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 7fa427cd89..902b541566 100644
--- a/application/pom.xml
+++ b/application/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.6.3-SNAPSHOT</version>
+        <version>3.7.0-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <artifactId>application</artifactId>
@@ -49,7 +49,6 @@
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-transport-native-epoll</artifactId>
-            <version>${netty.version}</version>
             <!-- Explicitly bring in the linux classifier, test may fail on 32-bit linux -->
             <classifier>linux-x86_64</classifier>
         </dependency>
@@ -212,7 +211,15 @@
         </dependency>
         <dependency>
             <groupId>com.sun.mail</groupId>
-            <artifactId>javax.mail</artifactId>
+            <artifactId>jakarta.mail</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
         </dependency>
         <dependency>
             <groupId>com.twilio.sdk</groupId>
@@ -256,7 +263,7 @@
         </dependency>
         <dependency>
             <groupId>org.thingsboard</groupId>
-            <artifactId>springfox-boot-starter</artifactId>
+            <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
         </dependency>
         <dependency>
             <groupId>com.sun.winsw</groupId>
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 c84faa359e..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
@@ -5,418 +5,1051 @@
   "mobileOrder": null,
   "configuration": {
     "widgets": {
-      "81987f19-3eac-e4ce-b790-d96e9b54d9a0": {
+      "5eb79712-5c24-3060-7e4f-6af36b8f842d": {
         "type": "timeseries",
-        "sizeX": 12,
-        "sizeY": 7,
+        "sizeX": 24,
+        "sizeY": 5,
         "config": {
           "datasources": [
             {
               "type": "entity",
+              "entityAliasId": "140f23dd-e3a0-ed98-6189-03c49d2d8018",
               "dataKeys": [
                 {
-                  "name": "successfulMsgs",
+                  "name": "ruleEngineException",
                   "type": "timeseries",
-                  "label": "${entityName} Successful",
-                  "color": "#4caf50",
+                  "label": "Rule Chain",
+                  "color": "#2196f3",
                   "settings": {
-                    "excludeFromStacking": false,
-                    "hideDataByDefault": false,
-                    "disableDataHiding": false,
-                    "removeFromLegend": false,
-                    "showLines": true,
-                    "fillLines": false,
-                    "showPoints": false,
-                    "showPointShape": "circle",
-                    "pointShapeFormatter": "var size = radius * Math.sqrt(Math.PI) / 2;\nctx.moveTo(x - size, y - size);\nctx.lineTo(x + size, y + size);\nctx.moveTo(x - size, y + size);\nctx.lineTo(x + size, y - size);",
-                    "showPointsLineWidth": 5,
-                    "showPointsRadius": 3,
-                    "showSeparateAxis": false,
-                    "axisPosition": "left",
-                    "thresholds": [
-                      {
-                        "thresholdValueSource": "predefinedValue"
-                      }
-                    ],
-                    "comparisonSettings": {
-                      "showValuesForComparison": true
-                    }
+                    "useCellStyleFunction": false,
+                    "useCellContentFunction": true,
+                    "cellContentFunction": "return JSON.parse(value).ruleChainName;"
                   },
-                  "_hash": 0.15490750967648736
+                  "_hash": 0.9954481282345906
                 },
                 {
-                  "name": "failedMsgs",
+                  "name": "ruleEngineException",
                   "type": "timeseries",
-                  "label": "${entityName} Permanent Failures",
-                  "color": "#ef5350",
+                  "label": "Rule Node",
+                  "color": "#4caf50",
                   "settings": {
-                    "excludeFromStacking": false,
-                    "hideDataByDefault": false,
-                    "disableDataHiding": false,
-                    "removeFromLegend": false,
-                    "showLines": true,
-                    "fillLines": false,
-                    "showPoints": false,
-                    "showPointShape": "circle",
-                    "pointShapeFormatter": "var size = radius * Math.sqrt(Math.PI) / 2;\nctx.moveTo(x - size, y - size);\nctx.lineTo(x + size, y + size);\nctx.moveTo(x - size, y + size);\nctx.lineTo(x + size, y - size);",
-                    "showPointsLineWidth": 5,
-                    "showPointsRadius": 3,
-                    "showSeparateAxis": false,
-                    "axisPosition": "left",
-                    "thresholds": [
-                      {
-                        "thresholdValueSource": "predefinedValue"
-                      }
-                    ],
-                    "comparisonSettings": {
-                      "showValuesForComparison": true
-                    }
+                    "useCellStyleFunction": false,
+                    "useCellContentFunction": true,
+                    "cellContentFunction": "return JSON.parse(value).ruleNodeName;"
                   },
-                  "_hash": 0.4186621166514697
+                  "_hash": 0.18580357036589978
                 },
                 {
-                  "name": "tmpFailed",
+                  "name": "ruleEngineException",
                   "type": "timeseries",
-                  "label": "${entityName} Processing Failures",
-                  "color": "#ffc107",
+                  "label": "Latest Error",
+                  "color": "#f44336",
                   "settings": {
-                    "excludeFromStacking": false,
-                    "hideDataByDefault": false,
-                    "disableDataHiding": false,
-                    "removeFromLegend": false,
-                    "showLines": true,
-                    "fillLines": false,
-                    "showPoints": false,
-                    "showPointShape": "circle",
-                    "pointShapeFormatter": "var size = radius * Math.sqrt(Math.PI) / 2;\nctx.moveTo(x - size, y - size);\nctx.lineTo(x + size, y + size);\nctx.moveTo(x - size, y + size);\nctx.lineTo(x + size, y - size);",
-                    "showPointsLineWidth": 5,
-                    "showPointsRadius": 3,
-                    "showSeparateAxis": false,
-                    "axisPosition": "left",
-                    "thresholds": [
-                      {
-                        "thresholdValueSource": "predefinedValue"
-                      }
-                    ],
-                    "comparisonSettings": {
-                      "showValuesForComparison": true
-                    }
+                    "useCellStyleFunction": false,
+                    "useCellContentFunction": true,
+                    "cellContentFunction": "return JSON.parse(value).message;"
                   },
-                  "_hash": 0.49891007198715376
+                  "_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": {
             "realtime": {
               "interval": 1000,
-              "timewindowMs": 300000
+              "timewindowMs": 86400000
             },
             "aggregation": {
               "type": "NONE",
-              "limit": 8640
-            },
-            "hideInterval": false,
-            "hideAggregation": false,
-            "hideAggInterval": false
+              "limit": 200
+            }
           },
           "showTitle": true,
-          "backgroundColor": "#fff",
+          "backgroundColor": "rgb(255, 255, 255)",
           "color": "rgba(0, 0, 0, 0.87)",
           "padding": "8px",
           "settings": {
-            "shadowSize": 4,
-            "fontColor": "#545454",
-            "fontSize": 10,
-            "xaxis": {
-              "showLabels": true,
-              "color": "#545454"
-            },
-            "yaxis": {
-              "showLabels": true,
-              "color": "#545454"
-            },
-            "grid": {
-              "color": "#545454",
-              "tickColor": "#DDDDDD",
-              "verticalLines": true,
-              "horizontalLines": true,
-              "outlineWidth": 1
-            },
-            "stack": false,
-            "tooltipIndividual": false,
-            "timeForComparison": "months",
-            "xaxisSecond": {
-              "axisPosition": "top",
-              "showLabels": true
-            },
-            "showLegend": true,
-            "legendConfig": {
-              "direction": "column",
-              "position": "bottom",
-              "showMin": true,
-              "showMax": true,
-              "showAvg": false,
-              "showTotal": true
-            }
+            "showTimestamp": true,
+            "displayPagination": true,
+            "defaultPageSize": 10,
+            "enableSearch": true,
+            "enableSelectColumnDisplay": true
           },
-          "title": "Queue Stats",
+          "title": "Exceptions",
           "dropShadow": true,
           "enableFullscreen": true,
           "titleStyle": {
             "fontSize": "16px",
             "fontWeight": 400
           },
-          "mobileHeight": null,
+          "useDashboardTimewindow": false,
+          "showLegend": false,
+          "widgetStyle": {},
+          "actions": {},
           "showTitleIcon": false,
           "titleIcon": null,
           "iconColor": "rgba(0, 0, 0, 0.87)",
           "iconSize": "24px",
           "titleTooltip": "",
-          "widgetStyle": {},
-          "useDashboardTimewindow": false,
           "displayTimewindow": true,
-          "actions": {}
+          "configMode": "basic",
+          "titleFont": null,
+          "titleColor": null
         },
-        "id": "81987f19-3eac-e4ce-b790-d96e9b54d9a0",
-        "typeFullFqn": "system.charts.basic_timeseries"
+        "id": "5eb79712-5c24-3060-7e4f-6af36b8f842d",
+        "typeFullFqn": "system.cards.timeseries_table"
       },
-      "5eb79712-5c24-3060-7e4f-6af36b8f842d": {
+      "42face47-730d-f930-fef5-2a1ef6304b16": {
+        "typeFullFqn": "system.time_series_chart",
         "type": "timeseries",
-        "sizeX": 24,
+        "sizeX": 8,
         "sizeY": 5,
         "config": {
           "datasources": [
             {
               "type": "entity",
+              "entityAliasId": "140f23dd-e3a0-ed98-6189-03c49d2d8018",
               "dataKeys": [
                 {
-                  "name": "ruleEngineException",
+                  "name": "successfulMsgs",
                   "type": "timeseries",
-                  "label": "Rule Chain",
-                  "color": "#2196f3",
+                  "label": "{i18n:api-usage.successful}",
+                  "color": "#4caf50",
                   "settings": {
-                    "useCellStyleFunction": false,
-                    "useCellContentFunction": true,
-                    "cellContentFunction": "return JSON.parse(value).ruleChainName;"
+                    "yAxisId": "default",
+                    "showInLegend": true,
+                    "dataHiddenByDefault": false,
+                    "type": "line",
+                    "lineSettings": {
+                      "showLine": true,
+                      "step": false,
+                      "stepType": "start",
+                      "smooth": false,
+                      "lineType": "solid",
+                      "lineWidth": 2.5,
+                      "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)",
+                      "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)",
+                      "backgroundSettings": {
+                        "type": "none",
+                        "opacity": 0.4,
+                        "gradient": {
+                          "start": 100,
+                          "end": 0
+                        }
+                      }
+                    }
                   },
-                  "_hash": 0.9954481282345906
+                  "_hash": 0.15490750967648736,
+                  "aggregationType": null,
+                  "units": null,
+                  "decimals": null,
+                  "funcBody": null,
+                  "usePostProcessing": null,
+                  "postFuncBody": null
                 },
                 {
-                  "name": "ruleEngineException",
+                  "name": "failedMsgs",
                   "type": "timeseries",
-                  "label": "Rule Node",
-                  "color": "#4caf50",
+                  "label": "{i18n:api-usage.permanent-failures}",
+                  "color": "#ef5350",
                   "settings": {
-                    "useCellStyleFunction": false,
-                    "useCellContentFunction": true,
-                    "cellContentFunction": "return JSON.parse(value).ruleNodeName;"
+                    "yAxisId": "default",
+                    "showInLegend": true,
+                    "dataHiddenByDefault": false,
+                    "type": "line",
+                    "lineSettings": {
+                      "showLine": true,
+                      "step": false,
+                      "stepType": "start",
+                      "smooth": false,
+                      "lineType": "solid",
+                      "lineWidth": 2.5,
+                      "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)",
+                      "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)",
+                      "backgroundSettings": {
+                        "type": "none",
+                        "opacity": 0.4,
+                        "gradient": {
+                          "start": 100,
+                          "end": 0
+                        }
+                      }
+                    }
                   },
-                  "_hash": 0.18580357036589978
+                  "_hash": 0.4186621166514697,
+                  "aggregationType": null,
+                  "units": null,
+                  "decimals": null,
+                  "funcBody": null,
+                  "usePostProcessing": null,
+                  "postFuncBody": null
                 },
                 {
-                  "name": "ruleEngineException",
+                  "name": "tmpFailed",
                   "type": "timeseries",
-                  "label": "Latest Error",
-                  "color": "#f44336",
+                  "label": "{i18n:api-usage.processing-failures}",
+                  "color": "#ffc107",
                   "settings": {
-                    "useCellStyleFunction": false,
-                    "useCellContentFunction": true,
-                    "cellContentFunction": "return JSON.parse(value).message;"
+                    "yAxisId": "default",
+                    "showInLegend": true,
+                    "dataHiddenByDefault": false,
+                    "type": "line",
+                    "lineSettings": {
+                      "showLine": true,
+                      "step": false,
+                      "stepType": "start",
+                      "smooth": false,
+                      "lineType": "solid",
+                      "lineWidth": 2.5,
+                      "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)",
+                      "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)",
+                      "backgroundSettings": {
+                        "type": "none",
+                        "opacity": 0.4,
+                        "gradient": {
+                          "start": 100,
+                          "end": 0
+                        }
+                      }
+                    }
                   },
-                  "_hash": 0.7255162989552142
+                  "_hash": 0.49891007198715376,
+                  "aggregationType": null,
+                  "units": null,
+                  "decimals": null,
+                  "funcBody": null,
+                  "usePostProcessing": null,
+                  "postFuncBody": null
                 }
               ],
-              "entityAliasId": "140f23dd-e3a0-ed98-6189-03c49d2d8018"
+              "alarmFilterConfig": {
+                "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": {
+            "hideInterval": false,
+            "hideLastInterval": false,
+            "hideQuickInterval": false,
+            "hideAggregation": false,
+            "hideAggInterval": false,
+            "hideTimezone": false,
+            "selectedTab": 0,
             "realtime": {
-              "interval": 1000,
-              "timewindowMs": 86400000
+              "realtimeType": 0,
+              "timewindowMs": 300000,
+              "quickInterval": "CURRENT_DAY",
+              "interval": 1000
             },
             "aggregation": {
               "type": "NONE",
-              "limit": 200
+              "limit": 8640
             }
           },
           "showTitle": true,
-          "backgroundColor": "rgb(255, 255, 255)",
+          "backgroundColor": "#FFFFFF",
           "color": "rgba(0, 0, 0, 0.87)",
-          "padding": "8px",
+          "padding": "0px",
           "settings": {
-            "showTimestamp": true,
-            "displayPagination": true,
-            "defaultPageSize": 10
+            "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": "var rounder = Math.pow(10, 1);\nvar powers = [\n  {key: 'Q', value: Math.pow(10, 15)},\n  {key: 'T', value: Math.pow(10, 12)},\n  {key: 'B', value: Math.pow(10, 9)},\n  {key: 'M', value: Math.pow(10, 6)},\n  {key: 'K', value: 1000}\n];\n\nvar key = '';\n\nfor (var i = 0; i < powers.length; i++) {\n    var reduced = value / powers[i].value;\n    reduced = Math.round(reduced * rounder) / rounder;\n    if (reduced >= 1) {\n        value = reduced;\n        key = powers[i].key;\n        break;\n    }\n}\nreturn value + key;",
+                "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,
+                "min": null,
+                "max": null
+              }
+            },
+            "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)",
+              "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": false,
+                "relativeWidth": 2,
+                "absoluteWidth": 1800000
+              },
+              "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": "bottom",
+              "sortDataKeys": false,
+              "showMin": true,
+              "showMax": true,
+              "showAvg": false,
+              "showTotal": true,
+              "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)",
+            "tooltipShowDate": true,
+            "tooltipDateFormat": {
+              "format": "yyyy-MM-dd HH:mm:ss",
+              "lastUpdateAgo": false,
+              "custom": false
+            },
+            "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": 300,
+              "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"
           },
-          "title": "Exceptions",
+          "title": "{i18n:api-usage.queue-stats}",
           "dropShadow": true,
           "enableFullscreen": true,
-          "titleStyle": {
-            "fontSize": "16px",
-            "fontWeight": 400
-          },
-          "useDashboardTimewindow": false,
-          "showLegend": false,
-          "widgetStyle": {},
+          "titleStyle": null,
+          "configMode": "basic",
           "actions": {},
           "showTitleIcon": false,
-          "titleIcon": null,
-          "iconColor": "rgba(0, 0, 0, 0.87)",
-          "iconSize": "24px",
+          "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": "",
-          "displayTimewindow": true
+          "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"
         },
-        "id": "5eb79712-5c24-3060-7e4f-6af36b8f842d",
-        "typeFullFqn": "system.cards.timeseries_table"
+        "row": 0,
+        "col": 0,
+        "id": "42face47-730d-f930-fef5-2a1ef6304b16"
       },
-      "ad3f1417-87a8-750e-fc67-49a2de1466d4": {
+      "6a74ab56-cb36-e75e-c094-a51a896da94a": {
+        "typeFullFqn": "system.time_series_chart",
         "type": "timeseries",
-        "sizeX": 12,
-        "sizeY": 7,
+        "sizeX": 8,
+        "sizeY": 5,
         "config": {
           "datasources": [
             {
               "type": "entity",
+              "entityAliasId": "140f23dd-e3a0-ed98-6189-03c49d2d8018",
               "dataKeys": [
                 {
                   "name": "timeoutMsgs",
                   "type": "timeseries",
-                  "label": "${entityName} Permanent Timeouts",
+                  "label": "{i18n:api-usage.permanent-timeouts}",
                   "color": "#4caf50",
                   "settings": {
-                    "excludeFromStacking": false,
-                    "hideDataByDefault": false,
-                    "disableDataHiding": false,
-                    "removeFromLegend": false,
-                    "showLines": true,
-                    "fillLines": false,
-                    "showPoints": false,
-                    "showPointShape": "circle",
-                    "pointShapeFormatter": "var size = radius * Math.sqrt(Math.PI) / 2;\nctx.moveTo(x - size, y - size);\nctx.lineTo(x + size, y + size);\nctx.moveTo(x - size, y + size);\nctx.lineTo(x + size, y - size);",
-                    "showPointsLineWidth": 5,
-                    "showPointsRadius": 3,
-                    "showSeparateAxis": false,
-                    "axisPosition": "left",
-                    "thresholds": [
-                      {
-                        "thresholdValueSource": "predefinedValue"
+                    "yAxisId": "default",
+                    "showInLegend": true,
+                    "dataHiddenByDefault": false,
+                    "type": "line",
+                    "lineSettings": {
+                      "showLine": true,
+                      "step": false,
+                      "stepType": "start",
+                      "smooth": false,
+                      "lineType": "solid",
+                      "lineWidth": 2.5,
+                      "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)",
+                      "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)",
+                      "backgroundSettings": {
+                        "type": "none",
+                        "opacity": 0.4,
+                        "gradient": {
+                          "start": 100,
+                          "end": 0
+                        }
                       }
-                    ],
-                    "comparisonSettings": {
-                      "showValuesForComparison": true
                     }
                   },
-                  "_hash": 0.565222981550328
+                  "_hash": 0.565222981550328,
+                  "aggregationType": null,
+                  "units": null,
+                  "decimals": null,
+                  "funcBody": null,
+                  "usePostProcessing": null,
+                  "postFuncBody": null
                 },
                 {
                   "name": "tmpTimeout",
                   "type": "timeseries",
-                  "label": "${entityName} Processing Timeouts",
+                  "label": "{i18n:api-usage.processing-timeouts}",
                   "color": "#9c27b0",
                   "settings": {
-                    "excludeFromStacking": false,
-                    "hideDataByDefault": false,
-                    "disableDataHiding": false,
-                    "removeFromLegend": false,
-                    "showLines": true,
-                    "fillLines": false,
-                    "showPoints": false,
-                    "showPointShape": "circle",
-                    "pointShapeFormatter": "var size = radius * Math.sqrt(Math.PI) / 2;\nctx.moveTo(x - size, y - size);\nctx.lineTo(x + size, y + size);\nctx.moveTo(x - size, y + size);\nctx.lineTo(x + size, y - size);",
-                    "showPointsLineWidth": 5,
-                    "showPointsRadius": 3,
-                    "showSeparateAxis": false,
-                    "axisPosition": "left",
-                    "thresholds": [
-                      {
-                        "thresholdValueSource": "predefinedValue"
+                    "yAxisId": "default",
+                    "showInLegend": true,
+                    "dataHiddenByDefault": false,
+                    "type": "line",
+                    "lineSettings": {
+                      "showLine": true,
+                      "step": false,
+                      "stepType": "start",
+                      "smooth": false,
+                      "lineType": "solid",
+                      "lineWidth": 2.5,
+                      "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)",
+                      "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)",
+                      "backgroundSettings": {
+                        "type": "none",
+                        "opacity": 0.4,
+                        "gradient": {
+                          "start": 100,
+                          "end": 0
+                        }
                       }
-                    ],
-                    "comparisonSettings": {
-                      "showValuesForComparison": true
                     }
                   },
-                  "_hash": 0.2679547062508352
+                  "_hash": 0.2679547062508352,
+                  "aggregationType": null,
+                  "units": null,
+                  "decimals": null,
+                  "funcBody": null,
+                  "usePostProcessing": null,
+                  "postFuncBody": null
                 }
               ],
-              "entityAliasId": "140f23dd-e3a0-ed98-6189-03c49d2d8018"
+              "alarmFilterConfig": {
+                "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": {
+            "hideInterval": false,
+            "hideLastInterval": false,
+            "hideQuickInterval": false,
+            "hideAggregation": false,
+            "hideAggInterval": false,
+            "hideTimezone": false,
+            "selectedTab": 0,
             "realtime": {
-              "interval": 1000,
-              "timewindowMs": 300000
+              "realtimeType": 0,
+              "timewindowMs": 300000,
+              "quickInterval": "CURRENT_DAY",
+              "interval": 1000
             },
             "aggregation": {
               "type": "NONE",
               "limit": 8640
-            },
-            "hideInterval": false,
-            "hideAggregation": false,
-            "hideAggInterval": false
+            }
           },
           "showTitle": true,
-          "backgroundColor": "#fff",
+          "backgroundColor": "#FFFFFF",
           "color": "rgba(0, 0, 0, 0.87)",
-          "padding": "8px",
+          "padding": "0px",
           "settings": {
-            "shadowSize": 4,
-            "fontColor": "#545454",
-            "fontSize": 10,
-            "xaxis": {
-              "showLabels": true,
-              "color": "#545454"
-            },
-            "yaxis": {
-              "showLabels": true,
-              "color": "#545454"
-            },
-            "grid": {
-              "color": "#545454",
-              "tickColor": "#DDDDDD",
-              "verticalLines": true,
-              "horizontalLines": true,
-              "outlineWidth": 1
+            "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": "var rounder = Math.pow(10, 1);\nvar powers = [\n  {key: 'Q', value: Math.pow(10, 15)},\n  {key: 'T', value: Math.pow(10, 12)},\n  {key: 'B', value: Math.pow(10, 9)},\n  {key: 'M', value: Math.pow(10, 6)},\n  {key: 'K', value: 1000}\n];\n\nvar key = '';\n\nfor (var i = 0; i < powers.length; i++) {\n    var reduced = value / powers[i].value;\n    reduced = Math.round(reduced * rounder) / rounder;\n    if (reduced >= 1) {\n        value = reduced;\n        key = powers[i].key;\n        break;\n    }\n}\nreturn value + key;",
+                "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,
+                "min": null,
+                "max": null
+              }
             },
+            "thresholds": [],
+            "dataZoom": true,
             "stack": false,
-            "tooltipIndividual": false,
-            "timeForComparison": "months",
-            "xaxisSecond": {
-              "axisPosition": "top",
-              "showLabels": true
+            "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)",
+              "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": false,
+                "relativeWidth": 2,
+                "absoluteWidth": 1800000
+              },
+              "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": "bottom",
+              "sortDataKeys": false,
               "showMin": true,
               "showMax": true,
               "showAvg": false,
-              "showTotal": true
-            }
+              "showTotal": true,
+              "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)",
+            "tooltipShowDate": true,
+            "tooltipDateFormat": {
+              "format": "yyyy-MM-dd HH:mm:ss",
+              "lastUpdateAgo": false,
+              "custom": false
+            },
+            "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": 300,
+              "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"
           },
-          "title": "Processing Failures and Timeouts",
+          "title": "{i18n:api-usage.processing-failures-and-timeouts}",
           "dropShadow": true,
           "enableFullscreen": true,
-          "titleStyle": {
-            "fontSize": "16px",
-            "fontWeight": 400
-          },
-          "mobileHeight": null,
+          "titleStyle": null,
+          "configMode": "basic",
+          "actions": {},
           "showTitleIcon": false,
-          "titleIcon": null,
-          "iconColor": "rgba(0, 0, 0, 0.87)",
-          "iconSize": "24px",
-          "titleTooltip": "",
-          "widgetStyle": {},
+          "titleIcon": "thermostat",
+          "iconColor": "#1F6BDD",
           "useDashboardTimewindow": false,
           "displayTimewindow": true,
-          "actions": {}
+          "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"
         },
-        "id": "ad3f1417-87a8-750e-fc67-49a2de1466d4",
-        "typeFullFqn": "system.charts.basic_timeseries"
+        "row": 0,
+        "col": 0,
+        "id": "6a74ab56-cb36-e75e-c094-a51a896da94a"
       }
     },
     "states": {
@@ -426,23 +1059,21 @@
         "layouts": {
           "main": {
             "widgets": {
-              "81987f19-3eac-e4ce-b790-d96e9b54d9a0": {
-                "sizeX": 12,
-                "sizeY": 7,
-                "mobileHeight": null,
-                "row": 0,
-                "col": 0
-              },
               "5eb79712-5c24-3060-7e4f-6af36b8f842d": {
                 "sizeX": 24,
                 "sizeY": 5,
                 "row": 7,
                 "col": 0
               },
-              "ad3f1417-87a8-750e-fc67-49a2de1466d4": {
+              "42face47-730d-f930-fef5-2a1ef6304b16": {
+                "sizeX": 12,
+                "sizeY": 7,
+                "row": 0,
+                "col": 0
+              },
+              "6a74ab56-cb36-e75e-c094-a51a896da94a": {
                 "sizeX": 12,
                 "sizeY": 7,
-                "mobileHeight": null,
                 "row": 0,
                 "col": 12
               }
@@ -467,12 +1098,9 @@
         "id": "140f23dd-e3a0-ed98-6189-03c49d2d8018",
         "alias": "TbServiceQueues",
         "filter": {
-          "type": "assetType",
+          "type": "entityType",
           "resolveMultiple": true,
-          "assetNameFilter": "",
-          "assetTypes": [
-            "TbServiceQueue"
-          ]
+          "entityType": "QUEUE_STATS"
         }
       }
     },
@@ -511,6 +1139,5 @@
     },
     "filters": {}
   },
-  "externalId": null,
   "name": "Rule Engine Statistics"
 }
\ No newline at end of file
diff --git a/application/src/main/data/json/demo/dashboards/thermostats.json b/application/src/main/data/json/demo/dashboards/thermostats.json
index 967c1cb253..223722fee1 100644
--- a/application/src/main/data/json/demo/dashboards/thermostats.json
+++ b/application/src/main/data/json/demo/dashboards/thermostats.json
@@ -325,240 +325,6 @@
         "id": "7943196b-eedb-d422-f9c3-b32d379ad172",
         "typeFullFqn": "system.alarm_widgets.alarms_table"
       },
-      "14a19183-f0b2-d6be-0f62-9863f0a51111": {
-        "type": "timeseries",
-        "sizeX": 18,
-        "sizeY": 6,
-        "config": {
-          "datasources": [
-            {
-              "type": "entity",
-              "dataKeys": [
-                {
-                  "name": "temperature",
-                  "type": "timeseries",
-                  "label": "Temperature",
-                  "color": "#ef5350",
-                  "settings": {
-                    "excludeFromStacking": false,
-                    "hideDataByDefault": false,
-                    "disableDataHiding": false,
-                    "removeFromLegend": false,
-                    "showLines": true,
-                    "fillLines": true,
-                    "showPoints": false,
-                    "showPointShape": "circle",
-                    "pointShapeFormatter": "var size = radius * Math.sqrt(Math.PI) / 2;\nctx.moveTo(x - size, y - size);\nctx.lineTo(x + size, y + size);\nctx.moveTo(x - size, y + size);\nctx.lineTo(x + size, y - size);",
-                    "showPointsLineWidth": 5,
-                    "showPointsRadius": 3,
-                    "showSeparateAxis": false,
-                    "axisPosition": "left",
-                    "thresholds": [
-                      {
-                        "thresholdValueSource": "predefinedValue"
-                      }
-                    ],
-                    "comparisonSettings": {
-                      "showValuesForComparison": true
-                    }
-                  },
-                  "_hash": 0.7852346160709658,
-                  "units": "°C",
-                  "decimals": 1
-                }
-              ],
-              "entityAliasId": "12ae98c7-1ea2-52cf-64d5-763e9d993547"
-            }
-          ],
-          "timewindow": {
-            "realtime": {
-              "interval": 30000,
-              "timewindowMs": 3600000
-            },
-            "aggregation": {
-              "type": "AVG",
-              "limit": 25000
-            }
-          },
-          "showTitle": true,
-          "backgroundColor": "#fff",
-          "color": "rgba(0, 0, 0, 0.87)",
-          "padding": "8px",
-          "settings": {
-            "shadowSize": 4,
-            "fontColor": "#545454",
-            "fontSize": 10,
-            "xaxis": {
-              "showLabels": true,
-              "color": "#545454"
-            },
-            "yaxis": {
-              "showLabels": true,
-              "color": "#545454"
-            },
-            "grid": {
-              "color": "#545454",
-              "tickColor": "#DDDDDD",
-              "verticalLines": true,
-              "horizontalLines": true,
-              "outlineWidth": 1
-            },
-            "stack": false,
-            "tooltipIndividual": false,
-            "timeForComparison": "months",
-            "xaxisSecond": {
-              "axisPosition": "top",
-              "showLabels": true
-            },
-            "smoothLines": true,
-            "showLegend": true,
-            "legendConfig": {
-              "direction": "column",
-              "position": "bottom",
-              "showMin": true,
-              "showMax": true,
-              "showAvg": true,
-              "showTotal": false
-            }
-          },
-          "title": "Temperature",
-          "dropShadow": true,
-          "enableFullscreen": true,
-          "titleStyle": {
-            "fontSize": "16px",
-            "fontWeight": 400
-          },
-          "mobileHeight": null,
-          "showTitleIcon": false,
-          "titleIcon": null,
-          "iconColor": "rgba(0, 0, 0, 0.87)",
-          "iconSize": "24px",
-          "titleTooltip": "",
-          "widgetStyle": {},
-          "useDashboardTimewindow": false,
-          "displayTimewindow": true,
-          "actions": {}
-        },
-        "id": "14a19183-f0b2-d6be-0f62-9863f0a51111",
-        "typeFullFqn": "system.charts.basic_timeseries"
-      },
-      "07f49fd5-a73b-d74c-c220-362c20af81f4": {
-        "type": "timeseries",
-        "sizeX": 18,
-        "sizeY": 6,
-        "config": {
-          "datasources": [
-            {
-              "type": "entity",
-              "dataKeys": [
-                {
-                  "name": "humidity",
-                  "type": "timeseries",
-                  "label": "Humidity",
-                  "color": "#2196f3",
-                  "settings": {
-                    "excludeFromStacking": false,
-                    "hideDataByDefault": false,
-                    "disableDataHiding": false,
-                    "removeFromLegend": false,
-                    "showLines": true,
-                    "fillLines": true,
-                    "showPoints": false,
-                    "showPointShape": "circle",
-                    "pointShapeFormatter": "var size = radius * Math.sqrt(Math.PI) / 2;\nctx.moveTo(x - size, y - size);\nctx.lineTo(x + size, y + size);\nctx.moveTo(x - size, y + size);\nctx.lineTo(x + size, y - size);",
-                    "showPointsLineWidth": 5,
-                    "showPointsRadius": 3,
-                    "showSeparateAxis": false,
-                    "axisPosition": "left",
-                    "thresholds": [
-                      {
-                        "thresholdValueSource": "predefinedValue"
-                      }
-                    ],
-                    "comparisonSettings": {
-                      "showValuesForComparison": true
-                    }
-                  },
-                  "_hash": 0.28640715926957183,
-                  "units": "%",
-                  "decimals": 0
-                }
-              ],
-              "entityAliasId": "12ae98c7-1ea2-52cf-64d5-763e9d993547"
-            }
-          ],
-          "timewindow": {
-            "realtime": {
-              "interval": 30000,
-              "timewindowMs": 3600000
-            },
-            "aggregation": {
-              "type": "AVG",
-              "limit": 25000
-            }
-          },
-          "showTitle": true,
-          "backgroundColor": "#fff",
-          "color": "rgba(0, 0, 0, 0.87)",
-          "padding": "8px",
-          "settings": {
-            "shadowSize": 4,
-            "fontColor": "#545454",
-            "fontSize": 10,
-            "xaxis": {
-              "showLabels": true,
-              "color": "#545454"
-            },
-            "yaxis": {
-              "showLabels": true,
-              "color": "#545454"
-            },
-            "grid": {
-              "color": "#545454",
-              "tickColor": "#DDDDDD",
-              "verticalLines": true,
-              "horizontalLines": true,
-              "outlineWidth": 1
-            },
-            "stack": false,
-            "tooltipIndividual": false,
-            "timeForComparison": "months",
-            "xaxisSecond": {
-              "axisPosition": "top",
-              "showLabels": true
-            },
-            "smoothLines": true,
-            "showLegend": true,
-            "legendConfig": {
-              "direction": "column",
-              "position": "bottom",
-              "showMin": true,
-              "showMax": true,
-              "showAvg": true,
-              "showTotal": false
-            }
-          },
-          "title": "Humidity",
-          "dropShadow": true,
-          "enableFullscreen": true,
-          "titleStyle": {
-            "fontSize": "16px",
-            "fontWeight": 400
-          },
-          "mobileHeight": null,
-          "showTitleIcon": false,
-          "titleIcon": null,
-          "iconColor": "rgba(0, 0, 0, 0.87)",
-          "iconSize": "24px",
-          "titleTooltip": "",
-          "widgetStyle": {},
-          "useDashboardTimewindow": false,
-          "displayTimewindow": true,
-          "actions": {}
-        },
-        "id": "07f49fd5-a73b-d74c-c220-362c20af81f4",
-        "typeFullFqn": "system.charts.basic_timeseries"
-      },
       "c4631f94-2db3-523b-4d09-2a1a0a75d93f": {
         "type": "latest",
         "sizeX": 6,
@@ -668,7 +434,9 @@
             "fieldsAlignment": "column",
             "fieldsInRow": 2,
             "groupTitle": "${entityName}",
-            "widgetTitle": "Termostat settings"
+            "widgetTitle": "Termostat settings",
+            "columnGap": 10,
+            "rowGap": 5
           },
           "title": "New Update Multiple Attributes",
           "dropShadow": true,
@@ -787,8 +555,8 @@
             "markerImageSize": 48,
             "useColorFunction": false,
             "markerImages": [
-              "data:image/svg+xml;base64,PHN2ZyB2ZXJzaW9uPSIxLjEiIGlkPSJzdmc0NDA4IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHg9IjAiIHk9IjAiIHZpZXdCb3g9IjAgMCAxNTAgMTUwIiB4bWw6c3BhY2U9InByZXNlcnZlIj48c3R5bGU+LnN0MntmaWxsOiNmNDQzMzZ9PC9zdHlsZT48ZyBpZD0ibGF5ZXIxIj48ZyBpZD0icGF0aDY4ODEtMy01LTUtMS04LTQtNC03LTgiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0xNDYuNDM4IC0yNzYuMDI4KSIgb3BhY2l0eT0iLjg5MiI+PHJhZGlhbEdyYWRpZW50IGlkPSJTVkdJRF8xXyIgY3g9IjMwODUuMjE1IiBjeT0iMzE3OC40NTgiIHI9IjQ5LjkwMSIgZ3JhZGllbnRUcmFuc2Zvcm09Im1hdHJpeCguNjc5MyAuMDA3NiAtLjUwOSAuNTYxMiAtMjMyLjYyOSAtMTQxMS43MjUpIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+PHN0b3Agb2Zmc2V0PSIwIi8+PHN0b3Agb2Zmc2V0PSIxIiBzdG9wLW9wYWNpdHk9Ii4xODgiLz48L3JhZGlhbEdyYWRpZW50PjxwYXRoIGQ9Ik0yODUuNiAzODguNWMxMC4zLTEyLjQgNC40LTIyLjQtMTQuNC0yMi40LTE4LjkgMC00Mi40IDEwLTUzLjkgMjIuNC0xNi44IDE4IC40IDIzLjUtLjIgMzUtLjEgMS44IDMuOSAxLjggNyAwIDE5LjgtMTEuNSA0Ni41LTE3IDYxLjUtMzUiIGZpbGw9InVybCgjU1ZHSURfMV8pIi8+PC9nPjxwYXRoIGlkPSJwYXRoNjg4MS0zLTUtNS0xLTgtNC00IiBjbGFzcz0ic3QyIiBkPSJNMTI0LjcgNjkuMWMtLjktMjcuNS0yMi4zLTQ5LjgtNDkuOC00OS44cy00OSAyMi4zLTQ5LjggNDkuOGMtMS4zIDQwLjEgMzAuNyA1Mi4yIDQ0LjcgNzggMi4yIDQgOCA0IDEwLjEgMCAxNC4xLTI1LjggNDYuMS0zNy45IDQ0LjgtNzgiLz48L2c+PGcgaWQ9Imc0OTI4Ij48Y2lyY2xlIGlkPSJwYXRoNDk3OCIgY2xhc3M9InN0MiIgY3g9Ijc0LjkiIGN5PSI2OS4xIiByPSI0OS45Ii8+PGcgaWQ9Imc0OTE1Ij48cGF0aCBpZD0icGF0aDY4ODMtMi0zLTUtMi00LTktNC05IiBkPSJNNzQuOCAxMDYuNGMtMjAuNiAwLTM3LjQtMTYuNy0zNy40LTM3LjQgMC0yMC42IDE2LjctMzcuNCAzNy40LTM3LjQgMjAuNiAwIDM3LjQgMTYuNyAzNy40IDM3LjRzLTE2LjcgMzcuNC0zNy40IDM3LjQiIGZpbGw9IiNmZmYiLz48L2c+PC9nPjxwYXRoIGNsYXNzPSJzdDIiIGQ9Ik05NS45IDQ2LjZWNDloLTEwdi0yLjVsMTAgLjF6bS0yIDUuM2gtOHYyLjVoOHYtMi41em0tOCA3LjloNnYtMi41aC02djIuNXptNCAyLjloLTR2Mi41aDR2LTIuNXptLTQgNy44aDJWNjhoLTJ2Mi41em0xLjUgMTRjMCA2LjktNS41IDEyLjUtMTIuMyAxMi41cy0xMi4zLTUuNi0xMi4zLTEyLjVjMC00LjUgMi4zLTguNSA2LjEtMTAuN1Y0NS41YzAtMy41IDIuOC02LjMgNi4yLTYuM3M2LjIgMi44IDYuMiA2LjN2MjguM2MzLjggMi4yIDYuMSA2LjMgNi4xIDEwLjd6bS0yLjQgMGMwLTMuOC0yLjEtNy4yLTUuNC04LjlsLS43LS4zVjQ1LjVjMC0yLjEtMS43LTMuOC0zLjgtMy44LTIuMSAwLTMuOCAxLjctMy44IDMuOHYyOS44bC0uNy4zYy0zLjMgMS43LTUuNCA1LjEtNS40IDguOSAwIDUuNSA0LjQgMTAgOS45IDEwUzg1IDkwIDg1IDg0LjV6bS0yLjEgMGMwIDQuNC0zLjUgOC03LjggOHMtNy44LTMuNi03LjgtOGMwLTMuNiAyLjQtNi44IDUuOC03LjdsLjUtLjFWNjEuNWgzLjF2MTUuMmwuNS4xYzMuMyAxIDUuNyA0LjEgNS43IDcuN3ptLTcuNC01LjNjLS4yLS44LTEtMS40LTEuOS0xLjItMyAuNy01IDMuMy01IDYuNCAwIC45LjcgMS42IDEuNiAxLjZzMS42LS43IDEuNi0xLjZjMC0xLjYgMS4xLTMgMi42LTMuMy43LS4yIDEuMy0xIDEuMS0xLjl6Ii8+PC9zdmc+",
-              "data:image/svg+xml;base64,PHN2ZyB2ZXJzaW9uPSIxLjEiIGlkPSJzdmc0NDA4IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHg9IjAiIHk9IjAiIHZpZXdCb3g9IjAgMCAxNTAgMTUwIiB4bWw6c3BhY2U9InByZXNlcnZlIj48c3R5bGU+LnN0MntmaWxsOiMyNzg2MjJ9PC9zdHlsZT48ZyBpZD0ibGF5ZXIxIj48ZyBpZD0icGF0aDY4ODEtMy01LTUtMS04LTQtNC03LTgiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0xNDYuNDM4IC0yNzYuMDI4KSIgb3BhY2l0eT0iLjg5MiI+PHJhZGlhbEdyYWRpZW50IGlkPSJTVkdJRF8xXyIgY3g9IjMwODUuMjE1IiBjeT0iMzE3OC40NTgiIHI9IjQ5LjkwMSIgZ3JhZGllbnRUcmFuc2Zvcm09Im1hdHJpeCguNjc5MyAuMDA3NiAtLjUwOSAuNTYxMiAtMjMyLjYyOSAtMTQxMS43MjUpIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+PHN0b3Agb2Zmc2V0PSIwIi8+PHN0b3Agb2Zmc2V0PSIxIiBzdG9wLW9wYWNpdHk9Ii4xODgiLz48L3JhZGlhbEdyYWRpZW50PjxwYXRoIGQ9Ik0yODUuNiAzODguNWMxMC4zLTEyLjQgNC40LTIyLjQtMTQuNC0yMi40LTE4LjkgMC00Mi40IDEwLTUzLjkgMjIuNC0xNi44IDE4IC40IDIzLjUtLjIgMzUtLjEgMS44IDMuOSAxLjggNyAwIDE5LjgtMTEuNSA0Ni41LTE3IDYxLjUtMzUiIGZpbGw9InVybCgjU1ZHSURfMV8pIi8+PC9nPjxwYXRoIGlkPSJwYXRoNjg4MS0zLTUtNS0xLTgtNC00IiBjbGFzcz0ic3QyIiBkPSJNMTI0LjcgNjkuMWMtLjktMjcuNS0yMi4zLTQ5LjgtNDkuOC00OS44cy00OSAyMi4zLTQ5LjggNDkuOGMtMS4zIDQwLjEgMzAuNyA1Mi4yIDQ0LjcgNzggMi4yIDQgOCA0IDEwLjEgMCAxNC4xLTI1LjggNDYuMS0zNy45IDQ0LjgtNzgiLz48L2c+PGcgaWQ9Imc0OTI4Ij48Y2lyY2xlIGlkPSJwYXRoNDk3OCIgY2xhc3M9InN0MiIgY3g9Ijc0LjkiIGN5PSI2OS4xIiByPSI0OS45Ii8+PGcgaWQ9Imc0OTE1Ij48cGF0aCBpZD0icGF0aDY4ODMtMi0zLTUtMi00LTktNC05IiBkPSJNNzQuOCAxMDYuNGMtMjAuNiAwLTM3LjQtMTYuNy0zNy40LTM3LjQgMC0yMC42IDE2LjctMzcuNCAzNy40LTM3LjQgMjAuNiAwIDM3LjQgMTYuNyAzNy40IDM3LjRzLTE2LjcgMzcuNC0zNy40IDM3LjQiIGZpbGw9IiNmZmYiLz48L2c+PC9nPjxwYXRoIGNsYXNzPSJzdDIiIGQ9Ik05NS45IDQ2LjZWNDloLTEwdi0yLjVsMTAgLjF6bS0yIDUuM2gtOHYyLjVoOHYtMi41em0tOCA3LjloNnYtMi41aC02djIuNXptNCAyLjloLTR2Mi41aDR2LTIuNXptLTQgNy44aDJWNjhoLTJ2Mi41em0xLjUgMTRjMCA2LjktNS41IDEyLjUtMTIuMyAxMi41cy0xMi4zLTUuNi0xMi4zLTEyLjVjMC00LjUgMi4zLTguNSA2LjEtMTAuN1Y0NS41YzAtMy41IDIuOC02LjMgNi4yLTYuM3M2LjIgMi44IDYuMiA2LjN2MjguM2MzLjggMi4yIDYuMSA2LjMgNi4xIDEwLjd6bS0yLjQgMGMwLTMuOC0yLjEtNy4yLTUuNC04LjlsLS43LS4zVjQ1LjVjMC0yLjEtMS43LTMuOC0zLjgtMy44LTIuMSAwLTMuOCAxLjctMy44IDMuOHYyOS44bC0uNy4zYy0zLjMgMS43LTUuNCA1LjEtNS40IDguOSAwIDUuNSA0LjQgMTAgOS45IDEwUzg1IDkwIDg1IDg0LjV6bS0yLjEgMGMwIDQuNC0zLjUgOC03LjggOHMtNy44LTMuNi03LjgtOGMwLTMuNiAyLjQtNi44IDUuOC03LjdsLjUtLjFWNjEuNWgzLjF2MTUuMmwuNS4xYzMuMyAxIDUuNyA0LjEgNS43IDcuN3ptLTcuNC01LjNjLS4yLS44LTEtMS40LTEuOS0xLjItMyAuNy01IDMuMy01IDYuNCAwIC45LjcgMS42IDEuNiAxLjZzMS42LS43IDEuNi0xLjZjMC0xLjYgMS4xLTMgMi42LTMuMy43LS4yIDEuMy0xIDEuMS0xLjl6Ii8+PC9zdmc+Cg=="
+              "tb-image:dGhlcm1vc3RhdHNfZGFzaGJvYXJkX3dpZGdldF90aGVybW9zdGF0X21hcHNfbWFya2VyX2ltYWdlXzAuc3Zn:IlRoZXJtb3N0YXRzIiBkYXNoYm9hcmQgd2lkZ2V0ICJUaGVybW9zdGF0IG1hcHMiIG1hcmtlciBpbWFnZSAw;data:image/svg+xml;base64,PHN2ZyB2ZXJzaW9uPSIxLjEiIGlkPSJzdmc0NDA4IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHg9IjAiIHk9IjAiIHZpZXdCb3g9IjAgMCAxNTAgMTUwIiB4bWw6c3BhY2U9InByZXNlcnZlIj48c3R5bGU+LnN0MntmaWxsOiNmNDQzMzZ9PC9zdHlsZT48ZyBpZD0ibGF5ZXIxIj48ZyBpZD0icGF0aDY4ODEtMy01LTUtMS04LTQtNC03LTgiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0xNDYuNDM4IC0yNzYuMDI4KSIgb3BhY2l0eT0iLjg5MiI+PHJhZGlhbEdyYWRpZW50IGlkPSJTVkdJRF8xXyIgY3g9IjMwODUuMjE1IiBjeT0iMzE3OC40NTgiIHI9IjQ5LjkwMSIgZ3JhZGllbnRUcmFuc2Zvcm09Im1hdHJpeCguNjc5MyAuMDA3NiAtLjUwOSAuNTYxMiAtMjMyLjYyOSAtMTQxMS43MjUpIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+PHN0b3Agb2Zmc2V0PSIwIi8+PHN0b3Agb2Zmc2V0PSIxIiBzdG9wLW9wYWNpdHk9Ii4xODgiLz48L3JhZGlhbEdyYWRpZW50PjxwYXRoIGQ9Ik0yODUuNiAzODguNWMxMC4zLTEyLjQgNC40LTIyLjQtMTQuNC0yMi40LTE4LjkgMC00Mi40IDEwLTUzLjkgMjIuNC0xNi44IDE4IC40IDIzLjUtLjIgMzUtLjEgMS44IDMuOSAxLjggNyAwIDE5LjgtMTEuNSA0Ni41LTE3IDYxLjUtMzUiIGZpbGw9InVybCgjU1ZHSURfMV8pIi8+PC9nPjxwYXRoIGlkPSJwYXRoNjg4MS0zLTUtNS0xLTgtNC00IiBjbGFzcz0ic3QyIiBkPSJNMTI0LjcgNjkuMWMtLjktMjcuNS0yMi4zLTQ5LjgtNDkuOC00OS44cy00OSAyMi4zLTQ5LjggNDkuOGMtMS4zIDQwLjEgMzAuNyA1Mi4yIDQ0LjcgNzggMi4yIDQgOCA0IDEwLjEgMCAxNC4xLTI1LjggNDYuMS0zNy45IDQ0LjgtNzgiLz48L2c+PGcgaWQ9Imc0OTI4Ij48Y2lyY2xlIGlkPSJwYXRoNDk3OCIgY2xhc3M9InN0MiIgY3g9Ijc0LjkiIGN5PSI2OS4xIiByPSI0OS45Ii8+PGcgaWQ9Imc0OTE1Ij48cGF0aCBpZD0icGF0aDY4ODMtMi0zLTUtMi00LTktNC05IiBkPSJNNzQuOCAxMDYuNGMtMjAuNiAwLTM3LjQtMTYuNy0zNy40LTM3LjQgMC0yMC42IDE2LjctMzcuNCAzNy40LTM3LjQgMjAuNiAwIDM3LjQgMTYuNyAzNy40IDM3LjRzLTE2LjcgMzcuNC0zNy40IDM3LjQiIGZpbGw9IiNmZmYiLz48L2c+PC9nPjxwYXRoIGNsYXNzPSJzdDIiIGQ9Ik05NS45IDQ2LjZWNDloLTEwdi0yLjVsMTAgLjF6bS0yIDUuM2gtOHYyLjVoOHYtMi41em0tOCA3LjloNnYtMi41aC02djIuNXptNCAyLjloLTR2Mi41aDR2LTIuNXptLTQgNy44aDJWNjhoLTJ2Mi41em0xLjUgMTRjMCA2LjktNS41IDEyLjUtMTIuMyAxMi41cy0xMi4zLTUuNi0xMi4zLTEyLjVjMC00LjUgMi4zLTguNSA2LjEtMTAuN1Y0NS41YzAtMy41IDIuOC02LjMgNi4yLTYuM3M2LjIgMi44IDYuMiA2LjN2MjguM2MzLjggMi4yIDYuMSA2LjMgNi4xIDEwLjd6bS0yLjQgMGMwLTMuOC0yLjEtNy4yLTUuNC04LjlsLS43LS4zVjQ1LjVjMC0yLjEtMS43LTMuOC0zLjgtMy44LTIuMSAwLTMuOCAxLjctMy44IDMuOHYyOS44bC0uNy4zYy0zLjMgMS43LTUuNCA1LjEtNS40IDguOSAwIDUuNSA0LjQgMTAgOS45IDEwUzg1IDkwIDg1IDg0LjV6bS0yLjEgMGMwIDQuNC0zLjUgOC03LjggOHMtNy44LTMuNi03LjgtOGMwLTMuNiAyLjQtNi44IDUuOC03LjdsLjUtLjFWNjEuNWgzLjF2MTUuMmwuNS4xYzMuMyAxIDUuNyA0LjEgNS43IDcuN3ptLTcuNC01LjNjLS4yLS44LTEtMS40LTEuOS0xLjItMyAuNy01IDMuMy01IDYuNCAwIC45LjcgMS42IDEuNiAxLjZzMS42LS43IDEuNi0xLjZjMC0xLjYgMS4xLTMgMi42LTMuMy43LS4yIDEuMy0xIDEuMS0xLjl6Ii8+PC9zdmc+",
+              "tb-image:dGhlcm1vc3RhdHNfZGFzaGJvYXJkX3dpZGdldF90aGVybW9zdGF0X21hcHNfbWFya2VyX2ltYWdlXzEuc3Zn:IlRoZXJtb3N0YXRzIiBkYXNoYm9hcmQgd2lkZ2V0ICJUaGVybW9zdGF0IG1hcHMiIG1hcmtlciBpbWFnZSAx;data:image/svg+xml;base64,PHN2ZyB2ZXJzaW9uPSIxLjEiIGlkPSJzdmc0NDA4IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHg9IjAiIHk9IjAiIHZpZXdCb3g9IjAgMCAxNTAgMTUwIiB4bWw6c3BhY2U9InByZXNlcnZlIj48c3R5bGU+LnN0MntmaWxsOiMyNzg2MjJ9PC9zdHlsZT48ZyBpZD0ibGF5ZXIxIj48ZyBpZD0icGF0aDY4ODEtMy01LTUtMS04LTQtNC03LTgiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0xNDYuNDM4IC0yNzYuMDI4KSIgb3BhY2l0eT0iLjg5MiI+PHJhZGlhbEdyYWRpZW50IGlkPSJTVkdJRF8xXyIgY3g9IjMwODUuMjE1IiBjeT0iMzE3OC40NTgiIHI9IjQ5LjkwMSIgZ3JhZGllbnRUcmFuc2Zvcm09Im1hdHJpeCguNjc5MyAuMDA3NiAtLjUwOSAuNTYxMiAtMjMyLjYyOSAtMTQxMS43MjUpIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+PHN0b3Agb2Zmc2V0PSIwIi8+PHN0b3Agb2Zmc2V0PSIxIiBzdG9wLW9wYWNpdHk9Ii4xODgiLz48L3JhZGlhbEdyYWRpZW50PjxwYXRoIGQ9Ik0yODUuNiAzODguNWMxMC4zLTEyLjQgNC40LTIyLjQtMTQuNC0yMi40LTE4LjkgMC00Mi40IDEwLTUzLjkgMjIuNC0xNi44IDE4IC40IDIzLjUtLjIgMzUtLjEgMS44IDMuOSAxLjggNyAwIDE5LjgtMTEuNSA0Ni41LTE3IDYxLjUtMzUiIGZpbGw9InVybCgjU1ZHSURfMV8pIi8+PC9nPjxwYXRoIGlkPSJwYXRoNjg4MS0zLTUtNS0xLTgtNC00IiBjbGFzcz0ic3QyIiBkPSJNMTI0LjcgNjkuMWMtLjktMjcuNS0yMi4zLTQ5LjgtNDkuOC00OS44cy00OSAyMi4zLTQ5LjggNDkuOGMtMS4zIDQwLjEgMzAuNyA1Mi4yIDQ0LjcgNzggMi4yIDQgOCA0IDEwLjEgMCAxNC4xLTI1LjggNDYuMS0zNy45IDQ0LjgtNzgiLz48L2c+PGcgaWQ9Imc0OTI4Ij48Y2lyY2xlIGlkPSJwYXRoNDk3OCIgY2xhc3M9InN0MiIgY3g9Ijc0LjkiIGN5PSI2OS4xIiByPSI0OS45Ii8+PGcgaWQ9Imc0OTE1Ij48cGF0aCBpZD0icGF0aDY4ODMtMi0zLTUtMi00LTktNC05IiBkPSJNNzQuOCAxMDYuNGMtMjAuNiAwLTM3LjQtMTYuNy0zNy40LTM3LjQgMC0yMC42IDE2LjctMzcuNCAzNy40LTM3LjQgMjAuNiAwIDM3LjQgMTYuNyAzNy40IDM3LjRzLTE2LjcgMzcuNC0zNy40IDM3LjQiIGZpbGw9IiNmZmYiLz48L2c+PC9nPjxwYXRoIGNsYXNzPSJzdDIiIGQ9Ik05NS45IDQ2LjZWNDloLTEwdi0yLjVsMTAgLjF6bS0yIDUuM2gtOHYyLjVoOHYtMi41em0tOCA3LjloNnYtMi41aC02djIuNXptNCAyLjloLTR2Mi41aDR2LTIuNXptLTQgNy44aDJWNjhoLTJ2Mi41em0xLjUgMTRjMCA2LjktNS41IDEyLjUtMTIuMyAxMi41cy0xMi4zLTUuNi0xMi4zLTEyLjVjMC00LjUgMi4zLTguNSA2LjEtMTAuN1Y0NS41YzAtMy41IDIuOC02LjMgNi4yLTYuM3M2LjIgMi44IDYuMiA2LjN2MjguM2MzLjggMi4yIDYuMSA2LjMgNi4xIDEwLjd6bS0yLjQgMGMwLTMuOC0yLjEtNy4yLTUuNC04LjlsLS43LS4zVjQ1LjVjMC0yLjEtMS43LTMuOC0zLjgtMy44LTIuMSAwLTMuOCAxLjctMy44IDMuOHYyOS44bC0uNy4zYy0zLjMgMS43LTUuNCA1LjEtNS40IDguOSAwIDUuNSA0LjQgMTAgOS45IDEwUzg1IDkwIDg1IDg0LjV6bS0yLjEgMGMwIDQuNC0zLjUgOC03LjggOHMtNy44LTMuNi03LjgtOGMwLTMuNiAyLjQtNi44IDUuOC03LjdsLjUtLjFWNjEuNWgzLjF2MTUuMmwuNS4xYzMuMyAxIDUuNyA0LjEgNS43IDcuN3ptLTcuNC01LjNjLS4yLS44LTEtMS40LTEuOS0xLjItMyAuNy01IDMuMy01IDYuNCAwIC45LjcgMS42IDEuNiAxLjZzMS42LS43IDEuNi0xLjZjMC0xLjYgMS4xLTMgMi42LTMuMy43LS4yIDEuMy0xIDEuMS0xLjl6Ii8+PC9zdmc+Cg=="
             ],
             "useMarkerImageFunction": true,
             "colorFunction": "\n",
@@ -942,8 +710,8 @@
             "markerImageSize": 34,
             "useColorFunction": false,
             "markerImages": [
-              "data:image/svg+xml;base64,PHN2ZyB2ZXJzaW9uPSIxLjEiIGlkPSJzdmc0NDA4IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHg9IjAiIHk9IjAiIHZpZXdCb3g9IjAgMCAxNTAgMTUwIiB4bWw6c3BhY2U9InByZXNlcnZlIj48c3R5bGU+LnN0MntmaWxsOiNmNDQzMzZ9PC9zdHlsZT48ZyBpZD0ibGF5ZXIxIj48ZyBpZD0icGF0aDY4ODEtMy01LTUtMS04LTQtNC03LTgiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0xNDYuNDM4IC0yNzYuMDI4KSIgb3BhY2l0eT0iLjg5MiI+PHJhZGlhbEdyYWRpZW50IGlkPSJTVkdJRF8xXyIgY3g9IjMwODUuMjE1IiBjeT0iMzE3OC40NTgiIHI9IjQ5LjkwMSIgZ3JhZGllbnRUcmFuc2Zvcm09Im1hdHJpeCguNjc5MyAuMDA3NiAtLjUwOSAuNTYxMiAtMjMyLjYyOSAtMTQxMS43MjUpIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+PHN0b3Agb2Zmc2V0PSIwIi8+PHN0b3Agb2Zmc2V0PSIxIiBzdG9wLW9wYWNpdHk9Ii4xODgiLz48L3JhZGlhbEdyYWRpZW50PjxwYXRoIGQ9Ik0yODUuNiAzODguNWMxMC4zLTEyLjQgNC40LTIyLjQtMTQuNC0yMi40LTE4LjkgMC00Mi40IDEwLTUzLjkgMjIuNC0xNi44IDE4IC40IDIzLjUtLjIgMzUtLjEgMS44IDMuOSAxLjggNyAwIDE5LjgtMTEuNSA0Ni41LTE3IDYxLjUtMzUiIGZpbGw9InVybCgjU1ZHSURfMV8pIi8+PC9nPjxwYXRoIGlkPSJwYXRoNjg4MS0zLTUtNS0xLTgtNC00IiBjbGFzcz0ic3QyIiBkPSJNMTI0LjcgNjkuMWMtLjktMjcuNS0yMi4zLTQ5LjgtNDkuOC00OS44cy00OSAyMi4zLTQ5LjggNDkuOGMtMS4zIDQwLjEgMzAuNyA1Mi4yIDQ0LjcgNzggMi4yIDQgOCA0IDEwLjEgMCAxNC4xLTI1LjggNDYuMS0zNy45IDQ0LjgtNzgiLz48L2c+PGcgaWQ9Imc0OTI4Ij48Y2lyY2xlIGlkPSJwYXRoNDk3OCIgY2xhc3M9InN0MiIgY3g9Ijc0LjkiIGN5PSI2OS4xIiByPSI0OS45Ii8+PGcgaWQ9Imc0OTE1Ij48cGF0aCBpZD0icGF0aDY4ODMtMi0zLTUtMi00LTktNC05IiBkPSJNNzQuOCAxMDYuNGMtMjAuNiAwLTM3LjQtMTYuNy0zNy40LTM3LjQgMC0yMC42IDE2LjctMzcuNCAzNy40LTM3LjQgMjAuNiAwIDM3LjQgMTYuNyAzNy40IDM3LjRzLTE2LjcgMzcuNC0zNy40IDM3LjQiIGZpbGw9IiNmZmYiLz48L2c+PC9nPjxwYXRoIGNsYXNzPSJzdDIiIGQ9Ik05NS45IDQ2LjZWNDloLTEwdi0yLjVsMTAgLjF6bS0yIDUuM2gtOHYyLjVoOHYtMi41em0tOCA3LjloNnYtMi41aC02djIuNXptNCAyLjloLTR2Mi41aDR2LTIuNXptLTQgNy44aDJWNjhoLTJ2Mi41em0xLjUgMTRjMCA2LjktNS41IDEyLjUtMTIuMyAxMi41cy0xMi4zLTUuNi0xMi4zLTEyLjVjMC00LjUgMi4zLTguNSA2LjEtMTAuN1Y0NS41YzAtMy41IDIuOC02LjMgNi4yLTYuM3M2LjIgMi44IDYuMiA2LjN2MjguM2MzLjggMi4yIDYuMSA2LjMgNi4xIDEwLjd6bS0yLjQgMGMwLTMuOC0yLjEtNy4yLTUuNC04LjlsLS43LS4zVjQ1LjVjMC0yLjEtMS43LTMuOC0zLjgtMy44LTIuMSAwLTMuOCAxLjctMy44IDMuOHYyOS44bC0uNy4zYy0zLjMgMS43LTUuNCA1LjEtNS40IDguOSAwIDUuNSA0LjQgMTAgOS45IDEwUzg1IDkwIDg1IDg0LjV6bS0yLjEgMGMwIDQuNC0zLjUgOC03LjggOHMtNy44LTMuNi03LjgtOGMwLTMuNiAyLjQtNi44IDUuOC03LjdsLjUtLjFWNjEuNWgzLjF2MTUuMmwuNS4xYzMuMyAxIDUuNyA0LjEgNS43IDcuN3ptLTcuNC01LjNjLS4yLS44LTEtMS40LTEuOS0xLjItMyAuNy01IDMuMy01IDYuNCAwIC45LjcgMS42IDEuNiAxLjZzMS42LS43IDEuNi0xLjZjMC0xLjYgMS4xLTMgMi42LTMuMy43LS4yIDEuMy0xIDEuMS0xLjl6Ii8+PC9zdmc+",
-              "data:image/svg+xml;base64,PHN2ZyB2ZXJzaW9uPSIxLjEiIGlkPSJzdmc0NDA4IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHg9IjAiIHk9IjAiIHZpZXdCb3g9IjAgMCAxNTAgMTUwIiB4bWw6c3BhY2U9InByZXNlcnZlIj48c3R5bGU+LnN0MntmaWxsOiMyNzg2MjJ9PC9zdHlsZT48ZyBpZD0ibGF5ZXIxIj48ZyBpZD0icGF0aDY4ODEtMy01LTUtMS04LTQtNC03LTgiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0xNDYuNDM4IC0yNzYuMDI4KSIgb3BhY2l0eT0iLjg5MiI+PHJhZGlhbEdyYWRpZW50IGlkPSJTVkdJRF8xXyIgY3g9IjMwODUuMjE1IiBjeT0iMzE3OC40NTgiIHI9IjQ5LjkwMSIgZ3JhZGllbnRUcmFuc2Zvcm09Im1hdHJpeCguNjc5MyAuMDA3NiAtLjUwOSAuNTYxMiAtMjMyLjYyOSAtMTQxMS43MjUpIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+PHN0b3Agb2Zmc2V0PSIwIi8+PHN0b3Agb2Zmc2V0PSIxIiBzdG9wLW9wYWNpdHk9Ii4xODgiLz48L3JhZGlhbEdyYWRpZW50PjxwYXRoIGQ9Ik0yODUuNiAzODguNWMxMC4zLTEyLjQgNC40LTIyLjQtMTQuNC0yMi40LTE4LjkgMC00Mi40IDEwLTUzLjkgMjIuNC0xNi44IDE4IC40IDIzLjUtLjIgMzUtLjEgMS44IDMuOSAxLjggNyAwIDE5LjgtMTEuNSA0Ni41LTE3IDYxLjUtMzUiIGZpbGw9InVybCgjU1ZHSURfMV8pIi8+PC9nPjxwYXRoIGlkPSJwYXRoNjg4MS0zLTUtNS0xLTgtNC00IiBjbGFzcz0ic3QyIiBkPSJNMTI0LjcgNjkuMWMtLjktMjcuNS0yMi4zLTQ5LjgtNDkuOC00OS44cy00OSAyMi4zLTQ5LjggNDkuOGMtMS4zIDQwLjEgMzAuNyA1Mi4yIDQ0LjcgNzggMi4yIDQgOCA0IDEwLjEgMCAxNC4xLTI1LjggNDYuMS0zNy45IDQ0LjgtNzgiLz48L2c+PGcgaWQ9Imc0OTI4Ij48Y2lyY2xlIGlkPSJwYXRoNDk3OCIgY2xhc3M9InN0MiIgY3g9Ijc0LjkiIGN5PSI2OS4xIiByPSI0OS45Ii8+PGcgaWQ9Imc0OTE1Ij48cGF0aCBpZD0icGF0aDY4ODMtMi0zLTUtMi00LTktNC05IiBkPSJNNzQuOCAxMDYuNGMtMjAuNiAwLTM3LjQtMTYuNy0zNy40LTM3LjQgMC0yMC42IDE2LjctMzcuNCAzNy40LTM3LjQgMjAuNiAwIDM3LjQgMTYuNyAzNy40IDM3LjRzLTE2LjcgMzcuNC0zNy40IDM3LjQiIGZpbGw9IiNmZmYiLz48L2c+PC9nPjxwYXRoIGNsYXNzPSJzdDIiIGQ9Ik05NS45IDQ2LjZWNDloLTEwdi0yLjVsMTAgLjF6bS0yIDUuM2gtOHYyLjVoOHYtMi41em0tOCA3LjloNnYtMi41aC02djIuNXptNCAyLjloLTR2Mi41aDR2LTIuNXptLTQgNy44aDJWNjhoLTJ2Mi41em0xLjUgMTRjMCA2LjktNS41IDEyLjUtMTIuMyAxMi41cy0xMi4zLTUuNi0xMi4zLTEyLjVjMC00LjUgMi4zLTguNSA2LjEtMTAuN1Y0NS41YzAtMy41IDIuOC02LjMgNi4yLTYuM3M2LjIgMi44IDYuMiA2LjN2MjguM2MzLjggMi4yIDYuMSA2LjMgNi4xIDEwLjd6bS0yLjQgMGMwLTMuOC0yLjEtNy4yLTUuNC04LjlsLS43LS4zVjQ1LjVjMC0yLjEtMS43LTMuOC0zLjgtMy44LTIuMSAwLTMuOCAxLjctMy44IDMuOHYyOS44bC0uNy4zYy0zLjMgMS43LTUuNCA1LjEtNS40IDguOSAwIDUuNSA0LjQgMTAgOS45IDEwUzg1IDkwIDg1IDg0LjV6bS0yLjEgMGMwIDQuNC0zLjUgOC03LjggOHMtNy44LTMuNi03LjgtOGMwLTMuNiAyLjQtNi44IDUuOC03LjdsLjUtLjFWNjEuNWgzLjF2MTUuMmwuNS4xYzMuMyAxIDUuNyA0LjEgNS43IDcuN3ptLTcuNC01LjNjLS4yLS44LTEtMS40LTEuOS0xLjItMyAuNy01IDMuMy01IDYuNCAwIC45LjcgMS42IDEuNiAxLjZzMS42LS43IDEuNi0xLjZjMC0xLjYgMS4xLTMgMi42LTMuMy43LS4yIDEuMy0xIDEuMS0xLjl6Ii8+PC9zdmc+Cg=="
+              "tb-image:dGhlcm1vc3RhdHNfZGFzaGJvYXJkX3dpZGdldF90aGVybW9zdGF0X21hcHNfbWFya2VyX2ltYWdlXzAuc3Zn:IlRoZXJtb3N0YXRzIiBkYXNoYm9hcmQgd2lkZ2V0ICJUaGVybW9zdGF0IG1hcHMiIG1hcmtlciBpbWFnZSAw;data:image/svg+xml;base64,PHN2ZyB2ZXJzaW9uPSIxLjEiIGlkPSJzdmc0NDA4IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHg9IjAiIHk9IjAiIHZpZXdCb3g9IjAgMCAxNTAgMTUwIiB4bWw6c3BhY2U9InByZXNlcnZlIj48c3R5bGU+LnN0MntmaWxsOiNmNDQzMzZ9PC9zdHlsZT48ZyBpZD0ibGF5ZXIxIj48ZyBpZD0icGF0aDY4ODEtMy01LTUtMS04LTQtNC03LTgiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0xNDYuNDM4IC0yNzYuMDI4KSIgb3BhY2l0eT0iLjg5MiI+PHJhZGlhbEdyYWRpZW50IGlkPSJTVkdJRF8xXyIgY3g9IjMwODUuMjE1IiBjeT0iMzE3OC40NTgiIHI9IjQ5LjkwMSIgZ3JhZGllbnRUcmFuc2Zvcm09Im1hdHJpeCguNjc5MyAuMDA3NiAtLjUwOSAuNTYxMiAtMjMyLjYyOSAtMTQxMS43MjUpIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+PHN0b3Agb2Zmc2V0PSIwIi8+PHN0b3Agb2Zmc2V0PSIxIiBzdG9wLW9wYWNpdHk9Ii4xODgiLz48L3JhZGlhbEdyYWRpZW50PjxwYXRoIGQ9Ik0yODUuNiAzODguNWMxMC4zLTEyLjQgNC40LTIyLjQtMTQuNC0yMi40LTE4LjkgMC00Mi40IDEwLTUzLjkgMjIuNC0xNi44IDE4IC40IDIzLjUtLjIgMzUtLjEgMS44IDMuOSAxLjggNyAwIDE5LjgtMTEuNSA0Ni41LTE3IDYxLjUtMzUiIGZpbGw9InVybCgjU1ZHSURfMV8pIi8+PC9nPjxwYXRoIGlkPSJwYXRoNjg4MS0zLTUtNS0xLTgtNC00IiBjbGFzcz0ic3QyIiBkPSJNMTI0LjcgNjkuMWMtLjktMjcuNS0yMi4zLTQ5LjgtNDkuOC00OS44cy00OSAyMi4zLTQ5LjggNDkuOGMtMS4zIDQwLjEgMzAuNyA1Mi4yIDQ0LjcgNzggMi4yIDQgOCA0IDEwLjEgMCAxNC4xLTI1LjggNDYuMS0zNy45IDQ0LjgtNzgiLz48L2c+PGcgaWQ9Imc0OTI4Ij48Y2lyY2xlIGlkPSJwYXRoNDk3OCIgY2xhc3M9InN0MiIgY3g9Ijc0LjkiIGN5PSI2OS4xIiByPSI0OS45Ii8+PGcgaWQ9Imc0OTE1Ij48cGF0aCBpZD0icGF0aDY4ODMtMi0zLTUtMi00LTktNC05IiBkPSJNNzQuOCAxMDYuNGMtMjAuNiAwLTM3LjQtMTYuNy0zNy40LTM3LjQgMC0yMC42IDE2LjctMzcuNCAzNy40LTM3LjQgMjAuNiAwIDM3LjQgMTYuNyAzNy40IDM3LjRzLTE2LjcgMzcuNC0zNy40IDM3LjQiIGZpbGw9IiNmZmYiLz48L2c+PC9nPjxwYXRoIGNsYXNzPSJzdDIiIGQ9Ik05NS45IDQ2LjZWNDloLTEwdi0yLjVsMTAgLjF6bS0yIDUuM2gtOHYyLjVoOHYtMi41em0tOCA3LjloNnYtMi41aC02djIuNXptNCAyLjloLTR2Mi41aDR2LTIuNXptLTQgNy44aDJWNjhoLTJ2Mi41em0xLjUgMTRjMCA2LjktNS41IDEyLjUtMTIuMyAxMi41cy0xMi4zLTUuNi0xMi4zLTEyLjVjMC00LjUgMi4zLTguNSA2LjEtMTAuN1Y0NS41YzAtMy41IDIuOC02LjMgNi4yLTYuM3M2LjIgMi44IDYuMiA2LjN2MjguM2MzLjggMi4yIDYuMSA2LjMgNi4xIDEwLjd6bS0yLjQgMGMwLTMuOC0yLjEtNy4yLTUuNC04LjlsLS43LS4zVjQ1LjVjMC0yLjEtMS43LTMuOC0zLjgtMy44LTIuMSAwLTMuOCAxLjctMy44IDMuOHYyOS44bC0uNy4zYy0zLjMgMS43LTUuNCA1LjEtNS40IDguOSAwIDUuNSA0LjQgMTAgOS45IDEwUzg1IDkwIDg1IDg0LjV6bS0yLjEgMGMwIDQuNC0zLjUgOC03LjggOHMtNy44LTMuNi03LjgtOGMwLTMuNiAyLjQtNi44IDUuOC03LjdsLjUtLjFWNjEuNWgzLjF2MTUuMmwuNS4xYzMuMyAxIDUuNyA0LjEgNS43IDcuN3ptLTcuNC01LjNjLS4yLS44LTEtMS40LTEuOS0xLjItMyAuNy01IDMuMy01IDYuNCAwIC45LjcgMS42IDEuNiAxLjZzMS42LS43IDEuNi0xLjZjMC0xLjYgMS4xLTMgMi42LTMuMy43LS4yIDEuMy0xIDEuMS0xLjl6Ii8+PC9zdmc+",
+              "tb-image:dGhlcm1vc3RhdHNfZGFzaGJvYXJkX3dpZGdldF90aGVybW9zdGF0X21hcHNfbWFya2VyX2ltYWdlXzEuc3Zn:IlRoZXJtb3N0YXRzIiBkYXNoYm9hcmQgd2lkZ2V0ICJUaGVybW9zdGF0IG1hcHMiIG1hcmtlciBpbWFnZSAx;data:image/svg+xml;base64,PHN2ZyB2ZXJzaW9uPSIxLjEiIGlkPSJzdmc0NDA4IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHg9IjAiIHk9IjAiIHZpZXdCb3g9IjAgMCAxNTAgMTUwIiB4bWw6c3BhY2U9InByZXNlcnZlIj48c3R5bGU+LnN0MntmaWxsOiMyNzg2MjJ9PC9zdHlsZT48ZyBpZD0ibGF5ZXIxIj48ZyBpZD0icGF0aDY4ODEtMy01LTUtMS04LTQtNC03LTgiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0xNDYuNDM4IC0yNzYuMDI4KSIgb3BhY2l0eT0iLjg5MiI+PHJhZGlhbEdyYWRpZW50IGlkPSJTVkdJRF8xXyIgY3g9IjMwODUuMjE1IiBjeT0iMzE3OC40NTgiIHI9IjQ5LjkwMSIgZ3JhZGllbnRUcmFuc2Zvcm09Im1hdHJpeCguNjc5MyAuMDA3NiAtLjUwOSAuNTYxMiAtMjMyLjYyOSAtMTQxMS43MjUpIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+PHN0b3Agb2Zmc2V0PSIwIi8+PHN0b3Agb2Zmc2V0PSIxIiBzdG9wLW9wYWNpdHk9Ii4xODgiLz48L3JhZGlhbEdyYWRpZW50PjxwYXRoIGQ9Ik0yODUuNiAzODguNWMxMC4zLTEyLjQgNC40LTIyLjQtMTQuNC0yMi40LTE4LjkgMC00Mi40IDEwLTUzLjkgMjIuNC0xNi44IDE4IC40IDIzLjUtLjIgMzUtLjEgMS44IDMuOSAxLjggNyAwIDE5LjgtMTEuNSA0Ni41LTE3IDYxLjUtMzUiIGZpbGw9InVybCgjU1ZHSURfMV8pIi8+PC9nPjxwYXRoIGlkPSJwYXRoNjg4MS0zLTUtNS0xLTgtNC00IiBjbGFzcz0ic3QyIiBkPSJNMTI0LjcgNjkuMWMtLjktMjcuNS0yMi4zLTQ5LjgtNDkuOC00OS44cy00OSAyMi4zLTQ5LjggNDkuOGMtMS4zIDQwLjEgMzAuNyA1Mi4yIDQ0LjcgNzggMi4yIDQgOCA0IDEwLjEgMCAxNC4xLTI1LjggNDYuMS0zNy45IDQ0LjgtNzgiLz48L2c+PGcgaWQ9Imc0OTI4Ij48Y2lyY2xlIGlkPSJwYXRoNDk3OCIgY2xhc3M9InN0MiIgY3g9Ijc0LjkiIGN5PSI2OS4xIiByPSI0OS45Ii8+PGcgaWQ9Imc0OTE1Ij48cGF0aCBpZD0icGF0aDY4ODMtMi0zLTUtMi00LTktNC05IiBkPSJNNzQuOCAxMDYuNGMtMjAuNiAwLTM3LjQtMTYuNy0zNy40LTM3LjQgMC0yMC42IDE2LjctMzcuNCAzNy40LTM3LjQgMjAuNiAwIDM3LjQgMTYuNyAzNy40IDM3LjRzLTE2LjcgMzcuNC0zNy40IDM3LjQiIGZpbGw9IiNmZmYiLz48L2c+PC9nPjxwYXRoIGNsYXNzPSJzdDIiIGQ9Ik05NS45IDQ2LjZWNDloLTEwdi0yLjVsMTAgLjF6bS0yIDUuM2gtOHYyLjVoOHYtMi41em0tOCA3LjloNnYtMi41aC02djIuNXptNCAyLjloLTR2Mi41aDR2LTIuNXptLTQgNy44aDJWNjhoLTJ2Mi41em0xLjUgMTRjMCA2LjktNS41IDEyLjUtMTIuMyAxMi41cy0xMi4zLTUuNi0xMi4zLTEyLjVjMC00LjUgMi4zLTguNSA2LjEtMTAuN1Y0NS41YzAtMy41IDIuOC02LjMgNi4yLTYuM3M2LjIgMi44IDYuMiA2LjN2MjguM2MzLjggMi4yIDYuMSA2LjMgNi4xIDEwLjd6bS0yLjQgMGMwLTMuOC0yLjEtNy4yLTUuNC04LjlsLS43LS4zVjQ1LjVjMC0yLjEtMS43LTMuOC0zLjgtMy44LTIuMSAwLTMuOCAxLjctMy44IDMuOHYyOS44bC0uNy4zYy0zLjMgMS43LTUuNCA1LjEtNS40IDguOSAwIDUuNSA0LjQgMTAgOS45IDEwUzg1IDkwIDg1IDg0LjV6bS0yLjEgMGMwIDQuNC0zLjUgOC03LjggOHMtNy44LTMuNi03LjgtOGMwLTMuNiAyLjQtNi44IDUuOC03LjdsLjUtLjFWNjEuNWgzLjF2MTUuMmwuNS4xYzMuMyAxIDUuNyA0LjEgNS43IDcuN3ptLTcuNC01LjNjLS4yLS44LTEtMS40LTEuOS0xLjItMyAuNy01IDMuMy01IDYuNCAwIC45LjcgMS42IDEuNiAxLjZzMS42LS43IDEuNi0xLjZjMC0xLjYgMS4xLTMgMi42LTMuMy43LS4yIDEuMy0xIDEuMS0xLjl6Ii8+PC9zdmc+Cg=="
             ],
             "useMarkerImageFunction": true,
             "color": "#fe7569",
@@ -1093,8 +861,8 @@
             "markerImageSize": 34,
             "useColorFunction": false,
             "markerImages": [
-              "data:image/svg+xml;base64,PHN2ZyB2ZXJzaW9uPSIxLjEiIGlkPSJzdmc0NDA4IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHg9IjAiIHk9IjAiIHZpZXdCb3g9IjAgMCAxNTAgMTUwIiB4bWw6c3BhY2U9InByZXNlcnZlIj48c3R5bGU+LnN0MntmaWxsOiNmNDQzMzZ9PC9zdHlsZT48ZyBpZD0ibGF5ZXIxIj48ZyBpZD0icGF0aDY4ODEtMy01LTUtMS04LTQtNC03LTgiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0xNDYuNDM4IC0yNzYuMDI4KSIgb3BhY2l0eT0iLjg5MiI+PHJhZGlhbEdyYWRpZW50IGlkPSJTVkdJRF8xXyIgY3g9IjMwODUuMjE1IiBjeT0iMzE3OC40NTgiIHI9IjQ5LjkwMSIgZ3JhZGllbnRUcmFuc2Zvcm09Im1hdHJpeCguNjc5MyAuMDA3NiAtLjUwOSAuNTYxMiAtMjMyLjYyOSAtMTQxMS43MjUpIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+PHN0b3Agb2Zmc2V0PSIwIi8+PHN0b3Agb2Zmc2V0PSIxIiBzdG9wLW9wYWNpdHk9Ii4xODgiLz48L3JhZGlhbEdyYWRpZW50PjxwYXRoIGQ9Ik0yODUuNiAzODguNWMxMC4zLTEyLjQgNC40LTIyLjQtMTQuNC0yMi40LTE4LjkgMC00Mi40IDEwLTUzLjkgMjIuNC0xNi44IDE4IC40IDIzLjUtLjIgMzUtLjEgMS44IDMuOSAxLjggNyAwIDE5LjgtMTEuNSA0Ni41LTE3IDYxLjUtMzUiIGZpbGw9InVybCgjU1ZHSURfMV8pIi8+PC9nPjxwYXRoIGlkPSJwYXRoNjg4MS0zLTUtNS0xLTgtNC00IiBjbGFzcz0ic3QyIiBkPSJNMTI0LjcgNjkuMWMtLjktMjcuNS0yMi4zLTQ5LjgtNDkuOC00OS44cy00OSAyMi4zLTQ5LjggNDkuOGMtMS4zIDQwLjEgMzAuNyA1Mi4yIDQ0LjcgNzggMi4yIDQgOCA0IDEwLjEgMCAxNC4xLTI1LjggNDYuMS0zNy45IDQ0LjgtNzgiLz48L2c+PGcgaWQ9Imc0OTI4Ij48Y2lyY2xlIGlkPSJwYXRoNDk3OCIgY2xhc3M9InN0MiIgY3g9Ijc0LjkiIGN5PSI2OS4xIiByPSI0OS45Ii8+PGcgaWQ9Imc0OTE1Ij48cGF0aCBpZD0icGF0aDY4ODMtMi0zLTUtMi00LTktNC05IiBkPSJNNzQuOCAxMDYuNGMtMjAuNiAwLTM3LjQtMTYuNy0zNy40LTM3LjQgMC0yMC42IDE2LjctMzcuNCAzNy40LTM3LjQgMjAuNiAwIDM3LjQgMTYuNyAzNy40IDM3LjRzLTE2LjcgMzcuNC0zNy40IDM3LjQiIGZpbGw9IiNmZmYiLz48L2c+PC9nPjxwYXRoIGNsYXNzPSJzdDIiIGQ9Ik05NS45IDQ2LjZWNDloLTEwdi0yLjVsMTAgLjF6bS0yIDUuM2gtOHYyLjVoOHYtMi41em0tOCA3LjloNnYtMi41aC02djIuNXptNCAyLjloLTR2Mi41aDR2LTIuNXptLTQgNy44aDJWNjhoLTJ2Mi41em0xLjUgMTRjMCA2LjktNS41IDEyLjUtMTIuMyAxMi41cy0xMi4zLTUuNi0xMi4zLTEyLjVjMC00LjUgMi4zLTguNSA2LjEtMTAuN1Y0NS41YzAtMy41IDIuOC02LjMgNi4yLTYuM3M2LjIgMi44IDYuMiA2LjN2MjguM2MzLjggMi4yIDYuMSA2LjMgNi4xIDEwLjd6bS0yLjQgMGMwLTMuOC0yLjEtNy4yLTUuNC04LjlsLS43LS4zVjQ1LjVjMC0yLjEtMS43LTMuOC0zLjgtMy44LTIuMSAwLTMuOCAxLjctMy44IDMuOHYyOS44bC0uNy4zYy0zLjMgMS43LTUuNCA1LjEtNS40IDguOSAwIDUuNSA0LjQgMTAgOS45IDEwUzg1IDkwIDg1IDg0LjV6bS0yLjEgMGMwIDQuNC0zLjUgOC03LjggOHMtNy44LTMuNi03LjgtOGMwLTMuNiAyLjQtNi44IDUuOC03LjdsLjUtLjFWNjEuNWgzLjF2MTUuMmwuNS4xYzMuMyAxIDUuNyA0LjEgNS43IDcuN3ptLTcuNC01LjNjLS4yLS44LTEtMS40LTEuOS0xLjItMyAuNy01IDMuMy01IDYuNCAwIC45LjcgMS42IDEuNiAxLjZzMS42LS43IDEuNi0xLjZjMC0xLjYgMS4xLTMgMi42LTMuMy43LS4yIDEuMy0xIDEuMS0xLjl6Ii8+PC9zdmc+",
-              "data:image/svg+xml;base64,PHN2ZyB2ZXJzaW9uPSIxLjEiIGlkPSJzdmc0NDA4IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHg9IjAiIHk9IjAiIHZpZXdCb3g9IjAgMCAxNTAgMTUwIiB4bWw6c3BhY2U9InByZXNlcnZlIj48c3R5bGU+LnN0MntmaWxsOiMyNzg2MjJ9PC9zdHlsZT48ZyBpZD0ibGF5ZXIxIj48ZyBpZD0icGF0aDY4ODEtMy01LTUtMS04LTQtNC03LTgiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0xNDYuNDM4IC0yNzYuMDI4KSIgb3BhY2l0eT0iLjg5MiI+PHJhZGlhbEdyYWRpZW50IGlkPSJTVkdJRF8xXyIgY3g9IjMwODUuMjE1IiBjeT0iMzE3OC40NTgiIHI9IjQ5LjkwMSIgZ3JhZGllbnRUcmFuc2Zvcm09Im1hdHJpeCguNjc5MyAuMDA3NiAtLjUwOSAuNTYxMiAtMjMyLjYyOSAtMTQxMS43MjUpIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+PHN0b3Agb2Zmc2V0PSIwIi8+PHN0b3Agb2Zmc2V0PSIxIiBzdG9wLW9wYWNpdHk9Ii4xODgiLz48L3JhZGlhbEdyYWRpZW50PjxwYXRoIGQ9Ik0yODUuNiAzODguNWMxMC4zLTEyLjQgNC40LTIyLjQtMTQuNC0yMi40LTE4LjkgMC00Mi40IDEwLTUzLjkgMjIuNC0xNi44IDE4IC40IDIzLjUtLjIgMzUtLjEgMS44IDMuOSAxLjggNyAwIDE5LjgtMTEuNSA0Ni41LTE3IDYxLjUtMzUiIGZpbGw9InVybCgjU1ZHSURfMV8pIi8+PC9nPjxwYXRoIGlkPSJwYXRoNjg4MS0zLTUtNS0xLTgtNC00IiBjbGFzcz0ic3QyIiBkPSJNMTI0LjcgNjkuMWMtLjktMjcuNS0yMi4zLTQ5LjgtNDkuOC00OS44cy00OSAyMi4zLTQ5LjggNDkuOGMtMS4zIDQwLjEgMzAuNyA1Mi4yIDQ0LjcgNzggMi4yIDQgOCA0IDEwLjEgMCAxNC4xLTI1LjggNDYuMS0zNy45IDQ0LjgtNzgiLz48L2c+PGcgaWQ9Imc0OTI4Ij48Y2lyY2xlIGlkPSJwYXRoNDk3OCIgY2xhc3M9InN0MiIgY3g9Ijc0LjkiIGN5PSI2OS4xIiByPSI0OS45Ii8+PGcgaWQ9Imc0OTE1Ij48cGF0aCBpZD0icGF0aDY4ODMtMi0zLTUtMi00LTktNC05IiBkPSJNNzQuOCAxMDYuNGMtMjAuNiAwLTM3LjQtMTYuNy0zNy40LTM3LjQgMC0yMC42IDE2LjctMzcuNCAzNy40LTM3LjQgMjAuNiAwIDM3LjQgMTYuNyAzNy40IDM3LjRzLTE2LjcgMzcuNC0zNy40IDM3LjQiIGZpbGw9IiNmZmYiLz48L2c+PC9nPjxwYXRoIGNsYXNzPSJzdDIiIGQ9Ik05NS45IDQ2LjZWNDloLTEwdi0yLjVsMTAgLjF6bS0yIDUuM2gtOHYyLjVoOHYtMi41em0tOCA3LjloNnYtMi41aC02djIuNXptNCAyLjloLTR2Mi41aDR2LTIuNXptLTQgNy44aDJWNjhoLTJ2Mi41em0xLjUgMTRjMCA2LjktNS41IDEyLjUtMTIuMyAxMi41cy0xMi4zLTUuNi0xMi4zLTEyLjVjMC00LjUgMi4zLTguNSA2LjEtMTAuN1Y0NS41YzAtMy41IDIuOC02LjMgNi4yLTYuM3M2LjIgMi44IDYuMiA2LjN2MjguM2MzLjggMi4yIDYuMSA2LjMgNi4xIDEwLjd6bS0yLjQgMGMwLTMuOC0yLjEtNy4yLTUuNC04LjlsLS43LS4zVjQ1LjVjMC0yLjEtMS43LTMuOC0zLjgtMy44LTIuMSAwLTMuOCAxLjctMy44IDMuOHYyOS44bC0uNy4zYy0zLjMgMS43LTUuNCA1LjEtNS40IDguOSAwIDUuNSA0LjQgMTAgOS45IDEwUzg1IDkwIDg1IDg0LjV6bS0yLjEgMGMwIDQuNC0zLjUgOC03LjggOHMtNy44LTMuNi03LjgtOGMwLTMuNiAyLjQtNi44IDUuOC03LjdsLjUtLjFWNjEuNWgzLjF2MTUuMmwuNS4xYzMuMyAxIDUuNyA0LjEgNS43IDcuN3ptLTcuNC01LjNjLS4yLS44LTEtMS40LTEuOS0xLjItMyAuNy01IDMuMy01IDYuNCAwIC45LjcgMS42IDEuNiAxLjZzMS42LS43IDEuNi0xLjZjMC0xLjYgMS4xLTMgMi42LTMuMy43LS4yIDEuMy0xIDEuMS0xLjl6Ii8+PC9zdmc+Cg=="
+              "tb-image:dGhlcm1vc3RhdHNfZGFzaGJvYXJkX3dpZGdldF90aGVybW9zdGF0X21hcHNfbWFya2VyX2ltYWdlXzAuc3Zn:IlRoZXJtb3N0YXRzIiBkYXNoYm9hcmQgd2lkZ2V0ICJUaGVybW9zdGF0IG1hcHMiIG1hcmtlciBpbWFnZSAw;data:image/svg+xml;base64,PHN2ZyB2ZXJzaW9uPSIxLjEiIGlkPSJzdmc0NDA4IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHg9IjAiIHk9IjAiIHZpZXdCb3g9IjAgMCAxNTAgMTUwIiB4bWw6c3BhY2U9InByZXNlcnZlIj48c3R5bGU+LnN0MntmaWxsOiNmNDQzMzZ9PC9zdHlsZT48ZyBpZD0ibGF5ZXIxIj48ZyBpZD0icGF0aDY4ODEtMy01LTUtMS04LTQtNC03LTgiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0xNDYuNDM4IC0yNzYuMDI4KSIgb3BhY2l0eT0iLjg5MiI+PHJhZGlhbEdyYWRpZW50IGlkPSJTVkdJRF8xXyIgY3g9IjMwODUuMjE1IiBjeT0iMzE3OC40NTgiIHI9IjQ5LjkwMSIgZ3JhZGllbnRUcmFuc2Zvcm09Im1hdHJpeCguNjc5MyAuMDA3NiAtLjUwOSAuNTYxMiAtMjMyLjYyOSAtMTQxMS43MjUpIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+PHN0b3Agb2Zmc2V0PSIwIi8+PHN0b3Agb2Zmc2V0PSIxIiBzdG9wLW9wYWNpdHk9Ii4xODgiLz48L3JhZGlhbEdyYWRpZW50PjxwYXRoIGQ9Ik0yODUuNiAzODguNWMxMC4zLTEyLjQgNC40LTIyLjQtMTQuNC0yMi40LTE4LjkgMC00Mi40IDEwLTUzLjkgMjIuNC0xNi44IDE4IC40IDIzLjUtLjIgMzUtLjEgMS44IDMuOSAxLjggNyAwIDE5LjgtMTEuNSA0Ni41LTE3IDYxLjUtMzUiIGZpbGw9InVybCgjU1ZHSURfMV8pIi8+PC9nPjxwYXRoIGlkPSJwYXRoNjg4MS0zLTUtNS0xLTgtNC00IiBjbGFzcz0ic3QyIiBkPSJNMTI0LjcgNjkuMWMtLjktMjcuNS0yMi4zLTQ5LjgtNDkuOC00OS44cy00OSAyMi4zLTQ5LjggNDkuOGMtMS4zIDQwLjEgMzAuNyA1Mi4yIDQ0LjcgNzggMi4yIDQgOCA0IDEwLjEgMCAxNC4xLTI1LjggNDYuMS0zNy45IDQ0LjgtNzgiLz48L2c+PGcgaWQ9Imc0OTI4Ij48Y2lyY2xlIGlkPSJwYXRoNDk3OCIgY2xhc3M9InN0MiIgY3g9Ijc0LjkiIGN5PSI2OS4xIiByPSI0OS45Ii8+PGcgaWQ9Imc0OTE1Ij48cGF0aCBpZD0icGF0aDY4ODMtMi0zLTUtMi00LTktNC05IiBkPSJNNzQuOCAxMDYuNGMtMjAuNiAwLTM3LjQtMTYuNy0zNy40LTM3LjQgMC0yMC42IDE2LjctMzcuNCAzNy40LTM3LjQgMjAuNiAwIDM3LjQgMTYuNyAzNy40IDM3LjRzLTE2LjcgMzcuNC0zNy40IDM3LjQiIGZpbGw9IiNmZmYiLz48L2c+PC9nPjxwYXRoIGNsYXNzPSJzdDIiIGQ9Ik05NS45IDQ2LjZWNDloLTEwdi0yLjVsMTAgLjF6bS0yIDUuM2gtOHYyLjVoOHYtMi41em0tOCA3LjloNnYtMi41aC02djIuNXptNCAyLjloLTR2Mi41aDR2LTIuNXptLTQgNy44aDJWNjhoLTJ2Mi41em0xLjUgMTRjMCA2LjktNS41IDEyLjUtMTIuMyAxMi41cy0xMi4zLTUuNi0xMi4zLTEyLjVjMC00LjUgMi4zLTguNSA2LjEtMTAuN1Y0NS41YzAtMy41IDIuOC02LjMgNi4yLTYuM3M2LjIgMi44IDYuMiA2LjN2MjguM2MzLjggMi4yIDYuMSA2LjMgNi4xIDEwLjd6bS0yLjQgMGMwLTMuOC0yLjEtNy4yLTUuNC04LjlsLS43LS4zVjQ1LjVjMC0yLjEtMS43LTMuOC0zLjgtMy44LTIuMSAwLTMuOCAxLjctMy44IDMuOHYyOS44bC0uNy4zYy0zLjMgMS43LTUuNCA1LjEtNS40IDguOSAwIDUuNSA0LjQgMTAgOS45IDEwUzg1IDkwIDg1IDg0LjV6bS0yLjEgMGMwIDQuNC0zLjUgOC03LjggOHMtNy44LTMuNi03LjgtOGMwLTMuNiAyLjQtNi44IDUuOC03LjdsLjUtLjFWNjEuNWgzLjF2MTUuMmwuNS4xYzMuMyAxIDUuNyA0LjEgNS43IDcuN3ptLTcuNC01LjNjLS4yLS44LTEtMS40LTEuOS0xLjItMyAuNy01IDMuMy01IDYuNCAwIC45LjcgMS42IDEuNiAxLjZzMS42LS43IDEuNi0xLjZjMC0xLjYgMS4xLTMgMi42LTMuMy43LS4yIDEuMy0xIDEuMS0xLjl6Ii8+PC9zdmc+",
+              "tb-image:dGhlcm1vc3RhdHNfZGFzaGJvYXJkX3dpZGdldF90aGVybW9zdGF0X21hcHNfbWFya2VyX2ltYWdlXzEuc3Zn:IlRoZXJtb3N0YXRzIiBkYXNoYm9hcmQgd2lkZ2V0ICJUaGVybW9zdGF0IG1hcHMiIG1hcmtlciBpbWFnZSAx;data:image/svg+xml;base64,PHN2ZyB2ZXJzaW9uPSIxLjEiIGlkPSJzdmc0NDA4IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHg9IjAiIHk9IjAiIHZpZXdCb3g9IjAgMCAxNTAgMTUwIiB4bWw6c3BhY2U9InByZXNlcnZlIj48c3R5bGU+LnN0MntmaWxsOiMyNzg2MjJ9PC9zdHlsZT48ZyBpZD0ibGF5ZXIxIj48ZyBpZD0icGF0aDY4ODEtMy01LTUtMS04LTQtNC03LTgiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0xNDYuNDM4IC0yNzYuMDI4KSIgb3BhY2l0eT0iLjg5MiI+PHJhZGlhbEdyYWRpZW50IGlkPSJTVkdJRF8xXyIgY3g9IjMwODUuMjE1IiBjeT0iMzE3OC40NTgiIHI9IjQ5LjkwMSIgZ3JhZGllbnRUcmFuc2Zvcm09Im1hdHJpeCguNjc5MyAuMDA3NiAtLjUwOSAuNTYxMiAtMjMyLjYyOSAtMTQxMS43MjUpIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+PHN0b3Agb2Zmc2V0PSIwIi8+PHN0b3Agb2Zmc2V0PSIxIiBzdG9wLW9wYWNpdHk9Ii4xODgiLz48L3JhZGlhbEdyYWRpZW50PjxwYXRoIGQ9Ik0yODUuNiAzODguNWMxMC4zLTEyLjQgNC40LTIyLjQtMTQuNC0yMi40LTE4LjkgMC00Mi40IDEwLTUzLjkgMjIuNC0xNi44IDE4IC40IDIzLjUtLjIgMzUtLjEgMS44IDMuOSAxLjggNyAwIDE5LjgtMTEuNSA0Ni41LTE3IDYxLjUtMzUiIGZpbGw9InVybCgjU1ZHSURfMV8pIi8+PC9nPjxwYXRoIGlkPSJwYXRoNjg4MS0zLTUtNS0xLTgtNC00IiBjbGFzcz0ic3QyIiBkPSJNMTI0LjcgNjkuMWMtLjktMjcuNS0yMi4zLTQ5LjgtNDkuOC00OS44cy00OSAyMi4zLTQ5LjggNDkuOGMtMS4zIDQwLjEgMzAuNyA1Mi4yIDQ0LjcgNzggMi4yIDQgOCA0IDEwLjEgMCAxNC4xLTI1LjggNDYuMS0zNy45IDQ0LjgtNzgiLz48L2c+PGcgaWQ9Imc0OTI4Ij48Y2lyY2xlIGlkPSJwYXRoNDk3OCIgY2xhc3M9InN0MiIgY3g9Ijc0LjkiIGN5PSI2OS4xIiByPSI0OS45Ii8+PGcgaWQ9Imc0OTE1Ij48cGF0aCBpZD0icGF0aDY4ODMtMi0zLTUtMi00LTktNC05IiBkPSJNNzQuOCAxMDYuNGMtMjAuNiAwLTM3LjQtMTYuNy0zNy40LTM3LjQgMC0yMC42IDE2LjctMzcuNCAzNy40LTM3LjQgMjAuNiAwIDM3LjQgMTYuNyAzNy40IDM3LjRzLTE2LjcgMzcuNC0zNy40IDM3LjQiIGZpbGw9IiNmZmYiLz48L2c+PC9nPjxwYXRoIGNsYXNzPSJzdDIiIGQ9Ik05NS45IDQ2LjZWNDloLTEwdi0yLjVsMTAgLjF6bS0yIDUuM2gtOHYyLjVoOHYtMi41em0tOCA3LjloNnYtMi41aC02djIuNXptNCAyLjloLTR2Mi41aDR2LTIuNXptLTQgNy44aDJWNjhoLTJ2Mi41em0xLjUgMTRjMCA2LjktNS41IDEyLjUtMTIuMyAxMi41cy0xMi4zLTUuNi0xMi4zLTEyLjVjMC00LjUgMi4zLTguNSA2LjEtMTAuN1Y0NS41YzAtMy41IDIuOC02LjMgNi4yLTYuM3M2LjIgMi44IDYuMiA2LjN2MjguM2MzLjggMi4yIDYuMSA2LjMgNi4xIDEwLjd6bS0yLjQgMGMwLTMuOC0yLjEtNy4yLTUuNC04LjlsLS43LS4zVjQ1LjVjMC0yLjEtMS43LTMuOC0zLjgtMy44LTIuMSAwLTMuOCAxLjctMy44IDMuOHYyOS44bC0uNy4zYy0zLjMgMS43LTUuNCA1LjEtNS40IDguOSAwIDUuNSA0LjQgMTAgOS45IDEwUzg1IDkwIDg1IDg0LjV6bS0yLjEgMGMwIDQuNC0zLjUgOC03LjggOHMtNy44LTMuNi03LjgtOGMwLTMuNiAyLjQtNi44IDUuOC03LjdsLjUtLjFWNjEuNWgzLjF2MTUuMmwuNS4xYzMuMyAxIDUuNyA0LjEgNS43IDcuN3ptLTcuNC01LjNjLS4yLS44LTEtMS40LTEuOS0xLjItMyAuNy01IDMuMy01IDYuNCAwIC45LjcgMS42IDEuNiAxLjZzMS42LS43IDEuNi0xLjZjMC0xLjYgMS4xLTMgMi42LTMuMy43LS4yIDEuMy0xIDEuMS0xLjl6Ii8+PC9zdmc+Cg=="
             ],
             "useMarkerImageFunction": true,
             "color": "#fe7569",
@@ -1151,6 +919,792 @@
         },
         "id": "0a430429-9078-9ae6-2b67-e4a15a2bf8bf",
         "typeFullFqn": "system.input_widgets.markers_placement_openstreetmap"
+      },
+      "eda8a397-0959-690c-405c-11e2c9b2bc7e": {
+        "typeFullFqn": "system.time_series_chart",
+        "type": "timeseries",
+        "sizeX": 8,
+        "sizeY": 5,
+        "config": {
+          "datasources": [
+            {
+              "type": "entity",
+              "name": "",
+              "entityAliasId": "12ae98c7-1ea2-52cf-64d5-763e9d993547",
+              "dataKeys": [
+                {
+                  "name": "temperature",
+                  "type": "timeseries",
+                  "label": "Temperature",
+                  "color": "#EF5350",
+                  "settings": {
+                    "yAxisId": "default",
+                    "showInLegend": true,
+                    "dataHiddenByDefault": false,
+                    "type": "line",
+                    "lineSettings": {
+                      "showLine": true,
+                      "step": false,
+                      "stepType": "start",
+                      "smooth": true,
+                      "lineType": "solid",
+                      "lineWidth": 2.5,
+                      "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)",
+                      "pointShape": "circle",
+                      "pointSize": 14,
+                      "fillAreaSettings": {
+                        "type": "gradient",
+                        "opacity": 0.4,
+                        "gradient": {
+                          "start": 60,
+                          "end": 10
+                        }
+                      }
+                    },
+                    "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)",
+                      "backgroundSettings": {
+                        "type": "none",
+                        "opacity": 0.4,
+                        "gradient": {
+                          "start": 100,
+                          "end": 0
+                        }
+                      }
+                    }
+                  },
+                  "_hash": 0.5973804076994531,
+                  "units": "°C",
+                  "decimals": 1,
+                  "aggregationType": null,
+                  "funcBody": null,
+                  "usePostProcessing": null,
+                  "postFuncBody": null
+                }
+              ],
+              "alarmFilterConfig": {
+                "statusList": [
+                  "ACTIVE"
+                ]
+              },
+              "latestDataKeys": [
+                {
+                  "name": "temperatureAlarmThreshold",
+                  "type": "attribute",
+                  "label": "temperatureAlarmThreshold",
+                  "color": "#4caf50",
+                  "settings": {
+                    "__thresholdKey": true
+                  },
+                  "_hash": 0.7120450032526351
+                }
+              ]
+            }
+          ],
+          "timewindow": {
+            "hideInterval": false,
+            "hideLastInterval": false,
+            "hideQuickInterval": false,
+            "hideAggregation": false,
+            "hideAggInterval": false,
+            "hideTimezone": false,
+            "selectedTab": 0,
+            "realtime": {
+              "realtimeType": 0,
+              "timewindowMs": 3600000,
+              "quickInterval": "CURRENT_DAY",
+              "interval": 30000
+            },
+            "aggregation": {
+              "type": "AVG",
+              "limit": 25000
+            },
+            "timezone": null
+          },
+          "showTitle": true,
+          "backgroundColor": "rgba(0, 0, 0, 0)",
+          "color": "rgba(0, 0, 0, 0.87)",
+          "padding": "0px",
+          "settings": {
+            "showLegend": true,
+            "legendConfig": {
+              "direction": "column",
+              "position": "bottom",
+              "sortDataKeys": false,
+              "showMin": true,
+              "showMax": true,
+              "showAvg": true,
+              "showTotal": false,
+              "showLatest": false
+            },
+            "thresholds": [
+              {
+                "type": "latestKey",
+                "yAxisId": "default",
+                "units": "°C",
+                "decimals": 0,
+                "lineColor": "rgb(233, 30, 99)",
+                "lineType": "solid",
+                "lineWidth": 2,
+                "startSymbol": "none",
+                "startSymbolSize": 5,
+                "endSymbol": "arrow",
+                "endSymbolSize": 8,
+                "showLabel": true,
+                "labelPosition": "end",
+                "labelFont": {
+                  "size": 14,
+                  "family": "Roboto",
+                  "weight": "500",
+                  "style": "normal"
+                },
+                "labelColor": "rgb(233, 30, 99)",
+                "latestKey": "temperatureAlarmThreshold",
+                "latestKeyType": "attribute"
+              }
+            ],
+            "dataZoom": true,
+            "stack": false,
+            "yAxis": {
+              "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)",
+              "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)"
+            },
+            "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)",
+              "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)",
+              "ticksFormat": {}
+            },
+            "legendLabelFont": {
+              "family": "Roboto",
+              "size": 12,
+              "sizeUnit": "px",
+              "style": "normal",
+              "weight": "400",
+              "lineHeight": "16px"
+            },
+            "legendLabelColor": "rgba(0, 0, 0, 0.76)",
+            "showTooltip": true,
+            "tooltipTrigger": "axis",
+            "tooltipValueFont": {
+              "family": "Roboto",
+              "size": 12,
+              "sizeUnit": "px",
+              "style": "normal",
+              "weight": "500",
+              "lineHeight": "16px"
+            },
+            "tooltipValueColor": "rgba(0, 0, 0, 0.76)",
+            "tooltipShowDate": true,
+            "tooltipDateFormat": {
+              "format": "MMM dd yyyy HH:mm",
+              "lastUpdateAgo": false,
+              "custom": false,
+              "auto": true,
+              "autoDateFormatSettings": {}
+            },
+            "tooltipDateFont": {
+              "family": "Roboto",
+              "size": 11,
+              "sizeUnit": "px",
+              "style": "normal",
+              "weight": "400",
+              "lineHeight": "16px"
+            },
+            "tooltipDateColor": "rgba(0, 0, 0, 0.76)",
+            "tooltipDateInterval": false,
+            "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
+              }
+            },
+            "yAxes": {
+              "default": {
+                "units": "°C",
+                "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": null,
+                "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,
+                "min": 0
+              }
+            },
+            "noAggregationBarWidthSettings": {
+              "strategy": "group",
+              "groupWidth": {
+                "relative": true,
+                "relativeWidth": 2,
+                "absoluteWidth": 1000
+              },
+              "barWidth": {
+                "relative": true,
+                "relativeWidth": 2,
+                "absoluteWidth": 1000
+              }
+            },
+            "animation": {
+              "animation": true,
+              "animationThreshold": 2000,
+              "animationDuration": 500,
+              "animationEasing": "cubicOut",
+              "animationDelay": 0,
+              "animationDurationUpdate": 300,
+              "animationEasingUpdate": "cubicOut",
+              "animationDelayUpdate": 0
+            },
+            "padding": "12px"
+          },
+          "title": "Temperature",
+          "dropShadow": true,
+          "enableFullscreen": true,
+          "titleStyle": 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"
+        },
+        "row": 0,
+        "col": 0,
+        "id": "eda8a397-0959-690c-405c-11e2c9b2bc7e"
+      },
+      "ac90f089-197f-b767-82c3-2668844265a2": {
+        "typeFullFqn": "system.time_series_chart",
+        "type": "timeseries",
+        "sizeX": 8,
+        "sizeY": 5,
+        "config": {
+          "datasources": [
+            {
+              "type": "entity",
+              "name": "",
+              "entityAliasId": "12ae98c7-1ea2-52cf-64d5-763e9d993547",
+              "dataKeys": [
+                {
+                  "name": "humidity",
+                  "type": "timeseries",
+                  "label": "Humidity",
+                  "color": "#2196F3",
+                  "settings": {
+                    "yAxisId": "default",
+                    "showInLegend": true,
+                    "dataHiddenByDefault": false,
+                    "type": "line",
+                    "lineSettings": {
+                      "showLine": true,
+                      "step": false,
+                      "stepType": "start",
+                      "smooth": true,
+                      "lineType": "solid",
+                      "lineWidth": 2.5,
+                      "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)",
+                      "pointShape": "circle",
+                      "pointSize": 14,
+                      "fillAreaSettings": {
+                        "type": "gradient",
+                        "opacity": 0.4,
+                        "gradient": {
+                          "start": 60,
+                          "end": 10
+                        }
+                      }
+                    },
+                    "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)",
+                      "backgroundSettings": {
+                        "type": "none",
+                        "opacity": 0.4,
+                        "gradient": {
+                          "start": 100,
+                          "end": 0
+                        }
+                      }
+                    }
+                  },
+                  "_hash": 0.4481337125330429,
+                  "units": "%",
+                  "decimals": 0,
+                  "aggregationType": null,
+                  "funcBody": null,
+                  "usePostProcessing": null,
+                  "postFuncBody": null
+                }
+              ],
+              "alarmFilterConfig": {
+                "statusList": [
+                  "ACTIVE"
+                ]
+              },
+              "latestDataKeys": [
+                {
+                  "name": "humidityAlarmThreshold",
+                  "type": "attribute",
+                  "label": "humidityAlarmThreshold",
+                  "color": "#4caf50",
+                  "settings": {
+                    "__thresholdKey": true
+                  },
+                  "_hash": 0.134733085341747
+                }
+              ]
+            }
+          ],
+          "timewindow": {
+            "hideInterval": false,
+            "hideLastInterval": false,
+            "hideQuickInterval": false,
+            "hideAggregation": false,
+            "hideAggInterval": false,
+            "hideTimezone": false,
+            "selectedTab": 0,
+            "realtime": {
+              "realtimeType": 0,
+              "timewindowMs": 3600000,
+              "quickInterval": "CURRENT_DAY",
+              "interval": 30000
+            },
+            "aggregation": {
+              "type": "AVG",
+              "limit": 25000
+            },
+            "timezone": null
+          },
+          "showTitle": true,
+          "backgroundColor": "rgba(0, 0, 0, 0)",
+          "color": "rgba(0, 0, 0, 0.87)",
+          "padding": "0px",
+          "settings": {
+            "showLegend": true,
+            "legendConfig": {
+              "direction": "column",
+              "position": "bottom",
+              "sortDataKeys": false,
+              "showMin": true,
+              "showMax": true,
+              "showAvg": true,
+              "showTotal": false,
+              "showLatest": false
+            },
+            "thresholds": [
+              {
+                "type": "latestKey",
+                "yAxisId": "default",
+                "units": "%",
+                "decimals": 0,
+                "lineColor": "rgb(4, 138, 211)",
+                "lineType": "solid",
+                "lineWidth": 2,
+                "startSymbol": "none",
+                "startSymbolSize": 5,
+                "endSymbol": "arrow",
+                "endSymbolSize": 8,
+                "showLabel": true,
+                "labelPosition": "end",
+                "labelFont": {
+                  "size": 14,
+                  "family": "Roboto",
+                  "weight": "500",
+                  "style": "normal"
+                },
+                "labelColor": "rgb(4, 138, 211)",
+                "latestKey": "humidityAlarmThreshold",
+                "latestKeyType": "attribute"
+              }
+            ],
+            "dataZoom": true,
+            "stack": false,
+            "yAxis": {
+              "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)",
+              "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)"
+            },
+            "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)",
+              "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)",
+              "ticksFormat": {}
+            },
+            "legendLabelFont": {
+              "family": "Roboto",
+              "size": 12,
+              "sizeUnit": "px",
+              "style": "normal",
+              "weight": "400",
+              "lineHeight": "16px"
+            },
+            "legendLabelColor": "rgba(0, 0, 0, 0.76)",
+            "showTooltip": true,
+            "tooltipTrigger": "axis",
+            "tooltipValueFont": {
+              "family": "Roboto",
+              "size": 12,
+              "sizeUnit": "px",
+              "style": "normal",
+              "weight": "500",
+              "lineHeight": "16px"
+            },
+            "tooltipValueColor": "rgba(0, 0, 0, 0.76)",
+            "tooltipShowDate": true,
+            "tooltipDateFormat": {
+              "format": null,
+              "lastUpdateAgo": false,
+              "custom": false,
+              "auto": true,
+              "autoDateFormatSettings": {}
+            },
+            "tooltipDateFont": {
+              "family": "Roboto",
+              "size": 11,
+              "sizeUnit": "px",
+              "style": "normal",
+              "weight": "400",
+              "lineHeight": "16px"
+            },
+            "tooltipDateColor": "rgba(0, 0, 0, 0.76)",
+            "tooltipDateInterval": false,
+            "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
+              }
+            },
+            "yAxes": {
+              "default": {
+                "units": "°C",
+                "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": null,
+                "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,
+                "min": 0
+              }
+            },
+            "noAggregationBarWidthSettings": {
+              "strategy": "group",
+              "groupWidth": {
+                "relative": true,
+                "relativeWidth": 2,
+                "absoluteWidth": 1000
+              },
+              "barWidth": {
+                "relative": true,
+                "relativeWidth": 2,
+                "absoluteWidth": 1000
+              }
+            },
+            "animation": {
+              "animation": true,
+              "animationThreshold": 2000,
+              "animationDuration": 500,
+              "animationEasing": "cubicOut",
+              "animationDelay": 0,
+              "animationDurationUpdate": 300,
+              "animationEasingUpdate": "cubicOut",
+              "animationDelayUpdate": 0
+            },
+            "padding": "12px"
+          },
+          "title": "Humidity",
+          "dropShadow": true,
+          "enableFullscreen": true,
+          "titleStyle": 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"
+        },
+        "row": 0,
+        "col": 0,
+        "id": "ac90f089-197f-b767-82c3-2668844265a2"
       }
     },
     "states": {
@@ -1164,19 +1718,25 @@
                 "sizeX": 11,
                 "sizeY": 11,
                 "row": 0,
-                "col": 0
+                "col": 0,
+                "mobileOrder": 1,
+                "mobileHeight": 5
               },
               "7943196b-eedb-d422-f9c3-b32d379ad172": {
                 "sizeX": 13,
                 "sizeY": 5,
                 "row": 0,
-                "col": 11
+                "col": 11,
+                "mobileOrder": 2,
+                "mobileHeight": 5
               },
               "3da9a9a1-0b9a-2e1f-0dcb-0ff34a695abb": {
                 "sizeX": 13,
                 "sizeY": 6,
                 "row": 5,
-                "col": 11
+                "col": 11,
+                "mobileOrder": 3,
+                "mobileHeight": 5
               }
             },
             "gridSettings": {
@@ -1226,31 +1786,37 @@
         "layouts": {
           "main": {
             "widgets": {
-              "14a19183-f0b2-d6be-0f62-9863f0a51111": {
-                "sizeX": 18,
+              "c4631f94-2db3-523b-4d09-2a1a0a75d93f": {
+                "sizeX": 6,
                 "sizeY": 6,
-                "mobileHeight": null,
                 "row": 0,
-                "col": 6
+                "col": 0,
+                "mobileOrder": 3,
+                "mobileHeight": 5
               },
-              "07f49fd5-a73b-d74c-c220-362c20af81f4": {
-                "sizeX": 18,
+              "0a430429-9078-9ae6-2b67-e4a15a2bf8bf": {
+                "sizeX": 6,
                 "sizeY": 6,
-                "mobileHeight": null,
                 "row": 6,
-                "col": 6
+                "col": 0,
+                "mobileOrder": 4,
+                "mobileHeight": 6
               },
-              "c4631f94-2db3-523b-4d09-2a1a0a75d93f": {
-                "sizeX": 6,
+              "eda8a397-0959-690c-405c-11e2c9b2bc7e": {
+                "sizeX": 18,
                 "sizeY": 6,
                 "row": 0,
-                "col": 0
+                "col": 6,
+                "mobileOrder": 1,
+                "mobileHeight": 6
               },
-              "0a430429-9078-9ae6-2b67-e4a15a2bf8bf": {
-                "sizeX": 6,
+              "ac90f089-197f-b767-82c3-2668844265a2": {
+                "sizeX": 18,
                 "sizeY": 6,
                 "row": 6,
-                "col": 0
+                "col": 6,
+                "mobileOrder": 2,
+                "mobileHeight": 6
               }
             },
             "gridSettings": {
@@ -1327,6 +1893,5 @@
     },
     "filters": {}
   },
-  "externalId": null,
   "name": "Thermostats"
 }
\ No newline at end of file
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 07929028ff..2e01cf6963 100644
--- a/application/src/main/data/json/system/widget_bundles/charts.json
+++ b/application/src/main/data/json/system/widget_bundles/charts.json
@@ -2,25 +2,34 @@
   "widgetsBundle": {
     "alias": "charts",
     "title": "Charts",
-    "image": "tb-image:Y2hhcnRzX3N5c3RlbV9idW5kbGVfaW1hZ2UucG5n:IkNoYXJ0cyIgc3lzdGVtIGJ1bmRsZSBpbWFnZQ==;data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAACgCAMAAAB+IdObAAAC91BMVEX////K5vz/wQchlvP0QzZgfYtMr1C20ujl5eUAAADi4uL/ySX9/v7/9+Dg4OA8o/TK2eT+6Ob1Wk7q9f7x8fHw8PHy8/L5+vn09PTT2t/p6ekznvRfs/b+wxHLy8v8/Pz/6KL///3+8/JRsVX6+/vq9uqTw+rn5+diuWVNq/bk5OTY2NjNzc2+vr6lzqfqop3u1Yr/wgzD4/w2oPSs2Pv4+Pnj4+S83/v8xBj/wgr0+v5itfdGqPX/1lv29vZUrvXHx8fH5fx2vvgunPTO5OvQ4+Oryd35xSG23fuRy/qAw/n39/jt7e3U4NK3t7eqqqprufdasfY/pPXL5PHu7u7r6+vf3t3/8srW3sjCwsK6urqxsbGw2vum1fuGxvn//fj/+urtzVf3/P/i8v6g0vvL5vqa0PqMyfns7Ozm5ubl1IL/333p0nLtz1/zyj/7/f/S6v17wfjM5fR4uevS0tJtiJX/3HLq0Wrxy0b1yTj/zDD/xhn9/v/u9/7/+PgpmvT//PPS4dj8w77/663c2qnm03yXzvpwu/dmt/fv7+/m6+2uz+ra4eX93tzV1dX/7LOurq6tra3g15j/4of/2WfvzFH1V0v/0kj0STz3yDH5xyjZ7f2gyerR4t7/9tzb3Nv/9dT61tPY3b/Z3Lrb27KMoavf2J92j5v/5JPrz2P2ZFn/xx++4fvr7/Dg6Ou+ztD8zcquvcT/8MKarbakpKSCmqT5n5iTz5Zmgo/5kIn3cWfpx0z1T0P/zz7U6/3P4+bO3ObO19vF0tq80dm6x82jtLz/7rni1YyJy4zc7/3O6Pz+7uz94d/Y7tm437qx3LPIz7P6sauo1ar/5pv6opuRkZHi1o97xH7aynr4gHdpvGzhymZbtl7zxC36wRC30ui30uTM1Njz69TM6M3F5cbC5MPDz7/p3bt/q52huI64wIf4gXjfzG67umTVvUDk8+Tm5N3a185yss2TwMjCz8T7ta/7s610qaWOr5PSy5H4hn33fnX3eG83NCs7AAAOvklEQVR42tzaSYyLYRzH8Z9SaV6P19a+7+u1VKmUWhJLK7baDpY2StKZCSNmwsFMHJDgYM84WGIZIUgkloMQYt8FsUessUWIiy0ODk4ccDDzvG2fvn3eeVvK+758LxKHJ/30eZ63/+kM/p+ICGVhHA5r9Gj0m7wQv1LlHiRrt8BZSae7kiSS+IWk55WhLXAWRIY4uW/fLaiHTFBsZdO9k5OOgRApJAiCCqm+78LTNZVQwoIQTcgoIlJfL/abPBpEEPYIf6kwiioeEqMpGbToQpLqGknjasWoj6D4BNhYUBVDMpqK+MSw8i9A4kLB1+kvExPE4ZBYOORHEUmiShwMkbmXZ0ZZ51QIUcUg8lPWb4hh2TAYlBDjjoTEREnvOnrs1JlFbre7Izo0b96p95qJQ5ZDlz+sOhCSEAhYwWunGgw0Ckk3YmazZfrzJTsM4hdSYB29pSkYhDVo0q5csCg5CiKLEWTbsN/NYhDW8LvIRjwJB0EiYpDtRobBQ1hTryCbqv5VyKpufKthnCISpIvfYgADCGssu/gpz9+EtHbxtYJhceboeMBtDmF1moBMXo8jIHLWQU5wCAbhGzsruyeqAyDBcj+0lP1uMwhf79lIV1ZjO4RkPwmOHHCbQ/gGZe+8R7Ib4lGgtX6RuxCEb9yY7PsRtBfiVZmjMIRvZbPsTbMVIovcuTKF8I2bz94SGyGZAxE84y4Owjcoc+PDEfsgUhm0TrmLhfD1ngWaX7QNQjKfIDfdxUP4xkKrxmcXJKSkL/r5kiDNh0BLJPZAiJj+94y7NEin5eyk2gFRFdCOuUuA0BY0uSVXO/ONLR1iuCGxRSVA0s0HzZuA1rTInul0+bbN+dr8YUiZBNoJd+mQztASQSt/LiWRtAoighZfVAIkW7Pc0xqsnC7Vo94iSCTENqR0yPDM9yp0Qyqfd7VuR2plNEYWlQJhzdZd900Nd6QcRBBuGM0Cwq/00QAyXhDC+SfrmvvPQOaAts4HliU7Ele5b35KgXSeARqJWg1RY0hHNtw6UBJk5fDBy9lGWw0RQVtVrQ0pJ8zHeFPFMO7qWQkRQOvmWtKNs/CQQgqWlLASwh6+I+n/P9UsR26e+QXIuClMwSJRayFeH2itXFqHD7bmLGaQTmOHzAMtRKBLtBaiRrQr4mIt3do6oFn2F4CMGNxhHpt0FOgSfhsS6G5QIYhA0FiFi8Ysu6lFub7/fFOQUUP0ByqmQleU/C6kXQu+9gUg7K7n12XuXmqJpS16yKgJwwpcCqgxOyBbXQYNWKxZ4m9Onc+FrB04CwD87849MPnZKSXZAVnsMm7otopA+hdX5zXIlGZUEXx37nXLlg9NID6vHZBtrqbbVlGlWdZj2Hx6ueX3dxoUDZ0zgUgpOyAjXaaNPFmFTPKHOz2oogBEqXEgpKEdt1c1Kh6+oIp0d0wgcdWZEJerNQDygikK7UjCaXck3UGgbgXkHrmQJ2Z3ZJ0dkLmFj1YAG3deAB7kQj6YQNZJdkAOFnJ0WYUVh1q0qAP650B6mkASiqUQEbTNhSAVwIWG9S61A3mVdbxCTsFa6ArJlkI8fjS2t4BjLlBHF7wYgJSFPOI/N1gCLIXUKNrA2cXUsSSAdpe0FZ8B79OOHhJy8sjQJVoJYQ/Jy6aQavgvZpY8DtwxeGZBhK0Qf5gbtvg2A2ezS27vDj8dUHrptkD2QJccshLC3rjbZgMKsK8F6yXwufFgPTCZ2oGEZDEkrN32qqYvyeEqdG+fu+hX4BGdfM1OlkCA2OnToX7TR1sD8fkKDSm7ge+6RXduBHnxiPstJA+TUn02JZG0AsIuyWaT0eRxC32HVsAPfSIB+K/GlUqyBfVWQNhLqFpqMprkL3sBeUkq9IUiAOTTHimpbgHxeq8bQbzGbTSAbPe+NYJ4vRIypbzcuMWNJlx10EXKidHDN9a3r6D0jYP4fIYQn3H7jCA+Q4jP50UmIoBW3cVkNNGljSq5qRL0KWVgWXS0EPU3Pcov1kYTvosBsGJh5BUO2gBRVG5LuNGE7xn/9wasoAAbIBBJU7ekGoH0aMK3jzkiyKs2bgOEfQasasWPJs+MDJlRRSss8X88DDsgbEtOmowmfC9B8/iQXyhmE0QJQWsxP5qY9AUAiXqRnyzAJgiiMmhVl/WjySdjARtVEFXAJcjFQnr24HtVCiQoQmv3UpPRhMVGFQIuSUXRkJZ8vUqBoMwHrYrMM/hyAPe50cR0VGEPYxshEGVorR6qfRNfDdz7VMCxvQ58Qgx2QvwiyUgGuBraisaOHzJhXDq7AnypGtgKgVKLrITOvLRA3cWmduPsPRgUEWAzBGoC6SoOL61Gto1n2/PPq5d1VTAqWE5sh6B2HdK1Pgld9x9/O7QzuxU/zh5fAeP85TLsh/xk545xGgaCAIr+Eo1GUzn2apsVkoUlF0Bjl1wASsgZnKOk4AZIKDfIPaDiBtyEDhdZkLPVRPKrd4uv3WKqYaz52/XH6+F4PHzmG+apy0OIWqDMfN9FCNpXlEv2gJMQ6CZKNdbgJ4S4U4rU1uIphGANBWKv+Aoh2abgW1XgLQSmMx9FozR4DKEdO2WxYDX4DIFgUcnJn/QbArXFtHTBgOsQCCKV8o+hs0nBfQjos437RI6GznYDcBEhQNr01k+hZaaP+87sZWAxFfm+OfUm77envmR7lyHb+wyRnuVSeLoy+TXGamC1Wq1WPxoFtAfR4rpyDpE6ugxDHZSIy4EBw1AHfaAYcQDHCCemLMcQEULij3pkUAiNeoR8odq04eERE2ljz2HgkZOBNrHmxkY09wgHBtCmppBZsXMxOzu7mvMBqhuvTc8Y6Q4K9GAEgULNfOI15u8zKU6vISpGtHUdSmhfIQq3G6cxQkGgF1Eaa43S2m3qg6yLNWWsiPGIhLa2ro4OjT1iIh3QzQgDRkEmBDQKm3ta8ztrdnilGDEysjsG2CQT4REdHm1dGsfIbHtNE0Z2RjgwkZ6NW2NyoWY9v0xhmwdUMUijl/Ep4jM7J608YhUnHQd2DwKkB1nh0lhg7BRrhFAJ1dgmHTPgxe8afhlzqHsQIMAaV5Eg3YasDq7RxDhuYD0i3M6fBncPAjhqtmHVaOIci6QKWaO5ZkDSAHkE0N7ZhTQVhnF879NFRcSCPoiOZxREMLKLbdHO2sbcV/uAlXOQm87VdHMwp+kMt5lR4lZCYmBJaFqhIklR0K2UQZDUVRBEEH1c9UVFX1DdtffMebZ5ds5ZlJT0v5j4+Pzf9/zeZ+/zvuzCdZ3f2SY1GuSIBQRZCT2LMVQ1goqAIHmZ7ujig6zx+nTpzkl3HVYQ1KhYW2g8dFKqZLIWGg1V59lnrP8jIA3WkNOoKLMHrrI9D6M23aF8426nU464QJCNkOPELfm9xKsm+n4XyO61Da16pbfuREhNEM62xuILy0iv8+WN1aA5qUeI21inCIhEq2+SQ9ozPZe24FpYK41Om5ynIq1r+UBslU6pRmxcdowQa3ROdaUh2/4FgKCr4hERo1sKuwCjtcrecwQyknX63377HMKF5wZpIKR93CCNGltj3U7rKZQrbhB3YpxZX+M9UVZywiZoBVzvAbSrXz3sOGeZwxnyh5Mf8RA1+z0Vkh0Lb7994vYy3S6ui+cpYs9yLPzKiDP0lQKYvp4NtYv75oYaMW7jMDJ6+RSefb+9YvvzdkLcvuPHu+kMzqfMN0tI0lpQkXqdAek1Po6KXHs9rUpMCFhFJmS2QIIEMuyaC/VWzr1FxV5OY1YDJAw5fAq7QmO3ZkvknkxN0Q8lkeCKFIJ09arRjOtUVV0RkAM92meA1TImHMQ0BC1RczOAJZkJyTUB3HYNGiUSAGLyA8SiCDW25Z02XHvk4N237+MWUD198noNC8iWGx1HMMMj84Al/eOBQJBoCwyZ8D5pSZscdMhKINFutU6OBIC4h4FKMiFukOPVPU3aThnQolT4dfjs5ku5IFuqO64AwIc3ZrqyYQpg0CEEJDgIFtqDgpMUqGImnBVQtEp79UzWneRUbDzKMlYwrIKWUSQIpOPcKsjI8uHdwNgMcj0Ix+k30BHt5eoDdNKlCM7pPLNHKs8WPEUCNHfzg8SAmgc2RWRADbzAx/UyO8rKMRun144cHDAXjGWOA6SCSBiICvdmbdPmahexc94Q/PJGe4Ue/VzT3TOdALCqqVrkFStzVjFCgmpqlAfkMZBuxMgRB3g6hpA+gGhFxyPDuJvGH4UTkFYi5Q4yY01QYBlHSCDIw9OZfxpzngjkGtSVXRc2n8UIuDbNN9I5rTQpM6w5JgNZZIYLZABUE/mRiWEAfwbfPOknAYCaSt7J/bU5acpsrgjA4AwSDJK9eYtteQa9LkQ3gNNNN7WnD6ygM04ULn93MwCZMhUFSapgsjAWfUy3YjdTAmzMK5AqPutY3p0A2SxCpYLsltoLDMrcJpz21Et9LMM6/ABU2MU+0xgJj1m2DW7FMmZTFBi7Z+P4jxYKht2oZJBDZZULDF5CngPS1dvLPiyNkjKxzOSgIMbeWN0JGI4lXcUe0TURswD4Tah0EINTv9AQUNxjQHxSfbFhx1pwVUyFM41awB9kB0HBbp52F3wwgVDpICGNnM0QqjqaBdkpVnIMOzYIQEbMuSF8oMejLI8oOCQMpEJS0T//cVCdWMluMOjqMyDPCS/3sG6M8sTMBFz0gf7nQTb09+8ol2AQfJ8dKXbx1JWtwLpNbOO96r6cBpA9yd5xX0yD5TpL1u8MbccgtfvnP6BrJeqKksulNtzSNO1ClszhV4Fs7rSfAqr7ty4//x5pUDRyGJRir6hLfVLgTI7mOZQIUG60yCAaH6fBS9y36/SCZ8IoqqkUyMbRYoPYeAwBY9XVUmYajeHzbBItOgivwWYtcabRCPkI/YUgvxAyoSUCgv6D/AdZEiB79y4REI9niYAsmYrQWvkPS5SvlSJW/SNZS1F4q/CrZoeApNr15fv5szySDQKmlJSXe0oD8QjKr60VkLR9fW0Nf9bGw+US/qxNnq2SP1KRGgFJF9d5BKTt6z+8jz+rQlJzmCflJ6e3vqMkTdRjAAAAAElFTkSuQmCC",
+    "image": "tb-image:Y2hhcnRzLnN2Zw==:IkNoYXJ0cyIgc3lzdGVtIGJ1bmRsZSBpbWFnZQ==;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_4198_110493)">
<path d="M19.2461 20.9969L4.95448 54.3254L0 63.5V76H96V60.9561V45.3333L88.8987 69.0461L84.9407 54.2153L83.2233 58.5773L75.8824 74.9376C70.9889 57.1433 66.9111 50.5036 61.5851 33.0209L56.0897 59.1309H49.0221L47.657 16.702L44.9076 0L31.825 41.6708L28.7141 40.3627L19.2461 20.9969Z" fill="url(#paint0_linear_4198_110493)"/>
<path d="M0 63.6487L5.00109 53.488L19.4271 20.3988L28.9842 40.6255L32.1244 41.9243L44.8696 1L47.7391 16.1703C48.2772 32.6209 48.4184 42.5494 48.9565 59H56L61.5652 32.1233L75.913 74L85.0185 53.4413L88.9565 68.0176L96 44.7194" stroke="url(#paint1_linear_4198_110493)" stroke-width="0.776582"/>
</g>
<g clip-path="url(#clip1_4198_110493)">
<path d="M0 0L96 1.60872e-05" stroke="black" stroke-opacity="0.12" stroke-width="0.25417"/>
<path d="M0 19L96 19" stroke="black" stroke-opacity="0.12" stroke-width="0.25417"/>
<path d="M0 38L96 38" stroke="black" stroke-opacity="0.12" stroke-width="0.25417"/>
<path d="M0 57L96 57" stroke="black" stroke-opacity="0.12" stroke-width="0.25417"/>
<path d="M0 76L96 76" stroke="black" stroke-opacity="0.12" stroke-width="0.25417"/>
</g>
<rect x="104" width="96" height="76" rx="1.13433" fill="white"/>
<mask id="path-9-outside-1_4198_110493" maskUnits="userSpaceOnUse" x="152.018" y="3.25" width="35" height="51" fill="black">
<rect fill="white" x="152.018" y="3.25" width="35" height="51"/>
<path d="M153.341 7.26249C153.39 5.88606 154.546 4.79955 155.915 4.95061C160.635 5.47143 165.198 6.9984 169.293 9.43958C174.104 12.3073 178.113 16.3438 180.947 21.1744C183.781 26.005 185.349 31.4732 185.505 37.0716C185.638 41.8373 184.745 46.5659 182.897 50.9398C182.361 52.2085 180.848 52.6882 179.623 52.0586C178.398 51.4291 177.927 49.929 178.446 48.6533C179.919 45.0325 180.629 41.1365 180.52 37.2109C180.387 32.4522 179.054 27.8042 176.645 23.6982C174.236 19.5922 170.829 16.1612 166.74 13.7236C163.366 11.7128 159.619 10.4317 155.74 9.95152C154.373 9.78234 153.293 8.63891 153.341 7.26249Z"/>
</mask>
<path d="M153.341 7.26249C153.39 5.88606 154.546 4.79955 155.915 4.95061C160.635 5.47143 165.198 6.9984 169.293 9.43958C174.104 12.3073 178.113 16.3438 180.947 21.1744C183.781 26.005 185.349 31.4732 185.505 37.0716C185.638 41.8373 184.745 46.5659 182.897 50.9398C182.361 52.2085 180.848 52.6882 179.623 52.0586C178.398 51.4291 177.927 49.929 178.446 48.6533C179.919 45.0325 180.629 41.1365 180.52 37.2109C180.387 32.4522 179.054 27.8042 176.645 23.6982C174.236 19.5922 170.829 16.1612 166.74 13.7236C163.366 11.7128 159.619 10.4317 155.74 9.95152C154.373 9.78234 153.293 8.63891 153.341 7.26249Z" fill="#FF4D5A"/>
<path d="M153.341 7.26249C153.39 5.88606 154.546 4.79955 155.915 4.95061C160.635 5.47143 165.198 6.9984 169.293 9.43958C174.104 12.3073 178.113 16.3438 180.947 21.1744C183.781 26.005 185.349 31.4732 185.505 37.0716C185.638 41.8373 184.745 46.5659 182.897 50.9398C182.361 52.2085 180.848 52.6882 179.623 52.0586C178.398 51.4291 177.927 49.929 178.446 48.6533C179.919 45.0325 180.629 41.1365 180.52 37.2109C180.387 32.4522 179.054 27.8042 176.645 23.6982C174.236 19.5922 170.829 16.1612 166.74 13.7236C163.366 11.7128 159.619 10.4317 155.74 9.95152C154.373 9.78234 153.293 8.63891 153.341 7.26249Z" fill="white" fill-opacity="0.1"/>
<path d="M153.341 7.26249C153.39 5.88606 154.546 4.79955 155.915 4.95061C160.635 5.47143 165.198 6.9984 169.293 9.43958C174.104 12.3073 178.113 16.3438 180.947 21.1744C183.781 26.005 185.349 31.4732 185.505 37.0716C185.638 41.8373 184.745 46.5659 182.897 50.9398C182.361 52.2085 180.848 52.6882 179.623 52.0586C178.398 51.4291 177.927 49.929 178.446 48.6533C179.919 45.0325 180.629 41.1365 180.52 37.2109C180.387 32.4522 179.054 27.8042 176.645 23.6982C174.236 19.5922 170.829 16.1612 166.74 13.7236C163.366 11.7128 159.619 10.4317 155.74 9.95152C154.373 9.78234 153.293 8.63891 153.341 7.26249Z" stroke="white" stroke-width="1.93371" mask="url(#path-9-outside-1_4198_110493)"/>
<path d="M151.195 7.26249C151.147 5.88606 149.99 4.79955 148.621 4.95062C143.727 5.49067 139.003 7.11237 134.796 9.71053C129.881 12.7465 125.841 17.0109 123.075 22.0835C120.309 27.1561 118.913 32.8618 119.024 38.6383C119.135 44.4148 120.749 50.0627 123.708 55.0254C126.666 59.9881 130.866 64.0943 135.895 66.9393C140.924 69.7843 146.607 71.27 152.384 71.2498C158.162 71.2296 163.834 69.7044 168.843 66.8243C173.129 64.3596 176.802 60.9754 179.605 56.9273C180.389 55.7949 179.984 54.2607 178.796 53.5637C177.608 52.8668 176.089 53.2724 175.29 54.3943C172.936 57.6999 169.891 60.4681 166.357 62.5007C162.099 64.9487 157.278 66.2452 152.367 66.2623C147.456 66.2795 142.625 65.0167 138.351 62.5984C134.077 60.1802 130.506 56.6899 127.992 52.4716C125.477 48.2533 124.105 43.4526 124.011 38.5426C123.916 33.6325 125.103 28.7827 127.454 24.471C129.805 20.1593 133.239 16.5345 137.417 13.9539C140.886 11.8113 144.769 10.45 148.796 9.95151C150.163 9.78234 151.243 8.63891 151.195 7.26249Z" fill="#4CAF50"/>
<path d="M147.106 29.2344V33.5H146.549V29.2344H147.106ZM148.477 29.2344V29.6973H145.181V29.2344H148.477ZM148.591 31.9502V31.8828C148.591 31.6543 148.625 31.4424 148.691 31.2471C148.757 31.0498 148.853 30.8789 148.978 30.7344C149.103 30.5879 149.254 30.4746 149.432 30.3945C149.61 30.3125 149.809 30.2715 150.03 30.2715C150.252 30.2715 150.453 30.3125 150.63 30.3945C150.81 30.4746 150.962 30.5879 151.087 30.7344C151.214 30.8789 151.311 31.0498 151.377 31.2471C151.444 31.4424 151.477 31.6543 151.477 31.8828V31.9502C151.477 32.1787 151.444 32.3906 151.377 32.5859C151.311 32.7812 151.214 32.9521 151.087 33.0986C150.962 33.2432 150.811 33.3564 150.633 33.4385C150.458 33.5186 150.258 33.5586 150.036 33.5586C149.813 33.5586 149.613 33.5186 149.435 33.4385C149.257 33.3564 149.105 33.2432 148.978 33.0986C148.853 32.9521 148.757 32.7812 148.691 32.5859C148.625 32.3906 148.591 32.1787 148.591 31.9502ZM149.133 31.8828V31.9502C149.133 32.1084 149.152 32.2578 149.189 32.3984C149.226 32.5371 149.282 32.6602 149.356 32.7676C149.432 32.875 149.527 32.96 149.64 33.0225C149.753 33.083 149.885 33.1133 150.036 33.1133C150.184 33.1133 150.314 33.083 150.425 33.0225C150.539 32.96 150.632 32.875 150.707 32.7676C150.781 32.6602 150.836 32.5371 150.874 32.3984C150.913 32.2578 150.932 32.1084 150.932 31.9502V31.8828C150.932 31.7266 150.913 31.5791 150.874 31.4404C150.836 31.2998 150.78 31.1758 150.704 31.0684C150.629 30.959 150.536 30.873 150.422 30.8105C150.311 30.748 150.18 30.7168 150.03 30.7168C149.881 30.7168 149.75 30.748 149.637 30.8105C149.526 30.873 149.432 30.959 149.356 31.0684C149.282 31.1758 149.226 31.2998 149.189 31.4404C149.152 31.5791 149.133 31.7266 149.133 31.8828ZM153.484 30.3301V30.7461H151.77V30.3301H153.484ZM152.35 29.5596H152.892V32.7148C152.892 32.8223 152.909 32.9033 152.942 32.958C152.975 33.0127 153.018 33.0488 153.071 33.0664C153.124 33.084 153.18 33.0928 153.241 33.0928C153.286 33.0928 153.333 33.0889 153.381 33.0811C153.432 33.0713 153.47 33.0635 153.496 33.0576L153.499 33.5C153.456 33.5137 153.399 33.5264 153.329 33.5381C153.26 33.5518 153.177 33.5586 153.08 33.5586C152.947 33.5586 152.825 33.5322 152.713 33.4795C152.602 33.4268 152.513 33.3389 152.447 33.2158C152.382 33.0908 152.35 32.9229 152.35 32.7119V29.5596ZM155.989 32.958V31.3262C155.989 31.2012 155.963 31.0928 155.913 31.001C155.864 30.9072 155.79 30.835 155.69 30.7842C155.59 30.7334 155.467 30.708 155.321 30.708C155.184 30.708 155.064 30.7314 154.96 30.7783C154.859 30.8252 154.779 30.8867 154.72 30.9629C154.664 31.0391 154.635 31.1211 154.635 31.209H154.093C154.093 31.0957 154.123 30.9834 154.181 30.8721C154.24 30.7607 154.324 30.6602 154.433 30.5703C154.544 30.4785 154.677 30.4062 154.832 30.3535C154.988 30.2988 155.162 30.2715 155.353 30.2715C155.583 30.2715 155.787 30.3105 155.962 30.3887C156.14 30.4668 156.279 30.585 156.378 30.7432C156.48 30.8994 156.531 31.0957 156.531 31.332V32.8086C156.531 32.9141 156.54 33.0264 156.557 33.1455C156.577 33.2646 156.605 33.3672 156.642 33.4531V33.5H156.077C156.049 33.4375 156.028 33.3545 156.012 33.251C155.997 33.1455 155.989 33.0479 155.989 32.958ZM156.083 31.5781L156.088 31.959H155.541C155.386 31.959 155.249 31.9717 155.127 31.9971C155.006 32.0205 154.905 32.0566 154.823 32.1055C154.741 32.1543 154.678 32.2158 154.635 32.29C154.592 32.3623 154.571 32.4473 154.571 32.5449C154.571 32.6445 154.593 32.7354 154.638 32.8174C154.683 32.8994 154.75 32.9648 154.84 33.0137C154.932 33.0605 155.044 33.084 155.177 33.084C155.343 33.084 155.49 33.0488 155.617 32.9785C155.744 32.9082 155.844 32.8223 155.918 32.7207C155.995 32.6191 156.036 32.5205 156.042 32.4248L156.273 32.6855C156.259 32.7676 156.222 32.8584 156.162 32.958C156.101 33.0576 156.02 33.1533 155.918 33.2451C155.819 33.335 155.7 33.4102 155.561 33.4707C155.424 33.5293 155.27 33.5586 155.098 33.5586C154.883 33.5586 154.695 33.5166 154.533 33.4326C154.373 33.3486 154.248 33.2363 154.158 33.0957C154.07 32.9531 154.026 32.7939 154.026 32.6182C154.026 32.4482 154.059 32.2988 154.125 32.1699C154.192 32.0391 154.288 31.9307 154.413 31.8447C154.538 31.7568 154.688 31.6904 154.864 31.6455C155.04 31.6006 155.236 31.5781 155.453 31.5781H156.083ZM157.972 29V33.5H157.427V29H157.972Z" fill="black" fill-opacity="0.38"/>
<path d="M145.732 36.9395V45.5H144.32V38.6152L142.228 39.3242V38.1582L145.562 36.9395H145.732ZM154.275 43.1738C154.275 43.7051 154.152 44.1523 153.906 44.5156C153.66 44.8789 153.324 45.1543 152.898 45.3418C152.476 45.5254 152 45.6172 151.468 45.6172C150.937 45.6172 150.458 45.5254 150.033 45.3418C149.607 45.1543 149.271 44.8789 149.025 44.5156C148.779 44.1523 148.656 43.7051 148.656 43.1738C148.656 42.8223 148.724 42.5039 148.861 42.2188C148.998 41.9297 149.191 41.6816 149.441 41.4746C149.695 41.2637 149.992 41.1016 150.332 40.9883C150.675 40.875 151.05 40.8184 151.457 40.8184C151.996 40.8184 152.478 40.918 152.904 41.1172C153.33 41.3164 153.664 41.5918 153.906 41.9434C154.152 42.2949 154.275 42.7051 154.275 43.1738ZM152.857 43.1035C152.857 42.8184 152.798 42.5684 152.681 42.3535C152.564 42.1387 152.4 41.9727 152.189 41.8555C151.978 41.7383 151.734 41.6797 151.457 41.6797C151.175 41.6797 150.931 41.7383 150.724 41.8555C150.517 41.9727 150.355 42.1387 150.238 42.3535C150.125 42.5684 150.068 42.8184 150.068 43.1035C150.068 43.3926 150.125 43.6426 150.238 43.8535C150.351 44.0605 150.513 44.2188 150.724 44.3281C150.935 44.4375 151.183 44.4922 151.468 44.4922C151.753 44.4922 152 44.4375 152.207 44.3281C152.414 44.2188 152.574 44.0605 152.687 43.8535C152.8 43.6426 152.857 43.3926 152.857 43.1035ZM154.082 39.2129C154.082 39.6387 153.968 40.0176 153.742 40.3496C153.519 40.6816 153.21 40.9434 152.816 41.1348C152.421 41.3223 151.972 41.416 151.468 41.416C150.96 41.416 150.507 41.3223 150.109 41.1348C149.714 40.9434 149.404 40.6816 149.177 40.3496C148.955 40.0176 148.843 39.6387 148.843 39.2129C148.843 38.7051 148.955 38.2773 149.177 37.9297C149.404 37.5781 149.714 37.3105 150.109 37.127C150.503 36.9434 150.955 36.8516 151.462 36.8516C151.97 36.8516 152.421 36.9434 152.816 37.127C153.21 37.3105 153.519 37.5781 153.742 37.9297C153.968 38.2773 154.082 38.7051 154.082 39.2129ZM152.669 39.2598C152.669 39.0059 152.619 38.7832 152.517 38.5918C152.419 38.3965 152.281 38.2441 152.101 38.1348C151.921 38.0254 151.708 37.9707 151.462 37.9707C151.216 37.9707 151.003 38.0234 150.824 38.1289C150.644 38.2344 150.505 38.3828 150.408 38.5742C150.31 38.7656 150.261 38.9941 150.261 39.2598C150.261 39.5215 150.31 39.75 150.408 39.9453C150.505 40.1367 150.644 40.2871 150.824 40.3965C151.007 40.5059 151.222 40.5605 151.468 40.5605C151.714 40.5605 151.927 40.5059 152.107 40.3965C152.287 40.2871 152.425 40.1367 152.523 39.9453C152.621 39.75 152.669 39.5215 152.669 39.2598ZM157.175 40.5957H158.019C158.347 40.5957 158.619 40.5391 158.833 40.4258C159.052 40.3125 159.214 40.1562 159.32 39.957C159.425 39.7578 159.478 39.5293 159.478 39.2715C159.478 39.002 159.429 38.7715 159.332 38.5801C159.238 38.3848 159.093 38.2344 158.898 38.1289C158.707 38.0234 158.462 37.9707 158.166 37.9707C157.916 37.9707 157.689 38.0215 157.486 38.123C157.287 38.2207 157.128 38.3613 157.011 38.5449C156.894 38.7246 156.835 38.9395 156.835 39.1895H155.417C155.417 38.7363 155.537 38.334 155.775 37.9824C156.013 37.6309 156.337 37.3555 156.748 37.1562C157.162 36.9531 157.626 36.8516 158.142 36.8516C158.693 36.8516 159.173 36.9434 159.583 37.127C159.998 37.3066 160.32 37.5762 160.55 37.9355C160.781 38.2949 160.896 38.7402 160.896 39.2715C160.896 39.5137 160.839 39.7598 160.726 40.0098C160.613 40.2598 160.445 40.4883 160.222 40.6953C160 40.8984 159.722 41.0645 159.39 41.1934C159.058 41.3184 158.673 41.3809 158.236 41.3809H157.175V40.5957ZM157.175 41.6973V40.9238H158.236C158.736 40.9238 159.162 40.9824 159.513 41.0996C159.869 41.2168 160.158 41.3789 160.38 41.5859C160.603 41.7891 160.765 42.0215 160.867 42.2832C160.972 42.5449 161.025 42.8223 161.025 43.1152C161.025 43.5137 160.953 43.8691 160.808 44.1816C160.667 44.4902 160.466 44.752 160.205 44.9668C159.943 45.1816 159.636 45.3438 159.285 45.4531C158.937 45.5625 158.558 45.6172 158.148 45.6172C157.781 45.6172 157.429 45.5664 157.093 45.4648C156.757 45.3633 156.457 45.2129 156.191 45.0137C155.925 44.8105 155.714 44.5586 155.558 44.2578C155.406 43.9531 155.33 43.6016 155.33 43.2031H156.742C156.742 43.457 156.8 43.6816 156.917 43.877C157.039 44.0684 157.207 44.2188 157.421 44.3281C157.64 44.4375 157.89 44.4922 158.171 44.4922C158.468 44.4922 158.724 44.4395 158.939 44.334C159.154 44.2285 159.318 44.0723 159.431 43.8652C159.548 43.6582 159.607 43.4082 159.607 43.1152C159.607 42.7832 159.542 42.5137 159.414 42.3066C159.285 42.0996 159.101 41.9473 158.863 41.8496C158.625 41.748 158.343 41.6973 158.019 41.6973H157.175Z" fill="black" fill-opacity="0.87"/>
<g clip-path="url(#clip2_4198_110493)">
<path d="M2 88L197 88" stroke="black" stroke-opacity="0.12" stroke-width="0.5"/>
<path d="M2 106L197 106" stroke="black" stroke-opacity="0.12" stroke-width="0.5"/>
<path d="M2 124L197 124" stroke="black" stroke-opacity="0.12" stroke-width="0.5"/>
<path d="M2 142L197 142" stroke="black" stroke-opacity="0.12" stroke-width="0.5"/>
<path d="M2 160L197 160" stroke="black" stroke-opacity="0.12"/>
<path d="M103.695 91C103.695 89.8954 104.59 89 105.695 89H117.695C118.799 89 119.695 89.8954 119.695 91V160H103.695V91Z" fill="#4196F6"/>
<path d="M136 124C136 122.895 136.895 122 138 122H150C151.105 122 152 122.895 152 124V160H136V124Z" fill="#4196F6"/>
<path d="M7.69482 143C7.69482 141.895 8.59025 141 9.69482 141H21.6948C22.7994 141 23.6948 141.895 23.6948 143V160H7.69482V143Z" fill="#4196F6"/>
<path d="M39.6948 107C39.6948 105.895 40.5903 105 41.6948 105H53.6948C54.7994 105 55.6948 105.895 55.6948 107V160H39.6948V107Z" fill="#4196F6"/>
<path d="M72 132C72 130.895 72.8954 130 74 130H86C87.1046 130 88 130.895 88 132V160H72V132Z" fill="#4196F6"/>
<path d="M167.695 150C167.695 148.895 168.59 148 169.695 148H181.695C182.799 148 183.695 148.895 183.695 150V160H167.695V150Z" fill="#4196F6"/>
<path d="M4 109L18.5211 103.031C18.5933 103.001 18.6687 102.98 18.7457 102.968L59.5747 96.5365C59.6615 96.5228 59.7498 96.5207 59.8373 96.5301L99.0933 100.755L139.044 99.7131L181.142 95.8402C181.21 95.8339 181.278 95.8206 181.344 95.8005L197 91" stroke="#FFC107" stroke-width="2" stroke-linecap="round"/>
<circle cx="59" cy="97" r="1.5" fill="white" stroke="#FFC107"/>
<circle cx="18.6948" cy="103.161" r="1.5" fill="white" stroke="#FFC107"/>
<circle cx="3.69482" cy="109.161" r="1.5" fill="white" stroke="#FFC107"/>
<circle cx="100" cy="101" r="1.5" fill="white" stroke="#FFC107"/>
<circle cx="143" cy="99" r="1.5" fill="white" stroke="#FFC107"/>
<circle cx="180.695" cy="96.1611" r="1.5" fill="white" stroke="#FFC107"/>
<circle cx="196" cy="91" r="1.5" fill="white" stroke="#FFC107"/>
<path d="M4 132L18.6393 119.814L60.305 127.6L100.282 116L140.258 116L177.982 122.184L196 127.6" stroke="#4CAF50" stroke-width="2" stroke-linecap="round"/>
<circle cx="59" cy="128" r="1.5" fill="white" stroke="#4CAF50"/>
<circle cx="19" cy="120" r="1.5" fill="white" stroke="#4CAF50"/>
<circle cx="100" cy="116" r="1.5" fill="white" stroke="#4CAF50"/>
<circle cx="178.695" cy="122" r="1.5" fill="white" stroke="#4CAF50"/>
<circle cx="196" cy="128" r="1.5" fill="white" stroke="#4CAF50"/>
<circle cx="3.69482" cy="131.161" r="1.5" fill="white" stroke="#4CAF50"/>
<circle cx="143" cy="116" r="1.5" fill="white" stroke="#4CAF50"/>
</g>
<defs>
<linearGradient id="paint0_linear_4198_110493" x1="45.6986" y1="84.7493" x2="45.6986" y2="-19.9388" gradientUnits="userSpaceOnUse">
<stop offset="0.173389" stop-color="#6DC770"/>
<stop offset="0.262979" stop-color="#6DC770"/>
<stop offset="0.267969" stop-color="#FFC107"/>
<stop offset="0.446178" stop-color="#FFC107"/>
<stop offset="0.448316" stop-color="#FD8F3C"/>
<stop offset="0.624387" stop-color="#FD8F3C"/>
<stop offset="0.630803" stop-color="#F2737C"/>
</linearGradient>
<linearGradient id="paint1_linear_4198_110493" x1="45.2797" y1="74.6635" x2="45.2261" y2="-20.2431" gradientUnits="userSpaceOnUse">
<stop offset="0.182254" stop-color="#3FA71A"/>
<stop offset="0.190118" stop-color="#FFA600"/>
<stop offset="0.382761" stop-color="#FFA600"/>
<stop offset="0.388268" stop-color="#F56E08"/>
<stop offset="0.581695" stop-color="#F56E08"/>
<stop offset="0.587985" stop-color="#FF4D5A"/>
</linearGradient>
<clipPath id="clip0_4198_110493">
<rect width="96" height="76" fill="white"/>
</clipPath>
<clipPath id="clip1_4198_110493">
<rect width="96" height="76" fill="white"/>
</clipPath>
<clipPath id="clip2_4198_110493">
<rect width="200" height="76" fill="white" transform="translate(0 84)"/>
</clipPath>
</defs>
</svg>
",
     "description": "Display time series data using customizable line and bar charts. Use various pie charts to display the latest values.",
     "order": 1000,
     "name": "Charts"
   },
   "widgetTypeFqns": [
+    "time_series_chart",
+    "line_chart",
+    "bar_chart",
+    "point_chart",
+    "state_chart",
+    "bar_chart_with_labels",
+    "range_chart",
+    "cards.aggregated_value_card",
+    "bars",
+    "pie",
+    "doughnut",
+    "horizontal_doughnut",
+    "polar_area",
+    "radar",
     "charts.basic_timeseries",
     "charts.state_chart",
-    "range_chart",
-    "bar_chart_with_labels",
     "charts.timeseries_bars_flot",
-    "cards.aggregated_value_card",
     "charts.bars",
     "charts.pie",
     "charts.pie_chart_js",
-    "doughnut",
-    "horizontal_doughnut",
+    "charts.doughnut_chart_js",
     "charts.polar_area_chart_js",
-    "charts.radar_chart_js",
-    "charts.doughnut_chart_js"
+    "charts.radar_chart_js"
   ]
 }
\ No newline at end of file
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/bar_chart.json b/application/src/main/data/json/system/widget_types/bar_chart.json
new file mode 100644
index 0000000000..264c314686
--- /dev/null
+++ b/application/src/main/data/json/system/widget_types/bar_chart.json
@@ -0,0 +1,32 @@
+{
+  "fqn": "bar_chart",
+  "name": "Bar chart",
+  "deprecated": false,
+  "image": "tb-image:Y2hhcnRfKDIpLnN2Zw==:IkJhciBjaGFydCIgc3lzdGVtIHdpZGdldCBpbWFnZQ==;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_4183_90877)">
<path d="M2.84766 1.28125V7H2.125V2.18359L0.667969 2.71484V2.0625L2.73438 1.28125H2.84766ZM8.67517 3.70312V4.57031C8.67517 5.03646 8.63351 5.42969 8.55017 5.75C8.46684 6.07031 8.34705 6.32812 8.1908 6.52344C8.03455 6.71875 7.84575 6.86068 7.62439 6.94922C7.40564 7.03516 7.15825 7.07812 6.8822 7.07812C6.66345 7.07812 6.46163 7.05078 6.27673 6.99609C6.09184 6.94141 5.92517 6.85417 5.77673 6.73438C5.6309 6.61198 5.5059 6.45312 5.40173 6.25781C5.29757 6.0625 5.21814 5.82552 5.16345 5.54688C5.10877 5.26823 5.08142 4.94271 5.08142 4.57031V3.70312C5.08142 3.23698 5.12309 2.84635 5.20642 2.53125C5.29236 2.21615 5.41345 1.96354 5.5697 1.77344C5.72595 1.58073 5.91345 1.44271 6.1322 1.35938C6.35356 1.27604 6.60095 1.23438 6.87439 1.23438C7.09575 1.23438 7.29887 1.26172 7.48377 1.31641C7.67127 1.36849 7.83793 1.45312 7.98377 1.57031C8.1296 1.6849 8.2533 1.83854 8.35486 2.03125C8.45903 2.22135 8.53845 2.45443 8.59314 2.73047C8.64783 3.00651 8.67517 3.33073 8.67517 3.70312ZM7.94861 4.6875V3.58203C7.94861 3.32682 7.93298 3.10286 7.90173 2.91016C7.87309 2.71484 7.83012 2.54818 7.77283 2.41016C7.71554 2.27214 7.64262 2.16016 7.55408 2.07422C7.46814 1.98828 7.36788 1.92578 7.2533 1.88672C7.14132 1.84505 7.01502 1.82422 6.87439 1.82422C6.70252 1.82422 6.55017 1.85677 6.41736 1.92188C6.28455 1.98438 6.17257 2.08464 6.08142 2.22266C5.99288 2.36068 5.92517 2.54167 5.8783 2.76562C5.83142 2.98958 5.80798 3.26172 5.80798 3.58203V4.6875C5.80798 4.94271 5.82231 5.16797 5.85095 5.36328C5.8822 5.55859 5.92778 5.72786 5.98767 5.87109C6.04757 6.01172 6.12048 6.1276 6.20642 6.21875C6.29236 6.3099 6.39132 6.3776 6.5033 6.42188C6.61788 6.46354 6.74418 6.48438 6.8822 6.48438C7.05929 6.48438 7.21423 6.45052 7.34705 6.38281C7.47986 6.3151 7.59054 6.20964 7.67908 6.06641C7.77022 5.92057 7.83793 5.73438 7.8822 5.50781C7.92647 5.27865 7.94861 5.00521 7.94861 4.6875ZM13.3074 3.70312V4.57031C13.3074 5.03646 13.2657 5.42969 13.1824 5.75C13.099 6.07031 12.9793 6.32812 12.823 6.52344C12.6668 6.71875 12.4779 6.86068 12.2566 6.94922C12.0378 7.03516 11.7904 7.07812 11.5144 7.07812C11.2957 7.07812 11.0938 7.05078 10.9089 6.99609C10.724 6.94141 10.5574 6.85417 10.4089 6.73438C10.2631 6.61198 10.1381 6.45312 10.0339 6.25781C9.92977 6.0625 9.85034 5.82552 9.79566 5.54688C9.74097 5.26823 9.71363 4.94271 9.71363 4.57031V3.70312C9.71363 3.23698 9.75529 2.84635 9.83863 2.53125C9.92456 2.21615 10.0457 1.96354 10.2019 1.77344C10.3582 1.58073 10.5457 1.44271 10.7644 1.35938C10.9858 1.27604 11.2332 1.23438 11.5066 1.23438C11.7279 1.23438 11.9311 1.26172 12.116 1.31641C12.3035 1.36849 12.4701 1.45312 12.616 1.57031C12.7618 1.6849 12.8855 1.83854 12.9871 2.03125C13.0912 2.22135 13.1707 2.45443 13.2253 2.73047C13.28 3.00651 13.3074 3.33073 13.3074 3.70312ZM12.5808 4.6875V3.58203C12.5808 3.32682 12.5652 3.10286 12.5339 2.91016C12.5053 2.71484 12.4623 2.54818 12.405 2.41016C12.3477 2.27214 12.2748 2.16016 12.1863 2.07422C12.1003 1.98828 12.0001 1.92578 11.8855 1.88672C11.7735 1.84505 11.6472 1.82422 11.5066 1.82422C11.3347 1.82422 11.1824 1.85677 11.0496 1.92188C10.9168 1.98438 10.8048 2.08464 10.7136 2.22266C10.6251 2.36068 10.5574 2.54167 10.5105 2.76562C10.4636 2.98958 10.4402 3.26172 10.4402 3.58203V4.6875C10.4402 4.94271 10.4545 5.16797 10.4832 5.36328C10.5144 5.55859 10.56 5.72786 10.6199 5.87109C10.6798 6.01172 10.7527 6.1276 10.8386 6.21875C10.9246 6.3099 11.0235 6.3776 11.1355 6.42188C11.2501 6.46354 11.3764 6.48438 11.5144 6.48438C11.6915 6.48438 11.8464 6.45052 11.9793 6.38281C12.1121 6.3151 12.2227 6.20964 12.3113 6.06641C12.4024 5.92057 12.4701 5.73438 12.5144 5.50781C12.5587 5.27865 12.5808 5.00521 12.5808 4.6875ZM14.3068 2.70703V2.40625C14.3068 2.1901 14.3536 1.99349 14.4474 1.81641C14.5411 1.63932 14.6753 1.4974 14.8497 1.39062C15.0242 1.28385 15.2312 1.23047 15.4708 1.23047C15.7156 1.23047 15.924 1.28385 16.0958 1.39062C16.2703 1.4974 16.4044 1.63932 16.4982 1.81641C16.5919 1.99349 16.6388 2.1901 16.6388 2.40625V2.70703C16.6388 2.91797 16.5919 3.11198 16.4982 3.28906C16.407 3.46615 16.2742 3.60807 16.0997 3.71484C15.9279 3.82161 15.7208 3.875 15.4786 3.875C15.2365 3.875 15.0268 3.82161 14.8497 3.71484C14.6753 3.60807 14.5411 3.46615 14.4474 3.28906C14.3536 3.11198 14.3068 2.91797 14.3068 2.70703ZM14.8497 2.40625V2.70703C14.8497 2.82682 14.8719 2.9401 14.9161 3.04688C14.963 3.15365 15.0333 3.24089 15.1271 3.30859C15.2208 3.3737 15.338 3.40625 15.4786 3.40625C15.6193 3.40625 15.7352 3.3737 15.8263 3.30859C15.9174 3.24089 15.9852 3.15365 16.0294 3.04688C16.0737 2.9401 16.0958 2.82682 16.0958 2.70703V2.40625C16.0958 2.28385 16.0724 2.16927 16.0255 2.0625C15.9812 1.95312 15.9122 1.86589 15.8185 1.80078C15.7273 1.73307 15.6115 1.69922 15.4708 1.69922C15.3328 1.69922 15.2169 1.73307 15.1232 1.80078C15.032 1.86589 14.963 1.95312 14.9161 2.0625C14.8719 2.16927 14.8497 2.28385 14.8497 2.40625ZM17.0763 5.91016V5.60547C17.0763 5.39193 17.1232 5.19661 17.2169 5.01953C17.3107 4.84245 17.4448 4.70052 17.6193 4.59375C17.7937 4.48698 18.0008 4.43359 18.2404 4.43359C18.4852 4.43359 18.6935 4.48698 18.8654 4.59375C19.0398 4.70052 19.174 4.84245 19.2677 5.01953C19.3615 5.19661 19.4083 5.39193 19.4083 5.60547V5.91016C19.4083 6.1237 19.3615 6.31901 19.2677 6.49609C19.1766 6.67318 19.0437 6.8151 18.8693 6.92188C18.6974 7.02865 18.4904 7.08203 18.2482 7.08203C18.006 7.08203 17.7977 7.02865 17.6232 6.92188C17.4487 6.8151 17.3133 6.67318 17.2169 6.49609C17.1232 6.31901 17.0763 6.1237 17.0763 5.91016ZM17.6193 5.60547V5.91016C17.6193 6.02995 17.6414 6.14453 17.6857 6.25391C17.7325 6.36068 17.8029 6.44792 17.8966 6.51562C17.9904 6.58073 18.1075 6.61328 18.2482 6.61328C18.3888 6.61328 18.5047 6.58073 18.5958 6.51562C18.6896 6.44792 18.7586 6.36068 18.8029 6.25391C18.8471 6.14714 18.8693 6.03255 18.8693 5.91016V5.60547C18.8693 5.48307 18.8458 5.36849 18.799 5.26172C18.7547 5.15495 18.6857 5.06901 18.5919 5.00391C18.5008 4.9362 18.3836 4.90234 18.2404 4.90234C18.1023 4.90234 17.9865 4.9362 17.8927 5.00391C17.8016 5.06901 17.7325 5.15495 17.6857 5.26172C17.6414 5.36849 17.6193 5.48307 17.6193 5.60547ZM18.42 2.12109L15.6427 6.56641L15.2365 6.30859L18.0138 1.86328L18.42 2.12109Z" fill="black" fill-opacity="0.54"/>
<path d="M8.05859 33.6677C8.05859 34.0141 7.97786 34.3083 7.81641 34.5505C7.65755 34.7901 7.44141 34.9724 7.16797 35.0974C6.89714 35.2224 6.59115 35.2849 6.25 35.2849C5.90885 35.2849 5.60156 35.2224 5.32812 35.0974C5.05469 34.9724 4.83854 34.7901 4.67969 34.5505C4.52083 34.3083 4.44141 34.0141 4.44141 33.6677C4.44141 33.4412 4.48438 33.2341 4.57031 33.0466C4.65885 32.8565 4.78255 32.6912 4.94141 32.5505C5.10286 32.4099 5.29297 32.3018 5.51172 32.2263C5.73307 32.1482 5.97656 32.1091 6.24219 32.1091C6.59115 32.1091 6.90234 32.1768 7.17578 32.3123C7.44922 32.4451 7.66406 32.6287 7.82031 32.863C7.97917 33.0974 8.05859 33.3656 8.05859 33.6677ZM7.33203 33.6521C7.33203 33.4412 7.28646 33.255 7.19531 33.0935C7.10417 32.9294 6.97656 32.8018 6.8125 32.7107C6.64844 32.6195 6.45833 32.574 6.24219 32.574C6.02083 32.574 5.82943 32.6195 5.66797 32.7107C5.50911 32.8018 5.38542 32.9294 5.29688 33.0935C5.20833 33.255 5.16406 33.4412 5.16406 33.6521C5.16406 33.8708 5.20703 34.0583 5.29297 34.2146C5.38151 34.3682 5.50651 34.4867 5.66797 34.5701C5.83203 34.6508 6.02604 34.6912 6.25 34.6912C6.47396 34.6912 6.66667 34.6508 6.82812 34.5701C6.98958 34.4867 7.11328 34.3682 7.19922 34.2146C7.28776 34.0583 7.33203 33.8708 7.33203 33.6521ZM7.92578 30.9998C7.92578 31.2758 7.85286 31.5245 7.70703 31.7458C7.5612 31.9672 7.36198 32.1417 7.10938 32.2693C6.85677 32.3969 6.57031 32.4607 6.25 32.4607C5.92448 32.4607 5.63411 32.3969 5.37891 32.2693C5.1263 32.1417 4.92839 31.9672 4.78516 31.7458C4.64193 31.5245 4.57031 31.2758 4.57031 30.9998C4.57031 30.669 4.64193 30.3878 4.78516 30.156C4.93099 29.9242 5.13021 29.7472 5.38281 29.6248C5.63542 29.5024 5.92318 29.4412 6.24609 29.4412C6.57161 29.4412 6.86068 29.5024 7.11328 29.6248C7.36589 29.7472 7.5638 29.9242 7.70703 30.156C7.85286 30.3878 7.92578 30.669 7.92578 30.9998ZM7.20312 31.0115C7.20312 30.8214 7.16276 30.6534 7.08203 30.5076C7.0013 30.3617 6.88932 30.2472 6.74609 30.1638C6.60286 30.0779 6.4362 30.0349 6.24609 30.0349C6.05599 30.0349 5.88932 30.0753 5.74609 30.156C5.60547 30.2341 5.49479 30.3461 5.41406 30.4919C5.33594 30.6378 5.29688 30.811 5.29688 31.0115C5.29688 31.2068 5.33594 31.3774 5.41406 31.5232C5.49479 31.669 5.60677 31.7823 5.75 31.863C5.89323 31.9438 6.0599 31.9841 6.25 31.9841C6.4401 31.9841 6.60547 31.9438 6.74609 31.863C6.88932 31.7823 7.0013 31.669 7.08203 31.5232C7.16276 31.3774 7.20312 31.2068 7.20312 31.0115ZM12.6752 31.9099V32.7771C12.6752 33.2432 12.6335 33.6365 12.5502 33.9568C12.4668 34.2771 12.347 34.5349 12.1908 34.7302C12.0345 34.9255 11.8457 35.0675 11.6244 35.156C11.4056 35.2419 11.1582 35.2849 10.8822 35.2849C10.6635 35.2849 10.4616 35.2576 10.2767 35.2029C10.0918 35.1482 9.92517 35.061 9.77673 34.9412C9.6309 34.8188 9.5059 34.6599 9.40173 34.4646C9.29757 34.2693 9.21814 34.0323 9.16345 33.7537C9.10877 33.475 9.08142 33.1495 9.08142 32.7771V31.9099C9.08142 31.4438 9.12309 31.0531 9.20642 30.738C9.29236 30.4229 9.41345 30.1703 9.5697 29.9802C9.72595 29.7875 9.91345 29.6495 10.1322 29.5662C10.3536 29.4828 10.601 29.4412 10.8744 29.4412C11.0957 29.4412 11.2989 29.4685 11.4838 29.5232C11.6713 29.5753 11.8379 29.6599 11.9838 29.7771C12.1296 29.8917 12.2533 30.0453 12.3549 30.238C12.459 30.4281 12.5385 30.6612 12.5931 30.9373C12.6478 31.2133 12.6752 31.5375 12.6752 31.9099ZM11.9486 32.8943V31.7888C11.9486 31.5336 11.933 31.3097 11.9017 31.1169C11.8731 30.9216 11.8301 30.755 11.7728 30.6169C11.7155 30.4789 11.6426 30.3669 11.5541 30.281C11.4681 30.1951 11.3679 30.1326 11.2533 30.0935C11.1413 30.0518 11.015 30.031 10.8744 30.031C10.7025 30.031 10.5502 30.0636 10.4174 30.1287C10.2845 30.1912 10.1726 30.2914 10.0814 30.4294C9.99288 30.5675 9.92517 30.7485 9.8783 30.9724C9.83142 31.1964 9.80798 31.4685 9.80798 31.7888V32.8943C9.80798 33.1495 9.82231 33.3748 9.85095 33.5701C9.8822 33.7654 9.92778 33.9347 9.98767 34.0779C10.0476 34.2185 10.1205 34.3344 10.2064 34.4255C10.2924 34.5167 10.3913 34.5844 10.5033 34.6287C10.6179 34.6703 10.7442 34.6912 10.8822 34.6912C11.0593 34.6912 11.2142 34.6573 11.347 34.5896C11.4799 34.5219 11.5905 34.4164 11.6791 34.2732C11.7702 34.1274 11.8379 33.9412 11.8822 33.7146C11.9265 33.4854 11.9486 33.212 11.9486 32.8943ZM13.6746 30.9138V30.613C13.6746 30.3969 13.7214 30.2003 13.8152 30.0232C13.9089 29.8461 14.0431 29.7042 14.2175 29.5974C14.392 29.4906 14.599 29.4373 14.8386 29.4373C15.0834 29.4373 15.2918 29.4906 15.4636 29.5974C15.6381 29.7042 15.7722 29.8461 15.866 30.0232C15.9597 30.2003 16.0066 30.3969 16.0066 30.613V30.9138C16.0066 31.1248 15.9597 31.3188 15.866 31.4958C15.7748 31.6729 15.642 31.8149 15.4675 31.9216C15.2957 32.0284 15.0886 32.0818 14.8464 32.0818C14.6043 32.0818 14.3946 32.0284 14.2175 31.9216C14.0431 31.8149 13.9089 31.6729 13.8152 31.4958C13.7214 31.3188 13.6746 31.1248 13.6746 30.9138ZM14.2175 30.613V30.9138C14.2175 31.0336 14.2397 31.1469 14.2839 31.2537C14.3308 31.3604 14.4011 31.4477 14.4949 31.5154C14.5886 31.5805 14.7058 31.613 14.8464 31.613C14.9871 31.613 15.1029 31.5805 15.1941 31.5154C15.2852 31.4477 15.3529 31.3604 15.3972 31.2537C15.4415 31.1469 15.4636 31.0336 15.4636 30.9138V30.613C15.4636 30.4906 15.4402 30.3761 15.3933 30.2693C15.349 30.1599 15.28 30.0727 15.1863 30.0076C15.0951 29.9399 14.9793 29.906 14.8386 29.906C14.7006 29.906 14.5847 29.9399 14.491 30.0076C14.3998 30.0727 14.3308 30.1599 14.2839 30.2693C14.2397 30.3761 14.2175 30.4906 14.2175 30.613ZM16.4441 34.1169V33.8123C16.4441 33.5987 16.491 33.4034 16.5847 33.2263C16.6785 33.0492 16.8126 32.9073 16.9871 32.8005C17.1615 32.6938 17.3686 32.6404 17.6082 32.6404C17.8529 32.6404 18.0613 32.6938 18.2332 32.8005C18.4076 32.9073 18.5418 33.0492 18.6355 33.2263C18.7293 33.4034 18.7761 33.5987 18.7761 33.8123V34.1169C18.7761 34.3305 18.7293 34.5258 18.6355 34.7029C18.5444 34.88 18.4115 35.0219 18.2371 35.1287C18.0652 35.2354 17.8582 35.2888 17.616 35.2888C17.3738 35.2888 17.1654 35.2354 16.991 35.1287C16.8165 35.0219 16.6811 34.88 16.5847 34.7029C16.491 34.5258 16.4441 34.3305 16.4441 34.1169ZM16.9871 33.8123V34.1169C16.9871 34.2367 17.0092 34.3513 17.0535 34.4607C17.1003 34.5675 17.1707 34.6547 17.2644 34.7224C17.3582 34.7875 17.4753 34.8201 17.616 34.8201C17.7566 34.8201 17.8725 34.7875 17.9636 34.7224C18.0574 34.6547 18.1264 34.5675 18.1707 34.4607C18.2149 34.3539 18.2371 34.2393 18.2371 34.1169V33.8123C18.2371 33.6899 18.2136 33.5753 18.1668 33.4685C18.1225 33.3617 18.0535 33.2758 17.9597 33.2107C17.8686 33.143 17.7514 33.1091 17.6082 33.1091C17.4701 33.1091 17.3543 33.143 17.2605 33.2107C17.1694 33.2758 17.1003 33.3617 17.0535 33.4685C17.0092 33.5753 16.9871 33.6899 16.9871 33.8123ZM17.7878 30.3279L15.0105 34.7732L14.6043 34.5154L17.3816 30.0701L17.7878 30.3279Z" fill="black" fill-opacity="0.54"/>
<path d="M7.24609 57.7183H7.30859V58.3315H7.24609C6.86328 58.3315 6.54297 58.394 6.28516 58.519C6.02734 58.6414 5.82292 58.8068 5.67188 59.0151C5.52083 59.2209 5.41146 59.4526 5.34375 59.7104C5.27865 59.9683 5.24609 60.23 5.24609 60.4956V61.3315C5.24609 61.5841 5.27604 61.8081 5.33594 62.0034C5.39583 62.1961 5.47786 62.3589 5.58203 62.4917C5.6862 62.6245 5.80339 62.7248 5.93359 62.7925C6.06641 62.8602 6.20443 62.894 6.34766 62.894C6.51432 62.894 6.66276 62.8628 6.79297 62.8003C6.92318 62.7352 7.03255 62.6453 7.12109 62.5308C7.21224 62.4136 7.28125 62.2756 7.32812 62.1167C7.375 61.9578 7.39844 61.7834 7.39844 61.5933C7.39844 61.424 7.3776 61.2612 7.33594 61.105C7.29427 60.9461 7.23047 60.8055 7.14453 60.6831C7.05859 60.5581 6.95052 60.4604 6.82031 60.3901C6.69271 60.3172 6.54036 60.2808 6.36328 60.2808C6.16276 60.2808 5.97526 60.3302 5.80078 60.4292C5.62891 60.5256 5.48698 60.6532 5.375 60.812C5.26562 60.9683 5.20312 61.1388 5.1875 61.3237L4.80469 61.3198C4.84115 61.0282 4.90885 60.7795 5.00781 60.5737C5.10938 60.3654 5.23438 60.1961 5.38281 60.0659C5.53385 59.9331 5.70182 59.8368 5.88672 59.7769C6.07422 59.7144 6.27214 59.6831 6.48047 59.6831C6.76432 59.6831 7.00911 59.7365 7.21484 59.8433C7.42057 59.95 7.58984 60.0933 7.72266 60.2729C7.85547 60.45 7.95312 60.6506 8.01562 60.8745C8.08073 61.0959 8.11328 61.3237 8.11328 61.5581C8.11328 61.8263 8.07552 62.0776 8 62.312C7.92448 62.5464 7.8112 62.7521 7.66016 62.9292C7.51172 63.1063 7.32812 63.2443 7.10938 63.3433C6.89062 63.4422 6.63672 63.4917 6.34766 63.4917C6.04036 63.4917 5.77214 63.4292 5.54297 63.3042C5.3138 63.1766 5.1237 63.0073 4.97266 62.7964C4.82161 62.5854 4.70833 62.3511 4.63281 62.0933C4.55729 61.8354 4.51953 61.5737 4.51953 61.3081V60.9683C4.51953 60.5672 4.5599 60.174 4.64062 59.7886C4.72135 59.4032 4.86068 59.0542 5.05859 58.7417C5.25911 58.4292 5.53646 58.1805 5.89062 57.9956C6.24479 57.8107 6.69661 57.7183 7.24609 57.7183ZM12.6752 60.1167V60.9839C12.6752 61.45 12.6335 61.8433 12.5502 62.1636C12.4668 62.4839 12.347 62.7417 12.1908 62.937C12.0345 63.1323 11.8457 63.2743 11.6244 63.3628C11.4056 63.4487 11.1582 63.4917 10.8822 63.4917C10.6635 63.4917 10.4616 63.4644 10.2767 63.4097C10.0918 63.355 9.92517 63.2677 9.77673 63.1479C9.6309 63.0256 9.5059 62.8667 9.40173 62.6714C9.29757 62.4761 9.21814 62.2391 9.16345 61.9604C9.10877 61.6818 9.08142 61.3563 9.08142 60.9839V60.1167C9.08142 59.6506 9.12309 59.2599 9.20642 58.9448C9.29236 58.6297 9.41345 58.3771 9.5697 58.187C9.72595 57.9943 9.91345 57.8563 10.1322 57.7729C10.3536 57.6896 10.601 57.6479 10.8744 57.6479C11.0957 57.6479 11.2989 57.6753 11.4838 57.73C11.6713 57.7821 11.8379 57.8667 11.9838 57.9839C12.1296 58.0985 12.2533 58.2521 12.3549 58.4448C12.459 58.6349 12.5385 58.868 12.5931 59.144C12.6478 59.4201 12.6752 59.7443 12.6752 60.1167ZM11.9486 61.1011V59.9956C11.9486 59.7404 11.933 59.5164 11.9017 59.3237C11.8731 59.1284 11.8301 58.9618 11.7728 58.8237C11.7155 58.6857 11.6426 58.5737 11.5541 58.4878C11.4681 58.4019 11.3679 58.3394 11.2533 58.3003C11.1413 58.2586 11.015 58.2378 10.8744 58.2378C10.7025 58.2378 10.5502 58.2703 10.4174 58.3354C10.2845 58.3979 10.1726 58.4982 10.0814 58.6362C9.99288 58.7743 9.92517 58.9552 9.8783 59.1792C9.83142 59.4032 9.80798 59.6753 9.80798 59.9956V61.1011C9.80798 61.3563 9.82231 61.5815 9.85095 61.7769C9.8822 61.9722 9.92778 62.1414 9.98767 62.2847C10.0476 62.4253 10.1205 62.5412 10.2064 62.6323C10.2924 62.7235 10.3913 62.7912 10.5033 62.8354C10.6179 62.8771 10.7442 62.8979 10.8822 62.8979C11.0593 62.8979 11.2142 62.8641 11.347 62.7964C11.4799 62.7287 11.5905 62.6232 11.6791 62.48C11.7702 62.3341 11.8379 62.1479 11.8822 61.9214C11.9265 61.6922 11.9486 61.4188 11.9486 61.1011ZM13.6746 59.1206V58.8198C13.6746 58.6037 13.7214 58.4071 13.8152 58.23C13.9089 58.0529 14.0431 57.911 14.2175 57.8042C14.392 57.6974 14.599 57.644 14.8386 57.644C15.0834 57.644 15.2918 57.6974 15.4636 57.8042C15.6381 57.911 15.7722 58.0529 15.866 58.23C15.9597 58.4071 16.0066 58.6037 16.0066 58.8198V59.1206C16.0066 59.3315 15.9597 59.5256 15.866 59.7026C15.7748 59.8797 15.642 60.0216 15.4675 60.1284C15.2957 60.2352 15.0886 60.2886 14.8464 60.2886C14.6043 60.2886 14.3946 60.2352 14.2175 60.1284C14.0431 60.0216 13.9089 59.8797 13.8152 59.7026C13.7214 59.5256 13.6746 59.3315 13.6746 59.1206ZM14.2175 58.8198V59.1206C14.2175 59.2404 14.2397 59.3537 14.2839 59.4604C14.3308 59.5672 14.4011 59.6545 14.4949 59.7222C14.5886 59.7873 14.7058 59.8198 14.8464 59.8198C14.9871 59.8198 15.1029 59.7873 15.1941 59.7222C15.2852 59.6545 15.3529 59.5672 15.3972 59.4604C15.4415 59.3537 15.4636 59.2404 15.4636 59.1206V58.8198C15.4636 58.6974 15.4402 58.5828 15.3933 58.4761C15.349 58.3667 15.28 58.2795 15.1863 58.2144C15.0951 58.1466 14.9793 58.1128 14.8386 58.1128C14.7006 58.1128 14.5847 58.1466 14.491 58.2144C14.3998 58.2795 14.3308 58.3667 14.2839 58.4761C14.2397 58.5828 14.2175 58.6974 14.2175 58.8198ZM16.4441 62.3237V62.019C16.4441 61.8055 16.491 61.6102 16.5847 61.4331C16.6785 61.256 16.8126 61.1141 16.9871 61.0073C17.1615 60.9006 17.3686 60.8472 17.6082 60.8472C17.8529 60.8472 18.0613 60.9006 18.2332 61.0073C18.4076 61.1141 18.5418 61.256 18.6355 61.4331C18.7293 61.6102 18.7761 61.8055 18.7761 62.019V62.3237C18.7761 62.5373 18.7293 62.7326 18.6355 62.9097C18.5444 63.0868 18.4115 63.2287 18.2371 63.3354C18.0652 63.4422 17.8582 63.4956 17.616 63.4956C17.3738 63.4956 17.1654 63.4422 16.991 63.3354C16.8165 63.2287 16.6811 63.0868 16.5847 62.9097C16.491 62.7326 16.4441 62.5373 16.4441 62.3237ZM16.9871 62.019V62.3237C16.9871 62.4435 17.0092 62.5581 17.0535 62.6675C17.1003 62.7743 17.1707 62.8615 17.2644 62.9292C17.3582 62.9943 17.4753 63.0269 17.616 63.0269C17.7566 63.0269 17.8725 62.9943 17.9636 62.9292C18.0574 62.8615 18.1264 62.7743 18.1707 62.6675C18.2149 62.5607 18.2371 62.4461 18.2371 62.3237V62.019C18.2371 61.8966 18.2136 61.7821 18.1668 61.6753C18.1225 61.5685 18.0535 61.4826 17.9597 61.4175C17.8686 61.3498 17.7514 61.3159 17.6082 61.3159C17.4701 61.3159 17.3543 61.3498 17.2605 61.4175C17.1694 61.4826 17.1003 61.5685 17.0535 61.6753C17.0092 61.7821 16.9871 61.8966 16.9871 62.019ZM17.7878 58.5347L15.0105 62.98L14.6043 62.7222L17.3816 58.2769L17.7878 58.5347Z" fill="black" fill-opacity="0.54"/>
<path d="M8.31641 89.7063V90.3H4.20703V89.8743L6.75391 85.9329H7.34375L6.71094 87.0735L5.02734 89.7063H8.31641ZM7.52344 85.9329V91.6204H6.80078V85.9329H7.52344ZM12.6752 88.3235V89.1907C12.6752 89.6568 12.6335 90.05 12.5502 90.3704C12.4668 90.6907 12.347 90.9485 12.1908 91.1438C12.0345 91.3391 11.8457 91.481 11.6244 91.5696C11.4056 91.6555 11.1582 91.6985 10.8822 91.6985C10.6635 91.6985 10.4616 91.6711 10.2767 91.6165C10.0918 91.5618 9.92517 91.4745 9.77673 91.3547C9.6309 91.2323 9.5059 91.0735 9.40173 90.8782C9.29757 90.6829 9.21814 90.4459 9.16345 90.1672C9.10877 89.8886 9.08142 89.5631 9.08142 89.1907V88.3235C9.08142 87.8573 9.12309 87.4667 9.20642 87.1516C9.29236 86.8365 9.41345 86.5839 9.5697 86.3938C9.72595 86.2011 9.91345 86.0631 10.1322 85.9797C10.3536 85.8964 10.601 85.8547 10.8744 85.8547C11.0957 85.8547 11.2989 85.8821 11.4838 85.9368C11.6713 85.9889 11.8379 86.0735 11.9838 86.1907C12.1296 86.3053 12.2533 86.4589 12.3549 86.6516C12.459 86.8417 12.5385 87.0748 12.5931 87.3508C12.6478 87.6269 12.6752 87.9511 12.6752 88.3235ZM11.9486 89.3079V88.2024C11.9486 87.9472 11.933 87.7232 11.9017 87.5305C11.8731 87.3352 11.8301 87.1685 11.7728 87.0305C11.7155 86.8925 11.6426 86.7805 11.5541 86.6946C11.4681 86.6086 11.3679 86.5461 11.2533 86.5071C11.1413 86.4654 11.015 86.4446 10.8744 86.4446C10.7025 86.4446 10.5502 86.4771 10.4174 86.5422C10.2845 86.6047 10.1726 86.705 10.0814 86.843C9.99288 86.981 9.92517 87.162 9.8783 87.386C9.83142 87.6099 9.80798 87.8821 9.80798 88.2024V89.3079C9.80798 89.5631 9.82231 89.7883 9.85095 89.9836C9.8822 90.179 9.92778 90.3482 9.98767 90.4915C10.0476 90.6321 10.1205 90.748 10.2064 90.8391C10.2924 90.9303 10.3913 90.998 10.5033 91.0422C10.6179 91.0839 10.7442 91.1047 10.8822 91.1047C11.0593 91.1047 11.2142 91.0709 11.347 91.0032C11.4799 90.9355 11.5905 90.83 11.6791 90.6868C11.7702 90.5409 11.8379 90.3547 11.8822 90.1282C11.9265 89.899 11.9486 89.6256 11.9486 89.3079ZM13.6746 87.3274V87.0266C13.6746 86.8105 13.7214 86.6139 13.8152 86.4368C13.9089 86.2597 14.0431 86.1178 14.2175 86.011C14.392 85.9042 14.599 85.8508 14.8386 85.8508C15.0834 85.8508 15.2918 85.9042 15.4636 86.011C15.6381 86.1178 15.7722 86.2597 15.866 86.4368C15.9597 86.6139 16.0066 86.8105 16.0066 87.0266V87.3274C16.0066 87.5383 15.9597 87.7323 15.866 87.9094C15.7748 88.0865 15.642 88.2284 15.4675 88.3352C15.2957 88.442 15.0886 88.4954 14.8464 88.4954C14.6043 88.4954 14.3946 88.442 14.2175 88.3352C14.0431 88.2284 13.9089 88.0865 13.8152 87.9094C13.7214 87.7323 13.6746 87.5383 13.6746 87.3274ZM14.2175 87.0266V87.3274C14.2175 87.4472 14.2397 87.5605 14.2839 87.6672C14.3308 87.774 14.4011 87.8612 14.4949 87.929C14.5886 87.9941 14.7058 88.0266 14.8464 88.0266C14.9871 88.0266 15.1029 87.9941 15.1941 87.929C15.2852 87.8612 15.3529 87.774 15.3972 87.6672C15.4415 87.5605 15.4636 87.4472 15.4636 87.3274V87.0266C15.4636 86.9042 15.4402 86.7896 15.3933 86.6829C15.349 86.5735 15.28 86.4862 15.1863 86.4211C15.0951 86.3534 14.9793 86.3196 14.8386 86.3196C14.7006 86.3196 14.5847 86.3534 14.491 86.4211C14.3998 86.4862 14.3308 86.5735 14.2839 86.6829C14.2397 86.7896 14.2175 86.9042 14.2175 87.0266ZM16.4441 90.5305V90.2258C16.4441 90.0123 16.491 89.817 16.5847 89.6399C16.6785 89.4628 16.8126 89.3209 16.9871 89.2141C17.1615 89.1073 17.3686 89.054 17.6082 89.054C17.8529 89.054 18.0613 89.1073 18.2332 89.2141C18.4076 89.3209 18.5418 89.4628 18.6355 89.6399C18.7293 89.817 18.7761 90.0123 18.7761 90.2258V90.5305C18.7761 90.7441 18.7293 90.9394 18.6355 91.1165C18.5444 91.2935 18.4115 91.4355 18.2371 91.5422C18.0652 91.649 17.8582 91.7024 17.616 91.7024C17.3738 91.7024 17.1654 91.649 16.991 91.5422C16.8165 91.4355 16.6811 91.2935 16.5847 91.1165C16.491 90.9394 16.4441 90.7441 16.4441 90.5305ZM16.9871 90.2258V90.5305C16.9871 90.6503 17.0092 90.7649 17.0535 90.8743C17.1003 90.981 17.1707 91.0683 17.2644 91.136C17.3582 91.2011 17.4753 91.2336 17.616 91.2336C17.7566 91.2336 17.8725 91.2011 17.9636 91.136C18.0574 91.0683 18.1264 90.981 18.1707 90.8743C18.2149 90.7675 18.2371 90.6529 18.2371 90.5305V90.2258C18.2371 90.1034 18.2136 89.9889 18.1668 89.8821C18.1225 89.7753 18.0535 89.6894 17.9597 89.6243C17.8686 89.5566 17.7514 89.5227 17.6082 89.5227C17.4701 89.5227 17.3543 89.5566 17.2605 89.6243C17.1694 89.6894 17.1003 89.7753 17.0535 89.8821C17.0092 89.9889 16.9871 90.1034 16.9871 90.2258ZM17.7878 86.7415L15.0105 91.1868L14.6043 90.929L17.3816 86.4836L17.7878 86.7415Z" fill="black" fill-opacity="0.54"/>
<path d="M8.19922 119.233V119.827H4.47656V119.308L6.33984 117.233C6.56901 116.978 6.74609 116.762 6.87109 116.585C6.9987 116.405 7.08724 116.245 7.13672 116.104C7.1888 115.961 7.21484 115.815 7.21484 115.667C7.21484 115.479 7.17578 115.31 7.09766 115.159C7.02214 115.006 6.91016 114.883 6.76172 114.792C6.61328 114.701 6.43359 114.655 6.22266 114.655C5.97005 114.655 5.75911 114.705 5.58984 114.804C5.42318 114.9 5.29818 115.035 5.21484 115.21C5.13151 115.384 5.08984 115.585 5.08984 115.812H4.36719C4.36719 115.491 4.4375 115.198 4.57812 114.933C4.71875 114.667 4.92708 114.456 5.20312 114.3C5.47917 114.141 5.81901 114.062 6.22266 114.062C6.58203 114.062 6.88932 114.125 7.14453 114.253C7.39974 114.378 7.59505 114.555 7.73047 114.784C7.86849 115.011 7.9375 115.276 7.9375 115.581C7.9375 115.748 7.90885 115.917 7.85156 116.089C7.79688 116.258 7.72005 116.427 7.62109 116.597C7.52474 116.766 7.41146 116.933 7.28125 117.097C7.15365 117.261 7.01693 117.422 6.87109 117.581L5.34766 119.233H8.19922ZM12.6752 116.53V117.397C12.6752 117.864 12.6335 118.257 12.5502 118.577C12.4668 118.897 12.347 119.155 12.1908 119.351C12.0345 119.546 11.8457 119.688 11.6244 119.776C11.4056 119.862 11.1582 119.905 10.8822 119.905C10.6635 119.905 10.4616 119.878 10.2767 119.823C10.0918 119.769 9.92517 119.681 9.77673 119.562C9.6309 119.439 9.5059 119.28 9.40173 119.085C9.29757 118.89 9.21814 118.653 9.16345 118.374C9.10877 118.095 9.08142 117.77 9.08142 117.397V116.53C9.08142 116.064 9.12309 115.674 9.20642 115.358C9.29236 115.043 9.41345 114.791 9.5697 114.601C9.72595 114.408 9.91345 114.27 10.1322 114.187C10.3536 114.103 10.601 114.062 10.8744 114.062C11.0957 114.062 11.2989 114.089 11.4838 114.144C11.6713 114.196 11.8379 114.28 11.9838 114.397C12.1296 114.512 12.2533 114.666 12.3549 114.858C12.459 115.049 12.5385 115.282 12.5931 115.558C12.6478 115.834 12.6752 116.158 12.6752 116.53ZM11.9486 117.515V116.409C11.9486 116.154 11.933 115.93 11.9017 115.737C11.8731 115.542 11.8301 115.375 11.7728 115.237C11.7155 115.099 11.6426 114.987 11.5541 114.901C11.4681 114.815 11.3679 114.753 11.2533 114.714C11.1413 114.672 11.015 114.651 10.8744 114.651C10.7025 114.651 10.5502 114.684 10.4174 114.749C10.2845 114.812 10.1726 114.912 10.0814 115.05C9.99288 115.188 9.92517 115.369 9.8783 115.593C9.83142 115.817 9.80798 116.089 9.80798 116.409V117.515C9.80798 117.77 9.82231 117.995 9.85095 118.19C9.8822 118.386 9.92778 118.555 9.98767 118.698C10.0476 118.839 10.1205 118.955 10.2064 119.046C10.2924 119.137 10.3913 119.205 10.5033 119.249C10.6179 119.291 10.7442 119.312 10.8822 119.312C11.0593 119.312 11.2142 119.278 11.347 119.21C11.4799 119.142 11.5905 119.037 11.6791 118.894C11.7702 118.748 11.8379 118.562 11.8822 118.335C11.9265 118.106 11.9486 117.832 11.9486 117.515ZM13.6746 115.534V115.233C13.6746 115.017 13.7214 114.821 13.8152 114.644C13.9089 114.466 14.0431 114.325 14.2175 114.218C14.392 114.111 14.599 114.058 14.8386 114.058C15.0834 114.058 15.2918 114.111 15.4636 114.218C15.6381 114.325 15.7722 114.466 15.866 114.644C15.9597 114.821 16.0066 115.017 16.0066 115.233V115.534C16.0066 115.745 15.9597 115.939 15.866 116.116C15.7748 116.293 15.642 116.435 15.4675 116.542C15.2957 116.649 15.0886 116.702 14.8464 116.702C14.6043 116.702 14.3946 116.649 14.2175 116.542C14.0431 116.435 13.9089 116.293 13.8152 116.116C13.7214 115.939 13.6746 115.745 13.6746 115.534ZM14.2175 115.233V115.534C14.2175 115.654 14.2397 115.767 14.2839 115.874C14.3308 115.981 14.4011 116.068 14.4949 116.136C14.5886 116.201 14.7058 116.233 14.8464 116.233C14.9871 116.233 15.1029 116.201 15.1941 116.136C15.2852 116.068 15.3529 115.981 15.3972 115.874C15.4415 115.767 15.4636 115.654 15.4636 115.534V115.233C15.4636 115.111 15.4402 114.996 15.3933 114.89C15.349 114.78 15.28 114.693 15.1863 114.628C15.0951 114.56 14.9793 114.526 14.8386 114.526C14.7006 114.526 14.5847 114.56 14.491 114.628C14.3998 114.693 14.3308 114.78 14.2839 114.89C14.2397 114.996 14.2175 115.111 14.2175 115.233ZM16.4441 118.737V118.433C16.4441 118.219 16.491 118.024 16.5847 117.847C16.6785 117.67 16.8126 117.528 16.9871 117.421C17.1615 117.314 17.3686 117.261 17.6082 117.261C17.8529 117.261 18.0613 117.314 18.2332 117.421C18.4076 117.528 18.5418 117.67 18.6355 117.847C18.7293 118.024 18.7761 118.219 18.7761 118.433V118.737C18.7761 118.951 18.7293 119.146 18.6355 119.323C18.5444 119.5 18.4115 119.642 18.2371 119.749C18.0652 119.856 17.8582 119.909 17.616 119.909C17.3738 119.909 17.1654 119.856 16.991 119.749C16.8165 119.642 16.6811 119.5 16.5847 119.323C16.491 119.146 16.4441 118.951 16.4441 118.737ZM16.9871 118.433V118.737C16.9871 118.857 17.0092 118.972 17.0535 119.081C17.1003 119.188 17.1707 119.275 17.2644 119.343C17.3582 119.408 17.4753 119.44 17.616 119.44C17.7566 119.44 17.8725 119.408 17.9636 119.343C18.0574 119.275 18.1264 119.188 18.1707 119.081C18.2149 118.974 18.2371 118.86 18.2371 118.737V118.433C18.2371 118.31 18.2136 118.196 18.1668 118.089C18.1225 117.982 18.0535 117.896 17.9597 117.831C17.8686 117.763 17.7514 117.729 17.6082 117.729C17.4701 117.729 17.3543 117.763 17.2605 117.831C17.1694 117.896 17.1003 117.982 17.0535 118.089C17.0092 118.196 16.9871 118.31 16.9871 118.433ZM17.7878 114.948L15.0105 119.394L14.6043 119.136L17.3816 114.69L17.7878 114.948Z" fill="black" fill-opacity="0.54"/>
<path d="M13.043 144.737V145.604C13.043 146.07 13.0013 146.464 12.918 146.784C12.8346 147.104 12.7148 147.362 12.5586 147.557C12.4023 147.753 12.2135 147.895 11.9922 147.983C11.7734 148.069 11.526 148.112 11.25 148.112C11.0312 148.112 10.8294 148.085 10.6445 148.03C10.4596 147.975 10.293 147.888 10.1445 147.768C9.9987 147.646 9.8737 147.487 9.76953 147.292C9.66536 147.096 9.58594 146.859 9.53125 146.581C9.47656 146.302 9.44922 145.977 9.44922 145.604V144.737C9.44922 144.271 9.49089 143.88 9.57422 143.565C9.66016 143.25 9.78125 142.997 9.9375 142.807C10.0938 142.615 10.2812 142.477 10.5 142.393C10.7214 142.31 10.9688 142.268 11.2422 142.268C11.4635 142.268 11.6667 142.296 11.8516 142.35C12.0391 142.402 12.2057 142.487 12.3516 142.604C12.4974 142.719 12.6211 142.872 12.7227 143.065C12.8268 143.255 12.9062 143.488 12.9609 143.764C13.0156 144.04 13.043 144.365 13.043 144.737ZM12.3164 145.721V144.616C12.3164 144.361 12.3008 144.137 12.2695 143.944C12.2409 143.749 12.1979 143.582 12.1406 143.444C12.0833 143.306 12.0104 143.194 11.9219 143.108C11.8359 143.022 11.7357 142.96 11.6211 142.921C11.5091 142.879 11.3828 142.858 11.2422 142.858C11.0703 142.858 10.918 142.891 10.7852 142.956C10.6523 143.018 10.5404 143.119 10.4492 143.257C10.3607 143.395 10.293 143.576 10.2461 143.8C10.1992 144.024 10.1758 144.296 10.1758 144.616V145.721C10.1758 145.977 10.1901 146.202 10.2188 146.397C10.25 146.593 10.2956 146.762 10.3555 146.905C10.4154 147.046 10.4883 147.162 10.5742 147.253C10.6602 147.344 10.7591 147.412 10.8711 147.456C10.9857 147.497 11.112 147.518 11.25 147.518C11.4271 147.518 11.582 147.484 11.7148 147.417C11.8477 147.349 11.9583 147.244 12.0469 147.1C12.138 146.955 12.2057 146.768 12.25 146.542C12.2943 146.313 12.3164 146.039 12.3164 145.721ZM14.0424 143.741V143.44C14.0424 143.224 14.0892 143.027 14.183 142.85C14.2767 142.673 14.4108 142.531 14.5853 142.425C14.7598 142.318 14.9668 142.264 15.2064 142.264C15.4512 142.264 15.6595 142.318 15.8314 142.425C16.0059 142.531 16.14 142.673 16.2338 142.85C16.3275 143.027 16.3744 143.224 16.3744 143.44V143.741C16.3744 143.952 16.3275 144.146 16.2338 144.323C16.1426 144.5 16.0098 144.642 15.8353 144.749C15.6635 144.856 15.4564 144.909 15.2142 144.909C14.972 144.909 14.7624 144.856 14.5853 144.749C14.4108 144.642 14.2767 144.5 14.183 144.323C14.0892 144.146 14.0424 143.952 14.0424 143.741ZM14.5853 143.44V143.741C14.5853 143.861 14.6075 143.974 14.6517 144.081C14.6986 144.188 14.7689 144.275 14.8627 144.343C14.9564 144.408 15.0736 144.44 15.2142 144.44C15.3549 144.44 15.4707 144.408 15.5619 144.343C15.653 144.275 15.7207 144.188 15.765 144.081C15.8093 143.974 15.8314 143.861 15.8314 143.741V143.44C15.8314 143.318 15.808 143.203 15.7611 143.096C15.7168 142.987 15.6478 142.9 15.5541 142.835C15.4629 142.767 15.347 142.733 15.2064 142.733C15.0684 142.733 14.9525 142.767 14.8588 142.835C14.7676 142.9 14.6986 142.987 14.6517 143.096C14.6075 143.203 14.5853 143.318 14.5853 143.44ZM16.8119 146.944V146.639C16.8119 146.426 16.8588 146.231 16.9525 146.053C17.0463 145.876 17.1804 145.734 17.3549 145.628C17.5293 145.521 17.7364 145.468 17.976 145.468C18.2207 145.468 18.4291 145.521 18.601 145.628C18.7754 145.734 18.9095 145.876 19.0033 146.053C19.097 146.231 19.1439 146.426 19.1439 146.639V146.944C19.1439 147.158 19.097 147.353 19.0033 147.53C18.9122 147.707 18.7793 147.849 18.6049 147.956C18.433 148.063 18.226 148.116 17.9838 148.116C17.7416 148.116 17.5332 148.063 17.3588 147.956C17.1843 147.849 17.0489 147.707 16.9525 147.53C16.8588 147.353 16.8119 147.158 16.8119 146.944ZM17.3549 146.639V146.944C17.3549 147.064 17.377 147.178 17.4213 147.288C17.4681 147.395 17.5385 147.482 17.6322 147.55C17.726 147.615 17.8431 147.647 17.9838 147.647C18.1244 147.647 18.2403 147.615 18.3314 147.55C18.4252 147.482 18.4942 147.395 18.5385 147.288C18.5827 147.181 18.6049 147.066 18.6049 146.944V146.639C18.6049 146.517 18.5814 146.402 18.5345 146.296C18.4903 146.189 18.4213 146.103 18.3275 146.038C18.2364 145.97 18.1192 145.936 17.976 145.936C17.8379 145.936 17.722 145.97 17.6283 146.038C17.5372 146.103 17.4681 146.189 17.4213 146.296C17.377 146.402 17.3549 146.517 17.3549 146.639ZM18.1556 143.155L15.3783 147.6L14.972 147.343L17.7494 142.897L18.1556 143.155Z" fill="black" fill-opacity="0.54"/>
<path d="M25 4.16113L200 4.16116" stroke="black" stroke-opacity="0.12"/>
<path d="M25 33.1611L200 33.1612" stroke="black" stroke-opacity="0.12"/>
<path d="M25 61.1611L200 61.1612" stroke="black" stroke-opacity="0.12"/>
<path d="M25 89.1611L200 89.1612" stroke="black" stroke-opacity="0.12"/>
<path d="M25 118.161L200 118.161" stroke="black" stroke-opacity="0.12"/>
<path d="M36 62C36 60.8954 36.8954 60 38 60H52C53.1046 60 54 60.8954 54 62V146H36V62Z" fill="#FFC107"/>
<path d="M58 92C58 90.8954 58.8954 90 60 90H74C75.1046 90 76 90.8954 76 92V146H58V92Z" fill="#4CAF50"/>
<path d="M80 79C80 77.8954 80.8954 77 82 77H96C97.1046 77 98 77.8954 98 79V146H80V79Z" fill="#2196F3"/>
<path d="M125 78C125 76.8954 125.895 76 127 76H141C142.105 76 143 76.8954 143 78V146H125V78Z" fill="#FFC107"/>
<path d="M147 51C147 49.8954 147.895 49 149 49H163C164.105 49 165 49.8954 165 51V146H147V51Z" fill="#4CAF50"/>
<path d="M169 36C169 34.8954 169.895 34 171 34H185C186.105 34 187 34.8954 187 36V146H169V36Z" fill="#2196F3"/>
<line x1="23.2" y1="145.961" x2="202.8" y2="145.961" stroke="black" stroke-opacity="0.7" stroke-width="0.4" stroke-linecap="square"/>
<line x1="67" y1="148.072" x2="67" y2="147.25" stroke="black" stroke-opacity="0.5" stroke-width="0.5" stroke-linecap="square"/>
<path d="M59.0591 152.025V152.893C59.0591 153.359 59.0174 153.752 58.9341 154.072C58.8507 154.393 58.7309 154.65 58.5747 154.846C58.4184 155.041 58.2296 155.183 58.0083 155.271C57.7895 155.357 57.5421 155.4 57.2661 155.4C57.0473 155.4 56.8455 155.373 56.6606 155.318C56.4757 155.264 56.3091 155.176 56.1606 155.057C56.0148 154.934 55.8898 154.775 55.7856 154.58C55.6815 154.385 55.602 154.148 55.5473 153.869C55.4927 153.59 55.4653 153.265 55.4653 152.893V152.025C55.4653 151.559 55.507 151.169 55.5903 150.854C55.6762 150.538 55.7973 150.286 55.9536 150.096C56.1098 149.903 56.2973 149.765 56.5161 149.682C56.7374 149.598 56.9848 149.557 57.2583 149.557C57.4796 149.557 57.6828 149.584 57.8677 149.639C58.0552 149.691 58.2218 149.775 58.3677 149.893C58.5135 150.007 58.6372 150.161 58.7387 150.354C58.8429 150.544 58.9223 150.777 58.977 151.053C59.0317 151.329 59.0591 151.653 59.0591 152.025ZM58.3325 153.01V151.904C58.3325 151.649 58.3169 151.425 58.2856 151.232C58.257 151.037 58.214 150.87 58.1567 150.732C58.0994 150.594 58.0265 150.482 57.938 150.396C57.852 150.311 57.7518 150.248 57.6372 150.209C57.5252 150.167 57.3989 150.146 57.2583 150.146C57.0864 150.146 56.9341 150.179 56.8012 150.244C56.6684 150.307 56.5565 150.407 56.4653 150.545C56.3768 150.683 56.3091 150.864 56.2622 151.088C56.2153 151.312 56.1919 151.584 56.1919 151.904V153.01C56.1919 153.265 56.2062 153.49 56.2348 153.686C56.2661 153.881 56.3117 154.05 56.3716 154.193C56.4315 154.334 56.5044 154.45 56.5903 154.541C56.6762 154.632 56.7752 154.7 56.8872 154.744C57.0018 154.786 57.1281 154.807 57.2661 154.807C57.4432 154.807 57.5981 154.773 57.7309 154.705C57.8637 154.637 57.9744 154.532 58.063 154.389C58.1541 154.243 58.2218 154.057 58.2661 153.83C58.3104 153.601 58.3325 153.327 58.3325 153.01ZM62.4464 149.604V155.322H61.7237V150.506L60.2667 151.037V150.385L62.3331 149.604H62.4464ZM67.6624 149.635V155.322H66.9085V149.635H67.6624ZM70.0452 152.193V152.811H67.4983V152.193H70.0452ZM70.4319 149.635V150.252H67.4983V149.635H70.4319ZM72.9716 155.4C72.6773 155.4 72.4104 155.351 72.1708 155.252C71.9338 155.15 71.7294 155.008 71.5575 154.826C71.3883 154.644 71.2581 154.428 71.1669 154.178C71.0758 153.928 71.0302 153.654 71.0302 153.357V153.193C71.0302 152.85 71.081 152.544 71.1825 152.275C71.2841 152.005 71.4221 151.775 71.5966 151.588C71.7711 151.4 71.969 151.258 72.1903 151.162C72.4117 151.066 72.6409 151.018 72.8778 151.018C73.1799 151.018 73.4403 151.07 73.6591 151.174C73.8805 151.278 74.0614 151.424 74.2021 151.611C74.3427 151.796 74.4469 152.015 74.5146 152.268C74.5823 152.518 74.6161 152.791 74.6161 153.088V153.412H71.4599V152.822H73.8935V152.768C73.8831 152.58 73.844 152.398 73.7763 152.221C73.7112 152.044 73.607 151.898 73.4638 151.783C73.3206 151.669 73.1252 151.611 72.8778 151.611C72.7138 151.611 72.5627 151.646 72.4247 151.717C72.2867 151.785 72.1682 151.886 72.0693 152.021C71.9703 152.157 71.8935 152.322 71.8388 152.518C71.7841 152.713 71.7568 152.938 71.7568 153.193V153.357C71.7568 153.558 71.7841 153.747 71.8388 153.924C71.8961 154.098 71.9781 154.252 72.0849 154.385C72.1943 154.518 72.3258 154.622 72.4794 154.697C72.6357 154.773 72.8127 154.811 73.0107 154.811C73.2659 154.811 73.482 154.758 73.6591 154.654C73.8362 154.55 73.9911 154.411 74.1239 154.236L74.5614 154.584C74.4703 154.722 74.3544 154.854 74.2138 154.979C74.0732 155.104 73.9 155.205 73.6943 155.283C73.4911 155.361 73.2502 155.4 72.9716 155.4ZM75.5386 149.322H76.2652V154.502L76.2027 155.322H75.5386V149.322ZM79.1206 153.174V153.256C79.1206 153.563 79.0842 153.848 79.0113 154.111C78.9383 154.372 78.8316 154.598 78.6909 154.791C78.5503 154.984 78.3784 155.133 78.1753 155.24C77.9722 155.347 77.7391 155.4 77.4761 155.4C77.2079 155.4 76.9722 155.355 76.7691 155.264C76.5685 155.17 76.3993 155.036 76.2613 154.861C76.1232 154.687 76.0126 154.476 75.9292 154.229C75.8485 153.981 75.7925 153.702 75.7613 153.393V153.033C75.7925 152.721 75.8485 152.441 75.9292 152.193C76.0126 151.946 76.1232 151.735 76.2613 151.561C76.3993 151.383 76.5685 151.249 76.7691 151.158C76.9696 151.064 77.2027 151.018 77.4683 151.018C77.7339 151.018 77.9696 151.07 78.1753 151.174C78.381 151.275 78.5529 151.421 78.6909 151.611C78.8316 151.801 78.9383 152.029 79.0113 152.295C79.0842 152.558 79.1206 152.851 79.1206 153.174ZM78.3941 153.256V153.174C78.3941 152.963 78.3745 152.765 78.3355 152.58C78.2964 152.393 78.2339 152.229 78.148 152.088C78.062 151.945 77.9488 151.833 77.8081 151.752C77.6675 151.669 77.4943 151.627 77.2886 151.627C77.1063 151.627 76.9475 151.658 76.812 151.721C76.6792 151.783 76.5659 151.868 76.4722 151.975C76.3784 152.079 76.3016 152.199 76.2417 152.334C76.1844 152.467 76.1415 152.605 76.1128 152.748V153.689C76.1545 153.872 76.2222 154.048 76.3159 154.217C76.4123 154.383 76.5399 154.52 76.6988 154.627C76.8602 154.734 77.0594 154.787 77.2964 154.787C77.4917 154.787 77.6584 154.748 77.7964 154.67C77.937 154.589 78.0503 154.479 78.1363 154.338C78.2248 154.197 78.2899 154.035 78.3316 153.85C78.3732 153.665 78.3941 153.467 78.3941 153.256Z" fill="black" fill-opacity="0.54"/>
<g clip-path="url(#clip1_4183_90877)">
<line x1="155.5" y1="147.072" x2="155.5" y2="146.25" stroke="black" stroke-opacity="0.5" stroke-width="0.5" stroke-linecap="square"/>
<path d="M147.559 152.025V152.892C147.559 153.358 147.517 153.752 147.434 154.072C147.351 154.392 147.231 154.65 147.075 154.845C146.918 155.041 146.73 155.183 146.508 155.271C146.29 155.357 146.042 155.4 145.766 155.4C145.547 155.4 145.346 155.373 145.161 155.318C144.976 155.263 144.809 155.176 144.661 155.056C144.515 154.934 144.39 154.775 144.286 154.58C144.181 154.385 144.102 154.148 144.047 153.869C143.993 153.59 143.965 153.265 143.965 152.892V152.025C143.965 151.559 144.007 151.168 144.09 150.853C144.176 150.538 144.297 150.286 144.454 150.095C144.61 149.903 144.797 149.765 145.016 149.681C145.237 149.598 145.485 149.556 145.758 149.556C145.98 149.556 146.183 149.584 146.368 149.638C146.555 149.691 146.722 149.775 146.868 149.892C147.013 150.007 147.137 150.161 147.239 150.353C147.343 150.543 147.422 150.776 147.477 151.052C147.532 151.329 147.559 151.653 147.559 152.025ZM146.832 153.01V151.904C146.832 151.649 146.817 151.425 146.786 151.232C146.757 151.037 146.714 150.87 146.657 150.732C146.599 150.594 146.527 150.482 146.438 150.396C146.352 150.31 146.252 150.248 146.137 150.209C146.025 150.167 145.899 150.146 145.758 150.146C145.586 150.146 145.434 150.179 145.301 150.244C145.168 150.306 145.056 150.407 144.965 150.545C144.877 150.683 144.809 150.864 144.762 151.088C144.715 151.312 144.692 151.584 144.692 151.904V153.01C144.692 153.265 144.706 153.49 144.735 153.685C144.766 153.881 144.812 154.05 144.872 154.193C144.931 154.334 145.004 154.45 145.09 154.541C145.176 154.632 145.275 154.7 145.387 154.744C145.502 154.786 145.628 154.806 145.766 154.806C145.943 154.806 146.098 154.773 146.231 154.705C146.364 154.637 146.474 154.532 146.563 154.388C146.654 154.243 146.722 154.056 146.766 153.83C146.81 153.601 146.832 153.327 146.832 153.01ZM152.298 154.728V155.322H148.575V154.802L150.439 152.728C150.668 152.473 150.845 152.257 150.97 152.08C151.097 151.9 151.186 151.74 151.235 151.599C151.288 151.456 151.314 151.31 151.314 151.162C151.314 150.974 151.274 150.805 151.196 150.654C151.121 150.5 151.009 150.378 150.86 150.287C150.712 150.196 150.532 150.15 150.321 150.15C150.069 150.15 149.858 150.2 149.689 150.299C149.522 150.395 149.397 150.53 149.314 150.705C149.23 150.879 149.189 151.08 149.189 151.306H148.466C148.466 150.986 148.536 150.693 148.677 150.427C148.817 150.162 149.026 149.951 149.302 149.795C149.578 149.636 149.918 149.556 150.321 149.556C150.681 149.556 150.988 149.62 151.243 149.748C151.498 149.873 151.694 150.05 151.829 150.279C151.967 150.506 152.036 150.771 152.036 151.076C152.036 151.243 152.008 151.412 151.95 151.584C151.896 151.753 151.819 151.922 151.72 152.092C151.623 152.261 151.51 152.427 151.38 152.592C151.252 152.756 151.116 152.917 150.97 153.076L149.446 154.728H152.298ZM156.162 149.635V155.322H155.409V149.635H156.162ZM158.545 152.193V152.81H155.998V152.193H158.545ZM158.932 149.635V150.252H155.998V149.635H158.932ZM161.472 155.4C161.177 155.4 160.91 155.351 160.671 155.252C160.434 155.15 160.229 155.008 160.058 154.826C159.888 154.644 159.758 154.427 159.667 154.177C159.576 153.927 159.53 153.654 159.53 153.357V153.193C159.53 152.849 159.581 152.543 159.683 152.275C159.784 152.004 159.922 151.775 160.097 151.588C160.271 151.4 160.469 151.258 160.69 151.162C160.912 151.066 161.141 151.017 161.378 151.017C161.68 151.017 161.94 151.069 162.159 151.174C162.38 151.278 162.561 151.424 162.702 151.611C162.843 151.796 162.947 152.015 163.015 152.267C163.082 152.517 163.116 152.791 163.116 153.088V153.412H159.96V152.822H162.393V152.767C162.383 152.58 162.344 152.398 162.276 152.22C162.211 152.043 162.107 151.898 161.964 151.783C161.821 151.668 161.625 151.611 161.378 151.611C161.214 151.611 161.063 151.646 160.925 151.717C160.787 151.784 160.668 151.886 160.569 152.021C160.47 152.157 160.393 152.322 160.339 152.517C160.284 152.713 160.257 152.938 160.257 153.193V153.357C160.257 153.558 160.284 153.747 160.339 153.924C160.396 154.098 160.478 154.252 160.585 154.385C160.694 154.517 160.826 154.622 160.979 154.697C161.136 154.773 161.313 154.81 161.511 154.81C161.766 154.81 161.982 154.758 162.159 154.654C162.336 154.55 162.491 154.411 162.624 154.236L163.061 154.584C162.97 154.722 162.854 154.853 162.714 154.978C162.573 155.103 162.4 155.205 162.194 155.283C161.991 155.361 161.75 155.4 161.472 155.4ZM164.039 149.322H164.765V154.502L164.703 155.322H164.039V149.322ZM167.621 153.174V153.256C167.621 153.563 167.584 153.848 167.511 154.111C167.438 154.372 167.332 154.598 167.191 154.791C167.05 154.983 166.878 155.133 166.675 155.24C166.472 155.347 166.239 155.4 165.976 155.4C165.708 155.4 165.472 155.355 165.269 155.263C165.069 155.17 164.899 155.036 164.761 154.861C164.623 154.687 164.513 154.476 164.429 154.228C164.348 153.981 164.293 153.702 164.261 153.392V153.033C164.293 152.72 164.348 152.441 164.429 152.193C164.513 151.946 164.623 151.735 164.761 151.56C164.899 151.383 165.069 151.249 165.269 151.158C165.47 151.064 165.703 151.017 165.968 151.017C166.234 151.017 166.47 151.069 166.675 151.174C166.881 151.275 167.053 151.421 167.191 151.611C167.332 151.801 167.438 152.029 167.511 152.295C167.584 152.558 167.621 152.851 167.621 153.174ZM166.894 153.256V153.174C166.894 152.963 166.875 152.765 166.835 152.58C166.796 152.392 166.734 152.228 166.648 152.088C166.562 151.944 166.449 151.832 166.308 151.752C166.168 151.668 165.994 151.627 165.789 151.627C165.606 151.627 165.447 151.658 165.312 151.72C165.179 151.783 165.066 151.868 164.972 151.974C164.878 152.079 164.802 152.198 164.742 152.334C164.684 152.467 164.641 152.605 164.613 152.748V153.689C164.654 153.872 164.722 154.047 164.816 154.217C164.912 154.383 165.04 154.52 165.199 154.627C165.36 154.733 165.559 154.787 165.796 154.787C165.992 154.787 166.158 154.748 166.296 154.67C166.437 154.589 166.55 154.478 166.636 154.338C166.725 154.197 166.79 154.034 166.832 153.849C166.873 153.664 166.894 153.467 166.894 153.256Z" fill="black" fill-opacity="0.54"/>
</g>
</g>
<defs>
<clipPath id="clip0_4183_90877">
<rect width="200" height="160" fill="white"/>
</clipPath>
<clipPath id="clip1_4183_90877">
<rect width="88.5" height="10.322" fill="white" transform="translate(111.5 146)"/>
</clipPath>
</defs>
</svg>
",
+  "description": "Displays changes to time-series data over time—for example, temperature or humidity readings.",
+  "descriptor": {
+    "type": "timeseries",
+    "sizeX": 8,
+    "sizeY": 5,
+    "resources": [],
+    "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        chartType: 'bar',\n        previewWidth: '80%',\n        embedTitlePanel: true,\n        hasAdditionalLatestDataKeys: true,\n        dataKeySettingsFunction: TbTimeSeriesChart.dataKeySettings('bar'),\n        defaultDataKeysFunction: function() {\n            return [{ name: 'temperature', label: 'Temperature', type: 'timeseries', units: '°C', decimals: 0 }];\n        }\n    };\n}\n",
+    "settingsSchema": "{}",
+    "dataKeySettingsSchema": "{}",
+    "latestDataKeySettingsSchema": "{}",
+    "settingsDirective": "tb-time-series-chart-widget-settings",
+    "dataKeySettingsDirective": "tb-time-series-chart-key-settings",
+    "latestDataKeySettingsDirective": "",
+    "hasBasicMode": true,
+    "basicModeDirective": "tb-time-series-chart-basic-config",
+    "defaultConfig": "{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"First\",\"color\":\"#2196f3\",\"settings\":{\"type\":\"bar\"},\"_hash\":0.8587686344902596,\"funcBody\":\"var value = prevValue + Math.random() * 100 - 50;\\nvar multiplier = Math.pow(10, 2 || 0);\\nvar value = Math.round(value * multiplier) / multiplier;\\nif (value < -1000) {\\n\\tvalue = -1000;\\n} else if (value > 1000) {\\n\\tvalue = 1000;\\n}\\nreturn value;\",\"aggregationType\":null,\"units\":null,\"decimals\":null,\"usePostProcessing\":null,\"postFuncBody\":null},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Second\",\"color\":\"#FFC107\",\"settings\":{\"type\":\"bar\"},\"_hash\":0.5534217244004682,\"funcBody\":\"var value = prevValue + Math.random() * 100 - 50;\\nvar multiplier = Math.pow(10, 2 || 0);\\nvar value = Math.round(value * multiplier) / multiplier;\\nif (value < -1000) {\\n\\tvalue = -1000;\\n} else if (value > 1000) {\\n\\tvalue = 1000;\\n}\\nreturn value;\",\"aggregationType\":null,\"units\":null,\"decimals\":null,\"usePostProcessing\":null,\"postFuncBody\":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\":\"AVG\",\"limit\":25000},\"timezone\":null},\"showTitle\":true,\"backgroundColor\":\"rgba(0, 0, 0, 0)\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"showLegend\":true,\"legendConfig\":{\"direction\":\"column\",\"position\":\"top\",\"sortDataKeys\":false,\"showMin\":false,\"showMax\":false,\"showAvg\":true,\"showTotal\":false,\"showLatest\":false},\"thresholds\":[],\"dataZoom\":true,\"stack\":false,\"yAxis\":{\"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)\",\"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)\"},\"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)\"},\"legendLabelFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"16px\"},\"legendLabelColor\":\"rgba(0, 0, 0, 0.76)\",\"showTooltip\":true,\"tooltipTrigger\":\"axis\",\"tooltipValueFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"500\",\"lineHeight\":\"16px\"},\"tooltipValueColor\":\"rgba(0, 0, 0, 0.76)\",\"tooltipShowDate\":true,\"tooltipDateFormat\":{\"format\":null,\"lastUpdateAgo\":false,\"custom\":false,\"auto\":true,\"autoDateFormatSettings\":{}},\"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,\"background\":{\"type\":\"color\",\"color\":\"#fff\",\"overlay\":{\"enabled\":false,\"color\":\"rgba(255,255,255,0.72)\",\"blur\":3}},\"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\":null,\"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}},\"noAggregationBarWidthSettings\":{\"strategy\":\"group\",\"groupWidth\":{\"relative\":true,\"relativeWidth\":2,\"absoluteWidth\":1000},\"barWidth\":{\"relative\":true,\"relativeWidth\":2,\"absoluteWidth\":1000}},\"animation\":{\"animation\":true,\"animationThreshold\":2000,\"animationDuration\":500,\"animationEasing\":\"cubicOut\",\"animationDelay\":0,\"animationDurationUpdate\":300,\"animationEasingUpdate\":\"cubicOut\",\"animationDelayUpdate\":0},\"padding\":\"12px\"},\"title\":\"Bar 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\"}"
+  },
+  "tags": [
+    "chart",
+    "time series",
+    "time-series",
+    "bar",
+    "bar chart"
+  ]
+}
\ No newline at end of file
diff --git a/application/src/main/data/json/system/widget_types/bar_chart_with_labels.json b/application/src/main/data/json/system/widget_types/bar_chart_with_labels.json
index 75814a547a..356e91f90e 100644
--- a/application/src/main/data/json/system/widget_types/bar_chart_with_labels.json
+++ b/application/src/main/data/json/system/widget_types/bar_chart_with_labels.json
@@ -20,7 +20,7 @@
     "latestDataKeySettingsDirective": "",
     "hasBasicMode": true,
     "basicModeDirective": "tb-bar-chart-with-labels-basic-config",
-    "defaultConfig": "{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Humidity\",\"color\":\"rgb(125, 142, 255)\",\"settings\":{},\"_hash\":0.8587686344902596,\"funcBody\":\"var value = prevValue + Math.random() * 40 - 20;\\nif (value < 50) {\\n\\tvalue = 50;\\n} else if (value > 80) {\\n\\tvalue = 80;\\n}\\nreturn value;\",\"aggregationType\":null,\"units\":null,\"decimals\":null,\"usePostProcessing\":null,\"postFuncBody\":null},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Soil moisture\",\"color\":\"rgb(249, 111, 255)\",\"settings\":{},\"_hash\":0.9111685461089025,\"funcBody\":\"var value = prevValue + Math.random() * 40 - 20;\\nif (value < 30) {\\n\\tvalue = 30;\\n} else if (value > 90) {\\n\\tvalue = 90;\\n}\\nreturn value;\",\"aggregationType\":null,\"units\":null,\"decimals\":null,\"usePostProcessing\":null,\"postFuncBody\":null},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Leaf wetness\",\"color\":\"rgb(255, 163, 137)\",\"settings\":{},\"_hash\":0.8487533373085416,\"funcBody\":\"var value = prevValue + Math.random() * 40 - 20;\\nif (value < 40) {\\n\\tvalue = 40;\\n} else if (value > 70) {\\n\\tvalue = 70;\\n}\\nreturn value;\",\"aggregationType\":null,\"units\":null,\"decimals\":null,\"usePostProcessing\":null,\"postFuncBody\":null},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Cloud cover\",\"color\":\"#FFED53\",\"settings\":{},\"_hash\":0.7690144858984289,\"funcBody\":\"var value = prevValue + Math.random() * 40 - 20;\\nif (value < 20) {\\n\\tvalue = 20;\\n} else if (value > 60) {\\n\\tvalue = 60;\\n}\\nreturn value;\",\"aggregationType\":null,\"units\":null,\"decimals\":null,\"usePostProcessing\":null,\"postFuncBody\":null}],\"alarmFilterConfig\":{\"statusList\":[\"ACTIVE\"]}}],\"timewindow\":{\"hideInterval\":false,\"hideLastInterval\":false,\"hideQuickInterval\":false,\"hideAggregation\":false,\"hideAggInterval\":false,\"hideTimezone\":false,\"selectedTab\":1,\"history\":{\"historyType\":2,\"timewindowMs\":60000,\"interval\":\"MONTH\",\"fixedTimewindow\":{\"startTimeMs\":1704293713163,\"endTimeMs\":1704380113163},\"quickInterval\":\"CURRENT_HALF_YEAR\"},\"aggregation\":{\"type\":\"AVG\",\"limit\":25000},\"timezone\":null},\"showTitle\":true,\"backgroundColor\":\"rgba(0, 0, 0, 0)\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"showBarLabel\":true,\"barLabelFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"12px\"},\"barLabelColor\":\"rgba(0, 0, 0, 0.54)\",\"showBarValue\":true,\"barValueFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"700\",\"lineHeight\":\"12px\"},\"barValueColor\":\"rgba(0, 0, 0, 0.76)\",\"showLegend\":true,\"legendPosition\":\"top\",\"legendLabelFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"16px\"},\"legendLabelColor\":\"rgba(0, 0, 0, 0.76)\",\"showTooltip\":true,\"tooltipValueFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"500\",\"lineHeight\":\"16px\"},\"tooltipValueColor\":\"rgba(0, 0, 0, 0.76)\",\"tooltipShowDate\":true,\"tooltipDateFormat\":{\"format\":\"MMMM y\",\"lastUpdateAgo\":false,\"custom\":true},\"tooltipDateFont\":{\"family\":\"Roboto\",\"size\":11,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"16px\"},\"tooltipDateColor\":\"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\":\"Bar chart with labels\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":null,\"mobileHeight\":null,\"configMode\":\"basic\",\"actions\":{},\"showTitleIcon\":false,\"titleIcon\":\"public\",\"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\":0,\"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\":\"24px\"}"
+    "defaultConfig": "{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Humidity\",\"color\":\"rgb(125, 142, 255)\",\"settings\":{},\"_hash\":0.8587686344902596,\"funcBody\":\"var value = prevValue + Math.random() * 40 - 20;\\nif (value < 50) {\\n\\tvalue = 50;\\n} else if (value > 80) {\\n\\tvalue = 80;\\n}\\nreturn value;\",\"aggregationType\":null,\"units\":null,\"decimals\":null,\"usePostProcessing\":null,\"postFuncBody\":null},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Soil moisture\",\"color\":\"rgb(249, 111, 255)\",\"settings\":{},\"_hash\":0.9111685461089025,\"funcBody\":\"var value = prevValue + Math.random() * 40 - 20;\\nif (value < 30) {\\n\\tvalue = 30;\\n} else if (value > 90) {\\n\\tvalue = 90;\\n}\\nreturn value;\",\"aggregationType\":null,\"units\":null,\"decimals\":null,\"usePostProcessing\":null,\"postFuncBody\":null},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Leaf wetness\",\"color\":\"rgb(255, 163, 137)\",\"settings\":{},\"_hash\":0.8487533373085416,\"funcBody\":\"var value = prevValue + Math.random() * 40 - 20;\\nif (value < 40) {\\n\\tvalue = 40;\\n} else if (value > 70) {\\n\\tvalue = 70;\\n}\\nreturn value;\",\"aggregationType\":null,\"units\":null,\"decimals\":null,\"usePostProcessing\":null,\"postFuncBody\":null},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Cloud cover\",\"color\":\"#FFED53\",\"settings\":{},\"_hash\":0.7690144858984289,\"funcBody\":\"var value = prevValue + Math.random() * 40 - 20;\\nif (value < 20) {\\n\\tvalue = 20;\\n} else if (value > 60) {\\n\\tvalue = 60;\\n}\\nreturn value;\",\"aggregationType\":null,\"units\":null,\"decimals\":null,\"usePostProcessing\":null,\"postFuncBody\":null}],\"alarmFilterConfig\":{\"statusList\":[\"ACTIVE\"]}}],\"timewindow\":{\"hideInterval\":false,\"hideLastInterval\":false,\"hideQuickInterval\":false,\"hideAggregation\":false,\"hideAggInterval\":false,\"hideTimezone\":false,\"selectedTab\":1,\"history\":{\"historyType\":2,\"timewindowMs\":60000,\"interval\":\"MONTH\",\"fixedTimewindow\":{\"startTimeMs\":1704293713163,\"endTimeMs\":1704380113163},\"quickInterval\":\"CURRENT_HALF_YEAR\"},\"aggregation\":{\"type\":\"AVG\",\"limit\":25000},\"timezone\":null},\"showTitle\":true,\"backgroundColor\":\"rgba(0, 0, 0, 0)\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"showBarLabel\":true,\"barLabelFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"12px\"},\"barLabelColor\":\"rgba(0, 0, 0, 0.54)\",\"showBarValue\":true,\"barValueFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"700\",\"lineHeight\":\"12px\"},\"barValueColor\":\"rgba(0, 0, 0, 0.76)\",\"showLegend\":true,\"legendPosition\":\"top\",\"legendLabelFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"16px\"},\"legendLabelColor\":\"rgba(0, 0, 0, 0.76)\",\"showTooltip\":true,\"tooltipValueFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"500\",\"lineHeight\":\"16px\"},\"tooltipValueColor\":\"rgba(0, 0, 0, 0.76)\",\"tooltipShowDate\":true,\"tooltipDateFormat\":{\"format\":null,\"lastUpdateAgo\":false,\"custom\":false,\"auto\":true,\"autoDateFormatSettings\":{}},\"tooltipDateFont\":{\"family\":\"Roboto\",\"size\":11,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"16px\"},\"tooltipDateColor\":\"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}},\"tooltipDateInterval\":true},\"title\":\"Bar chart with labels\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":null,\"mobileHeight\":null,\"configMode\":\"basic\",\"actions\":{},\"showTitleIcon\":false,\"titleIcon\":\"public\",\"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\":0,\"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\":\"24px\"}"
   },
   "tags": [
     "bar chart",
diff --git a/application/src/main/data/json/system/widget_types/bars.json b/application/src/main/data/json/system/widget_types/bars.json
index b3c991f968..69c9ae208a 100644
--- a/application/src/main/data/json/system/widget_types/bars.json
+++ b/application/src/main/data/json/system/widget_types/bars.json
@@ -1,28 +1,26 @@
 {
-  "fqn": "charts.bars",
+  "fqn": "bars",
   "name": "Bars",
   "deprecated": false,
-  "image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAACgCAMAAAB+IdObAAAA8FBMVEUhlvNMr1Bqamp5eXl7e3t8fHx9fX1+fn5/f3+AgICCgoKDg4OEhISGhoaHh4eKioqMjIyNjY2Ojo6QkJCRkZGSkpKWlpaXl5ebm5udnZ2enp6goKChoaGkpKSnp6epqamsrKyurq6xsbGzs7O1tbW2tra3t7e4uLi7u7u9vb3BwcHCwsLDw8PGxsbKysrNzc3Ozs7R0dHS0tLT09PZ2dna2trc3Nzd3d3e3t7g4ODh4eHj4+Pk5OTm5ubn5+fo6Ojp6enu7u7w8PDz8/P0Qzb09PT29vb39/f5+fn6+vr7+/v8/Pz9/f3+/v7/wQf///+dc+aLAAAAAWJLR0RPbmZBSQAAAcFJREFUeNrt3ds2AgEYhuHsaSOZbAvZi0r2YYjCJOW7/7txZhkcDNbM6h/vdwfPmlX/ybtmEorJErGCeJLadz3rkKPpZamaLTp925DHdFvSpKelU9uQ/cLKhtcdk7YqtiHruevtojch7ZZtQ0o1dcdfRqXNqm1IbVU3OaVamm/YhvQW5zIXOknnC5JUt7qEpE5fUv/5HVePy2UHAgQIECBAgAABAgQIECBxgrwGHBAgQIAAAQIECBAgQIAAAQIECJC/QRIBN0iQ+66voDMLuRp2fQWdVUhvNun6CjqrkJ0Dx/UVdEYhzXzfcX0FnVFIrlSZ2mx/LOiMQuqHh6k972NBZ/fv13G/KeiCQkIu4358EL8UdBafSGwuOxAgQIAAAQIECJDYQB4CDggQIECAAAECBAgQIECAAAECBAgQIECA/BrSufn0DjqjkEZmLXkWaUEXEmThXMeFSAu68H4j5b1IC7rQILfZTqQFXViQ1nRTL1EWdCFBnmYuJUVZ0IUEWR1xHKcXZUEXFDLwBR2XHQgQIECAAAEC5H9ChgIOCBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgxiBmv+L6Bl9pkxYph15gAAAAAElFTkSuQmCC",
-  "description": "Displays latest values of the attributes or time-series data for multiple entities as separate bars.",
+  "image": "tb-image:YmFycy5zdmc=:IkJhcnMiIHN5c3RlbSB3aWRnZXQgaW1hZ2U=;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_4624_38022)">
<path d="M2.84766 1.28125V7H2.125V2.18359L0.667969 2.71484V2.0625L2.73438 1.28125H2.84766ZM8.67517 3.70312V4.57031C8.67517 5.03646 8.63351 5.42969 8.55017 5.75C8.46684 6.07031 8.34705 6.32812 8.1908 6.52344C8.03455 6.71875 7.84575 6.86068 7.62439 6.94922C7.40564 7.03516 7.15825 7.07812 6.8822 7.07812C6.66345 7.07812 6.46163 7.05078 6.27673 6.99609C6.09184 6.94141 5.92517 6.85417 5.77673 6.73438C5.6309 6.61198 5.5059 6.45312 5.40173 6.25781C5.29757 6.0625 5.21814 5.82552 5.16345 5.54688C5.10877 5.26823 5.08142 4.94271 5.08142 4.57031V3.70312C5.08142 3.23698 5.12309 2.84635 5.20642 2.53125C5.29236 2.21615 5.41345 1.96354 5.5697 1.77344C5.72595 1.58073 5.91345 1.44271 6.1322 1.35938C6.35356 1.27604 6.60095 1.23438 6.87439 1.23438C7.09575 1.23438 7.29887 1.26172 7.48377 1.31641C7.67127 1.36849 7.83793 1.45312 7.98377 1.57031C8.1296 1.6849 8.2533 1.83854 8.35486 2.03125C8.45903 2.22135 8.53845 2.45443 8.59314 2.73047C8.64783 3.00651 8.67517 3.33073 8.67517 3.70312ZM7.94861 4.6875V3.58203C7.94861 3.32682 7.93298 3.10286 7.90173 2.91016C7.87309 2.71484 7.83012 2.54818 7.77283 2.41016C7.71554 2.27214 7.64262 2.16016 7.55408 2.07422C7.46814 1.98828 7.36788 1.92578 7.2533 1.88672C7.14132 1.84505 7.01502 1.82422 6.87439 1.82422C6.70252 1.82422 6.55017 1.85677 6.41736 1.92188C6.28455 1.98438 6.17257 2.08464 6.08142 2.22266C5.99288 2.36068 5.92517 2.54167 5.8783 2.76562C5.83142 2.98958 5.80798 3.26172 5.80798 3.58203V4.6875C5.80798 4.94271 5.82231 5.16797 5.85095 5.36328C5.8822 5.55859 5.92778 5.72786 5.98767 5.87109C6.04757 6.01172 6.12048 6.1276 6.20642 6.21875C6.29236 6.3099 6.39132 6.3776 6.5033 6.42188C6.61788 6.46354 6.74418 6.48438 6.8822 6.48438C7.05929 6.48438 7.21423 6.45052 7.34705 6.38281C7.47986 6.3151 7.59054 6.20964 7.67908 6.06641C7.77022 5.92057 7.83793 5.73438 7.8822 5.50781C7.92647 5.27865 7.94861 5.00521 7.94861 4.6875ZM13.3074 3.70312V4.57031C13.3074 5.03646 13.2657 5.42969 13.1824 5.75C13.099 6.07031 12.9793 6.32812 12.823 6.52344C12.6668 6.71875 12.4779 6.86068 12.2566 6.94922C12.0378 7.03516 11.7904 7.07812 11.5144 7.07812C11.2957 7.07812 11.0938 7.05078 10.9089 6.99609C10.724 6.94141 10.5574 6.85417 10.4089 6.73438C10.2631 6.61198 10.1381 6.45312 10.0339 6.25781C9.92977 6.0625 9.85034 5.82552 9.79566 5.54688C9.74097 5.26823 9.71363 4.94271 9.71363 4.57031V3.70312C9.71363 3.23698 9.75529 2.84635 9.83863 2.53125C9.92456 2.21615 10.0457 1.96354 10.2019 1.77344C10.3582 1.58073 10.5457 1.44271 10.7644 1.35938C10.9858 1.27604 11.2332 1.23438 11.5066 1.23438C11.7279 1.23438 11.9311 1.26172 12.116 1.31641C12.3035 1.36849 12.4701 1.45312 12.616 1.57031C12.7618 1.6849 12.8855 1.83854 12.9871 2.03125C13.0912 2.22135 13.1707 2.45443 13.2253 2.73047C13.28 3.00651 13.3074 3.33073 13.3074 3.70312ZM12.5808 4.6875V3.58203C12.5808 3.32682 12.5652 3.10286 12.5339 2.91016C12.5053 2.71484 12.4623 2.54818 12.405 2.41016C12.3477 2.27214 12.2748 2.16016 12.1863 2.07422C12.1003 1.98828 12.0001 1.92578 11.8855 1.88672C11.7735 1.84505 11.6472 1.82422 11.5066 1.82422C11.3347 1.82422 11.1824 1.85677 11.0496 1.92188C10.9168 1.98438 10.8048 2.08464 10.7136 2.22266C10.6251 2.36068 10.5574 2.54167 10.5105 2.76562C10.4636 2.98958 10.4402 3.26172 10.4402 3.58203V4.6875C10.4402 4.94271 10.4545 5.16797 10.4832 5.36328C10.5144 5.55859 10.56 5.72786 10.6199 5.87109C10.6798 6.01172 10.7527 6.1276 10.8386 6.21875C10.9246 6.3099 11.0235 6.3776 11.1355 6.42188C11.2501 6.46354 11.3764 6.48438 11.5144 6.48438C11.6915 6.48438 11.8464 6.45052 11.9793 6.38281C12.1121 6.3151 12.2227 6.20964 12.3113 6.06641C12.4024 5.92057 12.4701 5.73438 12.5144 5.50781C12.5587 5.27865 12.5808 5.00521 12.5808 4.6875Z" fill="black" fill-opacity="0.76"/>
<path d="M8.05859 33.6677C8.05859 34.0141 7.97786 34.3083 7.81641 34.5505C7.65755 34.7901 7.44141 34.9724 7.16797 35.0974C6.89714 35.2224 6.59115 35.2849 6.25 35.2849C5.90885 35.2849 5.60156 35.2224 5.32812 35.0974C5.05469 34.9724 4.83854 34.7901 4.67969 34.5505C4.52083 34.3083 4.44141 34.0141 4.44141 33.6677C4.44141 33.4412 4.48438 33.2341 4.57031 33.0466C4.65885 32.8565 4.78255 32.6912 4.94141 32.5505C5.10286 32.4099 5.29297 32.3018 5.51172 32.2263C5.73307 32.1482 5.97656 32.1091 6.24219 32.1091C6.59115 32.1091 6.90234 32.1768 7.17578 32.3123C7.44922 32.4451 7.66406 32.6287 7.82031 32.863C7.97917 33.0974 8.05859 33.3656 8.05859 33.6677ZM7.33203 33.6521C7.33203 33.4412 7.28646 33.255 7.19531 33.0935C7.10417 32.9294 6.97656 32.8018 6.8125 32.7107C6.64844 32.6195 6.45833 32.574 6.24219 32.574C6.02083 32.574 5.82943 32.6195 5.66797 32.7107C5.50911 32.8018 5.38542 32.9294 5.29688 33.0935C5.20833 33.255 5.16406 33.4412 5.16406 33.6521C5.16406 33.8708 5.20703 34.0583 5.29297 34.2146C5.38151 34.3682 5.50651 34.4867 5.66797 34.5701C5.83203 34.6508 6.02604 34.6912 6.25 34.6912C6.47396 34.6912 6.66667 34.6508 6.82812 34.5701C6.98958 34.4867 7.11328 34.3682 7.19922 34.2146C7.28776 34.0583 7.33203 33.8708 7.33203 33.6521ZM7.92578 30.9998C7.92578 31.2758 7.85286 31.5245 7.70703 31.7458C7.5612 31.9672 7.36198 32.1417 7.10938 32.2693C6.85677 32.3969 6.57031 32.4607 6.25 32.4607C5.92448 32.4607 5.63411 32.3969 5.37891 32.2693C5.1263 32.1417 4.92839 31.9672 4.78516 31.7458C4.64193 31.5245 4.57031 31.2758 4.57031 30.9998C4.57031 30.669 4.64193 30.3878 4.78516 30.156C4.93099 29.9242 5.13021 29.7472 5.38281 29.6248C5.63542 29.5024 5.92318 29.4412 6.24609 29.4412C6.57161 29.4412 6.86068 29.5024 7.11328 29.6248C7.36589 29.7472 7.5638 29.9242 7.70703 30.156C7.85286 30.3878 7.92578 30.669 7.92578 30.9998ZM7.20312 31.0115C7.20312 30.8214 7.16276 30.6534 7.08203 30.5076C7.0013 30.3617 6.88932 30.2472 6.74609 30.1638C6.60286 30.0779 6.4362 30.0349 6.24609 30.0349C6.05599 30.0349 5.88932 30.0753 5.74609 30.156C5.60547 30.2341 5.49479 30.3461 5.41406 30.4919C5.33594 30.6378 5.29688 30.811 5.29688 31.0115C5.29688 31.2068 5.33594 31.3774 5.41406 31.5232C5.49479 31.669 5.60677 31.7823 5.75 31.863C5.89323 31.9438 6.0599 31.9841 6.25 31.9841C6.4401 31.9841 6.60547 31.9438 6.74609 31.863C6.88932 31.7823 7.0013 31.669 7.08203 31.5232C7.16276 31.3774 7.20312 31.2068 7.20312 31.0115ZM12.6752 31.9099V32.7771C12.6752 33.2432 12.6335 33.6365 12.5502 33.9568C12.4668 34.2771 12.347 34.5349 12.1908 34.7302C12.0345 34.9255 11.8457 35.0675 11.6244 35.156C11.4056 35.2419 11.1582 35.2849 10.8822 35.2849C10.6635 35.2849 10.4616 35.2576 10.2767 35.2029C10.0918 35.1482 9.92517 35.061 9.77673 34.9412C9.6309 34.8188 9.5059 34.6599 9.40173 34.4646C9.29757 34.2693 9.21814 34.0323 9.16345 33.7537C9.10877 33.475 9.08142 33.1495 9.08142 32.7771V31.9099C9.08142 31.4438 9.12309 31.0531 9.20642 30.738C9.29236 30.4229 9.41345 30.1703 9.5697 29.9802C9.72595 29.7875 9.91345 29.6495 10.1322 29.5662C10.3536 29.4828 10.601 29.4412 10.8744 29.4412C11.0957 29.4412 11.2989 29.4685 11.4838 29.5232C11.6713 29.5753 11.8379 29.6599 11.9838 29.7771C12.1296 29.8917 12.2533 30.0453 12.3549 30.238C12.459 30.4281 12.5385 30.6612 12.5931 30.9373C12.6478 31.2133 12.6752 31.5375 12.6752 31.9099ZM11.9486 32.8943V31.7888C11.9486 31.5336 11.933 31.3097 11.9017 31.1169C11.8731 30.9216 11.8301 30.755 11.7728 30.6169C11.7155 30.4789 11.6426 30.3669 11.5541 30.281C11.4681 30.1951 11.3679 30.1326 11.2533 30.0935C11.1413 30.0518 11.015 30.031 10.8744 30.031C10.7025 30.031 10.5502 30.0636 10.4174 30.1287C10.2845 30.1912 10.1726 30.2914 10.0814 30.4294C9.99288 30.5675 9.92517 30.7485 9.8783 30.9724C9.83142 31.1964 9.80798 31.4685 9.80798 31.7888V32.8943C9.80798 33.1495 9.82231 33.3748 9.85095 33.5701C9.8822 33.7654 9.92778 33.9347 9.98767 34.0779C10.0476 34.2185 10.1205 34.3344 10.2064 34.4255C10.2924 34.5167 10.3913 34.5844 10.5033 34.6287C10.6179 34.6703 10.7442 34.6912 10.8822 34.6912C11.0593 34.6912 11.2142 34.6573 11.347 34.5896C11.4799 34.5219 11.5905 34.4164 11.6791 34.2732C11.7702 34.1274 11.8379 33.9412 11.8822 33.7146C11.9265 33.4854 11.9486 33.212 11.9486 32.8943Z" fill="black" fill-opacity="0.76"/>
<path d="M7.24609 57.7183H7.30859V58.3315H7.24609C6.86328 58.3315 6.54297 58.394 6.28516 58.519C6.02734 58.6414 5.82292 58.8068 5.67188 59.0151C5.52083 59.2209 5.41146 59.4526 5.34375 59.7104C5.27865 59.9683 5.24609 60.23 5.24609 60.4956V61.3315C5.24609 61.5841 5.27604 61.8081 5.33594 62.0034C5.39583 62.1961 5.47786 62.3589 5.58203 62.4917C5.6862 62.6245 5.80339 62.7248 5.93359 62.7925C6.06641 62.8602 6.20443 62.894 6.34766 62.894C6.51432 62.894 6.66276 62.8628 6.79297 62.8003C6.92318 62.7352 7.03255 62.6453 7.12109 62.5308C7.21224 62.4136 7.28125 62.2756 7.32812 62.1167C7.375 61.9578 7.39844 61.7834 7.39844 61.5933C7.39844 61.424 7.3776 61.2612 7.33594 61.105C7.29427 60.9461 7.23047 60.8055 7.14453 60.6831C7.05859 60.5581 6.95052 60.4604 6.82031 60.3901C6.69271 60.3172 6.54036 60.2808 6.36328 60.2808C6.16276 60.2808 5.97526 60.3302 5.80078 60.4292C5.62891 60.5256 5.48698 60.6532 5.375 60.812C5.26562 60.9683 5.20312 61.1388 5.1875 61.3237L4.80469 61.3198C4.84115 61.0282 4.90885 60.7795 5.00781 60.5737C5.10938 60.3654 5.23438 60.1961 5.38281 60.0659C5.53385 59.9331 5.70182 59.8368 5.88672 59.7769C6.07422 59.7144 6.27214 59.6831 6.48047 59.6831C6.76432 59.6831 7.00911 59.7365 7.21484 59.8433C7.42057 59.95 7.58984 60.0933 7.72266 60.2729C7.85547 60.45 7.95312 60.6506 8.01562 60.8745C8.08073 61.0959 8.11328 61.3237 8.11328 61.5581C8.11328 61.8263 8.07552 62.0776 8 62.312C7.92448 62.5464 7.8112 62.7521 7.66016 62.9292C7.51172 63.1063 7.32812 63.2443 7.10938 63.3433C6.89062 63.4422 6.63672 63.4917 6.34766 63.4917C6.04036 63.4917 5.77214 63.4292 5.54297 63.3042C5.3138 63.1766 5.1237 63.0073 4.97266 62.7964C4.82161 62.5854 4.70833 62.3511 4.63281 62.0933C4.55729 61.8354 4.51953 61.5737 4.51953 61.3081V60.9683C4.51953 60.5672 4.5599 60.174 4.64062 59.7886C4.72135 59.4032 4.86068 59.0542 5.05859 58.7417C5.25911 58.4292 5.53646 58.1805 5.89062 57.9956C6.24479 57.8107 6.69661 57.7183 7.24609 57.7183ZM12.6752 60.1167V60.9839C12.6752 61.45 12.6335 61.8433 12.5502 62.1636C12.4668 62.4839 12.347 62.7417 12.1908 62.937C12.0345 63.1323 11.8457 63.2743 11.6244 63.3628C11.4056 63.4487 11.1582 63.4917 10.8822 63.4917C10.6635 63.4917 10.4616 63.4644 10.2767 63.4097C10.0918 63.355 9.92517 63.2677 9.77673 63.1479C9.6309 63.0256 9.5059 62.8667 9.40173 62.6714C9.29757 62.4761 9.21814 62.2391 9.16345 61.9604C9.10877 61.6818 9.08142 61.3563 9.08142 60.9839V60.1167C9.08142 59.6506 9.12309 59.2599 9.20642 58.9448C9.29236 58.6297 9.41345 58.3771 9.5697 58.187C9.72595 57.9943 9.91345 57.8563 10.1322 57.7729C10.3536 57.6896 10.601 57.6479 10.8744 57.6479C11.0957 57.6479 11.2989 57.6753 11.4838 57.73C11.6713 57.7821 11.8379 57.8667 11.9838 57.9839C12.1296 58.0985 12.2533 58.2521 12.3549 58.4448C12.459 58.6349 12.5385 58.868 12.5931 59.144C12.6478 59.4201 12.6752 59.7443 12.6752 60.1167ZM11.9486 61.1011V59.9956C11.9486 59.7404 11.933 59.5164 11.9017 59.3237C11.8731 59.1284 11.8301 58.9618 11.7728 58.8237C11.7155 58.6857 11.6426 58.5737 11.5541 58.4878C11.4681 58.4019 11.3679 58.3394 11.2533 58.3003C11.1413 58.2586 11.015 58.2378 10.8744 58.2378C10.7025 58.2378 10.5502 58.2703 10.4174 58.3354C10.2845 58.3979 10.1726 58.4982 10.0814 58.6362C9.99288 58.7743 9.92517 58.9552 9.8783 59.1792C9.83142 59.4032 9.80798 59.6753 9.80798 59.9956V61.1011C9.80798 61.3563 9.82231 61.5815 9.85095 61.7769C9.8822 61.9722 9.92778 62.1414 9.98767 62.2847C10.0476 62.4253 10.1205 62.5412 10.2064 62.6323C10.2924 62.7235 10.3913 62.7912 10.5033 62.8354C10.6179 62.8771 10.7442 62.8979 10.8822 62.8979C11.0593 62.8979 11.2142 62.8641 11.347 62.7964C11.4799 62.7287 11.5905 62.6232 11.6791 62.48C11.7702 62.3341 11.8379 62.1479 11.8822 61.9214C11.9265 61.6922 11.9486 61.4188 11.9486 61.1011Z" fill="black" fill-opacity="0.76"/>
<path d="M8.31641 89.7063V90.3H4.20703V89.8743L6.75391 85.9329H7.34375L6.71094 87.0735L5.02734 89.7063H8.31641ZM7.52344 85.9329V91.6204H6.80078V85.9329H7.52344ZM12.6752 88.3235V89.1907C12.6752 89.6568 12.6335 90.05 12.5502 90.3704C12.4668 90.6907 12.347 90.9485 12.1908 91.1438C12.0345 91.3391 11.8457 91.481 11.6244 91.5696C11.4056 91.6555 11.1582 91.6985 10.8822 91.6985C10.6635 91.6985 10.4616 91.6711 10.2767 91.6165C10.0918 91.5618 9.92517 91.4745 9.77673 91.3547C9.6309 91.2323 9.5059 91.0735 9.40173 90.8782C9.29757 90.6829 9.21814 90.4459 9.16345 90.1672C9.10877 89.8886 9.08142 89.5631 9.08142 89.1907V88.3235C9.08142 87.8573 9.12309 87.4667 9.20642 87.1516C9.29236 86.8365 9.41345 86.5839 9.5697 86.3938C9.72595 86.2011 9.91345 86.0631 10.1322 85.9797C10.3536 85.8964 10.601 85.8547 10.8744 85.8547C11.0957 85.8547 11.2989 85.8821 11.4838 85.9368C11.6713 85.9889 11.8379 86.0735 11.9838 86.1907C12.1296 86.3053 12.2533 86.4589 12.3549 86.6516C12.459 86.8417 12.5385 87.0748 12.5931 87.3508C12.6478 87.6269 12.6752 87.9511 12.6752 88.3235ZM11.9486 89.3079V88.2024C11.9486 87.9472 11.933 87.7232 11.9017 87.5305C11.8731 87.3352 11.8301 87.1685 11.7728 87.0305C11.7155 86.8925 11.6426 86.7805 11.5541 86.6946C11.4681 86.6086 11.3679 86.5461 11.2533 86.5071C11.1413 86.4654 11.015 86.4446 10.8744 86.4446C10.7025 86.4446 10.5502 86.4771 10.4174 86.5422C10.2845 86.6047 10.1726 86.705 10.0814 86.843C9.99288 86.981 9.92517 87.162 9.8783 87.386C9.83142 87.6099 9.80798 87.8821 9.80798 88.2024V89.3079C9.80798 89.5631 9.82231 89.7883 9.85095 89.9836C9.8822 90.179 9.92778 90.3482 9.98767 90.4915C10.0476 90.6321 10.1205 90.748 10.2064 90.8391C10.2924 90.9303 10.3913 90.998 10.5033 91.0422C10.6179 91.0839 10.7442 91.1047 10.8822 91.1047C11.0593 91.1047 11.2142 91.0709 11.347 91.0032C11.4799 90.9355 11.5905 90.83 11.6791 90.6868C11.7702 90.5409 11.8379 90.3547 11.8822 90.1282C11.9265 89.899 11.9486 89.6256 11.9486 89.3079Z" fill="black" fill-opacity="0.76"/>
<path d="M8.19922 119.233V119.827H4.47656V119.308L6.33984 117.233C6.56901 116.978 6.74609 116.762 6.87109 116.585C6.9987 116.405 7.08724 116.245 7.13672 116.104C7.1888 115.961 7.21484 115.815 7.21484 115.667C7.21484 115.479 7.17578 115.31 7.09766 115.159C7.02214 115.006 6.91016 114.883 6.76172 114.792C6.61328 114.701 6.43359 114.655 6.22266 114.655C5.97005 114.655 5.75911 114.705 5.58984 114.804C5.42318 114.9 5.29818 115.035 5.21484 115.21C5.13151 115.384 5.08984 115.585 5.08984 115.812H4.36719C4.36719 115.491 4.4375 115.198 4.57812 114.933C4.71875 114.667 4.92708 114.456 5.20312 114.3C5.47917 114.141 5.81901 114.062 6.22266 114.062C6.58203 114.062 6.88932 114.125 7.14453 114.253C7.39974 114.378 7.59505 114.555 7.73047 114.784C7.86849 115.011 7.9375 115.276 7.9375 115.581C7.9375 115.748 7.90885 115.917 7.85156 116.089C7.79688 116.258 7.72005 116.427 7.62109 116.597C7.52474 116.766 7.41146 116.933 7.28125 117.097C7.15365 117.261 7.01693 117.422 6.87109 117.581L5.34766 119.233H8.19922ZM12.6752 116.53V117.397C12.6752 117.864 12.6335 118.257 12.5502 118.577C12.4668 118.897 12.347 119.155 12.1908 119.351C12.0345 119.546 11.8457 119.688 11.6244 119.776C11.4056 119.862 11.1582 119.905 10.8822 119.905C10.6635 119.905 10.4616 119.878 10.2767 119.823C10.0918 119.769 9.92517 119.681 9.77673 119.562C9.6309 119.439 9.5059 119.28 9.40173 119.085C9.29757 118.89 9.21814 118.653 9.16345 118.374C9.10877 118.095 9.08142 117.77 9.08142 117.397V116.53C9.08142 116.064 9.12309 115.674 9.20642 115.358C9.29236 115.043 9.41345 114.791 9.5697 114.601C9.72595 114.408 9.91345 114.27 10.1322 114.187C10.3536 114.103 10.601 114.062 10.8744 114.062C11.0957 114.062 11.2989 114.089 11.4838 114.144C11.6713 114.196 11.8379 114.28 11.9838 114.397C12.1296 114.512 12.2533 114.666 12.3549 114.858C12.459 115.049 12.5385 115.282 12.5931 115.558C12.6478 115.834 12.6752 116.158 12.6752 116.53ZM11.9486 117.515V116.409C11.9486 116.154 11.933 115.93 11.9017 115.737C11.8731 115.542 11.8301 115.375 11.7728 115.237C11.7155 115.099 11.6426 114.987 11.5541 114.901C11.4681 114.815 11.3679 114.753 11.2533 114.714C11.1413 114.672 11.015 114.651 10.8744 114.651C10.7025 114.651 10.5502 114.684 10.4174 114.749C10.2845 114.812 10.1726 114.912 10.0814 115.05C9.99288 115.188 9.92517 115.369 9.8783 115.593C9.83142 115.817 9.80798 116.089 9.80798 116.409V117.515C9.80798 117.77 9.82231 117.995 9.85095 118.19C9.8822 118.386 9.92778 118.555 9.98767 118.698C10.0476 118.839 10.1205 118.955 10.2064 119.046C10.2924 119.137 10.3913 119.205 10.5033 119.249C10.6179 119.291 10.7442 119.312 10.8822 119.312C11.0593 119.312 11.2142 119.278 11.347 119.21C11.4799 119.142 11.5905 119.037 11.6791 118.894C11.7702 118.748 11.8379 118.562 11.8822 118.335C11.9265 118.106 11.9486 117.832 11.9486 117.515Z" fill="black" fill-opacity="0.76"/>
<path d="M13.043 144.737V145.604C13.043 146.07 13.0013 146.464 12.918 146.784C12.8346 147.104 12.7148 147.362 12.5586 147.557C12.4023 147.753 12.2135 147.895 11.9922 147.983C11.7734 148.069 11.526 148.112 11.25 148.112C11.0312 148.112 10.8294 148.085 10.6445 148.03C10.4596 147.975 10.293 147.888 10.1445 147.768C9.9987 147.646 9.8737 147.487 9.76953 147.292C9.66536 147.096 9.58594 146.859 9.53125 146.581C9.47656 146.302 9.44922 145.977 9.44922 145.604V144.737C9.44922 144.271 9.49089 143.88 9.57422 143.565C9.66016 143.25 9.78125 142.997 9.9375 142.807C10.0938 142.615 10.2812 142.477 10.5 142.393C10.7214 142.31 10.9688 142.268 11.2422 142.268C11.4635 142.268 11.6667 142.296 11.8516 142.35C12.0391 142.402 12.2057 142.487 12.3516 142.604C12.4974 142.719 12.6211 142.872 12.7227 143.065C12.8268 143.255 12.9062 143.488 12.9609 143.764C13.0156 144.04 13.043 144.365 13.043 144.737ZM12.3164 145.721V144.616C12.3164 144.361 12.3008 144.137 12.2695 143.944C12.2409 143.749 12.1979 143.582 12.1406 143.444C12.0833 143.306 12.0104 143.194 11.9219 143.108C11.8359 143.022 11.7357 142.96 11.6211 142.921C11.5091 142.879 11.3828 142.858 11.2422 142.858C11.0703 142.858 10.918 142.891 10.7852 142.956C10.6523 143.018 10.5404 143.119 10.4492 143.257C10.3607 143.395 10.293 143.576 10.2461 143.8C10.1992 144.024 10.1758 144.296 10.1758 144.616V145.721C10.1758 145.977 10.1901 146.202 10.2188 146.397C10.25 146.593 10.2956 146.762 10.3555 146.905C10.4154 147.046 10.4883 147.162 10.5742 147.253C10.6602 147.344 10.7591 147.412 10.8711 147.456C10.9857 147.497 11.112 147.518 11.25 147.518C11.4271 147.518 11.582 147.484 11.7148 147.417C11.8477 147.349 11.9583 147.244 12.0469 147.1C12.138 146.955 12.2057 146.768 12.25 146.542C12.2943 146.313 12.3164 146.039 12.3164 145.721Z" fill="black" fill-opacity="0.76"/>
<path d="M19 4.16113L194 4.16116" stroke="black" stroke-opacity="0.12"/>
<path d="M19 33.1611L194 33.1612" stroke="black" stroke-opacity="0.12"/>
<path d="M19 61.1611L194 61.1612" stroke="black" stroke-opacity="0.12"/>
<path d="M19 89.1611L194 89.1612" stroke="black" stroke-opacity="0.12"/>
<path d="M19 118.161L194 118.161" stroke="black" stroke-opacity="0.12"/>
<path d="M28 27C28 25.8954 28.8954 25 30 25H56C57.1046 25 58 25.8954 58 27V146H28V27Z" fill="#08872B"/>
<path d="M70 69C70 67.8954 70.8954 67 72 67H98C99.1046 67 100 67.8954 100 69V146H70V69Z" fill="#4B93FF"/>
<path d="M112 92C112 90.8954 112.895 90 114 90H140C141.105 90 142 90.8954 142 92V146H112V92Z" fill="#FF4D5A"/>
<path d="M154 79C154 77.8954 154.895 77 156 77H182C183.105 77 184 77.8954 184 79V146H154V79Z" fill="#FFC107"/>
<line x1="17.2" y1="145.961" x2="196.8" y2="145.961" stroke="black" stroke-opacity="0.7" stroke-width="0.4" stroke-linecap="square"/>
<path d="M43.1328 14.1758L41.5117 19H40.375L42.5 13.3125H43.2266L43.1328 14.1758ZM44.4883 19L42.8594 14.1758L42.7617 13.3125H43.4922L45.6289 19H44.4883ZM44.4141 16.8867V17.7344H41.3633V16.8867H44.4141Z" fill="black" fill-opacity="0.76"/>
<path d="M85.1836 58.4648H83.7305L83.7227 57.707H84.9688C85.1823 57.707 85.3607 57.6771 85.5039 57.6172C85.6471 57.5573 85.7552 57.4701 85.8281 57.3555C85.9036 57.2409 85.9414 57.1016 85.9414 56.9375C85.9414 56.7552 85.9062 56.6068 85.8359 56.4922C85.7682 56.3776 85.6615 56.2943 85.5156 56.2422C85.3698 56.1875 85.1849 56.1602 84.9609 56.1602H84.0781V61H83.0039V55.3125H84.9609C85.2839 55.3125 85.5716 55.3438 85.8242 55.4062C86.0794 55.4661 86.2956 55.5599 86.4727 55.6875C86.6497 55.8151 86.7839 55.9753 86.875 56.168C86.9688 56.3607 87.0156 56.5898 87.0156 56.8555C87.0156 57.0898 86.9609 57.306 86.8516 57.5039C86.7448 57.6992 86.5794 57.8581 86.3555 57.9805C86.1341 58.1029 85.8529 58.1732 85.5117 58.1914L85.1836 58.4648ZM85.1367 61H83.4141L83.8633 60.1562H85.1367C85.3503 60.1562 85.526 60.1211 85.6641 60.0508C85.8047 59.9805 85.9089 59.8841 85.9766 59.7617C86.0469 59.6367 86.082 59.4935 86.082 59.332C86.082 59.1549 86.0508 59.0013 85.9883 58.8711C85.9284 58.7409 85.832 58.6406 85.6992 58.5703C85.569 58.5 85.3971 58.4648 85.1836 58.4648H84.0664L84.0742 57.707H85.4961L85.7422 58C86.0703 58.0026 86.3372 58.0677 86.543 58.1953C86.7513 58.3229 86.9049 58.487 87.0039 58.6875C87.1029 58.888 87.1523 59.1042 87.1523 59.3359C87.1523 59.7005 87.0729 60.0065 86.9141 60.2539C86.7578 60.5013 86.5286 60.6875 86.2266 60.8125C85.9271 60.9375 85.5638 61 85.1367 61Z" fill="black" fill-opacity="0.76"/>
<path d="M168.637 72H167.41L167.418 71.1562H168.637C168.967 71.1562 169.245 71.0833 169.469 70.9375C169.693 70.7891 169.862 70.5768 169.977 70.3008C170.091 70.0221 170.148 69.6888 170.148 69.3008V69.0078C170.148 68.7083 170.116 68.444 170.051 68.2148C169.986 67.9857 169.889 67.793 169.762 67.6367C169.637 67.4805 169.482 67.362 169.297 67.2812C169.112 67.2005 168.9 67.1602 168.66 67.1602H167.387V66.3125H168.66C169.04 66.3125 169.387 66.3763 169.699 66.5039C170.014 66.6315 170.286 66.8151 170.516 67.0547C170.747 67.2917 170.924 67.5755 171.047 67.9062C171.172 68.237 171.234 68.6068 171.234 69.0156V69.3008C171.234 69.707 171.172 70.0768 171.047 70.4102C170.924 70.7409 170.747 71.0247 170.516 71.2617C170.286 71.4987 170.013 71.681 169.695 71.8086C169.378 71.9362 169.025 72 168.637 72ZM168.012 66.3125V72H166.938V66.3125H168.012Z" fill="black" fill-opacity="0.76"/>
<path d="M128.254 82.1289H129.328C129.299 82.5091 129.194 82.8464 129.012 83.1406C128.829 83.4323 128.576 83.6615 128.25 83.8281C127.924 83.9948 127.53 84.0781 127.066 84.0781C126.71 84.0781 126.388 84.0156 126.102 83.8906C125.818 83.763 125.574 83.582 125.371 83.3477C125.171 83.1107 125.017 82.8268 124.91 82.4961C124.803 82.1628 124.75 81.7891 124.75 81.375V80.9414C124.75 80.5273 124.805 80.1536 124.914 79.8203C125.023 79.487 125.18 79.2031 125.383 78.9688C125.589 78.7318 125.835 78.5495 126.121 78.4219C126.41 78.2943 126.733 78.2305 127.09 78.2305C127.553 78.2305 127.945 78.3164 128.266 78.4883C128.586 78.6576 128.835 78.8906 129.012 79.1875C129.189 79.4844 129.296 79.8255 129.332 80.2109H128.258C128.237 79.9714 128.185 79.7682 128.102 79.6016C128.021 79.4349 127.898 79.3086 127.734 79.2227C127.573 79.1341 127.358 79.0898 127.09 79.0898C126.882 79.0898 126.698 79.1289 126.539 79.207C126.383 79.2852 126.253 79.4023 126.148 79.5586C126.044 79.7122 125.966 79.9049 125.914 80.1367C125.862 80.3659 125.836 80.6315 125.836 80.9336V81.375C125.836 81.6641 125.859 81.9232 125.906 82.1523C125.953 82.3815 126.026 82.5755 126.125 82.7344C126.224 82.8932 126.352 83.0143 126.508 83.0977C126.664 83.181 126.85 83.2227 127.066 83.2227C127.329 83.2227 127.543 83.181 127.707 83.0977C127.874 83.0143 128 82.8919 128.086 82.7305C128.174 82.569 128.23 82.3685 128.254 82.1289Z" fill="black" fill-opacity="0.76"/>
</g>
<defs>
<clipPath id="clip0_4624_38022">
<rect width="200" height="160" fill="white"/>
</clipPath>
</defs>
</svg>
",
+  "description": "Displays the latest values of the attributes or time-series data in a bar chart. Supports numeric values only.",
   "descriptor": {
     "type": "latest",
-    "sizeX": 7,
-    "sizeY": 5,
-    "resources": [
-      {
-        "url": "https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.3.0/Chart.min.js"
-      }
-    ],
-    "templateHtml": "<canvas id=\"barChart\"></canvas>\n",
+    "sizeX": 5,
+    "sizeY": 4,
+    "resources": [],
+    "templateHtml": "<tb-bar-chart-widget \n    [ctx]=\"ctx\"\n    [widgetTitlePanel]=\"widgetTitlePanel\">\n</tb-bar-chart-widget>",
     "templateCss": "",
-    "controllerScript": "self.onInit = function() {\n    $scope = self.ctx.$scope;\n    utils = $scope.$injector.get(self.ctx.servicesMap.get('utils'));\n    settings = utils.deepClone(self.ctx.settings) || {};\n    settings.showTooltip = utils.defaultValue(settings.showTooltip, true);\n    \n    Chart.defaults.global.tooltips.enabled = settings.showTooltip;\n    \n    var barData = {\n        labels: [],\n        datasets: []\n    };\n    \n    for (var i = 0; i < self.ctx.datasources.length; i++) {\n        var datasource = self.ctx.datasources[i];\n        for (var d = 0; d < datasource.dataKeys.length; d++) {\n            var dataKey = datasource.dataKeys[d];\n            var units = dataKey.units && dataKey.units.length ? dataKey.units : self.ctx.units;\n            units = units ? (' (' + units + ')') : '';\n            var dataset = {\n                label: dataKey.label + units,\n                data: [0],\n                backgroundColor: [dataKey.color],\n                borderColor: [dataKey.color],\n                borderWidth: 1\n            }\n            barData.datasets.push(dataset);\n        }\n    }\n\n    var ctx = $('#barChart', self.ctx.$container);\n    self.ctx.chart = new Chart(ctx, {\n        type: 'bar',\n        data: barData,\n        options: {\n            responsive: false,\n            maintainAspectRatio: false,\n            scales: {\n                yAxes: [{\n                    ticks: {\n                        beginAtZero:true\n                    }\n                }]\n            }\n        }\n    });\n    \n    self.onResize();\n}\n\nself.onDataUpdated = function() {\n    var c = 0;\n    for (var i = 0; i < self.ctx.chart.data.datasets.length; i++) {\n        var dataset = self.ctx.chart.data.datasets[i];\n        var cellData = self.ctx.data[i]; \n        if (cellData.data.length > 0) {\n            var decimals;\n            if (typeof cellData.dataKey.decimals !== 'undefined' \n                && cellData.dataKey.decimals !== null ) {\n                decimals = cellData.dataKey.decimals; \n            } else {\n                decimals = self.ctx.decimals;\n            }\n            var tvPair = cellData.data[cellData.data.length - 1];\n            var value = self.ctx.utils.formatValue(tvPair[1], decimals);\n            dataset.data[0] = parseFloat(value);\n        }\n    }\n    self.ctx.chart.update();\n}\n\nself.onResize = function() {\n    self.ctx.chart.resize();\n}\n\nself.onDestroy = function() {\n    self.ctx.chart.destroy();\n    self.ctx.chart = null;\n}\n",
+    "controllerScript": "self.onInit = function() {\n    self.ctx.$scope.barChartWidget.onInit();\n};\n\nself.onDataUpdated = function() {\n    self.ctx.$scope.barChartWidget.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\n",
     "settingsSchema": "",
-    "dataKeySettingsSchema": "{}\n",
-    "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\":\"Bars\"}"
+    "dataKeySettingsSchema": "",
+    "settingsDirective": "tb-bar-chart-widget-settings",
+    "hasBasicMode": true,
+    "basicModeDirective": "tb-bar-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\":\"Bars\",\"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\":\"bar_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}}"
   },
-  "externalId": null,
   "tags": [
+    "bars",
     "bar",
     "bar chart"
   ]
diff --git a/application/src/main/data/json/system/widget_types/bars_deprecated.json b/application/src/main/data/json/system/widget_types/bars_deprecated.json
new file mode 100644
index 0000000000..6324f9d7b2
--- /dev/null
+++ b/application/src/main/data/json/system/widget_types/bars_deprecated.json
@@ -0,0 +1,29 @@
+{
+  "fqn": "charts.bars",
+  "name": "Bars",
+  "deprecated": true,
+  "image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAACgCAMAAAB+IdObAAAA8FBMVEUhlvNMr1Bqamp5eXl7e3t8fHx9fX1+fn5/f3+AgICCgoKDg4OEhISGhoaHh4eKioqMjIyNjY2Ojo6QkJCRkZGSkpKWlpaXl5ebm5udnZ2enp6goKChoaGkpKSnp6epqamsrKyurq6xsbGzs7O1tbW2tra3t7e4uLi7u7u9vb3BwcHCwsLDw8PGxsbKysrNzc3Ozs7R0dHS0tLT09PZ2dna2trc3Nzd3d3e3t7g4ODh4eHj4+Pk5OTm5ubn5+fo6Ojp6enu7u7w8PDz8/P0Qzb09PT29vb39/f5+fn6+vr7+/v8/Pz9/f3+/v7/wQf///+dc+aLAAAAAWJLR0RPbmZBSQAAAcFJREFUeNrt3ds2AgEYhuHsaSOZbAvZi0r2YYjCJOW7/7txZhkcDNbM6h/vdwfPmlX/ybtmEorJErGCeJLadz3rkKPpZamaLTp925DHdFvSpKelU9uQ/cLKhtcdk7YqtiHruevtojch7ZZtQ0o1dcdfRqXNqm1IbVU3OaVamm/YhvQW5zIXOknnC5JUt7qEpE5fUv/5HVePy2UHAgQIECBAgAABAgQIECBxgrwGHBAgQIAAAQIECBAgQIAAAQIECJC/QRIBN0iQ+66voDMLuRp2fQWdVUhvNun6CjqrkJ0Dx/UVdEYhzXzfcX0FnVFIrlSZ2mx/LOiMQuqHh6k972NBZ/fv13G/KeiCQkIu4358EL8UdBafSGwuOxAgQIAAAQIECJDYQB4CDggQIECAAAECBAgQIECAAAECBAgQIECA/BrSufn0DjqjkEZmLXkWaUEXEmThXMeFSAu68H4j5b1IC7rQILfZTqQFXViQ1nRTL1EWdCFBnmYuJUVZ0IUEWR1xHKcXZUEXFDLwBR2XHQgQIECAAAEC5H9ChgIOCBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgxiBmv+L6Bl9pkxYph15gAAAAAElFTkSuQmCC",
+  "description": "Displays latest values of the attributes or time-series data for multiple entities as separate bars.",
+  "descriptor": {
+    "type": "latest",
+    "sizeX": 7,
+    "sizeY": 5,
+    "resources": [
+      {
+        "url": "https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.3.0/Chart.min.js"
+      }
+    ],
+    "templateHtml": "<canvas id=\"barChart\"></canvas>\n",
+    "templateCss": "",
+    "controllerScript": "self.onInit = function() {\n    $scope = self.ctx.$scope;\n    utils = $scope.$injector.get(self.ctx.servicesMap.get('utils'));\n    settings = utils.deepClone(self.ctx.settings) || {};\n    settings.showTooltip = utils.defaultValue(settings.showTooltip, true);\n    \n    Chart.defaults.global.tooltips.enabled = settings.showTooltip;\n    \n    var barData = {\n        labels: [],\n        datasets: []\n    };\n    \n    for (var i = 0; i < self.ctx.datasources.length; i++) {\n        var datasource = self.ctx.datasources[i];\n        for (var d = 0; d < datasource.dataKeys.length; d++) {\n            var dataKey = datasource.dataKeys[d];\n            var units = dataKey.units && dataKey.units.length ? dataKey.units : self.ctx.units;\n            units = units ? (' (' + units + ')') : '';\n            var dataset = {\n                label: dataKey.label + units,\n                data: [0],\n                backgroundColor: [dataKey.color],\n                borderColor: [dataKey.color],\n                borderWidth: 1\n            }\n            barData.datasets.push(dataset);\n        }\n    }\n\n    var ctx = $('#barChart', self.ctx.$container);\n    self.ctx.chart = new Chart(ctx, {\n        type: 'bar',\n        data: barData,\n        options: {\n            responsive: false,\n            maintainAspectRatio: false,\n            scales: {\n                yAxes: [{\n                    ticks: {\n                        beginAtZero:true\n                    }\n                }]\n            }\n        }\n    });\n    \n    self.onResize();\n}\n\nself.onDataUpdated = function() {\n    var c = 0;\n    for (var i = 0; i < self.ctx.chart.data.datasets.length; i++) {\n        var dataset = self.ctx.chart.data.datasets[i];\n        var cellData = self.ctx.data[i]; \n        if (cellData.data.length > 0) {\n            var decimals;\n            if (typeof cellData.dataKey.decimals !== 'undefined' \n                && cellData.dataKey.decimals !== null ) {\n                decimals = cellData.dataKey.decimals; \n            } else {\n                decimals = self.ctx.decimals;\n            }\n            var tvPair = cellData.data[cellData.data.length - 1];\n            var value = self.ctx.utils.formatValue(tvPair[1], decimals);\n            dataset.data[0] = parseFloat(value);\n        }\n    }\n    self.ctx.chart.update();\n}\n\nself.onResize = function() {\n    self.ctx.chart.resize();\n}\n\nself.onDestroy = function() {\n    self.ctx.chart.destroy();\n    self.ctx.chart = null;\n}\n",
+    "settingsSchema": "",
+    "dataKeySettingsSchema": "{}\n",
+    "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\":\"Bars\"}"
+  },
+  "externalId": null,
+  "tags": [
+    "bar",
+    "bar chart"
+  ]
+}
\ 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/line_chart.json b/application/src/main/data/json/system/widget_types/line_chart.json
new file mode 100644
index 0000000000..f5b123231c
--- /dev/null
+++ b/application/src/main/data/json/system/widget_types/line_chart.json
@@ -0,0 +1,32 @@
+{
+  "fqn": "line_chart",
+  "name": "Line chart",
+  "deprecated": false,
+  "image": "tb-image:Y2hhcnRfKDEpLnN2Zw==:IkxpbmUgY2hhcnQiIHN5c3RlbSB3aWRnZXQgaW1hZ2U=;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_4184_94527)">
<path d="M2.84766 1.28125V7H2.125V2.18359L0.667969 2.71484V2.0625L2.73438 1.28125H2.84766ZM8.67517 3.70312V4.57031C8.67517 5.03646 8.63351 5.42969 8.55017 5.75C8.46684 6.07031 8.34705 6.32812 8.1908 6.52344C8.03455 6.71875 7.84575 6.86068 7.62439 6.94922C7.40564 7.03516 7.15825 7.07812 6.8822 7.07812C6.66345 7.07812 6.46163 7.05078 6.27673 6.99609C6.09184 6.94141 5.92517 6.85417 5.77673 6.73438C5.6309 6.61198 5.5059 6.45312 5.40173 6.25781C5.29757 6.0625 5.21814 5.82552 5.16345 5.54688C5.10877 5.26823 5.08142 4.94271 5.08142 4.57031V3.70312C5.08142 3.23698 5.12309 2.84635 5.20642 2.53125C5.29236 2.21615 5.41345 1.96354 5.5697 1.77344C5.72595 1.58073 5.91345 1.44271 6.1322 1.35938C6.35356 1.27604 6.60095 1.23438 6.87439 1.23438C7.09575 1.23438 7.29887 1.26172 7.48377 1.31641C7.67127 1.36849 7.83793 1.45312 7.98377 1.57031C8.1296 1.6849 8.2533 1.83854 8.35486 2.03125C8.45903 2.22135 8.53845 2.45443 8.59314 2.73047C8.64783 3.00651 8.67517 3.33073 8.67517 3.70312ZM7.94861 4.6875V3.58203C7.94861 3.32682 7.93298 3.10286 7.90173 2.91016C7.87309 2.71484 7.83012 2.54818 7.77283 2.41016C7.71554 2.27214 7.64262 2.16016 7.55408 2.07422C7.46814 1.98828 7.36788 1.92578 7.2533 1.88672C7.14132 1.84505 7.01502 1.82422 6.87439 1.82422C6.70252 1.82422 6.55017 1.85677 6.41736 1.92188C6.28455 1.98438 6.17257 2.08464 6.08142 2.22266C5.99288 2.36068 5.92517 2.54167 5.8783 2.76562C5.83142 2.98958 5.80798 3.26172 5.80798 3.58203V4.6875C5.80798 4.94271 5.82231 5.16797 5.85095 5.36328C5.8822 5.55859 5.92778 5.72786 5.98767 5.87109C6.04757 6.01172 6.12048 6.1276 6.20642 6.21875C6.29236 6.3099 6.39132 6.3776 6.5033 6.42188C6.61788 6.46354 6.74418 6.48438 6.8822 6.48438C7.05929 6.48438 7.21423 6.45052 7.34705 6.38281C7.47986 6.3151 7.59054 6.20964 7.67908 6.06641C7.77022 5.92057 7.83793 5.73438 7.8822 5.50781C7.92647 5.27865 7.94861 5.00521 7.94861 4.6875ZM13.3074 3.70312V4.57031C13.3074 5.03646 13.2657 5.42969 13.1824 5.75C13.099 6.07031 12.9793 6.32812 12.823 6.52344C12.6668 6.71875 12.4779 6.86068 12.2566 6.94922C12.0378 7.03516 11.7904 7.07812 11.5144 7.07812C11.2957 7.07812 11.0938 7.05078 10.9089 6.99609C10.724 6.94141 10.5574 6.85417 10.4089 6.73438C10.2631 6.61198 10.1381 6.45312 10.0339 6.25781C9.92977 6.0625 9.85034 5.82552 9.79566 5.54688C9.74097 5.26823 9.71363 4.94271 9.71363 4.57031V3.70312C9.71363 3.23698 9.75529 2.84635 9.83863 2.53125C9.92456 2.21615 10.0457 1.96354 10.2019 1.77344C10.3582 1.58073 10.5457 1.44271 10.7644 1.35938C10.9858 1.27604 11.2332 1.23438 11.5066 1.23438C11.7279 1.23438 11.9311 1.26172 12.116 1.31641C12.3035 1.36849 12.4701 1.45312 12.616 1.57031C12.7618 1.6849 12.8855 1.83854 12.9871 2.03125C13.0912 2.22135 13.1707 2.45443 13.2253 2.73047C13.28 3.00651 13.3074 3.33073 13.3074 3.70312ZM12.5808 4.6875V3.58203C12.5808 3.32682 12.5652 3.10286 12.5339 2.91016C12.5053 2.71484 12.4623 2.54818 12.405 2.41016C12.3477 2.27214 12.2748 2.16016 12.1863 2.07422C12.1003 1.98828 12.0001 1.92578 11.8855 1.88672C11.7735 1.84505 11.6472 1.82422 11.5066 1.82422C11.3347 1.82422 11.1824 1.85677 11.0496 1.92188C10.9168 1.98438 10.8048 2.08464 10.7136 2.22266C10.6251 2.36068 10.5574 2.54167 10.5105 2.76562C10.4636 2.98958 10.4402 3.26172 10.4402 3.58203V4.6875C10.4402 4.94271 10.4545 5.16797 10.4832 5.36328C10.5144 5.55859 10.56 5.72786 10.6199 5.87109C10.6798 6.01172 10.7527 6.1276 10.8386 6.21875C10.9246 6.3099 11.0235 6.3776 11.1355 6.42188C11.2501 6.46354 11.3764 6.48438 11.5144 6.48438C11.6915 6.48438 11.8464 6.45052 11.9793 6.38281C12.1121 6.3151 12.2227 6.20964 12.3113 6.06641C12.4024 5.92057 12.4701 5.73438 12.5144 5.50781C12.5587 5.27865 12.5808 5.00521 12.5808 4.6875ZM14.3068 2.70703V2.40625C14.3068 2.1901 14.3536 1.99349 14.4474 1.81641C14.5411 1.63932 14.6753 1.4974 14.8497 1.39062C15.0242 1.28385 15.2312 1.23047 15.4708 1.23047C15.7156 1.23047 15.924 1.28385 16.0958 1.39062C16.2703 1.4974 16.4044 1.63932 16.4982 1.81641C16.5919 1.99349 16.6388 2.1901 16.6388 2.40625V2.70703C16.6388 2.91797 16.5919 3.11198 16.4982 3.28906C16.407 3.46615 16.2742 3.60807 16.0997 3.71484C15.9279 3.82161 15.7208 3.875 15.4786 3.875C15.2365 3.875 15.0268 3.82161 14.8497 3.71484C14.6753 3.60807 14.5411 3.46615 14.4474 3.28906C14.3536 3.11198 14.3068 2.91797 14.3068 2.70703ZM14.8497 2.40625V2.70703C14.8497 2.82682 14.8719 2.9401 14.9161 3.04688C14.963 3.15365 15.0333 3.24089 15.1271 3.30859C15.2208 3.3737 15.338 3.40625 15.4786 3.40625C15.6193 3.40625 15.7352 3.3737 15.8263 3.30859C15.9174 3.24089 15.9852 3.15365 16.0294 3.04688C16.0737 2.9401 16.0958 2.82682 16.0958 2.70703V2.40625C16.0958 2.28385 16.0724 2.16927 16.0255 2.0625C15.9812 1.95312 15.9122 1.86589 15.8185 1.80078C15.7273 1.73307 15.6115 1.69922 15.4708 1.69922C15.3328 1.69922 15.2169 1.73307 15.1232 1.80078C15.032 1.86589 14.963 1.95312 14.9161 2.0625C14.8719 2.16927 14.8497 2.28385 14.8497 2.40625ZM17.0763 5.91016V5.60547C17.0763 5.39193 17.1232 5.19661 17.2169 5.01953C17.3107 4.84245 17.4448 4.70052 17.6193 4.59375C17.7937 4.48698 18.0008 4.43359 18.2404 4.43359C18.4852 4.43359 18.6935 4.48698 18.8654 4.59375C19.0398 4.70052 19.174 4.84245 19.2677 5.01953C19.3615 5.19661 19.4083 5.39193 19.4083 5.60547V5.91016C19.4083 6.1237 19.3615 6.31901 19.2677 6.49609C19.1766 6.67318 19.0437 6.8151 18.8693 6.92188C18.6974 7.02865 18.4904 7.08203 18.2482 7.08203C18.006 7.08203 17.7977 7.02865 17.6232 6.92188C17.4487 6.8151 17.3133 6.67318 17.2169 6.49609C17.1232 6.31901 17.0763 6.1237 17.0763 5.91016ZM17.6193 5.60547V5.91016C17.6193 6.02995 17.6414 6.14453 17.6857 6.25391C17.7325 6.36068 17.8029 6.44792 17.8966 6.51562C17.9904 6.58073 18.1075 6.61328 18.2482 6.61328C18.3888 6.61328 18.5047 6.58073 18.5958 6.51562C18.6896 6.44792 18.7586 6.36068 18.8029 6.25391C18.8471 6.14714 18.8693 6.03255 18.8693 5.91016V5.60547C18.8693 5.48307 18.8458 5.36849 18.799 5.26172C18.7547 5.15495 18.6857 5.06901 18.5919 5.00391C18.5008 4.9362 18.3836 4.90234 18.2404 4.90234C18.1023 4.90234 17.9865 4.9362 17.8927 5.00391C17.8016 5.06901 17.7325 5.15495 17.6857 5.26172C17.6414 5.36849 17.6193 5.48307 17.6193 5.60547ZM18.42 2.12109L15.6427 6.56641L15.2365 6.30859L18.0138 1.86328L18.42 2.12109Z" fill="black" fill-opacity="0.54"/>
<path d="M8.05859 33.6677C8.05859 34.0141 7.97786 34.3083 7.81641 34.5505C7.65755 34.7901 7.44141 34.9724 7.16797 35.0974C6.89714 35.2224 6.59115 35.2849 6.25 35.2849C5.90885 35.2849 5.60156 35.2224 5.32812 35.0974C5.05469 34.9724 4.83854 34.7901 4.67969 34.5505C4.52083 34.3083 4.44141 34.0141 4.44141 33.6677C4.44141 33.4412 4.48438 33.2341 4.57031 33.0466C4.65885 32.8565 4.78255 32.6912 4.94141 32.5505C5.10286 32.4099 5.29297 32.3018 5.51172 32.2263C5.73307 32.1482 5.97656 32.1091 6.24219 32.1091C6.59115 32.1091 6.90234 32.1768 7.17578 32.3123C7.44922 32.4451 7.66406 32.6287 7.82031 32.863C7.97917 33.0974 8.05859 33.3656 8.05859 33.6677ZM7.33203 33.6521C7.33203 33.4412 7.28646 33.255 7.19531 33.0935C7.10417 32.9294 6.97656 32.8018 6.8125 32.7107C6.64844 32.6195 6.45833 32.574 6.24219 32.574C6.02083 32.574 5.82943 32.6195 5.66797 32.7107C5.50911 32.8018 5.38542 32.9294 5.29688 33.0935C5.20833 33.255 5.16406 33.4412 5.16406 33.6521C5.16406 33.8708 5.20703 34.0583 5.29297 34.2146C5.38151 34.3682 5.50651 34.4867 5.66797 34.5701C5.83203 34.6508 6.02604 34.6912 6.25 34.6912C6.47396 34.6912 6.66667 34.6508 6.82812 34.5701C6.98958 34.4867 7.11328 34.3682 7.19922 34.2146C7.28776 34.0583 7.33203 33.8708 7.33203 33.6521ZM7.92578 30.9998C7.92578 31.2758 7.85286 31.5245 7.70703 31.7458C7.5612 31.9672 7.36198 32.1417 7.10938 32.2693C6.85677 32.3969 6.57031 32.4607 6.25 32.4607C5.92448 32.4607 5.63411 32.3969 5.37891 32.2693C5.1263 32.1417 4.92839 31.9672 4.78516 31.7458C4.64193 31.5245 4.57031 31.2758 4.57031 30.9998C4.57031 30.669 4.64193 30.3878 4.78516 30.156C4.93099 29.9242 5.13021 29.7472 5.38281 29.6248C5.63542 29.5024 5.92318 29.4412 6.24609 29.4412C6.57161 29.4412 6.86068 29.5024 7.11328 29.6248C7.36589 29.7472 7.5638 29.9242 7.70703 30.156C7.85286 30.3878 7.92578 30.669 7.92578 30.9998ZM7.20312 31.0115C7.20312 30.8214 7.16276 30.6534 7.08203 30.5076C7.0013 30.3617 6.88932 30.2472 6.74609 30.1638C6.60286 30.0779 6.4362 30.0349 6.24609 30.0349C6.05599 30.0349 5.88932 30.0753 5.74609 30.156C5.60547 30.2341 5.49479 30.3461 5.41406 30.4919C5.33594 30.6378 5.29688 30.811 5.29688 31.0115C5.29688 31.2068 5.33594 31.3774 5.41406 31.5232C5.49479 31.669 5.60677 31.7823 5.75 31.863C5.89323 31.9438 6.0599 31.9841 6.25 31.9841C6.4401 31.9841 6.60547 31.9438 6.74609 31.863C6.88932 31.7823 7.0013 31.669 7.08203 31.5232C7.16276 31.3774 7.20312 31.2068 7.20312 31.0115ZM12.6752 31.9099V32.7771C12.6752 33.2432 12.6335 33.6365 12.5502 33.9568C12.4668 34.2771 12.347 34.5349 12.1908 34.7302C12.0345 34.9255 11.8457 35.0675 11.6244 35.156C11.4056 35.2419 11.1582 35.2849 10.8822 35.2849C10.6635 35.2849 10.4616 35.2576 10.2767 35.2029C10.0918 35.1482 9.92517 35.061 9.77673 34.9412C9.6309 34.8188 9.5059 34.6599 9.40173 34.4646C9.29757 34.2693 9.21814 34.0323 9.16345 33.7537C9.10877 33.475 9.08142 33.1495 9.08142 32.7771V31.9099C9.08142 31.4438 9.12309 31.0531 9.20642 30.738C9.29236 30.4229 9.41345 30.1703 9.5697 29.9802C9.72595 29.7875 9.91345 29.6495 10.1322 29.5662C10.3536 29.4828 10.601 29.4412 10.8744 29.4412C11.0957 29.4412 11.2989 29.4685 11.4838 29.5232C11.6713 29.5753 11.8379 29.6599 11.9838 29.7771C12.1296 29.8917 12.2533 30.0453 12.3549 30.238C12.459 30.4281 12.5385 30.6612 12.5931 30.9373C12.6478 31.2133 12.6752 31.5375 12.6752 31.9099ZM11.9486 32.8943V31.7888C11.9486 31.5336 11.933 31.3097 11.9017 31.1169C11.8731 30.9216 11.8301 30.755 11.7728 30.6169C11.7155 30.4789 11.6426 30.3669 11.5541 30.281C11.4681 30.1951 11.3679 30.1326 11.2533 30.0935C11.1413 30.0518 11.015 30.031 10.8744 30.031C10.7025 30.031 10.5502 30.0636 10.4174 30.1287C10.2845 30.1912 10.1726 30.2914 10.0814 30.4294C9.99288 30.5675 9.92517 30.7485 9.8783 30.9724C9.83142 31.1964 9.80798 31.4685 9.80798 31.7888V32.8943C9.80798 33.1495 9.82231 33.3748 9.85095 33.5701C9.8822 33.7654 9.92778 33.9347 9.98767 34.0779C10.0476 34.2185 10.1205 34.3344 10.2064 34.4255C10.2924 34.5167 10.3913 34.5844 10.5033 34.6287C10.6179 34.6703 10.7442 34.6912 10.8822 34.6912C11.0593 34.6912 11.2142 34.6573 11.347 34.5896C11.4799 34.5219 11.5905 34.4164 11.6791 34.2732C11.7702 34.1274 11.8379 33.9412 11.8822 33.7146C11.9265 33.4854 11.9486 33.212 11.9486 32.8943ZM13.6746 30.9138V30.613C13.6746 30.3969 13.7214 30.2003 13.8152 30.0232C13.9089 29.8461 14.0431 29.7042 14.2175 29.5974C14.392 29.4906 14.599 29.4373 14.8386 29.4373C15.0834 29.4373 15.2918 29.4906 15.4636 29.5974C15.6381 29.7042 15.7722 29.8461 15.866 30.0232C15.9597 30.2003 16.0066 30.3969 16.0066 30.613V30.9138C16.0066 31.1248 15.9597 31.3188 15.866 31.4958C15.7748 31.6729 15.642 31.8149 15.4675 31.9216C15.2957 32.0284 15.0886 32.0818 14.8464 32.0818C14.6043 32.0818 14.3946 32.0284 14.2175 31.9216C14.0431 31.8149 13.9089 31.6729 13.8152 31.4958C13.7214 31.3188 13.6746 31.1248 13.6746 30.9138ZM14.2175 30.613V30.9138C14.2175 31.0336 14.2397 31.1469 14.2839 31.2537C14.3308 31.3604 14.4011 31.4477 14.4949 31.5154C14.5886 31.5805 14.7058 31.613 14.8464 31.613C14.9871 31.613 15.1029 31.5805 15.1941 31.5154C15.2852 31.4477 15.3529 31.3604 15.3972 31.2537C15.4415 31.1469 15.4636 31.0336 15.4636 30.9138V30.613C15.4636 30.4906 15.4402 30.3761 15.3933 30.2693C15.349 30.1599 15.28 30.0727 15.1863 30.0076C15.0951 29.9399 14.9793 29.906 14.8386 29.906C14.7006 29.906 14.5847 29.9399 14.491 30.0076C14.3998 30.0727 14.3308 30.1599 14.2839 30.2693C14.2397 30.3761 14.2175 30.4906 14.2175 30.613ZM16.4441 34.1169V33.8123C16.4441 33.5987 16.491 33.4034 16.5847 33.2263C16.6785 33.0492 16.8126 32.9073 16.9871 32.8005C17.1615 32.6938 17.3686 32.6404 17.6082 32.6404C17.8529 32.6404 18.0613 32.6938 18.2332 32.8005C18.4076 32.9073 18.5418 33.0492 18.6355 33.2263C18.7293 33.4034 18.7761 33.5987 18.7761 33.8123V34.1169C18.7761 34.3305 18.7293 34.5258 18.6355 34.7029C18.5444 34.88 18.4115 35.0219 18.2371 35.1287C18.0652 35.2354 17.8582 35.2888 17.616 35.2888C17.3738 35.2888 17.1654 35.2354 16.991 35.1287C16.8165 35.0219 16.6811 34.88 16.5847 34.7029C16.491 34.5258 16.4441 34.3305 16.4441 34.1169ZM16.9871 33.8123V34.1169C16.9871 34.2367 17.0092 34.3513 17.0535 34.4607C17.1003 34.5675 17.1707 34.6547 17.2644 34.7224C17.3582 34.7875 17.4753 34.8201 17.616 34.8201C17.7566 34.8201 17.8725 34.7875 17.9636 34.7224C18.0574 34.6547 18.1264 34.5675 18.1707 34.4607C18.2149 34.3539 18.2371 34.2393 18.2371 34.1169V33.8123C18.2371 33.6899 18.2136 33.5753 18.1668 33.4685C18.1225 33.3617 18.0535 33.2758 17.9597 33.2107C17.8686 33.143 17.7514 33.1091 17.6082 33.1091C17.4701 33.1091 17.3543 33.143 17.2605 33.2107C17.1694 33.2758 17.1003 33.3617 17.0535 33.4685C17.0092 33.5753 16.9871 33.6899 16.9871 33.8123ZM17.7878 30.3279L15.0105 34.7732L14.6043 34.5154L17.3816 30.0701L17.7878 30.3279Z" fill="black" fill-opacity="0.54"/>
<path d="M7.24609 57.7183H7.30859V58.3315H7.24609C6.86328 58.3315 6.54297 58.394 6.28516 58.519C6.02734 58.6414 5.82292 58.8068 5.67188 59.0151C5.52083 59.2209 5.41146 59.4526 5.34375 59.7104C5.27865 59.9683 5.24609 60.23 5.24609 60.4956V61.3315C5.24609 61.5841 5.27604 61.8081 5.33594 62.0034C5.39583 62.1961 5.47786 62.3589 5.58203 62.4917C5.6862 62.6245 5.80339 62.7248 5.93359 62.7925C6.06641 62.8602 6.20443 62.894 6.34766 62.894C6.51432 62.894 6.66276 62.8628 6.79297 62.8003C6.92318 62.7352 7.03255 62.6453 7.12109 62.5308C7.21224 62.4136 7.28125 62.2756 7.32812 62.1167C7.375 61.9578 7.39844 61.7834 7.39844 61.5933C7.39844 61.424 7.3776 61.2612 7.33594 61.105C7.29427 60.9461 7.23047 60.8055 7.14453 60.6831C7.05859 60.5581 6.95052 60.4604 6.82031 60.3901C6.69271 60.3172 6.54036 60.2808 6.36328 60.2808C6.16276 60.2808 5.97526 60.3302 5.80078 60.4292C5.62891 60.5256 5.48698 60.6532 5.375 60.812C5.26562 60.9683 5.20312 61.1388 5.1875 61.3237L4.80469 61.3198C4.84115 61.0282 4.90885 60.7795 5.00781 60.5737C5.10938 60.3654 5.23438 60.1961 5.38281 60.0659C5.53385 59.9331 5.70182 59.8368 5.88672 59.7769C6.07422 59.7144 6.27214 59.6831 6.48047 59.6831C6.76432 59.6831 7.00911 59.7365 7.21484 59.8433C7.42057 59.95 7.58984 60.0933 7.72266 60.2729C7.85547 60.45 7.95312 60.6506 8.01562 60.8745C8.08073 61.0959 8.11328 61.3237 8.11328 61.5581C8.11328 61.8263 8.07552 62.0776 8 62.312C7.92448 62.5464 7.8112 62.7521 7.66016 62.9292C7.51172 63.1063 7.32812 63.2443 7.10938 63.3433C6.89062 63.4422 6.63672 63.4917 6.34766 63.4917C6.04036 63.4917 5.77214 63.4292 5.54297 63.3042C5.3138 63.1766 5.1237 63.0073 4.97266 62.7964C4.82161 62.5854 4.70833 62.3511 4.63281 62.0933C4.55729 61.8354 4.51953 61.5737 4.51953 61.3081V60.9683C4.51953 60.5672 4.5599 60.174 4.64062 59.7886C4.72135 59.4032 4.86068 59.0542 5.05859 58.7417C5.25911 58.4292 5.53646 58.1805 5.89062 57.9956C6.24479 57.8107 6.69661 57.7183 7.24609 57.7183ZM12.6752 60.1167V60.9839C12.6752 61.45 12.6335 61.8433 12.5502 62.1636C12.4668 62.4839 12.347 62.7417 12.1908 62.937C12.0345 63.1323 11.8457 63.2743 11.6244 63.3628C11.4056 63.4487 11.1582 63.4917 10.8822 63.4917C10.6635 63.4917 10.4616 63.4644 10.2767 63.4097C10.0918 63.355 9.92517 63.2677 9.77673 63.1479C9.6309 63.0256 9.5059 62.8667 9.40173 62.6714C9.29757 62.4761 9.21814 62.2391 9.16345 61.9604C9.10877 61.6818 9.08142 61.3563 9.08142 60.9839V60.1167C9.08142 59.6506 9.12309 59.2599 9.20642 58.9448C9.29236 58.6297 9.41345 58.3771 9.5697 58.187C9.72595 57.9943 9.91345 57.8563 10.1322 57.7729C10.3536 57.6896 10.601 57.6479 10.8744 57.6479C11.0957 57.6479 11.2989 57.6753 11.4838 57.73C11.6713 57.7821 11.8379 57.8667 11.9838 57.9839C12.1296 58.0985 12.2533 58.2521 12.3549 58.4448C12.459 58.6349 12.5385 58.868 12.5931 59.144C12.6478 59.4201 12.6752 59.7443 12.6752 60.1167ZM11.9486 61.1011V59.9956C11.9486 59.7404 11.933 59.5164 11.9017 59.3237C11.8731 59.1284 11.8301 58.9618 11.7728 58.8237C11.7155 58.6857 11.6426 58.5737 11.5541 58.4878C11.4681 58.4019 11.3679 58.3394 11.2533 58.3003C11.1413 58.2586 11.015 58.2378 10.8744 58.2378C10.7025 58.2378 10.5502 58.2703 10.4174 58.3354C10.2845 58.3979 10.1726 58.4982 10.0814 58.6362C9.99288 58.7743 9.92517 58.9552 9.8783 59.1792C9.83142 59.4032 9.80798 59.6753 9.80798 59.9956V61.1011C9.80798 61.3563 9.82231 61.5815 9.85095 61.7769C9.8822 61.9722 9.92778 62.1414 9.98767 62.2847C10.0476 62.4253 10.1205 62.5412 10.2064 62.6323C10.2924 62.7235 10.3913 62.7912 10.5033 62.8354C10.6179 62.8771 10.7442 62.8979 10.8822 62.8979C11.0593 62.8979 11.2142 62.8641 11.347 62.7964C11.4799 62.7287 11.5905 62.6232 11.6791 62.48C11.7702 62.3341 11.8379 62.1479 11.8822 61.9214C11.9265 61.6922 11.9486 61.4188 11.9486 61.1011ZM13.6746 59.1206V58.8198C13.6746 58.6037 13.7214 58.4071 13.8152 58.23C13.9089 58.0529 14.0431 57.911 14.2175 57.8042C14.392 57.6974 14.599 57.644 14.8386 57.644C15.0834 57.644 15.2918 57.6974 15.4636 57.8042C15.6381 57.911 15.7722 58.0529 15.866 58.23C15.9597 58.4071 16.0066 58.6037 16.0066 58.8198V59.1206C16.0066 59.3315 15.9597 59.5256 15.866 59.7026C15.7748 59.8797 15.642 60.0216 15.4675 60.1284C15.2957 60.2352 15.0886 60.2886 14.8464 60.2886C14.6043 60.2886 14.3946 60.2352 14.2175 60.1284C14.0431 60.0216 13.9089 59.8797 13.8152 59.7026C13.7214 59.5256 13.6746 59.3315 13.6746 59.1206ZM14.2175 58.8198V59.1206C14.2175 59.2404 14.2397 59.3537 14.2839 59.4604C14.3308 59.5672 14.4011 59.6545 14.4949 59.7222C14.5886 59.7873 14.7058 59.8198 14.8464 59.8198C14.9871 59.8198 15.1029 59.7873 15.1941 59.7222C15.2852 59.6545 15.3529 59.5672 15.3972 59.4604C15.4415 59.3537 15.4636 59.2404 15.4636 59.1206V58.8198C15.4636 58.6974 15.4402 58.5828 15.3933 58.4761C15.349 58.3667 15.28 58.2795 15.1863 58.2144C15.0951 58.1466 14.9793 58.1128 14.8386 58.1128C14.7006 58.1128 14.5847 58.1466 14.491 58.2144C14.3998 58.2795 14.3308 58.3667 14.2839 58.4761C14.2397 58.5828 14.2175 58.6974 14.2175 58.8198ZM16.4441 62.3237V62.019C16.4441 61.8055 16.491 61.6102 16.5847 61.4331C16.6785 61.256 16.8126 61.1141 16.9871 61.0073C17.1615 60.9006 17.3686 60.8472 17.6082 60.8472C17.8529 60.8472 18.0613 60.9006 18.2332 61.0073C18.4076 61.1141 18.5418 61.256 18.6355 61.4331C18.7293 61.6102 18.7761 61.8055 18.7761 62.019V62.3237C18.7761 62.5373 18.7293 62.7326 18.6355 62.9097C18.5444 63.0868 18.4115 63.2287 18.2371 63.3354C18.0652 63.4422 17.8582 63.4956 17.616 63.4956C17.3738 63.4956 17.1654 63.4422 16.991 63.3354C16.8165 63.2287 16.6811 63.0868 16.5847 62.9097C16.491 62.7326 16.4441 62.5373 16.4441 62.3237ZM16.9871 62.019V62.3237C16.9871 62.4435 17.0092 62.5581 17.0535 62.6675C17.1003 62.7743 17.1707 62.8615 17.2644 62.9292C17.3582 62.9943 17.4753 63.0269 17.616 63.0269C17.7566 63.0269 17.8725 62.9943 17.9636 62.9292C18.0574 62.8615 18.1264 62.7743 18.1707 62.6675C18.2149 62.5607 18.2371 62.4461 18.2371 62.3237V62.019C18.2371 61.8966 18.2136 61.7821 18.1668 61.6753C18.1225 61.5685 18.0535 61.4826 17.9597 61.4175C17.8686 61.3498 17.7514 61.3159 17.6082 61.3159C17.4701 61.3159 17.3543 61.3498 17.2605 61.4175C17.1694 61.4826 17.1003 61.5685 17.0535 61.6753C17.0092 61.7821 16.9871 61.8966 16.9871 62.019ZM17.7878 58.5347L15.0105 62.98L14.6043 62.7222L17.3816 58.2769L17.7878 58.5347Z" fill="black" fill-opacity="0.54"/>
<path d="M8.31641 89.7063V90.3H4.20703V89.8743L6.75391 85.9329H7.34375L6.71094 87.0735L5.02734 89.7063H8.31641ZM7.52344 85.9329V91.6204H6.80078V85.9329H7.52344ZM12.6752 88.3235V89.1907C12.6752 89.6568 12.6335 90.05 12.5502 90.3704C12.4668 90.6907 12.347 90.9485 12.1908 91.1438C12.0345 91.3391 11.8457 91.481 11.6244 91.5696C11.4056 91.6555 11.1582 91.6985 10.8822 91.6985C10.6635 91.6985 10.4616 91.6711 10.2767 91.6165C10.0918 91.5618 9.92517 91.4745 9.77673 91.3547C9.6309 91.2323 9.5059 91.0735 9.40173 90.8782C9.29757 90.6829 9.21814 90.4459 9.16345 90.1672C9.10877 89.8886 9.08142 89.5631 9.08142 89.1907V88.3235C9.08142 87.8573 9.12309 87.4667 9.20642 87.1516C9.29236 86.8365 9.41345 86.5839 9.5697 86.3938C9.72595 86.2011 9.91345 86.0631 10.1322 85.9797C10.3536 85.8964 10.601 85.8547 10.8744 85.8547C11.0957 85.8547 11.2989 85.8821 11.4838 85.9368C11.6713 85.9889 11.8379 86.0735 11.9838 86.1907C12.1296 86.3053 12.2533 86.4589 12.3549 86.6516C12.459 86.8417 12.5385 87.0748 12.5931 87.3508C12.6478 87.6269 12.6752 87.9511 12.6752 88.3235ZM11.9486 89.3079V88.2024C11.9486 87.9472 11.933 87.7232 11.9017 87.5305C11.8731 87.3352 11.8301 87.1685 11.7728 87.0305C11.7155 86.8925 11.6426 86.7805 11.5541 86.6946C11.4681 86.6086 11.3679 86.5461 11.2533 86.5071C11.1413 86.4654 11.015 86.4446 10.8744 86.4446C10.7025 86.4446 10.5502 86.4771 10.4174 86.5422C10.2845 86.6047 10.1726 86.705 10.0814 86.843C9.99288 86.981 9.92517 87.162 9.8783 87.386C9.83142 87.6099 9.80798 87.8821 9.80798 88.2024V89.3079C9.80798 89.5631 9.82231 89.7883 9.85095 89.9836C9.8822 90.179 9.92778 90.3482 9.98767 90.4915C10.0476 90.6321 10.1205 90.748 10.2064 90.8391C10.2924 90.9303 10.3913 90.998 10.5033 91.0422C10.6179 91.0839 10.7442 91.1047 10.8822 91.1047C11.0593 91.1047 11.2142 91.0709 11.347 91.0032C11.4799 90.9355 11.5905 90.83 11.6791 90.6868C11.7702 90.5409 11.8379 90.3547 11.8822 90.1282C11.9265 89.899 11.9486 89.6256 11.9486 89.3079ZM13.6746 87.3274V87.0266C13.6746 86.8105 13.7214 86.6139 13.8152 86.4368C13.9089 86.2597 14.0431 86.1178 14.2175 86.011C14.392 85.9042 14.599 85.8508 14.8386 85.8508C15.0834 85.8508 15.2918 85.9042 15.4636 86.011C15.6381 86.1178 15.7722 86.2597 15.866 86.4368C15.9597 86.6139 16.0066 86.8105 16.0066 87.0266V87.3274C16.0066 87.5383 15.9597 87.7323 15.866 87.9094C15.7748 88.0865 15.642 88.2284 15.4675 88.3352C15.2957 88.442 15.0886 88.4954 14.8464 88.4954C14.6043 88.4954 14.3946 88.442 14.2175 88.3352C14.0431 88.2284 13.9089 88.0865 13.8152 87.9094C13.7214 87.7323 13.6746 87.5383 13.6746 87.3274ZM14.2175 87.0266V87.3274C14.2175 87.4472 14.2397 87.5605 14.2839 87.6672C14.3308 87.774 14.4011 87.8612 14.4949 87.929C14.5886 87.9941 14.7058 88.0266 14.8464 88.0266C14.9871 88.0266 15.1029 87.9941 15.1941 87.929C15.2852 87.8612 15.3529 87.774 15.3972 87.6672C15.4415 87.5605 15.4636 87.4472 15.4636 87.3274V87.0266C15.4636 86.9042 15.4402 86.7896 15.3933 86.6829C15.349 86.5735 15.28 86.4862 15.1863 86.4211C15.0951 86.3534 14.9793 86.3196 14.8386 86.3196C14.7006 86.3196 14.5847 86.3534 14.491 86.4211C14.3998 86.4862 14.3308 86.5735 14.2839 86.6829C14.2397 86.7896 14.2175 86.9042 14.2175 87.0266ZM16.4441 90.5305V90.2258C16.4441 90.0123 16.491 89.817 16.5847 89.6399C16.6785 89.4628 16.8126 89.3209 16.9871 89.2141C17.1615 89.1073 17.3686 89.054 17.6082 89.054C17.8529 89.054 18.0613 89.1073 18.2332 89.2141C18.4076 89.3209 18.5418 89.4628 18.6355 89.6399C18.7293 89.817 18.7761 90.0123 18.7761 90.2258V90.5305C18.7761 90.7441 18.7293 90.9394 18.6355 91.1165C18.5444 91.2935 18.4115 91.4355 18.2371 91.5422C18.0652 91.649 17.8582 91.7024 17.616 91.7024C17.3738 91.7024 17.1654 91.649 16.991 91.5422C16.8165 91.4355 16.6811 91.2935 16.5847 91.1165C16.491 90.9394 16.4441 90.7441 16.4441 90.5305ZM16.9871 90.2258V90.5305C16.9871 90.6503 17.0092 90.7649 17.0535 90.8743C17.1003 90.981 17.1707 91.0683 17.2644 91.136C17.3582 91.2011 17.4753 91.2336 17.616 91.2336C17.7566 91.2336 17.8725 91.2011 17.9636 91.136C18.0574 91.0683 18.1264 90.981 18.1707 90.8743C18.2149 90.7675 18.2371 90.6529 18.2371 90.5305V90.2258C18.2371 90.1034 18.2136 89.9889 18.1668 89.8821C18.1225 89.7753 18.0535 89.6894 17.9597 89.6243C17.8686 89.5566 17.7514 89.5227 17.6082 89.5227C17.4701 89.5227 17.3543 89.5566 17.2605 89.6243C17.1694 89.6894 17.1003 89.7753 17.0535 89.8821C17.0092 89.9889 16.9871 90.1034 16.9871 90.2258ZM17.7878 86.7415L15.0105 91.1868L14.6043 90.929L17.3816 86.4836L17.7878 86.7415Z" fill="black" fill-opacity="0.54"/>
<path d="M8.19922 119.233V119.827H4.47656V119.308L6.33984 117.233C6.56901 116.978 6.74609 116.762 6.87109 116.585C6.9987 116.405 7.08724 116.245 7.13672 116.104C7.1888 115.961 7.21484 115.815 7.21484 115.667C7.21484 115.479 7.17578 115.31 7.09766 115.159C7.02214 115.006 6.91016 114.883 6.76172 114.792C6.61328 114.701 6.43359 114.655 6.22266 114.655C5.97005 114.655 5.75911 114.705 5.58984 114.804C5.42318 114.9 5.29818 115.035 5.21484 115.21C5.13151 115.384 5.08984 115.585 5.08984 115.812H4.36719C4.36719 115.491 4.4375 115.198 4.57812 114.933C4.71875 114.667 4.92708 114.456 5.20312 114.3C5.47917 114.141 5.81901 114.062 6.22266 114.062C6.58203 114.062 6.88932 114.125 7.14453 114.253C7.39974 114.378 7.59505 114.555 7.73047 114.784C7.86849 115.011 7.9375 115.276 7.9375 115.581C7.9375 115.748 7.90885 115.917 7.85156 116.089C7.79688 116.258 7.72005 116.427 7.62109 116.597C7.52474 116.766 7.41146 116.933 7.28125 117.097C7.15365 117.261 7.01693 117.422 6.87109 117.581L5.34766 119.233H8.19922ZM12.6752 116.53V117.397C12.6752 117.864 12.6335 118.257 12.5502 118.577C12.4668 118.897 12.347 119.155 12.1908 119.351C12.0345 119.546 11.8457 119.688 11.6244 119.776C11.4056 119.862 11.1582 119.905 10.8822 119.905C10.6635 119.905 10.4616 119.878 10.2767 119.823C10.0918 119.769 9.92517 119.681 9.77673 119.562C9.6309 119.439 9.5059 119.28 9.40173 119.085C9.29757 118.89 9.21814 118.653 9.16345 118.374C9.10877 118.095 9.08142 117.77 9.08142 117.397V116.53C9.08142 116.064 9.12309 115.674 9.20642 115.358C9.29236 115.043 9.41345 114.791 9.5697 114.601C9.72595 114.408 9.91345 114.27 10.1322 114.187C10.3536 114.103 10.601 114.062 10.8744 114.062C11.0957 114.062 11.2989 114.089 11.4838 114.144C11.6713 114.196 11.8379 114.28 11.9838 114.397C12.1296 114.512 12.2533 114.666 12.3549 114.858C12.459 115.049 12.5385 115.282 12.5931 115.558C12.6478 115.834 12.6752 116.158 12.6752 116.53ZM11.9486 117.515V116.409C11.9486 116.154 11.933 115.93 11.9017 115.737C11.8731 115.542 11.8301 115.375 11.7728 115.237C11.7155 115.099 11.6426 114.987 11.5541 114.901C11.4681 114.815 11.3679 114.753 11.2533 114.714C11.1413 114.672 11.015 114.651 10.8744 114.651C10.7025 114.651 10.5502 114.684 10.4174 114.749C10.2845 114.812 10.1726 114.912 10.0814 115.05C9.99288 115.188 9.92517 115.369 9.8783 115.593C9.83142 115.817 9.80798 116.089 9.80798 116.409V117.515C9.80798 117.77 9.82231 117.995 9.85095 118.19C9.8822 118.386 9.92778 118.555 9.98767 118.698C10.0476 118.839 10.1205 118.955 10.2064 119.046C10.2924 119.137 10.3913 119.205 10.5033 119.249C10.6179 119.291 10.7442 119.312 10.8822 119.312C11.0593 119.312 11.2142 119.278 11.347 119.21C11.4799 119.142 11.5905 119.037 11.6791 118.894C11.7702 118.748 11.8379 118.562 11.8822 118.335C11.9265 118.106 11.9486 117.832 11.9486 117.515ZM13.6746 115.534V115.233C13.6746 115.017 13.7214 114.821 13.8152 114.644C13.9089 114.466 14.0431 114.325 14.2175 114.218C14.392 114.111 14.599 114.058 14.8386 114.058C15.0834 114.058 15.2918 114.111 15.4636 114.218C15.6381 114.325 15.7722 114.466 15.866 114.644C15.9597 114.821 16.0066 115.017 16.0066 115.233V115.534C16.0066 115.745 15.9597 115.939 15.866 116.116C15.7748 116.293 15.642 116.435 15.4675 116.542C15.2957 116.649 15.0886 116.702 14.8464 116.702C14.6043 116.702 14.3946 116.649 14.2175 116.542C14.0431 116.435 13.9089 116.293 13.8152 116.116C13.7214 115.939 13.6746 115.745 13.6746 115.534ZM14.2175 115.233V115.534C14.2175 115.654 14.2397 115.767 14.2839 115.874C14.3308 115.981 14.4011 116.068 14.4949 116.136C14.5886 116.201 14.7058 116.233 14.8464 116.233C14.9871 116.233 15.1029 116.201 15.1941 116.136C15.2852 116.068 15.3529 115.981 15.3972 115.874C15.4415 115.767 15.4636 115.654 15.4636 115.534V115.233C15.4636 115.111 15.4402 114.996 15.3933 114.89C15.349 114.78 15.28 114.693 15.1863 114.628C15.0951 114.56 14.9793 114.526 14.8386 114.526C14.7006 114.526 14.5847 114.56 14.491 114.628C14.3998 114.693 14.3308 114.78 14.2839 114.89C14.2397 114.996 14.2175 115.111 14.2175 115.233ZM16.4441 118.737V118.433C16.4441 118.219 16.491 118.024 16.5847 117.847C16.6785 117.67 16.8126 117.528 16.9871 117.421C17.1615 117.314 17.3686 117.261 17.6082 117.261C17.8529 117.261 18.0613 117.314 18.2332 117.421C18.4076 117.528 18.5418 117.67 18.6355 117.847C18.7293 118.024 18.7761 118.219 18.7761 118.433V118.737C18.7761 118.951 18.7293 119.146 18.6355 119.323C18.5444 119.5 18.4115 119.642 18.2371 119.749C18.0652 119.856 17.8582 119.909 17.616 119.909C17.3738 119.909 17.1654 119.856 16.991 119.749C16.8165 119.642 16.6811 119.5 16.5847 119.323C16.491 119.146 16.4441 118.951 16.4441 118.737ZM16.9871 118.433V118.737C16.9871 118.857 17.0092 118.972 17.0535 119.081C17.1003 119.188 17.1707 119.275 17.2644 119.343C17.3582 119.408 17.4753 119.44 17.616 119.44C17.7566 119.44 17.8725 119.408 17.9636 119.343C18.0574 119.275 18.1264 119.188 18.1707 119.081C18.2149 118.974 18.2371 118.86 18.2371 118.737V118.433C18.2371 118.31 18.2136 118.196 18.1668 118.089C18.1225 117.982 18.0535 117.896 17.9597 117.831C17.8686 117.763 17.7514 117.729 17.6082 117.729C17.4701 117.729 17.3543 117.763 17.2605 117.831C17.1694 117.896 17.1003 117.982 17.0535 118.089C17.0092 118.196 16.9871 118.31 16.9871 118.433ZM17.7878 114.948L15.0105 119.394L14.6043 119.136L17.3816 114.69L17.7878 114.948Z" fill="black" fill-opacity="0.54"/>
<path d="M13.043 144.737V145.604C13.043 146.07 13.0013 146.464 12.918 146.784C12.8346 147.104 12.7148 147.362 12.5586 147.557C12.4023 147.753 12.2135 147.895 11.9922 147.983C11.7734 148.069 11.526 148.112 11.25 148.112C11.0312 148.112 10.8294 148.085 10.6445 148.03C10.4596 147.975 10.293 147.888 10.1445 147.768C9.9987 147.646 9.8737 147.487 9.76953 147.292C9.66536 147.096 9.58594 146.859 9.53125 146.581C9.47656 146.302 9.44922 145.977 9.44922 145.604V144.737C9.44922 144.271 9.49089 143.88 9.57422 143.565C9.66016 143.25 9.78125 142.997 9.9375 142.807C10.0938 142.615 10.2812 142.477 10.5 142.393C10.7214 142.31 10.9688 142.268 11.2422 142.268C11.4635 142.268 11.6667 142.296 11.8516 142.35C12.0391 142.402 12.2057 142.487 12.3516 142.604C12.4974 142.719 12.6211 142.872 12.7227 143.065C12.8268 143.255 12.9062 143.488 12.9609 143.764C13.0156 144.04 13.043 144.365 13.043 144.737ZM12.3164 145.721V144.616C12.3164 144.361 12.3008 144.137 12.2695 143.944C12.2409 143.749 12.1979 143.582 12.1406 143.444C12.0833 143.306 12.0104 143.194 11.9219 143.108C11.8359 143.022 11.7357 142.96 11.6211 142.921C11.5091 142.879 11.3828 142.858 11.2422 142.858C11.0703 142.858 10.918 142.891 10.7852 142.956C10.6523 143.018 10.5404 143.119 10.4492 143.257C10.3607 143.395 10.293 143.576 10.2461 143.8C10.1992 144.024 10.1758 144.296 10.1758 144.616V145.721C10.1758 145.977 10.1901 146.202 10.2188 146.397C10.25 146.593 10.2956 146.762 10.3555 146.905C10.4154 147.046 10.4883 147.162 10.5742 147.253C10.6602 147.344 10.7591 147.412 10.8711 147.456C10.9857 147.497 11.112 147.518 11.25 147.518C11.4271 147.518 11.582 147.484 11.7148 147.417C11.8477 147.349 11.9583 147.244 12.0469 147.1C12.138 146.955 12.2057 146.768 12.25 146.542C12.2943 146.313 12.3164 146.039 12.3164 145.721ZM14.0424 143.741V143.44C14.0424 143.224 14.0892 143.027 14.183 142.85C14.2767 142.673 14.4108 142.531 14.5853 142.425C14.7598 142.318 14.9668 142.264 15.2064 142.264C15.4512 142.264 15.6595 142.318 15.8314 142.425C16.0059 142.531 16.14 142.673 16.2338 142.85C16.3275 143.027 16.3744 143.224 16.3744 143.44V143.741C16.3744 143.952 16.3275 144.146 16.2338 144.323C16.1426 144.5 16.0098 144.642 15.8353 144.749C15.6635 144.856 15.4564 144.909 15.2142 144.909C14.972 144.909 14.7624 144.856 14.5853 144.749C14.4108 144.642 14.2767 144.5 14.183 144.323C14.0892 144.146 14.0424 143.952 14.0424 143.741ZM14.5853 143.44V143.741C14.5853 143.861 14.6075 143.974 14.6517 144.081C14.6986 144.188 14.7689 144.275 14.8627 144.343C14.9564 144.408 15.0736 144.44 15.2142 144.44C15.3549 144.44 15.4707 144.408 15.5619 144.343C15.653 144.275 15.7207 144.188 15.765 144.081C15.8093 143.974 15.8314 143.861 15.8314 143.741V143.44C15.8314 143.318 15.808 143.203 15.7611 143.096C15.7168 142.987 15.6478 142.9 15.5541 142.835C15.4629 142.767 15.347 142.733 15.2064 142.733C15.0684 142.733 14.9525 142.767 14.8588 142.835C14.7676 142.9 14.6986 142.987 14.6517 143.096C14.6075 143.203 14.5853 143.318 14.5853 143.44ZM16.8119 146.944V146.639C16.8119 146.426 16.8588 146.231 16.9525 146.053C17.0463 145.876 17.1804 145.734 17.3549 145.628C17.5293 145.521 17.7364 145.468 17.976 145.468C18.2207 145.468 18.4291 145.521 18.601 145.628C18.7754 145.734 18.9095 145.876 19.0033 146.053C19.097 146.231 19.1439 146.426 19.1439 146.639V146.944C19.1439 147.158 19.097 147.353 19.0033 147.53C18.9122 147.707 18.7793 147.849 18.6049 147.956C18.433 148.063 18.226 148.116 17.9838 148.116C17.7416 148.116 17.5332 148.063 17.3588 147.956C17.1843 147.849 17.0489 147.707 16.9525 147.53C16.8588 147.353 16.8119 147.158 16.8119 146.944ZM17.3549 146.639V146.944C17.3549 147.064 17.377 147.178 17.4213 147.288C17.4681 147.395 17.5385 147.482 17.6322 147.55C17.726 147.615 17.8431 147.647 17.9838 147.647C18.1244 147.647 18.2403 147.615 18.3314 147.55C18.4252 147.482 18.4942 147.395 18.5385 147.288C18.5827 147.181 18.6049 147.066 18.6049 146.944V146.639C18.6049 146.517 18.5814 146.402 18.5345 146.296C18.4903 146.189 18.4213 146.103 18.3275 146.038C18.2364 145.97 18.1192 145.936 17.976 145.936C17.8379 145.936 17.722 145.97 17.6283 146.038C17.5372 146.103 17.4681 146.189 17.4213 146.296C17.377 146.402 17.3549 146.517 17.3549 146.639ZM18.1556 143.155L15.3783 147.6L14.972 147.343L17.7494 142.897L18.1556 143.155Z" fill="black" fill-opacity="0.54"/>
<path d="M25 4.16113L200 4.16116" stroke="black" stroke-opacity="0.12"/>
<path d="M25 33.1611L200 33.1612" stroke="black" stroke-opacity="0.12"/>
<path d="M25 61.1611L200 61.1612" stroke="black" stroke-opacity="0.12"/>
<path d="M25 89.1611L200 89.1612" stroke="black" stroke-opacity="0.12"/>
<path d="M25 118.161L200 118.161" stroke="black" stroke-opacity="0.12"/>
<line x1="23.2" y1="145.961" x2="202.8" y2="145.961" stroke="black" stroke-opacity="0.7" stroke-width="0.4" stroke-linecap="square"/>
<line x1="40.45" y1="148.072" x2="40.45" y2="147.25" stroke="black" stroke-opacity="0.5" stroke-width="0.5" stroke-linecap="square"/>
<path d="M32.5091 152.025V152.893C32.5091 153.359 32.4674 153.752 32.3841 154.072C32.3007 154.393 32.1809 154.65 32.0247 154.846C31.8684 155.041 31.6796 155.183 31.4583 155.271C31.2395 155.357 30.9921 155.4 30.7161 155.4C30.4973 155.4 30.2955 155.373 30.1106 155.318C29.9257 155.264 29.7591 155.176 29.6106 155.057C29.4648 154.934 29.3398 154.775 29.2356 154.58C29.1315 154.385 29.052 154.148 28.9973 153.869C28.9427 153.59 28.9153 153.265 28.9153 152.893V152.025C28.9153 151.559 28.957 151.169 29.0403 150.854C29.1262 150.538 29.2473 150.286 29.4036 150.096C29.5598 149.903 29.7473 149.765 29.9661 149.682C30.1874 149.598 30.4348 149.557 30.7083 149.557C30.9296 149.557 31.1328 149.584 31.3177 149.639C31.5052 149.691 31.6718 149.775 31.8177 149.893C31.9635 150.007 32.0872 150.161 32.1887 150.354C32.2929 150.544 32.3723 150.777 32.427 151.053C32.4817 151.329 32.5091 151.653 32.5091 152.025ZM31.7825 153.01V151.904C31.7825 151.649 31.7669 151.425 31.7356 151.232C31.707 151.037 31.664 150.87 31.6067 150.732C31.5494 150.594 31.4765 150.482 31.388 150.396C31.302 150.311 31.2018 150.248 31.0872 150.209C30.9752 150.167 30.8489 150.146 30.7083 150.146C30.5364 150.146 30.3841 150.179 30.2512 150.244C30.1184 150.307 30.0065 150.407 29.9153 150.545C29.8268 150.683 29.7591 150.864 29.7122 151.088C29.6653 151.312 29.6419 151.584 29.6419 151.904V153.01C29.6419 153.265 29.6562 153.49 29.6848 153.686C29.7161 153.881 29.7617 154.05 29.8216 154.193C29.8815 154.334 29.9544 154.45 30.0403 154.541C30.1262 154.632 30.2252 154.7 30.3372 154.744C30.4518 154.786 30.5781 154.807 30.7161 154.807C30.8932 154.807 31.0481 154.773 31.1809 154.705C31.3137 154.637 31.4244 154.532 31.513 154.389C31.6041 154.243 31.6718 154.057 31.7161 153.83C31.7604 153.601 31.7825 153.327 31.7825 153.01ZM35.8964 149.604V155.322H35.1737V150.506L33.7167 151.037V150.385L35.7831 149.604H35.8964ZM41.1124 149.635V155.322H40.3585V149.635H41.1124ZM43.4952 152.193V152.811H40.9483V152.193H43.4952ZM43.8819 149.635V150.252H40.9483V149.635H43.8819ZM46.4216 155.4C46.1273 155.4 45.8604 155.351 45.6208 155.252C45.3838 155.15 45.1794 155.008 45.0075 154.826C44.8383 154.644 44.7081 154.428 44.6169 154.178C44.5258 153.928 44.4802 153.654 44.4802 153.357V153.193C44.4802 152.85 44.531 152.544 44.6325 152.275C44.7341 152.005 44.8721 151.775 45.0466 151.588C45.2211 151.4 45.419 151.258 45.6403 151.162C45.8617 151.066 46.0909 151.018 46.3278 151.018C46.6299 151.018 46.8903 151.07 47.1091 151.174C47.3305 151.278 47.5114 151.424 47.6521 151.611C47.7927 151.796 47.8969 152.015 47.9646 152.268C48.0323 152.518 48.0661 152.791 48.0661 153.088V153.412H44.9099V152.822H47.3435V152.768C47.3331 152.58 47.294 152.398 47.2263 152.221C47.1612 152.044 47.057 151.898 46.9138 151.783C46.7706 151.669 46.5752 151.611 46.3278 151.611C46.1638 151.611 46.0127 151.646 45.8747 151.717C45.7367 151.785 45.6182 151.886 45.5193 152.021C45.4203 152.157 45.3435 152.322 45.2888 152.518C45.2341 152.713 45.2068 152.938 45.2068 153.193V153.357C45.2068 153.558 45.2341 153.747 45.2888 153.924C45.3461 154.098 45.4281 154.252 45.5349 154.385C45.6443 154.518 45.7758 154.622 45.9294 154.697C46.0857 154.773 46.2627 154.811 46.4607 154.811C46.7159 154.811 46.932 154.758 47.1091 154.654C47.2862 154.55 47.4411 154.411 47.5739 154.236L48.0114 154.584C47.9203 154.722 47.8044 154.854 47.6638 154.979C47.5232 155.104 47.35 155.205 47.1443 155.283C46.9411 155.361 46.7002 155.4 46.4216 155.4ZM48.9886 149.322H49.7152V154.502L49.6527 155.322H48.9886V149.322ZM52.5706 153.174V153.256C52.5706 153.563 52.5342 153.848 52.4613 154.111C52.3883 154.372 52.2816 154.598 52.1409 154.791C52.0003 154.984 51.8284 155.133 51.6253 155.24C51.4222 155.347 51.1891 155.4 50.9261 155.4C50.6579 155.4 50.4222 155.355 50.2191 155.264C50.0185 155.17 49.8493 155.036 49.7113 154.861C49.5732 154.687 49.4626 154.476 49.3792 154.229C49.2985 153.981 49.2425 153.702 49.2113 153.393V153.033C49.2425 152.721 49.2985 152.441 49.3792 152.193C49.4626 151.946 49.5732 151.735 49.7113 151.561C49.8493 151.383 50.0185 151.249 50.2191 151.158C50.4196 151.064 50.6527 151.018 50.9183 151.018C51.1839 151.018 51.4196 151.07 51.6253 151.174C51.831 151.275 52.0029 151.421 52.1409 151.611C52.2816 151.801 52.3883 152.029 52.4613 152.295C52.5342 152.558 52.5706 152.851 52.5706 153.174ZM51.8441 153.256V153.174C51.8441 152.963 51.8245 152.765 51.7855 152.58C51.7464 152.393 51.6839 152.229 51.598 152.088C51.512 151.945 51.3988 151.833 51.2581 151.752C51.1175 151.669 50.9443 151.627 50.7386 151.627C50.5563 151.627 50.3975 151.658 50.262 151.721C50.1292 151.783 50.0159 151.868 49.9222 151.975C49.8284 152.079 49.7516 152.199 49.6917 152.334C49.6344 152.467 49.5915 152.605 49.5628 152.748V153.689C49.6045 153.872 49.6722 154.048 49.7659 154.217C49.8623 154.383 49.9899 154.52 50.1488 154.627C50.3102 154.734 50.5094 154.787 50.7464 154.787C50.9417 154.787 51.1084 154.748 51.2464 154.67C51.387 154.589 51.5003 154.479 51.5863 154.338C51.6748 154.197 51.7399 154.035 51.7816 153.85C51.8232 153.665 51.8441 153.467 51.8441 153.256Z" fill="black" fill-opacity="0.54"/>
<g clip-path="url(#clip1_4184_94527)">
<line x1="75.8499" y1="147.072" x2="75.8499" y2="146.25" stroke="black" stroke-opacity="0.5" stroke-width="0.5" stroke-linecap="square"/>
<path d="M67.909 152.025V152.892C67.909 153.358 67.8673 153.752 67.784 154.072C67.7006 154.392 67.5808 154.65 67.4246 154.845C67.2683 155.041 67.0795 155.183 66.8582 155.271C66.6394 155.357 66.392 155.4 66.116 155.4C65.8972 155.4 65.6954 155.373 65.5105 155.318C65.3256 155.263 65.159 155.176 65.0105 155.056C64.8647 154.934 64.7397 154.775 64.6355 154.58C64.5314 154.385 64.4519 154.148 64.3972 153.869C64.3426 153.59 64.3152 153.265 64.3152 152.892V152.025C64.3152 151.559 64.3569 151.168 64.4402 150.853C64.5261 150.538 64.6472 150.286 64.8035 150.095C64.9597 149.903 65.1472 149.765 65.366 149.681C65.5873 149.598 65.8347 149.556 66.1082 149.556C66.3295 149.556 66.5327 149.584 66.7176 149.638C66.9051 149.691 67.0717 149.775 67.2176 149.892C67.3634 150.007 67.4871 150.161 67.5886 150.353C67.6928 150.543 67.7722 150.776 67.8269 151.052C67.8816 151.329 67.909 151.653 67.909 152.025ZM67.1824 153.01V151.904C67.1824 151.649 67.1668 151.425 67.1355 151.232C67.1069 151.037 67.0639 150.87 67.0066 150.732C66.9493 150.594 66.8764 150.482 66.7879 150.396C66.7019 150.31 66.6017 150.248 66.4871 150.209C66.3751 150.167 66.2488 150.146 66.1082 150.146C65.9363 150.146 65.784 150.179 65.6511 150.244C65.5183 150.306 65.4064 150.407 65.3152 150.545C65.2267 150.683 65.159 150.864 65.1121 151.088C65.0652 151.312 65.0418 151.584 65.0418 151.904V153.01C65.0418 153.265 65.0561 153.49 65.0847 153.685C65.116 153.881 65.1616 154.05 65.2215 154.193C65.2814 154.334 65.3543 154.45 65.4402 154.541C65.5261 154.632 65.6251 154.7 65.7371 154.744C65.8517 154.786 65.978 154.806 66.116 154.806C66.2931 154.806 66.448 154.773 66.5808 154.705C66.7136 154.637 66.8243 154.532 66.9129 154.388C67.004 154.243 67.0717 154.056 67.116 153.83C67.1603 153.601 67.1824 153.327 67.1824 153.01ZM72.6478 154.728V155.322H68.9252V154.802L70.7885 152.728C71.0176 152.473 71.1947 152.257 71.3197 152.08C71.4473 151.9 71.5359 151.74 71.5853 151.599C71.6374 151.456 71.6635 151.31 71.6635 151.162C71.6635 150.974 71.6244 150.805 71.5463 150.654C71.4708 150.5 71.3588 150.378 71.2103 150.287C71.0619 150.196 70.8822 150.15 70.6713 150.15C70.4187 150.15 70.2077 150.2 70.0385 150.299C69.8718 150.395 69.7468 150.53 69.6635 150.705C69.5801 150.879 69.5385 151.08 69.5385 151.306H68.8158C68.8158 150.986 68.8861 150.693 69.0267 150.427C69.1674 150.162 69.3757 149.951 69.6517 149.795C69.9278 149.636 70.2676 149.556 70.6713 149.556C71.0307 149.556 71.3379 149.62 71.5932 149.748C71.8484 149.873 72.0437 150.05 72.1791 150.279C72.3171 150.506 72.3861 150.771 72.3861 151.076C72.3861 151.243 72.3575 151.412 72.3002 151.584C72.2455 151.753 72.1687 151.922 72.0697 152.092C71.9734 152.261 71.8601 152.427 71.7299 152.592C71.6023 152.756 71.4655 152.917 71.3197 153.076L69.7963 154.728H72.6478ZM76.5123 149.635V155.322H75.7584V149.635H76.5123ZM78.8951 152.193V152.81H76.3482V152.193H78.8951ZM79.2818 149.635V150.252H76.3482V149.635H79.2818ZM81.8215 155.4C81.5272 155.4 81.2603 155.351 81.0207 155.252C80.7837 155.15 80.5793 155.008 80.4074 154.826C80.2382 154.644 80.108 154.427 80.0168 154.177C79.9257 153.927 79.8801 153.654 79.8801 153.357V153.193C79.8801 152.849 79.9309 152.543 80.0324 152.275C80.134 152.004 80.272 151.775 80.4465 151.588C80.621 151.4 80.8189 151.258 81.0402 151.162C81.2616 151.066 81.4908 151.017 81.7277 151.017C82.0298 151.017 82.2902 151.069 82.509 151.174C82.7304 151.278 82.9113 151.424 83.052 151.611C83.1926 151.796 83.2968 152.015 83.3645 152.267C83.4322 152.517 83.466 152.791 83.466 153.088V153.412H80.3098V152.822H82.7434V152.767C82.733 152.58 82.6939 152.398 82.6262 152.22C82.5611 152.043 82.4569 151.898 82.3137 151.783C82.1705 151.668 81.9751 151.611 81.7277 151.611C81.5637 151.611 81.4126 151.646 81.2746 151.717C81.1366 151.784 81.0181 151.886 80.9192 152.021C80.8202 152.157 80.7434 152.322 80.6887 152.517C80.634 152.713 80.6067 152.938 80.6067 153.193V153.357C80.6067 153.558 80.634 153.747 80.6887 153.924C80.746 154.098 80.828 154.252 80.9348 154.385C81.0442 154.517 81.1757 154.622 81.3293 154.697C81.4856 154.773 81.6626 154.81 81.8606 154.81C82.1158 154.81 82.3319 154.758 82.509 154.654C82.6861 154.55 82.841 154.411 82.9738 154.236L83.4113 154.584C83.3202 154.722 83.2043 154.853 83.0637 154.978C82.9231 155.103 82.7499 155.205 82.5442 155.283C82.341 155.361 82.1001 155.4 81.8215 155.4ZM84.3885 149.322H85.1151V154.502L85.0526 155.322H84.3885V149.322ZM87.9705 153.174V153.256C87.9705 153.563 87.9341 153.848 87.8612 154.111C87.7882 154.372 87.6815 154.598 87.5408 154.791C87.4002 154.983 87.2283 155.133 87.0252 155.24C86.8221 155.347 86.589 155.4 86.326 155.4C86.0578 155.4 85.8221 155.355 85.619 155.263C85.4185 155.17 85.2492 155.036 85.1112 154.861C84.9731 154.687 84.8625 154.476 84.7791 154.228C84.6984 153.981 84.6424 153.702 84.6112 153.392V153.033C84.6424 152.72 84.6984 152.441 84.7791 152.193C84.8625 151.946 84.9731 151.735 85.1112 151.56C85.2492 151.383 85.4185 151.249 85.619 151.158C85.8195 151.064 86.0526 151.017 86.3182 151.017C86.5838 151.017 86.8195 151.069 87.0252 151.174C87.231 151.275 87.4028 151.421 87.5408 151.611C87.6815 151.801 87.7882 152.029 87.8612 152.295C87.9341 152.558 87.9705 152.851 87.9705 153.174ZM87.244 153.256V153.174C87.244 152.963 87.2244 152.765 87.1854 152.58C87.1463 152.392 87.0838 152.228 86.9979 152.088C86.9119 151.944 86.7987 151.832 86.658 151.752C86.5174 151.668 86.3442 151.627 86.1385 151.627C85.9562 151.627 85.7974 151.658 85.6619 151.72C85.5291 151.783 85.4158 151.868 85.3221 151.974C85.2283 152.079 85.1515 152.198 85.0916 152.334C85.0343 152.467 84.9914 152.605 84.9627 152.748V153.689C85.0044 153.872 85.0721 154.047 85.1658 154.217C85.2622 154.383 85.3898 154.52 85.5487 154.627C85.7101 154.733 85.9093 154.787 86.1463 154.787C86.3416 154.787 86.5083 154.748 86.6463 154.67C86.7869 154.589 86.9002 154.478 86.9862 154.338C87.0747 154.197 87.1398 154.034 87.1815 153.849C87.2231 153.664 87.244 153.467 87.244 153.256Z" fill="black" fill-opacity="0.54"/>
</g>
<g clip-path="url(#clip2_4184_94527)">
<line x1="111.25" y1="147.072" x2="111.25" y2="146.25" stroke="black" stroke-opacity="0.5" stroke-width="0.5" stroke-linecap="square"/>
<path d="M103.309 152.025V152.892C103.309 153.358 103.267 153.752 103.184 154.072C103.101 154.392 102.981 154.65 102.825 154.845C102.668 155.041 102.48 155.183 102.258 155.271C102.04 155.357 101.792 155.4 101.516 155.4C101.297 155.4 101.096 155.373 100.911 155.318C100.726 155.263 100.559 155.176 100.411 155.056C100.265 154.934 100.14 154.775 100.036 154.58C99.9315 154.385 99.8521 154.148 99.7974 153.869C99.7427 153.59 99.7154 153.265 99.7154 152.892V152.025C99.7154 151.559 99.757 151.168 99.8404 150.853C99.9263 150.538 100.047 150.286 100.204 150.095C100.36 149.903 100.547 149.765 100.766 149.681C100.987 149.598 101.235 149.556 101.508 149.556C101.73 149.556 101.933 149.584 102.118 149.638C102.305 149.691 102.472 149.775 102.618 149.892C102.764 150.007 102.887 150.161 102.989 150.353C103.093 150.543 103.172 150.776 103.227 151.052C103.282 151.329 103.309 151.653 103.309 152.025ZM102.583 153.01V151.904C102.583 151.649 102.567 151.425 102.536 151.232C102.507 151.037 102.464 150.87 102.407 150.732C102.349 150.594 102.277 150.482 102.188 150.396C102.102 150.31 102.002 150.248 101.887 150.209C101.775 150.167 101.649 150.146 101.508 150.146C101.336 150.146 101.184 150.179 101.051 150.244C100.918 150.306 100.807 150.407 100.715 150.545C100.627 150.683 100.559 150.864 100.512 151.088C100.465 151.312 100.442 151.584 100.442 151.904V153.01C100.442 153.265 100.456 153.49 100.485 153.685C100.516 153.881 100.562 154.05 100.622 154.193C100.682 154.334 100.754 154.45 100.84 154.541C100.926 154.632 101.025 154.7 101.137 154.744C101.252 154.786 101.378 154.806 101.516 154.806C101.693 154.806 101.848 154.773 101.981 154.705C102.114 154.637 102.224 154.532 102.313 154.388C102.404 154.243 102.472 154.056 102.516 153.83C102.56 153.601 102.583 153.327 102.583 153.01ZM105.376 152.123H105.892C106.144 152.123 106.353 152.081 106.517 151.998C106.683 151.912 106.807 151.796 106.888 151.65C106.971 151.502 107.013 151.335 107.013 151.15C107.013 150.931 106.976 150.748 106.903 150.599C106.831 150.451 106.721 150.339 106.575 150.263C106.429 150.188 106.245 150.15 106.021 150.15C105.818 150.15 105.638 150.191 105.482 150.271C105.328 150.349 105.207 150.461 105.118 150.607C105.032 150.753 104.989 150.925 104.989 151.123H104.267C104.267 150.834 104.34 150.571 104.485 150.334C104.631 150.097 104.836 149.908 105.099 149.767C105.364 149.627 105.672 149.556 106.021 149.556C106.364 149.556 106.665 149.618 106.923 149.74C107.181 149.86 107.381 150.039 107.525 150.279C107.668 150.516 107.739 150.812 107.739 151.166C107.739 151.309 107.706 151.463 107.638 151.627C107.573 151.788 107.47 151.939 107.329 152.08C107.191 152.22 107.012 152.336 106.79 152.427C106.569 152.516 106.303 152.56 105.993 152.56H105.376V152.123ZM105.376 152.717V152.283H105.993C106.355 152.283 106.655 152.326 106.892 152.412C107.129 152.498 107.315 152.612 107.45 152.756C107.588 152.899 107.685 153.056 107.739 153.228C107.797 153.398 107.825 153.567 107.825 153.736C107.825 154.002 107.78 154.237 107.689 154.443C107.6 154.649 107.474 154.823 107.31 154.967C107.148 155.11 106.958 155.218 106.739 155.291C106.521 155.364 106.282 155.4 106.025 155.4C105.777 155.4 105.544 155.365 105.325 155.295C105.109 155.224 104.918 155.123 104.751 154.99C104.584 154.855 104.454 154.689 104.36 154.494C104.267 154.296 104.22 154.071 104.22 153.818H104.943C104.943 154.016 104.985 154.189 105.071 154.338C105.16 154.486 105.285 154.602 105.446 154.685C105.61 154.766 105.803 154.806 106.025 154.806C106.246 154.806 106.436 154.769 106.595 154.693C106.756 154.615 106.88 154.498 106.966 154.342C107.054 154.185 107.099 153.989 107.099 153.752C107.099 153.515 107.049 153.321 106.95 153.17C106.851 153.016 106.711 152.903 106.528 152.83C106.349 152.754 106.137 152.717 105.892 152.717H105.376ZM111.912 149.635V155.322H111.159V149.635H111.912ZM114.295 152.193V152.81H111.748V152.193H114.295ZM114.682 149.635V150.252H111.748V149.635H114.682ZM117.222 155.4C116.927 155.4 116.66 155.351 116.421 155.252C116.184 155.15 115.979 155.008 115.808 154.826C115.638 154.644 115.508 154.427 115.417 154.177C115.326 153.927 115.28 153.654 115.28 153.357V153.193C115.28 152.849 115.331 152.543 115.433 152.275C115.534 152.004 115.672 151.775 115.847 151.588C116.021 151.4 116.219 151.258 116.44 151.162C116.662 151.066 116.891 151.017 117.128 151.017C117.43 151.017 117.69 151.069 117.909 151.174C118.13 151.278 118.311 151.424 118.452 151.611C118.593 151.796 118.697 152.015 118.765 152.267C118.832 152.517 118.866 152.791 118.866 153.088V153.412H115.71V152.822H118.144V152.767C118.133 152.58 118.094 152.398 118.026 152.22C117.961 152.043 117.857 151.898 117.714 151.783C117.571 151.668 117.375 151.611 117.128 151.611C116.964 151.611 116.813 151.646 116.675 151.717C116.537 151.784 116.418 151.886 116.319 152.021C116.22 152.157 116.144 152.322 116.089 152.517C116.034 152.713 116.007 152.938 116.007 153.193V153.357C116.007 153.558 116.034 153.747 116.089 153.924C116.146 154.098 116.228 154.252 116.335 154.385C116.444 154.517 116.576 154.622 116.729 154.697C116.886 154.773 117.063 154.81 117.261 154.81C117.516 154.81 117.732 154.758 117.909 154.654C118.086 154.55 118.241 154.411 118.374 154.236L118.811 154.584C118.72 154.722 118.604 154.853 118.464 154.978C118.323 155.103 118.15 155.205 117.944 155.283C117.741 155.361 117.5 155.4 117.222 155.4ZM119.789 149.322H120.515V154.502L120.453 155.322H119.789V149.322ZM123.371 153.174V153.256C123.371 153.563 123.334 153.848 123.261 154.111C123.188 154.372 123.082 154.598 122.941 154.791C122.8 154.983 122.628 155.133 122.425 155.24C122.222 155.347 121.989 155.4 121.726 155.4C121.458 155.4 121.222 155.355 121.019 155.263C120.819 155.17 120.649 155.036 120.511 154.861C120.373 154.687 120.263 154.476 120.179 154.228C120.099 153.981 120.043 153.702 120.011 153.392V153.033C120.043 152.72 120.099 152.441 120.179 152.193C120.263 151.946 120.373 151.735 120.511 151.56C120.649 151.383 120.819 151.249 121.019 151.158C121.22 151.064 121.453 151.017 121.718 151.017C121.984 151.017 122.22 151.069 122.425 151.174C122.631 151.275 122.803 151.421 122.941 151.611C123.082 151.801 123.188 152.029 123.261 152.295C123.334 152.558 123.371 152.851 123.371 153.174ZM122.644 153.256V153.174C122.644 152.963 122.625 152.765 122.586 152.58C122.546 152.392 122.484 152.228 122.398 152.088C122.312 151.944 122.199 151.832 122.058 151.752C121.918 151.668 121.744 151.627 121.539 151.627C121.356 151.627 121.198 151.658 121.062 151.72C120.929 151.783 120.816 151.868 120.722 151.974C120.628 152.079 120.552 152.198 120.492 152.334C120.434 152.467 120.392 152.605 120.363 152.748V153.689C120.405 153.872 120.472 154.047 120.566 154.217C120.662 154.383 120.79 154.52 120.949 154.627C121.11 154.733 121.309 154.787 121.546 154.787C121.742 154.787 121.908 154.748 122.046 154.67C122.187 154.589 122.3 154.478 122.386 154.338C122.475 154.197 122.54 154.034 122.582 153.849C122.623 153.664 122.644 153.467 122.644 153.256Z" fill="black" fill-opacity="0.54"/>
</g>
<g clip-path="url(#clip3_4184_94527)">
<line x1="146.65" y1="147.072" x2="146.65" y2="146.25" stroke="black" stroke-opacity="0.5" stroke-width="0.5" stroke-linecap="square"/>
<path d="M138.709 152.025V152.892C138.709 153.358 138.667 153.752 138.584 154.072C138.501 154.392 138.381 154.65 138.225 154.845C138.068 155.041 137.88 155.183 137.658 155.271C137.439 155.357 137.192 155.4 136.916 155.4C136.697 155.4 136.495 155.373 136.311 155.318C136.126 155.263 135.959 155.176 135.811 155.056C135.665 154.934 135.54 154.775 135.436 154.58C135.331 154.385 135.252 154.148 135.197 153.869C135.143 153.59 135.115 153.265 135.115 152.892V152.025C135.115 151.559 135.157 151.168 135.24 150.853C135.326 150.538 135.447 150.286 135.604 150.095C135.76 149.903 135.947 149.765 136.166 149.681C136.387 149.598 136.635 149.556 136.908 149.556C137.13 149.556 137.333 149.584 137.518 149.638C137.705 149.691 137.872 149.775 138.018 149.892C138.163 150.007 138.287 150.161 138.389 150.353C138.493 150.543 138.572 150.776 138.627 151.052C138.682 151.329 138.709 151.653 138.709 152.025ZM137.982 153.01V151.904C137.982 151.649 137.967 151.425 137.936 151.232C137.907 151.037 137.864 150.87 137.807 150.732C137.749 150.594 137.676 150.482 137.588 150.396C137.502 150.31 137.402 150.248 137.287 150.209C137.175 150.167 137.049 150.146 136.908 150.146C136.736 150.146 136.584 150.179 136.451 150.244C136.318 150.306 136.206 150.407 136.115 150.545C136.027 150.683 135.959 150.864 135.912 151.088C135.865 151.312 135.842 151.584 135.842 151.904V153.01C135.842 153.265 135.856 153.49 135.885 153.685C135.916 153.881 135.962 154.05 136.022 154.193C136.081 154.334 136.154 154.45 136.24 154.541C136.326 154.632 136.425 154.7 136.537 154.744C136.652 154.786 136.778 154.806 136.916 154.806C137.093 154.806 137.248 154.773 137.381 154.705C137.514 154.637 137.624 154.532 137.713 154.388C137.804 154.243 137.872 154.056 137.916 153.83C137.96 153.601 137.982 153.327 137.982 153.01ZM143.565 153.408V154.002H139.456V153.576L142.003 149.635H142.592L141.96 150.775L140.276 153.408H143.565ZM142.772 149.635V155.322H142.049V149.635H142.772ZM147.312 149.635V155.322H146.558V149.635H147.312ZM149.695 152.193V152.81H147.148V152.193H149.695ZM150.082 149.635V150.252H147.148V149.635H150.082ZM152.622 155.4C152.327 155.4 152.06 155.351 151.821 155.252C151.584 155.15 151.379 155.008 151.207 154.826C151.038 154.644 150.908 154.427 150.817 154.177C150.726 153.927 150.68 153.654 150.68 153.357V153.193C150.68 152.849 150.731 152.543 150.832 152.275C150.934 152.004 151.072 151.775 151.247 151.588C151.421 151.4 151.619 151.258 151.84 151.162C152.062 151.066 152.291 151.017 152.528 151.017C152.83 151.017 153.09 151.069 153.309 151.174C153.53 151.278 153.711 151.424 153.852 151.611C153.993 151.796 154.097 152.015 154.165 152.267C154.232 152.517 154.266 152.791 154.266 153.088V153.412H151.11V152.822H153.543V152.767C153.533 152.58 153.494 152.398 153.426 152.22C153.361 152.043 153.257 151.898 153.114 151.783C152.971 151.668 152.775 151.611 152.528 151.611C152.364 151.611 152.213 151.646 152.075 151.717C151.937 151.784 151.818 151.886 151.719 152.021C151.62 152.157 151.543 152.322 151.489 152.517C151.434 152.713 151.407 152.938 151.407 153.193V153.357C151.407 153.558 151.434 153.747 151.489 153.924C151.546 154.098 151.628 154.252 151.735 154.385C151.844 154.517 151.976 154.622 152.129 154.697C152.286 154.773 152.463 154.81 152.661 154.81C152.916 154.81 153.132 154.758 153.309 154.654C153.486 154.55 153.641 154.411 153.774 154.236L154.211 154.584C154.12 154.722 154.004 154.853 153.864 154.978C153.723 155.103 153.55 155.205 153.344 155.283C153.141 155.361 152.9 155.4 152.622 155.4ZM155.189 149.322H155.915V154.502L155.853 155.322H155.189V149.322ZM158.771 153.174V153.256C158.771 153.563 158.734 153.848 158.661 154.111C158.588 154.372 158.482 154.598 158.341 154.791C158.2 154.983 158.028 155.133 157.825 155.24C157.622 155.347 157.389 155.4 157.126 155.4C156.858 155.4 156.622 155.355 156.419 155.263C156.218 155.17 156.049 155.036 155.911 154.861C155.773 154.687 155.663 154.476 155.579 154.228C155.498 153.981 155.442 153.702 155.411 153.392V153.033C155.442 152.72 155.498 152.441 155.579 152.193C155.663 151.946 155.773 151.735 155.911 151.56C156.049 151.383 156.218 151.249 156.419 151.158C156.62 151.064 156.853 151.017 157.118 151.017C157.384 151.017 157.62 151.069 157.825 151.174C158.031 151.275 158.203 151.421 158.341 151.611C158.482 151.801 158.588 152.029 158.661 152.295C158.734 152.558 158.771 152.851 158.771 153.174ZM158.044 153.256V153.174C158.044 152.963 158.024 152.765 157.985 152.58C157.946 152.392 157.884 152.228 157.798 152.088C157.712 151.944 157.599 151.832 157.458 151.752C157.317 151.668 157.144 151.627 156.939 151.627C156.756 151.627 156.597 151.658 156.462 151.72C156.329 151.783 156.216 151.868 156.122 151.974C156.028 152.079 155.952 152.198 155.892 152.334C155.834 152.467 155.791 152.605 155.763 152.748V153.689C155.804 153.872 155.872 154.047 155.966 154.217C156.062 154.383 156.19 154.52 156.349 154.627C156.51 154.733 156.709 154.787 156.946 154.787C157.142 154.787 157.308 154.748 157.446 154.67C157.587 154.589 157.7 154.478 157.786 154.338C157.875 154.197 157.94 154.034 157.982 153.849C158.023 153.664 158.044 153.467 158.044 153.256Z" fill="black" fill-opacity="0.54"/>
</g>
<g clip-path="url(#clip4_4184_94527)">
<line x1="182.05" y1="147.072" x2="182.05" y2="146.25" stroke="black" stroke-opacity="0.5" stroke-width="0.5" stroke-linecap="square"/>
<path d="M174.109 152.025V152.892C174.109 153.358 174.067 153.752 173.984 154.072C173.901 154.392 173.781 154.65 173.625 154.845C173.469 155.041 173.28 155.183 173.058 155.271C172.84 155.357 172.592 155.4 172.316 155.4C172.097 155.4 171.896 155.373 171.711 155.318C171.526 155.263 171.359 155.176 171.211 155.056C171.065 154.934 170.94 154.775 170.836 154.58C170.732 154.385 170.652 154.148 170.597 153.869C170.543 153.59 170.515 153.265 170.515 152.892V152.025C170.515 151.559 170.557 151.168 170.64 150.853C170.726 150.538 170.847 150.286 171.004 150.095C171.16 149.903 171.347 149.765 171.566 149.681C171.788 149.598 172.035 149.556 172.308 149.556C172.53 149.556 172.733 149.584 172.918 149.638C173.105 149.691 173.272 149.775 173.418 149.892C173.564 150.007 173.687 150.161 173.789 150.353C173.893 150.543 173.972 150.776 174.027 151.052C174.082 151.329 174.109 151.653 174.109 152.025ZM173.383 153.01V151.904C173.383 151.649 173.367 151.425 173.336 151.232C173.307 151.037 173.264 150.87 173.207 150.732C173.15 150.594 173.077 150.482 172.988 150.396C172.902 150.31 172.802 150.248 172.687 150.209C172.575 150.167 172.449 150.146 172.308 150.146C172.136 150.146 171.984 150.179 171.851 150.244C171.719 150.306 171.607 150.407 171.515 150.545C171.427 150.683 171.359 150.864 171.312 151.088C171.265 151.312 171.242 151.584 171.242 151.904V153.01C171.242 153.265 171.256 153.49 171.285 153.685C171.316 153.881 171.362 154.05 171.422 154.193C171.482 154.334 171.554 154.45 171.64 154.541C171.726 154.632 171.825 154.7 171.937 154.744C172.052 154.786 172.178 154.806 172.316 154.806C172.493 154.806 172.648 154.773 172.781 154.705C172.914 154.637 173.025 154.532 173.113 154.388C173.204 154.243 173.272 154.056 173.316 153.83C173.36 153.601 173.383 153.327 173.383 153.01ZM176.036 152.615L175.457 152.467L175.743 149.635H178.661V150.302H176.356L176.184 151.849C176.288 151.789 176.42 151.733 176.579 151.681C176.74 151.629 176.925 151.603 177.133 151.603C177.396 151.603 177.632 151.649 177.84 151.74C178.049 151.829 178.226 151.956 178.371 152.123C178.52 152.289 178.633 152.49 178.711 152.724C178.789 152.959 178.829 153.22 178.829 153.51C178.829 153.783 178.791 154.034 178.715 154.263C178.642 154.493 178.532 154.693 178.383 154.865C178.235 155.034 178.047 155.166 177.821 155.26C177.597 155.353 177.332 155.4 177.028 155.4C176.799 155.4 176.581 155.369 176.375 155.306C176.172 155.241 175.99 155.144 175.829 155.013C175.67 154.881 175.539 154.717 175.438 154.521C175.339 154.323 175.276 154.092 175.25 153.826H175.938C175.969 154.039 176.032 154.219 176.125 154.365C176.219 154.511 176.342 154.622 176.493 154.697C176.646 154.77 176.825 154.806 177.028 154.806C177.2 154.806 177.352 154.776 177.485 154.717C177.618 154.657 177.73 154.571 177.821 154.459C177.912 154.347 177.981 154.211 178.028 154.052C178.077 153.894 178.102 153.715 178.102 153.517C178.102 153.338 178.077 153.171 178.028 153.017C177.978 152.864 177.904 152.73 177.805 152.615C177.709 152.5 177.59 152.412 177.45 152.349C177.309 152.284 177.148 152.252 176.965 152.252C176.723 152.252 176.539 152.284 176.414 152.349C176.292 152.414 176.166 152.503 176.036 152.615ZM182.713 149.635V155.322H181.959V149.635H182.713ZM185.095 152.193V152.81H182.548V152.193H185.095ZM185.482 149.635V150.252H182.548V149.635H185.482ZM188.022 155.4C187.727 155.4 187.46 155.351 187.221 155.252C186.984 155.15 186.78 155.008 186.608 154.826C186.438 154.644 186.308 154.427 186.217 154.177C186.126 153.927 186.08 153.654 186.08 153.357V153.193C186.08 152.849 186.131 152.543 186.233 152.275C186.334 152.004 186.472 151.775 186.647 151.588C186.821 151.4 187.019 151.258 187.24 151.162C187.462 151.066 187.691 151.017 187.928 151.017C188.23 151.017 188.49 151.069 188.709 151.174C188.931 151.278 189.112 151.424 189.252 151.611C189.393 151.796 189.497 152.015 189.565 152.267C189.632 152.517 189.666 152.791 189.666 153.088V153.412H186.51V152.822H188.944V152.767C188.933 152.58 188.894 152.398 188.826 152.22C188.761 152.043 188.657 151.898 188.514 151.783C188.371 151.668 188.175 151.611 187.928 151.611C187.764 151.611 187.613 151.646 187.475 151.717C187.337 151.784 187.218 151.886 187.119 152.021C187.02 152.157 186.944 152.322 186.889 152.517C186.834 152.713 186.807 152.938 186.807 153.193V153.357C186.807 153.558 186.834 153.747 186.889 153.924C186.946 154.098 187.028 154.252 187.135 154.385C187.244 154.517 187.376 154.622 187.53 154.697C187.686 154.773 187.863 154.81 188.061 154.81C188.316 154.81 188.532 154.758 188.709 154.654C188.886 154.55 189.041 154.411 189.174 154.236L189.612 154.584C189.52 154.722 189.405 154.853 189.264 154.978C189.123 155.103 188.95 155.205 188.744 155.283C188.541 155.361 188.3 155.4 188.022 155.4ZM190.589 149.322H191.315V154.502L191.253 155.322H190.589V149.322ZM194.171 153.174V153.256C194.171 153.563 194.134 153.848 194.061 154.111C193.988 154.372 193.882 154.598 193.741 154.791C193.6 154.983 193.429 155.133 193.225 155.24C193.022 155.347 192.789 155.4 192.526 155.4C192.258 155.4 192.022 155.355 191.819 155.263C191.619 155.17 191.449 155.036 191.311 154.861C191.173 154.687 191.063 154.476 190.979 154.228C190.899 153.981 190.843 153.702 190.811 153.392V153.033C190.843 152.72 190.899 152.441 190.979 152.193C191.063 151.946 191.173 151.735 191.311 151.56C191.449 151.383 191.619 151.249 191.819 151.158C192.02 151.064 192.253 151.017 192.518 151.017C192.784 151.017 193.02 151.069 193.225 151.174C193.431 151.275 193.603 151.421 193.741 151.611C193.882 151.801 193.988 152.029 194.061 152.295C194.134 152.558 194.171 152.851 194.171 153.174ZM193.444 153.256V153.174C193.444 152.963 193.425 152.765 193.386 152.58C193.347 152.392 193.284 152.228 193.198 152.088C193.112 151.944 192.999 151.832 192.858 151.752C192.718 151.668 192.544 151.627 192.339 151.627C192.156 151.627 191.998 151.658 191.862 151.72C191.729 151.783 191.616 151.868 191.522 151.974C191.429 152.079 191.352 152.198 191.292 152.334C191.235 152.467 191.192 152.605 191.163 152.748V153.689C191.205 153.872 191.272 154.047 191.366 154.217C191.462 154.383 191.59 154.52 191.749 154.627C191.91 154.733 192.11 154.787 192.347 154.787C192.542 154.787 192.708 154.748 192.847 154.67C192.987 154.589 193.1 154.478 193.186 154.338C193.275 154.197 193.34 154.034 193.382 153.849C193.423 153.664 193.444 153.467 193.444 153.256Z" fill="black" fill-opacity="0.54"/>
</g>
<path d="M27 107.445L40 88.0962L75.9407 44.9895C76.2611 44.6052 76.8161 44.5168 77.24 44.7826L110.556 65.6716C110.834 65.846 111.18 65.8728 111.482 65.7433L147 50.499L184.032 39.8183C184.327 39.7331 184.567 39.5168 184.682 39.2318L198.5 5" stroke="#FFC107" stroke-width="2" stroke-linecap="round"/>
<path d="M28 129.161L40 112.14L76 79.1614L111 89.2678L147 79.1614L178 120.651L199 89.2678" stroke="#4CAF50" stroke-width="2" stroke-linecap="round"/>
<path d="M27 118L40 71.7792L76 64.5635L110.5 17.6611L146.5 42.9162L182 71.7792L198.5 108" stroke="#2196F3" stroke-width="2" stroke-linecap="round"/>
</g>
<defs>
<clipPath id="clip0_4184_94527">
<rect width="200" height="160" fill="white"/>
</clipPath>
<clipPath id="clip1_4184_94527">
<rect width="35.4" height="10.322" fill="white" transform="translate(58.3999 146)"/>
</clipPath>
<clipPath id="clip2_4184_94527">
<rect width="35.4" height="10.322" fill="white" transform="translate(93.8 146)"/>
</clipPath>
<clipPath id="clip3_4184_94527">
<rect width="35.4" height="10.322" fill="white" transform="translate(129.2 146)"/>
</clipPath>
<clipPath id="clip4_4184_94527">
<rect width="35.4" height="10.322" fill="white" transform="translate(164.6 146)"/>
</clipPath>
</defs>
</svg>
",
+  "description": "Displays changes to time-series data over time—for example, temperature or humidity readings.",
+  "descriptor": {
+    "type": "timeseries",
+    "sizeX": 8,
+    "sizeY": 5,
+    "resources": [],
+    "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        chartType: 'line',\n        previewWidth: '80%',\n        embedTitlePanel: true,\n        hasAdditionalLatestDataKeys: true,\n        dataKeySettingsFunction: TbTimeSeriesChart.dataKeySettings('line'),\n        defaultDataKeysFunction: function() {\n            return [{ name: 'temperature', label: 'Temperature', type: 'timeseries', units: '°C', decimals: 0 }];\n        }\n    };\n}\n",
+    "settingsSchema": "{}",
+    "dataKeySettingsSchema": "{}",
+    "latestDataKeySettingsSchema": "{}",
+    "settingsDirective": "tb-time-series-chart-widget-settings",
+    "dataKeySettingsDirective": "tb-time-series-chart-key-settings",
+    "latestDataKeySettingsDirective": "",
+    "hasBasicMode": true,
+    "basicModeDirective": "tb-time-series-chart-basic-config",
+    "defaultConfig": "{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"First\",\"color\":\"#2196f3\",\"settings\":{\"showInLegend\":true,\"dataHiddenByDefault\":false,\"type\":\"line\",\"lineSettings\":{\"showLine\":true,\"step\":false,\"stepType\":\"start\",\"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)\",\"pointShape\":\"emptyCircle\",\"pointSize\":4,\"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)\",\"backgroundSettings\":{\"type\":\"none\",\"opacity\":0.4,\"gradient\":{\"start\":100,\"end\":0}}}},\"_hash\":0.8587686344902596,\"funcBody\":\"var value = prevValue + Math.random() * 100 - 50;\\nvar multiplier = Math.pow(10, 2 || 0);\\nvar value = Math.round(value * multiplier) / multiplier;\\nif (value < -1000) {\\n\\tvalue = -1000;\\n} else if (value > 1000) {\\n\\tvalue = 1000;\\n}\\nreturn value;\",\"aggregationType\":null,\"units\":null,\"decimals\":null,\"usePostProcessing\":null,\"postFuncBody\":null},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Second\",\"color\":\"#FFC107\",\"settings\":{\"showInLegend\":true,\"dataHiddenByDefault\":false,\"type\":\"line\",\"lineSettings\":{\"showLine\":true,\"step\":false,\"stepType\":\"start\",\"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)\",\"pointShape\":\"emptyCircle\",\"pointSize\":4,\"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)\",\"backgroundSettings\":{\"type\":\"none\",\"opacity\":0.4,\"gradient\":{\"start\":100,\"end\":0}}}},\"_hash\":0.3409583261715494,\"funcBody\":\"var value = prevValue + Math.random() * 100 - 50;\\nvar multiplier = Math.pow(10, 2 || 0);\\nvar value = Math.round(value * multiplier) / multiplier;\\nif (value < -1000) {\\n\\tvalue = -1000;\\n} else if (value > 1000) {\\n\\tvalue = 1000;\\n}\\nreturn value;\",\"decimals\":null,\"aggregationType\":null,\"usePostProcessing\":null,\"postFuncBody\":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\":\"AVG\",\"limit\":25000},\"timezone\":null},\"showTitle\":true,\"backgroundColor\":\"rgba(0, 0, 0, 0)\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"showLegend\":true,\"legendConfig\":{\"direction\":\"column\",\"position\":\"top\",\"sortDataKeys\":false,\"showMin\":false,\"showMax\":false,\"showAvg\":true,\"showTotal\":false,\"showLatest\":false},\"thresholds\":[],\"dataZoom\":true,\"stack\":false,\"yAxis\":{\"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)\",\"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)\"},\"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)\"},\"legendLabelFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"16px\"},\"legendLabelColor\":\"rgba(0, 0, 0, 0.76)\",\"showTooltip\":true,\"tooltipTrigger\":\"axis\",\"tooltipValueFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"500\",\"lineHeight\":\"16px\"},\"tooltipValueColor\":\"rgba(0, 0, 0, 0.76)\",\"tooltipShowDate\":true,\"tooltipDateFormat\":{\"format\":null,\"lastUpdateAgo\":false,\"custom\":false,\"auto\":true,\"autoDateFormatSettings\":{}},\"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,\"background\":{\"type\":\"color\",\"color\":\"#fff\",\"overlay\":{\"enabled\":false,\"color\":\"rgba(255,255,255,0.72)\",\"blur\":3}},\"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\":null,\"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}},\"noAggregationBarWidthSettings\":{\"strategy\":\"group\",\"groupWidth\":{\"relative\":true,\"relativeWidth\":2,\"absoluteWidth\":1000},\"barWidth\":{\"relative\":true,\"relativeWidth\":2,\"absoluteWidth\":1000}},\"animation\":{\"animation\":true,\"animationThreshold\":2000,\"animationDuration\":500,\"animationEasing\":\"cubicOut\",\"animationDelay\":0,\"animationDurationUpdate\":300,\"animationEasingUpdate\":\"cubicOut\",\"animationDelayUpdate\":0},\"padding\":\"12px\"},\"title\":\"Line 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\"}"
+  },
+  "tags": [
+    "chart",
+    "time series",
+    "time-series",
+    "line",
+    "line chart"
+  ]
+}
\ No newline at end of file
diff --git a/application/src/main/data/json/system/widget_types/persistent_rpc_table.json b/application/src/main/data/json/system/widget_types/persistent_rpc_table.json
index 2dadf40b85..f50d1ac5e8 100644
--- a/application/src/main/data/json/system/widget_types/persistent_rpc_table.json
+++ b/application/src/main/data/json/system/widget_types/persistent_rpc_table.json
@@ -15,7 +15,7 @@
     "settingsSchema": "",
     "dataKeySettingsSchema": "{}\n",
     "settingsDirective": "tb-persistent-table-widget-settings",
-    "defaultConfig": "{\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{\"enableStickyAction\":true,\"enableFilter\":true,\"displayPagination\":true,\"defaultPageSize\":10,\"enableStickyHeader\":true,\"displayColumns\":[\"rpcId\",\"messageType\",\"status\",\"method\",\"createdTime\",\"expirationTime\"],\"displayDetails\":true,\"defaultSortOrder\":\"-createdTime\",\"allowSendRequest\":true,\"allowDelete\":true},\"title\":\"Persistent RPC table\",\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400,\"padding\":\"5px 10px\"},\"targetDeviceAliasIds\":[]}"
+    "defaultConfig": "{\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{\"enableStickyAction\":true,\"enableFilter\":true,\"displayPagination\":true,\"defaultPageSize\":10,\"enableStickyHeader\":true,\"displayColumns\":[\"rpcId\",\"messageType\",\"status\",\"method\",\"createdTime\",\"expirationTime\"],\"displayDetails\":true,\"defaultSortOrder\":\"-createdTime\",\"allowSendRequest\":true,\"allowDelete\":true},\"title\":\"Persistent RPC table\",\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400,\"padding\":\"5px 10px\"}}"
   },
   "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/point_chart.json b/application/src/main/data/json/system/widget_types/point_chart.json
new file mode 100644
index 0000000000..beb99116c9
--- /dev/null
+++ b/application/src/main/data/json/system/widget_types/point_chart.json
@@ -0,0 +1,32 @@
+{
+  "fqn": "point_chart",
+  "name": "Point chart",
+  "deprecated": false,
+  "image": "tb-image:Y2hhcnRfKDMpLnN2Zw==:IlBvaW50IGNoYXJ0IiBzeXN0ZW0gd2lkZ2V0IGltYWdl;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_4182_11193)">
<path d="M2.84766 1.28125V7H2.125V2.18359L0.667969 2.71484V2.0625L2.73438 1.28125H2.84766ZM8.67517 3.70312V4.57031C8.67517 5.03646 8.63351 5.42969 8.55017 5.75C8.46684 6.07031 8.34705 6.32812 8.1908 6.52344C8.03455 6.71875 7.84575 6.86068 7.62439 6.94922C7.40564 7.03516 7.15825 7.07812 6.8822 7.07812C6.66345 7.07812 6.46163 7.05078 6.27673 6.99609C6.09184 6.94141 5.92517 6.85417 5.77673 6.73438C5.6309 6.61198 5.5059 6.45312 5.40173 6.25781C5.29757 6.0625 5.21814 5.82552 5.16345 5.54688C5.10877 5.26823 5.08142 4.94271 5.08142 4.57031V3.70312C5.08142 3.23698 5.12309 2.84635 5.20642 2.53125C5.29236 2.21615 5.41345 1.96354 5.5697 1.77344C5.72595 1.58073 5.91345 1.44271 6.1322 1.35938C6.35356 1.27604 6.60095 1.23438 6.87439 1.23438C7.09575 1.23438 7.29887 1.26172 7.48377 1.31641C7.67127 1.36849 7.83793 1.45312 7.98377 1.57031C8.1296 1.6849 8.2533 1.83854 8.35486 2.03125C8.45903 2.22135 8.53845 2.45443 8.59314 2.73047C8.64783 3.00651 8.67517 3.33073 8.67517 3.70312ZM7.94861 4.6875V3.58203C7.94861 3.32682 7.93298 3.10286 7.90173 2.91016C7.87309 2.71484 7.83012 2.54818 7.77283 2.41016C7.71554 2.27214 7.64262 2.16016 7.55408 2.07422C7.46814 1.98828 7.36788 1.92578 7.2533 1.88672C7.14132 1.84505 7.01502 1.82422 6.87439 1.82422C6.70252 1.82422 6.55017 1.85677 6.41736 1.92188C6.28455 1.98438 6.17257 2.08464 6.08142 2.22266C5.99288 2.36068 5.92517 2.54167 5.8783 2.76562C5.83142 2.98958 5.80798 3.26172 5.80798 3.58203V4.6875C5.80798 4.94271 5.82231 5.16797 5.85095 5.36328C5.8822 5.55859 5.92778 5.72786 5.98767 5.87109C6.04757 6.01172 6.12048 6.1276 6.20642 6.21875C6.29236 6.3099 6.39132 6.3776 6.5033 6.42188C6.61788 6.46354 6.74418 6.48438 6.8822 6.48438C7.05929 6.48438 7.21423 6.45052 7.34705 6.38281C7.47986 6.3151 7.59054 6.20964 7.67908 6.06641C7.77022 5.92057 7.83793 5.73438 7.8822 5.50781C7.92647 5.27865 7.94861 5.00521 7.94861 4.6875ZM13.3074 3.70312V4.57031C13.3074 5.03646 13.2657 5.42969 13.1824 5.75C13.099 6.07031 12.9793 6.32812 12.823 6.52344C12.6668 6.71875 12.4779 6.86068 12.2566 6.94922C12.0378 7.03516 11.7904 7.07812 11.5144 7.07812C11.2957 7.07812 11.0938 7.05078 10.9089 6.99609C10.724 6.94141 10.5574 6.85417 10.4089 6.73438C10.2631 6.61198 10.1381 6.45312 10.0339 6.25781C9.92977 6.0625 9.85034 5.82552 9.79566 5.54688C9.74097 5.26823 9.71363 4.94271 9.71363 4.57031V3.70312C9.71363 3.23698 9.75529 2.84635 9.83863 2.53125C9.92456 2.21615 10.0457 1.96354 10.2019 1.77344C10.3582 1.58073 10.5457 1.44271 10.7644 1.35938C10.9858 1.27604 11.2332 1.23438 11.5066 1.23438C11.7279 1.23438 11.9311 1.26172 12.116 1.31641C12.3035 1.36849 12.4701 1.45312 12.616 1.57031C12.7618 1.6849 12.8855 1.83854 12.9871 2.03125C13.0912 2.22135 13.1707 2.45443 13.2253 2.73047C13.28 3.00651 13.3074 3.33073 13.3074 3.70312ZM12.5808 4.6875V3.58203C12.5808 3.32682 12.5652 3.10286 12.5339 2.91016C12.5053 2.71484 12.4623 2.54818 12.405 2.41016C12.3477 2.27214 12.2748 2.16016 12.1863 2.07422C12.1003 1.98828 12.0001 1.92578 11.8855 1.88672C11.7735 1.84505 11.6472 1.82422 11.5066 1.82422C11.3347 1.82422 11.1824 1.85677 11.0496 1.92188C10.9168 1.98438 10.8048 2.08464 10.7136 2.22266C10.6251 2.36068 10.5574 2.54167 10.5105 2.76562C10.4636 2.98958 10.4402 3.26172 10.4402 3.58203V4.6875C10.4402 4.94271 10.4545 5.16797 10.4832 5.36328C10.5144 5.55859 10.56 5.72786 10.6199 5.87109C10.6798 6.01172 10.7527 6.1276 10.8386 6.21875C10.9246 6.3099 11.0235 6.3776 11.1355 6.42188C11.2501 6.46354 11.3764 6.48438 11.5144 6.48438C11.6915 6.48438 11.8464 6.45052 11.9793 6.38281C12.1121 6.3151 12.2227 6.20964 12.3113 6.06641C12.4024 5.92057 12.4701 5.73438 12.5144 5.50781C12.5587 5.27865 12.5808 5.00521 12.5808 4.6875ZM14.3068 2.70703V2.40625C14.3068 2.1901 14.3536 1.99349 14.4474 1.81641C14.5411 1.63932 14.6753 1.4974 14.8497 1.39062C15.0242 1.28385 15.2312 1.23047 15.4708 1.23047C15.7156 1.23047 15.924 1.28385 16.0958 1.39062C16.2703 1.4974 16.4044 1.63932 16.4982 1.81641C16.5919 1.99349 16.6388 2.1901 16.6388 2.40625V2.70703C16.6388 2.91797 16.5919 3.11198 16.4982 3.28906C16.407 3.46615 16.2742 3.60807 16.0997 3.71484C15.9279 3.82161 15.7208 3.875 15.4786 3.875C15.2365 3.875 15.0268 3.82161 14.8497 3.71484C14.6753 3.60807 14.5411 3.46615 14.4474 3.28906C14.3536 3.11198 14.3068 2.91797 14.3068 2.70703ZM14.8497 2.40625V2.70703C14.8497 2.82682 14.8719 2.9401 14.9161 3.04688C14.963 3.15365 15.0333 3.24089 15.1271 3.30859C15.2208 3.3737 15.338 3.40625 15.4786 3.40625C15.6193 3.40625 15.7352 3.3737 15.8263 3.30859C15.9174 3.24089 15.9852 3.15365 16.0294 3.04688C16.0737 2.9401 16.0958 2.82682 16.0958 2.70703V2.40625C16.0958 2.28385 16.0724 2.16927 16.0255 2.0625C15.9812 1.95312 15.9122 1.86589 15.8185 1.80078C15.7273 1.73307 15.6115 1.69922 15.4708 1.69922C15.3328 1.69922 15.2169 1.73307 15.1232 1.80078C15.032 1.86589 14.963 1.95312 14.9161 2.0625C14.8719 2.16927 14.8497 2.28385 14.8497 2.40625ZM17.0763 5.91016V5.60547C17.0763 5.39193 17.1232 5.19661 17.2169 5.01953C17.3107 4.84245 17.4448 4.70052 17.6193 4.59375C17.7937 4.48698 18.0008 4.43359 18.2404 4.43359C18.4852 4.43359 18.6935 4.48698 18.8654 4.59375C19.0398 4.70052 19.174 4.84245 19.2677 5.01953C19.3615 5.19661 19.4083 5.39193 19.4083 5.60547V5.91016C19.4083 6.1237 19.3615 6.31901 19.2677 6.49609C19.1766 6.67318 19.0437 6.8151 18.8693 6.92188C18.6974 7.02865 18.4904 7.08203 18.2482 7.08203C18.006 7.08203 17.7977 7.02865 17.6232 6.92188C17.4487 6.8151 17.3133 6.67318 17.2169 6.49609C17.1232 6.31901 17.0763 6.1237 17.0763 5.91016ZM17.6193 5.60547V5.91016C17.6193 6.02995 17.6414 6.14453 17.6857 6.25391C17.7325 6.36068 17.8029 6.44792 17.8966 6.51562C17.9904 6.58073 18.1075 6.61328 18.2482 6.61328C18.3888 6.61328 18.5047 6.58073 18.5958 6.51562C18.6896 6.44792 18.7586 6.36068 18.8029 6.25391C18.8471 6.14714 18.8693 6.03255 18.8693 5.91016V5.60547C18.8693 5.48307 18.8458 5.36849 18.799 5.26172C18.7547 5.15495 18.6857 5.06901 18.5919 5.00391C18.5008 4.9362 18.3836 4.90234 18.2404 4.90234C18.1023 4.90234 17.9865 4.9362 17.8927 5.00391C17.8016 5.06901 17.7325 5.15495 17.6857 5.26172C17.6414 5.36849 17.6193 5.48307 17.6193 5.60547ZM18.42 2.12109L15.6427 6.56641L15.2365 6.30859L18.0138 1.86328L18.42 2.12109Z" fill="black" fill-opacity="0.54"/>
<path d="M8.05859 33.6677C8.05859 34.0141 7.97786 34.3083 7.81641 34.5505C7.65755 34.7901 7.44141 34.9724 7.16797 35.0974C6.89714 35.2224 6.59115 35.2849 6.25 35.2849C5.90885 35.2849 5.60156 35.2224 5.32812 35.0974C5.05469 34.9724 4.83854 34.7901 4.67969 34.5505C4.52083 34.3083 4.44141 34.0141 4.44141 33.6677C4.44141 33.4412 4.48438 33.2341 4.57031 33.0466C4.65885 32.8565 4.78255 32.6912 4.94141 32.5505C5.10286 32.4099 5.29297 32.3018 5.51172 32.2263C5.73307 32.1482 5.97656 32.1091 6.24219 32.1091C6.59115 32.1091 6.90234 32.1768 7.17578 32.3123C7.44922 32.4451 7.66406 32.6287 7.82031 32.863C7.97917 33.0974 8.05859 33.3656 8.05859 33.6677ZM7.33203 33.6521C7.33203 33.4412 7.28646 33.255 7.19531 33.0935C7.10417 32.9294 6.97656 32.8018 6.8125 32.7107C6.64844 32.6195 6.45833 32.574 6.24219 32.574C6.02083 32.574 5.82943 32.6195 5.66797 32.7107C5.50911 32.8018 5.38542 32.9294 5.29688 33.0935C5.20833 33.255 5.16406 33.4412 5.16406 33.6521C5.16406 33.8708 5.20703 34.0583 5.29297 34.2146C5.38151 34.3682 5.50651 34.4867 5.66797 34.5701C5.83203 34.6508 6.02604 34.6912 6.25 34.6912C6.47396 34.6912 6.66667 34.6508 6.82812 34.5701C6.98958 34.4867 7.11328 34.3682 7.19922 34.2146C7.28776 34.0583 7.33203 33.8708 7.33203 33.6521ZM7.92578 30.9998C7.92578 31.2758 7.85286 31.5245 7.70703 31.7458C7.5612 31.9672 7.36198 32.1417 7.10938 32.2693C6.85677 32.3969 6.57031 32.4607 6.25 32.4607C5.92448 32.4607 5.63411 32.3969 5.37891 32.2693C5.1263 32.1417 4.92839 31.9672 4.78516 31.7458C4.64193 31.5245 4.57031 31.2758 4.57031 30.9998C4.57031 30.669 4.64193 30.3878 4.78516 30.156C4.93099 29.9242 5.13021 29.7472 5.38281 29.6248C5.63542 29.5024 5.92318 29.4412 6.24609 29.4412C6.57161 29.4412 6.86068 29.5024 7.11328 29.6248C7.36589 29.7472 7.5638 29.9242 7.70703 30.156C7.85286 30.3878 7.92578 30.669 7.92578 30.9998ZM7.20312 31.0115C7.20312 30.8214 7.16276 30.6534 7.08203 30.5076C7.0013 30.3617 6.88932 30.2472 6.74609 30.1638C6.60286 30.0779 6.4362 30.0349 6.24609 30.0349C6.05599 30.0349 5.88932 30.0753 5.74609 30.156C5.60547 30.2341 5.49479 30.3461 5.41406 30.4919C5.33594 30.6378 5.29688 30.811 5.29688 31.0115C5.29688 31.2068 5.33594 31.3774 5.41406 31.5232C5.49479 31.669 5.60677 31.7823 5.75 31.863C5.89323 31.9438 6.0599 31.9841 6.25 31.9841C6.4401 31.9841 6.60547 31.9438 6.74609 31.863C6.88932 31.7823 7.0013 31.669 7.08203 31.5232C7.16276 31.3774 7.20312 31.2068 7.20312 31.0115ZM12.6752 31.9099V32.7771C12.6752 33.2432 12.6335 33.6365 12.5502 33.9568C12.4668 34.2771 12.347 34.5349 12.1908 34.7302C12.0345 34.9255 11.8457 35.0675 11.6244 35.156C11.4056 35.2419 11.1582 35.2849 10.8822 35.2849C10.6635 35.2849 10.4616 35.2576 10.2767 35.2029C10.0918 35.1482 9.92517 35.061 9.77673 34.9412C9.6309 34.8188 9.5059 34.6599 9.40173 34.4646C9.29757 34.2693 9.21814 34.0323 9.16345 33.7537C9.10877 33.475 9.08142 33.1495 9.08142 32.7771V31.9099C9.08142 31.4438 9.12309 31.0531 9.20642 30.738C9.29236 30.4229 9.41345 30.1703 9.5697 29.9802C9.72595 29.7875 9.91345 29.6495 10.1322 29.5662C10.3536 29.4828 10.601 29.4412 10.8744 29.4412C11.0957 29.4412 11.2989 29.4685 11.4838 29.5232C11.6713 29.5753 11.8379 29.6599 11.9838 29.7771C12.1296 29.8917 12.2533 30.0453 12.3549 30.238C12.459 30.4281 12.5385 30.6612 12.5931 30.9373C12.6478 31.2133 12.6752 31.5375 12.6752 31.9099ZM11.9486 32.8943V31.7888C11.9486 31.5336 11.933 31.3097 11.9017 31.1169C11.8731 30.9216 11.8301 30.755 11.7728 30.6169C11.7155 30.4789 11.6426 30.3669 11.5541 30.281C11.4681 30.1951 11.3679 30.1326 11.2533 30.0935C11.1413 30.0518 11.015 30.031 10.8744 30.031C10.7025 30.031 10.5502 30.0636 10.4174 30.1287C10.2845 30.1912 10.1726 30.2914 10.0814 30.4294C9.99288 30.5675 9.92517 30.7485 9.8783 30.9724C9.83142 31.1964 9.80798 31.4685 9.80798 31.7888V32.8943C9.80798 33.1495 9.82231 33.3748 9.85095 33.5701C9.8822 33.7654 9.92778 33.9347 9.98767 34.0779C10.0476 34.2185 10.1205 34.3344 10.2064 34.4255C10.2924 34.5167 10.3913 34.5844 10.5033 34.6287C10.6179 34.6703 10.7442 34.6912 10.8822 34.6912C11.0593 34.6912 11.2142 34.6573 11.347 34.5896C11.4799 34.5219 11.5905 34.4164 11.6791 34.2732C11.7702 34.1274 11.8379 33.9412 11.8822 33.7146C11.9265 33.4854 11.9486 33.212 11.9486 32.8943ZM13.6746 30.9138V30.613C13.6746 30.3969 13.7214 30.2003 13.8152 30.0232C13.9089 29.8461 14.0431 29.7042 14.2175 29.5974C14.392 29.4906 14.599 29.4373 14.8386 29.4373C15.0834 29.4373 15.2918 29.4906 15.4636 29.5974C15.6381 29.7042 15.7722 29.8461 15.866 30.0232C15.9597 30.2003 16.0066 30.3969 16.0066 30.613V30.9138C16.0066 31.1248 15.9597 31.3188 15.866 31.4958C15.7748 31.6729 15.642 31.8149 15.4675 31.9216C15.2957 32.0284 15.0886 32.0818 14.8464 32.0818C14.6043 32.0818 14.3946 32.0284 14.2175 31.9216C14.0431 31.8149 13.9089 31.6729 13.8152 31.4958C13.7214 31.3188 13.6746 31.1248 13.6746 30.9138ZM14.2175 30.613V30.9138C14.2175 31.0336 14.2397 31.1469 14.2839 31.2537C14.3308 31.3604 14.4011 31.4477 14.4949 31.5154C14.5886 31.5805 14.7058 31.613 14.8464 31.613C14.9871 31.613 15.1029 31.5805 15.1941 31.5154C15.2852 31.4477 15.3529 31.3604 15.3972 31.2537C15.4415 31.1469 15.4636 31.0336 15.4636 30.9138V30.613C15.4636 30.4906 15.4402 30.3761 15.3933 30.2693C15.349 30.1599 15.28 30.0727 15.1863 30.0076C15.0951 29.9399 14.9793 29.906 14.8386 29.906C14.7006 29.906 14.5847 29.9399 14.491 30.0076C14.3998 30.0727 14.3308 30.1599 14.2839 30.2693C14.2397 30.3761 14.2175 30.4906 14.2175 30.613ZM16.4441 34.1169V33.8123C16.4441 33.5987 16.491 33.4034 16.5847 33.2263C16.6785 33.0492 16.8126 32.9073 16.9871 32.8005C17.1615 32.6938 17.3686 32.6404 17.6082 32.6404C17.8529 32.6404 18.0613 32.6938 18.2332 32.8005C18.4076 32.9073 18.5418 33.0492 18.6355 33.2263C18.7293 33.4034 18.7761 33.5987 18.7761 33.8123V34.1169C18.7761 34.3305 18.7293 34.5258 18.6355 34.7029C18.5444 34.88 18.4115 35.0219 18.2371 35.1287C18.0652 35.2354 17.8582 35.2888 17.616 35.2888C17.3738 35.2888 17.1654 35.2354 16.991 35.1287C16.8165 35.0219 16.6811 34.88 16.5847 34.7029C16.491 34.5258 16.4441 34.3305 16.4441 34.1169ZM16.9871 33.8123V34.1169C16.9871 34.2367 17.0092 34.3513 17.0535 34.4607C17.1003 34.5675 17.1707 34.6547 17.2644 34.7224C17.3582 34.7875 17.4753 34.8201 17.616 34.8201C17.7566 34.8201 17.8725 34.7875 17.9636 34.7224C18.0574 34.6547 18.1264 34.5675 18.1707 34.4607C18.2149 34.3539 18.2371 34.2393 18.2371 34.1169V33.8123C18.2371 33.6899 18.2136 33.5753 18.1668 33.4685C18.1225 33.3617 18.0535 33.2758 17.9597 33.2107C17.8686 33.143 17.7514 33.1091 17.6082 33.1091C17.4701 33.1091 17.3543 33.143 17.2605 33.2107C17.1694 33.2758 17.1003 33.3617 17.0535 33.4685C17.0092 33.5753 16.9871 33.6899 16.9871 33.8123ZM17.7878 30.3279L15.0105 34.7732L14.6043 34.5154L17.3816 30.0701L17.7878 30.3279Z" fill="black" fill-opacity="0.54"/>
<path d="M7.24609 57.7183H7.30859V58.3315H7.24609C6.86328 58.3315 6.54297 58.394 6.28516 58.519C6.02734 58.6414 5.82292 58.8068 5.67188 59.0151C5.52083 59.2209 5.41146 59.4526 5.34375 59.7104C5.27865 59.9683 5.24609 60.23 5.24609 60.4956V61.3315C5.24609 61.5841 5.27604 61.8081 5.33594 62.0034C5.39583 62.1961 5.47786 62.3589 5.58203 62.4917C5.6862 62.6245 5.80339 62.7248 5.93359 62.7925C6.06641 62.8602 6.20443 62.894 6.34766 62.894C6.51432 62.894 6.66276 62.8628 6.79297 62.8003C6.92318 62.7352 7.03255 62.6453 7.12109 62.5308C7.21224 62.4136 7.28125 62.2756 7.32812 62.1167C7.375 61.9578 7.39844 61.7834 7.39844 61.5933C7.39844 61.424 7.3776 61.2612 7.33594 61.105C7.29427 60.9461 7.23047 60.8055 7.14453 60.6831C7.05859 60.5581 6.95052 60.4604 6.82031 60.3901C6.69271 60.3172 6.54036 60.2808 6.36328 60.2808C6.16276 60.2808 5.97526 60.3302 5.80078 60.4292C5.62891 60.5256 5.48698 60.6532 5.375 60.812C5.26562 60.9683 5.20312 61.1388 5.1875 61.3237L4.80469 61.3198C4.84115 61.0282 4.90885 60.7795 5.00781 60.5737C5.10938 60.3654 5.23438 60.1961 5.38281 60.0659C5.53385 59.9331 5.70182 59.8368 5.88672 59.7769C6.07422 59.7144 6.27214 59.6831 6.48047 59.6831C6.76432 59.6831 7.00911 59.7365 7.21484 59.8433C7.42057 59.95 7.58984 60.0933 7.72266 60.2729C7.85547 60.45 7.95312 60.6506 8.01562 60.8745C8.08073 61.0959 8.11328 61.3237 8.11328 61.5581C8.11328 61.8263 8.07552 62.0776 8 62.312C7.92448 62.5464 7.8112 62.7521 7.66016 62.9292C7.51172 63.1063 7.32812 63.2443 7.10938 63.3433C6.89062 63.4422 6.63672 63.4917 6.34766 63.4917C6.04036 63.4917 5.77214 63.4292 5.54297 63.3042C5.3138 63.1766 5.1237 63.0073 4.97266 62.7964C4.82161 62.5854 4.70833 62.3511 4.63281 62.0933C4.55729 61.8354 4.51953 61.5737 4.51953 61.3081V60.9683C4.51953 60.5672 4.5599 60.174 4.64062 59.7886C4.72135 59.4032 4.86068 59.0542 5.05859 58.7417C5.25911 58.4292 5.53646 58.1805 5.89062 57.9956C6.24479 57.8107 6.69661 57.7183 7.24609 57.7183ZM12.6752 60.1167V60.9839C12.6752 61.45 12.6335 61.8433 12.5502 62.1636C12.4668 62.4839 12.347 62.7417 12.1908 62.937C12.0345 63.1323 11.8457 63.2743 11.6244 63.3628C11.4056 63.4487 11.1582 63.4917 10.8822 63.4917C10.6635 63.4917 10.4616 63.4644 10.2767 63.4097C10.0918 63.355 9.92517 63.2677 9.77673 63.1479C9.6309 63.0256 9.5059 62.8667 9.40173 62.6714C9.29757 62.4761 9.21814 62.2391 9.16345 61.9604C9.10877 61.6818 9.08142 61.3563 9.08142 60.9839V60.1167C9.08142 59.6506 9.12309 59.2599 9.20642 58.9448C9.29236 58.6297 9.41345 58.3771 9.5697 58.187C9.72595 57.9943 9.91345 57.8563 10.1322 57.7729C10.3536 57.6896 10.601 57.6479 10.8744 57.6479C11.0957 57.6479 11.2989 57.6753 11.4838 57.73C11.6713 57.7821 11.8379 57.8667 11.9838 57.9839C12.1296 58.0985 12.2533 58.2521 12.3549 58.4448C12.459 58.6349 12.5385 58.868 12.5931 59.144C12.6478 59.4201 12.6752 59.7443 12.6752 60.1167ZM11.9486 61.1011V59.9956C11.9486 59.7404 11.933 59.5164 11.9017 59.3237C11.8731 59.1284 11.8301 58.9618 11.7728 58.8237C11.7155 58.6857 11.6426 58.5737 11.5541 58.4878C11.4681 58.4019 11.3679 58.3394 11.2533 58.3003C11.1413 58.2586 11.015 58.2378 10.8744 58.2378C10.7025 58.2378 10.5502 58.2703 10.4174 58.3354C10.2845 58.3979 10.1726 58.4982 10.0814 58.6362C9.99288 58.7743 9.92517 58.9552 9.8783 59.1792C9.83142 59.4032 9.80798 59.6753 9.80798 59.9956V61.1011C9.80798 61.3563 9.82231 61.5815 9.85095 61.7769C9.8822 61.9722 9.92778 62.1414 9.98767 62.2847C10.0476 62.4253 10.1205 62.5412 10.2064 62.6323C10.2924 62.7235 10.3913 62.7912 10.5033 62.8354C10.6179 62.8771 10.7442 62.8979 10.8822 62.8979C11.0593 62.8979 11.2142 62.8641 11.347 62.7964C11.4799 62.7287 11.5905 62.6232 11.6791 62.48C11.7702 62.3341 11.8379 62.1479 11.8822 61.9214C11.9265 61.6922 11.9486 61.4188 11.9486 61.1011ZM13.6746 59.1206V58.8198C13.6746 58.6037 13.7214 58.4071 13.8152 58.23C13.9089 58.0529 14.0431 57.911 14.2175 57.8042C14.392 57.6974 14.599 57.644 14.8386 57.644C15.0834 57.644 15.2918 57.6974 15.4636 57.8042C15.6381 57.911 15.7722 58.0529 15.866 58.23C15.9597 58.4071 16.0066 58.6037 16.0066 58.8198V59.1206C16.0066 59.3315 15.9597 59.5256 15.866 59.7026C15.7748 59.8797 15.642 60.0216 15.4675 60.1284C15.2957 60.2352 15.0886 60.2886 14.8464 60.2886C14.6043 60.2886 14.3946 60.2352 14.2175 60.1284C14.0431 60.0216 13.9089 59.8797 13.8152 59.7026C13.7214 59.5256 13.6746 59.3315 13.6746 59.1206ZM14.2175 58.8198V59.1206C14.2175 59.2404 14.2397 59.3537 14.2839 59.4604C14.3308 59.5672 14.4011 59.6545 14.4949 59.7222C14.5886 59.7873 14.7058 59.8198 14.8464 59.8198C14.9871 59.8198 15.1029 59.7873 15.1941 59.7222C15.2852 59.6545 15.3529 59.5672 15.3972 59.4604C15.4415 59.3537 15.4636 59.2404 15.4636 59.1206V58.8198C15.4636 58.6974 15.4402 58.5828 15.3933 58.4761C15.349 58.3667 15.28 58.2795 15.1863 58.2144C15.0951 58.1466 14.9793 58.1128 14.8386 58.1128C14.7006 58.1128 14.5847 58.1466 14.491 58.2144C14.3998 58.2795 14.3308 58.3667 14.2839 58.4761C14.2397 58.5828 14.2175 58.6974 14.2175 58.8198ZM16.4441 62.3237V62.019C16.4441 61.8055 16.491 61.6102 16.5847 61.4331C16.6785 61.256 16.8126 61.1141 16.9871 61.0073C17.1615 60.9006 17.3686 60.8472 17.6082 60.8472C17.8529 60.8472 18.0613 60.9006 18.2332 61.0073C18.4076 61.1141 18.5418 61.256 18.6355 61.4331C18.7293 61.6102 18.7761 61.8055 18.7761 62.019V62.3237C18.7761 62.5373 18.7293 62.7326 18.6355 62.9097C18.5444 63.0868 18.4115 63.2287 18.2371 63.3354C18.0652 63.4422 17.8582 63.4956 17.616 63.4956C17.3738 63.4956 17.1654 63.4422 16.991 63.3354C16.8165 63.2287 16.6811 63.0868 16.5847 62.9097C16.491 62.7326 16.4441 62.5373 16.4441 62.3237ZM16.9871 62.019V62.3237C16.9871 62.4435 17.0092 62.5581 17.0535 62.6675C17.1003 62.7743 17.1707 62.8615 17.2644 62.9292C17.3582 62.9943 17.4753 63.0269 17.616 63.0269C17.7566 63.0269 17.8725 62.9943 17.9636 62.9292C18.0574 62.8615 18.1264 62.7743 18.1707 62.6675C18.2149 62.5607 18.2371 62.4461 18.2371 62.3237V62.019C18.2371 61.8966 18.2136 61.7821 18.1668 61.6753C18.1225 61.5685 18.0535 61.4826 17.9597 61.4175C17.8686 61.3498 17.7514 61.3159 17.6082 61.3159C17.4701 61.3159 17.3543 61.3498 17.2605 61.4175C17.1694 61.4826 17.1003 61.5685 17.0535 61.6753C17.0092 61.7821 16.9871 61.8966 16.9871 62.019ZM17.7878 58.5347L15.0105 62.98L14.6043 62.7222L17.3816 58.2769L17.7878 58.5347Z" fill="black" fill-opacity="0.54"/>
<path d="M8.31641 89.7063V90.3H4.20703V89.8743L6.75391 85.9329H7.34375L6.71094 87.0735L5.02734 89.7063H8.31641ZM7.52344 85.9329V91.6204H6.80078V85.9329H7.52344ZM12.6752 88.3235V89.1907C12.6752 89.6568 12.6335 90.05 12.5502 90.3704C12.4668 90.6907 12.347 90.9485 12.1908 91.1438C12.0345 91.3391 11.8457 91.481 11.6244 91.5696C11.4056 91.6555 11.1582 91.6985 10.8822 91.6985C10.6635 91.6985 10.4616 91.6711 10.2767 91.6165C10.0918 91.5618 9.92517 91.4745 9.77673 91.3547C9.6309 91.2323 9.5059 91.0735 9.40173 90.8782C9.29757 90.6829 9.21814 90.4459 9.16345 90.1672C9.10877 89.8886 9.08142 89.5631 9.08142 89.1907V88.3235C9.08142 87.8573 9.12309 87.4667 9.20642 87.1516C9.29236 86.8365 9.41345 86.5839 9.5697 86.3938C9.72595 86.2011 9.91345 86.0631 10.1322 85.9797C10.3536 85.8964 10.601 85.8547 10.8744 85.8547C11.0957 85.8547 11.2989 85.8821 11.4838 85.9368C11.6713 85.9889 11.8379 86.0735 11.9838 86.1907C12.1296 86.3053 12.2533 86.4589 12.3549 86.6516C12.459 86.8417 12.5385 87.0748 12.5931 87.3508C12.6478 87.6269 12.6752 87.9511 12.6752 88.3235ZM11.9486 89.3079V88.2024C11.9486 87.9472 11.933 87.7232 11.9017 87.5305C11.8731 87.3352 11.8301 87.1685 11.7728 87.0305C11.7155 86.8925 11.6426 86.7805 11.5541 86.6946C11.4681 86.6086 11.3679 86.5461 11.2533 86.5071C11.1413 86.4654 11.015 86.4446 10.8744 86.4446C10.7025 86.4446 10.5502 86.4771 10.4174 86.5422C10.2845 86.6047 10.1726 86.705 10.0814 86.843C9.99288 86.981 9.92517 87.162 9.8783 87.386C9.83142 87.6099 9.80798 87.8821 9.80798 88.2024V89.3079C9.80798 89.5631 9.82231 89.7883 9.85095 89.9836C9.8822 90.179 9.92778 90.3482 9.98767 90.4915C10.0476 90.6321 10.1205 90.748 10.2064 90.8391C10.2924 90.9303 10.3913 90.998 10.5033 91.0422C10.6179 91.0839 10.7442 91.1047 10.8822 91.1047C11.0593 91.1047 11.2142 91.0709 11.347 91.0032C11.4799 90.9355 11.5905 90.83 11.6791 90.6868C11.7702 90.5409 11.8379 90.3547 11.8822 90.1282C11.9265 89.899 11.9486 89.6256 11.9486 89.3079ZM13.6746 87.3274V87.0266C13.6746 86.8105 13.7214 86.6139 13.8152 86.4368C13.9089 86.2597 14.0431 86.1178 14.2175 86.011C14.392 85.9042 14.599 85.8508 14.8386 85.8508C15.0834 85.8508 15.2918 85.9042 15.4636 86.011C15.6381 86.1178 15.7722 86.2597 15.866 86.4368C15.9597 86.6139 16.0066 86.8105 16.0066 87.0266V87.3274C16.0066 87.5383 15.9597 87.7323 15.866 87.9094C15.7748 88.0865 15.642 88.2284 15.4675 88.3352C15.2957 88.442 15.0886 88.4954 14.8464 88.4954C14.6043 88.4954 14.3946 88.442 14.2175 88.3352C14.0431 88.2284 13.9089 88.0865 13.8152 87.9094C13.7214 87.7323 13.6746 87.5383 13.6746 87.3274ZM14.2175 87.0266V87.3274C14.2175 87.4472 14.2397 87.5605 14.2839 87.6672C14.3308 87.774 14.4011 87.8612 14.4949 87.929C14.5886 87.9941 14.7058 88.0266 14.8464 88.0266C14.9871 88.0266 15.1029 87.9941 15.1941 87.929C15.2852 87.8612 15.3529 87.774 15.3972 87.6672C15.4415 87.5605 15.4636 87.4472 15.4636 87.3274V87.0266C15.4636 86.9042 15.4402 86.7896 15.3933 86.6829C15.349 86.5735 15.28 86.4862 15.1863 86.4211C15.0951 86.3534 14.9793 86.3196 14.8386 86.3196C14.7006 86.3196 14.5847 86.3534 14.491 86.4211C14.3998 86.4862 14.3308 86.5735 14.2839 86.6829C14.2397 86.7896 14.2175 86.9042 14.2175 87.0266ZM16.4441 90.5305V90.2258C16.4441 90.0123 16.491 89.817 16.5847 89.6399C16.6785 89.4628 16.8126 89.3209 16.9871 89.2141C17.1615 89.1073 17.3686 89.054 17.6082 89.054C17.8529 89.054 18.0613 89.1073 18.2332 89.2141C18.4076 89.3209 18.5418 89.4628 18.6355 89.6399C18.7293 89.817 18.7761 90.0123 18.7761 90.2258V90.5305C18.7761 90.7441 18.7293 90.9394 18.6355 91.1165C18.5444 91.2935 18.4115 91.4355 18.2371 91.5422C18.0652 91.649 17.8582 91.7024 17.616 91.7024C17.3738 91.7024 17.1654 91.649 16.991 91.5422C16.8165 91.4355 16.6811 91.2935 16.5847 91.1165C16.491 90.9394 16.4441 90.7441 16.4441 90.5305ZM16.9871 90.2258V90.5305C16.9871 90.6503 17.0092 90.7649 17.0535 90.8743C17.1003 90.981 17.1707 91.0683 17.2644 91.136C17.3582 91.2011 17.4753 91.2336 17.616 91.2336C17.7566 91.2336 17.8725 91.2011 17.9636 91.136C18.0574 91.0683 18.1264 90.981 18.1707 90.8743C18.2149 90.7675 18.2371 90.6529 18.2371 90.5305V90.2258C18.2371 90.1034 18.2136 89.9889 18.1668 89.8821C18.1225 89.7753 18.0535 89.6894 17.9597 89.6243C17.8686 89.5566 17.7514 89.5227 17.6082 89.5227C17.4701 89.5227 17.3543 89.5566 17.2605 89.6243C17.1694 89.6894 17.1003 89.7753 17.0535 89.8821C17.0092 89.9889 16.9871 90.1034 16.9871 90.2258ZM17.7878 86.7415L15.0105 91.1868L14.6043 90.929L17.3816 86.4836L17.7878 86.7415Z" fill="black" fill-opacity="0.54"/>
<path d="M8.19922 119.233V119.827H4.47656V119.308L6.33984 117.233C6.56901 116.978 6.74609 116.762 6.87109 116.585C6.9987 116.405 7.08724 116.245 7.13672 116.104C7.1888 115.961 7.21484 115.815 7.21484 115.667C7.21484 115.479 7.17578 115.31 7.09766 115.159C7.02214 115.006 6.91016 114.883 6.76172 114.792C6.61328 114.701 6.43359 114.655 6.22266 114.655C5.97005 114.655 5.75911 114.705 5.58984 114.804C5.42318 114.9 5.29818 115.035 5.21484 115.21C5.13151 115.384 5.08984 115.585 5.08984 115.812H4.36719C4.36719 115.491 4.4375 115.198 4.57812 114.933C4.71875 114.667 4.92708 114.456 5.20312 114.3C5.47917 114.141 5.81901 114.062 6.22266 114.062C6.58203 114.062 6.88932 114.125 7.14453 114.253C7.39974 114.378 7.59505 114.555 7.73047 114.784C7.86849 115.011 7.9375 115.276 7.9375 115.581C7.9375 115.748 7.90885 115.917 7.85156 116.089C7.79688 116.258 7.72005 116.427 7.62109 116.597C7.52474 116.766 7.41146 116.933 7.28125 117.097C7.15365 117.261 7.01693 117.422 6.87109 117.581L5.34766 119.233H8.19922ZM12.6752 116.53V117.397C12.6752 117.864 12.6335 118.257 12.5502 118.577C12.4668 118.897 12.347 119.155 12.1908 119.351C12.0345 119.546 11.8457 119.688 11.6244 119.776C11.4056 119.862 11.1582 119.905 10.8822 119.905C10.6635 119.905 10.4616 119.878 10.2767 119.823C10.0918 119.769 9.92517 119.681 9.77673 119.562C9.6309 119.439 9.5059 119.28 9.40173 119.085C9.29757 118.89 9.21814 118.653 9.16345 118.374C9.10877 118.095 9.08142 117.77 9.08142 117.397V116.53C9.08142 116.064 9.12309 115.674 9.20642 115.358C9.29236 115.043 9.41345 114.791 9.5697 114.601C9.72595 114.408 9.91345 114.27 10.1322 114.187C10.3536 114.103 10.601 114.062 10.8744 114.062C11.0957 114.062 11.2989 114.089 11.4838 114.144C11.6713 114.196 11.8379 114.28 11.9838 114.397C12.1296 114.512 12.2533 114.666 12.3549 114.858C12.459 115.049 12.5385 115.282 12.5931 115.558C12.6478 115.834 12.6752 116.158 12.6752 116.53ZM11.9486 117.515V116.409C11.9486 116.154 11.933 115.93 11.9017 115.737C11.8731 115.542 11.8301 115.375 11.7728 115.237C11.7155 115.099 11.6426 114.987 11.5541 114.901C11.4681 114.815 11.3679 114.753 11.2533 114.714C11.1413 114.672 11.015 114.651 10.8744 114.651C10.7025 114.651 10.5502 114.684 10.4174 114.749C10.2845 114.812 10.1726 114.912 10.0814 115.05C9.99288 115.188 9.92517 115.369 9.8783 115.593C9.83142 115.817 9.80798 116.089 9.80798 116.409V117.515C9.80798 117.77 9.82231 117.995 9.85095 118.19C9.8822 118.386 9.92778 118.555 9.98767 118.698C10.0476 118.839 10.1205 118.955 10.2064 119.046C10.2924 119.137 10.3913 119.205 10.5033 119.249C10.6179 119.291 10.7442 119.312 10.8822 119.312C11.0593 119.312 11.2142 119.278 11.347 119.21C11.4799 119.142 11.5905 119.037 11.6791 118.894C11.7702 118.748 11.8379 118.562 11.8822 118.335C11.9265 118.106 11.9486 117.832 11.9486 117.515ZM13.6746 115.534V115.233C13.6746 115.017 13.7214 114.821 13.8152 114.644C13.9089 114.466 14.0431 114.325 14.2175 114.218C14.392 114.111 14.599 114.058 14.8386 114.058C15.0834 114.058 15.2918 114.111 15.4636 114.218C15.6381 114.325 15.7722 114.466 15.866 114.644C15.9597 114.821 16.0066 115.017 16.0066 115.233V115.534C16.0066 115.745 15.9597 115.939 15.866 116.116C15.7748 116.293 15.642 116.435 15.4675 116.542C15.2957 116.649 15.0886 116.702 14.8464 116.702C14.6043 116.702 14.3946 116.649 14.2175 116.542C14.0431 116.435 13.9089 116.293 13.8152 116.116C13.7214 115.939 13.6746 115.745 13.6746 115.534ZM14.2175 115.233V115.534C14.2175 115.654 14.2397 115.767 14.2839 115.874C14.3308 115.981 14.4011 116.068 14.4949 116.136C14.5886 116.201 14.7058 116.233 14.8464 116.233C14.9871 116.233 15.1029 116.201 15.1941 116.136C15.2852 116.068 15.3529 115.981 15.3972 115.874C15.4415 115.767 15.4636 115.654 15.4636 115.534V115.233C15.4636 115.111 15.4402 114.996 15.3933 114.89C15.349 114.78 15.28 114.693 15.1863 114.628C15.0951 114.56 14.9793 114.526 14.8386 114.526C14.7006 114.526 14.5847 114.56 14.491 114.628C14.3998 114.693 14.3308 114.78 14.2839 114.89C14.2397 114.996 14.2175 115.111 14.2175 115.233ZM16.4441 118.737V118.433C16.4441 118.219 16.491 118.024 16.5847 117.847C16.6785 117.67 16.8126 117.528 16.9871 117.421C17.1615 117.314 17.3686 117.261 17.6082 117.261C17.8529 117.261 18.0613 117.314 18.2332 117.421C18.4076 117.528 18.5418 117.67 18.6355 117.847C18.7293 118.024 18.7761 118.219 18.7761 118.433V118.737C18.7761 118.951 18.7293 119.146 18.6355 119.323C18.5444 119.5 18.4115 119.642 18.2371 119.749C18.0652 119.856 17.8582 119.909 17.616 119.909C17.3738 119.909 17.1654 119.856 16.991 119.749C16.8165 119.642 16.6811 119.5 16.5847 119.323C16.491 119.146 16.4441 118.951 16.4441 118.737ZM16.9871 118.433V118.737C16.9871 118.857 17.0092 118.972 17.0535 119.081C17.1003 119.188 17.1707 119.275 17.2644 119.343C17.3582 119.408 17.4753 119.44 17.616 119.44C17.7566 119.44 17.8725 119.408 17.9636 119.343C18.0574 119.275 18.1264 119.188 18.1707 119.081C18.2149 118.974 18.2371 118.86 18.2371 118.737V118.433C18.2371 118.31 18.2136 118.196 18.1668 118.089C18.1225 117.982 18.0535 117.896 17.9597 117.831C17.8686 117.763 17.7514 117.729 17.6082 117.729C17.4701 117.729 17.3543 117.763 17.2605 117.831C17.1694 117.896 17.1003 117.982 17.0535 118.089C17.0092 118.196 16.9871 118.31 16.9871 118.433ZM17.7878 114.948L15.0105 119.394L14.6043 119.136L17.3816 114.69L17.7878 114.948Z" fill="black" fill-opacity="0.54"/>
<path d="M13.043 144.737V145.604C13.043 146.07 13.0013 146.464 12.918 146.784C12.8346 147.104 12.7148 147.362 12.5586 147.557C12.4023 147.753 12.2135 147.895 11.9922 147.983C11.7734 148.069 11.526 148.112 11.25 148.112C11.0312 148.112 10.8294 148.085 10.6445 148.03C10.4596 147.975 10.293 147.888 10.1445 147.768C9.9987 147.646 9.8737 147.487 9.76953 147.292C9.66536 147.096 9.58594 146.859 9.53125 146.581C9.47656 146.302 9.44922 145.977 9.44922 145.604V144.737C9.44922 144.271 9.49089 143.88 9.57422 143.565C9.66016 143.25 9.78125 142.997 9.9375 142.807C10.0938 142.615 10.2812 142.477 10.5 142.393C10.7214 142.31 10.9688 142.268 11.2422 142.268C11.4635 142.268 11.6667 142.296 11.8516 142.35C12.0391 142.402 12.2057 142.487 12.3516 142.604C12.4974 142.719 12.6211 142.872 12.7227 143.065C12.8268 143.255 12.9062 143.488 12.9609 143.764C13.0156 144.04 13.043 144.365 13.043 144.737ZM12.3164 145.721V144.616C12.3164 144.361 12.3008 144.137 12.2695 143.944C12.2409 143.749 12.1979 143.582 12.1406 143.444C12.0833 143.306 12.0104 143.194 11.9219 143.108C11.8359 143.022 11.7357 142.96 11.6211 142.921C11.5091 142.879 11.3828 142.858 11.2422 142.858C11.0703 142.858 10.918 142.891 10.7852 142.956C10.6523 143.018 10.5404 143.119 10.4492 143.257C10.3607 143.395 10.293 143.576 10.2461 143.8C10.1992 144.024 10.1758 144.296 10.1758 144.616V145.721C10.1758 145.977 10.1901 146.202 10.2188 146.397C10.25 146.593 10.2956 146.762 10.3555 146.905C10.4154 147.046 10.4883 147.162 10.5742 147.253C10.6602 147.344 10.7591 147.412 10.8711 147.456C10.9857 147.497 11.112 147.518 11.25 147.518C11.4271 147.518 11.582 147.484 11.7148 147.417C11.8477 147.349 11.9583 147.244 12.0469 147.1C12.138 146.955 12.2057 146.768 12.25 146.542C12.2943 146.313 12.3164 146.039 12.3164 145.721ZM14.0424 143.741V143.44C14.0424 143.224 14.0892 143.027 14.183 142.85C14.2767 142.673 14.4108 142.531 14.5853 142.425C14.7598 142.318 14.9668 142.264 15.2064 142.264C15.4512 142.264 15.6595 142.318 15.8314 142.425C16.0059 142.531 16.14 142.673 16.2338 142.85C16.3275 143.027 16.3744 143.224 16.3744 143.44V143.741C16.3744 143.952 16.3275 144.146 16.2338 144.323C16.1426 144.5 16.0098 144.642 15.8353 144.749C15.6635 144.856 15.4564 144.909 15.2142 144.909C14.972 144.909 14.7624 144.856 14.5853 144.749C14.4108 144.642 14.2767 144.5 14.183 144.323C14.0892 144.146 14.0424 143.952 14.0424 143.741ZM14.5853 143.44V143.741C14.5853 143.861 14.6075 143.974 14.6517 144.081C14.6986 144.188 14.7689 144.275 14.8627 144.343C14.9564 144.408 15.0736 144.44 15.2142 144.44C15.3549 144.44 15.4707 144.408 15.5619 144.343C15.653 144.275 15.7207 144.188 15.765 144.081C15.8093 143.974 15.8314 143.861 15.8314 143.741V143.44C15.8314 143.318 15.808 143.203 15.7611 143.096C15.7168 142.987 15.6478 142.9 15.5541 142.835C15.4629 142.767 15.347 142.733 15.2064 142.733C15.0684 142.733 14.9525 142.767 14.8588 142.835C14.7676 142.9 14.6986 142.987 14.6517 143.096C14.6075 143.203 14.5853 143.318 14.5853 143.44ZM16.8119 146.944V146.639C16.8119 146.426 16.8588 146.231 16.9525 146.053C17.0463 145.876 17.1804 145.734 17.3549 145.628C17.5293 145.521 17.7364 145.468 17.976 145.468C18.2207 145.468 18.4291 145.521 18.601 145.628C18.7754 145.734 18.9095 145.876 19.0033 146.053C19.097 146.231 19.1439 146.426 19.1439 146.639V146.944C19.1439 147.158 19.097 147.353 19.0033 147.53C18.9122 147.707 18.7793 147.849 18.6049 147.956C18.433 148.063 18.226 148.116 17.9838 148.116C17.7416 148.116 17.5332 148.063 17.3588 147.956C17.1843 147.849 17.0489 147.707 16.9525 147.53C16.8588 147.353 16.8119 147.158 16.8119 146.944ZM17.3549 146.639V146.944C17.3549 147.064 17.377 147.178 17.4213 147.288C17.4681 147.395 17.5385 147.482 17.6322 147.55C17.726 147.615 17.8431 147.647 17.9838 147.647C18.1244 147.647 18.2403 147.615 18.3314 147.55C18.4252 147.482 18.4942 147.395 18.5385 147.288C18.5827 147.181 18.6049 147.066 18.6049 146.944V146.639C18.6049 146.517 18.5814 146.402 18.5345 146.296C18.4903 146.189 18.4213 146.103 18.3275 146.038C18.2364 145.97 18.1192 145.936 17.976 145.936C17.8379 145.936 17.722 145.97 17.6283 146.038C17.5372 146.103 17.4681 146.189 17.4213 146.296C17.377 146.402 17.3549 146.517 17.3549 146.639ZM18.1556 143.155L15.3783 147.6L14.972 147.343L17.7494 142.897L18.1556 143.155Z" fill="black" fill-opacity="0.54"/>
<path d="M25 4.16113L200 4.16116" stroke="black" stroke-opacity="0.12"/>
<path d="M25 33.1611L200 33.1612" stroke="black" stroke-opacity="0.12"/>
<path d="M25 61.1611L200 61.1612" stroke="black" stroke-opacity="0.12"/>
<path d="M25 89.1611L200 89.1612" stroke="black" stroke-opacity="0.12"/>
<path d="M25 118.161L200 118.161" stroke="black" stroke-opacity="0.12"/>
<line x1="23.2" y1="145.961" x2="202.8" y2="145.961" stroke="black" stroke-opacity="0.7" stroke-width="0.4" stroke-linecap="square"/>
<g clip-path="url(#clip1_4182_11193)">
<line x1="40.45" y1="147.072" x2="40.45" y2="146.25" stroke="black" stroke-opacity="0.5" stroke-width="0.5" stroke-linecap="square"/>
<path d="M32.5091 152.025V152.893C32.5091 153.359 32.4674 153.752 32.3841 154.072C32.3007 154.393 32.1809 154.65 32.0247 154.846C31.8684 155.041 31.6796 155.183 31.4583 155.271C31.2395 155.357 30.9921 155.4 30.7161 155.4C30.4973 155.4 30.2955 155.373 30.1106 155.318C29.9257 155.264 29.7591 155.176 29.6106 155.057C29.4648 154.934 29.3398 154.775 29.2356 154.58C29.1315 154.385 29.052 154.148 28.9973 153.869C28.9427 153.59 28.9153 153.265 28.9153 152.893V152.025C28.9153 151.559 28.957 151.169 29.0403 150.854C29.1262 150.538 29.2473 150.286 29.4036 150.096C29.5598 149.903 29.7473 149.765 29.9661 149.682C30.1874 149.598 30.4348 149.557 30.7083 149.557C30.9296 149.557 31.1328 149.584 31.3177 149.639C31.5052 149.691 31.6718 149.775 31.8177 149.893C31.9635 150.007 32.0872 150.161 32.1887 150.354C32.2929 150.544 32.3723 150.777 32.427 151.053C32.4817 151.329 32.5091 151.653 32.5091 152.025ZM31.7825 153.01V151.904C31.7825 151.649 31.7669 151.425 31.7356 151.232C31.707 151.037 31.664 150.87 31.6067 150.732C31.5494 150.594 31.4765 150.482 31.388 150.396C31.302 150.311 31.2018 150.248 31.0872 150.209C30.9752 150.167 30.8489 150.146 30.7083 150.146C30.5364 150.146 30.3841 150.179 30.2512 150.244C30.1184 150.307 30.0065 150.407 29.9153 150.545C29.8268 150.683 29.7591 150.864 29.7122 151.088C29.6653 151.312 29.6419 151.584 29.6419 151.904V153.01C29.6419 153.265 29.6562 153.49 29.6848 153.686C29.7161 153.881 29.7617 154.05 29.8216 154.193C29.8815 154.334 29.9544 154.45 30.0403 154.541C30.1262 154.632 30.2252 154.7 30.3372 154.744C30.4518 154.786 30.5781 154.807 30.7161 154.807C30.8932 154.807 31.0481 154.773 31.1809 154.705C31.3137 154.637 31.4244 154.532 31.513 154.389C31.6041 154.243 31.6718 154.057 31.7161 153.83C31.7604 153.601 31.7825 153.327 31.7825 153.01ZM35.8964 149.604V155.322H35.1737V150.506L33.7167 151.037V150.385L35.7831 149.604H35.8964ZM41.1124 149.635V155.322H40.3585V149.635H41.1124ZM43.4952 152.193V152.811H40.9483V152.193H43.4952ZM43.8819 149.635V150.252H40.9483V149.635H43.8819ZM46.4216 155.4C46.1273 155.4 45.8604 155.351 45.6208 155.252C45.3838 155.15 45.1794 155.008 45.0075 154.826C44.8383 154.644 44.7081 154.428 44.6169 154.178C44.5258 153.928 44.4802 153.654 44.4802 153.357V153.193C44.4802 152.85 44.531 152.544 44.6325 152.275C44.7341 152.005 44.8721 151.775 45.0466 151.588C45.2211 151.4 45.419 151.258 45.6403 151.162C45.8617 151.066 46.0909 151.018 46.3278 151.018C46.6299 151.018 46.8903 151.07 47.1091 151.174C47.3305 151.278 47.5114 151.424 47.6521 151.611C47.7927 151.796 47.8969 152.015 47.9646 152.268C48.0323 152.518 48.0661 152.791 48.0661 153.088V153.412H44.9099V152.822H47.3435V152.768C47.3331 152.58 47.294 152.398 47.2263 152.221C47.1612 152.044 47.057 151.898 46.9138 151.783C46.7706 151.669 46.5752 151.611 46.3278 151.611C46.1638 151.611 46.0127 151.646 45.8747 151.717C45.7367 151.785 45.6182 151.886 45.5193 152.021C45.4203 152.157 45.3435 152.322 45.2888 152.518C45.2341 152.713 45.2068 152.938 45.2068 153.193V153.357C45.2068 153.558 45.2341 153.747 45.2888 153.924C45.3461 154.098 45.4281 154.252 45.5349 154.385C45.6443 154.518 45.7758 154.622 45.9294 154.697C46.0857 154.773 46.2627 154.811 46.4607 154.811C46.7159 154.811 46.932 154.758 47.1091 154.654C47.2862 154.55 47.4411 154.411 47.5739 154.236L48.0114 154.584C47.9203 154.722 47.8044 154.854 47.6638 154.979C47.5232 155.104 47.35 155.205 47.1443 155.283C46.9411 155.361 46.7002 155.4 46.4216 155.4ZM48.9886 149.322H49.7152V154.502L49.6527 155.322H48.9886V149.322ZM52.5706 153.174V153.256C52.5706 153.563 52.5342 153.848 52.4613 154.111C52.3883 154.372 52.2816 154.598 52.1409 154.791C52.0003 154.984 51.8284 155.133 51.6253 155.24C51.4222 155.347 51.1891 155.4 50.9261 155.4C50.6579 155.4 50.4222 155.355 50.2191 155.264C50.0185 155.17 49.8493 155.036 49.7113 154.861C49.5732 154.687 49.4626 154.476 49.3792 154.229C49.2985 153.981 49.2425 153.702 49.2113 153.393V153.033C49.2425 152.721 49.2985 152.441 49.3792 152.193C49.4626 151.946 49.5732 151.735 49.7113 151.561C49.8493 151.383 50.0185 151.249 50.2191 151.158C50.4196 151.064 50.6527 151.018 50.9183 151.018C51.1839 151.018 51.4196 151.07 51.6253 151.174C51.831 151.275 52.0029 151.421 52.1409 151.611C52.2816 151.801 52.3883 152.029 52.4613 152.295C52.5342 152.558 52.5706 152.851 52.5706 153.174ZM51.8441 153.256V153.174C51.8441 152.963 51.8245 152.765 51.7855 152.58C51.7464 152.393 51.6839 152.229 51.598 152.088C51.512 151.945 51.3988 151.833 51.2581 151.752C51.1175 151.669 50.9443 151.627 50.7386 151.627C50.5563 151.627 50.3975 151.658 50.262 151.721C50.1292 151.783 50.0159 151.868 49.9222 151.975C49.8284 152.079 49.7516 152.199 49.6917 152.334C49.6344 152.467 49.5915 152.605 49.5628 152.748V153.689C49.6045 153.872 49.6722 154.048 49.7659 154.217C49.8623 154.383 49.9899 154.52 50.1488 154.627C50.3102 154.734 50.5094 154.787 50.7464 154.787C50.9417 154.787 51.1084 154.748 51.2464 154.67C51.387 154.589 51.5003 154.479 51.5863 154.338C51.6748 154.197 51.7399 154.035 51.7816 153.85C51.8232 153.665 51.8441 153.467 51.8441 153.256Z" fill="black" fill-opacity="0.54"/>
</g>
<line x1="58.1499" y1="147.233" x2="58.1499" y2="146.411" stroke="black" stroke-opacity="0.5" stroke-width="0.5" stroke-linecap="square"/>
<g clip-path="url(#clip2_4182_11193)">
<line x1="75.8499" y1="147.233" x2="75.8499" y2="146.411" stroke="black" stroke-opacity="0.5" stroke-width="0.5" stroke-linecap="square"/>
<path d="M67.909 152.186V153.053C67.909 153.52 67.8673 153.913 67.784 154.233C67.7006 154.553 67.5808 154.811 67.4246 155.007C67.2683 155.202 67.0795 155.344 66.8582 155.432C66.6394 155.518 66.392 155.561 66.116 155.561C65.8972 155.561 65.6954 155.534 65.5105 155.479C65.3256 155.425 65.159 155.337 65.0105 155.218C64.8647 155.095 64.7397 154.936 64.6355 154.741C64.5314 154.546 64.4519 154.309 64.3972 154.03C64.3426 153.751 64.3152 153.426 64.3152 153.053V152.186C64.3152 151.72 64.3569 151.33 64.4402 151.014C64.5261 150.699 64.6472 150.447 64.8035 150.257C64.9597 150.064 65.1472 149.926 65.366 149.843C65.5873 149.759 65.8347 149.718 66.1082 149.718C66.3295 149.718 66.5327 149.745 66.7176 149.8C66.9051 149.852 67.0717 149.936 67.2176 150.053C67.3634 150.168 67.4871 150.322 67.5886 150.514C67.6928 150.705 67.7722 150.938 67.8269 151.214C67.8816 151.49 67.909 151.814 67.909 152.186ZM67.1824 153.171V152.065C67.1824 151.81 67.1668 151.586 67.1355 151.393C67.1069 151.198 67.0639 151.031 67.0066 150.893C66.9493 150.755 66.8764 150.643 66.7879 150.557C66.7019 150.471 66.6017 150.409 66.4871 150.37C66.3751 150.328 66.2488 150.307 66.1082 150.307C65.9363 150.307 65.784 150.34 65.6511 150.405C65.5183 150.468 65.4064 150.568 65.3152 150.706C65.2267 150.844 65.159 151.025 65.1121 151.249C65.0652 151.473 65.0418 151.745 65.0418 152.065V153.171C65.0418 153.426 65.0561 153.651 65.0847 153.846C65.116 154.042 65.1616 154.211 65.2215 154.354C65.2814 154.495 65.3543 154.611 65.4402 154.702C65.5261 154.793 65.6251 154.861 65.7371 154.905C65.8517 154.947 65.978 154.968 66.116 154.968C66.2931 154.968 66.448 154.934 66.5808 154.866C66.7136 154.798 66.8243 154.693 66.9129 154.55C67.004 154.404 67.0717 154.218 67.116 153.991C67.1603 153.762 67.1824 153.488 67.1824 153.171ZM69.976 152.284H70.4916C70.7442 152.284 70.9525 152.242 71.1166 152.159C71.2833 152.073 71.407 151.957 71.4877 151.811C71.571 151.663 71.6127 151.496 71.6127 151.311C71.6127 151.093 71.5762 150.909 71.5033 150.76C71.4304 150.612 71.321 150.5 71.1752 150.425C71.0293 150.349 70.8445 150.311 70.6205 150.311C70.4174 150.311 70.2377 150.352 70.0814 150.432C69.9278 150.51 69.8067 150.622 69.7182 150.768C69.6322 150.914 69.5892 151.086 69.5892 151.284H68.8666C68.8666 150.995 68.9395 150.732 69.0853 150.495C69.2312 150.258 69.4356 150.069 69.6986 149.928C69.9642 149.788 70.2715 149.718 70.6205 149.718C70.9642 149.718 71.265 149.779 71.5228 149.901C71.7807 150.021 71.9812 150.201 72.1244 150.44C72.2676 150.677 72.3392 150.973 72.3392 151.327C72.3392 151.47 72.3054 151.624 72.2377 151.788C72.1726 151.949 72.0697 152.1 71.9291 152.241C71.7911 152.382 71.6114 152.497 71.39 152.589C71.1687 152.677 70.903 152.721 70.5932 152.721H69.976V152.284ZM69.976 152.878V152.444H70.5932C70.9551 152.444 71.2546 152.487 71.4916 152.573C71.7286 152.659 71.9148 152.774 72.0502 152.917C72.1882 153.06 72.2846 153.218 72.3392 153.389C72.3965 153.559 72.4252 153.728 72.4252 153.897C72.4252 154.163 72.3796 154.399 72.2885 154.604C72.1999 154.81 72.0736 154.984 71.9096 155.128C71.7481 155.271 71.558 155.379 71.3392 155.452C71.1205 155.525 70.8822 155.561 70.6244 155.561C70.377 155.561 70.1439 155.526 69.9252 155.456C69.709 155.385 69.5176 155.284 69.351 155.151C69.1843 155.016 69.0541 154.85 68.9603 154.655C68.8666 154.457 68.8197 154.232 68.8197 153.979H69.5424C69.5424 154.177 69.5853 154.35 69.6713 154.499C69.7598 154.647 69.8848 154.763 70.0463 154.846C70.2103 154.927 70.403 154.968 70.6244 154.968C70.8458 154.968 71.0359 154.93 71.1947 154.854C71.3562 154.776 71.4799 154.659 71.5658 154.503C71.6543 154.346 71.6986 154.15 71.6986 153.913C71.6986 153.676 71.6491 153.482 71.5502 153.331C71.4512 153.177 71.3106 153.064 71.1283 152.991C70.9486 152.915 70.7364 152.878 70.4916 152.878H69.976ZM76.5123 149.796V155.483H75.7584V149.796H76.5123ZM78.8951 152.354V152.971H76.3482V152.354H78.8951ZM79.2818 149.796V150.413H76.3482V149.796H79.2818ZM81.8215 155.561C81.5272 155.561 81.2603 155.512 81.0207 155.413C80.7837 155.311 80.5793 155.169 80.4074 154.987C80.2382 154.805 80.108 154.589 80.0168 154.339C79.9257 154.089 79.8801 153.815 79.8801 153.518V153.354C79.8801 153.01 79.9309 152.705 80.0324 152.436C80.134 152.165 80.272 151.936 80.4465 151.749C80.621 151.561 80.8189 151.419 81.0402 151.323C81.2616 151.227 81.4908 151.178 81.7277 151.178C82.0298 151.178 82.2902 151.231 82.509 151.335C82.7304 151.439 82.9113 151.585 83.052 151.772C83.1926 151.957 83.2968 152.176 83.3645 152.428C83.4322 152.678 83.466 152.952 83.466 153.249V153.573H80.3098V152.983H82.7434V152.928C82.733 152.741 82.6939 152.559 82.6262 152.382C82.5611 152.205 82.4569 152.059 82.3137 151.944C82.1705 151.83 81.9751 151.772 81.7277 151.772C81.5637 151.772 81.4126 151.807 81.2746 151.878C81.1366 151.945 81.0181 152.047 80.9192 152.182C80.8202 152.318 80.7434 152.483 80.6887 152.678C80.634 152.874 80.6067 153.099 80.6067 153.354V153.518C80.6067 153.719 80.634 153.908 80.6887 154.085C80.746 154.259 80.828 154.413 80.9348 154.546C81.0442 154.678 81.1757 154.783 81.3293 154.858C81.4856 154.934 81.6626 154.971 81.8606 154.971C82.1158 154.971 82.3319 154.919 82.509 154.815C82.6861 154.711 82.841 154.572 82.9738 154.397L83.4113 154.745C83.3202 154.883 83.2043 155.014 83.0637 155.139C82.9231 155.264 82.7499 155.366 82.5442 155.444C82.341 155.522 82.1001 155.561 81.8215 155.561ZM84.3885 149.483H85.1151V154.663L85.0526 155.483H84.3885V149.483ZM87.9705 153.335V153.417C87.9705 153.724 87.9341 154.009 87.8612 154.272C87.7882 154.533 87.6815 154.759 87.5408 154.952C87.4002 155.145 87.2283 155.294 87.0252 155.401C86.8221 155.508 86.589 155.561 86.326 155.561C86.0578 155.561 85.8221 155.516 85.619 155.425C85.4185 155.331 85.2492 155.197 85.1112 155.022C84.9731 154.848 84.8625 154.637 84.7791 154.389C84.6984 154.142 84.6424 153.863 84.6112 153.553V153.194C84.6424 152.882 84.6984 152.602 84.7791 152.354C84.8625 152.107 84.9731 151.896 85.1112 151.721C85.2492 151.544 85.4185 151.41 85.619 151.319C85.8195 151.225 86.0526 151.178 86.3182 151.178C86.5838 151.178 86.8195 151.231 87.0252 151.335C87.231 151.436 87.4028 151.582 87.5408 151.772C87.6815 151.962 87.7882 152.19 87.8612 152.456C87.9341 152.719 87.9705 153.012 87.9705 153.335ZM87.244 153.417V153.335C87.244 153.124 87.2244 152.926 87.1854 152.741C87.1463 152.553 87.0838 152.389 86.9979 152.249C86.9119 152.106 86.7987 151.994 86.658 151.913C86.5174 151.83 86.3442 151.788 86.1385 151.788C85.9562 151.788 85.7974 151.819 85.6619 151.882C85.5291 151.944 85.4158 152.029 85.3221 152.135C85.2283 152.24 85.1515 152.359 85.0916 152.495C85.0343 152.628 84.9914 152.766 84.9627 152.909V153.85C85.0044 154.033 85.0721 154.208 85.1658 154.378C85.2622 154.544 85.3898 154.681 85.5487 154.788C85.7101 154.895 85.9093 154.948 86.1463 154.948C86.3416 154.948 86.5083 154.909 86.6463 154.831C86.7869 154.75 86.9002 154.639 86.9862 154.499C87.0747 154.358 87.1398 154.195 87.1815 154.01C87.2231 153.826 87.244 153.628 87.244 153.417Z" fill="black" fill-opacity="0.54"/>
</g>
<line x1="93.55" y1="147.233" x2="93.55" y2="146.411" stroke="black" stroke-opacity="0.5" stroke-width="0.5" stroke-linecap="square"/>
<g clip-path="url(#clip3_4182_11193)">
<line x1="111.25" y1="147.233" x2="111.25" y2="146.411" stroke="black" stroke-opacity="0.5" stroke-width="0.5" stroke-linecap="square"/>
<path d="M103.309 152.186V153.053C103.309 153.52 103.267 153.913 103.184 154.233C103.101 154.553 102.981 154.811 102.825 155.007C102.668 155.202 102.48 155.344 102.258 155.432C102.04 155.518 101.792 155.561 101.516 155.561C101.297 155.561 101.096 155.534 100.911 155.479C100.726 155.425 100.559 155.337 100.411 155.218C100.265 155.095 100.14 154.936 100.036 154.741C99.9315 154.546 99.8521 154.309 99.7974 154.03C99.7427 153.751 99.7154 153.426 99.7154 153.053V152.186C99.7154 151.72 99.757 151.33 99.8404 151.014C99.9263 150.699 100.047 150.447 100.204 150.257C100.36 150.064 100.547 149.926 100.766 149.843C100.987 149.759 101.235 149.718 101.508 149.718C101.73 149.718 101.933 149.745 102.118 149.8C102.305 149.852 102.472 149.936 102.618 150.053C102.764 150.168 102.887 150.322 102.989 150.514C103.093 150.705 103.172 150.938 103.227 151.214C103.282 151.49 103.309 151.814 103.309 152.186ZM102.583 153.171V152.065C102.583 151.81 102.567 151.586 102.536 151.393C102.507 151.198 102.464 151.031 102.407 150.893C102.349 150.755 102.277 150.643 102.188 150.557C102.102 150.471 102.002 150.409 101.887 150.37C101.775 150.328 101.649 150.307 101.508 150.307C101.336 150.307 101.184 150.34 101.051 150.405C100.918 150.468 100.807 150.568 100.715 150.706C100.627 150.844 100.559 151.025 100.512 151.249C100.465 151.473 100.442 151.745 100.442 152.065V153.171C100.442 153.426 100.456 153.651 100.485 153.846C100.516 154.042 100.562 154.211 100.622 154.354C100.682 154.495 100.754 154.611 100.84 154.702C100.926 154.793 101.025 154.861 101.137 154.905C101.252 154.947 101.378 154.968 101.516 154.968C101.693 154.968 101.848 154.934 101.981 154.866C102.114 154.798 102.224 154.693 102.313 154.55C102.404 154.404 102.472 154.218 102.516 153.991C102.56 153.762 102.583 153.488 102.583 153.171ZM105.235 152.776L104.657 152.628L104.943 149.796H107.86V150.464H105.556L105.384 152.01C105.488 151.951 105.62 151.895 105.778 151.843C105.94 151.79 106.125 151.764 106.333 151.764C106.596 151.764 106.832 151.81 107.04 151.901C107.249 151.99 107.426 152.117 107.571 152.284C107.72 152.451 107.833 152.651 107.911 152.885C107.989 153.12 108.028 153.382 108.028 153.671C108.028 153.944 107.991 154.195 107.915 154.425C107.842 154.654 107.732 154.854 107.583 155.026C107.435 155.195 107.247 155.327 107.021 155.421C106.797 155.514 106.532 155.561 106.228 155.561C105.999 155.561 105.781 155.53 105.575 155.468C105.372 155.402 105.19 155.305 105.028 155.175C104.87 155.042 104.739 154.878 104.638 154.682C104.539 154.484 104.476 154.253 104.45 153.987H105.138C105.169 154.201 105.232 154.38 105.325 154.526C105.419 154.672 105.541 154.783 105.693 154.858C105.846 154.931 106.025 154.968 106.228 154.968C106.4 154.968 106.552 154.938 106.685 154.878C106.818 154.818 106.929 154.732 107.021 154.62C107.112 154.508 107.181 154.372 107.228 154.214C107.277 154.055 107.302 153.876 107.302 153.678C107.302 153.499 107.277 153.332 107.228 153.178C107.178 153.025 107.104 152.891 107.005 152.776C106.909 152.662 106.79 152.573 106.65 152.51C106.509 152.445 106.347 152.413 106.165 152.413C105.923 152.413 105.739 152.445 105.614 152.51C105.492 152.576 105.366 152.664 105.235 152.776ZM111.912 149.796V155.483H111.159V149.796H111.912ZM114.295 152.354V152.971H111.748V152.354H114.295ZM114.682 149.796V150.413H111.748V149.796H114.682ZM117.222 155.561C116.927 155.561 116.66 155.512 116.421 155.413C116.184 155.311 115.979 155.169 115.808 154.987C115.638 154.805 115.508 154.589 115.417 154.339C115.326 154.089 115.28 153.815 115.28 153.518V153.354C115.28 153.01 115.331 152.705 115.433 152.436C115.534 152.165 115.672 151.936 115.847 151.749C116.021 151.561 116.219 151.419 116.44 151.323C116.662 151.227 116.891 151.178 117.128 151.178C117.43 151.178 117.69 151.231 117.909 151.335C118.13 151.439 118.311 151.585 118.452 151.772C118.593 151.957 118.697 152.176 118.765 152.428C118.832 152.678 118.866 152.952 118.866 153.249V153.573H115.71V152.983H118.144V152.928C118.133 152.741 118.094 152.559 118.026 152.382C117.961 152.205 117.857 152.059 117.714 151.944C117.571 151.83 117.375 151.772 117.128 151.772C116.964 151.772 116.813 151.807 116.675 151.878C116.537 151.945 116.418 152.047 116.319 152.182C116.22 152.318 116.144 152.483 116.089 152.678C116.034 152.874 116.007 153.099 116.007 153.354V153.518C116.007 153.719 116.034 153.908 116.089 154.085C116.146 154.259 116.228 154.413 116.335 154.546C116.444 154.678 116.576 154.783 116.729 154.858C116.886 154.934 117.063 154.971 117.261 154.971C117.516 154.971 117.732 154.919 117.909 154.815C118.086 154.711 118.241 154.572 118.374 154.397L118.811 154.745C118.72 154.883 118.604 155.014 118.464 155.139C118.323 155.264 118.15 155.366 117.944 155.444C117.741 155.522 117.5 155.561 117.222 155.561ZM119.789 149.483H120.515V154.663L120.453 155.483H119.789V149.483ZM123.371 153.335V153.417C123.371 153.724 123.334 154.009 123.261 154.272C123.188 154.533 123.082 154.759 122.941 154.952C122.8 155.145 122.628 155.294 122.425 155.401C122.222 155.508 121.989 155.561 121.726 155.561C121.458 155.561 121.222 155.516 121.019 155.425C120.819 155.331 120.649 155.197 120.511 155.022C120.373 154.848 120.263 154.637 120.179 154.389C120.099 154.142 120.043 153.863 120.011 153.553V153.194C120.043 152.882 120.099 152.602 120.179 152.354C120.263 152.107 120.373 151.896 120.511 151.721C120.649 151.544 120.819 151.41 121.019 151.319C121.22 151.225 121.453 151.178 121.718 151.178C121.984 151.178 122.22 151.231 122.425 151.335C122.631 151.436 122.803 151.582 122.941 151.772C123.082 151.962 123.188 152.19 123.261 152.456C123.334 152.719 123.371 153.012 123.371 153.335ZM122.644 153.417V153.335C122.644 153.124 122.625 152.926 122.586 152.741C122.546 152.553 122.484 152.389 122.398 152.249C122.312 152.106 122.199 151.994 122.058 151.913C121.918 151.83 121.744 151.788 121.539 151.788C121.356 151.788 121.198 151.819 121.062 151.882C120.929 151.944 120.816 152.029 120.722 152.135C120.628 152.24 120.552 152.359 120.492 152.495C120.434 152.628 120.392 152.766 120.363 152.909V153.85C120.405 154.033 120.472 154.208 120.566 154.378C120.662 154.544 120.79 154.681 120.949 154.788C121.11 154.895 121.309 154.948 121.546 154.948C121.742 154.948 121.908 154.909 122.046 154.831C122.187 154.75 122.3 154.639 122.386 154.499C122.475 154.358 122.54 154.195 122.582 154.01C122.623 153.826 122.644 153.628 122.644 153.417Z" fill="black" fill-opacity="0.54"/>
</g>
<line x1="128.95" y1="147.233" x2="128.95" y2="146.411" stroke="black" stroke-opacity="0.5" stroke-width="0.5" stroke-linecap="square"/>
<g clip-path="url(#clip4_4182_11193)">
<line x1="146.65" y1="147.233" x2="146.65" y2="146.411" stroke="black" stroke-opacity="0.5" stroke-width="0.5" stroke-linecap="square"/>
<path d="M138.709 152.186V153.053C138.709 153.52 138.667 153.913 138.584 154.233C138.501 154.553 138.381 154.811 138.225 155.007C138.068 155.202 137.88 155.344 137.658 155.432C137.439 155.518 137.192 155.561 136.916 155.561C136.697 155.561 136.495 155.534 136.311 155.479C136.126 155.425 135.959 155.337 135.811 155.218C135.665 155.095 135.54 154.936 135.436 154.741C135.331 154.546 135.252 154.309 135.197 154.03C135.143 153.751 135.115 153.426 135.115 153.053V152.186C135.115 151.72 135.157 151.33 135.24 151.014C135.326 150.699 135.447 150.447 135.604 150.257C135.76 150.064 135.947 149.926 136.166 149.843C136.387 149.759 136.635 149.718 136.908 149.718C137.13 149.718 137.333 149.745 137.518 149.8C137.705 149.852 137.872 149.936 138.018 150.053C138.163 150.168 138.287 150.322 138.389 150.514C138.493 150.705 138.572 150.938 138.627 151.214C138.682 151.49 138.709 151.814 138.709 152.186ZM137.982 153.171V152.065C137.982 151.81 137.967 151.586 137.936 151.393C137.907 151.198 137.864 151.031 137.807 150.893C137.749 150.755 137.676 150.643 137.588 150.557C137.502 150.471 137.402 150.409 137.287 150.37C137.175 150.328 137.049 150.307 136.908 150.307C136.736 150.307 136.584 150.34 136.451 150.405C136.318 150.468 136.206 150.568 136.115 150.706C136.027 150.844 135.959 151.025 135.912 151.249C135.865 151.473 135.842 151.745 135.842 152.065V153.171C135.842 153.426 135.856 153.651 135.885 153.846C135.916 154.042 135.962 154.211 136.022 154.354C136.081 154.495 136.154 154.611 136.24 154.702C136.326 154.793 136.425 154.861 136.537 154.905C136.652 154.947 136.778 154.968 136.916 154.968C137.093 154.968 137.248 154.934 137.381 154.866C137.514 154.798 137.624 154.693 137.713 154.55C137.804 154.404 137.872 154.218 137.916 153.991C137.96 153.762 137.982 153.488 137.982 153.171ZM143.397 149.796V150.202L141.042 155.483H140.28L142.631 150.389H139.553V149.796H143.397ZM147.312 149.796V155.483H146.558V149.796H147.312ZM149.695 152.354V152.971H147.148V152.354H149.695ZM150.082 149.796V150.413H147.148V149.796H150.082ZM152.622 155.561C152.327 155.561 152.06 155.512 151.821 155.413C151.584 155.311 151.379 155.169 151.207 154.987C151.038 154.805 150.908 154.589 150.817 154.339C150.726 154.089 150.68 153.815 150.68 153.518V153.354C150.68 153.01 150.731 152.705 150.832 152.436C150.934 152.165 151.072 151.936 151.247 151.749C151.421 151.561 151.619 151.419 151.84 151.323C152.062 151.227 152.291 151.178 152.528 151.178C152.83 151.178 153.09 151.231 153.309 151.335C153.53 151.439 153.711 151.585 153.852 151.772C153.993 151.957 154.097 152.176 154.165 152.428C154.232 152.678 154.266 152.952 154.266 153.249V153.573H151.11V152.983H153.543V152.928C153.533 152.741 153.494 152.559 153.426 152.382C153.361 152.205 153.257 152.059 153.114 151.944C152.971 151.83 152.775 151.772 152.528 151.772C152.364 151.772 152.213 151.807 152.075 151.878C151.937 151.945 151.818 152.047 151.719 152.182C151.62 152.318 151.543 152.483 151.489 152.678C151.434 152.874 151.407 153.099 151.407 153.354V153.518C151.407 153.719 151.434 153.908 151.489 154.085C151.546 154.259 151.628 154.413 151.735 154.546C151.844 154.678 151.976 154.783 152.129 154.858C152.286 154.934 152.463 154.971 152.661 154.971C152.916 154.971 153.132 154.919 153.309 154.815C153.486 154.711 153.641 154.572 153.774 154.397L154.211 154.745C154.12 154.883 154.004 155.014 153.864 155.139C153.723 155.264 153.55 155.366 153.344 155.444C153.141 155.522 152.9 155.561 152.622 155.561ZM155.189 149.483H155.915V154.663L155.853 155.483H155.189V149.483ZM158.771 153.335V153.417C158.771 153.724 158.734 154.009 158.661 154.272C158.588 154.533 158.482 154.759 158.341 154.952C158.2 155.145 158.028 155.294 157.825 155.401C157.622 155.508 157.389 155.561 157.126 155.561C156.858 155.561 156.622 155.516 156.419 155.425C156.218 155.331 156.049 155.197 155.911 155.022C155.773 154.848 155.663 154.637 155.579 154.389C155.498 154.142 155.442 153.863 155.411 153.553V153.194C155.442 152.882 155.498 152.602 155.579 152.354C155.663 152.107 155.773 151.896 155.911 151.721C156.049 151.544 156.218 151.41 156.419 151.319C156.62 151.225 156.853 151.178 157.118 151.178C157.384 151.178 157.62 151.231 157.825 151.335C158.031 151.436 158.203 151.582 158.341 151.772C158.482 151.962 158.588 152.19 158.661 152.456C158.734 152.719 158.771 153.012 158.771 153.335ZM158.044 153.417V153.335C158.044 153.124 158.024 152.926 157.985 152.741C157.946 152.553 157.884 152.389 157.798 152.249C157.712 152.106 157.599 151.994 157.458 151.913C157.317 151.83 157.144 151.788 156.939 151.788C156.756 151.788 156.597 151.819 156.462 151.882C156.329 151.944 156.216 152.029 156.122 152.135C156.028 152.24 155.952 152.359 155.892 152.495C155.834 152.628 155.791 152.766 155.763 152.909V153.85C155.804 154.033 155.872 154.208 155.966 154.378C156.062 154.544 156.19 154.681 156.349 154.788C156.51 154.895 156.709 154.948 156.946 154.948C157.142 154.948 157.308 154.909 157.446 154.831C157.587 154.75 157.7 154.639 157.786 154.499C157.875 154.358 157.94 154.195 157.982 154.01C158.023 153.826 158.044 153.628 158.044 153.417Z" fill="black" fill-opacity="0.54"/>
</g>
<line x1="164.35" y1="147.233" x2="164.35" y2="146.411" stroke="black" stroke-opacity="0.5" stroke-width="0.5" stroke-linecap="square"/>
<g clip-path="url(#clip5_4182_11193)">
<line x1="182.05" y1="147.233" x2="182.05" y2="146.411" stroke="black" stroke-opacity="0.5" stroke-width="0.5" stroke-linecap="square"/>
<path d="M174.109 152.186V153.053C174.109 153.52 174.067 153.913 173.984 154.233C173.901 154.553 173.781 154.811 173.625 155.007C173.469 155.202 173.28 155.344 173.058 155.432C172.84 155.518 172.592 155.561 172.316 155.561C172.097 155.561 171.896 155.534 171.711 155.479C171.526 155.425 171.359 155.337 171.211 155.218C171.065 155.095 170.94 154.936 170.836 154.741C170.732 154.546 170.652 154.309 170.597 154.03C170.543 153.751 170.515 153.426 170.515 153.053V152.186C170.515 151.72 170.557 151.33 170.64 151.014C170.726 150.699 170.847 150.447 171.004 150.257C171.16 150.064 171.347 149.926 171.566 149.843C171.788 149.759 172.035 149.718 172.308 149.718C172.53 149.718 172.733 149.745 172.918 149.8C173.105 149.852 173.272 149.936 173.418 150.053C173.564 150.168 173.687 150.322 173.789 150.514C173.893 150.705 173.972 150.938 174.027 151.214C174.082 151.49 174.109 151.814 174.109 152.186ZM173.383 153.171V152.065C173.383 151.81 173.367 151.586 173.336 151.393C173.307 151.198 173.264 151.031 173.207 150.893C173.15 150.755 173.077 150.643 172.988 150.557C172.902 150.471 172.802 150.409 172.687 150.37C172.575 150.328 172.449 150.307 172.308 150.307C172.136 150.307 171.984 150.34 171.851 150.405C171.719 150.468 171.607 150.568 171.515 150.706C171.427 150.844 171.359 151.025 171.312 151.249C171.265 151.473 171.242 151.745 171.242 152.065V153.171C171.242 153.426 171.256 153.651 171.285 153.846C171.316 154.042 171.362 154.211 171.422 154.354C171.482 154.495 171.554 154.611 171.64 154.702C171.726 154.793 171.825 154.861 171.937 154.905C172.052 154.947 172.178 154.968 172.316 154.968C172.493 154.968 172.648 154.934 172.781 154.866C172.914 154.798 173.025 154.693 173.113 154.55C173.204 154.404 173.272 154.218 173.316 153.991C173.36 153.762 173.383 153.488 173.383 153.171ZM175.84 154.878H175.914C176.331 154.878 176.67 154.819 176.93 154.702C177.19 154.585 177.391 154.427 177.532 154.229C177.672 154.031 177.769 153.809 177.821 153.561C177.873 153.311 177.899 153.055 177.899 152.792V151.921C177.899 151.663 177.869 151.434 177.809 151.233C177.752 151.033 177.671 150.865 177.567 150.729C177.465 150.594 177.349 150.491 177.219 150.421C177.089 150.35 176.951 150.315 176.805 150.315C176.638 150.315 176.489 150.349 176.356 150.417C176.226 150.482 176.115 150.574 176.024 150.694C175.935 150.814 175.868 150.955 175.821 151.116C175.774 151.277 175.75 151.453 175.75 151.643C175.75 151.813 175.771 151.977 175.813 152.135C175.855 152.294 175.918 152.438 176.004 152.565C176.09 152.693 176.197 152.794 176.325 152.87C176.455 152.943 176.607 152.979 176.782 152.979C176.943 152.979 177.094 152.948 177.235 152.885C177.378 152.82 177.504 152.733 177.614 152.624C177.726 152.512 177.814 152.385 177.879 152.245C177.947 152.104 177.986 151.957 177.996 151.803H178.34C178.34 152.02 178.297 152.233 178.211 152.444C178.128 152.652 178.011 152.843 177.86 153.014C177.709 153.186 177.532 153.324 177.329 153.428C177.125 153.53 176.904 153.581 176.664 153.581C176.383 153.581 176.14 153.526 175.934 153.417C175.728 153.307 175.559 153.162 175.426 152.979C175.296 152.797 175.198 152.594 175.133 152.37C175.071 152.143 175.039 151.914 175.039 151.682C175.039 151.412 175.077 151.158 175.153 150.921C175.228 150.684 175.34 150.475 175.489 150.296C175.637 150.113 175.821 149.971 176.039 149.87C176.261 149.768 176.516 149.718 176.805 149.718C177.131 149.718 177.408 149.783 177.637 149.913C177.866 150.043 178.052 150.218 178.196 150.436C178.342 150.655 178.448 150.901 178.516 151.175C178.584 151.448 178.618 151.729 178.618 152.018V152.28C178.618 152.574 178.598 152.874 178.559 153.178C178.523 153.481 178.451 153.77 178.344 154.046C178.24 154.322 178.088 154.569 177.887 154.788C177.687 155.004 177.425 155.176 177.102 155.303C176.782 155.428 176.386 155.491 175.914 155.491H175.84V154.878ZM182.713 149.796V155.483H181.959V149.796H182.713ZM185.095 152.354V152.971H182.548V152.354H185.095ZM185.482 149.796V150.413H182.548V149.796H185.482ZM188.022 155.561C187.727 155.561 187.46 155.512 187.221 155.413C186.984 155.311 186.78 155.169 186.608 154.987C186.438 154.805 186.308 154.589 186.217 154.339C186.126 154.089 186.08 153.815 186.08 153.518V153.354C186.08 153.01 186.131 152.705 186.233 152.436C186.334 152.165 186.472 151.936 186.647 151.749C186.821 151.561 187.019 151.419 187.24 151.323C187.462 151.227 187.691 151.178 187.928 151.178C188.23 151.178 188.49 151.231 188.709 151.335C188.931 151.439 189.112 151.585 189.252 151.772C189.393 151.957 189.497 152.176 189.565 152.428C189.632 152.678 189.666 152.952 189.666 153.249V153.573H186.51V152.983H188.944V152.928C188.933 152.741 188.894 152.559 188.826 152.382C188.761 152.205 188.657 152.059 188.514 151.944C188.371 151.83 188.175 151.772 187.928 151.772C187.764 151.772 187.613 151.807 187.475 151.878C187.337 151.945 187.218 152.047 187.119 152.182C187.02 152.318 186.944 152.483 186.889 152.678C186.834 152.874 186.807 153.099 186.807 153.354V153.518C186.807 153.719 186.834 153.908 186.889 154.085C186.946 154.259 187.028 154.413 187.135 154.546C187.244 154.678 187.376 154.783 187.53 154.858C187.686 154.934 187.863 154.971 188.061 154.971C188.316 154.971 188.532 154.919 188.709 154.815C188.886 154.711 189.041 154.572 189.174 154.397L189.612 154.745C189.52 154.883 189.405 155.014 189.264 155.139C189.123 155.264 188.95 155.366 188.744 155.444C188.541 155.522 188.3 155.561 188.022 155.561ZM190.589 149.483H191.315V154.663L191.253 155.483H190.589V149.483ZM194.171 153.335V153.417C194.171 153.724 194.134 154.009 194.061 154.272C193.988 154.533 193.882 154.759 193.741 154.952C193.6 155.145 193.429 155.294 193.225 155.401C193.022 155.508 192.789 155.561 192.526 155.561C192.258 155.561 192.022 155.516 191.819 155.425C191.619 155.331 191.449 155.197 191.311 155.022C191.173 154.848 191.063 154.637 190.979 154.389C190.899 154.142 190.843 153.863 190.811 153.553V153.194C190.843 152.882 190.899 152.602 190.979 152.354C191.063 152.107 191.173 151.896 191.311 151.721C191.449 151.544 191.619 151.41 191.819 151.319C192.02 151.225 192.253 151.178 192.518 151.178C192.784 151.178 193.02 151.231 193.225 151.335C193.431 151.436 193.603 151.582 193.741 151.772C193.882 151.962 193.988 152.19 194.061 152.456C194.134 152.719 194.171 153.012 194.171 153.335ZM193.444 153.417V153.335C193.444 153.124 193.425 152.926 193.386 152.741C193.347 152.553 193.284 152.389 193.198 152.249C193.112 152.106 192.999 151.994 192.858 151.913C192.718 151.83 192.544 151.788 192.339 151.788C192.156 151.788 191.998 151.819 191.862 151.882C191.729 151.944 191.616 152.029 191.522 152.135C191.429 152.24 191.352 152.359 191.292 152.495C191.235 152.628 191.192 152.766 191.163 152.909V153.85C191.205 154.033 191.272 154.208 191.366 154.378C191.462 154.544 191.59 154.681 191.749 154.788C191.91 154.895 192.11 154.948 192.347 154.948C192.542 154.948 192.708 154.909 192.847 154.831C192.987 154.75 193.1 154.639 193.186 154.499C193.275 154.358 193.34 154.195 193.382 154.01C193.423 153.826 193.444 153.628 193.444 153.417Z" fill="black" fill-opacity="0.54"/>
</g>
<circle cx="41" cy="73.1611" r="3" fill="#2196F3"/>
<circle cx="59" cy="53" r="3" fill="#2196F3"/>
<circle cx="77" cy="81.1611" r="3" fill="#4CAF50"/>
<circle cx="95" cy="87" r="3" fill="#4CAF50"/>
<circle cx="41" cy="113.161" r="3" fill="#4CAF50"/>
<circle cx="59" cy="93" r="3" fill="#4CAF50"/>
<circle cx="112" cy="90.1611" r="3" fill="#4CAF50"/>
<circle cx="148" cy="81.1611" r="3" fill="#4CAF50"/>
<circle cx="130" cy="103" r="3" fill="#4CAF50"/>
<circle cx="183" cy="121.161" r="3" fill="#4CAF50"/>
<circle cx="166" cy="109" r="3" fill="#4CAF50"/>
<circle cx="77" cy="37" r="3" fill="#2196F3"/>
<circle cx="95" cy="39" r="3" fill="#2196F3"/>
<circle cx="112" cy="19.1611" r="3" fill="#2196F3"/>
<circle cx="148" cy="37" r="3" fill="#2196F3"/>
<circle cx="130" cy="44" r="3" fill="#2196F3"/>
<circle cx="183" cy="23" r="3" fill="#2196F3"/>
<circle cx="166" cy="44" r="3" fill="#2196F3"/>
<circle cx="77" cy="72" r="3" fill="#FFC107"/>
<circle cx="95" cy="55" r="3" fill="#FFC107"/>
<circle cx="112" cy="66.1611" r="3" fill="#FFC107"/>
<circle cx="148" cy="51.1611" r="3" fill="#FFC107"/>
<circle cx="130" cy="72" r="3" fill="#FFC107"/>
<circle cx="183" cy="81" r="3" fill="#FFC107"/>
<circle cx="166" cy="59" r="3" fill="#FFC107"/>
<circle cx="28" cy="89" r="3" fill="#FFC107"/>
<circle cx="41" cy="97" r="3" fill="#FFC107"/>
<circle cx="59" cy="68.5781" r="3" fill="#FFC107"/>
<circle cx="28" cy="118.161" r="3" fill="#2196F3"/>
<circle cx="28" cy="129.489" r="3" fill="#4CAF50"/>
</g>
<defs>
<clipPath id="clip0_4182_11193">
<rect width="200" height="160" fill="white"/>
</clipPath>
<clipPath id="clip1_4182_11193">
<rect width="35.4" height="10" fill="white" transform="translate(23 146.161)"/>
</clipPath>
<clipPath id="clip2_4182_11193">
<rect width="35.4" height="10.322" fill="white" transform="translate(58.3999 146.161)"/>
</clipPath>
<clipPath id="clip3_4182_11193">
<rect width="35.4" height="10.322" fill="white" transform="translate(93.8 146.161)"/>
</clipPath>
<clipPath id="clip4_4182_11193">
<rect width="35.4" height="10.322" fill="white" transform="translate(129.2 146.161)"/>
</clipPath>
<clipPath id="clip5_4182_11193">
<rect width="35.4" height="10.322" fill="white" transform="translate(164.6 146.161)"/>
</clipPath>
</defs>
</svg>
",
+  "description": "Displays changes to time-series data over time—for example, temperature or humidity readings.",
+  "descriptor": {
+    "type": "timeseries",
+    "sizeX": 8,
+    "sizeY": 5,
+    "resources": [],
+    "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        chartType: 'point',\n        previewWidth: '80%',\n        embedTitlePanel: true,\n        hasAdditionalLatestDataKeys: true,\n        dataKeySettingsFunction: TbTimeSeriesChart.dataKeySettings('point'),\n        defaultDataKeysFunction: function() {\n            return [{ name: 'temperature', label: 'Temperature', type: 'timeseries', units: '°C', decimals: 0 }];\n        }\n    };\n}\n",
+    "settingsSchema": "{}",
+    "dataKeySettingsSchema": "{}",
+    "latestDataKeySettingsSchema": "{}",
+    "settingsDirective": "tb-time-series-chart-widget-settings",
+    "dataKeySettingsDirective": "tb-time-series-chart-key-settings",
+    "latestDataKeySettingsDirective": "",
+    "hasBasicMode": true,
+    "basicModeDirective": "tb-time-series-chart-basic-config",
+    "defaultConfig": "{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"First\",\"color\":\"#2196f3\",\"settings\":{\"showInLegend\":true,\"dataHiddenByDefault\":false,\"type\":\"line\",\"lineSettings\":{\"showLine\":false,\"step\":false,\"stepType\":\"start\",\"smooth\":false,\"lineType\":\"solid\",\"lineWidth\":2,\"showPoints\":true,\"showPointLabel\":false,\"pointLabelPosition\":\"top\",\"pointLabelFont\":{\"family\":\"Roboto\",\"size\":11,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"1\"},\"pointLabelColor\":\"rgba(0, 0, 0, 0.76)\",\"pointShape\":\"circle\",\"pointSize\":8,\"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)\",\"backgroundSettings\":{\"type\":\"none\",\"opacity\":0.4,\"gradient\":{\"start\":100,\"end\":0}}}},\"_hash\":0.8587686344902596,\"funcBody\":\"var value = prevValue + Math.random() * 100 - 50;\\nvar multiplier = Math.pow(10, 2 || 0);\\nvar value = Math.round(value * multiplier) / multiplier;\\nif (value < -1000) {\\n\\tvalue = -1000;\\n} else if (value > 1000) {\\n\\tvalue = 1000;\\n}\\nreturn value;\",\"aggregationType\":null,\"units\":null,\"decimals\":null,\"usePostProcessing\":null,\"postFuncBody\":null},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Second\",\"color\":\"#FFC107\",\"settings\":{\"showInLegend\":true,\"dataHiddenByDefault\":false,\"type\":\"line\",\"lineSettings\":{\"showLine\":false,\"step\":false,\"stepType\":\"start\",\"smooth\":false,\"lineType\":\"solid\",\"lineWidth\":2,\"showPoints\":true,\"showPointLabel\":false,\"pointLabelPosition\":\"top\",\"pointLabelFont\":{\"family\":\"Roboto\",\"size\":11,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"1\"},\"pointLabelColor\":\"rgba(0, 0, 0, 0.76)\",\"pointShape\":\"circle\",\"pointSize\":8,\"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)\",\"backgroundSettings\":{\"type\":\"none\",\"opacity\":0.4,\"gradient\":{\"start\":100,\"end\":0}}}},\"_hash\":0.5534217244004682,\"funcBody\":\"var value = prevValue + Math.random() * 100 - 50;\\nvar multiplier = Math.pow(10, 2 || 0);\\nvar value = Math.round(value * multiplier) / multiplier;\\nif (value < -1000) {\\n\\tvalue = -1000;\\n} else if (value > 1000) {\\n\\tvalue = 1000;\\n}\\nreturn value;\",\"aggregationType\":null,\"units\":null,\"decimals\":null,\"usePostProcessing\":null,\"postFuncBody\":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\":\"AVG\",\"limit\":25000},\"timezone\":null},\"showTitle\":true,\"backgroundColor\":\"rgba(0, 0, 0, 0)\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"showLegend\":true,\"legendConfig\":{\"direction\":\"column\",\"position\":\"top\",\"sortDataKeys\":false,\"showMin\":false,\"showMax\":false,\"showAvg\":true,\"showTotal\":false,\"showLatest\":false},\"thresholds\":[],\"dataZoom\":true,\"stack\":false,\"yAxis\":{\"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)\",\"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)\"},\"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)\"},\"legendLabelFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"16px\"},\"legendLabelColor\":\"rgba(0, 0, 0, 0.76)\",\"showTooltip\":true,\"tooltipTrigger\":\"axis\",\"tooltipValueFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"500\",\"lineHeight\":\"16px\"},\"tooltipValueColor\":\"rgba(0, 0, 0, 0.76)\",\"tooltipShowDate\":true,\"tooltipDateFormat\":{\"format\":null,\"lastUpdateAgo\":false,\"custom\":false,\"auto\":true,\"autoDateFormatSettings\":{}},\"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,\"background\":{\"type\":\"color\",\"color\":\"#fff\",\"overlay\":{\"enabled\":false,\"color\":\"rgba(255,255,255,0.72)\",\"blur\":3}},\"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\":null,\"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}},\"noAggregationBarWidthSettings\":{\"strategy\":\"group\",\"groupWidth\":{\"relative\":true,\"relativeWidth\":2,\"absoluteWidth\":1000},\"barWidth\":{\"relative\":true,\"relativeWidth\":2,\"absoluteWidth\":1000}},\"animation\":{\"animation\":true,\"animationThreshold\":2000,\"animationDuration\":500,\"animationEasing\":\"cubicOut\",\"animationDelay\":0,\"animationDurationUpdate\":300,\"animationEasingUpdate\":\"cubicOut\",\"animationDelayUpdate\":0},\"padding\":\"12px\"},\"title\":\"Point 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\"}"
+  },
+  "tags": [
+    "chart",
+    "time series",
+    "time-series",
+    "point",
+    "point chart"
+  ]
+}
\ No newline at end of file
diff --git a/application/src/main/data/json/system/widget_types/polar_area.json b/application/src/main/data/json/system/widget_types/polar_area.json
index 4cc516321c..8d4a0b24a6 100644
--- a/application/src/main/data/json/system/widget_types/polar_area.json
+++ b/application/src/main/data/json/system/widget_types/polar_area.json
@@ -1,25 +1,28 @@
 {
-  "fqn": "charts.polar_area_chart_js",
-  "name": "Polar Area",
+  "fqn": "polar_area",
+  "name": "Polar area",
   "deprecated": false,
-  "image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAACgCAIAAADGnbT+AAAABmJLR0QA/wD/AP+gvaeTAAAYvUlEQVR42u2deXAU15nA+W+zm73/yV7Zqq09aje7SeXY2kocZ7cSH7GdxCG+cJxybHw7Xt/4WB+AY8CAMeEGc4MNAgcMxhgB5r4RkpAAHYCEDoRu0DX31fuTejyaEWjm9fTr7tejefWKksRMT/f3fvO+733He6O0fMs3C9qovAgytlgs5vf7Ez+3tbX19fXlxZIHK/sWjUYLCgqmTZtWVFSkUzVr1qxVq1ZNnz79yJEjefnkwcqy7d+/f8OGDfCk/1pdXb18+XJ+8Pl8EydOzMsnD1aWberUqZ9//jlTVElJCb8ePHhw27Zt+n+98cYbkUgkL6I8WNm0cePGbd++vbm5+Z133jl//vzu3bt37Nih/9f48eMThle+5cEa1jwPBAI9PT0dHR2XLl1K/P2VV17Rf9i3b19hYeGhQ4e2bt2amLGwwPSfeQtv7O3t5SIJvZkHa4SS5PF4WN/V19djOZWVlVVUVDAnNTQ0tLS0JF6Gqc5f+AFL6+jRoxcuXFiwYAG/guCkSZMSL+MtvIy3cxEuxQX5lYvzESOWs1EjDSb02rlz5xj+qqqqxsbGzs5Or9ebmHuGtKampilTpsydO3fevHnhcJi/rFy5cvbs2ZMnTz59+vRwC0k+hctycT6CD+Lj+NCRBlnug8VIX7lypa6urry8nJFGbaGzDNndKLjkX0OhkDgifBDTGx/KR3MD3AY3MxzHebDcMT91dXWhvBjOmpoaphCAcPaWuAFug5vRCeP2cngOy0GwmGCYIU6dOoUOYiAVdAqgVbkxbg99yq0OmRHzYCnX0HHMByCFbeSK0eImuVVumNvm5vNgKaf1Ll++jBFTWVnJTOA6/cINc9vcPI+ABZYHS4nGSDAkqBVsZLc/C49w9uxZHgfzKw+Wk4qPrzgjkWNKBLzwhPFors6hcCVYmCa1tbV4I3Pgmz1c49HOnDnDqjYYDObBssMcwc2Ntdva2prz/kbcXTwmD8sju+5h3QQWzmvsDxZQVnyJGbjO7p6K2oY9RWUFhXsXrN8yfeVHExeufmnm4t9MnpP8ytf3BaYdDS4qDa6rDBXWhsvaIt0BC0cd7xfzFg/O4+fBkj9RsSzH6yNX93X19p2oOAtGk5aseey3v3vwzXeH68nv+ocFfVf3by/33LnR99KewMpToVPt0Yhs1zprFN3p5ZapywVgkZ2CMcu3Vo/WmWzhSOT0+boPtu5iKkpDklGwhvSvLe4bs9k343iwpDUSlUQCj49liVFPmmEeLLMNBw9GBv+aHpXI8dPV89dteXLSbHGesgYruf/nCs/LewI7LoT9Er4XGvk5CAS/XR6s7NUfCQLYFibz6S61d360c//TU+dnwZMUsBL960s9r+0LFLeYDTEhEFbEFy9eVFktKgoWFisOKtRf1pE+hM4U9daiD8zwJBesRL9tvXf16ZDPxASGWBAOIpJiHowUsPhG4sJhpZ21FXWg5NSrs5ZKQcoKsPT+nRWeecXBHhMrStwQCErNDGnlwMKNjg2RXcgsGo3tKy5/YcYiiUhZB1ZCP04/FuzKFi+WyYhLwXCWWmDpYsoulFF5oWH8/FXSkbIaLL1/c5lnYWkwlJWTAnEhNNWCEAqBpbtqslhLt1/pnr1mk0VI2QOW3m8q8O5tyMamRBsiOqWWiqqAhUMhC3OBVdHeE+WPvz3LUqpsA0vvD33mb/XEsmALAZr3y+QUWHzVEIrR1LzOrp7pK9ZbjZT9YOma8eOzhpd7CBAxKpLR5TxYGAdM40bnqiNlFdm5Ol0Blt6f3uk3GoWELYSpAlsOg6WvAQ3ZVcT8cXjahpSDYNG/v9pT3mbMpEeYWS+AcgQsZimjIrjS00fA2GaqHASL/q/v931UZay+SF8nOhtSdAwsfOsYBIYWMrUXm5+ZNt9+qpwFS+8TDgQiRrQi2hDxOuiXdwYs4i2EI5KL2TM2UhJsWP0pCxb98UJ/wIgvAvEiZKfiic6ARXSZDBDx1xdXnHvkrZlOUaUIWHRScXqDBkAhnkiseqSApZc6iUeXdx0rHTt+hoNUqQOWHsBu9xoo8CcPwhHHqd1g6Qa7uHPh0MkzY8e/6yxVSoFFv2Gtt8MXMyRw+8t3bQULfU8uqLh3mLzhhybMcJwq1cCi/+z3XnGdSG4gYrfZ2LIVLPLW0fri1vojE2eqQJWCYNFJsfeGRFnBok3eUC6nwKLIBKew4AL4QlNL+uqGPFj0sVt9gj4IxI7w2Qks18BiHhavHO/u8zz/7iJ1qFIWLPo7R0Qr4fBsUYhhm0K0CSy2tBP0L1D1MGnxGqWoUhks+ibhcDVDkHVeropgsSRhYSK479myTdtVo0pxsIj5UDQrIlsKfRkIe2r27QBL/ItypLxSQaoUB4v+vdUewTwI3PHi6yelwSJ/AR+diGq/0tP71JS5ebCy6y/uFnINkhtCDNGG3AfLwcJgFLHZIW/q8nVqUuUKsOjbaoSMLYYDt5a7wWIlIvgMhYeKlKXKLWCxf4RgTjOD0t3d7VawdBeDyK5ol7t7HcxcyBmw6E/tEFKIlIsxNG4Fi9gnOziKvHLeuk9UpspFYNH3NwqtEMmosTSD2UKwsK5ECikraxsUp8pdYN1c4A1HhSYtSy0tq8BCA4pMtpFI9LU5y/Ngye1Ly4RchgyQdctDq8Bi3z2RNCAq4tWnynVgfWOpR2RLCP2YDDeBpbvaM/qumK4M7X6WB0u8zzqR2b2OT8u6VC1LwLo00DK+jD1hXEGVG8ESnLRIZLIonUY+WExUZGhk/B6wM4zcnYbyYA3pc4uDIrqFwbIi5UE+WDh2RbwMR1UNC+YMWN9a5hHJBGSwrHCWygeLGKdI8vHkpWvzYFndRSpdSVzmjDvVwcIe5DC+jBU4zR2XVSiRyHmwRm/IXAxNcilDJv1sTslg4cwVWcGu2bbbRVS5Fyz66fbMxHCatfR92ySDxaSaUQ+GwmFl02NyDyzO0XBEG8oEi8WFSKZofxFY3UUmLSs2C82DlejXrfb89lCgtDVz6JAhY+DUBYs6HOKDxjxe7Z2b9xx+dfayPFiy+vUf9PPEbvKGXAiEd+TW8MgEi4qJrL1t9c1tG3cdVDZuqD5Y7F/63vFgRUeWNjieUkN7tNgKFh4R82dSslPtzqMlOCOUWjYqC9bN67xEb0Qs9IzJDpjwKoKF5VRWVpZ5q4+eI1rpD7SOzVooQ4i6o0shwlQDS+eptkuaj4CBw+kg0QUvDSxRA6thirb/D+K96D+05qVaqC39O8gvhTBOD3xownsjGax/XNi/ZQM81XfLPrTui/w5iWaWNLDa2trY9Srz607dOgjWIGH/rrWu1ELt6d/a5/UdLquY9eHHD098b+SA9U8L++7e5FtxKpTFHt2GGsPX3t6uHFj19fWZIzmxoHboL68BVqIf/xetabbmz1D45vH5dcJs2zXEfrASPInvhmWy4c1qaGhQDiyhibT7cDqqkvuRv9MaZ2oBnjOdWL3+QNGZ6iUbt1ldi2EbWJQ1P7LNzybvIkkv7NYnsawZY0ZisrIcsHTLPXO8qWm+KFiJfvgr/WZZ/xyWTtDBULisugbCLNr83Wqw/m1xnKc+IztBisQ5DNnvDKIs+10OWKT1UO4s4JB4yjBYiX7wT7Tzz2h95Vosmj5eBGErP9lh8uRLe8C6/gMv+ekNPbFQJJvhhCq5oZgszgexFixRL0jZD7MHa5CwP9Vqx2meM+kJI5HwXEMTgaNnpy1QDawfrvGurwp1+szODehB0vRU80TKBEvU7jv81xLAGuxf7p/Deo5rsZAIYc9NX+gsWD9a6y2oCHX4ZBrjOJ8kbubOIMrSrXLAIpKTOSAQbJFKVXL/klZ5f7/rNS1hWA91l1oJTb78uyV2gjV6o3f7hXBXwJLFHXWnGN2yrsYgEpdTCCx8DZmLvXpPWAZWUj9zl9a9X4sG5Aa/swDr3s2+XfVhT8haZ4GQl8eI0cYFFQKL5L7MRc+dW+0AK9HLbuoPHEV6RQibuHC1LLAe+NS/tyHsC2fg6UJ33YeVa2cUzzQpeTYek1hmQ/K7oYMdLAcL/0dmJ1bLclvBSvTym/qZjmQo+U0f/M4I1qOF/mOXIsFMkdLG3sa1Veue2PXUTzeNpt+5ZYzJ5T2Zn7JQ0F1Z6FaFwMLXkHmZWj/JGbASvfR6keA352teTdhwYOk8pT/LGXTOd9XA02OfP6nzlNybPc2KoGDAbWQbWOQfZl6b1LzgMFiJfuJbWusHWiiDacIOg5wLTOCI4Hfy3/95Ud+bB/ozM9PvvRGNRSs7qxafWvpA4cNX85ToR5uPmZE8Z8cZTa5M5wUMhWT5L+SAJVKZo537X1XASg5+t2QOfrM9eCox6V4cjoaLW0vnlM6/77Nfp+Ep0bfUbDXpysKrKdH5zlAqBJZQPOfsE8qBlRz8vrRAC2R/UFYwEjrWfPy94lljtv5KhKdE33DuYzOSR1FITFdnEBlKhcA6efJkZiO0+mF1wRoMTf6VSGgyiadgUcuJmcWz7/n0PkM8JXpB1XozkkfsCF8WWBKvZiNYVQ+4AKzk4HfjNM1fd03CPCHvnsZ9k49NvWPLPdnxlOgrK1bnwTKnCqsedBNYid53DdVQ23XBJE+JvqaqIK8KzRnvxPVcR1XdxOGepqB6nRSwdtTvzBvv5twNF95wGVXF3+E7PKgmWi7Rk7XGM3ueNw8WS8i8u8Gcg7RhqqvA+nKKKzUS8T39sO83D2pJ3x9PyDP6k7tMglXfYyobOMcdpEIx9ksL3QTWlRQNFVw633PDf9GDyxYk/724rcQMVXdsuRs/RT6kM7xTXSQI3bHRNVThGUm2PMpLPDd9VwfLc+N3IyXHk/937sn5WYP12sE3TUo+x4PQQmkzfaXuoOro3yfndcW6u7z33BanaqB777oldmXwYSOxSPqgTZpOANG85HM5bUYo0S/c5Q6w+n1Xgya6/80Xk6nSu///ntOS/HbtvvbswDrdYXZBl+OJfsKpyV9RnaqWFSmrpI3rrqZK76GPUyabHfWfG6Xqwe2PRGNma5pzPDVZtJii5HtKU1V+W7KfPVpX47ntB8OB5bnl+uj5lCq88YffMhbMqV5vUuy5X0whukw9+7i6VB38Cy2SpFP8Pt/Ye4alaqD7fn1nLCm9MRAJ3P3pLwWp+vnmOzv9ZucGiSaR3vC1yqqAtbdgtXmxwqGbFEdlYMak9FTpPfDe5JTgQleNIFjTimaYF7sVBauyriatxJ7s5MxWZF+JqqGbCSnLjP27RajSe3j3jtRQz/qMVOFWNZk4qjf0oNwSe4m+VmlgYfdhwmea2ULawT9TjqoT30yufY21t3pH3ygOlvf2Hw0J9Ty95zlLMxriutrvlxgl1JTdFER0G6OT/6MYWH+khTpSQjfPPCJOVdzYempscqinN9h7+yd3DEfV/YUP+sI+8wLHNcCmIBLBUnQbI6p0hKKhjpdUDOmXt6ess5YvNEpVPNSzfFHydU60Fl+Tqp9t/kVpm5yEJ1ZLcrejlbu/re1bRdpTtioauhmbGropHQzdGO2EekqLkq825+S8q8FaV/2RLHtIVrQ42XJXcatIYS9ItH/vK1VCN4OWb6y31/vL27OkSje2xvyE+M/gUEWHhnreOvq2rJFDbREllDh26m5uq4lvx61IKunQ0M04M1TFQz2vpYR62ryDoZ6XDrzqDctRNPoBlhLXg5ri23GL7m/bucV5qpqXpYRuNq03T1U81LMpRdkV1m2HqlcOvCbFYE+skzhiTZPalD5AQPDIk34FdORvHA3d3JIauqlNF7ox2gn11KQc1/hhZQFOeYlCxn0lFwLVjzwx4As+/6wqoZtg0PfofdKo0r0PD43RAn7Nmoa3SfoJ4VxTbmhIc+pYOa23yDGweotTQjczp8ilKh7q+d07VlDFdIVTVGKeTPxrrv6xcvpBmEKJHPi77afqQkrGZvjgHiuoiod69uyUDhbWlfTpyh0HYRrQhpjPDodu2gyFbgx7H35+Q6ylWaJgdUtI1uazyXrQBUf3asKHjWtRv3b0qzaC9Ycpm3/Eov4XnrCOqrj34dlHtUhElmBZCcpK70xuBJ7dcdi4vmwhRJr5pQ2T7QOrc1tK6Gbl+1ZTFQ/1rFosRap4nnG1S1dYDBODJdHhbiFY2kAKPA43gcm9M8MJKBaFbk6dzD50k02o54R5MwibXVZu5xC/qBWzoFVgYQdgDQh9D0iEsjx089WhoZv7breJKt3YuvensR5TuoaSLIk1XkM8+NKNNgvB0gYqDYVMeDaftdrSSj3yyT/+JTup+iLU87yWrbphJYgZZIW2wmyXWOxqE1jM20QJxKbjeRZS1TQnRfd+8nv7qYqHerZsyC5KJjdNdEgYp6+vz2VgaQPngWUuj9YG0kqLvmZN6OZmC0M3RvutQ0M9IhYFVAnJ0HhjJSjxrC9bwcILL5pDTbad/NDNn6dswW1B6MZwqOfhe8VDPXitMNgl1kpc7WWQ7m23CSwDk5ZmwX5/vSlpd4FZU52lKu59mDVNRBik3SE6uRlXQ6YriZsfOQAW3wnR+RbXg8SUh9pXU8bp4F4VqIqHevbuzEgVHma5+exDGoNihVPUPrD0SUt0ym1bKyl0842hoZtf3KQOWP2hntaWNBoQiVlKFSaKpdaVTWCx7sBWEHUZS1CIhG7aUkI3Lz6pDlVx78Nzj2nXEoheUG6RxzLhu2I4rFsM2geWHuQSNRcwt5lvTIVuUvbjD61aohpVce/DqiXX9Cxk3g3KXINaK0LOzoCFG0YoszQu4NP9uXjZUVX5qxRKT5fZF7rJItRzcjAzDP+n0OZ1MgbCIq+YA2BpA9WVBhKJsjsnbEjops/u0I3JUI8VvvWrQ0PWrTSdAQupYZNiNgqHhMYZBsuXAm7g7ddVpiqeaDrhFc2uhvAZAhvwtRWshA0hvEtYzJghnxq6CW/ZqD5Vce/Dpx/bIHzELr0EQxWwtIF0GgNRTzIBBU+95zDV5INJKBKc8LJbwOJWNVuUoKWLTYfBYh7Gg5J5U5rBRd1lrfjbGag68Mea7xolvOF9u4ZsSqucjTXmJ9ykDWJnqw/EbpsSdAAs7YtULaH80jggV7TS69KB1fjusBx7PcH35zgZeB6u3/bfwcVzY7YoJo6usC7pSiGwaLhqcANGxJPB2W6ZU3evrQRv1GIZrhPrvhJcMo/kAiWQ+vF1FJzFOjvsETVCRtQG1kyuBotGyMJYitk12Tryt1pQdLsBoijBRbO9o29wTPGNviH4/uxYW4udcsY1LZQjnjNgoe9J2zC2CwXlyxX3JIH1Je3yNsMf7PeFt27yPX6/rdkyT9wf/myTdbXRaZzsBLNtNq0cBktfADNLG4xgxLT6t/uRAiwcXWbIbmlmo3aG3EKeHhpD3CbaWOeIeFF/iFfiFvCuAUsbqD3CrjRcfNK+Xiv9fr8zQsrc2dwU/mxzYNLrHGQiQd/dfWtg8htckMs6KFhizHit7DfYVQFLFwFssXIxiEPEipshwSZy7FBozQrg8D/zaP8+bD++Lo0ZTsiIklReHFq7MnLsMG/XFGh4QRGpDfkLSoOlDWQziha4OmAMRikXQ29Gmy5Gz1b196aL/MoftVhUwfvV0+QtzTl2DVi6A4IkIWen7hxoOlWOOBcUBUsbOL0DthSdt9zQ9GJ564ov3AqWvpDBOLAzUJozDaHZkCToVrC0geILFQxPdzWW1QjN6uIId4Ol2ZWhmzMNQan5VRyloLD0U2Lk7g6dkw3fOl5QNRc9o9QUGS5jYj7EEyORSB6gqxtiQThEbBz0rbsSLG0gnkismm9kfqk4pOFPRiwIx6k4oLvBSrYhDOQG5npDFAhEEWeVi8HSBoqWUIsU+YgWkOVoQ+uh/sgFdYUneZQrZMqcT768Om5l+xsPzuNjraus/twHVsK24PvK1GVPyaUijXmaiYrKLXe5jke5S8p8Xym5xMjAGSF9C2HVGg/IY/KwPLJbJiq3gpWwuki6xdelQhjfOt3HA7LPgkun51HuFT3u5uqBZvWWBzY3fVc0nsvVoa1Rbh8GJi2GgWVjDuAFUjwIj6Na4G8kgpVQHHzF2QaYvBHXmSPYUtw2N88j5IxyzxGwEsqRNSPWLjVPrvDXc5PcKjfMbedYTkdOgaU3/Ie604tQGn5qBaNp3BI3htbjJrnVnEydzUGwEo4JLBVWVRzGx0GPDKTjyytugNvgZrglbozbc53WzoOVYsFguDCQaBzsGFQPZr5tSRN8EB/Hh/LR3AC3wc3kvAduRICV3HBe43JkzigrK2Px1djYyBRCaqFEzrgUF+SyXByY+CA+jg8daSnXIwusZEXJSLO/T0NDA2sxhh9vJDYZvwIBKRXoKfjA+sEeigy0BDc0/sh/8QJexot5C2/k7VyES3FBfuXifEQOK7s8WKImP8njLPsJ9HKkO+E5jGvSntBfmETgUjrQ+IFf+SP/paci8mLewht5e76CLdH+H5nMNBUt+3p0AAAAAElFTkSuQmCC",
-  "description": "Displays the latest values of the attributes or time series data for multiple entities in a polar area chart. Supports numeric values only.",
+  "image": "tb-image:cG9sYXItYXJlYS5zdmc=:IlBvbGFyIGFyZWEiIHN5c3RlbSB3aWRnZXQgaW1hZ2U=;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="4" fill="white"/>
<circle cx="99.4776" cy="80" r="69.7388" stroke="black" stroke-opacity="0.38" stroke-width="0.522388"/>
<circle cx="99.4776" cy="80" r="53.0224" stroke="black" stroke-opacity="0.12" stroke-width="0.522388"/>
<circle cx="99.4776" cy="80" r="36.306" stroke="black" stroke-opacity="0.12" stroke-width="0.522388"/>
<circle cx="99.4776" cy="80" r="19.5896" stroke="black" stroke-opacity="0.12" stroke-width="0.522388"/>
<circle cx="99.4776" cy="80.0001" r="2.87313" stroke="black" stroke-opacity="0.12" stroke-width="0.522388"/>
<path d="M99.4776 10.5223V80" stroke="#9E9E9E" stroke-width="0.522388"/>
<path d="M99.4776 26.7164H97.3881" stroke="#9E9E9E" stroke-width="0.522388"/>
<path d="M99.4776 43.4329H97.3881" stroke="#9E9E9E" stroke-width="0.522388"/>
<path d="M99.4776 60.1493H97.3881" stroke="#9E9E9E" stroke-width="0.522388"/>
<rect width="15" height="8.35821" transform="translate(82.7612 39.2538)" fill="white"/>
<path d="M85.9229 39.958V45.9329H85.1679V40.9008L83.6456 41.4558V40.7743L85.8046 39.958H85.9229ZM92.1345 42.4884V43.3944C92.1345 43.8814 92.0909 44.2922 92.0039 44.6269C91.9168 44.9615 91.7916 45.2309 91.6284 45.435C91.4651 45.639 91.2679 45.7873 91.0366 45.8798C90.8081 45.9696 90.5496 46.0145 90.2612 46.0145C90.0327 46.0145 89.8218 45.9859 89.6286 45.9288C89.4354 45.8716 89.2613 45.7805 89.1062 45.6553C88.9539 45.5275 88.8233 45.3615 88.7144 45.1574C88.6056 44.9534 88.5226 44.7058 88.4655 44.4147C88.4084 44.1235 88.3798 43.7835 88.3798 43.3944V42.4884C88.3798 42.0013 88.4233 41.5932 88.5104 41.264C88.6002 40.9348 88.7267 40.6709 88.8899 40.4723C89.0532 40.2709 89.2491 40.1267 89.4776 40.0397C89.7089 39.9526 89.9674 39.9091 90.253 39.9091C90.4843 39.9091 90.6965 39.9376 90.8897 39.9948C91.0856 40.0492 91.2597 40.1376 91.4121 40.2601C91.5644 40.3798 91.6937 40.5403 91.7998 40.7416C91.9086 40.9402 91.9916 41.1838 92.0487 41.4722C92.1059 41.7606 92.1345 42.0993 92.1345 42.4884ZM91.3754 43.5168V42.3618C91.3754 42.0952 91.359 41.8612 91.3264 41.6599C91.2965 41.4558 91.2516 41.2817 91.1917 41.1375C91.1318 40.9933 91.0557 40.8763 90.9632 40.7865C90.8734 40.6967 90.7686 40.6314 90.6489 40.5906C90.5319 40.5471 90.4 40.5253 90.253 40.5253C90.0735 40.5253 89.9143 40.5593 89.7755 40.6274C89.6368 40.6927 89.5198 40.7974 89.4246 40.9416C89.3321 41.0858 89.2613 41.2749 89.2123 41.5089C89.1634 41.7429 89.1389 42.0272 89.1389 42.3618V43.5168C89.1389 43.7835 89.1538 44.0188 89.1838 44.2229C89.2164 44.4269 89.264 44.6038 89.3266 44.7534C89.3892 44.9003 89.4654 45.0214 89.5552 45.1166C89.6449 45.2119 89.7483 45.2826 89.8653 45.3289C89.985 45.3724 90.117 45.3941 90.2612 45.3941C90.4462 45.3941 90.6081 45.3588 90.7469 45.288C90.8856 45.2173 91.0012 45.1071 91.0938 44.9575C91.189 44.8051 91.2597 44.6106 91.306 44.3739C91.3522 44.1344 91.3754 43.8488 91.3754 43.5168ZM97.0971 42.4884V43.3944C97.0971 43.8814 97.0536 44.2922 96.9665 44.6269C96.8795 44.9615 96.7543 45.2309 96.5911 45.435C96.4278 45.639 96.2306 45.7873 95.9993 45.8798C95.7708 45.9696 95.5123 46.0145 95.2239 46.0145C94.9953 46.0145 94.7845 45.9859 94.5913 45.9288C94.3981 45.8716 94.224 45.7805 94.0689 45.6553C93.9166 45.5275 93.786 45.3615 93.6771 45.1574C93.5683 44.9534 93.4853 44.7058 93.4282 44.4147C93.371 44.1235 93.3425 43.7835 93.3425 43.3944V42.4884C93.3425 42.0013 93.386 41.5932 93.4731 41.264C93.5629 40.9348 93.6894 40.6709 93.8526 40.4723C94.0159 40.2709 94.2118 40.1267 94.4403 40.0397C94.6716 39.9526 94.93 39.9091 95.2157 39.9091C95.447 39.9091 95.6592 39.9376 95.8524 39.9948C96.0483 40.0492 96.2224 40.1376 96.3748 40.2601C96.5271 40.3798 96.6564 40.5403 96.7625 40.7416C96.8713 40.9402 96.9543 41.1838 97.0114 41.4722C97.0686 41.7606 97.0971 42.0993 97.0971 42.4884ZM96.338 43.5168V42.3618C96.338 42.0952 96.3217 41.8612 96.2891 41.6599C96.2591 41.4558 96.2142 41.2817 96.1544 41.1375C96.0945 40.9933 96.0184 40.8763 95.9258 40.7865C95.8361 40.6967 95.7313 40.6314 95.6116 40.5906C95.4946 40.5471 95.3626 40.5253 95.2157 40.5253C95.0362 40.5253 94.877 40.5593 94.7382 40.6274C94.5995 40.6927 94.4825 40.7974 94.3872 40.9416C94.2947 41.0858 94.224 41.2749 94.175 41.5089C94.1261 41.7429 94.1016 42.0272 94.1016 42.3618V43.5168C94.1016 43.7835 94.1165 44.0188 94.1465 44.2229C94.1791 44.4269 94.2267 44.6038 94.2893 44.7534C94.3519 44.9003 94.4281 45.0214 94.5178 45.1166C94.6076 45.2119 94.711 45.2826 94.828 45.3289C94.9477 45.3724 95.0797 45.3941 95.2239 45.3941C95.4089 45.3941 95.5708 45.3588 95.7095 45.288C95.8483 45.2173 95.9639 45.1071 96.0564 44.9575C96.1517 44.8051 96.2224 44.6106 96.2687 44.3739C96.3149 44.1344 96.338 43.8488 96.338 43.5168Z" fill="black" fill-opacity="0.76"/>
<rect width="10" height="8.35821" transform="translate(86.9403 55.9701)" fill="white"/>
<path d="M88.557 59.8209L87.953 59.6658L88.2509 56.707H91.2996V57.4049H88.8917L88.7121 59.021C88.8209 58.9584 88.9583 58.8999 89.1243 58.8455C89.293 58.7911 89.4862 58.7639 89.7038 58.7639C89.9786 58.7639 90.2249 58.8115 90.4425 58.9067C90.6602 58.9993 90.8452 59.1326 90.9976 59.3067C91.1526 59.4808 91.271 59.6903 91.3526 59.9352C91.4342 60.1801 91.4751 60.4535 91.4751 60.7555C91.4751 61.0412 91.4356 61.3037 91.3567 61.5432C91.2805 61.7826 91.1649 61.9921 91.0098 62.1717C90.8547 62.3485 90.6588 62.4859 90.4221 62.5839C90.1881 62.6818 89.912 62.7308 89.5936 62.7308C89.3542 62.7308 89.127 62.6981 88.9121 62.6328C88.6999 62.5648 88.5094 62.4628 88.3407 62.3268C88.1748 62.188 88.0387 62.0166 87.9326 61.8125C87.8292 61.6058 87.7639 61.3636 87.7367 61.0861H88.455C88.4876 61.3092 88.5529 61.4969 88.6509 61.6493C88.7488 61.8016 88.8767 61.9173 89.0345 61.9962C89.195 62.0724 89.3814 62.1105 89.5936 62.1105C89.7732 62.1105 89.9324 62.0792 90.0711 62.0166C90.2099 61.954 90.3269 61.8642 90.4221 61.7472C90.5173 61.6302 90.5894 61.4888 90.6384 61.3228C90.6901 61.1568 90.716 60.9705 90.716 60.7637C90.716 60.5759 90.6901 60.4018 90.6384 60.2413C90.5867 60.0808 90.5092 59.9406 90.4058 59.8209C90.3051 59.7012 90.1813 59.6087 90.0344 59.5434C89.8875 59.4754 89.7188 59.4414 89.5283 59.4414C89.2753 59.4414 89.0835 59.4754 88.9529 59.5434C88.825 59.6114 88.6931 59.7039 88.557 59.8209ZM96.2949 59.2047V60.1107C96.2949 60.5977 96.2514 61.0085 96.1643 61.3432C96.0772 61.6779 95.9521 61.9472 95.7888 62.1513C95.6256 62.3553 95.4283 62.5036 95.1971 62.5961C94.9685 62.6859 94.7101 62.7308 94.4217 62.7308C94.1931 62.7308 93.9822 62.7022 93.7891 62.6451C93.5959 62.588 93.4218 62.4968 93.2667 62.3717C93.1143 62.2438 92.9837 62.0778 92.8749 61.8738C92.7661 61.6697 92.6831 61.4221 92.6259 61.131C92.5688 60.8399 92.5402 60.4998 92.5402 60.1107V59.2047C92.5402 58.7177 92.5838 58.3095 92.6708 57.9803C92.7606 57.6511 92.8871 57.3872 93.0504 57.1886C93.2136 56.9872 93.4095 56.843 93.6381 56.756C93.8693 56.6689 94.1278 56.6254 94.4135 56.6254C94.6448 56.6254 94.857 56.654 95.0501 56.7111C95.246 56.7655 95.4202 56.8539 95.5725 56.9764C95.7249 57.0961 95.8541 57.2566 95.9602 57.4579C96.0691 57.6566 96.1521 57.9001 96.2092 58.1885C96.2663 58.4769 96.2949 58.8156 96.2949 59.2047ZM95.5358 60.2331V59.0782C95.5358 58.8115 95.5195 58.5775 95.4868 58.3762C95.4569 58.1721 95.412 57.998 95.3522 57.8538C95.2923 57.7096 95.2161 57.5926 95.1236 57.5028C95.0338 57.413 94.9291 57.3477 94.8094 57.3069C94.6924 57.2634 94.5604 57.2416 94.4135 57.2416C94.2339 57.2416 94.0748 57.2756 93.936 57.3437C93.7972 57.409 93.6802 57.5137 93.585 57.6579C93.4925 57.8021 93.4218 57.9912 93.3728 58.2252C93.3238 58.4592 93.2993 58.7435 93.2993 59.0782V60.2331C93.2993 60.4998 93.3143 60.7351 93.3442 60.9392C93.3769 61.1432 93.4245 61.3201 93.4871 61.4697C93.5496 61.6166 93.6258 61.7377 93.7156 61.8329C93.8054 61.9282 93.9088 61.9989 94.0258 62.0452C94.1455 62.0887 94.2775 62.1105 94.4217 62.1105C94.6067 62.1105 94.7685 62.0751 94.9073 62.0043C95.0461 61.9336 95.1617 61.8234 95.2542 61.6738C95.3494 61.5214 95.4202 61.3269 95.4664 61.0902C95.5127 60.8507 95.5358 60.5651 95.5358 60.2331Z" fill="black" fill-opacity="0.76"/>
<rect width="5" height="8.35821" transform="translate(92.1642 72.6865)" fill="white"/>
<path d="M96.6867 75.9211V76.8271C96.6867 77.3141 96.6432 77.725 96.5561 78.0596C96.469 78.3943 96.3439 78.6636 96.1806 78.8677C96.0174 79.0718 95.8201 79.22 95.5889 79.3125C95.3603 79.4023 95.1018 79.4472 94.8134 79.4472C94.5849 79.4472 94.374 79.4187 94.1809 79.3615C93.9877 79.3044 93.8136 79.2132 93.6585 79.0881C93.5061 78.9602 93.3755 78.7942 93.2667 78.5902C93.1578 78.3861 93.0749 78.1385 93.0177 77.8474C92.9606 77.5563 92.932 77.2162 92.932 76.8271V75.9211C92.932 75.4341 92.9756 75.026 93.0626 74.6968C93.1524 74.3675 93.2789 74.1036 93.4422 73.905C93.6054 73.7037 93.8013 73.5595 94.0299 73.4724C94.2611 73.3853 94.5196 73.3418 94.8053 73.3418C95.0365 73.3418 95.2488 73.3704 95.4419 73.4275C95.6378 73.4819 95.812 73.5704 95.9643 73.6928C96.1167 73.8125 96.2459 73.973 96.352 74.1744C96.4609 74.373 96.5438 74.6165 96.601 74.9049C96.6581 75.1933 96.6867 75.532 96.6867 75.9211ZM95.9276 76.9496V75.7946C95.9276 75.528 95.9113 75.294 95.8786 75.0926C95.8487 74.8886 95.8038 74.7144 95.7439 74.5702C95.6841 74.426 95.6079 74.309 95.5154 74.2193C95.4256 74.1295 95.3209 74.0642 95.2011 74.0234C95.0842 73.9798 94.9522 73.9581 94.8053 73.9581C94.6257 73.9581 94.4665 73.9921 94.3278 74.0601C94.189 74.1254 94.072 74.2301 93.9768 74.3743C93.8843 74.5185 93.8136 74.7076 93.7646 74.9416C93.7156 75.1756 93.6911 75.4599 93.6911 75.7946V76.9496C93.6911 77.2162 93.7061 77.4515 93.736 77.6556C93.7687 77.8597 93.8163 78.0365 93.8789 78.1861C93.9414 78.3331 94.0176 78.4541 94.1074 78.5494C94.1972 78.6446 94.3006 78.7153 94.4176 78.7616C94.5373 78.8051 94.6692 78.8269 94.8134 78.8269C94.9985 78.8269 95.1603 78.7915 95.2991 78.7208C95.4379 78.65 95.5535 78.5398 95.646 78.3902C95.7412 78.2378 95.812 78.0433 95.8582 77.8066C95.9045 77.5672 95.9276 77.2815 95.9276 76.9496Z" fill="black" fill-opacity="0.76"/>
<rect width="15" height="8.35821" transform="translate(82.7612 22.5374)" fill="white"/>
<path d="M85.9229 23.2416V29.2164H85.1679V24.1844L83.6456 24.7394V24.0578L85.8046 23.2416H85.9229ZM89.3593 26.3882L88.7553 26.2331L89.0532 23.2743H92.1018V23.9721H89.6939L89.5143 25.5883C89.6232 25.5257 89.7606 25.4672 89.9265 25.4128C90.0952 25.3584 90.2884 25.3312 90.5061 25.3312C90.7809 25.3312 91.0271 25.3788 91.2448 25.474C91.4624 25.5665 91.6474 25.6998 91.7998 25.874C91.9549 26.0481 92.0732 26.2576 92.1549 26.5025C92.2365 26.7473 92.2773 27.0208 92.2773 27.3228C92.2773 27.6085 92.2378 27.871 92.1589 28.1104C92.0828 28.3499 91.9671 28.5594 91.812 28.7389C91.657 28.9158 91.4611 29.0532 91.2244 29.1511C90.9904 29.2491 90.7142 29.2981 90.3959 29.2981C90.1565 29.2981 89.9293 29.2654 89.7143 29.2001C89.5021 29.1321 89.3117 29.0301 89.143 28.894C88.977 28.7553 88.841 28.5839 88.7348 28.3798C88.6315 28.173 88.5662 27.9309 88.539 27.6533H89.2572C89.2899 27.8765 89.3552 28.0642 89.4531 28.2165C89.5511 28.3689 89.679 28.4845 89.8368 28.5634C89.9973 28.6396 90.1837 28.6777 90.3959 28.6777C90.5754 28.6777 90.7346 28.6464 90.8734 28.5839C91.0121 28.5213 91.1291 28.4315 91.2244 28.3145C91.3196 28.1975 91.3917 28.056 91.4407 27.8901C91.4923 27.7241 91.5182 27.5377 91.5182 27.3309C91.5182 27.1432 91.4923 26.9691 91.4407 26.8085C91.389 26.648 91.3114 26.5079 91.208 26.3882C91.1074 26.2685 90.9836 26.176 90.8366 26.1107C90.6897 26.0427 90.521 26.0086 90.3306 26.0086C90.0775 26.0086 89.8857 26.0427 89.7551 26.1107C89.6273 26.1787 89.4953 26.2712 89.3593 26.3882ZM97.0971 25.7719V26.678C97.0971 27.165 97.0536 27.5758 96.9665 27.9105C96.8795 28.2451 96.7543 28.5145 96.5911 28.7185C96.4278 28.9226 96.2306 29.0709 95.9993 29.1634C95.7708 29.2532 95.5123 29.2981 95.2239 29.2981C94.9953 29.2981 94.7845 29.2695 94.5913 29.2123C94.3981 29.1552 94.224 29.0641 94.0689 28.9389C93.9166 28.811 93.786 28.6451 93.6771 28.441C93.5683 28.237 93.4853 27.9894 93.4282 27.6982C93.371 27.4071 93.3425 27.067 93.3425 26.678V25.7719C93.3425 25.2849 93.386 24.8768 93.4731 24.5476C93.5629 24.2184 93.6894 23.9545 93.8526 23.7558C94.0159 23.5545 94.2118 23.4103 94.4403 23.3232C94.6716 23.2362 94.93 23.1926 95.2157 23.1926C95.447 23.1926 95.6592 23.2212 95.8524 23.2783C96.0483 23.3328 96.2224 23.4212 96.3748 23.5436C96.5271 23.6633 96.6564 23.8239 96.7625 24.0252C96.8713 24.2238 96.9543 24.4673 97.0114 24.7557C97.0686 25.0441 97.0971 25.3829 97.0971 25.7719ZM96.338 26.8004V25.6454C96.338 25.3788 96.3217 25.1448 96.2891 24.9435C96.2591 24.7394 96.2142 24.5653 96.1544 24.4211C96.0945 24.2769 96.0184 24.1599 95.9258 24.0701C95.8361 23.9803 95.7313 23.915 95.6116 23.8742C95.4946 23.8307 95.3626 23.8089 95.2157 23.8089C95.0362 23.8089 94.877 23.8429 94.7382 23.9109C94.5995 23.9762 94.4825 24.081 94.3872 24.2252C94.2947 24.3694 94.224 24.5585 94.175 24.7925C94.1261 25.0264 94.1016 25.3108 94.1016 25.6454V26.8004C94.1016 27.067 94.1165 27.3024 94.1465 27.5064C94.1791 27.7105 94.2267 27.8873 94.2893 28.037C94.3519 28.1839 94.4281 28.305 94.5178 28.4002C94.6076 28.4954 94.711 28.5662 94.828 28.6124C94.9477 28.656 95.0797 28.6777 95.2239 28.6777C95.4089 28.6777 95.5708 28.6423 95.7095 28.5716C95.8483 28.5009 95.9639 28.3907 96.0564 28.241C96.1517 28.0887 96.2224 27.8941 96.2687 27.6574C96.3149 27.418 96.338 27.1323 96.338 26.8004Z" fill="black" fill-opacity="0.76"/>
<rect width="15" height="8.35821" transform="translate(82.7612 5.82092)" fill="white"/>
<path d="M87.335 11.8797V12.5H83.4457V11.9572L85.3924 9.79011C85.6318 9.52348 85.8168 9.29765 85.9474 9.11264C86.0807 8.92491 86.1732 8.75758 86.2249 8.61066C86.2794 8.46102 86.3066 8.30865 86.3066 8.15357C86.3066 7.95767 86.2657 7.78082 86.1841 7.62302C86.1052 7.46249 85.9882 7.33462 85.8331 7.23939C85.6781 7.14416 85.4903 7.09655 85.2699 7.09655C85.006 7.09655 84.7856 7.14824 84.6088 7.25163C84.4347 7.3523 84.3041 7.49378 84.217 7.67607C84.1299 7.85836 84.0864 8.06786 84.0864 8.30457H83.3314C83.3314 7.96992 83.4049 7.66383 83.5518 7.38631C83.6987 7.10879 83.9164 6.88841 84.2048 6.72516C84.4932 6.5592 84.8482 6.47621 85.2699 6.47621C85.6454 6.47621 85.9665 6.54287 86.2331 6.67619C86.4997 6.80679 86.7038 6.9918 86.8453 7.23123C86.9895 7.46793 87.0616 7.74545 87.0616 8.06378C87.0616 8.23791 87.0316 8.41476 86.9718 8.59433C86.9147 8.77118 86.8344 8.94803 86.731 9.12488C86.6303 9.30173 86.512 9.47586 86.3759 9.64727C86.2426 9.81868 86.0998 9.98737 85.9474 10.1533L84.3558 11.8797H87.335ZM92.1345 9.0555V9.96152C92.1345 10.4485 92.0909 10.8594 92.0039 11.194C91.9168 11.5287 91.7916 11.798 91.6284 12.0021C91.4651 12.2062 91.2679 12.3544 91.0366 12.4469C90.8081 12.5367 90.5496 12.5816 90.2612 12.5816C90.0327 12.5816 89.8218 12.5531 89.6286 12.4959C89.4354 12.4388 89.2613 12.3476 89.1062 12.2225C88.9539 12.0946 88.8233 11.9286 88.7144 11.7246C88.6056 11.5205 88.5226 11.2729 88.4655 10.9818C88.4084 10.6907 88.3798 10.3506 88.3798 9.96152V9.0555C88.3798 8.56849 88.4233 8.16037 88.5104 7.83116C88.6002 7.50194 88.7267 7.23803 88.8899 7.03941C89.0532 6.83808 89.2491 6.69387 89.4776 6.60681C89.7089 6.51975 89.9674 6.47621 90.253 6.47621C90.4843 6.47621 90.6965 6.50478 90.8897 6.56192C91.0856 6.61633 91.2597 6.70476 91.4121 6.82719C91.5644 6.94691 91.6937 7.10743 91.7998 7.30877C91.9086 7.50739 91.9916 7.75089 92.0487 8.0393C92.1059 8.3277 92.1345 8.66643 92.1345 9.0555ZM91.3754 10.084V8.92899C91.3754 8.66235 91.359 8.42837 91.3264 8.22703C91.2965 8.02297 91.2516 7.84884 91.1917 7.70464C91.1318 7.56044 91.0557 7.44345 90.9632 7.35366C90.8734 7.26388 90.7686 7.19858 90.6489 7.15777C90.5319 7.11423 90.4 7.09247 90.253 7.09247C90.0735 7.09247 89.9143 7.12648 89.7755 7.1945C89.6368 7.25979 89.5198 7.36454 89.4246 7.50875C89.3321 7.65295 89.2613 7.84204 89.2123 8.07603C89.1634 8.31001 89.1389 8.59433 89.1389 8.92899V10.084C89.1389 10.3506 89.1538 10.5859 89.1838 10.79C89.2164 10.9941 89.264 11.1709 89.3266 11.3205C89.3892 11.4675 89.4654 11.5885 89.5552 11.6838C89.6449 11.779 89.7483 11.8497 89.8653 11.896C89.985 11.9395 90.117 11.9613 90.2612 11.9613C90.4462 11.9613 90.6081 11.9259 90.7469 11.8552C90.8856 11.7844 91.0012 11.6742 91.0938 11.5246C91.189 11.3722 91.2597 11.1777 91.306 10.941C91.3522 10.7016 91.3754 10.4159 91.3754 10.084ZM97.0971 9.0555V9.96152C97.0971 10.4485 97.0536 10.8594 96.9665 11.194C96.8795 11.5287 96.7543 11.798 96.5911 12.0021C96.4278 12.2062 96.2306 12.3544 95.9993 12.4469C95.7708 12.5367 95.5123 12.5816 95.2239 12.5816C94.9953 12.5816 94.7845 12.5531 94.5913 12.4959C94.3981 12.4388 94.224 12.3476 94.0689 12.2225C93.9166 12.0946 93.786 11.9286 93.6771 11.7246C93.5683 11.5205 93.4853 11.2729 93.4282 10.9818C93.371 10.6907 93.3425 10.3506 93.3425 9.96152V9.0555C93.3425 8.56849 93.386 8.16037 93.4731 7.83116C93.5629 7.50194 93.6894 7.23803 93.8526 7.03941C94.0159 6.83808 94.2118 6.69387 94.4403 6.60681C94.6716 6.51975 94.93 6.47621 95.2157 6.47621C95.447 6.47621 95.6592 6.50478 95.8524 6.56192C96.0483 6.61633 96.2224 6.70476 96.3748 6.82719C96.5271 6.94691 96.6564 7.10743 96.7625 7.30877C96.8713 7.50739 96.9543 7.75089 97.0114 8.0393C97.0686 8.3277 97.0971 8.66643 97.0971 9.0555ZM96.338 10.084V8.92899C96.338 8.66235 96.3217 8.42837 96.2891 8.22703C96.2591 8.02297 96.2142 7.84884 96.1544 7.70464C96.0945 7.56044 96.0184 7.44345 95.9258 7.35366C95.8361 7.26388 95.7313 7.19858 95.6116 7.15777C95.4946 7.11423 95.3626 7.09247 95.2157 7.09247C95.0362 7.09247 94.877 7.12648 94.7382 7.1945C94.5995 7.25979 94.4825 7.36454 94.3872 7.50875C94.2947 7.65295 94.224 7.84204 94.175 8.07603C94.1261 8.31001 94.1016 8.59433 94.1016 8.92899V10.084C94.1016 10.3506 94.1165 10.5859 94.1465 10.79C94.1791 10.9941 94.2267 11.1709 94.2893 11.3205C94.3519 11.4675 94.4281 11.5885 94.5178 11.6838C94.6076 11.779 94.711 11.8497 94.828 11.896C94.9477 11.9395 95.0797 11.9613 95.2239 11.9613C95.4089 11.9613 95.5708 11.9259 95.7095 11.8552C95.8483 11.7844 95.9639 11.6742 96.0564 11.5246C96.1517 11.3722 96.2224 11.1777 96.2687 10.941C96.3149 10.7016 96.338 10.4159 96.338 10.084Z" fill="black" fill-opacity="0.76"/>
<path d="M76.2765 92.264C78.561 96.4205 81.919 99.8876 86.0003 102.304C90.0816 104.72 94.7365 105.996 99.4794 106C104.222 106.004 108.879 104.734 112.964 102.325C117.049 99.9149 120.413 96.453 122.704 92.3002L99.5 79.5L76.2765 92.264Z" fill="#4B93FF" stroke="white" stroke-width="1.04478"/>
<path d="M135.011 99.3446C138.377 93.2537 140.095 86.3903 139.996 79.4323C139.897 72.4742 137.985 65.6623 134.448 59.6695C130.911 53.6766 125.872 48.7101 119.829 45.2606C113.785 41.811 106.946 39.9978 99.9873 40L100 80L135.011 99.3446Z" fill="#FF4D5A" stroke="white" stroke-width="1.04478"/>
<g filter="url(#filter0_di_4617_43499)">
<path d="M99.4776 27.7612C90.3981 27.7612 81.4753 30.1277 73.5891 34.6274C65.703 39.127 59.1258 45.6044 54.5061 53.4208C49.8864 61.2373 47.3837 70.1228 47.2449 79.2013C47.1061 88.2798 49.3359 97.2377 53.7144 105.192L99.4776 80V27.7612Z" fill="#08872B"/>
<path d="M99.4776 27.7612C90.3981 27.7612 81.4753 30.1277 73.5891 34.6274C65.703 39.127 59.1258 45.6044 54.5061 53.4208C49.8864 61.2373 47.3837 70.1228 47.2449 79.2013C47.1061 88.2798 49.3359 97.2377 53.7144 105.192L99.4776 80V27.7612Z" stroke="white" stroke-width="1.04478"/>
</g>
<path d="M75.1388 67.9598L73.4451 73H72.2575L74.4776 67.0578H75.2367L75.1388 67.9598ZM76.5549 73L74.8531 67.9598L74.751 67.0578H75.5142L77.7466 73H76.5549ZM76.4774 70.7921V71.6777H73.29V70.7921H76.4774Z" fill="white"/>
<path d="M100.31 94.0451H101.432C101.402 94.4424 101.292 94.7947 101.102 95.1021C100.911 95.4069 100.646 95.6463 100.306 95.8204C99.9659 95.9946 99.5537 96.0816 99.0694 96.0816C98.6966 96.0816 98.3606 96.0163 98.0613 95.8857C97.7648 95.7524 97.5104 95.5633 97.2982 95.3184C97.0887 95.0709 96.9281 94.7743 96.8166 94.4288C96.705 94.0805 96.6493 93.6901 96.6493 93.2575V92.8045C96.6493 92.3719 96.7064 91.9814 96.8207 91.6332C96.9349 91.2849 97.0982 90.9883 97.3104 90.7435C97.5253 90.4959 97.7825 90.3054 98.0817 90.1721C98.3837 90.0388 98.7211 89.9721 99.0939 89.9721C99.5782 89.9721 99.9876 90.0619 100.322 90.2415C100.657 90.4183 100.917 90.6618 101.102 90.972C101.287 91.2822 101.398 91.6386 101.436 92.0413H100.314C100.292 91.791 100.238 91.5787 100.151 91.4046C100.067 91.2305 99.9387 91.0985 99.7673 91.0087C99.5986 90.9162 99.3741 90.87 99.0939 90.87C98.8762 90.87 98.6844 90.9108 98.5184 90.9924C98.3552 91.074 98.2191 91.1965 98.1103 91.3597C98.0015 91.5203 97.9199 91.7216 97.8654 91.9637C97.811 92.2032 97.7838 92.4807 97.7838 92.7963V93.2575C97.7838 93.5595 97.8083 93.8302 97.8573 94.0696C97.9062 94.309 97.9824 94.5117 98.0858 94.6777C98.1892 94.8437 98.3225 94.9702 98.4858 95.0573C98.649 95.1443 98.8436 95.1878 99.0694 95.1878C99.3442 95.1878 99.5673 95.1443 99.7387 95.0573C99.9128 94.9702 100.045 94.8423 100.135 94.6736C100.227 94.5049 100.286 94.2954 100.31 94.0451Z" fill="white"/>
<path d="M117.192 70.3513H115.674L115.665 69.5596H116.967C117.19 69.5596 117.377 69.5283 117.526 69.4657C117.676 69.4031 117.789 69.312 117.865 69.1923C117.944 69.0726 117.984 68.927 117.984 68.7556C117.984 68.5651 117.947 68.4101 117.873 68.2903C117.803 68.1706 117.691 68.0836 117.539 68.0292C117.386 67.972 117.193 67.9434 116.959 67.9434H116.037V73H114.915V67.0578H116.959C117.297 67.0578 117.597 67.0905 117.861 67.1558C118.128 67.2184 118.354 67.3163 118.539 67.4496C118.724 67.5829 118.864 67.7503 118.959 67.9516C119.057 68.1529 119.106 68.3924 119.106 68.6699C119.106 68.9148 119.049 69.1406 118.934 69.3474C118.823 69.5514 118.65 69.7174 118.416 69.8453C118.185 69.9731 117.891 70.0466 117.535 70.0656L117.192 70.3513ZM117.143 73H115.343L115.812 72.1185H117.143C117.366 72.1185 117.55 72.0817 117.694 72.0083C117.841 71.9348 117.95 71.8341 118.02 71.7063C118.094 71.5757 118.13 71.426 118.13 71.2573C118.13 71.0723 118.098 70.9118 118.033 70.7758C117.97 70.6397 117.869 70.535 117.731 70.4615C117.594 70.3881 117.415 70.3513 117.192 70.3513H116.025L116.033 69.5596H117.518L117.775 69.8657C118.118 69.8684 118.397 69.9364 118.612 70.0697C118.83 70.203 118.99 70.3745 119.094 70.584C119.197 70.7935 119.249 71.0193 119.249 71.2614C119.249 71.6423 119.166 71.962 119 72.2205C118.837 72.479 118.597 72.6735 118.281 72.8041C117.969 72.9347 117.589 73 117.143 73Z" fill="white"/>
<defs>
<filter id="filter0_di_4617_43499" x="34.1791" y="14.7016" width="78.3582" height="103.737" 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/>
<feGaussianBlur stdDeviation="6.26866"/>
<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.36 0"/>
<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_4617_43499"/>
<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_4617_43499" result="shape"/>
<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/>
<feGaussianBlur stdDeviation="3.13433"/>
<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.45 0"/>
<feBlend mode="normal" in2="shape" result="effect2_innerShadow_4617_43499"/>
</filter>
</defs>
</svg>
",
+  "description": "Displays the latest values of the attributes or time-series data in a polar area chart. Supports numeric values only.",
   "descriptor": {
     "type": "latest",
-    "sizeX": 7,
-    "sizeY": 5,
-    "resources": [
-      {
-        "url": "https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.3.0/Chart.min.js"
-      }
-    ],
-    "templateHtml": "<canvas id=\"pieChart\"></canvas>\n",
+    "sizeX": 5,
+    "sizeY": 4,
+    "resources": [],
+    "templateHtml": "<tb-polar-area-chart-widget \n    [ctx]=\"ctx\"\n    [widgetTitlePanel]=\"widgetTitlePanel\">\n</tb-polar-area-chart-widget>",
     "templateCss": "",
-    "controllerScript": "self.onInit = function() {\n    $scope = self.ctx.$scope;\n    utils = $scope.$injector.get(self.ctx.servicesMap.get('utils'));\n    settings = utils.deepClone(self.ctx.settings) || {};\n    settings.showTooltip = utils.defaultValue(settings.showTooltip, true);\n    \n    Chart.defaults.global.tooltips.enabled = settings.showTooltip;\n    \n    var pieData = {\n        labels: [],\n        datasets: []\n    };\n\n    var dataset = {\n        data: [],\n        backgroundColor: [],\n        borderColor: [],\n        borderWidth: [],\n        hoverBackgroundColor: []\n    }\n\n    pieData.datasets.push(dataset);\n    \n    for (var i = 0; i < self.ctx.data.length; i++) {\n        var dataKey = self.ctx.data[i].dataKey;\n        var units = dataKey.units && dataKey.units.length ? dataKey.units : self.ctx.units;\n        units = units ? (' (' + units + ')') : '';\n        pieData.labels.push(dataKey.label + units);\n        dataset.data.push(0);\n        var hoverBackgroundColor = tinycolor(dataKey.color).lighten(15);\n        var borderColor = tinycolor(dataKey.color).darken();\n        dataset.backgroundColor.push(dataKey.color);\n        dataset.borderColor.push('#fff');\n        dataset.borderWidth.push(5);\n        dataset.hoverBackgroundColor.push(hoverBackgroundColor.toRgbString());\n    }\n    \n    var floatingPoint;\n    if (typeof self.ctx.decimals !== 'undefined' && self.ctx.decimals !== null) {\n        floatingPoint = self.ctx.widget.config.decimals;\n    } else {\n        floatingPoint = 2;\n    }\n\n\n    var ctx = $('#pieChart', self.ctx.$container);\n    self.ctx.chart = new Chart(ctx, {\n        type: 'polarArea',\n        data: pieData,\n        options: {\n            responsive: false,\n            maintainAspectRatio: false,\n            scale: {\n                ticks: {\n                    callback: function(tick) {\n                    \treturn tick.toFixed(floatingPoint);\n                    }\n                }\n            }\n        }\n    });\n    \n    self.onResize();\n}\n\nself.onDataUpdated = function() {\n    for (var i = 0; i < self.ctx.data.length; i++) {\n        var cellData = self.ctx.data[i];\n        if (cellData.data.length > 0) {\n            var decimals;\n            if (typeof cellData.dataKey.decimals !== 'undefined' \n                && cellData.dataKey.decimals !== null ) {\n                decimals = cellData.dataKey.decimals; \n            } else {\n                decimals = self.ctx.decimals;\n            }\n            var tvPair = cellData.data[cellData.data.length - 1];\n            var value = self.ctx.utils.formatValue(tvPair[1], decimals);\n            self.ctx.chart.data.datasets[0].data[i] = parseFloat(value);\n        }\n    }\n    self.ctx.chart.update();\n}\n\nself.onResize = function() {\n    if (self.ctx.height >= 70) {\n        try {\n            self.ctx.chart.resize();\n        } catch (e) {}\n    }\n}\n\nself.onDestroy = function() {\n    self.ctx.chart.destroy();\n    self.ctx.chart = null;\n}\n",
+    "controllerScript": "self.onInit = function() {\n    self.ctx.$scope.polarAreaChartWidget.onInit();\n};\n\nself.onDataUpdated = function() {\n    self.ctx.$scope.polarAreaChartWidget.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\n",
     "settingsSchema": "",
-    "dataKeySettingsSchema": "{}\n",
-    "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;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Fifth\",\"color\":\"#607d8b\",\"settings\":{},\"_hash\":0.2074391823443591,\"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\":\"Polar Area\"}"
+    "dataKeySettingsSchema": "",
+    "settingsDirective": "tb-polar-area-chart-widget-settings",
+    "hasBasicMode": true,
+    "basicModeDirective": "tb-polar-area-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\":\"Polar area\",\"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\":\"bar_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}}"
   },
-  "externalId": null
+  "tags": [
+    "polar",
+    "polar area",
+    "bars",
+    "polar area chart"
+  ]
 }
\ No newline at end of file
diff --git a/application/src/main/data/json/system/widget_types/polar_area_deprecated.json b/application/src/main/data/json/system/widget_types/polar_area_deprecated.json
new file mode 100644
index 0000000000..b37392c867
--- /dev/null
+++ b/application/src/main/data/json/system/widget_types/polar_area_deprecated.json
@@ -0,0 +1,25 @@
+{
+  "fqn": "charts.polar_area_chart_js",
+  "name": "Polar Area",
+  "deprecated": true,
+  "image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAACgCAIAAADGnbT+AAAABmJLR0QA/wD/AP+gvaeTAAAYvUlEQVR42u2deXAU15nA+W+zm73/yV7Zqq09aje7SeXY2kocZ7cSH7GdxCG+cJxybHw7Xt/4WB+AY8CAMeEGc4MNAgcMxhgB5r4RkpAAHYCEDoRu0DX31fuTejyaEWjm9fTr7tejefWKksRMT/f3fvO+733He6O0fMs3C9qovAgytlgs5vf7Ez+3tbX19fXlxZIHK/sWjUYLCgqmTZtWVFSkUzVr1qxVq1ZNnz79yJEjefnkwcqy7d+/f8OGDfCk/1pdXb18+XJ+8Pl8EydOzMsnD1aWberUqZ9//jlTVElJCb8ePHhw27Zt+n+98cYbkUgkL6I8WNm0cePGbd++vbm5+Z133jl//vzu3bt37Nih/9f48eMThle+5cEa1jwPBAI9PT0dHR2XLl1K/P2VV17Rf9i3b19hYeGhQ4e2bt2amLGwwPSfeQtv7O3t5SIJvZkHa4SS5PF4WN/V19djOZWVlVVUVDAnNTQ0tLS0JF6Gqc5f+AFL6+jRoxcuXFiwYAG/guCkSZMSL+MtvIy3cxEuxQX5lYvzESOWs1EjDSb02rlz5xj+qqqqxsbGzs5Or9ebmHuGtKampilTpsydO3fevHnhcJi/rFy5cvbs2ZMnTz59+vRwC0k+hctycT6CD+Lj+NCRBlnug8VIX7lypa6urry8nJFGbaGzDNndKLjkX0OhkDgifBDTGx/KR3MD3AY3MxzHebDcMT91dXWhvBjOmpoaphCAcPaWuAFug5vRCeP2cngOy0GwmGCYIU6dOoUOYiAVdAqgVbkxbg99yq0OmRHzYCnX0HHMByCFbeSK0eImuVVumNvm5vNgKaf1Ll++jBFTWVnJTOA6/cINc9vcPI+ABZYHS4nGSDAkqBVsZLc/C49w9uxZHgfzKw+Wk4qPrzgjkWNKBLzwhPFors6hcCVYmCa1tbV4I3Pgmz1c49HOnDnDqjYYDObBssMcwc2Ntdva2prz/kbcXTwmD8sju+5h3QQWzmvsDxZQVnyJGbjO7p6K2oY9RWUFhXsXrN8yfeVHExeufmnm4t9MnpP8ytf3BaYdDS4qDa6rDBXWhsvaIt0BC0cd7xfzFg/O4+fBkj9RsSzH6yNX93X19p2oOAtGk5aseey3v3vwzXeH68nv+ocFfVf3by/33LnR99KewMpToVPt0Yhs1zprFN3p5ZapywVgkZ2CMcu3Vo/WmWzhSOT0+boPtu5iKkpDklGwhvSvLe4bs9k343iwpDUSlUQCj49liVFPmmEeLLMNBw9GBv+aHpXI8dPV89dteXLSbHGesgYruf/nCs/LewI7LoT9Er4XGvk5CAS/XR6s7NUfCQLYFibz6S61d360c//TU+dnwZMUsBL960s9r+0LFLeYDTEhEFbEFy9eVFktKgoWFisOKtRf1pE+hM4U9daiD8zwJBesRL9tvXf16ZDPxASGWBAOIpJiHowUsPhG4sJhpZ21FXWg5NSrs5ZKQcoKsPT+nRWeecXBHhMrStwQCErNDGnlwMKNjg2RXcgsGo3tKy5/YcYiiUhZB1ZCP04/FuzKFi+WyYhLwXCWWmDpYsoulFF5oWH8/FXSkbIaLL1/c5lnYWkwlJWTAnEhNNWCEAqBpbtqslhLt1/pnr1mk0VI2QOW3m8q8O5tyMamRBsiOqWWiqqAhUMhC3OBVdHeE+WPvz3LUqpsA0vvD33mb/XEsmALAZr3y+QUWHzVEIrR1LzOrp7pK9ZbjZT9YOma8eOzhpd7CBAxKpLR5TxYGAdM40bnqiNlFdm5Ol0Blt6f3uk3GoWELYSpAlsOg6WvAQ3ZVcT8cXjahpSDYNG/v9pT3mbMpEeYWS+AcgQsZimjIrjS00fA2GaqHASL/q/v931UZay+SF8nOhtSdAwsfOsYBIYWMrUXm5+ZNt9+qpwFS+8TDgQiRrQi2hDxOuiXdwYs4i2EI5KL2TM2UhJsWP0pCxb98UJ/wIgvAvEiZKfiic6ARXSZDBDx1xdXnHvkrZlOUaUIWHRScXqDBkAhnkiseqSApZc6iUeXdx0rHTt+hoNUqQOWHsBu9xoo8CcPwhHHqd1g6Qa7uHPh0MkzY8e/6yxVSoFFv2Gtt8MXMyRw+8t3bQULfU8uqLh3mLzhhybMcJwq1cCi/+z3XnGdSG4gYrfZ2LIVLPLW0fri1vojE2eqQJWCYNFJsfeGRFnBok3eUC6nwKLIBKew4AL4QlNL+uqGPFj0sVt9gj4IxI7w2Qks18BiHhavHO/u8zz/7iJ1qFIWLPo7R0Qr4fBsUYhhm0K0CSy2tBP0L1D1MGnxGqWoUhks+ibhcDVDkHVeropgsSRhYSK479myTdtVo0pxsIj5UDQrIlsKfRkIe2r27QBL/ItypLxSQaoUB4v+vdUewTwI3PHi6yelwSJ/AR+diGq/0tP71JS5ebCy6y/uFnINkhtCDNGG3AfLwcJgFLHZIW/q8nVqUuUKsOjbaoSMLYYDt5a7wWIlIvgMhYeKlKXKLWCxf4RgTjOD0t3d7VawdBeDyK5ol7t7HcxcyBmw6E/tEFKIlIsxNG4Fi9gnOziKvHLeuk9UpspFYNH3NwqtEMmosTSD2UKwsK5ECikraxsUp8pdYN1c4A1HhSYtSy0tq8BCA4pMtpFI9LU5y/Ngye1Ly4RchgyQdctDq8Bi3z2RNCAq4tWnynVgfWOpR2RLCP2YDDeBpbvaM/qumK4M7X6WB0u8zzqR2b2OT8u6VC1LwLo00DK+jD1hXEGVG8ESnLRIZLIonUY+WExUZGhk/B6wM4zcnYbyYA3pc4uDIrqFwbIi5UE+WDh2RbwMR1UNC+YMWN9a5hHJBGSwrHCWygeLGKdI8vHkpWvzYFndRSpdSVzmjDvVwcIe5DC+jBU4zR2XVSiRyHmwRm/IXAxNcilDJv1sTslg4cwVWcGu2bbbRVS5Fyz66fbMxHCatfR92ySDxaSaUQ+GwmFl02NyDyzO0XBEG8oEi8WFSKZofxFY3UUmLSs2C82DlejXrfb89lCgtDVz6JAhY+DUBYs6HOKDxjxe7Z2b9xx+dfayPFiy+vUf9PPEbvKGXAiEd+TW8MgEi4qJrL1t9c1tG3cdVDZuqD5Y7F/63vFgRUeWNjieUkN7tNgKFh4R82dSslPtzqMlOCOUWjYqC9bN67xEb0Qs9IzJDpjwKoKF5VRWVpZ5q4+eI1rpD7SOzVooQ4i6o0shwlQDS+eptkuaj4CBw+kg0QUvDSxRA6thirb/D+K96D+05qVaqC39O8gvhTBOD3xownsjGax/XNi/ZQM81XfLPrTui/w5iWaWNLDa2trY9Srz607dOgjWIGH/rrWu1ELt6d/a5/UdLquY9eHHD098b+SA9U8L++7e5FtxKpTFHt2GGsPX3t6uHFj19fWZIzmxoHboL68BVqIf/xetabbmz1D45vH5dcJs2zXEfrASPInvhmWy4c1qaGhQDiyhibT7cDqqkvuRv9MaZ2oBnjOdWL3+QNGZ6iUbt1ldi2EbWJQ1P7LNzybvIkkv7NYnsawZY0ZisrIcsHTLPXO8qWm+KFiJfvgr/WZZ/xyWTtDBULisugbCLNr83Wqw/m1xnKc+IztBisQ5DNnvDKIs+10OWKT1UO4s4JB4yjBYiX7wT7Tzz2h95Vosmj5eBGErP9lh8uRLe8C6/gMv+ekNPbFQJJvhhCq5oZgszgexFixRL0jZD7MHa5CwP9Vqx2meM+kJI5HwXEMTgaNnpy1QDawfrvGurwp1+szODehB0vRU80TKBEvU7jv81xLAGuxf7p/Deo5rsZAIYc9NX+gsWD9a6y2oCHX4ZBrjOJ8kbubOIMrSrXLAIpKTOSAQbJFKVXL/klZ5f7/rNS1hWA91l1oJTb78uyV2gjV6o3f7hXBXwJLFHXWnGN2yrsYgEpdTCCx8DZmLvXpPWAZWUj9zl9a9X4sG5Aa/swDr3s2+XfVhT8haZ4GQl8eI0cYFFQKL5L7MRc+dW+0AK9HLbuoPHEV6RQibuHC1LLAe+NS/tyHsC2fg6UJ33YeVa2cUzzQpeTYek1hmQ/K7oYMdLAcL/0dmJ1bLclvBSvTym/qZjmQo+U0f/M4I1qOF/mOXIsFMkdLG3sa1Veue2PXUTzeNpt+5ZYzJ5T2Zn7JQ0F1Z6FaFwMLXkHmZWj/JGbASvfR6keA352teTdhwYOk8pT/LGXTOd9XA02OfP6nzlNybPc2KoGDAbWQbWOQfZl6b1LzgMFiJfuJbWusHWiiDacIOg5wLTOCI4Hfy3/95Ud+bB/ozM9PvvRGNRSs7qxafWvpA4cNX85ToR5uPmZE8Z8cZTa5M5wUMhWT5L+SAJVKZo537X1XASg5+t2QOfrM9eCox6V4cjoaLW0vnlM6/77Nfp+Ep0bfUbDXpysKrKdH5zlAqBJZQPOfsE8qBlRz8vrRAC2R/UFYwEjrWfPy94lljtv5KhKdE33DuYzOSR1FITFdnEBlKhcA6efJkZiO0+mF1wRoMTf6VSGgyiadgUcuJmcWz7/n0PkM8JXpB1XozkkfsCF8WWBKvZiNYVQ+4AKzk4HfjNM1fd03CPCHvnsZ9k49NvWPLPdnxlOgrK1bnwTKnCqsedBNYid53DdVQ23XBJE+JvqaqIK8KzRnvxPVcR1XdxOGepqB6nRSwdtTvzBvv5twNF95wGVXF3+E7PKgmWi7Rk7XGM3ueNw8WS8i8u8Gcg7RhqqvA+nKKKzUS8T39sO83D2pJ3x9PyDP6k7tMglXfYyobOMcdpEIx9ksL3QTWlRQNFVw633PDf9GDyxYk/724rcQMVXdsuRs/RT6kM7xTXSQI3bHRNVThGUm2PMpLPDd9VwfLc+N3IyXHk/937sn5WYP12sE3TUo+x4PQQmkzfaXuoOro3yfndcW6u7z33BanaqB777oldmXwYSOxSPqgTZpOANG85HM5bUYo0S/c5Q6w+n1Xgya6/80Xk6nSu///ntOS/HbtvvbswDrdYXZBl+OJfsKpyV9RnaqWFSmrpI3rrqZK76GPUyabHfWfG6Xqwe2PRGNma5pzPDVZtJii5HtKU1V+W7KfPVpX47ntB8OB5bnl+uj5lCq88YffMhbMqV5vUuy5X0whukw9+7i6VB38Cy2SpFP8Pt/Ye4alaqD7fn1nLCm9MRAJ3P3pLwWp+vnmOzv9ZucGiSaR3vC1yqqAtbdgtXmxwqGbFEdlYMak9FTpPfDe5JTgQleNIFjTimaYF7sVBauyriatxJ7s5MxWZF+JqqGbCSnLjP27RajSe3j3jtRQz/qMVOFWNZk4qjf0oNwSe4m+VmlgYfdhwmea2ULawT9TjqoT30yufY21t3pH3ygOlvf2Hw0J9Ty95zlLMxriutrvlxgl1JTdFER0G6OT/6MYWH+khTpSQjfPPCJOVdzYempscqinN9h7+yd3DEfV/YUP+sI+8wLHNcCmIBLBUnQbI6p0hKKhjpdUDOmXt6ess5YvNEpVPNSzfFHydU60Fl+Tqp9t/kVpm5yEJ1ZLcrejlbu/re1bRdpTtioauhmbGropHQzdGO2EekqLkq825+S8q8FaV/2RLHtIVrQ42XJXcatIYS9ItH/vK1VCN4OWb6y31/vL27OkSje2xvyE+M/gUEWHhnreOvq2rJFDbREllDh26m5uq4lvx61IKunQ0M04M1TFQz2vpYR62ryDoZ6XDrzqDctRNPoBlhLXg5ri23GL7m/bucV5qpqXpYRuNq03T1U81LMpRdkV1m2HqlcOvCbFYE+skzhiTZPalD5AQPDIk34FdORvHA3d3JIauqlNF7ox2gn11KQc1/hhZQFOeYlCxn0lFwLVjzwx4As+/6wqoZtg0PfofdKo0r0PD43RAn7Nmoa3SfoJ4VxTbmhIc+pYOa23yDGweotTQjczp8ilKh7q+d07VlDFdIVTVGKeTPxrrv6xcvpBmEKJHPi77afqQkrGZvjgHiuoiod69uyUDhbWlfTpyh0HYRrQhpjPDodu2gyFbgx7H35+Q6ylWaJgdUtI1uazyXrQBUf3asKHjWtRv3b0qzaC9Ycpm3/Eov4XnrCOqrj34dlHtUhElmBZCcpK70xuBJ7dcdi4vmwhRJr5pQ2T7QOrc1tK6Gbl+1ZTFQ/1rFosRap4nnG1S1dYDBODJdHhbiFY2kAKPA43gcm9M8MJKBaFbk6dzD50k02o54R5MwibXVZu5xC/qBWzoFVgYQdgDQh9D0iEsjx089WhoZv7breJKt3YuvensR5TuoaSLIk1XkM8+NKNNgvB0gYqDYVMeDaftdrSSj3yyT/+JTup+iLU87yWrbphJYgZZIW2wmyXWOxqE1jM20QJxKbjeRZS1TQnRfd+8nv7qYqHerZsyC5KJjdNdEgYp6+vz2VgaQPngWUuj9YG0kqLvmZN6OZmC0M3RvutQ0M9IhYFVAnJ0HhjJSjxrC9bwcILL5pDTbad/NDNn6dswW1B6MZwqOfhe8VDPXitMNgl1kpc7WWQ7m23CSwDk5ZmwX5/vSlpd4FZU52lKu59mDVNRBik3SE6uRlXQ6YriZsfOQAW3wnR+RbXg8SUh9pXU8bp4F4VqIqHevbuzEgVHma5+exDGoNihVPUPrD0SUt0ym1bKyl0842hoZtf3KQOWP2hntaWNBoQiVlKFSaKpdaVTWCx7sBWEHUZS1CIhG7aUkI3Lz6pDlVx78Nzj2nXEoheUG6RxzLhu2I4rFsM2geWHuQSNRcwt5lvTIVuUvbjD61aohpVce/DqiXX9Cxk3g3KXINaK0LOzoCFG0YoszQu4NP9uXjZUVX5qxRKT5fZF7rJItRzcjAzDP+n0OZ1MgbCIq+YA2BpA9WVBhKJsjsnbEjops/u0I3JUI8VvvWrQ0PWrTSdAQupYZNiNgqHhMYZBsuXAm7g7ddVpiqeaDrhFc2uhvAZAhvwtRWshA0hvEtYzJghnxq6CW/ZqD5Vce/Dpx/bIHzELr0EQxWwtIF0GgNRTzIBBU+95zDV5INJKBKc8LJbwOJWNVuUoKWLTYfBYh7Gg5J5U5rBRd1lrfjbGag68Mea7xolvOF9u4ZsSqucjTXmJ9ykDWJnqw/EbpsSdAAs7YtULaH80jggV7TS69KB1fjusBx7PcH35zgZeB6u3/bfwcVzY7YoJo6usC7pSiGwaLhqcANGxJPB2W6ZU3evrQRv1GIZrhPrvhJcMo/kAiWQ+vF1FJzFOjvsETVCRtQG1kyuBotGyMJYitk12Tryt1pQdLsBoijBRbO9o29wTPGNviH4/uxYW4udcsY1LZQjnjNgoe9J2zC2CwXlyxX3JIH1Je3yNsMf7PeFt27yPX6/rdkyT9wf/myTdbXRaZzsBLNtNq0cBktfADNLG4xgxLT6t/uRAiwcXWbIbmlmo3aG3EKeHhpD3CbaWOeIeFF/iFfiFvCuAUsbqD3CrjRcfNK+Xiv9fr8zQsrc2dwU/mxzYNLrHGQiQd/dfWtg8htckMs6KFhizHit7DfYVQFLFwFssXIxiEPEipshwSZy7FBozQrg8D/zaP8+bD++Lo0ZTsiIklReHFq7MnLsMG/XFGh4QRGpDfkLSoOlDWQziha4OmAMRikXQ29Gmy5Gz1b196aL/MoftVhUwfvV0+QtzTl2DVi6A4IkIWen7hxoOlWOOBcUBUsbOL0DthSdt9zQ9GJ564ov3AqWvpDBOLAzUJozDaHZkCToVrC0geILFQxPdzWW1QjN6uIId4Ol2ZWhmzMNQan5VRyloLD0U2Lk7g6dkw3fOl5QNRc9o9QUGS5jYj7EEyORSB6gqxtiQThEbBz0rbsSLG0gnkismm9kfqk4pOFPRiwIx6k4oLvBSrYhDOQG5npDFAhEEWeVi8HSBoqWUIsU+YgWkOVoQ+uh/sgFdYUneZQrZMqcT768Om5l+xsPzuNjraus/twHVsK24PvK1GVPyaUijXmaiYrKLXe5jke5S8p8Xym5xMjAGSF9C2HVGg/IY/KwPLJbJiq3gpWwuki6xdelQhjfOt3HA7LPgkun51HuFT3u5uqBZvWWBzY3fVc0nsvVoa1Rbh8GJi2GgWVjDuAFUjwIj6Na4G8kgpVQHHzF2QaYvBHXmSPYUtw2N88j5IxyzxGwEsqRNSPWLjVPrvDXc5PcKjfMbedYTkdOgaU3/Ie604tQGn5qBaNp3BI3htbjJrnVnEydzUGwEo4JLBVWVRzGx0GPDKTjyytugNvgZrglbozbc53WzoOVYsFguDCQaBzsGFQPZr5tSRN8EB/Hh/LR3AC3wc3kvAduRICV3HBe43JkzigrK2Px1djYyBRCaqFEzrgUF+SyXByY+CA+jg8daSnXIwusZEXJSLO/T0NDA2sxhh9vJDYZvwIBKRXoKfjA+sEeigy0BDc0/sh/8QJexot5C2/k7VyES3FBfuXifEQOK7s8WKImP8njLPsJ9HKkO+E5jGvSntBfmETgUjrQ+IFf+SP/paci8mLewht5e76CLdH+H5nMNBUt+3p0AAAAAElFTkSuQmCC",
+  "description": "Displays the latest values of the attributes or time series data for multiple entities in a polar area chart. Supports numeric values only.",
+  "descriptor": {
+    "type": "latest",
+    "sizeX": 7,
+    "sizeY": 5,
+    "resources": [
+      {
+        "url": "https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.3.0/Chart.min.js"
+      }
+    ],
+    "templateHtml": "<canvas id=\"pieChart\"></canvas>\n",
+    "templateCss": "",
+    "controllerScript": "self.onInit = function() {\n    $scope = self.ctx.$scope;\n    utils = $scope.$injector.get(self.ctx.servicesMap.get('utils'));\n    settings = utils.deepClone(self.ctx.settings) || {};\n    settings.showTooltip = utils.defaultValue(settings.showTooltip, true);\n    \n    Chart.defaults.global.tooltips.enabled = settings.showTooltip;\n    \n    var pieData = {\n        labels: [],\n        datasets: []\n    };\n\n    var dataset = {\n        data: [],\n        backgroundColor: [],\n        borderColor: [],\n        borderWidth: [],\n        hoverBackgroundColor: []\n    }\n\n    pieData.datasets.push(dataset);\n    \n    for (var i = 0; i < self.ctx.data.length; i++) {\n        var dataKey = self.ctx.data[i].dataKey;\n        var units = dataKey.units && dataKey.units.length ? dataKey.units : self.ctx.units;\n        units = units ? (' (' + units + ')') : '';\n        pieData.labels.push(dataKey.label + units);\n        dataset.data.push(0);\n        var hoverBackgroundColor = tinycolor(dataKey.color).lighten(15);\n        var borderColor = tinycolor(dataKey.color).darken();\n        dataset.backgroundColor.push(dataKey.color);\n        dataset.borderColor.push('#fff');\n        dataset.borderWidth.push(5);\n        dataset.hoverBackgroundColor.push(hoverBackgroundColor.toRgbString());\n    }\n    \n    var floatingPoint;\n    if (typeof self.ctx.decimals !== 'undefined' && self.ctx.decimals !== null) {\n        floatingPoint = self.ctx.widget.config.decimals;\n    } else {\n        floatingPoint = 2;\n    }\n\n\n    var ctx = $('#pieChart', self.ctx.$container);\n    self.ctx.chart = new Chart(ctx, {\n        type: 'polarArea',\n        data: pieData,\n        options: {\n            responsive: false,\n            maintainAspectRatio: false,\n            scale: {\n                ticks: {\n                    callback: function(tick) {\n                    \treturn tick.toFixed(floatingPoint);\n                    }\n                }\n            }\n        }\n    });\n    \n    self.onResize();\n}\n\nself.onDataUpdated = function() {\n    for (var i = 0; i < self.ctx.data.length; i++) {\n        var cellData = self.ctx.data[i];\n        if (cellData.data.length > 0) {\n            var decimals;\n            if (typeof cellData.dataKey.decimals !== 'undefined' \n                && cellData.dataKey.decimals !== null ) {\n                decimals = cellData.dataKey.decimals; \n            } else {\n                decimals = self.ctx.decimals;\n            }\n            var tvPair = cellData.data[cellData.data.length - 1];\n            var value = self.ctx.utils.formatValue(tvPair[1], decimals);\n            self.ctx.chart.data.datasets[0].data[i] = parseFloat(value);\n        }\n    }\n    self.ctx.chart.update();\n}\n\nself.onResize = function() {\n    if (self.ctx.height >= 70) {\n        try {\n            self.ctx.chart.resize();\n        } catch (e) {}\n    }\n}\n\nself.onDestroy = function() {\n    self.ctx.chart.destroy();\n    self.ctx.chart = null;\n}\n",
+    "settingsSchema": "",
+    "dataKeySettingsSchema": "{}\n",
+    "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;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Fifth\",\"color\":\"#607d8b\",\"settings\":{},\"_hash\":0.2074391823443591,\"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\":\"Polar Area\"}"
+  },
+  "externalId": null
+}
\ No newline at end of file
diff --git a/application/src/main/data/json/system/widget_types/radar.json b/application/src/main/data/json/system/widget_types/radar.json
index 18bc07ac98..06c51d6296 100644
--- a/application/src/main/data/json/system/widget_types/radar.json
+++ b/application/src/main/data/json/system/widget_types/radar.json
@@ -1,25 +1,26 @@
 {
-  "fqn": "charts.radar_chart_js",
+  "fqn": "radar",
   "name": "Radar",
   "deprecated": false,
-  "image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAACgCAIAAADGnbT+AAAABmJLR0QA/wD/AP+gvaeTAAAR4ElEQVR42u3diVcV1xkA8PlXasxiNpOaxJg2S7Vp0iZNm72nSZqYJieWtNEkxrgbo5G4RMUFUHYCiKASBEFEVJAHuARlEQQVkeUBIgi8jbf3m7k4mbx15r2Z92be/e65J2cYGKOP35lv5rvfvZdxYwvYLl++XFZWNjIyQr60WCzl5eU5OTk6nc7lcuHn468x+BH4a06nMzk5ef369SBpfHycnNy6dWteXl5TU9OWLVsAHH5KCEtyq66u/uGHH4AXf2ZoaGjx4sXkTHd394oVK/BTQliS2/bt26uqqg4fPlxaWjo2NgZn2traNm7cyMfEuLg4h8OBHxTCktZWrly5bt26+vr6wsLC5cuXW63WxsZGuIeR79rt9gULFpjNZvygEJa0tnDhwt7eXnIcHx9/kWubN28mZ2w2G8ACbfhBISxpbdWqVfAgRY6TkpLq6uquX7++Zs0acmZ0dHTRokX4KSEsya2goCA7OxsO4JUQntkHBgbgLgUHPT09cLKysjIxMRE/JYQltun1enIAz087d+6E+9aSJUvgKZ6cvHDhwtKlS9euXbt69er+/n5ykj/AhrD8qoJXP+EZePsTZhygQV7UZDIJz7S3t6MthBVEFcQ7qRfCGyLaQlghqtJzDW0hLJnvVYFhoS2EFWIEDAoLbSGsUJ6rxMBCWwhL8tO6SFhoi3ZYUt8BxcNCW/TCCiGzIAkW2mJQlUKwKLfFoCpFG7W2GFTlr8G4zSFBg/JRd0g173TaYlCVvwY1M8uWLau404aHh92h1rxTaItBVf4a6Nm1a5fwTDg177TZYlCVvwaTKRISEkpKSiD2QVmfO+yad6psMajKX6utrd20aRNUYqVlZr8YX/FEhmFW6u03dtTanFNKQqh5p8cWg6qCto311t8kGvgOX7rDqHmnxBaDqvy1rq4uckOanWkUwnoi0+gOr+adBlsMqvLXMjMzjxw5AgezMgy/gpXOzooOs+Y95m0xqMr7WnIAk1ThUf3TDanTd98WwvpzfIUsNe+xbYtBVd7X8l8e67LP2MtimpNtmpnGBsR79hhHzE65at5j2BaDqvxdW9hum57Mqppfaqnvc5S1DL2QOwZf7m+zyegjVm0xqMrntUmNU2+Ciyonz+gd0AHW6uMjcObNIrO8PmLSFoOqPK51uNwrTk0CoLuSDN/VTakisIouDs3YywbEq7edaIsKWHKpsjrccRUW9lkq2bDzvJVXRWBBh7AI391yxiq7jxizxaAq/tqxSReEOXDzYIoxu8UmVMXDymqxsc/yWUaHy422YhmWXKoGja4X95sAzeOZxkOdnqp4WHDwu2z2x2p6HEr4iBlbDKqC484R51PZ7MPT0znG8mt2b1VCWF+fZKPhZ5UWhXzEhi0GVTX0O0iO6qUC08kbvlUJYYE8eK6/b48BQifaijVYcqmquJMCfbvIfLrX4U+VEBb0VwrZaJjTalPOh9ZtMTSrgid0uPcAkQXllvr+QKo8+tazbJbr1YNmRX1o2hZDpyqIYds5HNMSDV+dmAzMaE/Z+XzdFXJ8utu8o0i3Nqtixp5xuPzKqBNtxQIsWVRBpmDZnRTohrogqvbXXX178abN+SfIl19uz/su+2je6Y65O1vhT/i+3qq0D43aYmhTZbK5PjzCvtZBDj250RpYVe0Ny4LvUpYlHiCwjl4afn/ljvo+NhmRUDPA5iYyjA6nG21pGJYsqm5Pul4/xKZAH0ox/thqC/os9X1uZcKhWlBFYBXUX1u4JZuPifcn9MAfdaLbHgEfmrPF0KOqd8I5L8/ElYCaijqDqyo63/Pp9+l1vVYeVk51+xfbcsl34fzT647BnwZDQJHxoS1bDCWqOkacMA4DDp7JNZZ32YOqAjdx8Wk//dwLxzys3JrLn2/NIT+g65l8dcnOu5LZUcVRiwttaQyWLKrq+hwPp7KqXi4MlAIV9rRjF//x1eaPv02G/t7y7dDXppcWN/bBIxf5geMdt99dtu21g+wtEAYQI+ZDK7aYmFd19JodsuRsCvQnc22fhGQV3/k7Ftyl4OG95KIejncfboCH+oRzbM7ir4WmSPrQhC0mtlVlNE+lQOOOik2B8ul1b1jkMevDNbv/syH1k/V7jzQP6vqn7oVtt5xoSwOwwldltdnEp0CFquDVL/DPNPTbq7uM/JefHGWTF19X3IqwD5XbYmJSlWXS9vVJLgWabNjYIE0VxLugY4XCvq/NDv+jR1PHe/r0aEu9sMJXNWayzi81T6VAL9hkURUAFvRnc9homF5zPfI+VGuLiTFVQxPW1w+yqh5JM+a32eVSFRjW6hr27vhxmTkqPtRpi4klVV0j1rlcCnR2lqn4ik1GVYFhVV63w0Qx6PpxG9pSF6zwVbUOWp/kUqDz8ozwm5ZXVWBY0N/gRorSLtqi5UNttpjYUFXTPfkQ99oPKaVTN+RXFRTWzp/ZN9AX8k1R9KEqW0wMqDrYPnkPN2X5XyXmOtEpUEmqgsKCqdKPcPXNLTedaCv6sMJXldJokZoCDUFVUFjQP+UmJK6pmYyuD5XYYrSr6lJb2wadhaRAV1ZbJBGRqkoMrAOXuYRWmtHqcKMtRqOqmi+1/6+CfQG8O8mw7axVaVUi+9xcNhqWXbVH3UfUbTFaVNXY0v5+iYmkQPdetCmkCn4sqfTsusyyXcX1UNYnrHlfn1UO5Q8wtuNxyTe1k9zqNGY1+IiuLUZzqnQXO14uYG8Mj6Yb89vtyt2rlu4uhFIZmEYBjL7ake9R8w4Vf1Bc6nHJ8W47vEZMTzLAvGrKbTHaUlX1c8dz3PjJk1mmw1dsyqmCnwRMUO5HKt9hPgX8V1jzDrVZUKrlfSEU58BfD6rpVeIjWrYYDakqPnNtVjqr6o/7JKRAw3+ugmvBEAQ+j5p3qAQkyISdLKwFAwDq8REVW4xWVOXpumARGPidwSzk6p4IqcqsaoEC5XeWboX6d++a97e+3Fhz3eSd0Potp//CoINmW4wmVO06eeNuLgX6fqmEFGj49yq4EEqQoVgUKpJBkkfNO8CC+Oh91WeV7CM8rN6mKh8RtsWoX1X8sd5piVMp0AZ9hFSBmINnu/kv56/eVdo04F3z7nt6Tye7hhZUlprtbmptMWpW1a/Xf1nST1Kgq2ok5zPDuVfBIxREQJIRrWi7BYYg6nnXvPu7/Pl9bDbkcKddbT4iZotRraqe/oEPDgyRVRu3nbNGTBWfXs860frvbxJhauFHa5Pg2GfNOznJH/B9vW6SjF2q0EdkbDHqVHWtR/96/jBZtREmRERSlbDmHd4ET10zeCRCPWreoRc2dHnYgklm9+5h14boN7jotMWoUFVz18C8bHbha3i92i8lBSqLKqk17+QN0dvWO8VsQmvXeas6fShti1GbqnNXBuaks1uM/P5H05FralEVdBDa2xaMNcG/4rlck0utPhS1xahK1fFLg4+ksutOPZ9vguER9agSU93gYQtqeB7LYBNa5/QON322GPWoKmy8eV8yqwrKfGt6HapSJQaWt63Pj7OP8DARTc0+FLLFqERVasPw9KQJtjTgCLtxjdpUiYTlYQsmdECi5IEUo8nmos0WowZVm6pvTfv1xjVqUyUeloetF/PZhNbBy2pfQ0t2W0x0VcGqjV+Uj5JVGyH3o1pVkmAJbcXXs9Hwn8Vm9fuQ1xYTeVWwWTcs3Qn74c7OMj6XzT5UwThggsQUaIRVSYXF2zrQODQ92Ug2vIDNpG1OWmwxkb9XeezdDYn1rBabylWFAIvYmn9wyHujchpsMWGqam5u7uvr00tpj6dPCD/rB1MmyO9MfIfh4X21nTAqLPXCcK6FC6FLvWpmyrjwH/tY+oT4Dwo+WPh4Ozo69NJb+NeGaSsqsH71WT+wdzySsA6duxFRWKnjHhuVS/0Fd3Z2howjnGsHBga0HQrJYG1NT+TSoVBhrJVQGNpvN1rXRv/hHT5fWGcB+nuHxmbsYSMj7NVWcFnVtkJ7eE/QsYOed8E6JZkGqQ/v2lUV/XQDtLNXb87NGiFP8d+cnlStrRDSDeWtN8liIbC2oPplyKhKLQnSHv3QwmI9CRYwy+XEDbsKbUlNkIKqnzptZAO6myYXVapUNKQzODiYWn2d7Bs4J8u0v111tiQN6YAqOP6ojF0BYGX1JG2q1DUIDbZONnb8/YAphLAYAVviB6GJKpigBrV+08TtEBZjqtxqK5sBW02t7WuqzSQsvlUkISwqbUtk2QxRBX1xFTuY80m5hUJVbhUW+oEtuLbsyiRZbgpGQnJabWqwJabQj1cFZT9k/ffzAw4KVbnVWZpMbHWP2l7jlqmFtT2XV4ud+KWcraClybwq6Ou41UH+dsBEpyq3aidTEFuwXDvkfkhFzZtF5ipxYVEhW/5geauC2lFYWgL+zrDbCp2q3Gqe/kVswbXwFPwoCYsZojYZVMiWT1jeqqDv4DbYeTbH5HBRqsqt8gmrvC2YREU2sISdJmD/EjFLQspuyxuWT1XQ/5QffI/72FblVv8Ue94W7JAL+Wuy3Ciks8VMtZDXlgcsf6qgBIgsGBmgHDnmVbk1sSgIbwuOq7rtZC2XWRnGbBFVXDLaEsLyp4pf8D3AGA4NqtxaWcZIaGvA4IIHefFhUS5bPKwAqoKO4VCiyq2hhdeEtoRhEXYMqAi2Fa8stgisAKqCjuHQo8qtraUihbag6XodT2QayX5MqU02pW1BbSD0AKoCj+FQpcqtucVtPWwNm13vHjaTST5Bw2KYZfJQdwo9QPI9wBgObarcWlyO28MW5IogLE7nwiLsJX40YFgMxxYpTfb33QBjOBSqcmt0AwEPW9Bg/cjZXFiEwpuUgCu/h2wr8FjhtzrfYzh0qnJrd8sTb1u3zC6onSfL/8GM6gBhUfbpX/7GcKhV5db0Jk3etuAVH1bDJmHxpYJAYVHeCas+x3BoVuXW+rZy3ragcfePqbC4x/+e0DJOsSdjOD+22FCVimApYWvE7PqgdCoswlrL/lbwlmVREO8xHFTljo2te33agl9yepONrA7/lwJTuZ+wGP4yRh5jOKhKXbCUsAXtTL9jDhcWIRfgLyyGs/AaGcO5984YDqpSIyyFbI1aXPODhcWQl4okYzhkEwpUpV5YCtkShkXY4KnE17ZhISxuKxzDQVVqh6WQLWhNQ85nctjXN1i7cYev5bikLsfNj+GgKm3AUs7WhNUVV2Hhw6KuX4ItD1j8GM6ZPiuq0gws5WyRsHgPFxbn5Rm9d9P0Z8sDFhnDeaXQiKo0Bks5W9Cabzqf5cLi/SnG7V5h0actISx+DCetphtVaQ+WorYMVtd/ubAIHV7uavuC2BLCImM4T2WM9elRlTZhKWoLWt4lG7zZcZvteoZFD1tCWGTXuN26W6hKw7CUttVy0wk73pCw6LF/ndAWDyujib3PzUyZELktAIWqNANLaVsQFj87Zvll3cpeH7b4mveXckekrqVGmyotwVLaFjTYP+L+vVxYzDUWC8IisUVq3pNO3ZgmGMNBVbEAKwK2Woedf+DC4oy9xq1nrd417+8WjQXYSBxVaRVWBGwZba6FlT7CIhS8Z9X1SFpLjVpVmoQVAVvCsAj7cR7glnOGm1Zcyaj4tdRoVqVVWJGxBbelF7jSULhLwSyJh1MNZEGlhn4HqopZWJGxBQmFL45bPLY7ELkJAM2qtA0rMragzeQGm3/ZtiTTiKpiHFZkbJGpGXyHklRUFfuwImDLY/OfwKEQVcUOLKVtkc1/YNMy6IH3w0FVsQYrAvctsuUa3quog6W0rcCwUFUsw1LUVgBYqCr2YSlnyx8sVEULLIVs+YSFquiCpYQtb1ioikZYstvygIWq6IUlry0hLFRFOywZbfGwUBXCktMWgYWqEJbMtvq4hqoQlpy24NpmrgUe1UFVNMIK01Yn11AVwpLZVtBBaFRFNayQbYUAi1pVlMIKzZZUWDSrohdWCLYkwaJcFdWwpNoSDwtV0Q5Lki2RsFAVwpJmSwwsVIWwJNtStOYdYdFrS7mad4RFtS2Fat4RFu22lKh5R1hoS/6ad4SFtnzDQlUISwZbMta8Iyy0JX/NO8LC9itbstS8IyxsnrbCr3lHWNh82Aqz5h1hYfNti9S8oyqEJb8tVCW+/R++masNzLdd0QAAAABJRU5ErkJggg==",
-  "description": "Displays the latest values of the attributes or time series data for multiple entities in a radar chart. Supports numeric values only.",
+  "image": "tb-image:cmFkYXIuc3Zn:IlJhZGFyIiBzeXN0ZW0gd2lkZ2V0IGltYWdl;data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjAwIiBoZWlnaHQ9IjE2MCIgdmlld0JveD0iMCAwIDIwMCAxNjAiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CjxyZWN0IHdpZHRoPSIyMDAiIGhlaWdodD0iMTYwIiByeD0iNCIgZmlsbD0id2hpdGUiLz4KPHBhdGggZD0iTTMwLjk4NDQgMTQwLjA1MUw5OS40OTIxIDIwLjU3MzNMMTY4IDE0MC4wNTFIMzAuOTg0NFoiIHN0cm9rZT0iYmxhY2siIHN0cm9rZS1vcGFjaXR5PSIwLjM4IiBzdHJva2Utd2lkdGg9IjAuNTcwMzEzIi8+CjxwYXRoIGQ9Ik00OC42MzU2IDEyOS42MzdMOTkuNDkyIDQwLjI2NDFMMTUwLjM0OCAxMjkuNjM3SDQ4LjYzNTZaIiBmaWxsPSJibGFjayIgZmlsbC1vcGFjaXR5PSIwLjA0IiBzdHJva2U9IiNFMEUwRTAiIHN0cm9rZS13aWR0aD0iMC41NzAzMTMiLz4KPHBhdGggZD0iTTk5LjQ5MiA1Ny4xODc1TDEzNS45MDIgMTIxLjE3Mkg2My4wODI1TDk5LjQ5MiA1Ny4xODc1WiIgZmlsbD0id2hpdGUiLz4KPHBhdGggZD0iTTYzLjU3MjkgMTIwLjg4N0w5OS40OTIgNTcuNzY0MUwxMzUuNDExIDEyMC44ODdINjMuNTcyOVoiIHN0cm9rZT0iYmxhY2siIHN0cm9rZS1vcGFjaXR5PSIwLjEyIiBzdHJva2Utd2lkdGg9IjAuNTcwMzEzIi8+CjxwYXRoIGQ9Ik03OS40NDM4IDExMS42MzdMOTkuNDkyMiA3Ni40MDUyTDExOS41NDEgMTExLjYzN0g3OS40NDM4WiIgZmlsbD0iYmxhY2siIGZpbGwtb3BhY2l0eT0iMC4wNCIgc3Ryb2tlPSIjRTBFMEUwIiBzdHJva2Utd2lkdGg9IjAuNTcwMzEzIi8+CjxwYXRoIGQ9Ik05OS40OTE5IDkzLjI4MTJMMTA1LjA5MyAxMDMuMTI1SDkzLjg5MDVMOTkuNDkxOSA5My4yODEyWiIgZmlsbD0id2hpdGUiLz4KPHBhdGggZD0iTTk0LjM4MDggMTAyLjg0TDk5LjQ5MTkgOTMuODU3OEwxMDQuNjAzIDEwMi44NEg5NC4zODA4WiIgc3Ryb2tlPSJibGFjayIgc3Ryb2tlLW9wYWNpdHk9IjAuMTIiIHN0cm9rZS13aWR0aD0iMC41NzAzMTMiLz4KPHBhdGggZD0iTTMxLjA2MjUgMTM5Ljc2Nkw5OS40OTQ1IDk5Ljk1ODUiIHN0cm9rZT0iIzlFOUU5RSIgc3Ryb2tlLXdpZHRoPSIwLjYxMzA5MSIvPgo8cGF0aCBkPSJNMTY3LjkyMiAxMzkuNzY2TDk5LjQ5MTkgOTkuOTU1NCIgc3Ryb2tlPSIjOUU5RTlFIiBzdHJva2Utd2lkdGg9IjAuNjEzMDkxIi8+CjxwYXRoIGQ9Ik05OS40OTIyIDIxLjE0MDFMOTkuNDkyMiA5OS44NDMzIiBzdHJva2U9IiM5RTlFOUUiIHN0cm9rZS13aWR0aD0iMC42MTMwOTEiLz4KPHBhdGggZD0iTTk5LjQyNzIgNTUuMzgyOEwxMTQuNzEgMTA4LjY5MyIgc3Ryb2tlPSIjM0Y1MkREIiBzdHJva2Utd2lkdGg9IjAuNjEzMDkxIi8+CjxwYXRoIGQ9Ik0xMTQuNzExIDEwOC42OTNMNTEuNjYyNyAxMjcuMjYxIiBzdHJva2U9IiMzRjUyREQiIHN0cm9rZS13aWR0aD0iMC42MTMwOTEiLz4KPHBhdGggZD0iTTk5LjQyNzIgNTUuMzgyOEw1MS42NjI0IDEyNy4yNjEiIHN0cm9rZT0iIzNGNTJERCIgc3Ryb2tlLXdpZHRoPSIwLjYxMzA5MSIvPgo8ZWxsaXBzZSBjeD0iNTEuNjYyOCIgY3k9IjEyNy4yNjEiIHJ4PSIyLjE3NDMyIiByeT0iMi4xODQ0NSIgZmlsbD0iIzNGNTJERCIvPgo8ZWxsaXBzZSBjeD0iOTkuNDkyMiIgY3k9IjU1LjE3NDIiIHJ4PSIyLjE3NDMyIiByeT0iMi4xODQ0NSIgZmlsbD0iIzNGNTJERCIvPgo8ZWxsaXBzZSBjeD0iMTE0LjcxMSIgY3k9IjEwOC42OTMiIHJ4PSIyLjE3NDMyIiByeT0iMi4xODQ0NSIgZmlsbD0iIzNGNTJERCIvPgo8cGF0aCBkPSJNMjguMTMyOCAxNDkuMTc2TDI2LjUxMTcgMTU0SDI1LjM3NUwyNy41IDE0OC4zMTJIMjguMjI2NkwyOC4xMzI4IDE0OS4xNzZaTTI5LjQ4ODMgMTU0TDI3Ljg1OTQgMTQ5LjE3NkwyNy43NjE3IDE0OC4zMTJIMjguNDkyMkwzMC42Mjg5IDE1NEgyOS40ODgzWk0yOS40MTQxIDE1MS44ODdWMTUyLjczNEgyNi4zNjMzVjE1MS44ODdIMjkuNDE0MVoiIGZpbGw9ImJsYWNrIiBmaWxsLW9wYWNpdHk9IjAuNzYiLz4KPHBhdGggZD0iTTE3Mi4yNTQgMTUyLjEyOUgxNzMuMzI4QzE3My4yOTkgMTUyLjUwOSAxNzMuMTk0IDE1Mi44NDYgMTczLjAxMiAxNTMuMTQxQzE3Mi44MjkgMTUzLjQzMiAxNzIuNTc2IDE1My42NjEgMTcyLjI1IDE1My44MjhDMTcxLjkyNCAxNTMuOTk1IDE3MS41MyAxNTQuMDc4IDE3MS4wNjYgMTU0LjA3OEMxNzAuNzEgMTU0LjA3OCAxNzAuMzg4IDE1NC4wMTYgMTcwLjEwMiAxNTMuODkxQzE2OS44MTggMTUzLjc2MyAxNjkuNTc0IDE1My41ODIgMTY5LjM3MSAxNTMuMzQ4QzE2OS4xNzEgMTUzLjExMSAxNjkuMDE3IDE1Mi44MjcgMTY4LjkxIDE1Mi40OTZDMTY4LjgwMyAxNTIuMTYzIDE2OC43NSAxNTEuNzg5IDE2OC43NSAxNTEuMzc1VjE1MC45NDFDMTY4Ljc1IDE1MC41MjcgMTY4LjgwNSAxNTAuMTU0IDE2OC45MTQgMTQ5LjgyQzE2OS4wMjMgMTQ5LjQ4NyAxNjkuMTggMTQ5LjIwMyAxNjkuMzgzIDE0OC45NjlDMTY5LjU4OSAxNDguNzMyIDE2OS44MzUgMTQ4LjU0OSAxNzAuMTIxIDE0OC40MjJDMTcwLjQxIDE0OC4yOTQgMTcwLjczMyAxNDguMjMgMTcxLjA5IDE0OC4yM0MxNzEuNTUzIDE0OC4yMyAxNzEuOTQ1IDE0OC4zMTYgMTcyLjI2NiAxNDguNDg4QzE3Mi41ODYgMTQ4LjY1OCAxNzIuODM1IDE0OC44OTEgMTczLjAxMiAxNDkuMTg4QzE3My4xODkgMTQ5LjQ4NCAxNzMuMjk2IDE0OS44MjYgMTczLjMzMiAxNTAuMjExSDE3Mi4yNThDMTcyLjIzNyAxNDkuOTcxIDE3Mi4xODUgMTQ5Ljc2OCAxNzIuMTAyIDE0OS42MDJDMTcyLjAyMSAxNDkuNDM1IDE3MS44OTggMTQ5LjMwOSAxNzEuNzM0IDE0OS4yMjNDMTcxLjU3MyAxNDkuMTM0IDE3MS4zNTggMTQ5LjA5IDE3MS4wOSAxNDkuMDlDMTcwLjg4MiAxNDkuMDkgMTcwLjY5OCAxNDkuMTI5IDE3MC41MzkgMTQ5LjIwN0MxNzAuMzgzIDE0OS4yODUgMTcwLjI1MyAxNDkuNDAyIDE3MC4xNDggMTQ5LjU1OUMxNzAuMDQ0IDE0OS43MTIgMTY5Ljk2NiAxNDkuOTA1IDE2OS45MTQgMTUwLjEzN0MxNjkuODYyIDE1MC4zNjYgMTY5LjgzNiAxNTAuNjMyIDE2OS44MzYgMTUwLjkzNFYxNTEuMzc1QzE2OS44MzYgMTUxLjY2NCAxNjkuODU5IDE1MS45MjMgMTY5LjkwNiAxNTIuMTUyQzE2OS45NTMgMTUyLjM4MiAxNzAuMDI2IDE1Mi41NzYgMTcwLjEyNSAxNTIuNzM0QzE3MC4yMjQgMTUyLjg5MyAxNzAuMzUyIDE1My4wMTQgMTcwLjUwOCAxNTMuMDk4QzE3MC42NjQgMTUzLjE4MSAxNzAuODUgMTUzLjIyMyAxNzEuMDY2IDE1My4yMjNDMTcxLjMyOSAxNTMuMjIzIDE3MS41NDMgMTUzLjE4MSAxNzEuNzA3IDE1My4wOThDMTcxLjg3NCAxNTMuMDE0IDE3MiAxNTIuODkyIDE3Mi4wODYgMTUyLjczQzE3Mi4xNzQgMTUyLjU2OSAxNzIuMjMgMTUyLjM2OCAxNzIuMjU0IDE1Mi4xMjlaIiBmaWxsPSJibGFjayIgZmlsbC1vcGFjaXR5PSIwLjc2Ii8+CjxwYXRoIGQ9Ik0xMDAuMTg0IDguNDY0ODRIOTguNzMwNUw5OC43MjI3IDcuNzA3MDNIOTkuOTY4OEMxMDAuMTgyIDcuNzA3MDMgMTAwLjM2MSA3LjY3NzA4IDEwMC41MDQgNy42MTcxOUMxMDAuNjQ3IDcuNTU3MjkgMTAwLjc1NSA3LjQ3MDA1IDEwMC44MjggNy4zNTU0N0MxMDAuOTA0IDcuMjQwODkgMTAwLjk0MSA3LjEwMTU2IDEwMC45NDEgNi45Mzc1QzEwMC45NDEgNi43NTUyMSAxMDAuOTA2IDYuNjA2NzcgMTAwLjgzNiA2LjQ5MjE5QzEwMC43NjggNi4zNzc2IDEwMC42NjEgNi4yOTQyNyAxMDAuNTE2IDYuMjQyMTlDMTAwLjM3IDYuMTg3NSAxMDAuMTg1IDYuMTYwMTYgOTkuOTYwOSA2LjE2MDE2SDk5LjA3ODFWMTFIOTguMDAzOVY1LjMxMjVIOTkuOTYwOUMxMDAuMjg0IDUuMzEyNSAxMDAuNTcyIDUuMzQzNzUgMTAwLjgyNCA1LjQwNjI1QzEwMS4wNzkgNS40NjYxNSAxMDEuMjk2IDUuNTU5OSAxMDEuNDczIDUuNjg3NUMxMDEuNjUgNS44MTUxIDEwMS43ODQgNS45NzUyNiAxMDEuODc1IDYuMTY3OTdDMTAxLjk2OSA2LjM2MDY4IDEwMi4wMTYgNi41ODk4NCAxMDIuMDE2IDYuODU1NDdDMTAyLjAxNiA3LjA4OTg0IDEwMS45NjEgNy4zMDU5OSAxMDEuODUyIDcuNTAzOTFDMTAxLjc0NSA3LjY5OTIyIDEwMS41NzkgNy44NTgwNyAxMDEuMzU1IDcuOTgwNDdDMTAxLjEzNCA4LjEwMjg2IDEwMC44NTMgOC4xNzMxOCAxMDAuNTEyIDguMTkxNDFMMTAwLjE4NCA4LjQ2NDg0Wk0xMDAuMTM3IDExSDk4LjQxNDFMOTguODYzMyAxMC4xNTYySDEwMC4xMzdDMTAwLjM1IDEwLjE1NjIgMTAwLjUyNiAxMC4xMjExIDEwMC42NjQgMTAuMDUwOEMxMDAuODA1IDkuOTgwNDcgMTAwLjkwOSA5Ljg4NDExIDEwMC45NzcgOS43NjE3MkMxMDEuMDQ3IDkuNjM2NzIgMTAxLjA4MiA5LjQ5MzQ5IDEwMS4wODIgOS4zMzIwM0MxMDEuMDgyIDkuMTU0OTUgMTAxLjA1MSA5LjAwMTMgMTAwLjk4OCA4Ljg3MTA5QzEwMC45MjggOC43NDA4OSAxMDAuODMyIDguNjQwNjIgMTAwLjY5OSA4LjU3MDMxQzEwMC41NjkgOC41IDEwMC4zOTcgOC40NjQ4NCAxMDAuMTg0IDguNDY0ODRIOTkuMDY2NEw5OS4wNzQyIDcuNzA3MDNIMTAwLjQ5NkwxMDAuNzQyIDhDMTAxLjA3IDguMDAyNiAxMDEuMzM3IDguMDY3NzEgMTAxLjU0MyA4LjE5NTMxQzEwMS43NTEgOC4zMjI5MiAxMDEuOTA1IDguNDg2OTggMTAyLjAwNCA4LjY4NzVDMTAyLjEwMyA4Ljg4ODAyIDEwMi4xNTIgOS4xMDQxNyAxMDIuMTUyIDkuMzM1OTRDMTAyLjE1MiA5LjcwMDUyIDEwMi4wNzMgMTAuMDA2NSAxMDEuOTE0IDEwLjI1MzlDMTAxLjc1OCAxMC41MDEzIDEwMS41MjkgMTAuNjg3NSAxMDEuMjI3IDEwLjgxMjVDMTAwLjkyNyAxMC45Mzc1IDEwMC41NjQgMTEgMTAwLjEzNyAxMVoiIGZpbGw9ImJsYWNrIiBmaWxsLW9wYWNpdHk9IjAuNzYiLz4KPC9zdmc+Cg==",
+  "description": "Displays the latest values of the attributes or time-series data in a radar chart. Supports numeric values only.",
   "descriptor": {
     "type": "latest",
-    "sizeX": 7,
-    "sizeY": 5,
-    "resources": [
-      {
-        "url": "https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.3.0/Chart.min.js"
-      }
-    ],
-    "templateHtml": "<canvas id=\"radarChart\"></canvas>\n",
+    "sizeX": 5,
+    "sizeY": 4,
+    "resources": [],
+    "templateHtml": "<tb-radar-chart-widget \n    [ctx]=\"ctx\"\n    [widgetTitlePanel]=\"widgetTitlePanel\">\n</tb-radar-chart-widget>",
     "templateCss": "",
-    "controllerScript": "self.onInit = function() {\n    $scope = self.ctx.$scope;\n    utils = $scope.$injector.get(self.ctx.servicesMap.get('utils'));\n    settings = utils.deepClone(self.ctx.settings) || {};\n    settings.showTooltip = utils.defaultValue(settings.showTooltip, true);\n    \n    Chart.defaults.global.tooltips.enabled = settings.showTooltip;\n    \n    var barData = {\n        labels: [],\n        datasets: []\n    };\n\n    var backgroundColor = tinycolor(self.ctx.data[0].dataKey.color);\n    backgroundColor.setAlpha(0.2);\n    var borderColor = tinycolor(self.ctx.data[0].dataKey.color);\n    borderColor.setAlpha(1);\n    var dataset = {\n        label: self.ctx.datasources[0].name,\n        data: [],\n        backgroundColor: backgroundColor.toRgbString(),\n        borderColor: borderColor.toRgbString(),\n        pointBackgroundColor: borderColor.toRgbString(),\n        pointBorderColor: borderColor.darken().toRgbString(),\n        borderWidth: 1\n    }\n    \n    barData.datasets.push(dataset);\n    \n    for (var i = 0; i < self.ctx.data.length; i++) {\n        var dataKey = self.ctx.data[i].dataKey;\n        var units = dataKey.units && dataKey.units.length ? dataKey.units : self.ctx.units;\n        units = units ? (' (' + units + ')') : '';\n        barData.labels.push(dataKey.label + units);\n        dataset.data.push(0);\n    }\n    \n    var floatingPoint;\n    if (typeof self.ctx.decimals !== 'undefined' && self.ctx.decimals !== null) {\n        floatingPoint = self.ctx.widget.config.decimals;\n    } else {\n        floatingPoint = 2;\n    }\n\n    var ctx = $('#radarChart', self.ctx.$container);\n    self.ctx.chart = new Chart(ctx, {\n        type: 'radar',\n        data: barData,\n        options: {\n            responsive: false,\n            maintainAspectRatio: false,\n            scale: {\n                ticks: {\n                    callback: function(tick) {\n                    \treturn tick.toFixed(floatingPoint);\n                    }\n                }\n            }\n        }\n    });\n    \n    self.onResize();\n}\n\nself.onDataUpdated = function() {\n    for (var i = 0; i < self.ctx.data.length; i++) {\n        var cellData = self.ctx.data[i];\n        if (cellData.data.length > 0) {\n            var decimals;\n            if (typeof cellData.dataKey.decimals !== 'undefined' \n                && cellData.dataKey.decimals !== null ) {\n                decimals = cellData.dataKey.decimals; \n            } else {\n                decimals = self.ctx.decimals;\n            }\n            var tvPair = cellData.data[cellData.data.length - 1];\n            var value = self.ctx.utils.formatValue(tvPair[1], decimals);\n            self.ctx.chart.data.datasets[0].data[i] = parseFloat(value);\n        }\n    }    \n    self.ctx.chart.update();\n}\n\nself.onResize = function() {\n    if (self.ctx.height >= 70) {\n        self.ctx.chart.resize();\n    }\n}\n\nself.onDestroy = function() {\n    self.ctx.chart.destroy();\n    self.ctx.chart = null;\n}\n",
+    "controllerScript": "self.onInit = function() {\n    self.ctx.$scope.radarChartWidget.onInit();\n};\n\nself.onDataUpdated = function() {\n    self.ctx.$scope.radarChartWidget.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\n",
     "settingsSchema": "",
-    "dataKeySettingsSchema": "{}\n",
-    "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\":\"Radar\"}"
+    "dataKeySettingsSchema": "",
+    "settingsDirective": "tb-radar-chart-widget-settings",
+    "hasBasicMode": true,
+    "basicModeDirective": "tb-radar-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\":\"Radar\",\"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\":\"radar\",\"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}}"
   },
-  "externalId": null
+  "tags": [
+    "radar",
+    "radar chart"
+  ]
 }
\ No newline at end of file
diff --git a/application/src/main/data/json/system/widget_types/radar_deprecated.json b/application/src/main/data/json/system/widget_types/radar_deprecated.json
new file mode 100644
index 0000000000..0018c3d6a0
--- /dev/null
+++ b/application/src/main/data/json/system/widget_types/radar_deprecated.json
@@ -0,0 +1,25 @@
+{
+  "fqn": "charts.radar_chart_js",
+  "name": "Radar",
+  "deprecated": true,
+  "image": "tb-image:cmFkYXJfc3lzdGVtX3dpZGdldF9pbWFnZS5wbmc=:IlJhZGFyIiBzeXN0ZW0gd2lkZ2V0IGltYWdl;data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAACgCAIAAADGnbT+AAAABmJLR0QA/wD/AP+gvaeTAAAR4ElEQVR42u3diVcV1xkA8PlXasxiNpOaxJg2S7Vp0iZNm72nSZqYJieWtNEkxrgbo5G4RMUFUHYCiKASBEFEVJAHuARlEQQVkeUBIgi8jbf3m7k4mbx15r2Z92be/e65J2cYGKOP35lv5rvfvZdxYwvYLl++XFZWNjIyQr60WCzl5eU5OTk6nc7lcuHn468x+BH4a06nMzk5ef369SBpfHycnNy6dWteXl5TU9OWLVsAHH5KCEtyq66u/uGHH4AXf2ZoaGjx4sXkTHd394oVK/BTQliS2/bt26uqqg4fPlxaWjo2NgZn2traNm7cyMfEuLg4h8OBHxTCktZWrly5bt26+vr6wsLC5cuXW63WxsZGuIeR79rt9gULFpjNZvygEJa0tnDhwt7eXnIcHx9/kWubN28mZ2w2G8ACbfhBISxpbdWqVfAgRY6TkpLq6uquX7++Zs0acmZ0dHTRokX4KSEsya2goCA7OxsO4JUQntkHBgbgLgUHPT09cLKysjIxMRE/JYQltun1enIAz087d+6E+9aSJUvgKZ6cvHDhwtKlS9euXbt69er+/n5ykj/AhrD8qoJXP+EZePsTZhygQV7UZDIJz7S3t6MthBVEFcQ7qRfCGyLaQlghqtJzDW0hLJnvVYFhoS2EFWIEDAoLbSGsUJ6rxMBCWwhL8tO6SFhoi3ZYUt8BxcNCW/TCCiGzIAkW2mJQlUKwKLfFoCpFG7W2GFTlr8G4zSFBg/JRd0g173TaYlCVvwY1M8uWLau404aHh92h1rxTaItBVf4a6Nm1a5fwTDg177TZYlCVvwaTKRISEkpKSiD2QVmfO+yad6psMajKX6utrd20aRNUYqVlZr8YX/FEhmFW6u03dtTanFNKQqh5p8cWg6qCto311t8kGvgOX7rDqHmnxBaDqvy1rq4uckOanWkUwnoi0+gOr+adBlsMqvLXMjMzjxw5AgezMgy/gpXOzooOs+Y95m0xqMr7WnIAk1ThUf3TDanTd98WwvpzfIUsNe+xbYtBVd7X8l8e67LP2MtimpNtmpnGBsR79hhHzE65at5j2BaDqvxdW9hum57Mqppfaqnvc5S1DL2QOwZf7m+zyegjVm0xqMrntUmNU2+Ciyonz+gd0AHW6uMjcObNIrO8PmLSFoOqPK51uNwrTk0CoLuSDN/VTakisIouDs3YywbEq7edaIsKWHKpsjrccRUW9lkq2bDzvJVXRWBBh7AI391yxiq7jxizxaAq/tqxSReEOXDzYIoxu8UmVMXDymqxsc/yWUaHy422YhmWXKoGja4X95sAzeOZxkOdnqp4WHDwu2z2x2p6HEr4iBlbDKqC484R51PZ7MPT0znG8mt2b1VCWF+fZKPhZ5UWhXzEhi0GVTX0O0iO6qUC08kbvlUJYYE8eK6/b48BQifaijVYcqmquJMCfbvIfLrX4U+VEBb0VwrZaJjTalPOh9ZtMTSrgid0uPcAkQXllvr+QKo8+tazbJbr1YNmRX1o2hZDpyqIYds5HNMSDV+dmAzMaE/Z+XzdFXJ8utu8o0i3Nqtixp5xuPzKqBNtxQIsWVRBpmDZnRTohrogqvbXXX178abN+SfIl19uz/su+2je6Y65O1vhT/i+3qq0D43aYmhTZbK5PjzCvtZBDj250RpYVe0Ny4LvUpYlHiCwjl4afn/ljvo+NhmRUDPA5iYyjA6nG21pGJYsqm5Pul4/xKZAH0ox/thqC/os9X1uZcKhWlBFYBXUX1u4JZuPifcn9MAfdaLbHgEfmrPF0KOqd8I5L8/ElYCaijqDqyo63/Pp9+l1vVYeVk51+xfbcsl34fzT647BnwZDQJHxoS1bDCWqOkacMA4DDp7JNZZ32YOqAjdx8Wk//dwLxzys3JrLn2/NIT+g65l8dcnOu5LZUcVRiwttaQyWLKrq+hwPp7KqXi4MlAIV9rRjF//x1eaPv02G/t7y7dDXppcWN/bBIxf5geMdt99dtu21g+wtEAYQI+ZDK7aYmFd19JodsuRsCvQnc22fhGQV3/k7Ftyl4OG95KIejncfboCH+oRzbM7ir4WmSPrQhC0mtlVlNE+lQOOOik2B8ul1b1jkMevDNbv/syH1k/V7jzQP6vqn7oVtt5xoSwOwwldltdnEp0CFquDVL/DPNPTbq7uM/JefHGWTF19X3IqwD5XbYmJSlWXS9vVJLgWabNjYIE0VxLugY4XCvq/NDv+jR1PHe/r0aEu9sMJXNWayzi81T6VAL9hkURUAFvRnc9homF5zPfI+VGuLiTFVQxPW1w+yqh5JM+a32eVSFRjW6hr27vhxmTkqPtRpi4klVV0j1rlcCnR2lqn4ik1GVYFhVV63w0Qx6PpxG9pSF6zwVbUOWp/kUqDz8ozwm5ZXVWBY0N/gRorSLtqi5UNttpjYUFXTPfkQ99oPKaVTN+RXFRTWzp/ZN9AX8k1R9KEqW0wMqDrYPnkPN2X5XyXmOtEpUEmqgsKCqdKPcPXNLTedaCv6sMJXldJokZoCDUFVUFjQP+UmJK6pmYyuD5XYYrSr6lJb2wadhaRAV1ZbJBGRqkoMrAOXuYRWmtHqcKMtRqOqmi+1/6+CfQG8O8mw7axVaVUi+9xcNhqWXbVH3UfUbTFaVNXY0v5+iYmkQPdetCmkCn4sqfTsusyyXcX1UNYnrHlfn1UO5Q8wtuNxyTe1k9zqNGY1+IiuLUZzqnQXO14uYG8Mj6Yb89vtyt2rlu4uhFIZmEYBjL7ake9R8w4Vf1Bc6nHJ8W47vEZMTzLAvGrKbTHaUlX1c8dz3PjJk1mmw1dsyqmCnwRMUO5HKt9hPgX8V1jzDrVZUKrlfSEU58BfD6rpVeIjWrYYDakqPnNtVjqr6o/7JKRAw3+ugmvBEAQ+j5p3qAQkyISdLKwFAwDq8REVW4xWVOXpumARGPidwSzk6p4IqcqsaoEC5XeWboX6d++a97e+3Fhz3eSd0Potp//CoINmW4wmVO06eeNuLgX6fqmEFGj49yq4EEqQoVgUKpJBkkfNO8CC+Oh91WeV7CM8rN6mKh8RtsWoX1X8sd5piVMp0AZ9hFSBmINnu/kv56/eVdo04F3z7nt6Tye7hhZUlprtbmptMWpW1a/Xf1nST1Kgq2ok5zPDuVfBIxREQJIRrWi7BYYg6nnXvPu7/Pl9bDbkcKddbT4iZotRraqe/oEPDgyRVRu3nbNGTBWfXs860frvbxJhauFHa5Pg2GfNOznJH/B9vW6SjF2q0EdkbDHqVHWtR/96/jBZtREmRERSlbDmHd4ET10zeCRCPWreoRc2dHnYgklm9+5h14boN7jotMWoUFVz18C8bHbha3i92i8lBSqLKqk17+QN0dvWO8VsQmvXeas6fShti1GbqnNXBuaks1uM/P5H05FralEVdBDa2xaMNcG/4rlck0utPhS1xahK1fFLg4+ksutOPZ9vguER9agSU93gYQtqeB7LYBNa5/QON322GPWoKmy8eV8yqwrKfGt6HapSJQaWt63Pj7OP8DARTc0+FLLFqERVasPw9KQJtjTgCLtxjdpUiYTlYQsmdECi5IEUo8nmos0WowZVm6pvTfv1xjVqUyUeloetF/PZhNbBy2pfQ0t2W0x0VcGqjV+Uj5JVGyH3o1pVkmAJbcXXs9Hwn8Vm9fuQ1xYTeVWwWTcs3Qn74c7OMj6XzT5UwThggsQUaIRVSYXF2zrQODQ92Ug2vIDNpG1OWmwxkb9XeezdDYn1rBabylWFAIvYmn9wyHujchpsMWGqam5u7uvr00tpj6dPCD/rB1MmyO9MfIfh4X21nTAqLPXCcK6FC6FLvWpmyrjwH/tY+oT4Dwo+WPh4Ozo69NJb+NeGaSsqsH71WT+wdzySsA6duxFRWKnjHhuVS/0Fd3Z2howjnGsHBga0HQrJYG1NT+TSoVBhrJVQGNpvN1rXRv/hHT5fWGcB+nuHxmbsYSMj7NVWcFnVtkJ7eE/QsYOed8E6JZkGqQ/v2lUV/XQDtLNXb87NGiFP8d+cnlStrRDSDeWtN8liIbC2oPplyKhKLQnSHv3QwmI9CRYwy+XEDbsKbUlNkIKqnzptZAO6myYXVapUNKQzODiYWn2d7Bs4J8u0v111tiQN6YAqOP6ojF0BYGX1JG2q1DUIDbZONnb8/YAphLAYAVviB6GJKpigBrV+08TtEBZjqtxqK5sBW02t7WuqzSQsvlUkISwqbUtk2QxRBX1xFTuY80m5hUJVbhUW+oEtuLbsyiRZbgpGQnJabWqwJabQj1cFZT9k/ffzAw4KVbnVWZpMbHWP2l7jlqmFtT2XV4ud+KWcraClybwq6Ou41UH+dsBEpyq3aidTEFuwXDvkfkhFzZtF5ipxYVEhW/5geauC2lFYWgL+zrDbCp2q3Gqe/kVswbXwFPwoCYsZojYZVMiWT1jeqqDv4DbYeTbH5HBRqsqt8gmrvC2YREU2sISdJmD/EjFLQspuyxuWT1XQ/5QffI/72FblVv8Ue94W7JAL+Wuy3Ciks8VMtZDXlgcsf6qgBIgsGBmgHDnmVbk1sSgIbwuOq7rtZC2XWRnGbBFVXDLaEsLyp4pf8D3AGA4NqtxaWcZIaGvA4IIHefFhUS5bPKwAqoKO4VCiyq2hhdeEtoRhEXYMqAi2Fa8stgisAKqCjuHQo8qtraUihbag6XodT2QayX5MqU02pW1BbSD0AKoCj+FQpcqtucVtPWwNm13vHjaTST5Bw2KYZfJQdwo9QPI9wBgObarcWlyO28MW5IogLE7nwiLsJX40YFgMxxYpTfb33QBjOBSqcmt0AwEPW9Bg/cjZXFiEwpuUgCu/h2wr8FjhtzrfYzh0qnJrd8sTb1u3zC6onSfL/8GM6gBhUfbpX/7GcKhV5db0Jk3etuAVH1bDJmHxpYJAYVHeCas+x3BoVuXW+rZy3ragcfePqbC4x/+e0DJOsSdjOD+22FCVimApYWvE7PqgdCoswlrL/lbwlmVREO8xHFTljo2te33agl9yepONrA7/lwJTuZ+wGP4yRh5jOKhKXbCUsAXtTL9jDhcWIRfgLyyGs/AaGcO5984YDqpSIyyFbI1aXPODhcWQl4okYzhkEwpUpV5YCtkShkXY4KnE17ZhISxuKxzDQVVqh6WQLWhNQ85nctjXN1i7cYev5bikLsfNj+GgKm3AUs7WhNUVV2Hhw6KuX4ItD1j8GM6ZPiuq0gws5WyRsHgPFxbn5Rm9d9P0Z8sDFhnDeaXQiKo0Bks5W9Cabzqf5cLi/SnG7V5h0actISx+DCetphtVaQ+WorYMVtd/ubAIHV7uavuC2BLCImM4T2WM9elRlTZhKWoLWt4lG7zZcZvteoZFD1tCWGTXuN26W6hKw7CUttVy0wk73pCw6LF/ndAWDyujib3PzUyZELktAIWqNANLaVsQFj87Zvll3cpeH7b4mveXckekrqVGmyotwVLaFjTYP+L+vVxYzDUWC8IisUVq3pNO3ZgmGMNBVbEAKwK2Woedf+DC4oy9xq1nrd417+8WjQXYSBxVaRVWBGwZba6FlT7CIhS8Z9X1SFpLjVpVmoQVAVvCsAj7cR7glnOGm1Zcyaj4tdRoVqVVWJGxBbelF7jSULhLwSyJh1MNZEGlhn4HqopZWJGxBQmFL45bPLY7ELkJAM2qtA0rMragzeQGm3/ZtiTTiKpiHFZkbJGpGXyHklRUFfuwImDLY/OfwKEQVcUOLKVtkc1/YNMy6IH3w0FVsQYrAvctsuUa3quog6W0rcCwUFUsw1LUVgBYqCr2YSlnyx8sVEULLIVs+YSFquiCpYQtb1ioikZYstvygIWq6IUlry0hLFRFOywZbfGwUBXCktMWgYWqEJbMtvq4hqoQlpy24NpmrgUe1UFVNMIK01Yn11AVwpLZVtBBaFRFNayQbYUAi1pVlMIKzZZUWDSrohdWCLYkwaJcFdWwpNoSDwtV0Q5Lki2RsFAVwpJmSwwsVIWwJNtStOYdYdFrS7mad4RFtS2Fat4RFu22lKh5R1hoS/6ad4SFtnzDQlUISwZbMta8Iyy0JX/NO8LC9itbstS8IyxsnrbCr3lHWNh82Aqz5h1hYfNti9S8oyqEJb8tVCW+/R++masNzLdd0QAAAABJRU5ErkJggg==",
+  "description": "Displays the latest values of the attributes or time series data for multiple entities in a radar chart. Supports numeric values only.",
+  "descriptor": {
+    "type": "latest",
+    "sizeX": 7,
+    "sizeY": 5,
+    "resources": [
+      {
+        "url": "https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.3.0/Chart.min.js"
+      }
+    ],
+    "templateHtml": "<canvas id=\"radarChart\"></canvas>\n",
+    "templateCss": "",
+    "controllerScript": "self.onInit = function() {\n    $scope = self.ctx.$scope;\n    utils = $scope.$injector.get(self.ctx.servicesMap.get('utils'));\n    settings = utils.deepClone(self.ctx.settings) || {};\n    settings.showTooltip = utils.defaultValue(settings.showTooltip, true);\n    \n    Chart.defaults.global.tooltips.enabled = settings.showTooltip;\n    \n    var barData = {\n        labels: [],\n        datasets: []\n    };\n\n    var backgroundColor = tinycolor(self.ctx.data[0].dataKey.color);\n    backgroundColor.setAlpha(0.2);\n    var borderColor = tinycolor(self.ctx.data[0].dataKey.color);\n    borderColor.setAlpha(1);\n    var dataset = {\n        label: self.ctx.datasources[0].name,\n        data: [],\n        backgroundColor: backgroundColor.toRgbString(),\n        borderColor: borderColor.toRgbString(),\n        pointBackgroundColor: borderColor.toRgbString(),\n        pointBorderColor: borderColor.darken().toRgbString(),\n        borderWidth: 1\n    }\n    \n    barData.datasets.push(dataset);\n    \n    for (var i = 0; i < self.ctx.data.length; i++) {\n        var dataKey = self.ctx.data[i].dataKey;\n        var units = dataKey.units && dataKey.units.length ? dataKey.units : self.ctx.units;\n        units = units ? (' (' + units + ')') : '';\n        barData.labels.push(dataKey.label + units);\n        dataset.data.push(0);\n    }\n    \n    var floatingPoint;\n    if (typeof self.ctx.decimals !== 'undefined' && self.ctx.decimals !== null) {\n        floatingPoint = self.ctx.widget.config.decimals;\n    } else {\n        floatingPoint = 2;\n    }\n\n    var ctx = $('#radarChart', self.ctx.$container);\n    self.ctx.chart = new Chart(ctx, {\n        type: 'radar',\n        data: barData,\n        options: {\n            responsive: false,\n            maintainAspectRatio: false,\n            scale: {\n                ticks: {\n                    callback: function(tick) {\n                    \treturn tick.toFixed(floatingPoint);\n                    }\n                }\n            }\n        }\n    });\n    \n    self.onResize();\n}\n\nself.onDataUpdated = function() {\n    for (var i = 0; i < self.ctx.data.length; i++) {\n        var cellData = self.ctx.data[i];\n        if (cellData.data.length > 0) {\n            var decimals;\n            if (typeof cellData.dataKey.decimals !== 'undefined' \n                && cellData.dataKey.decimals !== null ) {\n                decimals = cellData.dataKey.decimals; \n            } else {\n                decimals = self.ctx.decimals;\n            }\n            var tvPair = cellData.data[cellData.data.length - 1];\n            var value = self.ctx.utils.formatValue(tvPair[1], decimals);\n            self.ctx.chart.data.datasets[0].data[i] = parseFloat(value);\n        }\n    }    \n    self.ctx.chart.update();\n}\n\nself.onResize = function() {\n    if (self.ctx.height >= 70) {\n        self.ctx.chart.resize();\n    }\n}\n\nself.onDestroy = function() {\n    self.ctx.chart.destroy();\n    self.ctx.chart = null;\n}\n",
+    "settingsSchema": "",
+    "dataKeySettingsSchema": "{}\n",
+    "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\":\"Radar\"}"
+  },
+  "tags": null
+}
\ No newline at end of file
diff --git a/application/src/main/data/json/system/widget_types/range_chart.json b/application/src/main/data/json/system/widget_types/range_chart.json
index 981e3582c5..72cbeeacbb 100644
--- a/application/src/main/data/json/system/widget_types/range_chart.json
+++ b/application/src/main/data/json/system/widget_types/range_chart.json
@@ -2,7 +2,7 @@
   "fqn": "range_chart",
   "name": "Range chart",
   "deprecated": false,
-  "image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAACgCAMAAAB+IdObAAAC/VBMVEX////////8/PwAAAD///////+bsfP+wEzu7u73lkzz8/P1eWTT09PN1emRpeOcsvSxsbGQpeLc3NyXl5epqanjXHPLy8tti+OgoKD/wU26urr29vbts0fnkUf39/fIrYP4l02oqKjJroPl5eWUrPPDw8PCwsLJroSQqfKLpfKDn/HU1NSnu/X/tzD/pwNyku//vD//sB3m5ub2jj98mfB2lfD2hTD/rRPu8v3/3qD1fCD3+f7K1vnnjEf1eh30awSWrvOBnfFkhOLld1n1dRX0cxH/9N/1cVvld1jmjEf2izn/qQry9f2Yr/P/+u/+9u+RpuP82r//yGDdM1D3kEPzWD32gSixwfBWeN//2JDzY0v+vkf/siT+5+RBaNr7x6DbYWXxTC96mPD+7N+VqN35tID2emX3oWD3k0fm6/zc5PvV3vq2xveWrfL+8/Hd3d09ZNr/6b/6vZCPj4/2h3TfQl3bKkjaIUD/ujnxQCL0bwrC0PiWqN5Kbt3/79D6zMqGhob/0n/iUWn0aVH+vUPZGjr/tSuwwvZpiOLR0dH+2I97e3v1dWDkcV3fPVnxSCr/qw+Jo/F/m/GLoum3xOj64uZef+H41NoyW9hdfNbJycnxqLT7x5/4no/nb4P/zXDiVm3hS2TlcV3zXEPyUzj+uTTwRCbkbRB+mOaareN5k+FyjuBHbNw4YNn7xr3/47D70LD5t6zumqjngJH/2I+Ojo7lYnf4oWC+mF7utEj2iDTmfSrxRyrunw/kZwLL1vWWrfS/zPORqfP98fKjt/GGofHv7+/+7erK0umHnuKDm+Lf39/t5d7829bm2dT949Dzt8HqwLFse6r4raDsjJz3lIPopHzGpnT4q3DZVmXSNkvnj0LnjD7mgjbjWzHiSzHwRyrunQXv8/3+9POquOWot+Tu4s3u3b3rzrfUxrHu166boa6coK76uKzTvJvoppv6vpDuyYfdboDmkXH1fGffR2H3oV/kbVnnjkHtrTbOIDTiUiLhUCD/rhTuoROM0RHwAAAABXRSTlMg77MAvxFwlo8AAA5CSURBVHja1JtJaBNRGMfj8scXk8MwSYZxoiFhaC9FEQoRA7YHE6K9iMZ4KIoWcTkpqK3oRVH05HISwX1Db66guF48eHHFBfcFQUUQ933BL6PxZZyZRE2+of4aMhPyWvKb73vzf3nQQL9A/z743+lLGoE+Qlea0JLShVA0mFHFwP9Hn0CgL7QwdERgKnGlmY7QBYgNGwY2lleHBjLSNwAIpdlAFPRIQERBsIjcvDGQEUEimqLq0FFysUR4WLKiG5yQiKGiJGIqIJYCKQEGDhV6wAmJCD3VBDWqCxCmrjeBg+7tK06DkQD8Yd3C2ML1YMM/kY2FWM9GsOGfyLLuWOEg2PBPZMW22JotYMM3kYs9sdjbw2DDN5Eta2KxbQWw4ZtIYRmJrAAbfomsXxgjFq4DF36JXCmQB2eQ+CWybHuMKPAFiU8i61bESqy5Ai58EtnYY4l08wWJTyKHuy2R7d3gwieRnmWkwRok/ogsoc6y4FzI84tYsU4wBwm/iBXrP+i5CC74RcqxTnAu5C0RMypgppQ4lCaIlN6CxnKwUBZZcwhsWN/ZE4CeUA3TiCIiEImjoVCs/6T7MNggkXAk1YIo4lGoCaEDiQQIRRGN4fynaWVu3BRskIjRBJ0sbPtaDRR5fm/1jtWrV+/YsXrH+3uCDRJpDpNI5Me+VlwnMYFG8qYz9IvdZ8AFicQjioKmlC4A0JFeNJSuvBRZuxdcBEAIlGcGkUBDWdIVkuy6DCb4c+TqzpmhED0sipvBBL9IMU8WZToXgAd+kSknQhUs7wQP/CKXd1WK5E88BAv8IvnllSKruO6/7CJzFq0KVbJ2ClhgF9nbFbLRdQ4ssIss6LSLFJ+BBXaRYinWZ9LPT3YyBQmviIx19iCpS2QOanK1GCJ4g6R+kQVLUIvO5SE7+SLqgkWkmEcNptwP/c4i1AeDyIGu3VNqDSn+DyL5zp3VZ66M9Zm9WeTcfVpwVJvvtliXInNQBwwiFHU1UkHGOvcaRYqYKoSiAc0mEs2KwB8wZRFF3apdVa8vuRIzfRRZaiAiVMPUDOiq+KN9rQO7an/jo1h3cIJTxCgJIB5FWMR1wBSoTdGax/ku75LIWJ/pU0WEoRr4y32tS1/GjB4zevSYu9eEJ6/vjh5DY8pPNJ6ePl8SPARIIBqZr0ZKFQHiEUATtUXGHh87dtSosaPu7DkrvDh+ZxQNGVt6EHQsne15IngIgKCKGIaigaCDjppMXxz8SW6G55j2oAu58eDBEkGCZExYmCZqc6Qt+JOOHDzYRGOcZPeDgX/OkczEYLJ8iafCnWQ6SNA4G21T8Y9wiGzKyk/WkYE77bN/OPRmkcyx2s2yn2R7u8h4muqybTpa4casScEKkr1SZFbaPn/Hw4VMa9CNzAz8Exwi09sn2q71MbeSXKCquTGpF4lMbfutXxa7lORFeZAcm+xtInTvtZN2KUlrR4VE76zI1Jw9G4h2R0lkrCftKpNmwZ2qic8i0pp2XOtJrQ7brDSoHJ5MH/H6s+NQBQYRucySzHaUJFlhaxPyFMnMgycsIu9ss9irYXJyHtmF0h6tNa69FZ5wiIyjj+hWkun2hs86FX5WJAlXxufavXuLQ2Rqm3s8XIdExrq9raqsAzAvk/XuLQ6RTIcVCcnfS5IdB4kj1muLJI+lPXuLQ4SWWbUTm2I9+bci6dbZXr3FIkLLLHdm58ZV9Elb0FMk7T71KHfq6i1LZG6LQEJrAehovZA4cm62vffleZssiYx15xJlYsZjrlsLhDoo/9dbSjU0s8mAoqlV9rWut5UFHCoTqSQy1r1wisgaUm/VJ6LGof/Y12pW4zoQ9hJxLLNsRtlfJdmU/WsRus3V2VsBEIZm29fyZFMu6E0HlUTG+l+KpDvKi896RDQDKO9r6YDqua91+/iQKuwpb9btue096NYp4capD9Z7Z+va1zJ1VY0rYSoLoWtzI/AQefRgsIOj8vTjSWHx9KRzkDx7IFx4/ONXvr2sT0TTNBEPt8AirCXgwYSVA4hBA0rIM8mIkSixdfKAKgyDC/u+Wu8NHQ4XGp4j32kvYxWFgSiKVsOkVlnyVrARbJYJM1XID6QJWKQT/Qm7VAFBLLbKH1hZ2/iBq6s4WW/MDle8oCHeIeT47ry85MlW96pKyvy8zlntWcNA9rtfb5nMwXoDSOZ0W4Ik211hs7zoxhS5guQKZatbTRdgvQHEVfp/mSZp8yJ60QXSLC82kS0GZF30Acj9u7K9pF0gdaE1kS0SRIyWW0AQA+Mm8OtzkGOqNZEtDgSiT6qoFWhz63OQrXeAlM5v2HBh1dK1AtmDENkiQdwWk0SoE6SxmsgWB5KlQAAnLMg80ZrIFgdiDlw9EOSI/TD1NpmtOg8EqQstDAaudhlcfLHytnDZsqdAkNIE3St6ISBy8Gu5bM2TDEBCxiwuZfIMxNiz+VK21imAhIxZLBOAwF5n+9Z+FQiysp0DCfMkWW169jqbLVN9B4FkTeBtC5yBjyAL11oqTLbyRIeBWMO2KRSClDv9YrYy1wKZDM6f6HKcdIxZ0Hx7qiD35Pn/ua8iprpafLZK40GieBaf39PH0fBjOIUxC6YsXrtSPShZepfrW27rQT4HaqhmIxVHavoF67oKIFz/NY8gdeNn/tBs4evM6Q4SqdHlOAzovcKOKQACl6eytXB/QeLLMR7/kGoFK27DQDQXixzKTgVljxswKo6NwVBsCDgH5wMM/QbfNt18QU495Zz8RdkfyLEsLXT30OveSy+99Bs6ltWVlfHKMnoklhTNyPM0T5ITEtx8uNh7tYbt841vJyL0h4ep2qLfAj7/J/Lm7Y1Mxnv869a18bvWz3O4CBFRtJCIojAKQyyxjkVb7fqlTYTG2IVX7A/bZgc0wzq2n6O5icVza412yhvvc/4zn4Izuv+dBQrX7+aqlDw0kS9PV/xK4yO+OOftZ5xjo6tiwVWdKztdtl0vHY98buK+HUXZ8M7h6XEKjx/36PZ79BxZZRWTAEZBesaxFIGB24KOU2dlYMHWbB4SdLkbJXK3kfewRu1D5NNpYNR8H1ggSrO5dCKSVO7Bu1iK5GKivjOKWFg1su43y4y5EFnn03IBY927JCDzSbzq3KKtQ3YwUtpGCKNEkmU/CphIhHrAJZFGSDtpqCv52hJSbAyRHhkinY0mhAJ8clKZRH5lQwOARVvbhmWrPi/hQiSJjbmSF2dIB5KRJiDC0IBxbaUxO/XytSqYA5FtQe7hvXtlZO8kQ5naosfBMe1pZuNCRMSvSgd0050hECLVctiRaEsHbsoTYkLEkhAfgNG4JHISxMGureSBsf4iaXZAiVA5GsGAKvxOeOPUvs3IGFRbdG43697SH8/IqvCJWGvQbBcC8VVd4vw131hY5lYvkn3SOXybWRNCFzjVip0INVkqPMjrbsAEtLbo3NZyD2/656nEzJaQyvvJBEhiRmHVVir3KL1IyqymRKgTjdV/HwbHzwe1VSa7rnOzV0skZ5QI3bAnhEfU502tLsrBvRcky1QdQ0dKxJ4Qd4CfF32Wp09+epH8q+56WqSG4Wj98yCHlQ1JiCGBQhk6KONpQBD04pxH8DZ7moN4WfbgwF5d8Kh4c0XWb+Dfo2cRVARvfgdP+iH8pdlprKGtioudRztN8vq68zYv/ZPD9OKF1Ej+S4dUvbj9j68jsd4zqmhNs7V3uT7C5SshNVSMRgouHTOqBOe05ZKFB6qOR0KiThDbjWylNxpxkFx7VGeZjLAJrFjPaxUMogwPVPGovbeNrcZI8IeR206ylV7XfHdtN67Y62hJKAZZleKw+pP4n8BASrN16UPkbtwK/+1ohCuAjxpG8nCX34u/vW1Mm1IyZqvlNHp5dz1xEXvEiurXwiRCeaxpe/3LlzA/4xcqERqzNjdpJaZiq6Jv99TxZ2B9MWkKCgJRtTBUaLlZ0YF/+Zj9hMcviKlnmF48Di3rb+DHiFRqyykuQHBcWRD2vn8799/x/Ond27dp8bh79+mnJkctX2M9w4AxP7h/vsbOrMkdnT9/NI/1QRvBbCcaWS2a3MGTJ9Ha0I0slrWPJwdo4nDn4LCuDN3IfFln69UCTbxbrt7WlaEbidmarXZ/NXm0ipXBG6mz9epZwv08+gdvpM7W692EO3wfy4M3ss7WzrOUercXy8M3sliFDnmbUnNEDN8IZSs996YYvpGQreUC3dgAIz5bs94O2QAjPluvDtGDDTBC2Zod7aIHm2BksaJzbx82wch8+XoPfdgEI5jN0IuNMLJYoB/BCJNghpcYG+RGFQ6Dwhz9ODZSSIwFJLh1xTTMa93Z+m1o3cWWJyR98KBZ90a0Xs9r5fTxx/j4uYt9cELSq3mznnHFbDJBlx5y8MgAYe29CUXLgMAFhE72yjF4ZPBQcMcvdGSqMHmgcm/ojqAPR5RgDV1OznNrJlTUI6BEA3csMOGFI6kvpVJq1O1SoZRulzI+SqRdp1/B3wC2sN7dwwmsQM6Q534hWK6hRZVEte/8dsowBVglHVN9jK3SS8tKGtRuLUUuVYdUAO1SmSORdhkJ40VURsy+s4IZWzizfqWo1utdlOa0LTTXtI+K0ikXJFWGWTEqtGxKuVDtUlsY1ioV+7xMpL9rRAluBZ+CT41TiEYs84dkXPi/5YzjWkTpFh95KTPHUh6lYJapdinLmWmVagvjEunvGgGXgjNYIZSORuwEBMWclE6CGZgiSicY8Upa3hNcoJgKE6Vjy/dHHVLIVqkoyVkqzU6hFYrW0dgb4XBvxMgKRVtWH3LrnlJUo1VIioNkGPP4bbhvAFNUEUxyYh66WloRrdKy4JN2qeEGqTQ7i3+EPGnoZLvJvItlSMnTWbb57wJH9RLtM9lpbDpOnc3O/ACb/i1NA1ABvwAAAABJRU5ErkJggg==",
+  "image": "tb-image:cmFuZ2VfY2hhcnRfc3lzdGVtX3dpZGdldF9pbWFnZS5wbmc=:IlJhbmdlIGNoYXJ0IiBzeXN0ZW0gd2lkZ2V0IGltYWdl;data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAACgCAMAAAB+IdObAAAC/VBMVEX////////8/PwAAAD///////+bsfP+wEzu7u73lkzz8/P1eWTT09PN1emRpeOcsvSxsbGQpeLc3NyXl5epqanjXHPLy8tti+OgoKD/wU26urr29vbts0fnkUf39/fIrYP4l02oqKjJroPl5eWUrPPDw8PCwsLJroSQqfKLpfKDn/HU1NSnu/X/tzD/pwNyku//vD//sB3m5ub2jj98mfB2lfD2hTD/rRPu8v3/3qD1fCD3+f7K1vnnjEf1eh30awSWrvOBnfFkhOLld1n1dRX0cxH/9N/1cVvld1jmjEf2izn/qQry9f2Yr/P/+u/+9u+RpuP82r//yGDdM1D3kEPzWD32gSixwfBWeN//2JDzY0v+vkf/siT+5+RBaNr7x6DbYWXxTC96mPD+7N+VqN35tID2emX3oWD3k0fm6/zc5PvV3vq2xveWrfL+8/Hd3d09ZNr/6b/6vZCPj4/2h3TfQl3bKkjaIUD/ujnxQCL0bwrC0PiWqN5Kbt3/79D6zMqGhob/0n/iUWn0aVH+vUPZGjr/tSuwwvZpiOLR0dH+2I97e3v1dWDkcV3fPVnxSCr/qw+Jo/F/m/GLoum3xOj64uZef+H41NoyW9hdfNbJycnxqLT7x5/4no/nb4P/zXDiVm3hS2TlcV3zXEPyUzj+uTTwRCbkbRB+mOaareN5k+FyjuBHbNw4YNn7xr3/47D70LD5t6zumqjngJH/2I+Ojo7lYnf4oWC+mF7utEj2iDTmfSrxRyrunw/kZwLL1vWWrfS/zPORqfP98fKjt/GGofHv7+/+7erK0umHnuKDm+Lf39/t5d7829bm2dT949Dzt8HqwLFse6r4raDsjJz3lIPopHzGpnT4q3DZVmXSNkvnj0LnjD7mgjbjWzHiSzHwRyrunQXv8/3+9POquOWot+Tu4s3u3b3rzrfUxrHu166boa6coK76uKzTvJvoppv6vpDuyYfdboDmkXH1fGffR2H3oV/kbVnnjkHtrTbOIDTiUiLhUCD/rhTuoROM0RHwAAAABXRSTlMg77MAvxFwlo8AAA5CSURBVHja1JtJaBNRGMfj8scXk8MwSYZxoiFhaC9FEQoRA7YHE6K9iMZ4KIoWcTkpqK3oRVH05HISwX1Db66guF48eHHFBfcFQUUQ933BL6PxZZyZRE2+of4aMhPyWvKb73vzf3nQQL9A/z743+lLGoE+Qlea0JLShVA0mFHFwP9Hn0CgL7QwdERgKnGlmY7QBYgNGwY2lleHBjLSNwAIpdlAFPRIQERBsIjcvDGQEUEimqLq0FFysUR4WLKiG5yQiKGiJGIqIJYCKQEGDhV6wAmJCD3VBDWqCxCmrjeBg+7tK06DkQD8Yd3C2ML1YMM/kY2FWM9GsOGfyLLuWOEg2PBPZMW22JotYMM3kYs9sdjbw2DDN5Eta2KxbQWw4ZtIYRmJrAAbfomsXxgjFq4DF36JXCmQB2eQ+CWybHuMKPAFiU8i61bESqy5Ai58EtnYY4l08wWJTyKHuy2R7d3gwieRnmWkwRok/ogsoc6y4FzI84tYsU4wBwm/iBXrP+i5CC74RcqxTnAu5C0RMypgppQ4lCaIlN6CxnKwUBZZcwhsWN/ZE4CeUA3TiCIiEImjoVCs/6T7MNggkXAk1YIo4lGoCaEDiQQIRRGN4fynaWVu3BRskIjRBJ0sbPtaDRR5fm/1jtWrV+/YsXrH+3uCDRJpDpNI5Me+VlwnMYFG8qYz9IvdZ8AFicQjioKmlC4A0JFeNJSuvBRZuxdcBEAIlGcGkUBDWdIVkuy6DCb4c+TqzpmhED0sipvBBL9IMU8WZToXgAd+kSknQhUs7wQP/CKXd1WK5E88BAv8IvnllSKruO6/7CJzFq0KVbJ2ClhgF9nbFbLRdQ4ssIss6LSLFJ+BBXaRYinWZ9LPT3YyBQmviIx19iCpS2QOanK1GCJ4g6R+kQVLUIvO5SE7+SLqgkWkmEcNptwP/c4i1AeDyIGu3VNqDSn+DyL5zp3VZ66M9Zm9WeTcfVpwVJvvtliXInNQBwwiFHU1UkHGOvcaRYqYKoSiAc0mEs2KwB8wZRFF3apdVa8vuRIzfRRZaiAiVMPUDOiq+KN9rQO7an/jo1h3cIJTxCgJIB5FWMR1wBSoTdGax/ku75LIWJ/pU0WEoRr4y32tS1/GjB4zevSYu9eEJ6/vjh5DY8pPNJ6ePl8SPARIIBqZr0ZKFQHiEUATtUXGHh87dtSosaPu7DkrvDh+ZxQNGVt6EHQsne15IngIgKCKGIaigaCDjppMXxz8SW6G55j2oAu58eDBEkGCZExYmCZqc6Qt+JOOHDzYRGOcZPeDgX/OkczEYLJ8iafCnWQ6SNA4G21T8Y9wiGzKyk/WkYE77bN/OPRmkcyx2s2yn2R7u8h4muqybTpa4casScEKkr1SZFbaPn/Hw4VMa9CNzAz8Exwi09sn2q71MbeSXKCquTGpF4lMbfutXxa7lORFeZAcm+xtInTvtZN2KUlrR4VE76zI1Jw9G4h2R0lkrCftKpNmwZ2qic8i0pp2XOtJrQ7brDSoHJ5MH/H6s+NQBQYRucySzHaUJFlhaxPyFMnMgycsIu9ss9irYXJyHtmF0h6tNa69FZ5wiIyjj+hWkun2hs86FX5WJAlXxufavXuLQ2Rqm3s8XIdExrq9raqsAzAvk/XuLQ6RTIcVCcnfS5IdB4kj1muLJI+lPXuLQ4SWWbUTm2I9+bci6dbZXr3FIkLLLHdm58ZV9Elb0FMk7T71KHfq6i1LZG6LQEJrAehovZA4cm62vffleZssiYx15xJlYsZjrlsLhDoo/9dbSjU0s8mAoqlV9rWut5UFHCoTqSQy1r1wisgaUm/VJ6LGof/Y12pW4zoQ9hJxLLNsRtlfJdmU/WsRus3V2VsBEIZm29fyZFMu6E0HlUTG+l+KpDvKi896RDQDKO9r6YDqua91+/iQKuwpb9btue096NYp4capD9Z7Z+va1zJ1VY0rYSoLoWtzI/AQefRgsIOj8vTjSWHx9KRzkDx7IFx4/ONXvr2sT0TTNBEPt8AirCXgwYSVA4hBA0rIM8mIkSixdfKAKgyDC/u+Wu8NHQ4XGp4j32kvYxWFgSiKVsOkVlnyVrARbJYJM1XID6QJWKQT/Qm7VAFBLLbKH1hZ2/iBq6s4WW/MDle8oCHeIeT47ry85MlW96pKyvy8zlntWcNA9rtfb5nMwXoDSOZ0W4Ik211hs7zoxhS5guQKZatbTRdgvQHEVfp/mSZp8yJ60QXSLC82kS0GZF30Acj9u7K9pF0gdaE1kS0SRIyWW0AQA+Mm8OtzkGOqNZEtDgSiT6qoFWhz63OQrXeAlM5v2HBh1dK1AtmDENkiQdwWk0SoE6SxmsgWB5KlQAAnLMg80ZrIFgdiDlw9EOSI/TD1NpmtOg8EqQstDAaudhlcfLHytnDZsqdAkNIE3St6ISBy8Gu5bM2TDEBCxiwuZfIMxNiz+VK21imAhIxZLBOAwF5n+9Z+FQiysp0DCfMkWW169jqbLVN9B4FkTeBtC5yBjyAL11oqTLbyRIeBWMO2KRSClDv9YrYy1wKZDM6f6HKcdIxZ0Hx7qiD35Pn/ua8iprpafLZK40GieBaf39PH0fBjOIUxC6YsXrtSPShZepfrW27rQT4HaqhmIxVHavoF67oKIFz/NY8gdeNn/tBs4evM6Q4SqdHlOAzovcKOKQACl6eytXB/QeLLMR7/kGoFK27DQDQXixzKTgVljxswKo6NwVBsCDgH5wMM/QbfNt18QU495Zz8RdkfyLEsLXT30OveSy+99Bs6ltWVlfHKMnoklhTNyPM0T5ITEtx8uNh7tYbt841vJyL0h4ep2qLfAj7/J/Lm7Y1Mxnv869a18bvWz3O4CBFRtJCIojAKQyyxjkVb7fqlTYTG2IVX7A/bZgc0wzq2n6O5icVza412yhvvc/4zn4Izuv+dBQrX7+aqlDw0kS9PV/xK4yO+OOftZ5xjo6tiwVWdKztdtl0vHY98buK+HUXZ8M7h6XEKjx/36PZ79BxZZRWTAEZBesaxFIGB24KOU2dlYMHWbB4SdLkbJXK3kfewRu1D5NNpYNR8H1ggSrO5dCKSVO7Bu1iK5GKivjOKWFg1su43y4y5EFnn03IBY927JCDzSbzq3KKtQ3YwUtpGCKNEkmU/CphIhHrAJZFGSDtpqCv52hJSbAyRHhkinY0mhAJ8clKZRH5lQwOARVvbhmWrPi/hQiSJjbmSF2dIB5KRJiDC0IBxbaUxO/XytSqYA5FtQe7hvXtlZO8kQ5naosfBMe1pZuNCRMSvSgd0050hECLVctiRaEsHbsoTYkLEkhAfgNG4JHISxMGureSBsf4iaXZAiVA5GsGAKvxOeOPUvs3IGFRbdG43697SH8/IqvCJWGvQbBcC8VVd4vw131hY5lYvkn3SOXybWRNCFzjVip0INVkqPMjrbsAEtLbo3NZyD2/656nEzJaQyvvJBEhiRmHVVir3KL1IyqymRKgTjdV/HwbHzwe1VSa7rnOzV0skZ5QI3bAnhEfU502tLsrBvRcky1QdQ0dKxJ4Qd4CfF32Wp09+epH8q+56WqSG4Wj98yCHlQ1JiCGBQhk6KONpQBD04pxH8DZ7moN4WfbgwF5d8Kh4c0XWb+Dfo2cRVARvfgdP+iH8pdlprKGtioudRztN8vq68zYv/ZPD9OKF1Ej+S4dUvbj9j68jsd4zqmhNs7V3uT7C5SshNVSMRgouHTOqBOe05ZKFB6qOR0KiThDbjWylNxpxkFx7VGeZjLAJrFjPaxUMogwPVPGovbeNrcZI8IeR206ylV7XfHdtN67Y62hJKAZZleKw+pP4n8BASrN16UPkbtwK/+1ohCuAjxpG8nCX34u/vW1Mm1IyZqvlNHp5dz1xEXvEiurXwiRCeaxpe/3LlzA/4xcqERqzNjdpJaZiq6Jv99TxZ2B9MWkKCgJRtTBUaLlZ0YF/+Zj9hMcviKlnmF48Di3rb+DHiFRqyykuQHBcWRD2vn8799/x/Ond27dp8bh79+mnJkctX2M9w4AxP7h/vsbOrMkdnT9/NI/1QRvBbCcaWS2a3MGTJ9Ha0I0slrWPJwdo4nDn4LCuDN3IfFln69UCTbxbrt7WlaEbidmarXZ/NXm0ipXBG6mz9epZwv08+gdvpM7W692EO3wfy4M3ss7WzrOUercXy8M3sliFDnmbUnNEDN8IZSs996YYvpGQreUC3dgAIz5bs94O2QAjPluvDtGDDTBC2Zod7aIHm2BksaJzbx82wch8+XoPfdgEI5jN0IuNMLJYoB/BCJNghpcYG+RGFQ6Dwhz9ODZSSIwFJLh1xTTMa93Z+m1o3cWWJyR98KBZ90a0Xs9r5fTxx/j4uYt9cELSq3mznnHFbDJBlx5y8MgAYe29CUXLgMAFhE72yjF4ZPBQcMcvdGSqMHmgcm/ojqAPR5RgDV1OznNrJlTUI6BEA3csMOGFI6kvpVJq1O1SoZRulzI+SqRdp1/B3wC2sN7dwwmsQM6Q534hWK6hRZVEte/8dsowBVglHVN9jK3SS8tKGtRuLUUuVYdUAO1SmSORdhkJ40VURsy+s4IZWzizfqWo1utdlOa0LTTXtI+K0ikXJFWGWTEqtGxKuVDtUlsY1ioV+7xMpL9rRAluBZ+CT41TiEYs84dkXPi/5YzjWkTpFh95KTPHUh6lYJapdinLmWmVagvjEunvGgGXgjNYIZSORuwEBMWclE6CGZgiSicY8Upa3hNcoJgKE6Vjy/dHHVLIVqkoyVkqzU6hFYrW0dgb4XBvxMgKRVtWH3LrnlJUo1VIioNkGPP4bbhvAFNUEUxyYh66WloRrdKy4JN2qeEGqTQ7i3+EPGnoZLvJvItlSMnTWbb57wJH9RLtM9lpbDpOnc3O/ACb/i1NA1ABvwAAAABJRU5ErkJggg==",
   "description": "Displays changes to time-series data over time visualized with color ranges — for example, temperature or humidity readings.",
   "descriptor": {
     "type": "timeseries",
@@ -20,9 +20,8 @@
     "latestDataKeySettingsDirective": "",
     "hasBasicMode": true,
     "basicModeDirective": "tb-range-chart-basic-config",
-    "defaultConfig": "{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Temperature\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.8587686344902596,\"funcBody\":\"var value = prevValue + Math.random() * 40 - 20;\\nif (value < -60) {\\n\\tvalue = -60;\\n} else if (value > 60) {\\n\\tvalue = 60;\\n}\\nreturn value;\",\"aggregationType\":null,\"units\":null,\"decimals\":null,\"usePostProcessing\":null,\"postFuncBody\":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\":\"AVG\",\"limit\":25000},\"timezone\":null},\"showTitle\":true,\"backgroundColor\":\"rgba(0, 0, 0, 0)\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"dataZoom\":true,\"rangeColors\":[{\"to\":-20,\"color\":\"#234CC7\"},{\"from\":-20,\"to\":0,\"color\":\"#305AD7\"},{\"from\":0,\"to\":10,\"color\":\"#7191EF\"},{\"from\":10,\"to\":20,\"color\":\"#FFA600\"},{\"from\":20,\"to\":30,\"color\":\"#F36900\"},{\"from\":30,\"to\":40,\"color\":\"#F04022\"},{\"from\":40,\"color\":\"#D81838\"}],\"outOfRangeColor\":\"#ccc\",\"fillArea\":true,\"showLegend\":true,\"legendPosition\":\"top\",\"legendLabelFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"16px\"},\"legendLabelColor\":\"rgba(0, 0, 0, 0.76)\",\"showTooltip\":true,\"tooltipValueFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"500\",\"lineHeight\":\"16px\"},\"tooltipValueColor\":\"rgba(0, 0, 0, 0.76)\",\"tooltipShowDate\":true,\"tooltipDateFormat\":{\"format\":\"dd MMM yyyy HH:mm\",\"lastUpdateAgo\":false,\"custom\":false},\"tooltipDateFont\":{\"family\":\"Roboto\",\"size\":11,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"16px\"},\"tooltipDateColor\":\"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\":\"Range 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\":\"°C\",\"decimals\":0,\"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\"}"
+    "defaultConfig": "{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Temperature\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.8587686344902596,\"funcBody\":\"var value = prevValue + Math.random() * 40 - 20;\\nif (value < -60) {\\n\\tvalue = -60;\\n} else if (value > 60) {\\n\\tvalue = 60;\\n}\\nreturn value;\",\"aggregationType\":null,\"units\":null,\"decimals\":null,\"usePostProcessing\":null,\"postFuncBody\":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\":\"AVG\",\"limit\":25000},\"timezone\":null},\"showTitle\":true,\"backgroundColor\":\"rgba(0, 0, 0, 0)\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"dataZoom\":true,\"rangeColors\":[{\"to\":-20,\"color\":\"#234CC7\"},{\"from\":-20,\"to\":0,\"color\":\"#305AD7\"},{\"from\":0,\"to\":10,\"color\":\"#7191EF\"},{\"from\":10,\"to\":20,\"color\":\"#FFA600\"},{\"from\":20,\"to\":30,\"color\":\"#F36900\"},{\"from\":30,\"to\":40,\"color\":\"#F04022\"},{\"from\":40,\"color\":\"#D81838\"}],\"outOfRangeColor\":\"#ccc\",\"fillArea\":true,\"showLegend\":true,\"legendPosition\":\"top\",\"legendLabelFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"16px\"},\"legendLabelColor\":\"rgba(0, 0, 0, 0.76)\",\"showTooltip\":true,\"tooltipValueFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"500\",\"lineHeight\":\"16px\"},\"tooltipValueColor\":\"rgba(0, 0, 0, 0.76)\",\"tooltipShowDate\":true,\"tooltipDateFormat\":{\"format\":null,\"lastUpdateAgo\":false,\"custom\":false,\"auto\":true,\"autoDateFormatSettings\":{}},\"tooltipDateFont\":{\"family\":\"Roboto\",\"size\":11,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"16px\"},\"tooltipDateColor\":\"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}},\"tooltipDateInterval\":true},\"title\":\"Range 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\":\"°C\",\"decimals\":0,\"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": [
     "range",
     "color range",
diff --git a/application/src/main/data/json/system/widget_types/rpc_debug_terminal.json b/application/src/main/data/json/system/widget_types/rpc_debug_terminal.json
index eed625283a..0d3409a4b4 100644
--- a/application/src/main/data/json/system/widget_types/rpc_debug_terminal.json
+++ b/application/src/main/data/json/system/widget_types/rpc_debug_terminal.json
@@ -11,7 +11,7 @@
     "resources": [],
     "templateHtml": "<div style=\"height: 100%; overflow-y: auto;\" id=\"device-terminal\"></div>",
     "templateCss": ".cmd .cursor.blink {\n    -webkit-animation-name: terminal-underline;\n       -moz-animation-name: terminal-underline;\n        -ms-animation-name: terminal-underline;\n            animation-name: terminal-underline;\n}\n.terminal .inverted, .cmd .inverted {\n    border-bottom-color: #aaa;\n}\n\n",
-    "controllerScript": "var requestTimeout = 500;\nvar requestPersistent = false;\nvar persistentPollingInterval = 5000;\n\nself.onInit = function() {\n    var subscription = self.ctx.defaultSubscription;\n    var rpcEnabled = subscription.rpcEnabled;\n    var deviceName = 'Simulated';\n    var prompt;\n    if (subscription.targetDeviceName && subscription.targetDeviceName.length) {\n        deviceName = subscription.targetDeviceName;\n    }\n    if (self.ctx.settings.requestTimeout) {\n        requestTimeout = self.ctx.settings.requestTimeout;\n    }\n    if (self.ctx.settings.requestPersistent) {\n        requestPersistent = self.ctx.settings.requestPersistent;\n    }\n    if (self.ctx.settings.persistentPollingInterval) {\n        persistentPollingInterval = self.ctx.settings.persistentPollingInterval;\n    }\n    var greetings = 'Welcome to ThingsBoard RPC debug terminal.\\n\\n';\n    if (!rpcEnabled) {\n        greetings += 'Target device is not set!\\n\\n';\n        prompt = '';\n    } else {\n        greetings += 'Current target device for RPC commands: [[b;#fff;]' + deviceName + ']\\n\\n';\n        greetings += 'Please type [[b;#fff;]\\'help\\'] to see usage.\\n';\n        prompt = '[[b;#8bc34a;]' + deviceName +']> ';\n    }\n    \n    var terminal = $('#device-terminal', self.ctx.$container).terminal(\n        function(command) {\n            if (command !== '') {\n                try {\n                    var localCommand = command.trim();\n                    var requestUUID = uuidv4();\n                    if (localCommand === 'help') {\n                        printUsage(this);\n                    } else {\n                        var spaceIndex = localCommand.indexOf(' ');\n                        if (spaceIndex === -1 && !localCommand.length) {\n                            this.error(\"Wrong number of arguments!\");\n                            this.echo(' ');\n                        } else {\n                            var params;\n                            if (spaceIndex === -1) {\n                                spaceIndex = localCommand.length;\n                            }\n                            var name = localCommand.substr(0, spaceIndex);\n                            var args = localCommand.substr(spaceIndex + 1);\n                            if (args.length) {\n                                try {\n                                    params = JSON.parse(args);\n                                } catch (e) {\n                                    params = args;\n                                }\n                            }\n                            performRpc(this, name, params, requestUUID);\n                        }\n                    }\n                } catch(e) {\n                    this.error(new String(e));\n                }\n            } else {\n               this.echo('');\n            }\n        }, {\n            greetings: greetings,\n            prompt: prompt,\n            enabled: rpcEnabled\n    });\n    \n    if (!rpcEnabled) {\n        terminal.error('No RPC target detected!').pause();\n    }\n}\n\n\nfunction printUsage(terminal) {\n    var commandsListText = '\\n[[b;#fff;]Usage:]\\n';\n    commandsListText += '   <method> [params body]]\\n\\n';\n    commandsListText += '[[b;#fff;]Example 1:]\\n'; \n    commandsListText += '   myRemoteMethod1 myText\\n\\n'; \n    commandsListText += '[[b;#fff;]Example 2:]\\n'; \n    commandsListText += '   myOtherRemoteMethod \"{\\\\\"key1\\\\\": 2, \\\\\"key2\\\\\": \\\\\"myVal\\\\\"}\"\\n'; \n    terminal.echo(new String(commandsListText));\n}\n\n\nfunction performRpc(terminal, method, params, requestUUID) {\n    terminal.pause();\n    self.ctx.controlApi.sendTwoWayCommand(method, params, requestTimeout, requestPersistent, persistentPollingInterval, requestUUID).subscribe(\n        function success(responseBody) {\n            terminal.echo(JSON.stringify(responseBody));\n            terminal.echo(' ');\n            terminal.resume();\n        },\n        function fail() {\n            var errorText = self.ctx.defaultSubscription.rpcErrorText;\n            terminal.error(errorText);\n            terminal.echo(' ');\n            terminal.resume();\n        }\n    );\n}\n\n\nfunction uuidv4() {\n  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {\n    var r = Math.random() * 16 | 0, v = c == 'x' ? r : (r & 0x3 | 0x8);\n    return v.toString(16);\n  });\n}\n\n  \nself.onDestroy = function() {\n    self.ctx.controlApi.completedCommand();\n}",
+    "controllerScript": "var requestTimeout = 500;\nvar requestPersistent = false;\nvar persistentPollingInterval = 5000;\n\nself.onInit = function() {\n    var subscription = self.ctx.defaultSubscription;\n    var rpcEnabled = subscription.rpcEnabled;\n    var deviceName = 'Simulated';\n    var prompt;\n    if (subscription.targetEntityName && subscription.targetEntityName.length) {\n        deviceName = subscription.targetEntityName;\n    }\n    if (self.ctx.settings.requestTimeout) {\n        requestTimeout = self.ctx.settings.requestTimeout;\n    }\n    if (self.ctx.settings.requestPersistent) {\n        requestPersistent = self.ctx.settings.requestPersistent;\n    }\n    if (self.ctx.settings.persistentPollingInterval) {\n        persistentPollingInterval = self.ctx.settings.persistentPollingInterval;\n    }\n    var greetings = 'Welcome to ThingsBoard RPC debug terminal.\\n\\n';\n    if (!rpcEnabled) {\n        greetings += 'Target device is not set!\\n\\n';\n        prompt = '';\n    } else {\n        greetings += 'Current target device for RPC commands: [[b;#fff;]' + deviceName + ']\\n\\n';\n        greetings += 'Please type [[b;#fff;]\\'help\\'] to see usage.\\n';\n        prompt = '[[b;#8bc34a;]' + deviceName +']> ';\n    }\n    \n    var terminal = $('#device-terminal', self.ctx.$container).terminal(\n        function(command) {\n            if (command !== '') {\n                try {\n                    var localCommand = command.trim();\n                    var requestUUID = uuidv4();\n                    if (localCommand === 'help') {\n                        printUsage(this);\n                    } else {\n                        var spaceIndex = localCommand.indexOf(' ');\n                        if (spaceIndex === -1 && !localCommand.length) {\n                            this.error(\"Wrong number of arguments!\");\n                            this.echo(' ');\n                        } else {\n                            var params;\n                            if (spaceIndex === -1) {\n                                spaceIndex = localCommand.length;\n                            }\n                            var name = localCommand.substr(0, spaceIndex);\n                            var args = localCommand.substr(spaceIndex + 1);\n                            if (args.length) {\n                                try {\n                                    params = JSON.parse(args);\n                                } catch (e) {\n                                    params = args;\n                                }\n                            }\n                            performRpc(this, name, params, requestUUID);\n                        }\n                    }\n                } catch(e) {\n                    this.error(new String(e));\n                }\n            } else {\n               this.echo('');\n            }\n        }, {\n            greetings: greetings,\n            prompt: prompt,\n            enabled: rpcEnabled\n    });\n    \n    if (!rpcEnabled) {\n        terminal.error('No RPC target detected!').pause();\n    }\n}\n\n\nfunction printUsage(terminal) {\n    var commandsListText = '\\n[[b;#fff;]Usage:]\\n';\n    commandsListText += '   <method> [params body]]\\n\\n';\n    commandsListText += '[[b;#fff;]Example 1:]\\n'; \n    commandsListText += '   myRemoteMethod1 myText\\n\\n'; \n    commandsListText += '[[b;#fff;]Example 2:]\\n'; \n    commandsListText += '   myOtherRemoteMethod \"{\\\\\"key1\\\\\": 2, \\\\\"key2\\\\\": \\\\\"myVal\\\\\"}\"\\n'; \n    terminal.echo(new String(commandsListText));\n}\n\n\nfunction performRpc(terminal, method, params, requestUUID) {\n    terminal.pause();\n    self.ctx.controlApi.sendTwoWayCommand(method, params, requestTimeout, requestPersistent, persistentPollingInterval, requestUUID).subscribe(\n        function success(responseBody) {\n            terminal.echo(JSON.stringify(responseBody));\n            terminal.echo(' ');\n            terminal.resume();\n        },\n        function fail() {\n            var errorText = self.ctx.defaultSubscription.rpcErrorText;\n            terminal.error(errorText);\n            terminal.echo(' ');\n            terminal.resume();\n        }\n    );\n}\n\n\nfunction uuidv4() {\n  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {\n    var r = Math.random() * 16 | 0, v = c == 'x' ? r : (r & 0x3 | 0x8);\n    return v.toString(16);\n  });\n}\n\n  \nself.onDestroy = function() {\n    self.ctx.controlApi.completedCommand();\n}",
     "settingsSchema": "",
     "dataKeySettingsSchema": "{}\n",
     "settingsDirective": "tb-rpc-terminal-widget-settings",
diff --git a/application/src/main/data/json/system/widget_types/rpc_remote_shell.json b/application/src/main/data/json/system/widget_types/rpc_remote_shell.json
index de9925a054..c02ce6b3d1 100644
--- a/application/src/main/data/json/system/widget_types/rpc_remote_shell.json
+++ b/application/src/main/data/json/system/widget_types/rpc_remote_shell.json
@@ -11,7 +11,7 @@
     "resources": [],
     "templateHtml": "<div style=\"height: 100%; overflow-y: auto;\" id=\"device-terminal\"></div>",
     "templateCss": ".cmd .cursor.blink {\n    -webkit-animation-name: terminal-underline;\n       -moz-animation-name: terminal-underline;\n        -ms-animation-name: terminal-underline;\n            animation-name: terminal-underline;\n}\n.terminal .inverted, .cmd .inverted {\n    border-bottom-color: #aaa;\n}\n",
-    "controllerScript": "var requestTimeout = 500;\nvar commandStatusPollingInterval = 200;\n\nvar welcome = 'Welcome to ThingsBoard RPC remote shell.\\n';\n\nvar terminal, rpcEnabled, simulated, deviceName, cwd;\nvar commandExecuting = false;\n\nself.onInit = function() {\n    var subscription = self.ctx.defaultSubscription;\n    rpcEnabled = subscription.rpcEnabled;\n    if (subscription.targetDeviceName && subscription.targetDeviceName.length) {\n        deviceName = subscription.targetDeviceName;\n    } else {\n        deviceName = 'Simulated';\n        simulated = true;\n    }\n    if (self.ctx.settings.requestTimeout) {\n        requestTimeout = self.ctx.settings.requestTimeout;\n    }\n    \n    terminal = $('#device-terminal', self.ctx.$container).terminal(\n        function (command) {\n            if (command && command.trim().length) {\n                try {\n                    if (simulated) {\n                        this.echo(command);\n                    } else {\n                        sendCommand(this, command);\n                    }\n                } catch(e) {\n                    this.error(e + '');\n                }\n            } else {\n               this.echo('');\n            }\n        }, {\n            greetings: false,\n            enabled: rpcEnabled,\n            prompt: rpcEnabled ? currentPrompt : '',\n            name: 'shell',\n            pauseEvents: false,\n            keydown: function (e, term) {\n                if ((e.which == 67 || e.which == 68) && e.ctrlKey) { // CTRL+C || CTRL+D\n                    if (commandExecuting) {\n                        terminateCommand(term);\n                        return false;\n                    }\n                }\n            },\n            onInit: initTerm\n        }\n    );\n    \n};\n\nfunction initTerm(terminal) {\n    terminal.echo(welcome);\n    if (!rpcEnabled) {\n        terminal.error('Target device is not set!\\n');\n    } else {\n        terminal.echo('Current target device for RPC terminal: [[b;#fff;]' + deviceName + ']\\n');\n        if (!simulated) {\n            terminal.pause();\n            getTermInfo(terminal,\n            function (remoteTermInfo) {\n                if (remoteTermInfo) {\n                    terminal.echo('Remote platform info:');\n                    terminal.echo('OS: [[b;#fff;]' + remoteTermInfo.platform + ']');\n                    if (remoteTermInfo.release) {\n                        terminal.echo('OS release: [[b;#fff;]' + remoteTermInfo.release + ']');\n                    }\n                    terminal.echo('\\r');\n                } else {\n                    terminal.echo('[[;#f00;]Unable to get remote platform info.\\nDevice is not responding.]\\n');\n                }\n                terminal.resume();\n            });\n        }\n    }\n}\n\nfunction currentPrompt(callback) {\n    if (cwd) {\n        callback('[[b;#2196f3;]' + deviceName +']: [[b;#8bc34a;]' + cwd +']> ');\n    } else {\n        callback('[[b;#8bc34a;]' + deviceName +']> ');\n    }\n}\n\nfunction getTermInfo(terminal, callback) {\n    self.ctx.controlApi.sendTwoWayCommand('getTermInfo', null, requestTimeout).subscribe(\n        function (termInfo) {\n            cwd = termInfo.cwd;\n            if (callback) {\n                callback(termInfo);\n            } \n        },\n        function () {\n            if (callback) {\n                callback(null);\n            }\n        }\n    );\n}\n\nfunction sendCommand(terminal, command) {\n    terminal.pause();\n    var sendCommandRequest = {\n        command: command,\n        cwd: cwd\n    };\n    self.ctx.controlApi.sendTwoWayCommand('sendCommand', sendCommandRequest, requestTimeout).subscribe(\n        function (responseBody) {\n            if (responseBody && responseBody.ok) {\n                commandExecuting = true;\n                setTimeout( pollCommandStatus.bind(null,terminal), commandStatusPollingInterval );\n            } else {\n                var error = responseBody ? responseBody.error : 'Unhandled error.';\n                terminal.error(error);\n                terminal.resume();\n            }\n        },\n        function () {\n            onRpcError(terminal);\n        }\n    );\n}\n\nfunction terminateCommand(terminal) {\n    self.ctx.controlApi.sendTwoWayCommand('terminateCommand', null, requestTimeout).subscribe(\n        function (responseBody) {\n            if (!responseBody.ok) {\n                commandExecuting = false;\n                terminal.error(responseBody.error);\n                terminal.resume();\n            } \n        },\n        function () {\n            onRpcError(terminal);\n        }\n    );    \n}\n\nfunction onRpcError(terminal) {\n    var errorText = self.ctx.defaultSubscription.rpcErrorText;\n    terminal.error(errorText);\n    terminal.resume();\n}\n\nfunction pollCommandStatus(terminal) {\n    self.ctx.controlApi.sendTwoWayCommand('getCommandStatus', null, requestTimeout).subscribe(\n        function (commandStatusResponse) {\n            for (var i=0;i<commandStatusResponse.data.length;i++) {\n                var dataElement = commandStatusResponse.data[i];\n                if (dataElement.stdout) {\n                    terminal.echo(dataElement.stdout);\n                }\n                if (dataElement.stderr) {\n                    terminal.error(dataElement.stderr);\n                }\n            }\n            if (commandStatusResponse.done) {\n                commandExecuting = false;\n                cwd = commandStatusResponse.cwd;\n                terminal.resume();\n            } else {\n                var interval = commandStatusPollingInterval;\n                if (!commandStatusResponse.data.length) {\n                    interval *=5;\n                }\n                setTimeout( pollCommandStatus.bind(null,terminal), interval );\n            }\n        },\n        function () {\n            commandExecuting = false;\n            onRpcError(terminal);\n        }\n    );\n}\n\nself.onResize = function () {\n    if (terminal) {\n        terminal.resize(self.ctx.width, self.ctx.height);\n    }\n};\n\nself.onDestroy = function() {\n};\n",
+    "controllerScript": "var requestTimeout = 500;\nvar commandStatusPollingInterval = 200;\n\nvar welcome = 'Welcome to ThingsBoard RPC remote shell.\\n';\n\nvar terminal, rpcEnabled, simulated, deviceName, cwd;\nvar commandExecuting = false;\n\nself.onInit = function() {\n    var subscription = self.ctx.defaultSubscription;\n    rpcEnabled = subscription.rpcEnabled;\n    if (subscription.targetEntityName && subscription.targetEntityName.length) {\n        deviceName = subscription.targetEntityName;\n    } else {\n        deviceName = 'Simulated';\n        simulated = true;\n    }\n    if (self.ctx.settings.requestTimeout) {\n        requestTimeout = self.ctx.settings.requestTimeout;\n    }\n    \n    terminal = $('#device-terminal', self.ctx.$container).terminal(\n        function (command) {\n            if (command && command.trim().length) {\n                try {\n                    if (simulated) {\n                        this.echo(command);\n                    } else {\n                        sendCommand(this, command);\n                    }\n                } catch(e) {\n                    this.error(e + '');\n                }\n            } else {\n               this.echo('');\n            }\n        }, {\n            greetings: false,\n            enabled: rpcEnabled,\n            prompt: rpcEnabled ? currentPrompt : '',\n            name: 'shell',\n            pauseEvents: false,\n            keydown: function (e, term) {\n                if ((e.which == 67 || e.which == 68) && e.ctrlKey) { // CTRL+C || CTRL+D\n                    if (commandExecuting) {\n                        terminateCommand(term);\n                        return false;\n                    }\n                }\n            },\n            onInit: initTerm\n        }\n    );\n    \n};\n\nfunction initTerm(terminal) {\n    terminal.echo(welcome);\n    if (!rpcEnabled) {\n        terminal.error('Target device is not set!\\n');\n    } else {\n        terminal.echo('Current target device for RPC terminal: [[b;#fff;]' + deviceName + ']\\n');\n        if (!simulated) {\n            terminal.pause();\n            getTermInfo(terminal,\n            function (remoteTermInfo) {\n                if (remoteTermInfo) {\n                    terminal.echo('Remote platform info:');\n                    terminal.echo('OS: [[b;#fff;]' + remoteTermInfo.platform + ']');\n                    if (remoteTermInfo.release) {\n                        terminal.echo('OS release: [[b;#fff;]' + remoteTermInfo.release + ']');\n                    }\n                    terminal.echo('\\r');\n                } else {\n                    terminal.echo('[[;#f00;]Unable to get remote platform info.\\nDevice is not responding.]\\n');\n                }\n                terminal.resume();\n            });\n        }\n    }\n}\n\nfunction currentPrompt(callback) {\n    if (cwd) {\n        callback('[[b;#2196f3;]' + deviceName +']: [[b;#8bc34a;]' + cwd +']> ');\n    } else {\n        callback('[[b;#8bc34a;]' + deviceName +']> ');\n    }\n}\n\nfunction getTermInfo(terminal, callback) {\n    self.ctx.controlApi.sendTwoWayCommand('getTermInfo', null, requestTimeout).subscribe(\n        function (termInfo) {\n            cwd = termInfo.cwd;\n            if (callback) {\n                callback(termInfo);\n            } \n        },\n        function () {\n            if (callback) {\n                callback(null);\n            }\n        }\n    );\n}\n\nfunction sendCommand(terminal, command) {\n    terminal.pause();\n    var sendCommandRequest = {\n        command: command,\n        cwd: cwd\n    };\n    self.ctx.controlApi.sendTwoWayCommand('sendCommand', sendCommandRequest, requestTimeout).subscribe(\n        function (responseBody) {\n            if (responseBody && responseBody.ok) {\n                commandExecuting = true;\n                setTimeout( pollCommandStatus.bind(null,terminal), commandStatusPollingInterval );\n            } else {\n                var error = responseBody ? responseBody.error : 'Unhandled error.';\n                terminal.error(error);\n                terminal.resume();\n            }\n        },\n        function () {\n            onRpcError(terminal);\n        }\n    );\n}\n\nfunction terminateCommand(terminal) {\n    self.ctx.controlApi.sendTwoWayCommand('terminateCommand', null, requestTimeout).subscribe(\n        function (responseBody) {\n            if (!responseBody.ok) {\n                commandExecuting = false;\n                terminal.error(responseBody.error);\n                terminal.resume();\n            } \n        },\n        function () {\n            onRpcError(terminal);\n        }\n    );    \n}\n\nfunction onRpcError(terminal) {\n    var errorText = self.ctx.defaultSubscription.rpcErrorText;\n    terminal.error(errorText);\n    terminal.resume();\n}\n\nfunction pollCommandStatus(terminal) {\n    self.ctx.controlApi.sendTwoWayCommand('getCommandStatus', null, requestTimeout).subscribe(\n        function (commandStatusResponse) {\n            for (var i=0;i<commandStatusResponse.data.length;i++) {\n                var dataElement = commandStatusResponse.data[i];\n                if (dataElement.stdout) {\n                    terminal.echo(dataElement.stdout);\n                }\n                if (dataElement.stderr) {\n                    terminal.error(dataElement.stderr);\n                }\n            }\n            if (commandStatusResponse.done) {\n                commandExecuting = false;\n                cwd = commandStatusResponse.cwd;\n                terminal.resume();\n            } else {\n                var interval = commandStatusPollingInterval;\n                if (!commandStatusResponse.data.length) {\n                    interval *=5;\n                }\n                setTimeout( pollCommandStatus.bind(null,terminal), interval );\n            }\n        },\n        function () {\n            commandExecuting = false;\n            onRpcError(terminal);\n        }\n    );\n}\n\nself.onResize = function () {\n    if (terminal) {\n        terminal.resize(self.ctx.width, self.ctx.height);\n    }\n};\n\nself.onDestroy = function() {\n};\n",
     "settingsSchema": "",
     "dataKeySettingsSchema": "{}\n",
     "settingsDirective": "tb-rpc-shell-widget-settings",
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/json/system/widget_types/time_series_chart.json b/application/src/main/data/json/system/widget_types/time_series_chart.json
new file mode 100644
index 0000000000..9b2069ca6b
--- /dev/null
+++ b/application/src/main/data/json/system/widget_types/time_series_chart.json
@@ -0,0 +1,36 @@
+{
+  "fqn": "time_series_chart",
+  "name": "Time series chart",
+  "deprecated": false,
+  "image": "tb-image:Y2hhcnQuc3Zn:IlRpbWUgc2VyaWVzIGNoYXJ0IiBzeXN0ZW0gd2lkZ2V0IGltYWdl;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_4053_185113)">
<path d="M2.84766 1.28125V7H2.125V2.18359L0.667969 2.71484V2.0625L2.73438 1.28125H2.84766ZM8.67517 3.70312V4.57031C8.67517 5.03646 8.63351 5.42969 8.55017 5.75C8.46684 6.07031 8.34705 6.32812 8.1908 6.52344C8.03455 6.71875 7.84575 6.86068 7.62439 6.94922C7.40564 7.03516 7.15825 7.07812 6.8822 7.07812C6.66345 7.07812 6.46163 7.05078 6.27673 6.99609C6.09184 6.94141 5.92517 6.85417 5.77673 6.73438C5.6309 6.61198 5.5059 6.45312 5.40173 6.25781C5.29757 6.0625 5.21814 5.82552 5.16345 5.54688C5.10877 5.26823 5.08142 4.94271 5.08142 4.57031V3.70312C5.08142 3.23698 5.12309 2.84635 5.20642 2.53125C5.29236 2.21615 5.41345 1.96354 5.5697 1.77344C5.72595 1.58073 5.91345 1.44271 6.1322 1.35938C6.35356 1.27604 6.60095 1.23438 6.87439 1.23438C7.09575 1.23438 7.29887 1.26172 7.48377 1.31641C7.67127 1.36849 7.83793 1.45312 7.98377 1.57031C8.1296 1.6849 8.2533 1.83854 8.35486 2.03125C8.45903 2.22135 8.53845 2.45443 8.59314 2.73047C8.64783 3.00651 8.67517 3.33073 8.67517 3.70312ZM7.94861 4.6875V3.58203C7.94861 3.32682 7.93298 3.10286 7.90173 2.91016C7.87309 2.71484 7.83012 2.54818 7.77283 2.41016C7.71554 2.27214 7.64262 2.16016 7.55408 2.07422C7.46814 1.98828 7.36788 1.92578 7.2533 1.88672C7.14132 1.84505 7.01502 1.82422 6.87439 1.82422C6.70252 1.82422 6.55017 1.85677 6.41736 1.92188C6.28455 1.98438 6.17257 2.08464 6.08142 2.22266C5.99288 2.36068 5.92517 2.54167 5.8783 2.76562C5.83142 2.98958 5.80798 3.26172 5.80798 3.58203V4.6875C5.80798 4.94271 5.82231 5.16797 5.85095 5.36328C5.8822 5.55859 5.92778 5.72786 5.98767 5.87109C6.04757 6.01172 6.12048 6.1276 6.20642 6.21875C6.29236 6.3099 6.39132 6.3776 6.5033 6.42188C6.61788 6.46354 6.74418 6.48438 6.8822 6.48438C7.05929 6.48438 7.21423 6.45052 7.34705 6.38281C7.47986 6.3151 7.59054 6.20964 7.67908 6.06641C7.77022 5.92057 7.83793 5.73438 7.8822 5.50781C7.92647 5.27865 7.94861 5.00521 7.94861 4.6875ZM13.3074 3.70312V4.57031C13.3074 5.03646 13.2657 5.42969 13.1824 5.75C13.099 6.07031 12.9793 6.32812 12.823 6.52344C12.6668 6.71875 12.4779 6.86068 12.2566 6.94922C12.0378 7.03516 11.7904 7.07812 11.5144 7.07812C11.2957 7.07812 11.0938 7.05078 10.9089 6.99609C10.724 6.94141 10.5574 6.85417 10.4089 6.73438C10.2631 6.61198 10.1381 6.45312 10.0339 6.25781C9.92977 6.0625 9.85034 5.82552 9.79566 5.54688C9.74097 5.26823 9.71363 4.94271 9.71363 4.57031V3.70312C9.71363 3.23698 9.75529 2.84635 9.83863 2.53125C9.92456 2.21615 10.0457 1.96354 10.2019 1.77344C10.3582 1.58073 10.5457 1.44271 10.7644 1.35938C10.9858 1.27604 11.2332 1.23438 11.5066 1.23438C11.7279 1.23438 11.9311 1.26172 12.116 1.31641C12.3035 1.36849 12.4701 1.45312 12.616 1.57031C12.7618 1.6849 12.8855 1.83854 12.9871 2.03125C13.0912 2.22135 13.1707 2.45443 13.2253 2.73047C13.28 3.00651 13.3074 3.33073 13.3074 3.70312ZM12.5808 4.6875V3.58203C12.5808 3.32682 12.5652 3.10286 12.5339 2.91016C12.5053 2.71484 12.4623 2.54818 12.405 2.41016C12.3477 2.27214 12.2748 2.16016 12.1863 2.07422C12.1003 1.98828 12.0001 1.92578 11.8855 1.88672C11.7735 1.84505 11.6472 1.82422 11.5066 1.82422C11.3347 1.82422 11.1824 1.85677 11.0496 1.92188C10.9168 1.98438 10.8048 2.08464 10.7136 2.22266C10.6251 2.36068 10.5574 2.54167 10.5105 2.76562C10.4636 2.98958 10.4402 3.26172 10.4402 3.58203V4.6875C10.4402 4.94271 10.4545 5.16797 10.4832 5.36328C10.5144 5.55859 10.56 5.72786 10.6199 5.87109C10.6798 6.01172 10.7527 6.1276 10.8386 6.21875C10.9246 6.3099 11.0235 6.3776 11.1355 6.42188C11.2501 6.46354 11.3764 6.48438 11.5144 6.48438C11.6915 6.48438 11.8464 6.45052 11.9793 6.38281C12.1121 6.3151 12.2227 6.20964 12.3113 6.06641C12.4024 5.92057 12.4701 5.73438 12.5144 5.50781C12.5587 5.27865 12.5808 5.00521 12.5808 4.6875ZM14.3068 2.70703V2.40625C14.3068 2.1901 14.3536 1.99349 14.4474 1.81641C14.5411 1.63932 14.6753 1.4974 14.8497 1.39062C15.0242 1.28385 15.2312 1.23047 15.4708 1.23047C15.7156 1.23047 15.924 1.28385 16.0958 1.39062C16.2703 1.4974 16.4044 1.63932 16.4982 1.81641C16.5919 1.99349 16.6388 2.1901 16.6388 2.40625V2.70703C16.6388 2.91797 16.5919 3.11198 16.4982 3.28906C16.407 3.46615 16.2742 3.60807 16.0997 3.71484C15.9279 3.82161 15.7208 3.875 15.4786 3.875C15.2365 3.875 15.0268 3.82161 14.8497 3.71484C14.6753 3.60807 14.5411 3.46615 14.4474 3.28906C14.3536 3.11198 14.3068 2.91797 14.3068 2.70703ZM14.8497 2.40625V2.70703C14.8497 2.82682 14.8719 2.9401 14.9161 3.04688C14.963 3.15365 15.0333 3.24089 15.1271 3.30859C15.2208 3.3737 15.338 3.40625 15.4786 3.40625C15.6193 3.40625 15.7352 3.3737 15.8263 3.30859C15.9174 3.24089 15.9852 3.15365 16.0294 3.04688C16.0737 2.9401 16.0958 2.82682 16.0958 2.70703V2.40625C16.0958 2.28385 16.0724 2.16927 16.0255 2.0625C15.9812 1.95312 15.9122 1.86589 15.8185 1.80078C15.7273 1.73307 15.6115 1.69922 15.4708 1.69922C15.3328 1.69922 15.2169 1.73307 15.1232 1.80078C15.032 1.86589 14.963 1.95312 14.9161 2.0625C14.8719 2.16927 14.8497 2.28385 14.8497 2.40625ZM17.0763 5.91016V5.60547C17.0763 5.39193 17.1232 5.19661 17.2169 5.01953C17.3107 4.84245 17.4448 4.70052 17.6193 4.59375C17.7937 4.48698 18.0008 4.43359 18.2404 4.43359C18.4852 4.43359 18.6935 4.48698 18.8654 4.59375C19.0398 4.70052 19.174 4.84245 19.2677 5.01953C19.3615 5.19661 19.4083 5.39193 19.4083 5.60547V5.91016C19.4083 6.1237 19.3615 6.31901 19.2677 6.49609C19.1766 6.67318 19.0437 6.8151 18.8693 6.92188C18.6974 7.02865 18.4904 7.08203 18.2482 7.08203C18.006 7.08203 17.7977 7.02865 17.6232 6.92188C17.4487 6.8151 17.3133 6.67318 17.2169 6.49609C17.1232 6.31901 17.0763 6.1237 17.0763 5.91016ZM17.6193 5.60547V5.91016C17.6193 6.02995 17.6414 6.14453 17.6857 6.25391C17.7325 6.36068 17.8029 6.44792 17.8966 6.51562C17.9904 6.58073 18.1075 6.61328 18.2482 6.61328C18.3888 6.61328 18.5047 6.58073 18.5958 6.51562C18.6896 6.44792 18.7586 6.36068 18.8029 6.25391C18.8471 6.14714 18.8693 6.03255 18.8693 5.91016V5.60547C18.8693 5.48307 18.8458 5.36849 18.799 5.26172C18.7547 5.15495 18.6857 5.06901 18.5919 5.00391C18.5008 4.9362 18.3836 4.90234 18.2404 4.90234C18.1023 4.90234 17.9865 4.9362 17.8927 5.00391C17.8016 5.06901 17.7325 5.15495 17.6857 5.26172C17.6414 5.36849 17.6193 5.48307 17.6193 5.60547ZM18.42 2.12109L15.6427 6.56641L15.2365 6.30859L18.0138 1.86328L18.42 2.12109Z" fill="black" fill-opacity="0.54"/>
<path d="M8.05859 33.668C8.05859 34.0143 7.97786 34.3086 7.81641 34.5508C7.65755 34.7904 7.44141 34.9727 7.16797 35.0977C6.89714 35.2227 6.59115 35.2852 6.25 35.2852C5.90885 35.2852 5.60156 35.2227 5.32812 35.0977C5.05469 34.9727 4.83854 34.7904 4.67969 34.5508C4.52083 34.3086 4.44141 34.0143 4.44141 33.668C4.44141 33.4414 4.48438 33.2344 4.57031 33.0469C4.65885 32.8568 4.78255 32.6914 4.94141 32.5508C5.10286 32.4102 5.29297 32.3021 5.51172 32.2266C5.73307 32.1484 5.97656 32.1094 6.24219 32.1094C6.59115 32.1094 6.90234 32.1771 7.17578 32.3125C7.44922 32.4453 7.66406 32.6289 7.82031 32.8633C7.97917 33.0977 8.05859 33.3659 8.05859 33.668ZM7.33203 33.6523C7.33203 33.4414 7.28646 33.2552 7.19531 33.0938C7.10417 32.9297 6.97656 32.8021 6.8125 32.7109C6.64844 32.6198 6.45833 32.5742 6.24219 32.5742C6.02083 32.5742 5.82943 32.6198 5.66797 32.7109C5.50911 32.8021 5.38542 32.9297 5.29688 33.0938C5.20833 33.2552 5.16406 33.4414 5.16406 33.6523C5.16406 33.8711 5.20703 34.0586 5.29297 34.2148C5.38151 34.3685 5.50651 34.487 5.66797 34.5703C5.83203 34.651 6.02604 34.6914 6.25 34.6914C6.47396 34.6914 6.66667 34.651 6.82812 34.5703C6.98958 34.487 7.11328 34.3685 7.19922 34.2148C7.28776 34.0586 7.33203 33.8711 7.33203 33.6523ZM7.92578 31C7.92578 31.276 7.85286 31.5247 7.70703 31.7461C7.5612 31.9674 7.36198 32.1419 7.10938 32.2695C6.85677 32.3971 6.57031 32.4609 6.25 32.4609C5.92448 32.4609 5.63411 32.3971 5.37891 32.2695C5.1263 32.1419 4.92839 31.9674 4.78516 31.7461C4.64193 31.5247 4.57031 31.276 4.57031 31C4.57031 30.6693 4.64193 30.388 4.78516 30.1562C4.93099 29.9245 5.13021 29.7474 5.38281 29.625C5.63542 29.5026 5.92318 29.4414 6.24609 29.4414C6.57161 29.4414 6.86068 29.5026 7.11328 29.625C7.36589 29.7474 7.5638 29.9245 7.70703 30.1562C7.85286 30.388 7.92578 30.6693 7.92578 31ZM7.20312 31.0117C7.20312 30.8216 7.16276 30.6536 7.08203 30.5078C7.0013 30.362 6.88932 30.2474 6.74609 30.1641C6.60286 30.0781 6.4362 30.0352 6.24609 30.0352C6.05599 30.0352 5.88932 30.0755 5.74609 30.1562C5.60547 30.2344 5.49479 30.3464 5.41406 30.4922C5.33594 30.638 5.29688 30.8112 5.29688 31.0117C5.29688 31.207 5.33594 31.3776 5.41406 31.5234C5.49479 31.6693 5.60677 31.7826 5.75 31.8633C5.89323 31.944 6.0599 31.9844 6.25 31.9844C6.4401 31.9844 6.60547 31.944 6.74609 31.8633C6.88932 31.7826 7.0013 31.6693 7.08203 31.5234C7.16276 31.3776 7.20312 31.207 7.20312 31.0117ZM12.6752 31.9102V32.7773C12.6752 33.2435 12.6335 33.6367 12.5502 33.957C12.4668 34.2773 12.347 34.5352 12.1908 34.7305C12.0345 34.9258 11.8457 35.0677 11.6244 35.1562C11.4056 35.2422 11.1582 35.2852 10.8822 35.2852C10.6635 35.2852 10.4616 35.2578 10.2767 35.2031C10.0918 35.1484 9.92517 35.0612 9.77673 34.9414C9.6309 34.819 9.5059 34.6602 9.40173 34.4648C9.29757 34.2695 9.21814 34.0326 9.16345 33.7539C9.10877 33.4753 9.08142 33.1497 9.08142 32.7773V31.9102C9.08142 31.444 9.12309 31.0534 9.20642 30.7383C9.29236 30.4232 9.41345 30.1706 9.5697 29.9805C9.72595 29.7878 9.91345 29.6497 10.1322 29.5664C10.3536 29.4831 10.601 29.4414 10.8744 29.4414C11.0957 29.4414 11.2989 29.4688 11.4838 29.5234C11.6713 29.5755 11.8379 29.6602 11.9838 29.7773C12.1296 29.8919 12.2533 30.0456 12.3549 30.2383C12.459 30.4284 12.5385 30.6615 12.5931 30.9375C12.6478 31.2135 12.6752 31.5378 12.6752 31.9102ZM11.9486 32.8945V31.7891C11.9486 31.5339 11.933 31.3099 11.9017 31.1172C11.8731 30.9219 11.8301 30.7552 11.7728 30.6172C11.7155 30.4792 11.6426 30.3672 11.5541 30.2812C11.4681 30.1953 11.3679 30.1328 11.2533 30.0938C11.1413 30.0521 11.015 30.0312 10.8744 30.0312C10.7025 30.0312 10.5502 30.0638 10.4174 30.1289C10.2845 30.1914 10.1726 30.2917 10.0814 30.4297C9.99288 30.5677 9.92517 30.7487 9.8783 30.9727C9.83142 31.1966 9.80798 31.4688 9.80798 31.7891V32.8945C9.80798 33.1497 9.82231 33.375 9.85095 33.5703C9.8822 33.7656 9.92778 33.9349 9.98767 34.0781C10.0476 34.2188 10.1205 34.3346 10.2064 34.4258C10.2924 34.5169 10.3913 34.5846 10.5033 34.6289C10.6179 34.6706 10.7442 34.6914 10.8822 34.6914C11.0593 34.6914 11.2142 34.6576 11.347 34.5898C11.4799 34.5221 11.5905 34.4167 11.6791 34.2734C11.7702 34.1276 11.8379 33.9414 11.8822 33.7148C11.9265 33.4857 11.9486 33.2122 11.9486 32.8945ZM13.6746 30.9141V30.6133C13.6746 30.3971 13.7214 30.2005 13.8152 30.0234C13.9089 29.8464 14.0431 29.7044 14.2175 29.5977C14.392 29.4909 14.599 29.4375 14.8386 29.4375C15.0834 29.4375 15.2918 29.4909 15.4636 29.5977C15.6381 29.7044 15.7722 29.8464 15.866 30.0234C15.9597 30.2005 16.0066 30.3971 16.0066 30.6133V30.9141C16.0066 31.125 15.9597 31.319 15.866 31.4961C15.7748 31.6732 15.642 31.8151 15.4675 31.9219C15.2957 32.0286 15.0886 32.082 14.8464 32.082C14.6043 32.082 14.3946 32.0286 14.2175 31.9219C14.0431 31.8151 13.9089 31.6732 13.8152 31.4961C13.7214 31.319 13.6746 31.125 13.6746 30.9141ZM14.2175 30.6133V30.9141C14.2175 31.0339 14.2397 31.1471 14.2839 31.2539C14.3308 31.3607 14.4011 31.4479 14.4949 31.5156C14.5886 31.5807 14.7058 31.6133 14.8464 31.6133C14.9871 31.6133 15.1029 31.5807 15.1941 31.5156C15.2852 31.4479 15.3529 31.3607 15.3972 31.2539C15.4415 31.1471 15.4636 31.0339 15.4636 30.9141V30.6133C15.4636 30.4909 15.4402 30.3763 15.3933 30.2695C15.349 30.1602 15.28 30.0729 15.1863 30.0078C15.0951 29.9401 14.9793 29.9062 14.8386 29.9062C14.7006 29.9062 14.5847 29.9401 14.491 30.0078C14.3998 30.0729 14.3308 30.1602 14.2839 30.2695C14.2397 30.3763 14.2175 30.4909 14.2175 30.6133ZM16.4441 34.1172V33.8125C16.4441 33.599 16.491 33.4036 16.5847 33.2266C16.6785 33.0495 16.8126 32.9076 16.9871 32.8008C17.1615 32.694 17.3686 32.6406 17.6082 32.6406C17.8529 32.6406 18.0613 32.694 18.2332 32.8008C18.4076 32.9076 18.5418 33.0495 18.6355 33.2266C18.7293 33.4036 18.7761 33.599 18.7761 33.8125V34.1172C18.7761 34.3307 18.7293 34.526 18.6355 34.7031C18.5444 34.8802 18.4115 35.0221 18.2371 35.1289C18.0652 35.2357 17.8582 35.2891 17.616 35.2891C17.3738 35.2891 17.1654 35.2357 16.991 35.1289C16.8165 35.0221 16.6811 34.8802 16.5847 34.7031C16.491 34.526 16.4441 34.3307 16.4441 34.1172ZM16.9871 33.8125V34.1172C16.9871 34.237 17.0092 34.3516 17.0535 34.4609C17.1003 34.5677 17.1707 34.6549 17.2644 34.7227C17.3582 34.7878 17.4753 34.8203 17.616 34.8203C17.7566 34.8203 17.8725 34.7878 17.9636 34.7227C18.0574 34.6549 18.1264 34.5677 18.1707 34.4609C18.2149 34.3542 18.2371 34.2396 18.2371 34.1172V33.8125C18.2371 33.6901 18.2136 33.5755 18.1668 33.4688C18.1225 33.362 18.0535 33.276 17.9597 33.2109C17.8686 33.1432 17.7514 33.1094 17.6082 33.1094C17.4701 33.1094 17.3543 33.1432 17.2605 33.2109C17.1694 33.276 17.1003 33.362 17.0535 33.4688C17.0092 33.5755 16.9871 33.6901 16.9871 33.8125ZM17.7878 30.3281L15.0105 34.7734L14.6043 34.5156L17.3816 30.0703L17.7878 30.3281Z" fill="black" fill-opacity="0.54"/>
<path d="M7.24609 57.7178H7.30859V58.3311H7.24609C6.86328 58.3311 6.54297 58.3936 6.28516 58.5186C6.02734 58.641 5.82292 58.8063 5.67188 59.0146C5.52083 59.2204 5.41146 59.4521 5.34375 59.71C5.27865 59.9678 5.24609 60.2295 5.24609 60.4951V61.3311C5.24609 61.5837 5.27604 61.8076 5.33594 62.0029C5.39583 62.1956 5.47786 62.3584 5.58203 62.4912C5.6862 62.624 5.80339 62.7243 5.93359 62.792C6.06641 62.8597 6.20443 62.8936 6.34766 62.8936C6.51432 62.8936 6.66276 62.8623 6.79297 62.7998C6.92318 62.7347 7.03255 62.6449 7.12109 62.5303C7.21224 62.4131 7.28125 62.2751 7.32812 62.1162C7.375 61.9574 7.39844 61.7829 7.39844 61.5928C7.39844 61.4235 7.3776 61.2607 7.33594 61.1045C7.29427 60.9456 7.23047 60.805 7.14453 60.6826C7.05859 60.5576 6.95052 60.46 6.82031 60.3896C6.69271 60.3167 6.54036 60.2803 6.36328 60.2803C6.16276 60.2803 5.97526 60.3298 5.80078 60.4287C5.62891 60.5251 5.48698 60.6527 5.375 60.8115C5.26562 60.9678 5.20312 61.1383 5.1875 61.3232L4.80469 61.3193C4.84115 61.0277 4.90885 60.779 5.00781 60.5732C5.10938 60.3649 5.23438 60.1956 5.38281 60.0654C5.53385 59.9326 5.70182 59.8363 5.88672 59.7764C6.07422 59.7139 6.27214 59.6826 6.48047 59.6826C6.76432 59.6826 7.00911 59.736 7.21484 59.8428C7.42057 59.9495 7.58984 60.0928 7.72266 60.2725C7.85547 60.4495 7.95312 60.6501 8.01562 60.874C8.08073 61.0954 8.11328 61.3232 8.11328 61.5576C8.11328 61.8258 8.07552 62.0771 8 62.3115C7.92448 62.5459 7.8112 62.7516 7.66016 62.9287C7.51172 63.1058 7.32812 63.2438 7.10938 63.3428C6.89062 63.4417 6.63672 63.4912 6.34766 63.4912C6.04036 63.4912 5.77214 63.4287 5.54297 63.3037C5.3138 63.1761 5.1237 63.0068 4.97266 62.7959C4.82161 62.585 4.70833 62.3506 4.63281 62.0928C4.55729 61.835 4.51953 61.5732 4.51953 61.3076V60.9678C4.51953 60.5667 4.5599 60.1735 4.64062 59.7881C4.72135 59.4027 4.86068 59.0537 5.05859 58.7412C5.25911 58.4287 5.53646 58.18 5.89062 57.9951C6.24479 57.8102 6.69661 57.7178 7.24609 57.7178ZM12.6752 60.1162V60.9834C12.6752 61.4495 12.6335 61.8428 12.5502 62.1631C12.4668 62.4834 12.347 62.7412 12.1908 62.9365C12.0345 63.1318 11.8457 63.2738 11.6244 63.3623C11.4056 63.4482 11.1582 63.4912 10.8822 63.4912C10.6635 63.4912 10.4616 63.4639 10.2767 63.4092C10.0918 63.3545 9.92517 63.2673 9.77673 63.1475C9.6309 63.0251 9.5059 62.8662 9.40173 62.6709C9.29757 62.4756 9.21814 62.2386 9.16345 61.96C9.10877 61.6813 9.08142 61.3558 9.08142 60.9834V60.1162C9.08142 59.6501 9.12309 59.2594 9.20642 58.9443C9.29236 58.6292 9.41345 58.3766 9.5697 58.1865C9.72595 57.9938 9.91345 57.8558 10.1322 57.7725C10.3536 57.6891 10.601 57.6475 10.8744 57.6475C11.0957 57.6475 11.2989 57.6748 11.4838 57.7295C11.6713 57.7816 11.8379 57.8662 11.9838 57.9834C12.1296 58.098 12.2533 58.2516 12.3549 58.4443C12.459 58.6344 12.5385 58.8675 12.5931 59.1436C12.6478 59.4196 12.6752 59.7438 12.6752 60.1162ZM11.9486 61.1006V59.9951C11.9486 59.7399 11.933 59.516 11.9017 59.3232C11.8731 59.1279 11.8301 58.9613 11.7728 58.8232C11.7155 58.6852 11.6426 58.5732 11.5541 58.4873C11.4681 58.4014 11.3679 58.3389 11.2533 58.2998C11.1413 58.2581 11.015 58.2373 10.8744 58.2373C10.7025 58.2373 10.5502 58.2699 10.4174 58.335C10.2845 58.3975 10.1726 58.4977 10.0814 58.6357C9.99288 58.7738 9.92517 58.9548 9.8783 59.1787C9.83142 59.4027 9.80798 59.6748 9.80798 59.9951V61.1006C9.80798 61.3558 9.82231 61.5811 9.85095 61.7764C9.8822 61.9717 9.92778 62.141 9.98767 62.2842C10.0476 62.4248 10.1205 62.5407 10.2064 62.6318C10.2924 62.723 10.3913 62.7907 10.5033 62.835C10.6179 62.8766 10.7442 62.8975 10.8822 62.8975C11.0593 62.8975 11.2142 62.8636 11.347 62.7959C11.4799 62.7282 11.5905 62.6227 11.6791 62.4795C11.7702 62.3337 11.8379 62.1475 11.8822 61.9209C11.9265 61.6917 11.9486 61.4183 11.9486 61.1006ZM13.6746 59.1201V58.8193C13.6746 58.6032 13.7214 58.4066 13.8152 58.2295C13.9089 58.0524 14.0431 57.9105 14.2175 57.8037C14.392 57.6969 14.599 57.6436 14.8386 57.6436C15.0834 57.6436 15.2918 57.6969 15.4636 57.8037C15.6381 57.9105 15.7722 58.0524 15.866 58.2295C15.9597 58.4066 16.0066 58.6032 16.0066 58.8193V59.1201C16.0066 59.3311 15.9597 59.5251 15.866 59.7021C15.7748 59.8792 15.642 60.0212 15.4675 60.1279C15.2957 60.2347 15.0886 60.2881 14.8464 60.2881C14.6043 60.2881 14.3946 60.2347 14.2175 60.1279C14.0431 60.0212 13.9089 59.8792 13.8152 59.7021C13.7214 59.5251 13.6746 59.3311 13.6746 59.1201ZM14.2175 58.8193V59.1201C14.2175 59.2399 14.2397 59.3532 14.2839 59.46C14.3308 59.5667 14.4011 59.654 14.4949 59.7217C14.5886 59.7868 14.7058 59.8193 14.8464 59.8193C14.9871 59.8193 15.1029 59.7868 15.1941 59.7217C15.2852 59.654 15.3529 59.5667 15.3972 59.46C15.4415 59.3532 15.4636 59.2399 15.4636 59.1201V58.8193C15.4636 58.6969 15.4402 58.5824 15.3933 58.4756C15.349 58.3662 15.28 58.279 15.1863 58.2139C15.0951 58.1462 14.9793 58.1123 14.8386 58.1123C14.7006 58.1123 14.5847 58.1462 14.491 58.2139C14.3998 58.279 14.3308 58.3662 14.2839 58.4756C14.2397 58.5824 14.2175 58.6969 14.2175 58.8193ZM16.4441 62.3232V62.0186C16.4441 61.805 16.491 61.6097 16.5847 61.4326C16.6785 61.2555 16.8126 61.1136 16.9871 61.0068C17.1615 60.9001 17.3686 60.8467 17.6082 60.8467C17.8529 60.8467 18.0613 60.9001 18.2332 61.0068C18.4076 61.1136 18.5418 61.2555 18.6355 61.4326C18.7293 61.6097 18.7761 61.805 18.7761 62.0186V62.3232C18.7761 62.5368 18.7293 62.7321 18.6355 62.9092C18.5444 63.0863 18.4115 63.2282 18.2371 63.335C18.0652 63.4417 17.8582 63.4951 17.616 63.4951C17.3738 63.4951 17.1654 63.4417 16.991 63.335C16.8165 63.2282 16.6811 63.0863 16.5847 62.9092C16.491 62.7321 16.4441 62.5368 16.4441 62.3232ZM16.9871 62.0186V62.3232C16.9871 62.443 17.0092 62.5576 17.0535 62.667C17.1003 62.7738 17.1707 62.861 17.2644 62.9287C17.3582 62.9938 17.4753 63.0264 17.616 63.0264C17.7566 63.0264 17.8725 62.9938 17.9636 62.9287C18.0574 62.861 18.1264 62.7738 18.1707 62.667C18.2149 62.5602 18.2371 62.4456 18.2371 62.3232V62.0186C18.2371 61.8962 18.2136 61.7816 18.1668 61.6748C18.1225 61.568 18.0535 61.4821 17.9597 61.417C17.8686 61.3493 17.7514 61.3154 17.6082 61.3154C17.4701 61.3154 17.3543 61.3493 17.2605 61.417C17.1694 61.4821 17.1003 61.568 17.0535 61.6748C17.0092 61.7816 16.9871 61.8962 16.9871 62.0186ZM17.7878 58.5342L15.0105 62.9795L14.6043 62.7217L17.3816 58.2764L17.7878 58.5342Z" fill="black" fill-opacity="0.54"/>
<path d="M8.31641 89.7061V90.2998H4.20703V89.874L6.75391 85.9326H7.34375L6.71094 87.0732L5.02734 89.7061H8.31641ZM7.52344 85.9326V91.6201H6.80078V85.9326H7.52344ZM12.6752 88.3232V89.1904C12.6752 89.6566 12.6335 90.0498 12.5502 90.3701C12.4668 90.6904 12.347 90.9482 12.1908 91.1436C12.0345 91.3389 11.8457 91.4808 11.6244 91.5693C11.4056 91.6553 11.1582 91.6982 10.8822 91.6982C10.6635 91.6982 10.4616 91.6709 10.2767 91.6162C10.0918 91.5615 9.92517 91.4743 9.77673 91.3545C9.6309 91.2321 9.5059 91.0732 9.40173 90.8779C9.29757 90.6826 9.21814 90.4456 9.16345 90.167C9.10877 89.8883 9.08142 89.5628 9.08142 89.1904V88.3232C9.08142 87.8571 9.12309 87.4665 9.20642 87.1514C9.29236 86.8363 9.41345 86.5837 9.5697 86.3936C9.72595 86.2008 9.91345 86.0628 10.1322 85.9795C10.3536 85.8962 10.601 85.8545 10.8744 85.8545C11.0957 85.8545 11.2989 85.8818 11.4838 85.9365C11.6713 85.9886 11.8379 86.0732 11.9838 86.1904C12.1296 86.305 12.2533 86.4587 12.3549 86.6514C12.459 86.8415 12.5385 87.0745 12.5931 87.3506C12.6478 87.6266 12.6752 87.9508 12.6752 88.3232ZM11.9486 89.3076V88.2021C11.9486 87.9469 11.933 87.723 11.9017 87.5303C11.8731 87.335 11.8301 87.1683 11.7728 87.0303C11.7155 86.8923 11.6426 86.7803 11.5541 86.6943C11.4681 86.6084 11.3679 86.5459 11.2533 86.5068C11.1413 86.4652 11.015 86.4443 10.8744 86.4443C10.7025 86.4443 10.5502 86.4769 10.4174 86.542C10.2845 86.6045 10.1726 86.7048 10.0814 86.8428C9.99288 86.9808 9.92517 87.1618 9.8783 87.3857C9.83142 87.6097 9.80798 87.8818 9.80798 88.2021V89.3076C9.80798 89.5628 9.82231 89.7881 9.85095 89.9834C9.8822 90.1787 9.92778 90.348 9.98767 90.4912C10.0476 90.6318 10.1205 90.7477 10.2064 90.8389C10.2924 90.93 10.3913 90.9977 10.5033 91.042C10.6179 91.0837 10.7442 91.1045 10.8822 91.1045C11.0593 91.1045 11.2142 91.0706 11.347 91.0029C11.4799 90.9352 11.5905 90.8298 11.6791 90.6865C11.7702 90.5407 11.8379 90.3545 11.8822 90.1279C11.9265 89.8988 11.9486 89.6253 11.9486 89.3076ZM13.6746 87.3271V87.0264C13.6746 86.8102 13.7214 86.6136 13.8152 86.4365C13.9089 86.2594 14.0431 86.1175 14.2175 86.0107C14.392 85.904 14.599 85.8506 14.8386 85.8506C15.0834 85.8506 15.2918 85.904 15.4636 86.0107C15.6381 86.1175 15.7722 86.2594 15.866 86.4365C15.9597 86.6136 16.0066 86.8102 16.0066 87.0264V87.3271C16.0066 87.5381 15.9597 87.7321 15.866 87.9092C15.7748 88.0863 15.642 88.2282 15.4675 88.335C15.2957 88.4417 15.0886 88.4951 14.8464 88.4951C14.6043 88.4951 14.3946 88.4417 14.2175 88.335C14.0431 88.2282 13.9089 88.0863 13.8152 87.9092C13.7214 87.7321 13.6746 87.5381 13.6746 87.3271ZM14.2175 87.0264V87.3271C14.2175 87.4469 14.2397 87.5602 14.2839 87.667C14.3308 87.7738 14.4011 87.861 14.4949 87.9287C14.5886 87.9938 14.7058 88.0264 14.8464 88.0264C14.9871 88.0264 15.1029 87.9938 15.1941 87.9287C15.2852 87.861 15.3529 87.7738 15.3972 87.667C15.4415 87.5602 15.4636 87.4469 15.4636 87.3271V87.0264C15.4636 86.904 15.4402 86.7894 15.3933 86.6826C15.349 86.5732 15.28 86.486 15.1863 86.4209C15.0951 86.3532 14.9793 86.3193 14.8386 86.3193C14.7006 86.3193 14.5847 86.3532 14.491 86.4209C14.3998 86.486 14.3308 86.5732 14.2839 86.6826C14.2397 86.7894 14.2175 86.904 14.2175 87.0264ZM16.4441 90.5303V90.2256C16.4441 90.012 16.491 89.8167 16.5847 89.6396C16.6785 89.4626 16.8126 89.3206 16.9871 89.2139C17.1615 89.1071 17.3686 89.0537 17.6082 89.0537C17.8529 89.0537 18.0613 89.1071 18.2332 89.2139C18.4076 89.3206 18.5418 89.4626 18.6355 89.6396C18.7293 89.8167 18.7761 90.012 18.7761 90.2256V90.5303C18.7761 90.7438 18.7293 90.9391 18.6355 91.1162C18.5444 91.2933 18.4115 91.4352 18.2371 91.542C18.0652 91.6488 17.8582 91.7021 17.616 91.7021C17.3738 91.7021 17.1654 91.6488 16.991 91.542C16.8165 91.4352 16.6811 91.2933 16.5847 91.1162C16.491 90.9391 16.4441 90.7438 16.4441 90.5303ZM16.9871 90.2256V90.5303C16.9871 90.6501 17.0092 90.7646 17.0535 90.874C17.1003 90.9808 17.1707 91.068 17.2644 91.1357C17.3582 91.2008 17.4753 91.2334 17.616 91.2334C17.7566 91.2334 17.8725 91.2008 17.9636 91.1357C18.0574 91.068 18.1264 90.9808 18.1707 90.874C18.2149 90.7673 18.2371 90.6527 18.2371 90.5303V90.2256C18.2371 90.1032 18.2136 89.9886 18.1668 89.8818C18.1225 89.7751 18.0535 89.6891 17.9597 89.624C17.8686 89.5563 17.7514 89.5225 17.6082 89.5225C17.4701 89.5225 17.3543 89.5563 17.2605 89.624C17.1694 89.6891 17.1003 89.7751 17.0535 89.8818C17.0092 89.9886 16.9871 90.1032 16.9871 90.2256ZM17.7878 86.7412L15.0105 91.1865L14.6043 90.9287L17.3816 86.4834L17.7878 86.7412Z" fill="black" fill-opacity="0.54"/>
<path d="M8.19922 119.233V119.827H4.47656V119.308L6.33984 117.233C6.56901 116.978 6.74609 116.762 6.87109 116.585C6.9987 116.405 7.08724 116.245 7.13672 116.104C7.1888 115.961 7.21484 115.815 7.21484 115.667C7.21484 115.479 7.17578 115.31 7.09766 115.159C7.02214 115.006 6.91016 114.883 6.76172 114.792C6.61328 114.701 6.43359 114.655 6.22266 114.655C5.97005 114.655 5.75911 114.705 5.58984 114.804C5.42318 114.9 5.29818 115.035 5.21484 115.21C5.13151 115.384 5.08984 115.585 5.08984 115.812H4.36719C4.36719 115.491 4.4375 115.198 4.57812 114.933C4.71875 114.667 4.92708 114.456 5.20312 114.3C5.47917 114.141 5.81901 114.062 6.22266 114.062C6.58203 114.062 6.88932 114.125 7.14453 114.253C7.39974 114.378 7.59505 114.555 7.73047 114.784C7.86849 115.011 7.9375 115.276 7.9375 115.581C7.9375 115.748 7.90885 115.917 7.85156 116.089C7.79688 116.258 7.72005 116.427 7.62109 116.597C7.52474 116.766 7.41146 116.933 7.28125 117.097C7.15365 117.261 7.01693 117.422 6.87109 117.581L5.34766 119.233H8.19922ZM12.6752 116.53V117.397C12.6752 117.864 12.6335 118.257 12.5502 118.577C12.4668 118.897 12.347 119.155 12.1908 119.351C12.0345 119.546 11.8457 119.688 11.6244 119.776C11.4056 119.862 11.1582 119.905 10.8822 119.905C10.6635 119.905 10.4616 119.878 10.2767 119.823C10.0918 119.769 9.92517 119.681 9.77673 119.562C9.6309 119.439 9.5059 119.28 9.40173 119.085C9.29757 118.89 9.21814 118.653 9.16345 118.374C9.10877 118.095 9.08142 117.77 9.08142 117.397V116.53C9.08142 116.064 9.12309 115.674 9.20642 115.358C9.29236 115.043 9.41345 114.791 9.5697 114.601C9.72595 114.408 9.91345 114.27 10.1322 114.187C10.3536 114.103 10.601 114.062 10.8744 114.062C11.0957 114.062 11.2989 114.089 11.4838 114.144C11.6713 114.196 11.8379 114.28 11.9838 114.397C12.1296 114.512 12.2533 114.666 12.3549 114.858C12.459 115.049 12.5385 115.282 12.5931 115.558C12.6478 115.834 12.6752 116.158 12.6752 116.53ZM11.9486 117.515V116.409C11.9486 116.154 11.933 115.93 11.9017 115.737C11.8731 115.542 11.8301 115.375 11.7728 115.237C11.7155 115.099 11.6426 114.987 11.5541 114.901C11.4681 114.815 11.3679 114.753 11.2533 114.714C11.1413 114.672 11.015 114.651 10.8744 114.651C10.7025 114.651 10.5502 114.684 10.4174 114.749C10.2845 114.812 10.1726 114.912 10.0814 115.05C9.99288 115.188 9.92517 115.369 9.8783 115.593C9.83142 115.817 9.80798 116.089 9.80798 116.409V117.515C9.80798 117.77 9.82231 117.995 9.85095 118.19C9.8822 118.386 9.92778 118.555 9.98767 118.698C10.0476 118.839 10.1205 118.955 10.2064 119.046C10.2924 119.137 10.3913 119.205 10.5033 119.249C10.6179 119.291 10.7442 119.312 10.8822 119.312C11.0593 119.312 11.2142 119.278 11.347 119.21C11.4799 119.142 11.5905 119.037 11.6791 118.894C11.7702 118.748 11.8379 118.562 11.8822 118.335C11.9265 118.106 11.9486 117.832 11.9486 117.515ZM13.6746 115.534V115.233C13.6746 115.017 13.7214 114.821 13.8152 114.644C13.9089 114.466 14.0431 114.325 14.2175 114.218C14.392 114.111 14.599 114.058 14.8386 114.058C15.0834 114.058 15.2918 114.111 15.4636 114.218C15.6381 114.325 15.7722 114.466 15.866 114.644C15.9597 114.821 16.0066 115.017 16.0066 115.233V115.534C16.0066 115.745 15.9597 115.939 15.866 116.116C15.7748 116.293 15.642 116.435 15.4675 116.542C15.2957 116.649 15.0886 116.702 14.8464 116.702C14.6043 116.702 14.3946 116.649 14.2175 116.542C14.0431 116.435 13.9089 116.293 13.8152 116.116C13.7214 115.939 13.6746 115.745 13.6746 115.534ZM14.2175 115.233V115.534C14.2175 115.654 14.2397 115.767 14.2839 115.874C14.3308 115.981 14.4011 116.068 14.4949 116.136C14.5886 116.201 14.7058 116.233 14.8464 116.233C14.9871 116.233 15.1029 116.201 15.1941 116.136C15.2852 116.068 15.3529 115.981 15.3972 115.874C15.4415 115.767 15.4636 115.654 15.4636 115.534V115.233C15.4636 115.111 15.4402 114.996 15.3933 114.89C15.349 114.78 15.28 114.693 15.1863 114.628C15.0951 114.56 14.9793 114.526 14.8386 114.526C14.7006 114.526 14.5847 114.56 14.491 114.628C14.3998 114.693 14.3308 114.78 14.2839 114.89C14.2397 114.996 14.2175 115.111 14.2175 115.233ZM16.4441 118.737V118.433C16.4441 118.219 16.491 118.024 16.5847 117.847C16.6785 117.67 16.8126 117.528 16.9871 117.421C17.1615 117.314 17.3686 117.261 17.6082 117.261C17.8529 117.261 18.0613 117.314 18.2332 117.421C18.4076 117.528 18.5418 117.67 18.6355 117.847C18.7293 118.024 18.7761 118.219 18.7761 118.433V118.737C18.7761 118.951 18.7293 119.146 18.6355 119.323C18.5444 119.5 18.4115 119.642 18.2371 119.749C18.0652 119.856 17.8582 119.909 17.616 119.909C17.3738 119.909 17.1654 119.856 16.991 119.749C16.8165 119.642 16.6811 119.5 16.5847 119.323C16.491 119.146 16.4441 118.951 16.4441 118.737ZM16.9871 118.433V118.737C16.9871 118.857 17.0092 118.972 17.0535 119.081C17.1003 119.188 17.1707 119.275 17.2644 119.343C17.3582 119.408 17.4753 119.44 17.616 119.44C17.7566 119.44 17.8725 119.408 17.9636 119.343C18.0574 119.275 18.1264 119.188 18.1707 119.081C18.2149 118.974 18.2371 118.86 18.2371 118.737V118.433C18.2371 118.31 18.2136 118.196 18.1668 118.089C18.1225 117.982 18.0535 117.896 17.9597 117.831C17.8686 117.763 17.7514 117.729 17.6082 117.729C17.4701 117.729 17.3543 117.763 17.2605 117.831C17.1694 117.896 17.1003 117.982 17.0535 118.089C17.0092 118.196 16.9871 118.31 16.9871 118.433ZM17.7878 114.948L15.0105 119.394L14.6043 119.136L17.3816 114.69L17.7878 114.948Z" fill="black" fill-opacity="0.54"/>
<path d="M13.043 144.737V145.604C13.043 146.071 13.0013 146.464 12.918 146.784C12.8346 147.104 12.7148 147.362 12.5586 147.558C12.4023 147.753 12.2135 147.895 11.9922 147.983C11.7734 148.069 11.526 148.112 11.25 148.112C11.0312 148.112 10.8294 148.085 10.6445 148.03C10.4596 147.976 10.293 147.888 10.1445 147.769C9.9987 147.646 9.8737 147.487 9.76953 147.292C9.66536 147.097 9.58594 146.86 9.53125 146.581C9.47656 146.302 9.44922 145.977 9.44922 145.604V144.737C9.44922 144.271 9.49089 143.881 9.57422 143.565C9.66016 143.25 9.78125 142.998 9.9375 142.808C10.0938 142.615 10.2812 142.477 10.5 142.394C10.7214 142.31 10.9688 142.269 11.2422 142.269C11.4635 142.269 11.6667 142.296 11.8516 142.351C12.0391 142.403 12.2057 142.487 12.3516 142.604C12.4974 142.719 12.6211 142.873 12.7227 143.065C12.8268 143.256 12.9062 143.489 12.9609 143.765C13.0156 144.041 13.043 144.365 13.043 144.737ZM12.3164 145.722V144.616C12.3164 144.361 12.3008 144.137 12.2695 143.944C12.2409 143.749 12.1979 143.582 12.1406 143.444C12.0833 143.306 12.0104 143.194 11.9219 143.108C11.8359 143.022 11.7357 142.96 11.6211 142.921C11.5091 142.879 11.3828 142.858 11.2422 142.858C11.0703 142.858 10.918 142.891 10.7852 142.956C10.6523 143.019 10.5404 143.119 10.4492 143.257C10.3607 143.395 10.293 143.576 10.2461 143.8C10.1992 144.024 10.1758 144.296 10.1758 144.616V145.722C10.1758 145.977 10.1901 146.202 10.2188 146.397C10.25 146.593 10.2956 146.762 10.3555 146.905C10.4154 147.046 10.4883 147.162 10.5742 147.253C10.6602 147.344 10.7591 147.412 10.8711 147.456C10.9857 147.498 11.112 147.519 11.25 147.519C11.4271 147.519 11.582 147.485 11.7148 147.417C11.8477 147.349 11.9583 147.244 12.0469 147.101C12.138 146.955 12.2057 146.769 12.25 146.542C12.2943 146.313 12.3164 146.039 12.3164 145.722ZM14.0424 143.741V143.44C14.0424 143.224 14.0892 143.028 14.183 142.851C14.2767 142.674 14.4108 142.532 14.5853 142.425C14.7598 142.318 14.9668 142.265 15.2064 142.265C15.4512 142.265 15.6595 142.318 15.8314 142.425C16.0059 142.532 16.14 142.674 16.2338 142.851C16.3275 143.028 16.3744 143.224 16.3744 143.44V143.741C16.3744 143.952 16.3275 144.146 16.2338 144.323C16.1426 144.5 16.0098 144.642 15.8353 144.749C15.6635 144.856 15.4564 144.909 15.2142 144.909C14.972 144.909 14.7624 144.856 14.5853 144.749C14.4108 144.642 14.2767 144.5 14.183 144.323C14.0892 144.146 14.0424 143.952 14.0424 143.741ZM14.5853 143.44V143.741C14.5853 143.861 14.6075 143.974 14.6517 144.081C14.6986 144.188 14.7689 144.275 14.8627 144.343C14.9564 144.408 15.0736 144.44 15.2142 144.44C15.3549 144.44 15.4707 144.408 15.5619 144.343C15.653 144.275 15.7207 144.188 15.765 144.081C15.8093 143.974 15.8314 143.861 15.8314 143.741V143.44C15.8314 143.318 15.808 143.203 15.7611 143.097C15.7168 142.987 15.6478 142.9 15.5541 142.835C15.4629 142.767 15.347 142.733 15.2064 142.733C15.0684 142.733 14.9525 142.767 14.8588 142.835C14.7676 142.9 14.6986 142.987 14.6517 143.097C14.6075 143.203 14.5853 143.318 14.5853 143.44ZM16.8119 146.944V146.64C16.8119 146.426 16.8588 146.231 16.9525 146.054C17.0463 145.877 17.1804 145.735 17.3549 145.628C17.5293 145.521 17.7364 145.468 17.976 145.468C18.2207 145.468 18.4291 145.521 18.601 145.628C18.7754 145.735 18.9095 145.877 19.0033 146.054C19.097 146.231 19.1439 146.426 19.1439 146.64V146.944C19.1439 147.158 19.097 147.353 19.0033 147.53C18.9122 147.707 18.7793 147.849 18.6049 147.956C18.433 148.063 18.226 148.116 17.9838 148.116C17.7416 148.116 17.5332 148.063 17.3588 147.956C17.1843 147.849 17.0489 147.707 16.9525 147.53C16.8588 147.353 16.8119 147.158 16.8119 146.944ZM17.3549 146.64V146.944C17.3549 147.064 17.377 147.179 17.4213 147.288C17.4681 147.395 17.5385 147.482 17.6322 147.55C17.726 147.615 17.8431 147.647 17.9838 147.647C18.1244 147.647 18.2403 147.615 18.3314 147.55C18.4252 147.482 18.4942 147.395 18.5385 147.288C18.5827 147.181 18.6049 147.067 18.6049 146.944V146.64C18.6049 146.517 18.5814 146.403 18.5345 146.296C18.4903 146.189 18.4213 146.103 18.3275 146.038C18.2364 145.97 18.1192 145.937 17.976 145.937C17.8379 145.937 17.722 145.97 17.6283 146.038C17.5372 146.103 17.4681 146.189 17.4213 146.296C17.377 146.403 17.3549 146.517 17.3549 146.64ZM18.1556 143.155L15.3783 147.601L14.972 147.343L17.7494 142.897L18.1556 143.155Z" fill="black" fill-opacity="0.54"/>
<path d="M138 58C138 56.8954 138.895 56 140 56H154C155.105 56 156 56.8954 156 58V146H138V58Z" fill="#3FA71A"/>
<path d="M25 4.16113L200 4.16116" stroke="black" stroke-opacity="0.12"/>
<path d="M25 33.1611L200 33.1612" stroke="black" stroke-opacity="0.12"/>
<path d="M25 61.1611L200 61.1612" stroke="black" stroke-opacity="0.12"/>
<path d="M25 89.1611L200 89.1612" stroke="black" stroke-opacity="0.12"/>
<path d="M25 118.161L200 118.161" stroke="black" stroke-opacity="0.12"/>
<line x1="23.2" y1="145.961" x2="202.8" y2="145.961" stroke="black" stroke-opacity="0.7" stroke-width="0.4" stroke-linecap="square"/>
<line x1="40.4502" y1="148.072" x2="40.4502" y2="147.25" stroke="black" stroke-opacity="0.5" stroke-width="0.5" stroke-linecap="square"/>
<path d="M32.5091 152.025V152.893C32.5091 153.359 32.4674 153.752 32.3841 154.072C32.3007 154.393 32.1809 154.65 32.0247 154.846C31.8684 155.041 31.6796 155.183 31.4583 155.271C31.2395 155.357 30.9921 155.4 30.7161 155.4C30.4973 155.4 30.2955 155.373 30.1106 155.318C29.9257 155.264 29.7591 155.176 29.6106 155.057C29.4648 154.934 29.3398 154.775 29.2356 154.58C29.1315 154.385 29.052 154.148 28.9973 153.869C28.9427 153.59 28.9153 153.265 28.9153 152.893V152.025C28.9153 151.559 28.957 151.169 29.0403 150.854C29.1262 150.538 29.2473 150.286 29.4036 150.096C29.5598 149.903 29.7473 149.765 29.9661 149.682C30.1874 149.598 30.4348 149.557 30.7083 149.557C30.9296 149.557 31.1328 149.584 31.3177 149.639C31.5052 149.691 31.6718 149.775 31.8177 149.893C31.9635 150.007 32.0872 150.161 32.1887 150.354C32.2929 150.544 32.3723 150.777 32.427 151.053C32.4817 151.329 32.5091 151.653 32.5091 152.025ZM31.7825 153.01V151.904C31.7825 151.649 31.7669 151.425 31.7356 151.232C31.707 151.037 31.664 150.87 31.6067 150.732C31.5494 150.594 31.4765 150.482 31.388 150.396C31.302 150.311 31.2018 150.248 31.0872 150.209C30.9752 150.167 30.8489 150.146 30.7083 150.146C30.5364 150.146 30.3841 150.179 30.2512 150.244C30.1184 150.307 30.0065 150.407 29.9153 150.545C29.8268 150.683 29.7591 150.864 29.7122 151.088C29.6653 151.312 29.6419 151.584 29.6419 151.904V153.01C29.6419 153.265 29.6562 153.49 29.6848 153.686C29.7161 153.881 29.7617 154.05 29.8216 154.193C29.8815 154.334 29.9544 154.45 30.0403 154.541C30.1262 154.632 30.2252 154.7 30.3372 154.744C30.4518 154.786 30.5781 154.807 30.7161 154.807C30.8932 154.807 31.0481 154.773 31.1809 154.705C31.3137 154.637 31.4244 154.532 31.513 154.389C31.6041 154.243 31.6718 154.057 31.7161 153.83C31.7604 153.601 31.7825 153.327 31.7825 153.01ZM35.8964 149.604V155.322H35.1737V150.506L33.7167 151.037V150.385L35.7831 149.604H35.8964ZM41.1124 149.635V155.322H40.3585V149.635H41.1124ZM43.4952 152.193V152.811H40.9483V152.193H43.4952ZM43.8819 149.635V150.252H40.9483V149.635H43.8819ZM46.4216 155.4C46.1273 155.4 45.8604 155.351 45.6208 155.252C45.3838 155.15 45.1794 155.008 45.0075 154.826C44.8383 154.644 44.7081 154.428 44.6169 154.178C44.5258 153.928 44.4802 153.654 44.4802 153.357V153.193C44.4802 152.85 44.531 152.544 44.6325 152.275C44.7341 152.005 44.8721 151.775 45.0466 151.588C45.2211 151.4 45.419 151.258 45.6403 151.162C45.8617 151.066 46.0909 151.018 46.3278 151.018C46.6299 151.018 46.8903 151.07 47.1091 151.174C47.3305 151.278 47.5114 151.424 47.6521 151.611C47.7927 151.796 47.8969 152.015 47.9646 152.268C48.0323 152.518 48.0661 152.791 48.0661 153.088V153.412H44.9099V152.822H47.3435V152.768C47.3331 152.58 47.294 152.398 47.2263 152.221C47.1612 152.044 47.057 151.898 46.9138 151.783C46.7706 151.669 46.5752 151.611 46.3278 151.611C46.1638 151.611 46.0127 151.646 45.8747 151.717C45.7367 151.785 45.6182 151.886 45.5193 152.021C45.4203 152.157 45.3435 152.322 45.2888 152.518C45.2341 152.713 45.2068 152.938 45.2068 153.193V153.357C45.2068 153.558 45.2341 153.747 45.2888 153.924C45.3461 154.098 45.4281 154.252 45.5349 154.385C45.6443 154.518 45.7758 154.622 45.9294 154.697C46.0857 154.773 46.2627 154.811 46.4607 154.811C46.7159 154.811 46.932 154.758 47.1091 154.654C47.2862 154.55 47.4411 154.411 47.5739 154.236L48.0114 154.584C47.9203 154.722 47.8044 154.854 47.6638 154.979C47.5232 155.104 47.35 155.205 47.1443 155.283C46.9411 155.361 46.7002 155.4 46.4216 155.4ZM48.9886 149.322H49.7152V154.502L49.6527 155.322H48.9886V149.322ZM52.5706 153.174V153.256C52.5706 153.563 52.5342 153.848 52.4613 154.111C52.3883 154.372 52.2816 154.598 52.1409 154.791C52.0003 154.984 51.8284 155.133 51.6253 155.24C51.4222 155.347 51.1891 155.4 50.9261 155.4C50.6579 155.4 50.4222 155.355 50.2191 155.264C50.0185 155.17 49.8493 155.036 49.7113 154.861C49.5732 154.687 49.4626 154.476 49.3792 154.229C49.2985 153.981 49.2425 153.702 49.2113 153.393V153.033C49.2425 152.721 49.2985 152.441 49.3792 152.193C49.4626 151.946 49.5732 151.735 49.7113 151.561C49.8493 151.383 50.0185 151.249 50.2191 151.158C50.4196 151.064 50.6527 151.018 50.9183 151.018C51.1839 151.018 51.4196 151.07 51.6253 151.174C51.831 151.275 52.0029 151.421 52.1409 151.611C52.2816 151.801 52.3883 152.029 52.4613 152.295C52.5342 152.558 52.5706 152.851 52.5706 153.174ZM51.8441 153.256V153.174C51.8441 152.963 51.8245 152.765 51.7855 152.58C51.7464 152.393 51.6839 152.229 51.598 152.088C51.512 151.945 51.3988 151.833 51.2581 151.752C51.1175 151.669 50.9443 151.627 50.7386 151.627C50.5563 151.627 50.3975 151.658 50.262 151.721C50.1292 151.783 50.0159 151.868 49.9222 151.975C49.8284 152.079 49.7516 152.199 49.6917 152.334C49.6344 152.467 49.5915 152.605 49.5628 152.748V153.689C49.6045 153.872 49.6722 154.048 49.7659 154.217C49.8623 154.383 49.9899 154.52 50.1488 154.627C50.3102 154.734 50.5094 154.787 50.7464 154.787C50.9417 154.787 51.1084 154.748 51.2464 154.67C51.387 154.589 51.5003 154.479 51.5863 154.338C51.6748 154.197 51.7399 154.035 51.7816 153.85C51.8232 153.665 51.8441 153.467 51.8441 153.256Z" fill="black" fill-opacity="0.54"/>
<g clip-path="url(#clip1_4053_185113)">
<line x1="75.8501" y1="147.072" x2="75.8501" y2="146.25" stroke="black" stroke-opacity="0.5" stroke-width="0.5" stroke-linecap="square"/>
<path d="M67.909 152.025V152.893C67.909 153.359 67.8673 153.752 67.784 154.072C67.7006 154.393 67.5808 154.65 67.4246 154.846C67.2683 155.041 67.0795 155.183 66.8582 155.271C66.6394 155.357 66.392 155.4 66.116 155.4C65.8972 155.4 65.6954 155.373 65.5105 155.318C65.3256 155.264 65.159 155.176 65.0105 155.057C64.8647 154.934 64.7397 154.775 64.6355 154.58C64.5314 154.385 64.4519 154.148 64.3972 153.869C64.3426 153.59 64.3152 153.265 64.3152 152.893V152.025C64.3152 151.559 64.3569 151.169 64.4402 150.854C64.5261 150.538 64.6472 150.286 64.8035 150.096C64.9597 149.903 65.1472 149.765 65.366 149.682C65.5873 149.598 65.8347 149.557 66.1082 149.557C66.3295 149.557 66.5327 149.584 66.7176 149.639C66.9051 149.691 67.0717 149.775 67.2176 149.893C67.3634 150.007 67.4871 150.161 67.5886 150.354C67.6928 150.544 67.7722 150.777 67.8269 151.053C67.8816 151.329 67.909 151.653 67.909 152.025ZM67.1824 153.01V151.904C67.1824 151.649 67.1668 151.425 67.1355 151.232C67.1069 151.037 67.0639 150.87 67.0066 150.732C66.9493 150.594 66.8764 150.482 66.7879 150.396C66.7019 150.311 66.6017 150.248 66.4871 150.209C66.3751 150.167 66.2488 150.146 66.1082 150.146C65.9363 150.146 65.784 150.179 65.6511 150.244C65.5183 150.307 65.4064 150.407 65.3152 150.545C65.2267 150.683 65.159 150.864 65.1121 151.088C65.0652 151.312 65.0418 151.584 65.0418 151.904V153.01C65.0418 153.265 65.0561 153.49 65.0847 153.686C65.116 153.881 65.1616 154.05 65.2215 154.193C65.2814 154.334 65.3543 154.45 65.4402 154.541C65.5261 154.632 65.6251 154.7 65.7371 154.744C65.8517 154.786 65.978 154.807 66.116 154.807C66.2931 154.807 66.448 154.773 66.5808 154.705C66.7136 154.637 66.8243 154.532 66.9129 154.389C67.004 154.243 67.0717 154.057 67.116 153.83C67.1603 153.601 67.1824 153.327 67.1824 153.01ZM72.6478 154.729V155.322H68.9252V154.803L70.7885 152.729C71.0176 152.473 71.1947 152.257 71.3197 152.08C71.4473 151.9 71.5359 151.74 71.5853 151.6C71.6374 151.456 71.6635 151.311 71.6635 151.162C71.6635 150.975 71.6244 150.805 71.5463 150.654C71.4708 150.501 71.3588 150.378 71.2103 150.287C71.0619 150.196 70.8822 150.15 70.6713 150.15C70.4187 150.15 70.2077 150.2 70.0385 150.299C69.8718 150.395 69.7468 150.531 69.6635 150.705C69.5801 150.88 69.5385 151.08 69.5385 151.307H68.8158C68.8158 150.986 68.8861 150.693 69.0267 150.428C69.1674 150.162 69.3757 149.951 69.6517 149.795C69.9278 149.636 70.2676 149.557 70.6713 149.557C71.0307 149.557 71.3379 149.62 71.5932 149.748C71.8484 149.873 72.0437 150.05 72.1791 150.279C72.3171 150.506 72.3861 150.771 72.3861 151.076C72.3861 151.243 72.3575 151.412 72.3002 151.584C72.2455 151.753 72.1687 151.923 72.0697 152.092C71.9734 152.261 71.8601 152.428 71.7299 152.592C71.6023 152.756 71.4655 152.917 71.3197 153.076L69.7963 154.729H72.6478ZM76.5123 149.635V155.322H75.7584V149.635H76.5123ZM78.8951 152.193V152.811H76.3482V152.193H78.8951ZM79.2818 149.635V150.252H76.3482V149.635H79.2818ZM81.8215 155.4C81.5272 155.4 81.2603 155.351 81.0207 155.252C80.7837 155.15 80.5793 155.008 80.4074 154.826C80.2382 154.644 80.108 154.428 80.0168 154.178C79.9257 153.928 79.8801 153.654 79.8801 153.357V153.193C79.8801 152.85 79.9309 152.544 80.0324 152.275C80.134 152.005 80.272 151.775 80.4465 151.588C80.621 151.4 80.8189 151.258 81.0402 151.162C81.2616 151.066 81.4908 151.018 81.7277 151.018C82.0298 151.018 82.2902 151.07 82.509 151.174C82.7304 151.278 82.9113 151.424 83.052 151.611C83.1926 151.796 83.2968 152.015 83.3645 152.268C83.4322 152.518 83.466 152.791 83.466 153.088V153.412H80.3098V152.822H82.7434V152.768C82.733 152.58 82.6939 152.398 82.6262 152.221C82.5611 152.044 82.4569 151.898 82.3137 151.783C82.1705 151.669 81.9751 151.611 81.7277 151.611C81.5637 151.611 81.4126 151.646 81.2746 151.717C81.1366 151.785 81.0181 151.886 80.9192 152.021C80.8202 152.157 80.7434 152.322 80.6887 152.518C80.634 152.713 80.6067 152.938 80.6067 153.193V153.357C80.6067 153.558 80.634 153.747 80.6887 153.924C80.746 154.098 80.828 154.252 80.9348 154.385C81.0442 154.518 81.1757 154.622 81.3293 154.697C81.4856 154.773 81.6626 154.811 81.8606 154.811C82.1158 154.811 82.3319 154.758 82.509 154.654C82.6861 154.55 82.841 154.411 82.9738 154.236L83.4113 154.584C83.3202 154.722 83.2043 154.854 83.0637 154.979C82.9231 155.104 82.7499 155.205 82.5442 155.283C82.341 155.361 82.1001 155.4 81.8215 155.4ZM84.3885 149.322H85.1151V154.502L85.0526 155.322H84.3885V149.322ZM87.9705 153.174V153.256C87.9705 153.563 87.9341 153.848 87.8612 154.111C87.7882 154.372 87.6815 154.598 87.5408 154.791C87.4002 154.984 87.2283 155.133 87.0252 155.24C86.8221 155.347 86.589 155.4 86.326 155.4C86.0578 155.4 85.8221 155.355 85.619 155.264C85.4185 155.17 85.2492 155.036 85.1112 154.861C84.9731 154.687 84.8625 154.476 84.7791 154.229C84.6984 153.981 84.6424 153.702 84.6112 153.393V153.033C84.6424 152.721 84.6984 152.441 84.7791 152.193C84.8625 151.946 84.9731 151.735 85.1112 151.561C85.2492 151.383 85.4185 151.249 85.619 151.158C85.8195 151.064 86.0526 151.018 86.3182 151.018C86.5838 151.018 86.8195 151.07 87.0252 151.174C87.231 151.275 87.4028 151.421 87.5408 151.611C87.6815 151.801 87.7882 152.029 87.8612 152.295C87.9341 152.558 87.9705 152.851 87.9705 153.174ZM87.244 153.256V153.174C87.244 152.963 87.2244 152.765 87.1854 152.58C87.1463 152.393 87.0838 152.229 86.9979 152.088C86.9119 151.945 86.7987 151.833 86.658 151.752C86.5174 151.669 86.3442 151.627 86.1385 151.627C85.9562 151.627 85.7974 151.658 85.6619 151.721C85.5291 151.783 85.4158 151.868 85.3221 151.975C85.2283 152.079 85.1515 152.199 85.0916 152.334C85.0343 152.467 84.9914 152.605 84.9627 152.748V153.689C85.0044 153.872 85.0721 154.048 85.1658 154.217C85.2622 154.383 85.3898 154.52 85.5487 154.627C85.7101 154.734 85.9093 154.787 86.1463 154.787C86.3416 154.787 86.5083 154.748 86.6463 154.67C86.7869 154.589 86.9002 154.479 86.9862 154.338C87.0747 154.197 87.1398 154.035 87.1815 153.85C87.2231 153.665 87.244 153.467 87.244 153.256Z" fill="black" fill-opacity="0.54"/>
</g>
<g clip-path="url(#clip2_4053_185113)">
<line x1="111.25" y1="147.072" x2="111.25" y2="146.25" stroke="black" stroke-opacity="0.5" stroke-width="0.5" stroke-linecap="square"/>
<path d="M103.309 152.025V152.893C103.309 153.359 103.267 153.752 103.184 154.072C103.101 154.393 102.981 154.65 102.824 154.846C102.668 155.041 102.479 155.183 102.258 155.271C102.039 155.357 101.792 155.4 101.516 155.4C101.297 155.4 101.095 155.373 100.91 155.318C100.726 155.264 100.559 155.176 100.41 155.057C100.265 154.934 100.14 154.775 100.035 154.58C99.9313 154.385 99.8518 154.148 99.7971 153.869C99.7425 153.59 99.7151 153.265 99.7151 152.893V152.025C99.7151 151.559 99.7568 151.169 99.8401 150.854C99.9261 150.538 100.047 150.286 100.203 150.096C100.36 149.903 100.547 149.765 100.766 149.682C100.987 149.598 101.235 149.557 101.508 149.557C101.729 149.557 101.933 149.584 102.117 149.639C102.305 149.691 102.472 149.775 102.617 149.893C102.763 150.007 102.887 150.161 102.989 150.354C103.093 150.544 103.172 150.777 103.227 151.053C103.282 151.329 103.309 151.653 103.309 152.025ZM102.582 153.01V151.904C102.582 151.649 102.567 151.425 102.535 151.232C102.507 151.037 102.464 150.87 102.407 150.732C102.349 150.594 102.276 150.482 102.188 150.396C102.102 150.311 102.002 150.248 101.887 150.209C101.775 150.167 101.649 150.146 101.508 150.146C101.336 150.146 101.184 150.179 101.051 150.244C100.918 150.307 100.806 150.407 100.715 150.545C100.627 150.683 100.559 150.864 100.512 151.088C100.465 151.312 100.442 151.584 100.442 151.904V153.01C100.442 153.265 100.456 153.49 100.485 153.686C100.516 153.881 100.561 154.05 100.621 154.193C100.681 154.334 100.754 154.45 100.84 154.541C100.926 154.632 101.025 154.7 101.137 154.744C101.252 154.786 101.378 154.807 101.516 154.807C101.693 154.807 101.848 154.773 101.981 154.705C102.114 154.637 102.224 154.532 102.313 154.389C102.404 154.243 102.472 154.057 102.516 153.83C102.56 153.601 102.582 153.327 102.582 153.01ZM105.376 152.123H105.891C106.144 152.123 106.352 152.081 106.516 151.998C106.683 151.912 106.807 151.796 106.888 151.65C106.971 151.502 107.013 151.335 107.013 151.15C107.013 150.932 106.976 150.748 106.903 150.6C106.83 150.451 106.721 150.339 106.575 150.264C106.429 150.188 106.244 150.15 106.02 150.15C105.817 150.15 105.638 150.191 105.481 150.271C105.328 150.35 105.207 150.462 105.118 150.607C105.032 150.753 104.989 150.925 104.989 151.123H104.266C104.266 150.834 104.339 150.571 104.485 150.334C104.631 150.097 104.836 149.908 105.099 149.768C105.364 149.627 105.671 149.557 106.02 149.557C106.364 149.557 106.665 149.618 106.923 149.74C107.181 149.86 107.381 150.04 107.524 150.279C107.668 150.516 107.739 150.812 107.739 151.166C107.739 151.309 107.705 151.463 107.638 151.627C107.572 151.788 107.47 151.939 107.329 152.08C107.191 152.221 107.011 152.337 106.79 152.428C106.569 152.516 106.303 152.561 105.993 152.561H105.376V152.123ZM105.376 152.717V152.283H105.993C106.355 152.283 106.655 152.326 106.891 152.412C107.128 152.498 107.315 152.613 107.45 152.756C107.588 152.899 107.684 153.057 107.739 153.229C107.796 153.398 107.825 153.567 107.825 153.736C107.825 154.002 107.78 154.238 107.688 154.443C107.6 154.649 107.474 154.824 107.309 154.967C107.148 155.11 106.958 155.218 106.739 155.291C106.52 155.364 106.282 155.4 106.024 155.4C105.777 155.4 105.544 155.365 105.325 155.295C105.109 155.225 104.918 155.123 104.751 154.99C104.584 154.855 104.454 154.689 104.36 154.494C104.266 154.296 104.22 154.071 104.22 153.818H104.942C104.942 154.016 104.985 154.189 105.071 154.338C105.16 154.486 105.285 154.602 105.446 154.686C105.61 154.766 105.803 154.807 106.024 154.807C106.246 154.807 106.436 154.769 106.595 154.693C106.756 154.615 106.88 154.498 106.966 154.342C107.054 154.186 107.099 153.989 107.099 153.752C107.099 153.515 107.049 153.321 106.95 153.17C106.851 153.016 106.711 152.903 106.528 152.83C106.349 152.755 106.136 152.717 105.891 152.717H105.376ZM111.912 149.635V155.322H111.158V149.635H111.912ZM114.295 152.193V152.811H111.748V152.193H114.295ZM114.682 149.635V150.252H111.748V149.635H114.682ZM117.221 155.4C116.927 155.4 116.66 155.351 116.421 155.252C116.184 155.15 115.979 155.008 115.807 154.826C115.638 154.644 115.508 154.428 115.417 154.178C115.326 153.928 115.28 153.654 115.28 153.357V153.193C115.28 152.85 115.331 152.544 115.432 152.275C115.534 152.005 115.672 151.775 115.846 151.588C116.021 151.4 116.219 151.258 116.44 151.162C116.662 151.066 116.891 151.018 117.128 151.018C117.43 151.018 117.69 151.07 117.909 151.174C118.13 151.278 118.311 151.424 118.452 151.611C118.592 151.796 118.697 152.015 118.764 152.268C118.832 152.518 118.866 152.791 118.866 153.088V153.412H115.71V152.822H118.143V152.768C118.133 152.58 118.094 152.398 118.026 152.221C117.961 152.044 117.857 151.898 117.714 151.783C117.57 151.669 117.375 151.611 117.128 151.611C116.964 151.611 116.813 151.646 116.675 151.717C116.537 151.785 116.418 151.886 116.319 152.021C116.22 152.157 116.143 152.322 116.089 152.518C116.034 152.713 116.007 152.938 116.007 153.193V153.357C116.007 153.558 116.034 153.747 116.089 153.924C116.146 154.098 116.228 154.252 116.335 154.385C116.444 154.518 116.576 154.622 116.729 154.697C116.885 154.773 117.063 154.811 117.26 154.811C117.516 154.811 117.732 154.758 117.909 154.654C118.086 154.55 118.241 154.411 118.374 154.236L118.811 154.584C118.72 154.722 118.604 154.854 118.464 154.979C118.323 155.104 118.15 155.205 117.944 155.283C117.741 155.361 117.5 155.4 117.221 155.4ZM119.788 149.322H120.515V154.502L120.452 155.322H119.788V149.322ZM123.37 153.174V153.256C123.37 153.563 123.334 153.848 123.261 154.111C123.188 154.372 123.081 154.598 122.941 154.791C122.8 154.984 122.628 155.133 122.425 155.24C122.222 155.347 121.989 155.4 121.726 155.4C121.458 155.4 121.222 155.355 121.019 155.264C120.818 155.17 120.649 155.036 120.511 154.861C120.373 154.687 120.262 154.476 120.179 154.229C120.098 153.981 120.042 153.702 120.011 153.393V153.033C120.042 152.721 120.098 152.441 120.179 152.193C120.262 151.946 120.373 151.735 120.511 151.561C120.649 151.383 120.818 151.249 121.019 151.158C121.219 151.064 121.452 151.018 121.718 151.018C121.984 151.018 122.219 151.07 122.425 151.174C122.631 151.275 122.803 151.421 122.941 151.611C123.081 151.801 123.188 152.029 123.261 152.295C123.334 152.558 123.37 152.851 123.37 153.174ZM122.644 153.256V153.174C122.644 152.963 122.624 152.765 122.585 152.58C122.546 152.393 122.484 152.229 122.398 152.088C122.312 151.945 122.199 151.833 122.058 151.752C121.917 151.669 121.744 151.627 121.538 151.627C121.356 151.627 121.197 151.658 121.062 151.721C120.929 151.783 120.816 151.868 120.722 151.975C120.628 152.079 120.551 152.199 120.492 152.334C120.434 152.467 120.391 152.605 120.363 152.748V153.689C120.404 153.872 120.472 154.048 120.566 154.217C120.662 154.383 120.79 154.52 120.949 154.627C121.11 154.734 121.309 154.787 121.546 154.787C121.742 154.787 121.908 154.748 122.046 154.67C122.187 154.589 122.3 154.479 122.386 154.338C122.475 154.197 122.54 154.035 122.581 153.85C122.623 153.665 122.644 153.467 122.644 153.256Z" fill="black" fill-opacity="0.54"/>
</g>
<g clip-path="url(#clip3_4053_185113)">
<line x1="146.65" y1="147.072" x2="146.65" y2="146.25" stroke="black" stroke-opacity="0.5" stroke-width="0.5" stroke-linecap="square"/>
<path d="M138.709 152.025V152.893C138.709 153.359 138.668 153.752 138.584 154.072C138.501 154.393 138.381 154.65 138.225 154.846C138.069 155.041 137.88 155.183 137.658 155.271C137.44 155.357 137.192 155.4 136.916 155.4C136.698 155.4 136.496 155.373 136.311 155.318C136.126 155.264 135.959 155.176 135.811 155.057C135.665 154.934 135.54 154.775 135.436 154.58C135.332 154.385 135.252 154.148 135.198 153.869C135.143 153.59 135.116 153.265 135.116 152.893V152.025C135.116 151.559 135.157 151.169 135.241 150.854C135.326 150.538 135.448 150.286 135.604 150.096C135.76 149.903 135.948 149.765 136.166 149.682C136.388 149.598 136.635 149.557 136.908 149.557C137.13 149.557 137.333 149.584 137.518 149.639C137.705 149.691 137.872 149.775 138.018 149.893C138.164 150.007 138.287 150.161 138.389 150.354C138.493 150.544 138.573 150.777 138.627 151.053C138.682 151.329 138.709 151.653 138.709 152.025ZM137.983 153.01V151.904C137.983 151.649 137.967 151.425 137.936 151.232C137.907 151.037 137.864 150.87 137.807 150.732C137.75 150.594 137.677 150.482 137.588 150.396C137.502 150.311 137.402 150.248 137.287 150.209C137.175 150.167 137.049 150.146 136.908 150.146C136.737 150.146 136.584 150.179 136.451 150.244C136.319 150.307 136.207 150.407 136.116 150.545C136.027 150.683 135.959 150.864 135.912 151.088C135.866 151.312 135.842 151.584 135.842 151.904V153.01C135.842 153.265 135.856 153.49 135.885 153.686C135.916 153.881 135.962 154.05 136.022 154.193C136.082 154.334 136.155 154.45 136.241 154.541C136.326 154.632 136.425 154.7 136.537 154.744C136.652 154.786 136.778 154.807 136.916 154.807C137.093 154.807 137.248 154.773 137.381 154.705C137.514 154.637 137.625 154.532 137.713 154.389C137.804 154.243 137.872 154.057 137.916 153.83C137.961 153.601 137.983 153.327 137.983 153.01ZM143.565 153.408V154.002H139.456V153.576L142.003 149.635H142.593L141.96 150.775L140.276 153.408H143.565ZM142.772 149.635V155.322H142.05V149.635H142.772ZM147.313 149.635V155.322H146.559V149.635H147.313ZM149.695 152.193V152.811H147.149V152.193H149.695ZM150.082 149.635V150.252H147.149V149.635H150.082ZM152.622 155.4C152.328 155.4 152.061 155.351 151.821 155.252C151.584 155.15 151.38 155.008 151.208 154.826C151.038 154.644 150.908 154.428 150.817 154.178C150.726 153.928 150.68 153.654 150.68 153.357V153.193C150.68 152.85 150.731 152.544 150.833 152.275C150.934 152.005 151.072 151.775 151.247 151.588C151.421 151.4 151.619 151.258 151.841 151.162C152.062 151.066 152.291 151.018 152.528 151.018C152.83 151.018 153.091 151.07 153.309 151.174C153.531 151.278 153.712 151.424 153.852 151.611C153.993 151.796 154.097 152.015 154.165 152.268C154.232 152.518 154.266 152.791 154.266 153.088V153.412H151.11V152.822H153.544V152.768C153.533 152.58 153.494 152.398 153.426 152.221C153.361 152.044 153.257 151.898 153.114 151.783C152.971 151.669 152.775 151.611 152.528 151.611C152.364 151.611 152.213 151.646 152.075 151.717C151.937 151.785 151.818 151.886 151.719 152.021C151.62 152.157 151.544 152.322 151.489 152.518C151.434 152.713 151.407 152.938 151.407 153.193V153.357C151.407 153.558 151.434 153.747 151.489 153.924C151.546 154.098 151.628 154.252 151.735 154.385C151.844 154.518 151.976 154.622 152.13 154.697C152.286 154.773 152.463 154.811 152.661 154.811C152.916 154.811 153.132 154.758 153.309 154.654C153.486 154.55 153.641 154.411 153.774 154.236L154.212 154.584C154.12 154.722 154.005 154.854 153.864 154.979C153.723 155.104 153.55 155.205 153.344 155.283C153.141 155.361 152.9 155.4 152.622 155.4ZM155.189 149.322H155.915V154.502L155.853 155.322H155.189V149.322ZM158.771 153.174V153.256C158.771 153.563 158.734 153.848 158.661 154.111C158.589 154.372 158.482 154.598 158.341 154.791C158.201 154.984 158.029 155.133 157.826 155.24C157.622 155.347 157.389 155.4 157.126 155.4C156.858 155.4 156.622 155.355 156.419 155.264C156.219 155.17 156.049 155.036 155.911 154.861C155.773 154.687 155.663 154.476 155.579 154.229C155.499 153.981 155.443 153.702 155.411 153.393V153.033C155.443 152.721 155.499 152.441 155.579 152.193C155.663 151.946 155.773 151.735 155.911 151.561C156.049 151.383 156.219 151.249 156.419 151.158C156.62 151.064 156.853 151.018 157.118 151.018C157.384 151.018 157.62 151.07 157.826 151.174C158.031 151.275 158.203 151.421 158.341 151.611C158.482 151.801 158.589 152.029 158.661 152.295C158.734 152.558 158.771 152.851 158.771 153.174ZM158.044 153.256V153.174C158.044 152.963 158.025 152.765 157.986 152.58C157.947 152.393 157.884 152.229 157.798 152.088C157.712 151.945 157.599 151.833 157.458 151.752C157.318 151.669 157.145 151.627 156.939 151.627C156.757 151.627 156.598 151.658 156.462 151.721C156.329 151.783 156.216 151.868 156.122 151.975C156.029 152.079 155.952 152.199 155.892 152.334C155.835 152.467 155.792 152.605 155.763 152.748V153.689C155.805 153.872 155.872 154.048 155.966 154.217C156.062 154.383 156.19 154.52 156.349 154.627C156.51 154.734 156.71 154.787 156.947 154.787C157.142 154.787 157.309 154.748 157.447 154.67C157.587 154.589 157.701 154.479 157.786 154.338C157.875 154.197 157.94 154.035 157.982 153.85C158.023 153.665 158.044 153.467 158.044 153.256Z" fill="black" fill-opacity="0.54"/>
</g>
<g clip-path="url(#clip4_4053_185113)">
<line x1="182.05" y1="147.072" x2="182.05" y2="146.25" stroke="black" stroke-opacity="0.5" stroke-width="0.5" stroke-linecap="square"/>
<path d="M174.109 152.025V152.893C174.109 153.359 174.067 153.752 173.984 154.072C173.901 154.393 173.781 154.65 173.625 154.846C173.469 155.041 173.28 155.183 173.058 155.271C172.84 155.357 172.592 155.4 172.316 155.4C172.097 155.4 171.896 155.373 171.711 155.318C171.526 155.264 171.359 155.176 171.211 155.057C171.065 154.934 170.94 154.775 170.836 154.58C170.732 154.385 170.652 154.148 170.597 153.869C170.543 153.59 170.515 153.265 170.515 152.893V152.025C170.515 151.559 170.557 151.169 170.64 150.854C170.726 150.538 170.847 150.286 171.004 150.096C171.16 149.903 171.347 149.765 171.566 149.682C171.788 149.598 172.035 149.557 172.308 149.557C172.53 149.557 172.733 149.584 172.918 149.639C173.105 149.691 173.272 149.775 173.418 149.893C173.564 150.007 173.687 150.161 173.789 150.354C173.893 150.544 173.972 150.777 174.027 151.053C174.082 151.329 174.109 151.653 174.109 152.025ZM173.383 153.01V151.904C173.383 151.649 173.367 151.425 173.336 151.232C173.307 151.037 173.264 150.87 173.207 150.732C173.15 150.594 173.077 150.482 172.988 150.396C172.902 150.311 172.802 150.248 172.687 150.209C172.575 150.167 172.449 150.146 172.308 150.146C172.136 150.146 171.984 150.179 171.851 150.244C171.719 150.307 171.607 150.407 171.515 150.545C171.427 150.683 171.359 150.864 171.312 151.088C171.265 151.312 171.242 151.584 171.242 151.904V153.01C171.242 153.265 171.256 153.49 171.285 153.686C171.316 153.881 171.362 154.05 171.422 154.193C171.482 154.334 171.554 154.45 171.64 154.541C171.726 154.632 171.825 154.7 171.937 154.744C172.052 154.786 172.178 154.807 172.316 154.807C172.493 154.807 172.648 154.773 172.781 154.705C172.914 154.637 173.025 154.532 173.113 154.389C173.204 154.243 173.272 154.057 173.316 153.83C173.36 153.601 173.383 153.327 173.383 153.01ZM176.036 152.615L175.457 152.467L175.743 149.635H178.661V150.303H176.356L176.184 151.85C176.288 151.79 176.42 151.734 176.579 151.682C176.74 151.63 176.925 151.604 177.133 151.604C177.396 151.604 177.632 151.649 177.84 151.74C178.049 151.829 178.226 151.956 178.371 152.123C178.52 152.29 178.633 152.49 178.711 152.725C178.789 152.959 178.829 153.221 178.829 153.51C178.829 153.783 178.791 154.035 178.715 154.264C178.642 154.493 178.532 154.693 178.383 154.865C178.235 155.035 178.047 155.166 177.821 155.26C177.597 155.354 177.332 155.4 177.028 155.4C176.799 155.4 176.581 155.369 176.375 155.307C176.172 155.242 175.99 155.144 175.829 155.014C175.67 154.881 175.539 154.717 175.438 154.521C175.339 154.324 175.276 154.092 175.25 153.826H175.938C175.969 154.04 176.032 154.219 176.125 154.365C176.219 154.511 176.342 154.622 176.493 154.697C176.646 154.77 176.825 154.807 177.028 154.807C177.2 154.807 177.352 154.777 177.485 154.717C177.618 154.657 177.73 154.571 177.821 154.459C177.912 154.347 177.981 154.212 178.028 154.053C178.077 153.894 178.102 153.715 178.102 153.518C178.102 153.338 178.077 153.171 178.028 153.018C177.978 152.864 177.904 152.73 177.805 152.615C177.709 152.501 177.59 152.412 177.45 152.35C177.309 152.285 177.148 152.252 176.965 152.252C176.723 152.252 176.539 152.285 176.414 152.35C176.292 152.415 176.166 152.503 176.036 152.615ZM182.713 149.635V155.322H181.959V149.635H182.713ZM185.095 152.193V152.811H182.548V152.193H185.095ZM185.482 149.635V150.252H182.548V149.635H185.482ZM188.022 155.4C187.727 155.4 187.46 155.351 187.221 155.252C186.984 155.15 186.78 155.008 186.608 154.826C186.438 154.644 186.308 154.428 186.217 154.178C186.126 153.928 186.08 153.654 186.08 153.357V153.193C186.08 152.85 186.131 152.544 186.233 152.275C186.334 152.005 186.472 151.775 186.647 151.588C186.821 151.4 187.019 151.258 187.24 151.162C187.462 151.066 187.691 151.018 187.928 151.018C188.23 151.018 188.49 151.07 188.709 151.174C188.931 151.278 189.112 151.424 189.252 151.611C189.393 151.796 189.497 152.015 189.565 152.268C189.632 152.518 189.666 152.791 189.666 153.088V153.412H186.51V152.822H188.944V152.768C188.933 152.58 188.894 152.398 188.826 152.221C188.761 152.044 188.657 151.898 188.514 151.783C188.371 151.669 188.175 151.611 187.928 151.611C187.764 151.611 187.613 151.646 187.475 151.717C187.337 151.785 187.218 151.886 187.119 152.021C187.02 152.157 186.944 152.322 186.889 152.518C186.834 152.713 186.807 152.938 186.807 153.193V153.357C186.807 153.558 186.834 153.747 186.889 153.924C186.946 154.098 187.028 154.252 187.135 154.385C187.244 154.518 187.376 154.622 187.53 154.697C187.686 154.773 187.863 154.811 188.061 154.811C188.316 154.811 188.532 154.758 188.709 154.654C188.886 154.55 189.041 154.411 189.174 154.236L189.612 154.584C189.52 154.722 189.405 154.854 189.264 154.979C189.123 155.104 188.95 155.205 188.744 155.283C188.541 155.361 188.3 155.4 188.022 155.4ZM190.589 149.322H191.315V154.502L191.253 155.322H190.589V149.322ZM194.171 153.174V153.256C194.171 153.563 194.134 153.848 194.061 154.111C193.988 154.372 193.882 154.598 193.741 154.791C193.6 154.984 193.429 155.133 193.225 155.24C193.022 155.347 192.789 155.4 192.526 155.4C192.258 155.4 192.022 155.355 191.819 155.264C191.619 155.17 191.449 155.036 191.311 154.861C191.173 154.687 191.063 154.476 190.979 154.229C190.899 153.981 190.843 153.702 190.811 153.393V153.033C190.843 152.721 190.899 152.441 190.979 152.193C191.063 151.946 191.173 151.735 191.311 151.561C191.449 151.383 191.619 151.249 191.819 151.158C192.02 151.064 192.253 151.018 192.518 151.018C192.784 151.018 193.02 151.07 193.225 151.174C193.431 151.275 193.603 151.421 193.741 151.611C193.882 151.801 193.988 152.029 194.061 152.295C194.134 152.558 194.171 152.851 194.171 153.174ZM193.444 153.256V153.174C193.444 152.963 193.425 152.765 193.386 152.58C193.347 152.393 193.284 152.229 193.198 152.088C193.112 151.945 192.999 151.833 192.858 151.752C192.718 151.669 192.544 151.627 192.339 151.627C192.156 151.627 191.998 151.658 191.862 151.721C191.729 151.783 191.616 151.868 191.522 151.975C191.429 152.079 191.352 152.199 191.292 152.334C191.235 152.467 191.192 152.605 191.163 152.748V153.689C191.205 153.872 191.272 154.048 191.366 154.217C191.462 154.383 191.59 154.52 191.749 154.627C191.91 154.734 192.11 154.787 192.347 154.787C192.542 154.787 192.708 154.748 192.847 154.67C192.987 154.589 193.1 154.479 193.186 154.338C193.275 154.197 193.34 154.035 193.382 153.85C193.423 153.665 193.444 153.467 193.444 153.256Z" fill="black" fill-opacity="0.54"/>
</g>
<path d="M27 107.445L40 88.0962L75.865 45.0802C76.2166 44.6586 76.8423 44.5992 77.2669 44.9471L111.135 72.7006C111.366 72.8902 111.67 72.9662 111.963 72.908L146.794 65.991C146.93 65.964 147.059 65.9089 147.172 65.8292L184.267 39.8468C184.419 39.74 184.539 39.5927 184.612 39.4215L198.5 7" stroke="#FBDB0F" stroke-width="2" stroke-linecap="round"/>
<circle cx="76" cy="45.1611" r="1.5" fill="white" stroke="#FBDB0F"/>
<circle cx="112" cy="73.1611" r="1.5" fill="white" stroke="#FBDB0F"/>
<circle cx="147" cy="66.1611" r="1.5" fill="white" stroke="#FBDB0F"/>
<circle cx="185" cy="39.1611" r="1.5" fill="white" stroke="#FBDB0F"/>
<circle cx="198" cy="7" r="1.5" fill="white" stroke="#FBDB0F"/>
<path d="M28.5 107.114C28.5 107.972 27.8197 108.651 27 108.651C26.1803 108.651 25.5 107.972 25.5 107.114C25.5 106.256 26.1803 105.576 27 105.576C27.8197 105.576 28.5 106.256 28.5 107.114Z" fill="white" stroke="#FBDB0F"/>
<path d="M41.5 87.7768C41.5 88.6347 40.8197 89.3143 40 89.3143C39.1803 89.3143 38.5 88.6347 38.5 87.7768C38.5 86.9188 39.1803 86.2393 40 86.2393C40.8197 86.2393 41.5 86.9188 41.5 87.7768Z" fill="white" stroke="#FBDB0F"/>
<path d="M32 122C32 120.895 32.8954 120 34 120H48C49.1046 120 50 120.895 50 122V146H32V122Z" fill="#3FA71A"/>
<path d="M67 78C67 76.8954 67.8954 76 69 76H83C84.1046 76 85 76.8954 85 78V146H67V78Z" fill="#3FA71A"/>
<path d="M102 92C102 90.8954 102.895 90 104 90H118C119.105 90 120 90.8954 120 92V146H102V92Z" fill="#3FA71A"/>
<path d="M173 105C173 103.895 173.895 103 175 103H189C190.105 103 191 103.895 191 105V146H173V105Z" fill="#3FA71A"/>
<path d="M27 118L40 71.7792L78.5 84L119 32L148 36.5L182 71.7792L195.311 100.216L197 107" stroke="#4B70DD" stroke-width="2" stroke-linecap="round"/>
<circle cx="78" cy="84.1611" r="1.5" fill="white" stroke="#4B70DD"/>
<circle cx="40" cy="72.1611" r="1.5" fill="white" stroke="#4B70DD"/>
<circle cx="119" cy="32" r="1.5" fill="white" stroke="#4B70DD"/>
<circle cx="182" cy="72.1611" r="1.5" fill="white" stroke="#4B70DD"/>
<circle cx="197" cy="107" r="1.5" fill="white" stroke="#4B70DD"/>
<circle cx="27" cy="117.161" r="1.5" fill="white" stroke="#4B70DD"/>
<circle cx="147" cy="37.1611" r="1.5" fill="white" stroke="#4B70DD"/>
</g>
<defs>
<clipPath id="clip0_4053_185113">
<rect width="200" height="160" fill="white"/>
</clipPath>
<clipPath id="clip1_4053_185113">
<rect width="35.4" height="10.322" fill="white" transform="translate(58.3999 146)"/>
</clipPath>
<clipPath id="clip2_4053_185113">
<rect width="35.4" height="10.322" fill="white" transform="translate(93.7998 146)"/>
</clipPath>
<clipPath id="clip3_4053_185113">
<rect width="35.4" height="10.322" fill="white" transform="translate(129.2 146)"/>
</clipPath>
<clipPath id="clip4_4053_185113">
<rect width="35.4" height="10.322" fill="white" transform="translate(164.6 146)"/>
</clipPath>
</defs>
</svg>
",
+  "description": "Displays changes to time-series data over time—for example, temperature or humidity readings.",
+  "descriptor": {
+    "type": "timeseries",
+    "sizeX": 8,
+    "sizeY": 5,
+    "resources": [],
+    "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        previewWidth: '80%',\n        embedTitlePanel: true,\n        hasAdditionalLatestDataKeys: true,\n        dataKeySettingsFunction: TbTimeSeriesChart.dataKeySettings(),\n        defaultDataKeysFunction: function() {\n            return [{ name: 'temperature', label: 'Temperature', type: 'timeseries', units: '°C', decimals: 0 }];\n        }\n    };\n}\n",
+    "settingsSchema": "{}",
+    "dataKeySettingsSchema": "{}",
+    "latestDataKeySettingsSchema": "{}",
+    "settingsDirective": "tb-time-series-chart-widget-settings",
+    "dataKeySettingsDirective": "tb-time-series-chart-key-settings",
+    "latestDataKeySettingsDirective": "",
+    "hasBasicMode": true,
+    "basicModeDirective": "tb-time-series-chart-basic-config",
+    "defaultConfig": "{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"First\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.8587686344902596,\"funcBody\":\"var value = prevValue + Math.random() * 100 - 50;\\nvar multiplier = Math.pow(10, 2 || 0);\\nvar value = Math.round(value * multiplier) / multiplier;\\nif (value < -1000) {\\n\\tvalue = -1000;\\n} else if (value > 1000) {\\n\\tvalue = 1000;\\n}\\nreturn value;\",\"aggregationType\":null,\"units\":null,\"decimals\":null,\"usePostProcessing\":null,\"postFuncBody\":null},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Second\",\"color\":\"#FFC107\",\"settings\":{\"type\":\"bar\"},\"_hash\":0.5534217244004682,\"funcBody\":\"var value = prevValue + Math.random() * 100 - 50;\\nvar multiplier = Math.pow(10, 2 || 0);\\nvar value = Math.round(value * multiplier) / multiplier;\\nif (value < -1000) {\\n\\tvalue = -1000;\\n} else if (value > 1000) {\\n\\tvalue = 1000;\\n}\\nreturn value;\",\"aggregationType\":null,\"units\":null,\"decimals\":null,\"usePostProcessing\":null,\"postFuncBody\":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\":\"AVG\",\"limit\":25000},\"timezone\":null},\"showTitle\":true,\"backgroundColor\":\"rgba(0, 0, 0, 0)\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"showLegend\":true,\"legendConfig\":{\"direction\":\"column\",\"position\":\"top\",\"sortDataKeys\":false,\"showMin\":false,\"showMax\":false,\"showAvg\":true,\"showTotal\":false,\"showLatest\":false},\"thresholds\":[],\"dataZoom\":true,\"stack\":false,\"yAxis\":{\"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)\",\"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)\"},\"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)\"},\"legendLabelFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"16px\"},\"legendLabelColor\":\"rgba(0, 0, 0, 0.76)\",\"showTooltip\":true,\"tooltipTrigger\":\"axis\",\"tooltipValueFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"500\",\"lineHeight\":\"16px\"},\"tooltipValueColor\":\"rgba(0, 0, 0, 0.76)\",\"tooltipShowDate\":true,\"tooltipDateFormat\":{\"format\":null,\"lastUpdateAgo\":false,\"custom\":false,\"auto\":true,\"autoDateFormatSettings\":{}},\"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,\"background\":{\"type\":\"color\",\"color\":\"#fff\",\"overlay\":{\"enabled\":false,\"color\":\"rgba(255,255,255,0.72)\",\"blur\":3}},\"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\":null,\"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}},\"noAggregationBarWidthSettings\":{\"strategy\":\"group\",\"groupWidth\":{\"relative\":true,\"relativeWidth\":2,\"absoluteWidth\":1000},\"barWidth\":{\"relative\":true,\"relativeWidth\":2,\"absoluteWidth\":1000}},\"animation\":{\"animation\":true,\"animationThreshold\":2000,\"animationDuration\":500,\"animationEasing\":\"cubicOut\",\"animationDelay\":0,\"animationDurationUpdate\":300,\"animationEasingUpdate\":\"cubicOut\",\"animationDelayUpdate\":0},\"padding\":\"12px\"},\"title\":\"Time series 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\"}"
+  },
+  "tags": [
+    "chart",
+    "time series",
+    "time-series",
+    "line",
+    "line chart",
+    "bar",
+    "bar chart",
+    "point",
+    "point chart"
+  ]
+}
\ No newline at end of file
diff --git a/application/src/main/data/json/system/widget_types/timeseries_bar_chart.json b/application/src/main/data/json/system/widget_types/timeseries_bar_chart.json
index ff9c7971f0..ebb0d2680d 100644
--- a/application/src/main/data/json/system/widget_types/timeseries_bar_chart.json
+++ b/application/src/main/data/json/system/widget_types/timeseries_bar_chart.json
@@ -1,8 +1,8 @@
 {
   "fqn": "charts.timeseries_bars_flot",
   "name": "Timeseries Bar Chart",
-  "deprecated": false,
-  "image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAACgCAMAAAB+IdObAAABOFBMVEUAAAA3oPR3d3d6enp8fHyBgYGDg4OGhoaNjY2RkZGSkpKTk5OUlJSVlZWWlpaXl5eYmJiZmZmampqcnJydnZ2enp6goKChoaGioqKjo6OkpKSlpaWmpqanp6eoqKipqamqqqqrq6usrKytra2urq6wsLCxsbGysrK0tLS1tbW2tra3t7e4uLi5ubm6urq8vLy9vb2+vr6/v7/AwMDBwcHDw8PExMTHx8fIyMjJycnLy8vNzc3Ozs7Pz8/S0tLT09PU1NTV1dXW1tbX19fZ2dna2trb29vc3Nzd3d3e3t7f39/h4eHi4uLj4+Pk5OTl5eXm5ubn5+fo6Ojq6urr6+vs7Ozt7e3u7u7v7+/w8PDx8fH09PT19fX29vb39/f4+Pj5+fn6+vr7+/v8/Pz9/f3+/v7/xx////8KXFhiAAAAAWJLR0RnW9PpswAAAvtJREFUeNrt3GtXElEUBuDpZlAqylVHCyMwyi4SpkaWAl4qk8wwUhJlmOn9//+gLzbKbc6AAm5991p82WvPOedZZw6zYM3aGupCQ4tYkZDSsKDrocNVvz8jHQKYY1ZiT/6OAJllRPSpsnzIqIG9SjYmHpKfAzI4CIuHjJeBtyHfZwCatiI1/m+BYV2Dw35NniOEEEIIIYQQQgghhBBCCCGEEEIIIYQQQgghhBBCCCGEEEIIIYQQUp/6Wx+DgbRbxOAhEb/fXJ98akiH1AIAHtSWlqRDSvdDGcOHnYR0SPV7zVsaQyHeO0jTJapEV5C9bUz9fIjsvHRIefhRxHqpjxzA3ftajXOudHGJOtHV+1rV04/wHenDc2QQkFbLJISQwUDaP90IIYQQQgghpAvIxRO9gFxG4lZ9XBFIx6sihJD+QVRjEEIIIYQQcoMgahkhhBDSe0iLX3ydQdSLIKR9ghCJkIYEIYQQIhPS8d+AhPQboppFw9HMxBrs/lqCIbObpgezP67YjnQ8iwagHDzrryUZUgsUz/prCYZY05vn+msJhiwM6XrR7q/V9OJU4xQuEpcxRsezNPbXEn3Yzz9Hulg3IYT0C3LxxI2CNCQIIYQQQgghhBBCCCGEEEIIIYQQQgghhBBCCCGEEEIIIYQQQlpA7P5a0iF2fy3hkLP+WsIhVbu/lvRby+6vJR1i99eSG6ffu1XHxlRNcfWq3I0iIK4tJK2nXVyV0lOqEmvjGWAtvnCu+jMzkQWMiOlYdRSd3MAH/UnVPWR/ApFfSkcpiOBvRc3XtAeYW1ZUJbZMD5C8azhWLX4xvZVR692Se0huHm9ySogxkhs3lFVewPM4WlFUlUMoJEYUox1+jAFIbLuHrKaQWlMu8TicDp+4gdw7/qS4t2qBohk4UUF2nieBfLyDM/ItgXhBucT113i14QbixW7M+SRNb6EQ0u8kHavyZQxj2/kgNUCsYDRoqXfEF/Mdu4G8D43uOtakh3R9H1DsyKZvOmneDjt+D/0DTzolrPMHmggAAAAASUVORK5CYII=",
+  "deprecated": true,
+  "image": "tb-image:dGltZXNlcmllc19iYXJfY2hhcnRfc3lzdGVtX3dpZGdldF9pbWFnZS5wbmc=:IlRpbWVzZXJpZXMgQmFyIENoYXJ0IiBzeXN0ZW0gd2lkZ2V0IGltYWdl;data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAACgCAMAAAB+IdObAAABOFBMVEUAAAA3oPR3d3d6enp8fHyBgYGDg4OGhoaNjY2RkZGSkpKTk5OUlJSVlZWWlpaXl5eYmJiZmZmampqcnJydnZ2enp6goKChoaGioqKjo6OkpKSlpaWmpqanp6eoqKipqamqqqqrq6usrKytra2urq6wsLCxsbGysrK0tLS1tbW2tra3t7e4uLi5ubm6urq8vLy9vb2+vr6/v7/AwMDBwcHDw8PExMTHx8fIyMjJycnLy8vNzc3Ozs7Pz8/S0tLT09PU1NTV1dXW1tbX19fZ2dna2trb29vc3Nzd3d3e3t7f39/h4eHi4uLj4+Pk5OTl5eXm5ubn5+fo6Ojq6urr6+vs7Ozt7e3u7u7v7+/w8PDx8fH09PT19fX29vb39/f4+Pj5+fn6+vr7+/v8/Pz9/f3+/v7/xx////8KXFhiAAAAAWJLR0RnW9PpswAAAvtJREFUeNrt3GtXElEUBuDpZlAqylVHCyMwyi4SpkaWAl4qk8wwUhJlmOn9//+gLzbKbc6AAm5991p82WvPOedZZw6zYM3aGupCQ4tYkZDSsKDrocNVvz8jHQKYY1ZiT/6OAJllRPSpsnzIqIG9SjYmHpKfAzI4CIuHjJeBtyHfZwCatiI1/m+BYV2Dw35NniOEEEIIIYQQQgghhBBCCCGEEEIIIYQQQgghhBBCCCGEEEIIIYQQUp/6Wx+DgbRbxOAhEb/fXJ98akiH1AIAHtSWlqRDSvdDGcOHnYR0SPV7zVsaQyHeO0jTJapEV5C9bUz9fIjsvHRIefhRxHqpjxzA3ftajXOudHGJOtHV+1rV04/wHenDc2QQkFbLJISQwUDaP90IIYQQQgghpAvIxRO9gFxG4lZ9XBFIx6sihJD+QVRjEEIIIYQQcoMgahkhhBDSe0iLX3ydQdSLIKR9ghCJkIYEIYQQIhPS8d+AhPQboppFw9HMxBrs/lqCIbObpgezP67YjnQ8iwagHDzrryUZUgsUz/prCYZY05vn+msJhiwM6XrR7q/V9OJU4xQuEpcxRsezNPbXEn3Yzz9Hulg3IYT0C3LxxI2CNCQIIYQQQgghhBBCCCGEEEIIIYQQQgghhBBCCCGEEEIIIYQQQlpA7P5a0iF2fy3hkLP+WsIhVbu/lvRby+6vJR1i99eSG6ffu1XHxlRNcfWq3I0iIK4tJK2nXVyV0lOqEmvjGWAtvnCu+jMzkQWMiOlYdRSd3MAH/UnVPWR/ApFfSkcpiOBvRc3XtAeYW1ZUJbZMD5C8azhWLX4xvZVR692Se0huHm9ySogxkhs3lFVewPM4WlFUlUMoJEYUox1+jAFIbLuHrKaQWlMu8TicDp+4gdw7/qS4t2qBohk4UUF2nieBfLyDM/ItgXhBucT113i14QbixW7M+SRNb6EQ0u8kHavyZQxj2/kgNUCsYDRoqXfEF/Mdu4G8D43uOtakh3R9H1DsyKZvOmneDjt+D/0DTzolrPMHmggAAAAASUVORK5CYII=",
   "description": "Displays changes to time-series data over time—for example, daily water consumption for the last month.",
   "descriptor": {
     "type": "timeseries",
@@ -21,6 +21,5 @@
     "basicModeDirective": "tb-flot-basic-config",
     "defaultConfig": "{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"First\",\"color\":\"#2196f3\",\"settings\":{\"showLines\":false,\"fillLines\":false,\"showPoints\":false},\"_hash\":0.8587686344902596,\"funcBody\":\"var value = prevValue + Math.random() * 100 - 50;\\nvar multiplier = Math.pow(10, 2 || 0);\\nvar value = Math.round(value * multiplier) / multiplier;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 1000) {\\n\\tvalue = 1000;\\n}\\nreturn value;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Second\",\"color\":\"#ffc107\",\"settings\":{\"showLines\":false,\"fillLines\":false,\"showPoints\":false},\"_hash\":0.12775350966079668,\"funcBody\":\"var value = prevValue + Math.random() * 100 - 50;\\nvar multiplier = Math.pow(10, 2 || 0);\\nvar value = Math.round(value * multiplier) / multiplier;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 1000) {\\n\\tvalue = 1000;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000},\"aggregation\":{\"limit\":200,\"type\":\"AVG\"}},\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{\"stack\":true,\"fontSize\":10,\"fontColor\":\"#545454\",\"showTooltip\":true,\"tooltipIndividual\":false,\"tooltipCumulative\":false,\"hideZeros\":false,\"grid\":{\"verticalLines\":true,\"horizontalLines\":true,\"outlineWidth\":1,\"color\":\"#545454\",\"backgroundColor\":null,\"tickColor\":\"#DDDDDD\"},\"xaxis\":{\"title\":null,\"showLabels\":true,\"color\":\"#545454\"},\"yaxis\":{\"min\":null,\"max\":null,\"title\":null,\"showLabels\":true,\"color\":\"#545454\",\"tickSize\":null,\"tickDecimals\":0,\"ticksFormatter\":\"\"},\"defaultBarWidth\":600,\"barAlignment\":\"left\",\"comparisonEnabled\":false,\"xaxisSecond\":{\"axisPosition\":\"top\",\"title\":null,\"showLabels\":true},\"showLegend\":true,\"legendConfig\":{\"direction\":\"column\",\"position\":\"bottom\",\"sortDataKeys\":false,\"showMin\":false,\"showMax\":false,\"showAvg\":true,\"showTotal\":false,\"showLatest\":false},\"customLegendEnabled\":false},\"title\":\"Timeseries Bar Chart\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400},\"mobileHeight\":null,\"widgetStyle\":{},\"useDashboardTimewindow\":true,\"showLegend\":true,\"actions\":{},\"configMode\":\"basic\",\"showTitleIcon\":false,\"titleIcon\":\"thermostat\",\"iconColor\":\"#1F6BDD\"}"
   },
-  "externalId": null,
   "tags": null
 }
\ No newline at end of file
diff --git a/application/src/main/data/json/system/widget_types/timeseries_line_chart.json b/application/src/main/data/json/system/widget_types/timeseries_line_chart.json
index e83b213ae0..87f7330657 100644
--- a/application/src/main/data/json/system/widget_types/timeseries_line_chart.json
+++ b/application/src/main/data/json/system/widget_types/timeseries_line_chart.json
@@ -1,8 +1,8 @@
 {
   "fqn": "charts.basic_timeseries",
   "name": "Timeseries Line Chart",
-  "deprecated": false,
-  "image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAACgCAIAAADGnbT+AAAABmJLR0QA/wD/AP+gvaeTAAAXk0lEQVR42u2deXwb1bXH+Y+lfY/utK98WkogZSk7LcujBF4pAT6lLaWvlBZeCrTw4AGFvrbQkPYRwlIWfyCr7WA7XrN4wzZx7DjxIu+2vEteZHmTJdmOd8faR9K838y1FUWWZVmaGQM585mPPmNZR/fOvV+de+455849iw/7OOuss/gojpaWFhI8cwQFVlQqVbp4JCUlzc3NaTSaveKhVqsJLBKMHCx2eDyeuLg4r9ebl5c3NjZGGosEpQEL+qm+vh4XKSkp0F4ZGRkWi4XAIsFowdqzZw/HcbiAurLb7Z2dndnZ2QQWCUYFVnd3d1FRkU914XV2djY5OZnAIsGowIqPj/cNfOXl5bDiY2Nj+/v7/anC0UIHHeEdwZUQxkRY8WS8k6AENhb5sUiQwCJBAosancAisEiQwCJBAosancAisEiQwCJBAosancAisEiQwCJBAosancAisEiQwCJBAosECSwCiwQJLBIksEiQwCKwSJDAIkECiwQJLAKLBAksEiSwSJDAIrBIkMAiQQKLBAksAosECSwSJLBIkMAisEiQwCJBAuuzK5jV7SKwCCyJBd+pd35nz7x6xE1gEViSCb7XIFCF84lCO4FFYEkj+IFaoOqSuPn1cfMX75nvnvQQWARWtIKvFg6CqnWx8+83Op8ptuP6hWN2AovAikowsd3FqIppcDaOuIv7uUtj5y+JnR+a9RBYBFaEgvs6BKow9r1V6wBV7PzdYRve3KJyEFgEViSC6VrXxSJVL+YN+6jC+ZHOBQV2Wfz8uNW75lXVTni2q50/zbLWGN0E1qdAEP4q0AOqXq92ZKi6/cHC+auPBKX1dp1zTarq9vBweWytctyaamETVZy3pFim7V6FwMKOX2yPQmwup9Pp0tLScnJy2J5NBFaII7uHA1Xora3Vwgi4FKz9ncIQeXWC5aTTq1hVwU1OD/fMUfv3PjzF0w1JlieL7HcftOIaF0qA5Xa7ExISfG/t2LED79SJB4EV4ijs4+BWQD+9orIzjJaChfMnWUJfxrY45a6qYc6T1O56pMB2ady8j6cfpllfOOZI1bgaxMpgSnGVSNtbRf2ygzU9Pf3mm29iYybs+wUthe2Z8KbRaMSOmATWcgd6iFH1t3K7j6GgYCWIs8Ub91nsnPRVbWpu0Yx7Pmh03i/iy851cfP3HLS+WuU40s8trc/OJsHTtj52ric8H1vkYLlcLrPZDC21fft2QIZ9VvGmyWTKzc0lsIIeRwc4phX+Umb377OgYOH80X5BSaRpXBJW1eXhXy53XL131scTBtxNH9t2qJ2Vw1zQavjOxw8LPrb7DlkdbjnBws6XBoMBF9hVdXx8fOfOnbjGRpilpaUE1tKjwuD+brzQkc+V2AM6bDmwdoju+NvTrW6PZFVl4UicN6dY4YyFF63O5A7Nk+8Eed9PnIHstmqHjGBhp8Jdu3YdOHAAJjx2kysuLsbWvbt378ZemP5U0X6FOJLKdevjTqJLHs0cAUZhnukV3awjPyjRS1KNA6qudXtOrgMZhYPhV8P/fLe4/5LYk5jMJpTp5N2vEANi0GvSWL4DHqDL9wpKAhoiqCZYTmPhfLvOAcG7D1g93miranV578wQLKo/lTpClBj6hOAWlTAg3rDPsqKbjfxYMgo2jbqvFOdTyFloWL63lutIjFPf3yeIlw5xUVZ1c4XA6J0ZllqzOxqw6s3un4omPywzL4G1JoLNY27mE3rssB390bh6sHD+X6UAxC9ybNFUtXLYjfELqRPZ3dyKJYYGC6/HBrlrE4X7golGYCkniN9xy5h7W42DUYXYXwiqVuxmmMyYuOF7GszuyKoKz+dNycI3/KPSEU6J4VR1T4sTpGI60jnhIbBkF+ydEpxDd2Sccg49nG+rN4XbW8udfy1ziGrPFllVnz0qWEX3HrL6+I4eLJxPiRk+Pz5gtXEEljyCjKd/3zd9KhKyzwJT3ee5jhKsMgN3+V5B5cCrudqq5uo4CF7xoQUe//BLDKeqNSb3hnSLtIkYBJZwwAeNJKr/2G/1j6yBpzRtWDytqpuZ1nm+xL6qqo7Me68RjaF36hyrLTGcqsJiWy+6fIsHuGhatc7sZhH3Mxos/bQHmcQYAnw8wZLFuPDGkYHQtlQ0YBUtJgAitBdmVWHq/bZAyJJArkQEJYZZ1deqhWH6+iTLqCWSePngrOepIjtrRrTemQWW082PznvbTgjxsnsOWf2DIU8ese9rdzGeJOytEBGVVyocYd5jkhhtBPTHBzn5wIJu/kWugO9v8m2nnG1el3CGbNVZh/f1GgdTeBjoETxFVFResMb82JcbLLTFpM0LIwnauEDPJXe4/ppvQOfhZ/TLXBuGuasSTuWQsBNx/scL7QltrgCrXG6wPupdSAA8seiZDHGPUKvMK4vpW8QlhikIcK9LspyWi9H7DF/1Rb7jXn74XX6+GaD5V5Xz8Cka1/WiCO4IjYkoaqO46E1esKC64VeUFawdTc6NB63wPbK8qNAnxiAYT3ekWx4rtMe3LhtckxssnL/OE3TDPxcTAJe7R/QcS1tAnylT1Q/bhGxYhNih13nj+7zq7NPO2gtnau/jRxJ4x3DZEHfXolWK1KDM7lPaVF6wgD8zC+QDyzzvZfFgdkIbIyKLjJEHc23wJm/KHEHqyHv1Tnj/cns4mKVhWk4KgHWgU2gcuMfmHN4Q9xgjLlG8KcW6XMKCHFV9tkQYqV/K+YivPI9XncOP7uPHMviex/m6i/wh6z16TVLu83/Oyo1tnAr4BhnBwsDkM2KqZUuy/psY3IBNUAJoTGvAx3KC7QbdaMfLjSOh0ldYOGVXk3O5e2wdcyPlC5oYzg4lfwPwPjyRqZ4v+4oAkOGN0zy009pDha+XHb7fWv4lH2Heys+fbLzTpHmta6BGbXbICxZSY9m46wtiSA4WZlXQ2Ehqy+91rZXiWU5wuvnXaPHxtqcbR5ZlImkxARBuyaX3iDeZ++OPxxwKK9cW45i1ej3qX1DwcIF+wXJH5hYML2anAvfnik826yrN2q3zDbd7Kz/ng8xd9dWZpgd554gsYCEHbUO60Chv1DpYKAqRV8nB+suCF9u+hiNaUMHOgXphBBEberLlUfYjDnqyDHQopKX3+HcxsIjE4hqToqO22mw/qb4LNR+tvPmKuBOYLxtPemDVsA7FeVfKBOwKf5Em01xP37GRjs2W+ptx457K83mPTRawEtuE3yKcubBpYOWwZEUk0UoIFrwm+N1cFj+tbXt/qvm3zaaZTwxYHH7E6Jjp5l+5q74iXjykHrEF/fwuMUv4tjSLurk1aKQ5q4dT2BycaP096uysubh12PSQOMO4cnFFBiY90LKhS2wbNuj6imUZCi0u741ifgimXWzAZn/uOq6XECwsXX8k5bC5/FqmGGz117cZBj4JYOl7s1AfV/WFYL1zoJGr/gb+nG26v8k8v/TzcB1BJ6Fx3i/p890azHm2WmuLyq7wPGO4813U1lP5hc6BBvxZbuBYqg/0FhRE+E4+WcBiE5n7Mq2+Yt6sFZTWbUlTbq80YA2NaisL72VI2WuvstddLfRlzbfRkWsL1gGVxl57JSoz2B3P3tEONnPV38Q7c+q7m0yzS0XeqRca5/bkKV/bPF8SGGlWBqxefQGvOhdjmb43x/cmVnj/6bjDf066NmDBRckyTDK0tq6BamPnWzp9Yb3RCS8A3sQqvGjB4qZ4/YselWAtWisuMHR9AJug2TQ517hR/Kl90b9RlAerSfV3QX3WXeNvV2mGNK5qYaKOIbLZOLVcAiBSo3B/Bb0c81/DalbSM6IZbGcDt0n7RvQlSg9WjKpn84Hddccecldd4JspQJc01Lx8R0IH1L7LEylYXk7wy9UKv35Pxbl5BY+W6Uf8TE7HifbnxOLOMWtfWxOwwLdDJdx1r/7jgH+1G/odtZcJP4b6H2DOFZgAKJqhD+TYEKi4TpzrvF3nUGwCK04Dxx11l6N6Uy0Ph3aRKAuWtZs3x/KdD3lqvuHvQLPVXTve+hSGqgVvh+qc+iN31jan8B7rqsGaOsqrr2Hf01V+z8bExv85GsT+MHa+Iyrzs1EuNJnCYGFahKIxpVrGqh1ko6St/rrWYXNAAuCV8XPChEv0LyAAFV6JLoyz0d+j2mydb9ggKNTG25rMFkkaJwqwnKP8eLYQSKq/xB+mE6XfUpc+NNi9t214yFdM56AaHh1nxaJLrfqrfM9j/HSpGLZf6bD1CjEEJth45XBfFkt3LB4I/sPS9+ZiQBRsmsaNWapGxcDCbEgs95wAO8//bB0esdbdgLo5ar/bbujz/9cT2WZfOLxkgFsRqT5dJgZcfNWM6qqBnlS12RnxPeJHKM42LmobHpaqcVYP1vghvvdpvvHy0+JHdd/muzeN6JM2JHRihlzUH7xdDqmaYvLjmotuOyWovlaIRrnGg5fHTfN9/8tXfl74ZM3XhE96nQiZregzxIwGg6/AlurydoNeGbAmWzYJNrvqgdAfazGesNbfJMznay9tH+o9FaEr07EEQKxADCEO7YJpAbhcdHl/zjc49OvSQzjMlrtHUcef7an6knawRcLGWT1Yi34/vvrL/hFv/PcRMWEoRJejQvEtwoTxgfQ218Brp1QdAlL4Kug/X3rGgjl1ofiBc6dqf8Y7T+DtjnHPxaJhuzR7ZIn+GGb9h9l+d79KbrDQK6gnHIN5qrKVTTHjFHN0uWq+BZPZVyIidI8V2kMitRfuJdZoMInwJzyTtap3HbVXLLxZu97QtT2c4YyVqNMf8YrRwD7dIWkbZ/Vg9T7LG2NEmE4zwrHgjoVUkXobukIbDy4GyEDP5Me89kHeFxCA5ht4hR/P4tXXLbzTvpG3dPhmhYgrC4vpjjvCM6VnzKofiVPF8/t0+2UFC64EwVXd8XKYgvA7zKl/LHL/TaYqIIiEk4pgrddsmsbkmvksBPO/7kaMg75IEQRhTQ707LPXfo99APAZunYEdZv5n4WqfE/Vl/F5fLnkjSON8Q59hRmN/0NXQlQI4Qt8Elm2M45FA8s5xpt28k03nja8Qp+NpfvPCptH3cwLHILdwEcIqbRj7S+yqSIs6xXnO5GBhTmggEjV11tM4+ELQgMJMTUhuHZB10BtUEFM1jDD5aoWpkSYUYpIcctU1QVHlBhUOZshC1lMVJcbkedV68Rp4G/CbxalwTrcx7Ek8SpjWBVij/WBHzXwi+bqeN1TfP13+OH3eE9gdiVSGCCFVS6rbQJD105R4SNstwndKS1YsJph3+DLMQatlkjEeRDtEdn6yjFVeoCZD/3HNAqbaSIYF15VuV59nqXh1gW8qr4OvEB8ANNsLJ5v+GGY4+YagIWnXLBJsv+zN0NXCKlIF4u6ZzK89bcAC4+lY0NtuYGLoAkQvXJXf401ZatxVEKwYOiIxs1lDNnVjqHgcqL1CYEA1fmoJPNKQMuyia1Y4Q09faURVLWrv2qm6efsSwAovrPVaFycBj6JNy2qi4CvTDMbCcDC4zfR5bemWle15u5BMbcaidJhgsXyLf2fRLXaJtAOtTlr1jGzt8PQJQlYMJXY9FMcoSJ2gLngixGneP8K/6RX9S9syjLd/J9w00TZzd39lbNNP1nAq/ILY20vjHS8wlCDjSWfLyZasJAzjwdaosuxNmFVFcJiI5b0jaUNK5abVNbDHDwrPvYpdBMgXG9puIUNEJGpgYATowzTgj4zJVJ3JdetenzRg3DeZMt/aQY7JOxmuNamm355akavOrdXny+r9zhasFjWx10HLBEs5nw4P9xHVW9MnQgz1L9iEzSZT0ITMA8Qpk7RtB0whftHiAQMVEsSYDFrXp1o/QNST2WawAJWIAtw4buSO94VFVhY9MOS+LBqKoIKIe0TyZ9IAfVfXrf0QMY+m0WuVl0t3wQucTgQfr4TrY8HtV7Dabvxtv9mSVefkJzVsCMEQwqUGBVYsJDE0Kk14gptEp+vj0TQEIX+PFv4DMK00jYBxgIk0bI5fASJXJohLXQecr07DD2fLrCUEYwcLCyWxWI3TO4OdkXuHCrsc7E1wVg6F7RE+AwF62rvbLVR+iaA15tlHHDV/xZgcq3YdkjcgyCmWp9tPtYArD+XCjE7hHGirBDWH7OHeQb1u94nrvN5/iOjTE0AB8+s+j5mchk73w5TsKevjDmflnouCKyowOqbEfLNcX4cXjJaiAohSQGpCtB8Sx/OVCj6XZHWnFLRI18TwJMkprucwzyoLBISUtDFvNv+IBJY0oD1e1HNPF1sl6RCbHnkH47Ygy5LRFqzAm3X13uQTfEQuoaLMoQgclRYPA4TTAJLSrCwipKlGBwblCbGhJVhLGMEz87zlZUvZuj+IDnax2yuIkNhqI2loyDKdlyVFtwjarY4a4SkDOSonAl8KArWw3mrjtmtWCEkLDCLbSFM5F0IE2GhgZJth6DvnPpeMdn1vKAjHRIBWH7BcstQCawIwTomPo4BTnCVgZOwQogAsg1eak1CnbLFVdS3pCyEiZRsu0WTS1xr2vo7/+QTZASwgONy8WACK3Kw2DSN7XQlbYVeLrezdG9ucRU126d0TdquWvU+CwMLQethE3vzRNsfhVTgpp+dOXwoB5Zo96yw6DviJwqzRyE+J9ryt6VJ/PzW1Qoi/46ZXEgGR74U0ogRHkY8JHQUj8A6DSybzZaZmZmamqrVavGnRqNhexdiM7AAsGC2v9fglKlC/xCfVsDOD/xSv9eq7bBOiz3FAHkHWGnNFv+cUXxEC1Z+fr5er8cWmDExMezP0dHRoBoL1k9kD+cMp0Jwr98gLt3ckGHxL2UN2w7LE3wmF1JNfMMigbWKoRBbNSUmJvLibqvYpAk7geGdALAiq0r4FXpdfL7qrtOTcNa87fp1GTC5TJqtZxofEoDFNlmdmJjgxV3m7HY7tpXLzs5WGCysN0dOX8Mnr+2Qcxf0yQsEViiwsJXc/v37MRoygJhphT3lkpOTFQaLsUW99RkBS6VSbdu2LV08oLTKy8uxjS828O3v7/enCkdkW+PReaadp+1XeNoiZI6DGltqvCugsUjwTPRjEVgkSGCRIIFFggQWgUWCBBYJElgkSGBR25EggUWCBBYJEljUdiRIYJEggUWCBBY1OgkSWCRIYJEggUWNToIEFgkSWCRIYFGjkyCBRYIEFgkSWNToJEhgkSCBRYIEFjU6CRJYJEhgkSCBRY1OggQWCRJYJEhgUaOTIIFFggQWCRJY1OgkSGCRIIFFggQWNToJElgkSGCRIIFFjU5gEVgkqBRYOp0uLS0tJycH+1MQWCQoGVg7duzAZmB14kFgkaA0YEFLYXsmXBiNxry8PAKLBKUBy+VyxcXF4cJkMuXm5hJYJCjZULhz5068YiPM0tJSAosEJQOruLgYGxfu3r0be2EG7FdIBx3hHkE9CxgQQzgdeGUPKvHTWKLS90PHGXIQWHR8AsCqqKiA+YVXxepXVlaGEvEqd0HYqri3t7egoMD3Z3V19ZEjR+Qr0Wq1ZmZmpqamYp7k8/WkpKR4PB6ZSrTZbIcOHYL3G3eKP5ubm9G2WVlZISwfJcCanJxEK+ACNz81NaUAVdPT04mJibjA68zMjKxlDQ4O4gcTExPD/iwqKqqvr5e1RLgJ+/r6gJGv0MOHD2/ZsiUg4CHhgZ/KwMAASty+fbvdbt+zZw9+P1VVVQGecKXB6urqYg6I48eP41oBsNDEmJyirPj4ePma2/9Ai7MLdPbBgwfx+0YHyFqixWJJSkpijkOghvuV9U7n5uZaW1uzs7P9+TYYDGsJlkajYUMSXrVarQLd7HA4kpOToUjw6nQ6lQRr69atKL2jo0PW0RChs4SEhImJCWgRXOAe5QYLAZXCwkKoRvZnd3d3gBt8DcAaHh5mQR5UBT8vBboZ4fCSkhJcHD16lJkFioHFLkZGRvx/3JJbdfv378doyNQV9BYsns2bN/t6XfIDGEFB4mLXrl14haKSz6Q7a1UNAVsHowNeca2MxkLgEl2LV1wrCVZDQwN6GlYI2JKpLGjibdu2pYsH7Ff2pqwaS6/XoyVBM9gFTy+99BKGAplmY/8Pl7O7ukBGoYYAAAAASUVORK5CYII=",
+  "deprecated": true,
+  "image": "tb-image:Z2F0ZXdheV9nZW5lcmFsX2NoYXJ0X3N0YXRpc3RpY3Nfc3lzdGVtX3dpZGdldF9pbWFnZS5wbmc=:IkdhdGV3YXkgZ2VuZXJhbCBjaGFydCBzdGF0aXN0aWNzIiBzeXN0ZW0gd2lkZ2V0IGltYWdl;data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAACgCAIAAADGnbT+AAAABmJLR0QA/wD/AP+gvaeTAAAXk0lEQVR42u2deXwb1bXH+Y+lfY/utK98WkogZSk7LcujBF4pAT6lLaWvlBZeCrTw4AGFvrbQkPYRwlIWfyCr7WA7XrN4wzZx7DjxIu+2vEteZHmTJdmOd8faR9K838y1FUWWZVmaGQM585mPPmNZR/fOvV+de+455849iw/7OOuss/gojpaWFhI8cwQFVlQqVbp4JCUlzc3NaTSaveKhVqsJLBKMHCx2eDyeuLg4r9ebl5c3NjZGGosEpQEL+qm+vh4XKSkp0F4ZGRkWi4XAIsFowdqzZw/HcbiAurLb7Z2dndnZ2QQWCUYFVnd3d1FRkU914XV2djY5OZnAIsGowIqPj/cNfOXl5bDiY2Nj+/v7/anC0UIHHeEdwZUQxkRY8WS8k6AENhb5sUiQwCJBAosancAisEiQwCJBAosancAisEiQwCJBAosancAisEiQwCJBAosancAisEiQwCJBAosECSwCiwQJLBIksEiQwCKwSJDAIkECiwQJLAKLBAksEiSwSJDAIrBIkMAiQQKLBAksAosECSwSJLBIkMAisEiQwCJBAuuzK5jV7SKwCCyJBd+pd35nz7x6xE1gEViSCb7XIFCF84lCO4FFYEkj+IFaoOqSuPn1cfMX75nvnvQQWARWtIKvFg6CqnWx8+83Op8ptuP6hWN2AovAikowsd3FqIppcDaOuIv7uUtj5y+JnR+a9RBYBFaEgvs6BKow9r1V6wBV7PzdYRve3KJyEFgEViSC6VrXxSJVL+YN+6jC+ZHOBQV2Wfz8uNW75lXVTni2q50/zbLWGN0E1qdAEP4q0AOqXq92ZKi6/cHC+auPBKX1dp1zTarq9vBweWytctyaamETVZy3pFim7V6FwMKOX2yPQmwup9Pp0tLScnJy2J5NBFaII7uHA1Xora3Vwgi4FKz9ncIQeXWC5aTTq1hVwU1OD/fMUfv3PjzF0w1JlieL7HcftOIaF0qA5Xa7ExISfG/t2LED79SJB4EV4ijs4+BWQD+9orIzjJaChfMnWUJfxrY45a6qYc6T1O56pMB2ady8j6cfpllfOOZI1bgaxMpgSnGVSNtbRf2ygzU9Pf3mm29iYybs+wUthe2Z8KbRaMSOmATWcgd6iFH1t3K7j6GgYCWIs8Ub91nsnPRVbWpu0Yx7Pmh03i/iy851cfP3HLS+WuU40s8trc/OJsHTtj52ric8H1vkYLlcLrPZDC21fft2QIZ9VvGmyWTKzc0lsIIeRwc4phX+Umb377OgYOH80X5BSaRpXBJW1eXhXy53XL131scTBtxNH9t2qJ2Vw1zQavjOxw8LPrb7DlkdbjnBws6XBoMBF9hVdXx8fOfOnbjGRpilpaUE1tKjwuD+brzQkc+V2AM6bDmwdoju+NvTrW6PZFVl4UicN6dY4YyFF63O5A7Nk+8Eed9PnIHstmqHjGBhp8Jdu3YdOHAAJjx2kysuLsbWvbt378ZemP5U0X6FOJLKdevjTqJLHs0cAUZhnukV3awjPyjRS1KNA6qudXtOrgMZhYPhV8P/fLe4/5LYk5jMJpTp5N2vEANi0GvSWL4DHqDL9wpKAhoiqCZYTmPhfLvOAcG7D1g93miranV578wQLKo/lTpClBj6hOAWlTAg3rDPsqKbjfxYMgo2jbqvFOdTyFloWL63lutIjFPf3yeIlw5xUVZ1c4XA6J0ZllqzOxqw6s3un4omPywzL4G1JoLNY27mE3rssB390bh6sHD+X6UAxC9ybNFUtXLYjfELqRPZ3dyKJYYGC6/HBrlrE4X7golGYCkniN9xy5h7W42DUYXYXwiqVuxmmMyYuOF7GszuyKoKz+dNycI3/KPSEU6J4VR1T4sTpGI60jnhIbBkF+ydEpxDd2Sccg49nG+rN4XbW8udfy1ziGrPFllVnz0qWEX3HrL6+I4eLJxPiRk+Pz5gtXEEljyCjKd/3zd9KhKyzwJT3ee5jhKsMgN3+V5B5cCrudqq5uo4CF7xoQUe//BLDKeqNSb3hnSLtIkYBJZwwAeNJKr/2G/1j6yBpzRtWDytqpuZ1nm+xL6qqo7Me68RjaF36hyrLTGcqsJiWy+6fIsHuGhatc7sZhH3Mxos/bQHmcQYAnw8wZLFuPDGkYHQtlQ0YBUtJgAitBdmVWHq/bZAyJJArkQEJYZZ1deqhWH6+iTLqCWSePngrOepIjtrRrTemQWW082PznvbTgjxsnsOWf2DIU8ese9rdzGeJOytEBGVVyocYd5jkhhtBPTHBzn5wIJu/kWugO9v8m2nnG1el3CGbNVZh/f1GgdTeBjoETxFVFResMb82JcbLLTFpM0LIwnauEDPJXe4/ppvQOfhZ/TLXBuGuasSTuWQsBNx/scL7QltrgCrXG6wPupdSAA8seiZDHGPUKvMK4vpW8QlhikIcK9LspyWi9H7DF/1Rb7jXn74XX6+GaD5V5Xz8Cka1/WiCO4IjYkoaqO46E1esKC64VeUFawdTc6NB63wPbK8qNAnxiAYT3ekWx4rtMe3LhtckxssnL/OE3TDPxcTAJe7R/QcS1tAnylT1Q/bhGxYhNih13nj+7zq7NPO2gtnau/jRxJ4x3DZEHfXolWK1KDM7lPaVF6wgD8zC+QDyzzvZfFgdkIbIyKLjJEHc23wJm/KHEHqyHv1Tnj/cns4mKVhWk4KgHWgU2gcuMfmHN4Q9xgjLlG8KcW6XMKCHFV9tkQYqV/K+YivPI9XncOP7uPHMviex/m6i/wh6z16TVLu83/Oyo1tnAr4BhnBwsDkM2KqZUuy/psY3IBNUAJoTGvAx3KC7QbdaMfLjSOh0ldYOGVXk3O5e2wdcyPlC5oYzg4lfwPwPjyRqZ4v+4oAkOGN0zy009pDha+XHb7fWv4lH2Heys+fbLzTpHmta6BGbXbICxZSY9m46wtiSA4WZlXQ2Ehqy+91rZXiWU5wuvnXaPHxtqcbR5ZlImkxARBuyaX3iDeZ++OPxxwKK9cW45i1ej3qX1DwcIF+wXJH5hYML2anAvfnik826yrN2q3zDbd7Kz/ng8xd9dWZpgd554gsYCEHbUO60Chv1DpYKAqRV8nB+suCF9u+hiNaUMHOgXphBBEberLlUfYjDnqyDHQopKX3+HcxsIjE4hqToqO22mw/qb4LNR+tvPmKuBOYLxtPemDVsA7FeVfKBOwKf5Em01xP37GRjs2W+ptx457K83mPTRawEtuE3yKcubBpYOWwZEUk0UoIFrwm+N1cFj+tbXt/qvm3zaaZTwxYHH7E6Jjp5l+5q74iXjykHrEF/fwuMUv4tjSLurk1aKQ5q4dT2BycaP096uysubh12PSQOMO4cnFFBiY90LKhS2wbNuj6imUZCi0u741ifgimXWzAZn/uOq6XECwsXX8k5bC5/FqmGGz117cZBj4JYOl7s1AfV/WFYL1zoJGr/gb+nG26v8k8v/TzcB1BJ6Fx3i/p890azHm2WmuLyq7wPGO4813U1lP5hc6BBvxZbuBYqg/0FhRE+E4+WcBiE5n7Mq2+Yt6sFZTWbUlTbq80YA2NaisL72VI2WuvstddLfRlzbfRkWsL1gGVxl57JSoz2B3P3tEONnPV38Q7c+q7m0yzS0XeqRca5/bkKV/bPF8SGGlWBqxefQGvOhdjmb43x/cmVnj/6bjDf066NmDBRckyTDK0tq6BamPnWzp9Yb3RCS8A3sQqvGjB4qZ4/YselWAtWisuMHR9AJug2TQ517hR/Kl90b9RlAerSfV3QX3WXeNvV2mGNK5qYaKOIbLZOLVcAiBSo3B/Bb0c81/DalbSM6IZbGcDt0n7RvQlSg9WjKpn84Hddccecldd4JspQJc01Lx8R0IH1L7LEylYXk7wy9UKv35Pxbl5BY+W6Uf8TE7HifbnxOLOMWtfWxOwwLdDJdx1r/7jgH+1G/odtZcJP4b6H2DOFZgAKJqhD+TYEKi4TpzrvF3nUGwCK04Dxx11l6N6Uy0Ph3aRKAuWtZs3x/KdD3lqvuHvQLPVXTve+hSGqgVvh+qc+iN31jan8B7rqsGaOsqrr2Hf01V+z8bExv85GsT+MHa+Iyrzs1EuNJnCYGFahKIxpVrGqh1ko6St/rrWYXNAAuCV8XPChEv0LyAAFV6JLoyz0d+j2mydb9ggKNTG25rMFkkaJwqwnKP8eLYQSKq/xB+mE6XfUpc+NNi9t214yFdM56AaHh1nxaJLrfqrfM9j/HSpGLZf6bD1CjEEJth45XBfFkt3LB4I/sPS9+ZiQBRsmsaNWapGxcDCbEgs95wAO8//bB0esdbdgLo5ar/bbujz/9cT2WZfOLxkgFsRqT5dJgZcfNWM6qqBnlS12RnxPeJHKM42LmobHpaqcVYP1vghvvdpvvHy0+JHdd/muzeN6JM2JHRihlzUH7xdDqmaYvLjmotuOyWovlaIRrnGg5fHTfN9/8tXfl74ZM3XhE96nQiZregzxIwGg6/AlurydoNeGbAmWzYJNrvqgdAfazGesNbfJMznay9tH+o9FaEr07EEQKxADCEO7YJpAbhcdHl/zjc49OvSQzjMlrtHUcef7an6knawRcLGWT1Yi34/vvrL/hFv/PcRMWEoRJejQvEtwoTxgfQ218Brp1QdAlL4Kug/X3rGgjl1ofiBc6dqf8Y7T+DtjnHPxaJhuzR7ZIn+GGb9h9l+d79KbrDQK6gnHIN5qrKVTTHjFHN0uWq+BZPZVyIidI8V2kMitRfuJdZoMInwJzyTtap3HbVXLLxZu97QtT2c4YyVqNMf8YrRwD7dIWkbZ/Vg9T7LG2NEmE4zwrHgjoVUkXobukIbDy4GyEDP5Me89kHeFxCA5ht4hR/P4tXXLbzTvpG3dPhmhYgrC4vpjjvCM6VnzKofiVPF8/t0+2UFC64EwVXd8XKYgvA7zKl/LHL/TaYqIIiEk4pgrddsmsbkmvksBPO/7kaMg75IEQRhTQ707LPXfo99APAZunYEdZv5n4WqfE/Vl/F5fLnkjSON8Q59hRmN/0NXQlQI4Qt8Elm2M45FA8s5xpt28k03nja8Qp+NpfvPCptH3cwLHILdwEcIqbRj7S+yqSIs6xXnO5GBhTmggEjV11tM4+ELQgMJMTUhuHZB10BtUEFM1jDD5aoWpkSYUYpIcctU1QVHlBhUOZshC1lMVJcbkedV68Rp4G/CbxalwTrcx7Ek8SpjWBVij/WBHzXwi+bqeN1TfP13+OH3eE9gdiVSGCCFVS6rbQJD105R4SNstwndKS1YsJph3+DLMQatlkjEeRDtEdn6yjFVeoCZD/3HNAqbaSIYF15VuV59nqXh1gW8qr4OvEB8ANNsLJ5v+GGY4+YagIWnXLBJsv+zN0NXCKlIF4u6ZzK89bcAC4+lY0NtuYGLoAkQvXJXf401ZatxVEKwYOiIxs1lDNnVjqHgcqL1CYEA1fmoJPNKQMuyia1Y4Q09faURVLWrv2qm6efsSwAovrPVaFycBj6JNy2qi4CvTDMbCcDC4zfR5bemWle15u5BMbcaidJhgsXyLf2fRLXaJtAOtTlr1jGzt8PQJQlYMJXY9FMcoSJ2gLngixGneP8K/6RX9S9syjLd/J9w00TZzd39lbNNP1nAq/ILY20vjHS8wlCDjSWfLyZasJAzjwdaosuxNmFVFcJiI5b0jaUNK5abVNbDHDwrPvYpdBMgXG9puIUNEJGpgYATowzTgj4zJVJ3JdetenzRg3DeZMt/aQY7JOxmuNamm355akavOrdXny+r9zhasFjWx10HLBEs5nw4P9xHVW9MnQgz1L9iEzSZT0ITMA8Qpk7RtB0whftHiAQMVEsSYDFrXp1o/QNST2WawAJWIAtw4buSO94VFVhY9MOS+LBqKoIKIe0TyZ9IAfVfXrf0QMY+m0WuVl0t3wQucTgQfr4TrY8HtV7Dabvxtv9mSVefkJzVsCMEQwqUGBVYsJDE0Kk14gptEp+vj0TQEIX+PFv4DMK00jYBxgIk0bI5fASJXJohLXQecr07DD2fLrCUEYwcLCyWxWI3TO4OdkXuHCrsc7E1wVg6F7RE+AwF62rvbLVR+iaA15tlHHDV/xZgcq3YdkjcgyCmWp9tPtYArD+XCjE7hHGirBDWH7OHeQb1u94nrvN5/iOjTE0AB8+s+j5mchk73w5TsKevjDmflnouCKyowOqbEfLNcX4cXjJaiAohSQGpCtB8Sx/OVCj6XZHWnFLRI18TwJMkprucwzyoLBISUtDFvNv+IBJY0oD1e1HNPF1sl6RCbHnkH47Ygy5LRFqzAm3X13uQTfEQuoaLMoQgclRYPA4TTAJLSrCwipKlGBwblCbGhJVhLGMEz87zlZUvZuj+IDnax2yuIkNhqI2loyDKdlyVFtwjarY4a4SkDOSonAl8KArWw3mrjtmtWCEkLDCLbSFM5F0IE2GhgZJth6DvnPpeMdn1vKAjHRIBWH7BcstQCawIwTomPo4BTnCVgZOwQogAsg1eak1CnbLFVdS3pCyEiZRsu0WTS1xr2vo7/+QTZASwgONy8WACK3Kw2DSN7XQlbYVeLrezdG9ucRU126d0TdquWvU+CwMLQethE3vzRNsfhVTgpp+dOXwoB5Zo96yw6DviJwqzRyE+J9ryt6VJ/PzW1Qoi/46ZXEgGR74U0ogRHkY8JHQUj8A6DSybzZaZmZmamqrVavGnRqNhexdiM7AAsGC2v9fglKlC/xCfVsDOD/xSv9eq7bBOiz3FAHkHWGnNFv+cUXxEC1Z+fr5er8cWmDExMezP0dHRoBoL1k9kD+cMp0Jwr98gLt3ckGHxL2UN2w7LE3wmF1JNfMMigbWKoRBbNSUmJvLibqvYpAk7geGdALAiq0r4FXpdfL7qrtOTcNa87fp1GTC5TJqtZxofEoDFNlmdmJjgxV3m7HY7tpXLzs5WGCysN0dOX8Mnr+2Qcxf0yQsEViiwsJXc/v37MRoygJhphT3lkpOTFQaLsUW99RkBS6VSbdu2LV08oLTKy8uxjS828O3v7/enCkdkW+PReaadp+1XeNoiZI6DGltqvCugsUjwTPRjEVgkSGCRIIFFggQWgUWCBBYJElgkSGBR25EggUWCBBYJEljUdiRIYJEggUWCBBY1OgkSWCRIYJEggUWNToIEFgkSWCRIYFGjkyCBRYIEFgkSWNToJEhgkSCBRYIEFjU6CRJYJEhgkSCBRY1OggQWCRJYJEhgUaOTIIFFggQWCRJY1OgkSGCRIIFFggQWNToJElgkSGCRIIFFjU5gEVgkqBRYOp0uLS0tJycH+1MQWCQoGVg7duzAZmB14kFgkaA0YEFLYXsmXBiNxry8PAKLBKUBy+VyxcXF4cJkMuXm5hJYJCjZULhz5068YiPM0tJSAosEJQOruLgYGxfu3r0be2EG7FdIBx3hHkE9CxgQQzgdeGUPKvHTWKLS90PHGXIQWHR8AsCqqKiA+YVXxepXVlaGEvEqd0HYqri3t7egoMD3Z3V19ZEjR+Qr0Wq1ZmZmpqamYp7k8/WkpKR4PB6ZSrTZbIcOHYL3G3eKP5ubm9G2WVlZISwfJcCanJxEK+ACNz81NaUAVdPT04mJibjA68zMjKxlDQ4O4gcTExPD/iwqKqqvr5e1RLgJ+/r6gJGv0MOHD2/ZsiUg4CHhgZ/KwMAASty+fbvdbt+zZw9+P1VVVQGecKXB6urqYg6I48eP41oBsNDEmJyirPj4ePma2/9Ai7MLdPbBgwfx+0YHyFqixWJJSkpijkOghvuV9U7n5uZaW1uzs7P9+TYYDGsJlkajYUMSXrVarQLd7HA4kpOToUjw6nQ6lQRr69atKL2jo0PW0RChs4SEhImJCWgRXOAe5QYLAZXCwkKoRvZnd3d3gBt8DcAaHh5mQR5UBT8vBboZ4fCSkhJcHD16lJkFioHFLkZGRvx/3JJbdfv378doyNQV9BYsns2bN/t6XfIDGEFB4mLXrl14haKSz6Q7a1UNAVsHowNeca2MxkLgEl2LV1wrCVZDQwN6GlYI2JKpLGjibdu2pYsH7Ff2pqwaS6/XoyVBM9gFTy+99BKGAplmY/8Pl7O7ukBGoYYAAAAASUVORK5CYII=",
   "description": "Displays changes to time-series data over time—for example, temperature or humidity readings.",
   "descriptor": {
     "type": "timeseries",
@@ -22,6 +22,5 @@
     "basicModeDirective": "tb-flot-basic-config",
     "defaultConfig": "{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"First\",\"color\":\"#2196f3\",\"settings\":{\"showLines\":true,\"fillLines\":true,\"showPoints\":false},\"_hash\":0.8587686344902596,\"funcBody\":\"var value = prevValue + Math.random() * 100 - 50;\\nvar multiplier = Math.pow(10, 2 || 0);\\nvar value = Math.round(value * multiplier) / multiplier;\\nif (value < -1000) {\\n\\tvalue = -1000;\\n} else if (value > 1000) {\\n\\tvalue = 1000;\\n}\\nreturn value;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Second\",\"color\":\"#ffc107\",\"settings\":{\"showLines\":true,\"fillLines\":false,\"showPoints\":false},\"_hash\":0.12775350966079668,\"funcBody\":\"var value = prevValue + Math.random() * 100 - 50;\\nvar multiplier = Math.pow(10, 2 || 0);\\nvar value = Math.round(value * multiplier) / multiplier;\\nif (value < -1000) {\\n\\tvalue = -1000;\\n} else if (value > 1000) {\\n\\tvalue = 1000;\\n}\\nreturn value;\"}]}],\"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,\"grid\":{\"verticalLines\":true,\"horizontalLines\":true,\"outlineWidth\":1,\"color\":\"#545454\",\"backgroundColor\":null,\"tickColor\":\"#DDDDDD\"},\"xaxis\":{\"title\":null,\"showLabels\":true,\"color\":\"#545454\"},\"yaxis\":{\"min\":null,\"max\":null,\"title\":null,\"showLabels\":true,\"color\":\"#545454\",\"tickSize\":null,\"tickDecimals\":0,\"ticksFormatter\":\"\"},\"shadowSize\":4,\"smoothLines\":false,\"comparisonEnabled\":false,\"xaxisSecond\":{\"axisPosition\":\"top\",\"title\":null,\"showLabels\":true},\"showLegend\":true,\"legendConfig\":{\"direction\":\"column\",\"position\":\"bottom\",\"sortDataKeys\":false,\"showMin\":false,\"showMax\":false,\"showAvg\":true,\"showTotal\":false,\"showLatest\":false},\"customLegendEnabled\":false},\"title\":\"Timeseries Line Chart\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400},\"mobileHeight\":null,\"configMode\":\"basic\",\"actions\":{},\"showTitleIcon\":false,\"titleIcon\":\"thermostat\",\"iconColor\":\"#1F6BDD\"}"
   },
-  "externalId": null,
   "tags": null
 }
\ 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
new file mode 100644
index 0000000000..3e0fdc3b4b
--- /dev/null
+++ b/application/src/main/data/upgrade/3.6.3/schema_update.sql
@@ -0,0 +1,27 @@
+--
+-- 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.
+--
+
+-- NOTIFICATIONS UPDATE START
+
+ALTER TABLE notification ADD COLUMN IF NOT EXISTS delivery_method VARCHAR(50) NOT NULL default 'WEB';
+
+DROP INDEX IF EXISTS idx_notification_recipient_id_created_time;
+DROP INDEX IF EXISTS idx_notification_recipient_id_unread;
+
+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';
+
+-- 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/apache/kafka/common/network/NetworkReceive.java b/application/src/main/java/org/apache/kafka/common/network/NetworkReceive.java
index 38764d08de..80192520ca 100644
--- a/application/src/main/java/org/apache/kafka/common/network/NetworkReceive.java
+++ b/application/src/main/java/org/apache/kafka/common/network/NetworkReceive.java
@@ -38,10 +38,10 @@ import java.util.stream.Collectors;
  */
 public class NetworkReceive implements Receive {
 
-    public final static String UNKNOWN_SOURCE = "";
-    public final static int UNLIMITED = -1;
-    public final static int TB_MAX_REQUESTED_BUFFER_SIZE = 100 * 1024 * 1024;
-    public final static int TB_LOG_REQUESTED_BUFFER_SIZE = 10 * 1024 * 1024;
+    public static final String UNKNOWN_SOURCE = "";
+    public static final int UNLIMITED = -1;
+    public static final int TB_MAX_REQUESTED_BUFFER_SIZE = 100 * 1024 * 1024;
+    public static final int TB_LOG_REQUESTED_BUFFER_SIZE = 10 * 1024 * 1024;
     private static final Logger log = LoggerFactory.getLogger(NetworkReceive.class);
     private static final ByteBuffer EMPTY_BUFFER = ByteBuffer.allocate(0);
 
@@ -54,27 +54,16 @@ public class NetworkReceive implements Receive {
 
 
     public NetworkReceive(String source, ByteBuffer buffer) {
-        this.source = source;
+        this(TB_MAX_REQUESTED_BUFFER_SIZE, source);
         this.buffer = buffer;
-        this.size = null;
-        this.maxSize = TB_MAX_REQUESTED_BUFFER_SIZE;
-        this.memoryPool = MemoryPool.NONE;
     }
 
     public NetworkReceive(String source) {
-        this.source = source;
-        this.size = ByteBuffer.allocate(4);
-        this.buffer = null;
-        this.maxSize = TB_MAX_REQUESTED_BUFFER_SIZE;
-        this.memoryPool = MemoryPool.NONE;
+        this(TB_MAX_REQUESTED_BUFFER_SIZE, source);
     }
 
     public NetworkReceive(int maxSize, String source) {
-        this.source = source;
-        this.size = ByteBuffer.allocate(4);
-        this.buffer = null;
-        this.maxSize = getMaxSize(maxSize);
-        this.memoryPool = MemoryPool.NONE;
+        this(maxSize, source, MemoryPool.NONE);
     }
 
     public NetworkReceive(int maxSize, String source, MemoryPool memoryPool) {
diff --git a/application/src/main/java/org/thingsboard/server/ThingsboardInstallApplication.java b/application/src/main/java/org/thingsboard/server/ThingsboardInstallApplication.java
index bead4d4049..226d4233f9 100644
--- a/application/src/main/java/org/thingsboard/server/ThingsboardInstallApplication.java
+++ b/application/src/main/java/org/thingsboard/server/ThingsboardInstallApplication.java
@@ -33,8 +33,7 @@ import java.util.Arrays;
         "org.thingsboard.server.dao",
         "org.thingsboard.server.common.stats",
         "org.thingsboard.server.common.transport.config.ssl",
-        "org.thingsboard.server.cache",
-        "org.thingsboard.server.springfox"
+        "org.thingsboard.server.cache"
 })
 public class ThingsboardInstallApplication {
 
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 ca9576b335..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;
@@ -93,7 +96,6 @@ import org.thingsboard.server.dao.widget.WidgetsBundleService;
 import org.thingsboard.server.queue.discovery.DiscoveryService;
 import org.thingsboard.server.queue.discovery.PartitionService;
 import org.thingsboard.server.queue.discovery.TbServiceInfoProvider;
-import org.thingsboard.server.queue.util.DataDecodingEncodingService;
 import org.thingsboard.server.service.apiusage.TbApiUsageStateService;
 import org.thingsboard.server.service.component.ComponentDiscoveryService;
 import org.thingsboard.server.service.edge.rpc.EdgeRpcService;
@@ -116,8 +118,6 @@ import org.thingsboard.server.service.telemetry.AlarmSubscriptionService;
 import org.thingsboard.server.service.telemetry.TelemetrySubscriptionService;
 import org.thingsboard.server.service.transport.TbCoreToTransportService;
 
-import javax.annotation.Nullable;
-import javax.annotation.PostConstruct;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.concurrent.ConcurrentHashMap;
@@ -184,10 +184,6 @@ public class ActorSystemContext {
     @Getter
     private DiscoveryService discoveryService;
 
-    @Autowired
-    @Getter
-    private DataDecodingEncodingService encodingService;
-
     @Autowired
     @Getter
     private DeviceService deviceService;
@@ -451,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 f1c0260124..253169a51d 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,13 +21,15 @@ 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.apache.commons.collections4.CollectionUtils;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.common.util.LinkedHashMapRemoveEldest;
 import org.thingsboard.server.actors.ActorSystemContext;
 import org.thingsboard.server.actors.TbActorCtx;
 import org.thingsboard.server.actors.shared.AbstractContextAwareMsgProcessor;
+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.EdgeUtils;
@@ -41,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;
@@ -66,13 +67,12 @@ import org.thingsboard.server.common.msg.rule.engine.DeviceCredentialsUpdateNoti
 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.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;
@@ -94,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 javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -252,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) {
@@ -463,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());
@@ -488,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() {
@@ -504,13 +514,13 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso
     private void handleGetAttributesRequest(SessionInfoProto sessionInfo, GetAttributeRequestMsg request) {
         int requestId = request.getRequestId();
         if (request.getOnlyShared()) {
-            Futures.addCallback(findAllAttributesByScope(DataConstants.SHARED_SCOPE), new FutureCallback<>() {
+            Futures.addCallback(findAllAttributesByScope(AttributeScope.SHARED_SCOPE), new FutureCallback<>() {
                 @Override
                 public void onSuccess(@Nullable List<AttributeKvEntry> result) {
                     GetAttributeResponseMsg responseMsg = GetAttributeResponseMsg.newBuilder()
                             .setRequestId(requestId)
                             .setSharedStateMsg(true)
-                            .addAllSharedAttributeList(toTsKvProtos(result))
+                            .addAllSharedAttributeList(KvProtoUtil.attrToTsKvProtos(result))
                             .setIsMultipleAttributesRequest(request.getSharedAttributeNamesCount() > 1)
                             .build();
                     sendToTransport(responseMsg, sessionInfo);
@@ -531,8 +541,8 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso
                 public void onSuccess(@Nullable List<List<AttributeKvEntry>> result) {
                     GetAttributeResponseMsg responseMsg = GetAttributeResponseMsg.newBuilder()
                             .setRequestId(requestId)
-                            .addAllClientAttributeList(toTsKvProtos(result.get(0)))
-                            .addAllSharedAttributeList(toTsKvProtos(result.get(1)))
+                            .addAllClientAttributeList(KvProtoUtil.attrToTsKvProtos(result.get(0)))
+                            .addAllSharedAttributeList(KvProtoUtil.attrToTsKvProtos(result.get(1)))
                             .setIsMultipleAttributesRequest(
                                     request.getSharedAttributeNamesCount() + request.getClientAttributeNamesCount() > 1)
                             .build();
@@ -554,26 +564,26 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso
         ListenableFuture<List<AttributeKvEntry>> clientAttributesFuture;
         ListenableFuture<List<AttributeKvEntry>> sharedAttributesFuture;
         if (CollectionUtils.isEmpty(request.getClientAttributeNamesList()) && CollectionUtils.isEmpty(request.getSharedAttributeNamesList())) {
-            clientAttributesFuture = findAllAttributesByScope(DataConstants.CLIENT_SCOPE);
-            sharedAttributesFuture = findAllAttributesByScope(DataConstants.SHARED_SCOPE);
+            clientAttributesFuture = findAllAttributesByScope(AttributeScope.CLIENT_SCOPE);
+            sharedAttributesFuture = findAllAttributesByScope(AttributeScope.SHARED_SCOPE);
         } else if (!CollectionUtils.isEmpty(request.getClientAttributeNamesList()) && !CollectionUtils.isEmpty(request.getSharedAttributeNamesList())) {
-            clientAttributesFuture = findAttributesByScope(toSet(request.getClientAttributeNamesList()), DataConstants.CLIENT_SCOPE);
-            sharedAttributesFuture = findAttributesByScope(toSet(request.getSharedAttributeNamesList()), DataConstants.SHARED_SCOPE);
+            clientAttributesFuture = findAttributesByScope(toSet(request.getClientAttributeNamesList()), AttributeScope.CLIENT_SCOPE);
+            sharedAttributesFuture = findAttributesByScope(toSet(request.getSharedAttributeNamesList()), AttributeScope.SHARED_SCOPE);
         } else if (CollectionUtils.isEmpty(request.getClientAttributeNamesList()) && !CollectionUtils.isEmpty(request.getSharedAttributeNamesList())) {
             clientAttributesFuture = Futures.immediateFuture(Collections.emptyList());
-            sharedAttributesFuture = findAttributesByScope(toSet(request.getSharedAttributeNamesList()), DataConstants.SHARED_SCOPE);
+            sharedAttributesFuture = findAttributesByScope(toSet(request.getSharedAttributeNamesList()), AttributeScope.SHARED_SCOPE);
         } else {
             sharedAttributesFuture = Futures.immediateFuture(Collections.emptyList());
-            clientAttributesFuture = findAttributesByScope(toSet(request.getClientAttributeNamesList()), DataConstants.CLIENT_SCOPE);
+            clientAttributesFuture = findAttributesByScope(toSet(request.getClientAttributeNamesList()), AttributeScope.CLIENT_SCOPE);
         }
         return Futures.allAsList(Arrays.asList(clientAttributesFuture, sharedAttributesFuture));
     }
 
-    private ListenableFuture<List<AttributeKvEntry>> findAllAttributesByScope(String scope) {
+    private ListenableFuture<List<AttributeKvEntry>> findAllAttributesByScope(AttributeScope scope) {
         return systemContext.getAttributesService().findAll(tenantId, deviceId, scope);
     }
 
-    private ListenableFuture<List<AttributeKvEntry>> findAttributesByScope(Set<String> attributesSet, String scope) {
+    private ListenableFuture<List<AttributeKvEntry>> findAttributesByScope(Set<String> attributesSet, AttributeScope scope) {
         return systemContext.getAttributesService().find(tenantId, deviceId, scope, attributesSet);
     }
 
@@ -602,7 +612,7 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso
                 if (DataConstants.SHARED_SCOPE.equals(msg.getScope())) {
                     List<AttributeKvEntry> attributes = new ArrayList<>(msg.getValues());
                     if (attributes.size() > 0) {
-                        List<TsKvProto> sharedUpdated = msg.getValues().stream().map(this::toTsKvProto)
+                        List<TsKvProto> sharedUpdated = msg.getValues().stream().map(t -> KvProtoUtil.toTsKvProto(t.getLastUpdateTs(), t))
                                 .collect(Collectors.toList());
                         if (!sharedUpdated.isEmpty()) {
                             notification.addAllSharedUpdated(sharedUpdated);
@@ -922,56 +932,7 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso
 
         EdgeEvent edgeEvent = EdgeUtils.constructEdgeEvent(tenantId, edgeId, EdgeEventType.DEVICE, EdgeEventActionType.RPC_CALL, deviceId, body);
 
-        return Futures.transform(systemContext.getEdgeEventService().saveAsync(edgeEvent), unused -> {
-            systemContext.getClusterService().onEdgeEventUpdate(tenantId, edgeId);
-            return null;
-        }, systemContext.getDbCallbackExecutor());
-    }
-
-    private List<TsKvProto> toTsKvProtos(@Nullable List<AttributeKvEntry> result) {
-        List<TsKvProto> clientAttributes;
-        if (result == null || result.isEmpty()) {
-            clientAttributes = Collections.emptyList();
-        } else {
-            clientAttributes = new ArrayList<>(result.size());
-            for (AttributeKvEntry attrEntry : result) {
-                clientAttributes.add(toTsKvProto(attrEntry));
-            }
-        }
-        return clientAttributes;
-    }
-
-    private TsKvProto toTsKvProto(AttributeKvEntry attrEntry) {
-        return TsKvProto.newBuilder().setTs(attrEntry.getLastUpdateTs())
-                .setKv(toKeyValueProto(attrEntry)).build();
-    }
-
-    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();
+        return systemContext.getEdgeEventService().saveAsync(edgeEvent);
     }
 
     void restoreSessions() {
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 a5828f8d80..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
@@ -54,7 +54,6 @@ import org.thingsboard.server.common.data.asset.AssetProfile;
 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.EdgeId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.RuleChainId;
 import org.thingsboard.server.common.data.id.RuleNodeId;
@@ -97,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;
@@ -476,11 +476,6 @@ class DefaultTbContext implements TbContext {
         return entityActionMsg(originator, tbMsgMetaData, msgData, actionMsgType, profile);
     }
 
-    @Override
-    public void onEdgeEventUpdate(TenantId tenantId, EdgeId edgeId) {
-        mainCtx.getClusterService().onEdgeEventUpdate(tenantId, edgeId);
-    }
-
     public <E, I extends EntityId> TbMsg entityActionMsg(E entity, I id, RuleNodeId ruleNodeId, TbMsgType actionMsgType) {
         return entityActionMsg(entity, id, ruleNodeId, actionMsgType, null);
     }
@@ -774,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/actors/service/DefaultActorService.java b/application/src/main/java/org/thingsboard/server/actors/service/DefaultActorService.java
index dab5d05fc3..e6dda31675 100644
--- a/application/src/main/java/org/thingsboard/server/actors/service/DefaultActorService.java
+++ b/application/src/main/java/org/thingsboard/server/actors/service/DefaultActorService.java
@@ -36,8 +36,8 @@ import org.thingsboard.server.queue.discovery.TbApplicationEventListener;
 import org.thingsboard.server.queue.discovery.event.PartitionChangeEvent;
 import org.thingsboard.server.queue.util.AfterStartUp;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
diff --git a/application/src/main/java/org/thingsboard/server/config/CustomOAuth2AuthorizationRequestResolver.java b/application/src/main/java/org/thingsboard/server/config/CustomOAuth2AuthorizationRequestResolver.java
index 368f55a154..1784c6fa1b 100644
--- a/application/src/main/java/org/thingsboard/server/config/CustomOAuth2AuthorizationRequestResolver.java
+++ b/application/src/main/java/org/thingsboard/server/config/CustomOAuth2AuthorizationRequestResolver.java
@@ -15,6 +15,7 @@
  */
 package org.thingsboard.server.config;
 
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.keygen.Base64StringKeyGenerator;
@@ -43,7 +44,6 @@ import org.thingsboard.server.service.security.auth.oauth2.TbOAuth2ParameterName
 import org.thingsboard.server.service.security.model.token.OAuth2AppTokenFactory;
 import org.thingsboard.server.utils.MiscUtils;
 
-import javax.servlet.http.HttpServletRequest;
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
@@ -115,7 +115,6 @@ public class CustomOAuth2AuthorizationRequestResolver implements OAuth2Authoriza
         return request.getParameter("appToken");
     }
 
-    @SuppressWarnings("deprecation")
     private OAuth2AuthorizationRequest resolve(HttpServletRequest request, String registrationId, String redirectUriAction, String appPackage, String appToken) {
         if (registrationId == null) {
             return null;
@@ -156,8 +155,6 @@ public class CustomOAuth2AuthorizationRequestResolver implements OAuth2Authoriza
                 addPkceParameters(attributes, additionalParameters);
             }
             builder.additionalParameters(additionalParameters);
-        } else if (AuthorizationGrantType.IMPLICIT.equals(clientRegistration.getAuthorizationGrantType())) {
-            builder = OAuth2AuthorizationRequest.implicit();
         } else {
             throw new IllegalArgumentException("Invalid Authorization Grant Type ("  +
                     clientRegistration.getAuthorizationGrantType().getValue() +
diff --git a/application/src/main/java/org/thingsboard/server/config/RateLimitProcessingFilter.java b/application/src/main/java/org/thingsboard/server/config/RateLimitProcessingFilter.java
index 0b859e7b06..73209c1ed6 100644
--- a/application/src/main/java/org/thingsboard/server/config/RateLimitProcessingFilter.java
+++ b/application/src/main/java/org/thingsboard/server/config/RateLimitProcessingFilter.java
@@ -30,10 +30,10 @@ import org.thingsboard.server.cache.limits.RateLimitService;
 import org.thingsboard.server.exception.ThingsboardErrorResponseHandler;
 import org.thingsboard.server.service.security.model.SecurityUser;
 
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 @Slf4j
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 a38512496d..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,17 +15,48 @@
  */
 package org.thingsboard.server.config;
 
-import com.fasterxml.classmate.TypeResolver;
+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;
+import io.swagger.v3.oas.models.info.License;
+import io.swagger.v3.oas.models.media.Content;
+import io.swagger.v3.oas.models.media.MediaType;
+import io.swagger.v3.oas.models.media.Schema;
+import io.swagger.v3.oas.models.parameters.RequestBody;
+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.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.annotation.Order;
-import org.springframework.http.HttpMethod;
+import org.springframework.core.MethodParameter;
 import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.security.core.annotation.AuthenticationPrincipal;
+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;
@@ -34,52 +65,17 @@ 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 springfox.documentation.builders.ApiInfoBuilder;
-import springfox.documentation.builders.ExampleBuilder;
-import springfox.documentation.builders.OperationBuilder;
-import springfox.documentation.builders.RepresentationBuilder;
-import springfox.documentation.builders.RequestParameterBuilder;
-import springfox.documentation.builders.ResponseBuilder;
-import springfox.documentation.schema.Example;
-import springfox.documentation.service.ApiDescription;
-import springfox.documentation.service.ApiInfo;
-import springfox.documentation.service.ApiListing;
-import springfox.documentation.service.AuthorizationScope;
-import springfox.documentation.service.Contact;
-import springfox.documentation.service.HttpLoginPasswordScheme;
-import springfox.documentation.service.ParameterType;
-import springfox.documentation.service.Response;
-import springfox.documentation.service.SecurityReference;
-import springfox.documentation.service.SecurityScheme;
-import springfox.documentation.service.Tag;
-import springfox.documentation.spi.DocumentationType;
-import springfox.documentation.spi.service.ApiListingBuilderPlugin;
-import springfox.documentation.spi.service.ApiListingScannerPlugin;
-import springfox.documentation.spi.service.contexts.ApiListingContext;
-import springfox.documentation.spi.service.contexts.DocumentationContext;
-import springfox.documentation.spi.service.contexts.OperationContext;
-import springfox.documentation.spi.service.contexts.SecurityContext;
-import springfox.documentation.spring.web.plugins.Docket;
-import springfox.documentation.spring.web.readers.operation.CachingOperationNameGenerator;
-import springfox.documentation.swagger.common.SwaggerPluginSupport;
-import springfox.documentation.swagger.web.DocExpansion;
-import springfox.documentation.swagger.web.ModelRendering;
-import springfox.documentation.swagger.web.OperationsSorter;
-import springfox.documentation.swagger.web.UiConfiguration;
-import springfox.documentation.swagger.web.UiConfigurationBuilder;
 
 import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Set;
-import java.util.function.Consumer;
-import java.util.function.Predicate;
+import java.util.Map;
+import java.util.Objects;
+import java.util.TreeMap;
 
-import static com.google.common.collect.Lists.newArrayList;
-import static java.util.function.Predicate.not;
-import static springfox.documentation.builders.PathSelectors.any;
-import static springfox.documentation.builders.PathSelectors.regex;
+import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 
 @Slf4j
 @Configuration
@@ -87,10 +83,14 @@ import static springfox.documentation.builders.PathSelectors.regex;
 @Profile("!test")
 public class SwaggerConfiguration {
 
-    @Value("${swagger.enabled:true}")
-    private boolean enabled;
-    @Value("${swagger.api_path_regex}")
-    private String apiPathRegex;
+    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}")
@@ -114,289 +114,362 @@ public class SwaggerConfiguration {
     @Value("${app.version:unknown}")
     private String appVersion;
 
+
     @Bean
-    public Docket thingsboardApi() {
-        TypeResolver typeResolver = new TypeResolver();
-        return new Docket(DocumentationType.OAS_30)
-                .enable(enabled)
-                .groupName("thingsboard")
-                .apiInfo(apiInfo())
-                .additionalModels(
-                        typeResolver.resolve(ThingsboardErrorResponse.class),
-                        typeResolver.resolve(ThingsboardCredentialsExpiredResponse.class),
-                        typeResolver.resolve(LoginRequest.class),
-                        typeResolver.resolve(LoginResponse.class)
-                )
-                .select()
-                .paths(apiPaths())
-                .paths(any())
-                .build()
-                .globalResponses(HttpMethod.GET,
-                        defaultErrorResponses(false)
-                )
-                .globalResponses(HttpMethod.POST,
-                        defaultErrorResponses(true)
-                )
-                .globalResponses(HttpMethod.DELETE,
-                        defaultErrorResponses(false)
-                )
-                .securitySchemes(newArrayList(httpLogin()))
-                .securityContexts(newArrayList(securityContext()))
-                .ignoredParameterTypes(AuthenticationPrincipal.class)
-                .enableUrlTemplating(true);
+    public OpenAPI thingsboardApi() {
+        Contact contact = new Contact()
+                .name(contactName)
+                .url(contactUrl)
+                .email(contactEmail);
+
+        License license = new License()
+                .name(licenseTitle)
+                .url(licenseUrl);
+
+        String apiVersion = version;
+        if (StringUtils.isEmpty(apiVersion)) {
+            apiVersion = appVersion;
+        }
+
+        Info info = new Info()
+                .title(title)
+                .description(description)
+                .contact(contact)
+                .license(license)
+                .version(apiVersion);
+
+        SecurityScheme securityScheme = new SecurityScheme()
+                .type(SecurityScheme.Type.HTTP)
+                .description("Enter Username / Password")
+                .scheme("loginPassword")
+                .bearerFormat("/api/auth/login|X-Authorization");
+
+        var openApi = new OpenAPI()
+                .components(new Components().addSecuritySchemes("HTTP login form", securityScheme))
+                .info(info);
+        addDefaultSchemas(openApi);
+        addLoginOperation(openApi);
+        return openApi;
     }
 
     @Bean
-    @Order(SwaggerPluginSupport.SWAGGER_PLUGIN_ORDER)
-    ApiListingScannerPlugin loginEndpointListingScanner(final CachingOperationNameGenerator operationNames) {
-        return new ApiListingScannerPlugin() {
-            @Override
-            public List<ApiDescription> apply(DocumentationContext context) {
-                return List.of(loginEndpointApiDescription(operationNames));
-            }
-
-            @Override
-            public boolean supports(DocumentationType delimiter) {
-                return DocumentationType.SWAGGER_2.equals(delimiter) || DocumentationType.OAS_30.equals(delimiter);
-            }
-        };
+    @Primary
+    public SpringDocConfigProperties springDocConfig(SpringDocConfigProperties springDocProperties) {
+        springDocProperties.getApiDocs().setVersion(SpringDocConfigProperties.ApiDocs.OpenApiVersion.OPENAPI_3_1);
+        springDocProperties.setRemoveBrokenReferenceDefinitions(false);
+        return springDocProperties;
     }
 
     @Bean
-    @Order(SwaggerPluginSupport.SWAGGER_PLUGIN_ORDER)
-    ApiListingBuilderPlugin loginEndpointListingBuilder() {
-        return new ApiListingBuilderPlugin() {
-            @Override
-            public void apply(ApiListingContext apiListingContext) {
-                if (apiListingContext.getResourceGroup().getGroupName().equals("default")) {
-                    ApiListing apiListing = apiListingContext.apiListingBuilder().build();
-                    if (apiListing.getResourcePath().equals("/api/auth/login")) {
-                        apiListingContext.apiListingBuilder().tags(Set.of(new Tag("login-endpoint", "Login Endpoint")));
-                        apiListingContext.apiListingBuilder().description("Login Endpoint");
-                    }
-                }
-            }
+    @Primary
+    public SwaggerUiConfigProperties swaggerUiConfig(SwaggerUiConfigProperties uiProperties) {
+        uiProperties.setDeepLinking(true);
+        uiProperties.setDisplayOperationId(false);
+        uiProperties.setDefaultModelsExpandDepth(1);
+        uiProperties.setDefaultModelExpandDepth(1);
+        uiProperties.setDefaultModelRendering("example");
+        uiProperties.setDisplayRequestDuration(false);
+        uiProperties.setDocExpansion("list");
+        uiProperties.setFilter("false");
+        uiProperties.setMaxDisplayedTags(null);
+        uiProperties.setOperationsSorter("alpha");
+        uiProperties.setTagsSorter("alpha");
+        uiProperties.setShowExtensions(false);
+        uiProperties.setShowCommonExtensions(false);
+        uiProperties.setSupportedSubmitMethods(List.of("get", "put", "post", "delete", "options", "head", "patch", "trace"));
+        uiProperties.setValidatorUrl(null);
+        uiProperties.setPersistAuthorization(true);
+
+        var syntaxHighLight = new SwaggerUiConfigProperties.SyntaxHighlight();
+        syntaxHighLight.setActivated(true);
+        syntaxHighLight.setTheme("agate");
+
+        uiProperties.setSyntaxHighlight(syntaxHighLight);
+        return uiProperties;
+    }
 
-            @Override
-            public boolean supports(DocumentationType delimiter) {
-                return DocumentationType.SWAGGER_2.equals(delimiter) || DocumentationType.OAS_30.equals(delimiter);
-            }
-        };
+    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
-    UiConfiguration uiConfig() {
-        return UiConfigurationBuilder.builder()
-                .deepLinking(true)
-                .displayOperationId(false)
-                .defaultModelsExpandDepth(1)
-                .defaultModelExpandDepth(1)
-                .defaultModelRendering(ModelRendering.EXAMPLE)
-                .displayRequestDuration(false)
-                .docExpansion(DocExpansion.LIST)
-                .filter(false)
-                .maxDisplayedTags(null)
-                .operationsSorter(OperationsSorter.ALPHA)
-                .showExtensions(false)
-                .showCommonExtensions(false)
-                .supportedSubmitMethods(UiConfiguration.Constants.DEFAULT_SUBMIT_METHODS)
-                .validatorUrl(null)
-                .persistAuthorization(true)
-                .syntaxHighlightActivate(true)
-                .syntaxHighlightTheme("agate")
+    public GroupedOpenApi groupedApi(SpringDocParameterNameDiscoverer localSpringDocParameterNameDiscoverer) {
+        return GroupedOpenApi.builder()
+                .group("thingsboard")
+                .pathsToMatch(apiPath)
+                .addRouterOperationCustomizer(routerOperationCustomizer(localSpringDocParameterNameDiscoverer))
+                .addOperationCustomizer(operationCustomizer())
+                .addOpenApiCustomizer(customOpenApiCustomizer())
                 .build();
     }
 
-    private SecurityScheme httpLogin() {
-        return HttpLoginPasswordScheme
-                .X_AUTHORIZATION_BUILDER
-                .loginEndpoint("/api/auth/login")
-                .name("HTTP login form")
-                .description("Enter Username / Password")
-                .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;
+            }
+        };
     }
 
-    private SecurityContext securityContext() {
-        return SecurityContext.builder()
-                .securityReferences(defaultAuth())
-                .operationSelector(securityPathOperationSelector())
-                .build();
+    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 Predicate<String> apiPaths() {
-        return regex(apiPathRegex);
+    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 Predicate<OperationContext> securityPathOperationSelector() {
-        return new SecurityPathOperationSelector(securityPathRegex, nonSecurityPathRegex);
+    private OperationCustomizer operationCustomizer() {
+        return (operation, handlerMethod) -> {
+            if (StringUtils.isBlank(operation.getSummary())) {
+                operation.setSummary(operation.getOperationId());
+            }
+            return operation;
+        };
     }
 
-    List<SecurityReference> defaultAuth() {
-        AuthorizationScope[] authorizationScopes = new AuthorizationScope[3];
-        authorizationScopes[0] = new AuthorizationScope(Authority.SYS_ADMIN.name(), "System administrator");
-        authorizationScopes[1] = new AuthorizationScope(Authority.TENANT_ADMIN.name(), "Tenant administrator");
-        authorizationScopes[2] = new AuthorizationScope(Authority.CUSTOMER_USER.name(), "Customer");
-        return newArrayList(
-                new SecurityReference("HTTP login form", authorizationScopes));
+    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 ApiInfo apiInfo() {
-        String apiVersion = version;
-        if (StringUtils.isEmpty(apiVersion)) {
-            apiVersion = appVersion;
+
+    private Tag tagsCustomization(Map.Entry<String, PathItem> entry) {
+        var tagItem = tagItemFromPathItem(entry.getValue());
+        if (tagItem != null) {
+            return tagFromTagItem(tagItem);
         }
-        return new ApiInfoBuilder()
-                .title(title)
-                .description(description)
-                .contact(new Contact(contactName, contactUrl, contactEmail))
-                .license(licenseTitle)
-                .licenseUrl(licenseUrl)
-                .version(apiVersion)
-                .build();
+        return null;
     }
 
-    private ApiDescription loginEndpointApiDescription(final CachingOperationNameGenerator operationNames) {
-        return new ApiDescription(null, "/api/auth/login", "Login method to get user JWT token data", "Login endpoint", Collections.singletonList(
-                new OperationBuilder(operationNames)
-                        .summary("Login method to get user JWT token data")
-                        .tags(Set.of("login-endpoint"))
-                        .authorizations(new ArrayList<>())
-                        .position(0)
-                        .codegenMethodNameStem("loginPost")
-                        .method(HttpMethod.POST)
-                        .notes("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`.")
-                        .requestParameters(
-                                List.of(
-                                        new RequestParameterBuilder()
-                                                .in(ParameterType.BODY)
-                                                .required(true)
-                                                .description("Login request")
-                                                .content(c ->
-                                                         c.requestBody(true)
-                                                          .representation(MediaType.APPLICATION_JSON)
-                                                          .apply(classRepresentation(LoginRequest.class, false))
-                                                )
-                                                .build()
-                                )
-                        )
-                        .responses(loginResponses())
-                        .build()
-        ), false);
+    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 Collection<Response> loginResponses() {
-        List<Response> responses = new ArrayList<>();
-        responses.add(
-                new ResponseBuilder()
-                        .code("200")
-                        .description("OK")
-                        .representation(MediaType.APPLICATION_JSON)
-                        .apply(classRepresentation(LoginResponse.class, true)).
-                        build()
-        );
-        responses.addAll(loginErrorResponses());
-        return responses;
-    }
+    private Tag tagFromTagItem(String tagItem) {
+        String[] words = tagItem.split("-");
+        StringBuilder sb = new StringBuilder();
 
-    /** Helper methods **/
-
-    private List<Response> defaultErrorResponses(boolean isPost) {
-        return List.of(
-                errorResponse("400", "Bad Request",
-                        ThingsboardErrorResponse.of(isPost ? "Invalid request body" : "Invalid UUID string: 123", ThingsboardErrorCode.BAD_REQUEST_PARAMS, HttpStatus.BAD_REQUEST)),
-                errorResponse("401", "Unauthorized",
-                        ThingsboardErrorResponse.of("Authentication failed", ThingsboardErrorCode.AUTHENTICATION, HttpStatus.UNAUTHORIZED)),
-                errorResponse("403", "Forbidden",
-                        ThingsboardErrorResponse.of("You don't have permission to perform this operation!",
-                        ThingsboardErrorCode.PERMISSION_DENIED, HttpStatus.FORBIDDEN)),
-                errorResponse("404", "Not Found",
-                        ThingsboardErrorResponse.of("Requested item wasn't found!", ThingsboardErrorCode.ITEM_NOT_FOUND, HttpStatus.NOT_FOUND)),
-                errorResponse("429", "Too Many Requests",
-                        ThingsboardErrorResponse.of("Too many requests for current tenant!",
-                        ThingsboardErrorCode.TOO_MANY_REQUESTS, HttpStatus.TOO_MANY_REQUESTS))
-        );
-    }
+        for (String word : words) {
+            sb.append(word.substring(0, 1).toUpperCase());
+            sb.append(word.substring(1).toLowerCase());
+            sb.append(" ");
+        }
 
-    private List<Response> loginErrorResponses() {
-        return List.of(
-                errorResponse("401", "Unauthorized",
-                        List.of(
-                                errorExample("bad-credentials", "Bad credentials",
-                                    ThingsboardErrorResponse.of("Invalid username or password", ThingsboardErrorCode.AUTHENTICATION, HttpStatus.UNAUTHORIZED)),
-                                 errorExample("token-expired", "JWT token expired",
-                                    ThingsboardErrorResponse.of("Token has expired", ThingsboardErrorCode.JWT_TOKEN_EXPIRED, HttpStatus.UNAUTHORIZED)),
-                                errorExample("account-disabled", "Disabled account",
-                                    ThingsboardErrorResponse.of("User account is not active", ThingsboardErrorCode.AUTHENTICATION, HttpStatus.UNAUTHORIZED)),
-                                errorExample("account-locked", "Locked account",
-                                    ThingsboardErrorResponse.of("User account is locked due to security policy", ThingsboardErrorCode.AUTHENTICATION, HttpStatus.UNAUTHORIZED)),
-                                errorExample("authentication-failed", "General authentication error",
-                                    ThingsboardErrorResponse.of("Authentication failed", ThingsboardErrorCode.AUTHENTICATION, HttpStatus.UNAUTHORIZED))
-                        )
-                ),
-                errorResponse("401 ", "Unauthorized (**Expired credentials**)",
-                        List.of(
-                                errorExample("credentials-expired", "Expired credentials",
-                                        ThingsboardCredentialsExpiredResponse.of("User password expired!", StringUtils.randomAlphanumeric(30)))
-                        ), ThingsboardCredentialsExpiredResponse.class
-                )
-        );
+        return new Tag().name(tagItem).description(sb.toString().trim());
     }
 
-    private Response errorResponse(String code, String description, ThingsboardErrorResponse example) {
-        return errorResponse(code, description,  List.of(errorExample("error-code-" + code, description, example)));
+    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 Response errorResponse(String code, String description, List<Example> examples) {
-        return errorResponse(code, description, examples, ThingsboardErrorResponse.class);
+    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));
+        }
     }
 
-    private Response errorResponse(String code, String description, List<Example> examples,
-                                   Class<? extends ThingsboardErrorResponse> errorResponseClass) {
-        return new ResponseBuilder()
-                .code(code)
-                .description(description)
-                .examples(examples)
-                .representation(MediaType.APPLICATION_JSON)
-                .apply(classRepresentation(errorResponseClass, true))
-                .build();
+    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 Example errorExample(String id, String summary, ThingsboardErrorResponse example) {
-        return new ExampleBuilder()
-                .mediaType(MediaType.APPLICATION_JSON_VALUE)
-                .summary(summary)
-                .id(id)
-                .value(example).build();
-    }
+    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", errorResponse("401", "Unauthorized",
+                ThingsboardErrorResponse.of("Authentication failed", ThingsboardErrorCode.AUTHENTICATION, HttpStatus.UNAUTHORIZED)));
+
+        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", errorResponse("404", "Not Found",
+                ThingsboardErrorResponse.of("Requested item wasn't found!", ThingsboardErrorCode.ITEM_NOT_FOUND, HttpStatus.NOT_FOUND)));
 
-    private Consumer<RepresentationBuilder> classRepresentation(Class<?> clazz, boolean isResponse) {
-        return r -> r.model(
-                m ->
-                        m.referenceModel(ref ->
-                                ref.key(k ->
-                                        k.qualifiedModelName(q ->
-                                                q.namespace(clazz.getPackageName())
-                                                        .name(clazz.getSimpleName())).isResponse(isResponse)))
-        );
+        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 static class SecurityPathOperationSelector implements Predicate<OperationContext> {
+    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 final Predicate<String> securityPathSelector;
+    private static ApiResponse errorResponse(String code, String description, ThingsboardErrorResponse example) {
+        return errorResponse(description, Map.of("error-code-" + code, errorExample(description, example)));
+    }
 
-        SecurityPathOperationSelector(String securityPathRegex, String nonSecurityPathRegex) {
-            this.securityPathSelector = regex(securityPathRegex).and(
-                not(
-                    regex(nonSecurityPathRegex)
-            ));
-        }
+    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);
+    }
 
-        @Override
-        public boolean test(OperationContext operationContext) {
-            return this.securityPathSelector.test(operationContext.requestMappingPattern());
-        }
+    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/TbRuleEngineSecurityConfiguration.java b/application/src/main/java/org/thingsboard/server/config/TbRuleEngineSecurityConfiguration.java
index 6772608311..15171ba0c7 100644
--- a/application/src/main/java/org/thingsboard/server/config/TbRuleEngineSecurityConfiguration.java
+++ b/application/src/main/java/org/thingsboard/server/config/TbRuleEngineSecurityConfiguration.java
@@ -20,25 +20,29 @@ import org.springframework.boot.autoconfigure.security.SecurityProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.annotation.Order;
-import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
+import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
 import org.springframework.security.web.SecurityFilterChain;
 
 @Configuration
 @EnableWebSecurity
-@EnableGlobalMethodSecurity(prePostEnabled = true)
+@EnableMethodSecurity
 @Order(SecurityProperties.BASIC_AUTH_ORDER)
 @ConditionalOnExpression("'${service.type:null}'=='tb-rule-engine'")
 public class TbRuleEngineSecurityConfiguration {
 
     @Bean
     SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
-        http.headers().cacheControl().and().frameOptions().disable()
-                .and().cors().and().csrf().disable()
-                .authorizeRequests()
-                .antMatchers("/actuator/prometheus").permitAll()
-                .anyRequest().authenticated();
+        http.headers(headers -> headers
+                        .cacheControl(config -> {})
+                        .frameOptions(config -> {}).disable())
+                .cors(cors -> {})
+                .csrf(AbstractHttpConfigurer::disable)
+                .authorizeHttpRequests(config -> config
+                        .requestMatchers("/actuator/prometheus").permitAll()
+                        .anyRequest().authenticated());
         return http.build();
     }
 }
diff --git a/application/src/main/java/org/thingsboard/server/config/ThingsboardSecurityConfiguration.java b/application/src/main/java/org/thingsboard/server/config/ThingsboardSecurityConfiguration.java
index 816b5a1c3f..eda8d3e89d 100644
--- a/application/src/main/java/org/thingsboard/server/config/ThingsboardSecurityConfiguration.java
+++ b/application/src/main/java/org/thingsboard/server/config/ThingsboardSecurityConfiguration.java
@@ -28,9 +28,11 @@ import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.DefaultAuthenticationEventPublisher;
 import org.springframework.security.config.annotation.ObjectPostProcessor;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
-import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
+import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
+import org.springframework.security.config.annotation.web.configurers.RequestCacheConfigurer;
 import org.springframework.security.config.http.SessionCreationPolicy;
 import org.springframework.security.oauth2.client.web.OAuth2AuthorizationRequestResolver;
 import org.springframework.security.web.SecurityFilterChain;
@@ -61,7 +63,7 @@ import java.util.List;
 
 @Configuration
 @EnableWebSecurity
-@EnableGlobalMethodSecurity(prePostEnabled = true)
+@EnableMethodSecurity
 @Order(SecurityProperties.BASIC_AUTH_ORDER)
 @TbCoreComponent
 public class ThingsboardSecurityConfiguration {
@@ -81,8 +83,8 @@ public class ThingsboardSecurityConfiguration {
     public static final String MAIL_OAUTH2_PROCESSING_ENTRY_POINT = "/api/admin/mail/oauth2/code";
     public static final String DEVICE_CONNECTIVITY_CERTIFICATE_DOWNLOAD_ENTRY_POINT = "/api/device-connectivity/mqtts/certificate/download";
 
-
-    @Autowired private ThingsboardErrorResponseHandler restAccessDeniedHandler;
+    @Autowired
+    private ThingsboardErrorResponseHandler restAccessDeniedHandler;
 
     @Autowired(required = false)
     @Qualifier("oauth2AuthenticationSuccessHandler")
@@ -103,27 +105,33 @@ public class ThingsboardSecurityConfiguration {
     @Qualifier("defaultAuthenticationFailureHandler")
     private AuthenticationFailureHandler failureHandler;
 
-    @Autowired private RestAuthenticationProvider restAuthenticationProvider;
-    @Autowired private JwtAuthenticationProvider jwtAuthenticationProvider;
-    @Autowired private RefreshTokenAuthenticationProvider refreshTokenAuthenticationProvider;
+    @Autowired
+    private RestAuthenticationProvider restAuthenticationProvider;
+    @Autowired
+    private JwtAuthenticationProvider jwtAuthenticationProvider;
+    @Autowired
+    private RefreshTokenAuthenticationProvider refreshTokenAuthenticationProvider;
 
-    @Autowired(required = false) OAuth2Configuration oauth2Configuration;
+    @Autowired(required = false)
+    OAuth2Configuration oauth2Configuration;
 
     @Autowired
     @Qualifier("jwtHeaderTokenExtractor")
     private TokenExtractor jwtHeaderTokenExtractor;
 
-    @Autowired private AuthenticationManager authenticationManager;
+    @Autowired
+    private AuthenticationManager authenticationManager;
 
-    @Autowired private RateLimitProcessingFilter rateLimitProcessingFilter;
+    @Autowired
+    private RateLimitProcessingFilter rateLimitProcessingFilter;
 
     @Bean
     protected FilterRegistrationBean<ShallowEtagHeaderFilter> buildEtagFilter() throws Exception {
         ShallowEtagHeaderFilter etagFilter = new ShallowEtagHeaderFilter();
         etagFilter.setWriteWeakETag(true);
         FilterRegistrationBean<ShallowEtagHeaderFilter> filterRegistrationBean
-                = new FilterRegistrationBean<>( etagFilter);
-        filterRegistrationBean.addUrlPatterns("*.js","*.css","*.ico","/assets/*","/static/*");
+                = new FilterRegistrationBean<>(etagFilter);
+        filterRegistrationBean.addUrlPatterns("*.js", "*.css", "*.ico", "/assets/*", "/static/*");
         filterRegistrationBean.setName("etagFilter");
         return filterRegistrationBean;
     }
@@ -180,60 +188,55 @@ public class ThingsboardSecurityConfiguration {
     @Order(0)
     SecurityFilterChain resources(HttpSecurity http) throws Exception {
         http
-                .requestMatchers((matchers) -> matchers.antMatchers("/*.js","/*.css","/*.ico","/assets/**","/static/**"))
-                .headers().defaultsDisabled()
-                .addHeaderWriter(new StaticHeadersWriter(HttpHeaders.CACHE_CONTROL, "max-age=0, public"))
-                .and()
+                .securityMatchers(matchers -> matchers
+                        .requestMatchers("/*.js", "/*.css", "/*.ico", "/assets/**", "/static/**"))
+                .headers(header -> header
+                        .defaultsDisabled()
+                        .addHeaderWriter(new StaticHeadersWriter(HttpHeaders.CACHE_CONTROL, "max-age=0, public")))
                 .authorizeHttpRequests((authorize) -> authorize.anyRequest().permitAll())
-                .requestCache().disable()
-                .securityContext().disable()
-                .sessionManagement().disable();
+                .requestCache(RequestCacheConfigurer::disable)
+                .securityContext(AbstractHttpConfigurer::disable)
+                .sessionManagement(AbstractHttpConfigurer::disable);
         return http.build();
     }
 
     @Bean
     SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
-        http.headers().cacheControl().and().frameOptions().disable()
-                .and()
-                .cors()
-                .and()
-                .csrf().disable()
-                .exceptionHandling()
-                .and()
-                .sessionManagement()
-                .sessionCreationPolicy(SessionCreationPolicy.STATELESS)
-                .and()
-                .authorizeRequests()
-                .antMatchers(WEBJARS_ENTRY_POINT).permitAll() // Webjars
-                .antMatchers(DEVICE_API_ENTRY_POINT).permitAll() // Device HTTP Transport API
-                .antMatchers(FORM_BASED_LOGIN_ENTRY_POINT).permitAll() // Login end-point
-                .antMatchers(PUBLIC_LOGIN_ENTRY_POINT).permitAll() // Public login end-point
-                .antMatchers(TOKEN_REFRESH_ENTRY_POINT).permitAll() // Token refresh end-point
-                .antMatchers(MAIL_OAUTH2_PROCESSING_ENTRY_POINT).permitAll() // Mail oauth2 code processing url
-                .antMatchers(DEVICE_CONNECTIVITY_CERTIFICATE_DOWNLOAD_ENTRY_POINT).permitAll() // Mail oauth2 code processing url
-                .antMatchers(NON_TOKEN_BASED_AUTH_ENTRY_POINTS).permitAll() // static resources, user activation and password reset end-points
-                .and()
-                .authorizeRequests()
-                .antMatchers(WS_ENTRY_POINT).permitAll() // WebSocket API End-points
-                .antMatchers(TOKEN_BASED_AUTH_ENTRY_POINT).authenticated() // Protected API End-points
-                .and()
-                .exceptionHandling().accessDeniedHandler(restAccessDeniedHandler)
-                .and()
+        http.headers(headers -> headers
+                        .cacheControl(config -> {})
+                        .frameOptions(config -> {}).disable())
+                .cors(cors -> {})
+                .csrf(AbstractHttpConfigurer::disable)
+                .exceptionHandling(config -> {})
+                .sessionManagement(config -> config.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
+                .authorizeHttpRequests(config -> config
+                        .requestMatchers(WEBJARS_ENTRY_POINT).permitAll() // Webjars
+                        .requestMatchers(DEVICE_API_ENTRY_POINT).permitAll() // Device HTTP Transport API
+                        .requestMatchers(FORM_BASED_LOGIN_ENTRY_POINT).permitAll() // Login end-point
+                        .requestMatchers(PUBLIC_LOGIN_ENTRY_POINT).permitAll() // Public login end-point
+                        .requestMatchers(TOKEN_REFRESH_ENTRY_POINT).permitAll() // Token refresh end-point
+                        .requestMatchers(MAIL_OAUTH2_PROCESSING_ENTRY_POINT).permitAll() // Mail oauth2 code processing url
+                        .requestMatchers(DEVICE_CONNECTIVITY_CERTIFICATE_DOWNLOAD_ENTRY_POINT).permitAll() // Device connectivity certificate (public)
+                        .requestMatchers(NON_TOKEN_BASED_AUTH_ENTRY_POINTS).permitAll() // static resources, user activation and password reset end-points
+                        .requestMatchers(WS_ENTRY_POINT).permitAll() // Protected WebSocket API End-points
+                        .requestMatchers(TOKEN_BASED_AUTH_ENTRY_POINT).authenticated()) // Protected API End-points
+                .formLogin(form -> form
+                        .loginPage("/login").permitAll())
+                .exceptionHandling(config -> config.accessDeniedHandler(restAccessDeniedHandler))
                 .addFilterBefore(buildRestLoginProcessingFilter(), UsernamePasswordAuthenticationFilter.class)
                 .addFilterBefore(buildRestPublicLoginProcessingFilter(), UsernamePasswordAuthenticationFilter.class)
                 .addFilterBefore(buildJwtTokenAuthenticationProcessingFilter(), UsernamePasswordAuthenticationFilter.class)
                 .addFilterBefore(buildRefreshTokenProcessingFilter(), UsernamePasswordAuthenticationFilter.class)
                 .addFilterAfter(rateLimitProcessingFilter, UsernamePasswordAuthenticationFilter.class);
         if (oauth2Configuration != null) {
-            http.oauth2Login()
-                    .authorizationEndpoint()
-                    .authorizationRequestRepository(httpCookieOAuth2AuthorizationRequestRepository)
-                    .authorizationRequestResolver(oAuth2AuthorizationRequestResolver)
-                    .and()
+            http.oauth2Login(login -> login
+                    .authorizationEndpoint(config -> config
+                            .authorizationRequestRepository(httpCookieOAuth2AuthorizationRequestRepository)
+                            .authorizationRequestResolver(oAuth2AuthorizationRequestResolver))
                     .loginPage("/oauth2Login")
                     .loginProcessingUrl(oauth2Configuration.getLoginProcessingUrl())
                     .successHandler(oauth2AuthenticationSuccessHandler)
-                    .failureHandler(oauth2AuthenticationFailureHandler);
+                    .failureHandler(oauth2AuthenticationFailureHandler));
         }
         return http.build();
     }
@@ -241,7 +244,7 @@ public class ThingsboardSecurityConfiguration {
     @Bean
     @ConditionalOnMissingBean(CorsFilter.class)
     public CorsFilter corsFilter(@Autowired MvcCorsProperties mvcCorsProperties) {
-        if (mvcCorsProperties.getMappings().size() == 0) {
+        if (mvcCorsProperties.getMappings().isEmpty()) {
             return new CorsFilter(new UrlBasedCorsConfigurationSource());
         } else {
             UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
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 36645e99c4..70afc8b99c 100644
--- a/application/src/main/java/org/thingsboard/server/config/WebConfig.java
+++ b/application/src/main/java/org/thingsboard/server/config/WebConfig.java
@@ -19,8 +19,8 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.thingsboard.server.utils.MiscUtils;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 @Controller
@@ -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/config/annotations/ApiOperation.java b/application/src/main/java/org/thingsboard/server/config/annotations/ApiOperation.java
new file mode 100644
index 0000000000..c54fa44070
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/config/annotations/ApiOperation.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.config.annotations;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.parameters.RequestBody;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import org.springframework.core.annotation.AliasFor;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@Operation
+public @interface ApiOperation {
+
+    @AliasFor(annotation = Operation.class, attribute = "summary")
+    String value();
+
+    @AliasFor(annotation = Operation.class, attribute = "description")
+    String notes() default "";
+
+    boolean hidden() default false;
+
+    RequestBody requestBody() default @RequestBody;
+
+    ApiResponse[] responses() default {};
+
+}
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 afd3b33734..3df3d6887a 100644
--- a/application/src/main/java/org/thingsboard/server/controller/AbstractRpcController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/AbstractRpcController.java
@@ -17,6 +17,7 @@ package org.thingsboard.server.controller;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.google.common.util.concurrent.FutureCallback;
+import jakarta.annotation.Nullable;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -45,7 +46,6 @@ import org.thingsboard.server.service.security.AccessValidator;
 import org.thingsboard.server.service.security.model.SecurityUser;
 import org.thingsboard.server.service.security.permission.Operation;
 
-import javax.annotation.Nullable;
 import java.util.Optional;
 import java.util.UUID;
 
@@ -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 5fae72252f..818a2a15a6 100644
--- a/application/src/main/java/org/thingsboard/server/controller/AdminController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/AdminController.java
@@ -28,11 +28,14 @@ import com.google.api.client.json.gson.GsonFactory;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -52,13 +55,12 @@ import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.rule.engine.api.MailService;
 import org.thingsboard.rule.engine.api.SmsService;
 import org.thingsboard.server.common.data.AdminSettings;
-import org.thingsboard.server.common.data.StringUtils;
-import org.thingsboard.server.common.data.FeaturesInfo;
 import org.thingsboard.server.common.data.FeaturesInfo;
+import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.SystemInfo;
 import org.thingsboard.server.common.data.UpdateMessage;
-import org.thingsboard.server.common.data.exception.ThingsboardErrorCode;
 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.CustomerId;
 import org.thingsboard.server.common.data.id.EntityId;
@@ -71,11 +73,12 @@ import org.thingsboard.server.common.data.sync.vc.AutoCommitSettings;
 import org.thingsboard.server.common.data.sync.vc.RepositorySettings;
 import org.thingsboard.server.common.data.sync.vc.RepositorySettingsInfo;
 import org.thingsboard.server.common.data.sync.vc.VcUtils;
+import org.thingsboard.server.config.annotations.ApiOperation;
 import org.thingsboard.server.dao.audit.AuditLogService;
 import org.thingsboard.server.dao.settings.AdminSettingsService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
-import org.thingsboard.server.service.security.auth.oauth2.CookieUtils;
 import org.thingsboard.server.service.security.auth.jwt.settings.JwtSettingsService;
+import org.thingsboard.server.service.security.auth.oauth2.CookieUtils;
 import org.thingsboard.server.service.security.model.SecurityUser;
 import org.thingsboard.server.service.security.model.token.JwtTokenFactory;
 import org.thingsboard.server.service.security.permission.Operation;
@@ -86,14 +89,10 @@ import org.thingsboard.server.service.sync.vc.autocommit.TbAutoCommitSettingsSer
 import org.thingsboard.server.service.system.SystemInfoService;
 import org.thingsboard.server.service.update.UpdateService;
 
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
 import java.util.Optional;
 
-import static org.thingsboard.server.controller.ControllerConstants.*;
 import static org.thingsboard.server.controller.ControllerConstants.SYSTEM_AUTHORITY_PARAGRAPH;
 import static org.thingsboard.server.controller.ControllerConstants.TENANT_AUTHORITY_PARAGRAPH;
 
@@ -113,9 +112,7 @@ public class AdminController extends BaseController {
     private final SmsService smsService;
     private final AdminSettingsService adminSettingsService;
     private final SystemSecurityService systemSecurityService;
-    @Lazy
     private final JwtSettingsService jwtSettingsService;
-    @Lazy
     private final JwtTokenFactory tokenFactory;
     private final EntitiesVersionControlService versionControlService;
     private final TbAutoCommitSettingsService autoCommitSettingsService;
@@ -129,7 +126,7 @@ public class AdminController extends BaseController {
     @RequestMapping(value = "/settings/{key}", method = RequestMethod.GET)
     @ResponseBody
     public AdminSettings getAdminSettings(
-            @ApiParam(value = "A string value of the key (e.g. 'general' or 'mail').")
+            @Parameter(description = "A string value of the key (e.g. 'general' or 'mail').")
             @PathVariable("key") String key) throws ThingsboardException {
         accessControlService.checkPermission(getCurrentUser(), Resource.ADMIN_SETTINGS, Operation.READ);
         AdminSettings adminSettings = checkNotNull(adminSettingsService.findAdminSettingsByKey(TenantId.SYS_TENANT_ID, key), "No Administration settings found for key: " + key);
@@ -148,7 +145,7 @@ public class AdminController extends BaseController {
     @RequestMapping(value = "/settings", method = RequestMethod.POST)
     @ResponseBody
     public AdminSettings saveAdminSettings(
-            @ApiParam(value = "A JSON value representing the Administration Settings.")
+            @Parameter(description = "A JSON value representing the Administration Settings.")
             @RequestBody AdminSettings adminSettings) throws ThingsboardException {
         accessControlService.checkPermission(getCurrentUser(), Resource.ADMIN_SETTINGS, Operation.WRITE);
         adminSettings.setTenantId(getTenantId());
@@ -179,7 +176,7 @@ public class AdminController extends BaseController {
     @RequestMapping(value = "/securitySettings", method = RequestMethod.POST)
     @ResponseBody
     public SecuritySettings saveSecuritySettings(
-            @ApiParam(value = "A JSON value representing the Security Settings.")
+            @Parameter(description = "A JSON value representing the Security Settings.")
             @RequestBody SecuritySettings securitySettings) throws ThingsboardException {
         accessControlService.checkPermission(getCurrentUser(), Resource.ADMIN_SETTINGS, Operation.WRITE);
         securitySettings = checkNotNull(systemSecurityService.saveSecuritySettings(securitySettings));
@@ -187,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,
-            produces = 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
@@ -198,13 +194,12 @@ 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,
-            produces = 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
     public JwtPair saveJwtSettings(
-            @ApiParam(value = "A JSON value representing the JWT Settings.")
+            @Parameter(description = "A JSON value representing the JWT Settings.")
             @RequestBody JwtSettings jwtSettings) throws ThingsboardException {
         SecurityUser securityUser = getCurrentUser();
         accessControlService.checkPermission(securityUser, Resource.ADMIN_SETTINGS, Operation.WRITE);
@@ -218,12 +213,12 @@ public class AdminController extends BaseController {
     @PreAuthorize("hasAuthority('SYS_ADMIN')")
     @RequestMapping(value = "/settings/testMail", method = RequestMethod.POST)
     public void sendTestMail(
-            @ApiParam(value = "A JSON value representing the Mail Settings.")
+            @Parameter(description = "A JSON value representing the Mail Settings.")
             @RequestBody AdminSettings adminSettings) throws ThingsboardException {
         accessControlService.checkPermission(getCurrentUser(), Resource.ADMIN_SETTINGS, Operation.READ);
         adminSettings = checkNotNull(adminSettings);
         if (adminSettings.getKey().equals("mail")) {
-            if (adminSettings.getJsonValue().has("enableOauth2") && adminSettings.getJsonValue().get("enableOauth2").asBoolean()){
+            if (adminSettings.getJsonValue().has("enableOauth2") && adminSettings.getJsonValue().get("enableOauth2").asBoolean()) {
                 AdminSettings mailSettings = checkNotNull(adminSettingsService.findAdminSettingsByKey(TenantId.SYS_TENANT_ID, "mail"));
                 JsonNode refreshToken = mailSettings.getJsonValue().get("refreshToken");
                 if (refreshToken == null) {
@@ -231,8 +226,7 @@ public class AdminController extends BaseController {
                 }
                 ObjectNode settings = (ObjectNode) adminSettings.getJsonValue();
                 settings.put("refreshToken", refreshToken.asText());
-            }
-            else {
+            } else {
                 if (!adminSettings.getJsonValue().has("password")) {
                     AdminSettings mailSettings = checkNotNull(adminSettingsService.findAdminSettingsByKey(TenantId.SYS_TENANT_ID, "mail"));
                     ((ObjectNode) adminSettings.getJsonValue()).put("password", mailSettings.getJsonValue().get("password").asText());
@@ -249,7 +243,7 @@ public class AdminController extends BaseController {
     @PreAuthorize("hasAuthority('SYS_ADMIN')")
     @RequestMapping(value = "/settings/testSms", method = RequestMethod.POST)
     public void sendTestSms(
-            @ApiParam(value = "A JSON value representing the Test SMS request.")
+            @Parameter(description = "A JSON value representing the Test SMS request.")
             @RequestBody TestSmsRequest testSmsRequest) throws ThingsboardException {
         SecurityUser user = getCurrentUser();
         accessControlService.checkPermission(user, Resource.ADMIN_SETTINGS, Operation.READ);
@@ -332,7 +326,7 @@ public class AdminController extends BaseController {
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/repositorySettings/checkAccess", method = RequestMethod.POST)
     public DeferredResult<Void> checkRepositoryAccess(
-            @ApiParam(value = "A JSON value representing the Repository Settings.")
+            @Parameter(description = "A JSON value representing the Repository Settings.")
             @RequestBody RepositorySettings settings) throws Exception {
         accessControlService.checkPermission(getCurrentUser(), Resource.VERSION_CONTROL, Operation.READ);
         settings = checkNotNull(settings);
@@ -415,12 +409,12 @@ public class AdminController extends BaseController {
     @RequestMapping(value = "/mail/oauth2/loginProcessingUrl", method = RequestMethod.GET)
     @ResponseBody
     public String getMailProcessingUrl() throws ThingsboardException {
-         accessControlService.checkPermission(getCurrentUser(), Resource.ADMIN_SETTINGS, Operation.READ);
-         return "\"/api/admin/mail/oauth2/code\"";
+        accessControlService.checkPermission(getCurrentUser(), Resource.ADMIN_SETTINGS, Operation.READ);
+        return "\"/api/admin/mail/oauth2/code\"";
     }
 
     @ApiOperation(value = "Redirect user to mail provider login page. ", notes = "After user logged in and provided access" +
-            "provider sends authorization code to specified redirect uri.)" )
+            "provider sends authorization code to specified redirect uri.)")
     @PreAuthorize("hasAuthority('SYS_ADMIN')")
     @RequestMapping(value = "/mail/oauth2/authorize", method = RequestMethod.GET, produces = "application/text")
     public String getAuthorizationUrl(HttpServletRequest request, HttpServletResponse response) throws ThingsboardException {
@@ -437,7 +431,7 @@ public class AdminController extends BaseController {
         String clientId = checkNotNull(jsonValue.get("clientId"), "No clientId was configured").asText();
         String authUri = checkNotNull(jsonValue.get("authUri"), "No authorization uri was configured").asText();
         String redirectUri = checkNotNull(jsonValue.get("redirectUri"), "No Redirect uri was configured").asText();
-        List<String> scope =  JacksonUtil.convertValue(checkNotNull(jsonValue.get("scope"), "No scope was configured"), new TypeReference<>() {
+        List<String> scope = JacksonUtil.convertValue(checkNotNull(jsonValue.get("scope"), "No scope was configured"), new TypeReference<>() {
         });
 
         return "\"" + new AuthorizationCodeRequestUrl(authUri, clientId)
@@ -455,7 +449,7 @@ public class AdminController extends BaseController {
         Optional<Cookie> cookieState = CookieUtils.getCookie(request, STATE_COOKIE_NAME);
 
         String baseUrl = this.systemSecurityService.getBaseUrl(TenantId.SYS_TENANT_ID, new CustomerId(EntityId.NULL_UUID), request);
-        String prevUri = baseUrl + (prevUrlOpt.isPresent() ? prevUrlOpt.get().getValue(): "/settings/outgoing-mail");
+        String prevUri = baseUrl + (prevUrlOpt.isPresent() ? prevUrlOpt.get().getValue() : "/settings/outgoing-mail");
 
         if (cookieState.isEmpty() || !cookieState.get().getValue().equals(state)) {
             CookieUtils.deleteCookie(request, response, STATE_COOKIE_NAME);
@@ -482,8 +476,8 @@ public class AdminController extends BaseController {
             log.warn("Unable to retrieve refresh token: {}", e.getMessage());
             throw new ThingsboardException("Error while requesting access token: " + e.getMessage(), ThingsboardErrorCode.GENERAL);
         }
-        ((ObjectNode)jsonValue).put("refreshToken", tokenResponse.getRefreshToken());
-        ((ObjectNode)jsonValue).put("tokenGenerated", true);
+        ((ObjectNode) jsonValue).put("refreshToken", tokenResponse.getRefreshToken());
+        ((ObjectNode) jsonValue).put("tokenGenerated", true);
 
         adminSettingsService.saveAdminSettings(TenantId.SYS_TENANT_ID, adminSettings);
         response.sendRedirect(prevUri);
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 acc6ec2b68..15918f0a08 100644
--- a/application/src/main/java/org/thingsboard/server/controller/AlarmCommentController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/AlarmCommentController.java
@@ -15,8 +15,10 @@
  */
 package org.thingsboard.server.controller;
 
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+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 org.springframework.http.MediaType;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -35,17 +37,16 @@ import org.thingsboard.server.common.data.id.AlarmCommentId;
 import org.thingsboard.server.common.data.id.AlarmId;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
+import org.thingsboard.server.config.annotations.ApiOperation;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.entitiy.alarm.TbAlarmCommentService;
 import org.thingsboard.server.service.security.permission.Operation;
 
 import static org.thingsboard.server.controller.ControllerConstants.ALARM_COMMENT_ID_PARAM_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.ALARM_COMMENT_SORT_PROPERTY_ALLOWABLE_VALUES;
 import static org.thingsboard.server.controller.ControllerConstants.ALARM_ID_PARAM_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_DATA_PARAMETERS;
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_NUMBER_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_SIZE_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_ALLOWABLE_VALUES;
 import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.SORT_PROPERTY_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH;
@@ -68,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
-            , produces = 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(@ApiParam(value = ALARM_ID_PARAM_DESCRIPTION)
-                                         @PathVariable(ALARM_ID) String strAlarmId, @ApiParam(value = "A JSON value representing the comment.") @RequestBody AlarmComment alarmComment) throws ThingsboardException {
+    public AlarmComment saveAlarmComment(@Parameter(description = ALARM_ID_PARAM_DESCRIPTION)
+                                         @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);
@@ -83,11 +83,11 @@ 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, produces = 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
-    public void deleteAlarmComment(@ApiParam(value = ALARM_ID_PARAM_DESCRIPTION) @PathVariable(ALARM_ID) String strAlarmId, @ApiParam(value = ALARM_COMMENT_ID_PARAM_DESCRIPTION) @PathVariable(ALARM_COMMENT_ID) String strCommentId) throws ThingsboardException {
+    public void deleteAlarmComment(@Parameter(description = ALARM_ID_PARAM_DESCRIPTION) @PathVariable(ALARM_ID) String strAlarmId, @Parameter(description = ALARM_COMMENT_ID_PARAM_DESCRIPTION) @PathVariable(ALARM_COMMENT_ID) String strCommentId) throws ThingsboardException {
         checkParameter(ALARM_ID, strAlarmId);
         AlarmId alarmId = new AlarmId(toUUID(strAlarmId));
         Alarm alarm = checkAlarmId(alarmId, Operation.WRITE);
@@ -99,20 +99,20 @@ 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, produces = 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
     public PageData<AlarmCommentInfo> getAlarmComments(
-            @ApiParam(value = ALARM_ID_PARAM_DESCRIPTION, required = true)
+            @Parameter(description = ALARM_ID_PARAM_DESCRIPTION, required = true)
             @PathVariable(ALARM_ID) String strAlarmId,
-            @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
             @RequestParam int pageSize,
-            @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
             @RequestParam int page,
-            @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = ALARM_COMMENT_SORT_PROPERTY_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "id"}))
             @RequestParam(required = false) String sortProperty,
-            @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
             @RequestParam(required = false) String sortOrder
     ) throws Exception {
         checkParameter(ALARM_ID, strAlarmId);
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 facf56c476..e78313f6d8 100644
--- a/application/src/main/java/org/thingsboard/server/controller/AlarmController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/AlarmController.java
@@ -15,8 +15,10 @@
  */
 package org.thingsboard.server.controller;
 
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+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 org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -47,6 +49,7 @@ import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.common.data.page.TimePageLink;
+import org.thingsboard.server.config.annotations.ApiOperation;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.entitiy.alarm.TbAlarmService;
 import org.thingsboard.server.service.security.permission.Operation;
@@ -61,7 +64,6 @@ import java.util.concurrent.ExecutionException;
 
 import static org.thingsboard.server.controller.ControllerConstants.ALARM_ID_PARAM_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.ALARM_INFO_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.ALARM_SORT_PROPERTY_ALLOWABLE_VALUES;
 import static org.thingsboard.server.controller.ControllerConstants.ASSIGNEE_ID;
 import static org.thingsboard.server.controller.ControllerConstants.ASSIGN_ID_PARAM_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.ENTITY_ID;
@@ -71,7 +73,6 @@ import static org.thingsboard.server.controller.ControllerConstants.ENTITY_TYPE_
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_DATA_PARAMETERS;
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_NUMBER_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_SIZE_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_ALLOWABLE_VALUES;
 import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.SORT_PROPERTY_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH;
@@ -91,11 +92,8 @@ public class AlarmController extends BaseController {
     private static final String ALARM_QUERY_SEARCH_STATUS_DESCRIPTION = "A string value representing one of the AlarmSearchStatus enumeration value";
 
     private static final String ALARM_QUERY_SEARCH_STATUS_ARRAY_DESCRIPTION = "A list of string values separated by comma ',' representing one of the AlarmSearchStatus enumeration value";
-    private static final String ALARM_QUERY_SEARCH_STATUS_ALLOWABLE_VALUES = "ANY, ACTIVE, CLEARED, ACK, UNACK";
     private static final String ALARM_QUERY_STATUS_DESCRIPTION = "A string value representing one of the AlarmStatus enumeration value";
-    private static final String ALARM_QUERY_STATUS_ALLOWABLE_VALUES = "ACTIVE_UNACK, ACTIVE_ACK, CLEARED_UNACK, CLEARED_ACK";
     private static final String ALARM_QUERY_SEVERITY_ARRAY_DESCRIPTION = "A list of string values separated by comma ',' representing one of the AlarmSeverity enumeration value";
-    private static final String ALARM_QUERY_SEVERITY_ALLOWABLE_VALUES = "CRITICAL, MAJOR, MINOR, WARNING, INDETERMINATE";
 
     private static final String ALARM_QUERY_TYPE_ARRAY_DESCRIPTION = "A list of string values separated by comma ',' representing alarm types";
     private static final String ALARM_QUERY_ASSIGNEE_DESCRIPTION = "A string value representing the assignee user id. For example, '784f394c-42b6-435a-983c-b7beff2784f9'";
@@ -106,11 +104,11 @@ 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, produces = 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
-    public Alarm getAlarmById(@ApiParam(value = ALARM_ID_PARAM_DESCRIPTION)
+    public Alarm getAlarmById(@Parameter(description = ALARM_ID_PARAM_DESCRIPTION)
                               @PathVariable(ALARM_ID) String strAlarmId) throws ThingsboardException {
         checkParameter(ALARM_ID, strAlarmId);
         AlarmId alarmId = new AlarmId(toUUID(strAlarmId));
@@ -119,11 +117,11 @@ 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, produces = 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
-    public AlarmInfo getAlarmInfoById(@ApiParam(value = ALARM_ID_PARAM_DESCRIPTION)
+    public AlarmInfo getAlarmInfoById(@Parameter(description = ALARM_ID_PARAM_DESCRIPTION)
                                       @PathVariable(ALARM_ID) String strAlarmId) throws ThingsboardException {
         checkParameter(ALARM_ID, strAlarmId);
         AlarmId alarmId = new AlarmId(toUUID(strAlarmId));
@@ -141,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
-            , produces = MediaType.APPLICATION_JSON_VALUE)
+            )
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/alarm", method = RequestMethod.POST)
     @ResponseBody
-    public Alarm saveAlarm(@ApiParam(value = "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);
@@ -157,11 +155,11 @@ 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, produces = 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
-    public Boolean deleteAlarm(@ApiParam(value = ALARM_ID_PARAM_DESCRIPTION) @PathVariable(ALARM_ID) String strAlarmId) throws ThingsboardException {
+    public Boolean deleteAlarm(@Parameter(description = ALARM_ID_PARAM_DESCRIPTION) @PathVariable(ALARM_ID) String strAlarmId) throws ThingsboardException {
         checkParameter(ALARM_ID, strAlarmId);
         AlarmId alarmId = new AlarmId(toUUID(strAlarmId));
         Alarm alarm = checkAlarmId(alarmId, Operation.DELETE);
@@ -171,11 +169,11 @@ 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, produces = 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)
-    public AlarmInfo ackAlarm(@ApiParam(value = ALARM_ID_PARAM_DESCRIPTION) @PathVariable(ALARM_ID) String strAlarmId) throws Exception {
+    public AlarmInfo ackAlarm(@Parameter(description = ALARM_ID_PARAM_DESCRIPTION) @PathVariable(ALARM_ID) String strAlarmId) throws Exception {
         checkParameter(ALARM_ID, strAlarmId);
         AlarmId alarmId = new AlarmId(toUUID(strAlarmId));
         Alarm alarm = checkAlarmId(alarmId, Operation.WRITE);
@@ -186,11 +184,11 @@ 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, produces = 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)
-    public AlarmInfo clearAlarm(@ApiParam(value = ALARM_ID_PARAM_DESCRIPTION) @PathVariable(ALARM_ID) String strAlarmId) throws Exception {
+    public AlarmInfo clearAlarm(@Parameter(description = ALARM_ID_PARAM_DESCRIPTION) @PathVariable(ALARM_ID) String strAlarmId) throws Exception {
         checkParameter(ALARM_ID, strAlarmId);
         AlarmId alarmId = new AlarmId(toUUID(strAlarmId));
         Alarm alarm = checkAlarmId(alarmId, Operation.WRITE);
@@ -202,13 +200,13 @@ 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, produces = 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)
-    public Alarm assignAlarm(@ApiParam(value = ALARM_ID_PARAM_DESCRIPTION)
+    public Alarm assignAlarm(@Parameter(description = ALARM_ID_PARAM_DESCRIPTION)
                              @PathVariable(ALARM_ID) String strAlarmId,
-                             @ApiParam(value = ASSIGN_ID_PARAM_DESCRIPTION)
+                             @Parameter(description = ASSIGN_ID_PARAM_DESCRIPTION)
                              @PathVariable(ASSIGNEE_ID) String strAssigneeId
     ) throws Exception {
         checkParameter(ALARM_ID, strAlarmId);
@@ -223,11 +221,11 @@ 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, produces = 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)
-    public Alarm unassignAlarm(@ApiParam(value = ALARM_ID_PARAM_DESCRIPTION)
+    public Alarm unassignAlarm(@Parameter(description = ALARM_ID_PARAM_DESCRIPTION)
                                @PathVariable(ALARM_ID) String strAlarmId
     ) throws Exception {
         checkParameter(ALARM_ID, strAlarmId);
@@ -238,36 +236,36 @@ 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, produces = 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
     public PageData<AlarmInfo> getAlarms(
-            @ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, defaultValue = "DEVICE")
+            @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, schema = @Schema(defaultValue = "DEVICE"))
             @PathVariable(ENTITY_TYPE) String strEntityType,
-            @ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true)
+            @Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true)
             @PathVariable(ENTITY_ID) String strEntityId,
-            @ApiParam(value = ALARM_QUERY_SEARCH_STATUS_DESCRIPTION, allowableValues = ALARM_QUERY_SEARCH_STATUS_ALLOWABLE_VALUES)
+            @Parameter(description = ALARM_QUERY_SEARCH_STATUS_DESCRIPTION, schema = @Schema(allowableValues = {"ANY", "ACTIVE", "CLEARED", "ACK", "UNACK"}))
             @RequestParam(required = false) String searchStatus,
-            @ApiParam(value = ALARM_QUERY_STATUS_DESCRIPTION, allowableValues = ALARM_QUERY_STATUS_ALLOWABLE_VALUES)
+            @Parameter(description = ALARM_QUERY_STATUS_DESCRIPTION, schema = @Schema(allowableValues = {"ACTIVE_UNACK", "ACTIVE_ACK", "CLEARED_UNACK", "CLEARED_ACK"}))
             @RequestParam(required = false) String status,
-            @ApiParam(value = ALARM_QUERY_ASSIGNEE_DESCRIPTION)
+            @Parameter(description = ALARM_QUERY_ASSIGNEE_DESCRIPTION)
             @RequestParam(required = false) String assigneeId,
-            @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
             @RequestParam int pageSize,
-            @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
             @RequestParam int page,
-            @ApiParam(value = ALARM_QUERY_TEXT_SEARCH_DESCRIPTION)
+            @Parameter(description = ALARM_QUERY_TEXT_SEARCH_DESCRIPTION)
             @RequestParam(required = false) String textSearch,
-            @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = ALARM_SORT_PROPERTY_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "startTs", "endTs", "type", "ackTs", "clearTs", "severity", "status"}))
             @RequestParam(required = false) String sortProperty,
-            @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
             @RequestParam(required = false) String sortOrder,
-            @ApiParam(value = ALARM_QUERY_START_TIME_DESCRIPTION)
+            @Parameter(description = ALARM_QUERY_START_TIME_DESCRIPTION)
             @RequestParam(required = false) Long startTime,
-            @ApiParam(value = ALARM_QUERY_END_TIME_DESCRIPTION)
+            @Parameter(description = ALARM_QUERY_END_TIME_DESCRIPTION)
             @RequestParam(required = false) Long endTime,
-            @ApiParam(value = ALARM_QUERY_FETCH_ORIGINATOR_DESCRIPTION)
+            @Parameter(description = ALARM_QUERY_FETCH_ORIGINATOR_DESCRIPTION)
             @RequestParam(required = false) Boolean fetchOriginator
     ) throws ThingsboardException, ExecutionException, InterruptedException {
         checkParameter("EntityId", strEntityId);
@@ -294,32 +292,32 @@ 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, produces = 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
     public PageData<AlarmInfo> getAllAlarms(
-            @ApiParam(value = ALARM_QUERY_SEARCH_STATUS_DESCRIPTION, allowableValues = ALARM_QUERY_SEARCH_STATUS_ALLOWABLE_VALUES)
+            @Parameter(description = ALARM_QUERY_SEARCH_STATUS_DESCRIPTION, schema = @Schema(allowableValues = {"ANY", "ACTIVE", "CLEARED", "ACK", "UNACK"}))
             @RequestParam(required = false) String searchStatus,
-            @ApiParam(value = ALARM_QUERY_STATUS_DESCRIPTION, allowableValues = ALARM_QUERY_STATUS_ALLOWABLE_VALUES)
+            @Parameter(description = ALARM_QUERY_STATUS_DESCRIPTION, schema = @Schema(allowableValues = {"ACTIVE_UNACK", "ACTIVE_ACK", "CLEARED_UNACK", "CLEARED_ACK"}))
             @RequestParam(required = false) String status,
-            @ApiParam(value = ALARM_QUERY_ASSIGNEE_DESCRIPTION)
+            @Parameter(description = ALARM_QUERY_ASSIGNEE_DESCRIPTION)
             @RequestParam(required = false) String assigneeId,
-            @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
             @RequestParam int pageSize,
-            @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
             @RequestParam int page,
-            @ApiParam(value = ALARM_QUERY_TEXT_SEARCH_DESCRIPTION)
+            @Parameter(description = ALARM_QUERY_TEXT_SEARCH_DESCRIPTION)
             @RequestParam(required = false) String textSearch,
-            @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = ALARM_SORT_PROPERTY_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "startTs", "endTs", "type", "ackTs", "clearTs", "severity", "status"}))
             @RequestParam(required = false) String sortProperty,
-            @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
             @RequestParam(required = false) String sortOrder,
-            @ApiParam(value = ALARM_QUERY_START_TIME_DESCRIPTION)
+            @Parameter(description = ALARM_QUERY_START_TIME_DESCRIPTION)
             @RequestParam(required = false) Long startTime,
-            @ApiParam(value = ALARM_QUERY_END_TIME_DESCRIPTION)
+            @Parameter(description = ALARM_QUERY_END_TIME_DESCRIPTION)
             @RequestParam(required = false) Long endTime,
-            @ApiParam(value = ALARM_QUERY_FETCH_ORIGINATOR_DESCRIPTION)
+            @Parameter(description = ALARM_QUERY_FETCH_ORIGINATOR_DESCRIPTION)
             @RequestParam(required = false) Boolean fetchOriginator
     ) throws ThingsboardException, ExecutionException, InterruptedException {
         AlarmSearchStatus alarmSearchStatus = StringUtils.isEmpty(searchStatus) ? null : AlarmSearchStatus.valueOf(searchStatus);
@@ -343,36 +341,36 @@ 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, produces = 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
     public PageData<AlarmInfo> getAlarmsV2(
-            @ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, defaultValue = "DEVICE")
+            @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, schema = @Schema(defaultValue = "DEVICE"))
             @PathVariable(ENTITY_TYPE) String strEntityType,
-            @ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true)
+            @Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true)
             @PathVariable(ENTITY_ID) String strEntityId,
-            @ApiParam(value = ALARM_QUERY_SEARCH_STATUS_ARRAY_DESCRIPTION, allowableValues = ALARM_QUERY_SEARCH_STATUS_ALLOWABLE_VALUES)
+            @Parameter(description = ALARM_QUERY_SEARCH_STATUS_ARRAY_DESCRIPTION, schema = @Schema(allowableValues = {"ANY", "ACTIVE", "CLEARED", "ACK", "UNACK"}))
             @RequestParam(required = false) String[] statusList,
-            @ApiParam(value = ALARM_QUERY_SEVERITY_ARRAY_DESCRIPTION, allowableValues = ALARM_QUERY_SEVERITY_ALLOWABLE_VALUES)
+            @Parameter(description = ALARM_QUERY_SEVERITY_ARRAY_DESCRIPTION, schema = @Schema(allowableValues = {"CRITICAL", "MAJOR", "MINOR", "WARNING", "INDETERMINATE"}))
             @RequestParam(required = false) String[] severityList,
-            @ApiParam(value = ALARM_QUERY_TYPE_ARRAY_DESCRIPTION)
+            @Parameter(description = ALARM_QUERY_TYPE_ARRAY_DESCRIPTION)
             @RequestParam(required = false) String[] typeList,
-            @ApiParam(value = ALARM_QUERY_ASSIGNEE_DESCRIPTION)
+            @Parameter(description = ALARM_QUERY_ASSIGNEE_DESCRIPTION)
             @RequestParam(required = false) String assigneeId,
-            @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
             @RequestParam int pageSize,
-            @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
             @RequestParam int page,
-            @ApiParam(value = ALARM_QUERY_TEXT_SEARCH_DESCRIPTION)
+            @Parameter(description = ALARM_QUERY_TEXT_SEARCH_DESCRIPTION)
             @RequestParam(required = false) String textSearch,
-            @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = ALARM_SORT_PROPERTY_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "startTs", "endTs", "type", "ackTs", "clearTs", "severity", "status"}))
             @RequestParam(required = false) String sortProperty,
-            @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
             @RequestParam(required = false) String sortOrder,
-            @ApiParam(value = ALARM_QUERY_START_TIME_DESCRIPTION)
+            @Parameter(description = ALARM_QUERY_START_TIME_DESCRIPTION)
             @RequestParam(required = false) Long startTime,
-            @ApiParam(value = ALARM_QUERY_END_TIME_DESCRIPTION)
+            @Parameter(description = ALARM_QUERY_END_TIME_DESCRIPTION)
             @RequestParam(required = false) Long endTime
     ) throws ThingsboardException, ExecutionException, InterruptedException {
         checkParameter("EntityId", strEntityId);
@@ -409,32 +407,32 @@ 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, produces = 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
     public PageData<AlarmInfo> getAllAlarmsV2(
-            @ApiParam(value = ALARM_QUERY_SEARCH_STATUS_ARRAY_DESCRIPTION, allowableValues = ALARM_QUERY_SEARCH_STATUS_ALLOWABLE_VALUES)
+            @Parameter(description = ALARM_QUERY_SEARCH_STATUS_ARRAY_DESCRIPTION, schema = @Schema(allowableValues = {"ANY", "ACTIVE", "CLEARED", "ACK", "UNACK"}))
             @RequestParam(required = false) String[] statusList,
-            @ApiParam(value = ALARM_QUERY_SEVERITY_ARRAY_DESCRIPTION, allowableValues = ALARM_QUERY_SEVERITY_ALLOWABLE_VALUES)
+            @Parameter(description = ALARM_QUERY_SEVERITY_ARRAY_DESCRIPTION, schema = @Schema(allowableValues = {"CRITICAL", "MAJOR", "MINOR", "WARNING", "INDETERMINATE"}))
             @RequestParam(required = false) String[] severityList,
-            @ApiParam(value = ALARM_QUERY_TYPE_ARRAY_DESCRIPTION)
+            @Parameter(description = ALARM_QUERY_TYPE_ARRAY_DESCRIPTION)
             @RequestParam(required = false) String[] typeList,
-            @ApiParam(value = ALARM_QUERY_ASSIGNEE_DESCRIPTION)
+            @Parameter(description = ALARM_QUERY_ASSIGNEE_DESCRIPTION)
             @RequestParam(required = false) String assigneeId,
-            @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
             @RequestParam int pageSize,
-            @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
             @RequestParam int page,
-            @ApiParam(value = ALARM_QUERY_TEXT_SEARCH_DESCRIPTION)
+            @Parameter(description = ALARM_QUERY_TEXT_SEARCH_DESCRIPTION)
             @RequestParam(required = false) String textSearch,
-            @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = ALARM_SORT_PROPERTY_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "startTs", "endTs", "type", "ackTs", "clearTs", "severity", "status"}))
             @RequestParam(required = false) String sortProperty,
-            @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
             @RequestParam(required = false) String sortOrder,
-            @ApiParam(value = ALARM_QUERY_START_TIME_DESCRIPTION)
+            @Parameter(description = ALARM_QUERY_START_TIME_DESCRIPTION)
             @RequestParam(required = false) Long startTime,
-            @ApiParam(value = ALARM_QUERY_END_TIME_DESCRIPTION)
+            @Parameter(description = ALARM_QUERY_END_TIME_DESCRIPTION)
             @RequestParam(required = false) Long endTime
     ) throws ThingsboardException, ExecutionException, InterruptedException {
         List<AlarmSearchStatus> alarmStatusList = new ArrayList<>();
@@ -470,20 +468,20 @@ 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
-            , produces = MediaType.APPLICATION_JSON_VALUE)
+            )
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/alarm/highestSeverity/{entityType}/{entityId}", method = RequestMethod.GET)
     @ResponseBody
     public AlarmSeverity getHighestAlarmSeverity(
-            @ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, defaultValue = "DEVICE")
+            @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, schema = @Schema(defaultValue = "DEVICE"))
             @PathVariable(ENTITY_TYPE) String strEntityType,
-            @ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true)
+            @Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true)
             @PathVariable(ENTITY_ID) String strEntityId,
-            @ApiParam(value = ALARM_QUERY_SEARCH_STATUS_DESCRIPTION, allowableValues = ALARM_QUERY_SEARCH_STATUS_ALLOWABLE_VALUES)
+            @Parameter(description = ALARM_QUERY_SEARCH_STATUS_DESCRIPTION, schema = @Schema(allowableValues = {"ANY", "ACTIVE", "CLEARED", "ACK", "UNACK"}))
             @RequestParam(required = false) String searchStatus,
-            @ApiParam(value = ALARM_QUERY_STATUS_DESCRIPTION, allowableValues = ALARM_QUERY_STATUS_ALLOWABLE_VALUES)
+            @Parameter(description = ALARM_QUERY_STATUS_DESCRIPTION, schema = @Schema(allowableValues = {"ACTIVE_UNACK", "ACTIVE_ACK", "CLEARED_UNACK", "CLEARED_ACK"}))
             @RequestParam(required = false) String status,
-            @ApiParam(value = ALARM_QUERY_ASSIGNEE_DESCRIPTION)
+            @Parameter(description = ALARM_QUERY_ASSIGNEE_DESCRIPTION)
             @RequestParam(required = false) String assigneeId
     ) throws ThingsboardException {
         checkParameter("EntityId", strEntityId);
@@ -501,17 +499,17 @@ 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.", produces = 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
-    public PageData<EntitySubtype> getAlarmTypes(@ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+    public PageData<EntitySubtype> getAlarmTypes(@Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
                                                  @RequestParam int pageSize,
-                                                 @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+                                                 @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
                                                  @RequestParam int page,
-                                                 @ApiParam(value = ALARM_QUERY_TEXT_SEARCH_DESCRIPTION)
+                                                 @Parameter(description = ALARM_QUERY_TEXT_SEARCH_DESCRIPTION)
                                                  @RequestParam(required = false) String textSearch,
-                                                 @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+                                                 @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
                                                  @RequestParam(required = false) String sortOrder) throws ThingsboardException, ExecutionException, InterruptedException {
         PageLink pageLink = createPageLink(pageSize, page, textSearch, "type", sortOrder);
         return checkNotNull(alarmService.findAlarmTypesByTenantId(getTenantId(), pageLink));
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 33a8cdca5b..8c03d34e8e 100644
--- a/application/src/main/java/org/thingsboard/server/controller/AssetController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/AssetController.java
@@ -16,8 +16,10 @@
 package org.thingsboard.server.controller;
 
 import com.google.common.util.concurrent.ListenableFuture;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+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.http.HttpStatus;
@@ -49,6 +51,7 @@ import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.common.data.page.TimePageLink;
 import org.thingsboard.server.common.data.sync.ie.importing.csv.BulkImportRequest;
 import org.thingsboard.server.common.data.sync.ie.importing.csv.BulkImportResult;
+import org.thingsboard.server.config.annotations.ApiOperation;
 import org.thingsboard.server.dao.exception.IncorrectParameterException;
 import org.thingsboard.server.dao.model.ModelConstants;
 import org.thingsboard.server.queue.util.TbCoreComponent;
@@ -67,7 +70,6 @@ import static org.thingsboard.server.controller.ControllerConstants.ASSET_ID_PAR
 import static org.thingsboard.server.controller.ControllerConstants.ASSET_INFO_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.ASSET_NAME_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.ASSET_PROFILE_ID_PARAM_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.ASSET_SORT_PROPERTY_ALLOWABLE_VALUES;
 import static org.thingsboard.server.controller.ControllerConstants.ASSET_TEXT_SEARCH_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.ASSET_TYPE_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.CUSTOMER_ID_PARAM_DESCRIPTION;
@@ -79,7 +81,6 @@ import static org.thingsboard.server.controller.ControllerConstants.EDGE_UNASSIG
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_DATA_PARAMETERS;
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_NUMBER_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_SIZE_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_ALLOWABLE_VALUES;
 import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.SORT_PROPERTY_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.TENANT_AUTHORITY_PARAGRAPH;
@@ -102,11 +103,11 @@ 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
-            , produces = MediaType.APPLICATION_JSON_VALUE)
+            )
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/asset/{assetId}", method = RequestMethod.GET)
     @ResponseBody
-    public Asset getAssetById(@ApiParam(value = ASSET_ID_PARAM_DESCRIPTION)
+    public Asset getAssetById(@Parameter(description = ASSET_ID_PARAM_DESCRIPTION)
                               @PathVariable(ASSET_ID) String strAssetId) throws ThingsboardException {
         checkParameter(ASSET_ID, strAssetId);
         AssetId assetId = new AssetId(toUUID(strAssetId));
@@ -117,11 +118,11 @@ 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, produces = 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
-    public AssetInfo getAssetInfoById(@ApiParam(value = ASSET_ID_PARAM_DESCRIPTION)
+    public AssetInfo getAssetInfoById(@Parameter(description = ASSET_ID_PARAM_DESCRIPTION)
                                       @PathVariable(ASSET_ID) String strAssetId) throws ThingsboardException {
         checkParameter(ASSET_ID, strAssetId);
         AssetId assetId = new AssetId(toUUID(strAssetId));
@@ -134,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, produces = 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(@ApiParam(value = "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());
@@ -149,7 +150,7 @@ public class AssetController extends BaseController {
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/asset/{assetId}", method = RequestMethod.DELETE)
     @ResponseStatus(value = HttpStatus.OK)
-    public void deleteAsset(@ApiParam(value = ASSET_ID_PARAM_DESCRIPTION) @PathVariable(ASSET_ID) String strAssetId) throws Exception {
+    public void deleteAsset(@Parameter(description = ASSET_ID_PARAM_DESCRIPTION) @PathVariable(ASSET_ID) String strAssetId) throws Exception {
         checkParameter(ASSET_ID, strAssetId);
         AssetId assetId = new AssetId(toUUID(strAssetId));
         Asset asset = checkAssetId(assetId, Operation.DELETE);
@@ -157,12 +158,12 @@ 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, produces = 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
-    public Asset assignAssetToCustomer(@ApiParam(value = CUSTOMER_ID_PARAM_DESCRIPTION) @PathVariable("customerId") String strCustomerId,
-                                       @ApiParam(value = ASSET_ID_PARAM_DESCRIPTION) @PathVariable(ASSET_ID) String strAssetId) throws ThingsboardException {
+    public Asset assignAssetToCustomer(@Parameter(description = CUSTOMER_ID_PARAM_DESCRIPTION) @PathVariable("customerId") String strCustomerId,
+                                       @Parameter(description = ASSET_ID_PARAM_DESCRIPTION) @PathVariable(ASSET_ID) String strAssetId) throws ThingsboardException {
         checkParameter("customerId", strCustomerId);
         checkParameter(ASSET_ID, strAssetId);
         CustomerId customerId = new CustomerId(toUUID(strCustomerId));
@@ -173,11 +174,11 @@ 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, produces = 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
-    public Asset unassignAssetFromCustomer(@ApiParam(value = ASSET_ID_PARAM_DESCRIPTION) @PathVariable(ASSET_ID) String strAssetId) throws ThingsboardException {
+    public Asset unassignAssetFromCustomer(@Parameter(description = ASSET_ID_PARAM_DESCRIPTION) @PathVariable(ASSET_ID) String strAssetId) throws ThingsboardException {
         checkParameter(ASSET_ID, strAssetId);
         AssetId assetId = new AssetId(toUUID(strAssetId));
         Asset asset = checkAssetId(assetId, Operation.UNASSIGN_FROM_CUSTOMER);
@@ -191,11 +192,11 @@ 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, produces = 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
-    public Asset assignAssetToPublicCustomer(@ApiParam(value = ASSET_ID_PARAM_DESCRIPTION) @PathVariable(ASSET_ID) String strAssetId) throws ThingsboardException {
+    public Asset assignAssetToPublicCustomer(@Parameter(description = ASSET_ID_PARAM_DESCRIPTION) @PathVariable(ASSET_ID) String strAssetId) throws ThingsboardException {
         checkParameter(ASSET_ID, strAssetId);
         AssetId assetId = new AssetId(toUUID(strAssetId));
         checkAssetId(assetId, Operation.ASSIGN_TO_CUSTOMER);
@@ -204,22 +205,22 @@ 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, produces = 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
     public PageData<Asset> getTenantAssets(
-            @ApiParam(value = PAGE_SIZE_DESCRIPTION)
+            @Parameter(description = PAGE_SIZE_DESCRIPTION)
             @RequestParam int pageSize,
-            @ApiParam(value = PAGE_NUMBER_DESCRIPTION)
+            @Parameter(description = PAGE_NUMBER_DESCRIPTION)
             @RequestParam int page,
-            @ApiParam(value = ASSET_TYPE_DESCRIPTION)
+            @Parameter(description = ASSET_TYPE_DESCRIPTION)
             @RequestParam(required = false) String type,
-            @ApiParam(value = ASSET_TEXT_SEARCH_DESCRIPTION)
+            @Parameter(description = ASSET_TEXT_SEARCH_DESCRIPTION)
             @RequestParam(required = false) String textSearch,
-            @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = ASSET_SORT_PROPERTY_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "name", "type", "label", "customerTitle"}))
             @RequestParam(required = false) String sortProperty,
-            @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
             @RequestParam(required = false) String sortOrder) throws ThingsboardException {
         TenantId tenantId = getCurrentUser().getTenantId();
         PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder);
@@ -232,24 +233,24 @@ 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, produces = 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
     public PageData<AssetInfo> getTenantAssetInfos(
-            @ApiParam(value = PAGE_SIZE_DESCRIPTION)
+            @Parameter(description = PAGE_SIZE_DESCRIPTION)
             @RequestParam int pageSize,
-            @ApiParam(value = PAGE_NUMBER_DESCRIPTION)
+            @Parameter(description = PAGE_NUMBER_DESCRIPTION)
             @RequestParam int page,
-            @ApiParam(value = ASSET_TYPE_DESCRIPTION)
+            @Parameter(description = ASSET_TYPE_DESCRIPTION)
             @RequestParam(required = false) String type,
-            @ApiParam(value = ASSET_PROFILE_ID_PARAM_DESCRIPTION)
+            @Parameter(description = ASSET_PROFILE_ID_PARAM_DESCRIPTION)
             @RequestParam(required = false) String assetProfileId,
-            @ApiParam(value = ASSET_TEXT_SEARCH_DESCRIPTION)
+            @Parameter(description = ASSET_TEXT_SEARCH_DESCRIPTION)
             @RequestParam(required = false) String textSearch,
-            @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = ASSET_SORT_PROPERTY_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "name", "type", "label", "customerTitle"}))
             @RequestParam(required = false) String sortProperty,
-            @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
             @RequestParam(required = false) String sortOrder) throws ThingsboardException {
         TenantId tenantId = getCurrentUser().getTenantId();
         PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder);
@@ -265,12 +266,12 @@ 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, produces = 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
     public Asset getTenantAsset(
-            @ApiParam(value = ASSET_NAME_DESCRIPTION)
+            @Parameter(description = ASSET_NAME_DESCRIPTION)
             @RequestParam String assetName) throws ThingsboardException {
         TenantId tenantId = getCurrentUser().getTenantId();
         return checkNotNull(assetService.findAssetByTenantIdAndName(tenantId, assetName));
@@ -278,24 +279,24 @@ public class AssetController extends BaseController {
 
     @ApiOperation(value = "Get Customer Assets (getCustomerAssets)",
             notes = "Returns a page of assets objects assigned to customer. " +
-                    PAGE_DATA_PARAMETERS, produces = 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
     public PageData<Asset> getCustomerAssets(
-            @ApiParam(value = CUSTOMER_ID_PARAM_DESCRIPTION)
+            @Parameter(description = CUSTOMER_ID_PARAM_DESCRIPTION)
             @PathVariable("customerId") String strCustomerId,
-            @ApiParam(value = PAGE_SIZE_DESCRIPTION)
+            @Parameter(description = PAGE_SIZE_DESCRIPTION)
             @RequestParam int pageSize,
-            @ApiParam(value = PAGE_NUMBER_DESCRIPTION)
+            @Parameter(description = PAGE_NUMBER_DESCRIPTION)
             @RequestParam int page,
-            @ApiParam(value = ASSET_TYPE_DESCRIPTION)
+            @Parameter(description = ASSET_TYPE_DESCRIPTION)
             @RequestParam(required = false) String type,
-            @ApiParam(value = ASSET_TEXT_SEARCH_DESCRIPTION)
+            @Parameter(description = ASSET_TEXT_SEARCH_DESCRIPTION)
             @RequestParam(required = false) String textSearch,
-            @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = ASSET_SORT_PROPERTY_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "name", "type", "label", "customerTitle"}))
             @RequestParam(required = false) String sortProperty,
-            @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
             @RequestParam(required = false) String sortOrder) throws ThingsboardException {
         checkParameter("customerId", strCustomerId);
         TenantId tenantId = getCurrentUser().getTenantId();
@@ -311,26 +312,26 @@ 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, produces = 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
     public PageData<AssetInfo> getCustomerAssetInfos(
-            @ApiParam(value = CUSTOMER_ID_PARAM_DESCRIPTION)
+            @Parameter(description = CUSTOMER_ID_PARAM_DESCRIPTION)
             @PathVariable("customerId") String strCustomerId,
-            @ApiParam(value = PAGE_SIZE_DESCRIPTION)
+            @Parameter(description = PAGE_SIZE_DESCRIPTION)
             @RequestParam int pageSize,
-            @ApiParam(value = PAGE_NUMBER_DESCRIPTION)
+            @Parameter(description = PAGE_NUMBER_DESCRIPTION)
             @RequestParam int page,
-            @ApiParam(value = ASSET_TYPE_DESCRIPTION)
+            @Parameter(description = ASSET_TYPE_DESCRIPTION)
             @RequestParam(required = false) String type,
-            @ApiParam(value = ASSET_PROFILE_ID_PARAM_DESCRIPTION)
+            @Parameter(description = ASSET_PROFILE_ID_PARAM_DESCRIPTION)
             @RequestParam(required = false) String assetProfileId,
-            @ApiParam(value = ASSET_TEXT_SEARCH_DESCRIPTION)
+            @Parameter(description = ASSET_TEXT_SEARCH_DESCRIPTION)
             @RequestParam(required = false) String textSearch,
-            @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = ASSET_SORT_PROPERTY_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "name", "type", "label", "customerTitle"}))
             @RequestParam(required = false) String sortProperty,
-            @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
             @RequestParam(required = false) String sortOrder) throws ThingsboardException {
         checkParameter("customerId", strCustomerId);
         TenantId tenantId = getCurrentUser().getTenantId();
@@ -348,12 +349,12 @@ 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. ", produces = 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
     public List<Asset> getAssetsByIds(
-            @ApiParam(value = "A list of assets ids, separated by comma ','")
+            @Parameter(description = "A list of assets ids, separated by comma ','")
             @RequestParam("assetIds") String[] strAssetIds) throws ThingsboardException, ExecutionException, InterruptedException {
         checkArrayParameter("assetIds", strAssetIds);
         SecurityUser user = getCurrentUser();
@@ -375,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.", produces = 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
@@ -397,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,
-            produces = 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
@@ -415,13 +415,12 @@ 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.",
-            produces = 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
-    public Asset assignAssetToEdge(@ApiParam(value = EDGE_ID_PARAM_DESCRIPTION) @PathVariable(EDGE_ID) String strEdgeId,
-                                   @ApiParam(value = ASSET_ID_PARAM_DESCRIPTION) @PathVariable(ASSET_ID) String strAssetId) throws ThingsboardException {
+    public Asset assignAssetToEdge(@Parameter(description = EDGE_ID_PARAM_DESCRIPTION) @PathVariable(EDGE_ID) String strEdgeId,
+                                   @Parameter(description = ASSET_ID_PARAM_DESCRIPTION) @PathVariable(ASSET_ID) String strAssetId) throws ThingsboardException {
         checkParameter(EDGE_ID, strEdgeId);
         checkParameter(ASSET_ID, strAssetId);
 
@@ -439,13 +438,12 @@ 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.",
-            produces = 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
-    public Asset unassignAssetFromEdge(@ApiParam(value = EDGE_ID_PARAM_DESCRIPTION) @PathVariable(EDGE_ID) String strEdgeId,
-                                       @ApiParam(value = ASSET_ID_PARAM_DESCRIPTION) @PathVariable(ASSET_ID) String strAssetId) throws ThingsboardException {
+    public Asset unassignAssetFromEdge(@Parameter(description = EDGE_ID_PARAM_DESCRIPTION) @PathVariable(EDGE_ID) String strEdgeId,
+                                       @Parameter(description = ASSET_ID_PARAM_DESCRIPTION) @PathVariable(ASSET_ID) String strAssetId) throws ThingsboardException {
         checkParameter(EDGE_ID, strEdgeId);
         checkParameter(ASSET_ID, strAssetId);
         EdgeId edgeId = new EdgeId(toUUID(strEdgeId));
@@ -459,28 +457,28 @@ 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, produces = 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
     public PageData<Asset> getEdgeAssets(
-            @ApiParam(value = EDGE_ID_PARAM_DESCRIPTION)
+            @Parameter(description = EDGE_ID_PARAM_DESCRIPTION)
             @PathVariable(EDGE_ID) String strEdgeId,
-            @ApiParam(value = PAGE_SIZE_DESCRIPTION)
+            @Parameter(description = PAGE_SIZE_DESCRIPTION)
             @RequestParam int pageSize,
-            @ApiParam(value = PAGE_NUMBER_DESCRIPTION)
+            @Parameter(description = PAGE_NUMBER_DESCRIPTION)
             @RequestParam int page,
-            @ApiParam(value = ASSET_TYPE_DESCRIPTION)
+            @Parameter(description = ASSET_TYPE_DESCRIPTION)
             @RequestParam(required = false) String type,
-            @ApiParam(value = ASSET_TEXT_SEARCH_DESCRIPTION)
+            @Parameter(description = ASSET_TEXT_SEARCH_DESCRIPTION)
             @RequestParam(required = false) String textSearch,
-            @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = ASSET_SORT_PROPERTY_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "name", "type", "label", "customerTitle"}))
             @RequestParam(required = false) String sortProperty,
-            @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
             @RequestParam(required = false) String sortOrder,
-            @ApiParam(value = "Timestamp. Assets with creation time before it won't be queried")
+            @Parameter(description = "Timestamp. Assets with creation time before it won't be queried")
             @RequestParam(required = false) Long startTime,
-            @ApiParam(value = "Timestamp. Assets with creation time after it won't be queried")
+            @Parameter(description = "Timestamp. Assets with creation time after it won't be queried")
             @RequestParam(required = false) Long endTime) throws ThingsboardException {
         checkParameter(EDGE_ID, strEdgeId);
         TenantId tenantId = getCurrentUser().getTenantId();
@@ -509,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.", produces = 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 b2e9cd816a..a4dc7a1cb0 100644
--- a/application/src/main/java/org/thingsboard/server/controller/AssetProfileController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/AssetProfileController.java
@@ -15,11 +15,14 @@
  */
 package org.thingsboard.server.controller;
 
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+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.http.HttpStatus;
+import org.springframework.http.MediaType;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -38,6 +41,7 @@ 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.dao.resource.ImageService;
+import org.thingsboard.server.config.annotations.ApiOperation;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.entitiy.asset.profile.TbAssetProfileService;
 import org.thingsboard.server.service.security.model.SecurityUser;
@@ -49,7 +53,6 @@ import java.util.List;
 import static org.thingsboard.server.controller.ControllerConstants.ASSET_PROFILE_ID;
 import static org.thingsboard.server.controller.ControllerConstants.ASSET_PROFILE_ID_PARAM_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.ASSET_PROFILE_INFO_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.ASSET_PROFILE_SORT_PROPERTY_ALLOWABLE_VALUES;
 import static org.thingsboard.server.controller.ControllerConstants.ASSET_PROFILE_TEXT_SEARCH_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.INLINE_IMAGES;
 import static org.thingsboard.server.controller.ControllerConstants.INLINE_IMAGES_DESCRIPTION;
@@ -57,7 +60,6 @@ import static org.thingsboard.server.controller.ControllerConstants.NEW_LINE;
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_DATA_PARAMETERS;
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_NUMBER_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_SIZE_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_ALLOWABLE_VALUES;
 import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.SORT_PROPERTY_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.TENANT_AUTHORITY_PARAGRAPH;
@@ -76,15 +78,14 @@ 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,
-            produces = "application/json")
+                    "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
     public AssetProfile getAssetProfileById(
-            @ApiParam(value = ASSET_PROFILE_ID_PARAM_DESCRIPTION)
+            @Parameter(description = ASSET_PROFILE_ID_PARAM_DESCRIPTION)
             @PathVariable(ASSET_PROFILE_ID) String strAssetProfileId,
-            @ApiParam(value = INLINE_IMAGES_DESCRIPTION)
+            @Parameter(description = INLINE_IMAGES_DESCRIPTION)
             @RequestParam(value = INLINE_IMAGES, required = false) boolean inlineImages) throws ThingsboardException {
         checkParameter(ASSET_PROFILE_ID, strAssetProfileId);
         AssetProfileId assetProfileId = new AssetProfileId(toUUID(strAssetProfileId));
@@ -97,13 +98,12 @@ 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,
-            produces = "application/json")
+                    + ASSET_PROFILE_INFO_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/assetProfileInfo/{assetProfileId}", method = RequestMethod.GET)
     @ResponseBody
     public AssetProfileInfo getAssetProfileInfoById(
-            @ApiParam(value = ASSET_PROFILE_ID_PARAM_DESCRIPTION)
+            @Parameter(description = ASSET_PROFILE_ID_PARAM_DESCRIPTION)
             @PathVariable(ASSET_PROFILE_ID) String strAssetProfileId) throws ThingsboardException {
         checkParameter(ASSET_PROFILE_ID, strAssetProfileId);
         AssetProfileId assetProfileId = new AssetProfileId(toUUID(strAssetProfileId));
@@ -112,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,
-            produces = "application/json")
+                    ASSET_PROFILE_INFO_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/assetProfileInfo/default", method = RequestMethod.GET)
     @ResponseBody
@@ -128,14 +127,12 @@ 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,
-            produces = "application/json",
-            consumes = "application/json")
+                    TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/assetProfile", method = RequestMethod.POST)
     @ResponseBody
     public AssetProfile saveAssetProfile(
-            @ApiParam(value = "A JSON value representing the asset profile.")
+            @Parameter(description = "A JSON value representing the asset profile.")
             @RequestBody AssetProfile assetProfile) throws Exception {
         assetProfile.setTenantId(getTenantId());
         checkEntity(assetProfile.getId(), assetProfile, Resource.ASSET_PROFILE);
@@ -144,13 +141,12 @@ 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,
-            produces = "application/json")
+                    "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)
     public void deleteAssetProfile(
-            @ApiParam(value = ASSET_PROFILE_ID_PARAM_DESCRIPTION)
+            @Parameter(description = ASSET_PROFILE_ID_PARAM_DESCRIPTION)
             @PathVariable(ASSET_PROFILE_ID) String strAssetProfileId) throws ThingsboardException {
         checkParameter(ASSET_PROFILE_ID, strAssetProfileId);
         AssetProfileId assetProfileId = new AssetProfileId(toUUID(strAssetProfileId));
@@ -159,13 +155,12 @@ 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,
-            produces = "application/json")
+            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
     public AssetProfile setDefaultAssetProfile(
-            @ApiParam(value = ASSET_PROFILE_ID_PARAM_DESCRIPTION)
+            @Parameter(description = ASSET_PROFILE_ID_PARAM_DESCRIPTION)
             @PathVariable(ASSET_PROFILE_ID) String strAssetProfileId) throws ThingsboardException {
         checkParameter(ASSET_PROFILE_ID, strAssetProfileId);
         AssetProfileId assetProfileId = new AssetProfileId(toUUID(strAssetProfileId));
@@ -176,21 +171,20 @@ 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,
-            produces = "application/json")
+                    PAGE_DATA_PARAMETERS + TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/assetProfiles", params = {"pageSize", "page"}, method = RequestMethod.GET)
     @ResponseBody
     public PageData<AssetProfile> getAssetProfiles(
-            @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
             @RequestParam int pageSize,
-            @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
             @RequestParam int page,
-            @ApiParam(value = ASSET_PROFILE_TEXT_SEARCH_DESCRIPTION)
+            @Parameter(description = ASSET_PROFILE_TEXT_SEARCH_DESCRIPTION)
             @RequestParam(required = false) String textSearch,
-            @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = ASSET_PROFILE_SORT_PROPERTY_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "name", "description", "isDefault"}))
             @RequestParam(required = false) String sortProperty,
-            @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
             @RequestParam(required = false) String sortOrder) throws ThingsboardException {
         PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder);
         return checkNotNull(assetProfileService.findAssetProfiles(getTenantId(), pageLink));
@@ -198,21 +192,20 @@ 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,
-            produces = "application/json")
+                    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
     public PageData<AssetProfileInfo> getAssetProfileInfos(
-            @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
             @RequestParam int pageSize,
-            @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
             @RequestParam int page,
-            @ApiParam(value = ASSET_PROFILE_TEXT_SEARCH_DESCRIPTION)
+            @Parameter(description = ASSET_PROFILE_TEXT_SEARCH_DESCRIPTION)
             @RequestParam(required = false) String textSearch,
-            @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = ASSET_PROFILE_SORT_PROPERTY_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "name", "description", "isDefault"}))
             @RequestParam(required = false) String sortProperty,
-            @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
             @RequestParam(required = false) String sortOrder) throws ThingsboardException {
         PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder);
         return checkNotNull(assetProfileService.findAssetProfileInfos(getTenantId(), pageLink));
@@ -225,7 +218,7 @@ public class AssetProfileController extends BaseController {
     @RequestMapping(value = "/assetProfile/names", method = RequestMethod.GET)
     @ResponseBody
     public List<EntityInfo> getAssetProfileNames(
-            @ApiParam(value = "Flag indicating whether to retrieve exclusively the names of asset profiles that are referenced by tenant's assets.")
+            @Parameter(description = "Flag indicating whether to retrieve exclusively the names of asset profiles that are referenced by tenant's assets.")
             @RequestParam(value = "activeOnly", required = false, defaultValue = "false") boolean activeOnly) throws ThingsboardException {
         SecurityUser user = getCurrentUser();
         TenantId tenantId = user.getTenantId();
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 f165d4d918..c8ea4073b1 100644
--- a/application/src/main/java/org/thingsboard/server/controller/AuditLogController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/AuditLogController.java
@@ -15,8 +15,10 @@
  */
 package org.thingsboard.server.controller;
 
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+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 org.springframework.http.MediaType;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -35,6 +37,7 @@ import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.TimePageLink;
+import org.thingsboard.server.config.annotations.ApiOperation;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 
 import java.util.Arrays;
@@ -42,7 +45,6 @@ import java.util.List;
 import java.util.UUID;
 import java.util.stream.Collectors;
 
-import static org.thingsboard.server.controller.ControllerConstants.AUDIT_LOG_SORT_PROPERTY_ALLOWABLE_VALUES;
 import static org.thingsboard.server.controller.ControllerConstants.AUDIT_LOG_TEXT_SEARCH_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.CUSTOMER_ID_PARAM_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.ENTITY_ID_PARAM_DESCRIPTION;
@@ -50,7 +52,6 @@ import static org.thingsboard.server.controller.ControllerConstants.ENTITY_TYPE_
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_DATA_PARAMETERS;
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_NUMBER_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_SIZE_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_ALLOWABLE_VALUES;
 import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.TENANT_AUTHORITY_PARAGRAPH;
 import static org.thingsboard.server.controller.ControllerConstants.USER_ID_PARAM_DESCRIPTION;
@@ -73,29 +74,28 @@ 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,
-            produces = 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
     public PageData<AuditLog> getAuditLogsByCustomerId(
-            @ApiParam(value = CUSTOMER_ID_PARAM_DESCRIPTION)
+            @Parameter(description = CUSTOMER_ID_PARAM_DESCRIPTION)
             @PathVariable("customerId") String strCustomerId,
-            @ApiParam(value = PAGE_SIZE_DESCRIPTION)
+            @Parameter(description = PAGE_SIZE_DESCRIPTION)
             @RequestParam int pageSize,
-            @ApiParam(value = PAGE_NUMBER_DESCRIPTION)
+            @Parameter(description = PAGE_NUMBER_DESCRIPTION)
             @RequestParam int page,
-            @ApiParam(value = AUDIT_LOG_TEXT_SEARCH_DESCRIPTION)
+            @Parameter(description = AUDIT_LOG_TEXT_SEARCH_DESCRIPTION)
             @RequestParam(required = false) String textSearch,
-            @ApiParam(value = AUDIT_LOG_SORT_PROPERTY_DESCRIPTION, allowableValues = AUDIT_LOG_SORT_PROPERTY_ALLOWABLE_VALUES)
+            @Parameter(description = AUDIT_LOG_SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "entityType", "entityName", "userName", "actionType", "actionStatus"}))
             @RequestParam(required = false) String sortProperty,
-            @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
             @RequestParam(required = false) String sortOrder,
-            @ApiParam(value = AUDIT_LOG_QUERY_START_TIME_DESCRIPTION)
+            @Parameter(description = AUDIT_LOG_QUERY_START_TIME_DESCRIPTION)
             @RequestParam(required = false) Long startTime,
-            @ApiParam(value = AUDIT_LOG_QUERY_END_TIME_DESCRIPTION)
+            @Parameter(description = AUDIT_LOG_QUERY_END_TIME_DESCRIPTION)
             @RequestParam(required = false) Long endTime,
-            @ApiParam(value = AUDIT_LOG_QUERY_ACTION_TYPES_DESCRIPTION)
+            @Parameter(description = AUDIT_LOG_QUERY_ACTION_TYPES_DESCRIPTION)
             @RequestParam(name = "actionTypes", required = false) String actionTypesStr) throws ThingsboardException {
         checkParameter("CustomerId", strCustomerId);
         TenantId tenantId = getCurrentUser().getTenantId();
@@ -107,29 +107,28 @@ 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,
-            produces = 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
     public PageData<AuditLog> getAuditLogsByUserId(
-            @ApiParam(value = USER_ID_PARAM_DESCRIPTION)
+            @Parameter(description = USER_ID_PARAM_DESCRIPTION)
             @PathVariable("userId") String strUserId,
-            @ApiParam(value = PAGE_SIZE_DESCRIPTION)
+            @Parameter(description = PAGE_SIZE_DESCRIPTION)
             @RequestParam int pageSize,
-            @ApiParam(value = PAGE_NUMBER_DESCRIPTION)
+            @Parameter(description = PAGE_NUMBER_DESCRIPTION)
             @RequestParam int page,
-            @ApiParam(value = AUDIT_LOG_TEXT_SEARCH_DESCRIPTION)
+            @Parameter(description = AUDIT_LOG_TEXT_SEARCH_DESCRIPTION)
             @RequestParam(required = false) String textSearch,
-            @ApiParam(value = AUDIT_LOG_SORT_PROPERTY_DESCRIPTION, allowableValues = AUDIT_LOG_SORT_PROPERTY_ALLOWABLE_VALUES)
+            @Parameter(description = AUDIT_LOG_SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "entityType", "entityName", "userName", "actionType", "actionStatus"}))
             @RequestParam(required = false) String sortProperty,
-            @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
             @RequestParam(required = false) String sortOrder,
-            @ApiParam(value = AUDIT_LOG_QUERY_START_TIME_DESCRIPTION)
+            @Parameter(description = AUDIT_LOG_QUERY_START_TIME_DESCRIPTION)
             @RequestParam(required = false) Long startTime,
-            @ApiParam(value = AUDIT_LOG_QUERY_END_TIME_DESCRIPTION)
+            @Parameter(description = AUDIT_LOG_QUERY_END_TIME_DESCRIPTION)
             @RequestParam(required = false) Long endTime,
-            @ApiParam(value = AUDIT_LOG_QUERY_ACTION_TYPES_DESCRIPTION)
+            @Parameter(description = AUDIT_LOG_QUERY_ACTION_TYPES_DESCRIPTION)
             @RequestParam(name = "actionTypes", required = false) String actionTypesStr) throws ThingsboardException {
         checkParameter("UserId", strUserId);
         TenantId tenantId = getCurrentUser().getTenantId();
@@ -142,31 +141,30 @@ 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,
-            produces = 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
     public PageData<AuditLog> getAuditLogsByEntityId(
-            @ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, defaultValue = "DEVICE")
+            @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, schema = @Schema(defaultValue = "DEVICE"))
             @PathVariable("entityType") String strEntityType,
-            @ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true)
+            @Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true)
             @PathVariable("entityId") String strEntityId,
-            @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
             @RequestParam int pageSize,
-            @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
             @RequestParam int page,
-            @ApiParam(value = AUDIT_LOG_TEXT_SEARCH_DESCRIPTION)
+            @Parameter(description = AUDIT_LOG_TEXT_SEARCH_DESCRIPTION)
             @RequestParam(required = false) String textSearch,
-            @ApiParam(value = AUDIT_LOG_SORT_PROPERTY_DESCRIPTION, allowableValues = AUDIT_LOG_SORT_PROPERTY_ALLOWABLE_VALUES)
+            @Parameter(description = AUDIT_LOG_SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "entityType", "entityName", "userName", "actionType", "actionStatus"}))
             @RequestParam(required = false) String sortProperty,
-            @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
             @RequestParam(required = false) String sortOrder,
-            @ApiParam(value = AUDIT_LOG_QUERY_START_TIME_DESCRIPTION)
+            @Parameter(description = AUDIT_LOG_QUERY_START_TIME_DESCRIPTION)
             @RequestParam(required = false) Long startTime,
-            @ApiParam(value = AUDIT_LOG_QUERY_END_TIME_DESCRIPTION)
+            @Parameter(description = AUDIT_LOG_QUERY_END_TIME_DESCRIPTION)
             @RequestParam(required = false) Long endTime,
-            @ApiParam(value = AUDIT_LOG_QUERY_ACTION_TYPES_DESCRIPTION)
+            @Parameter(description = AUDIT_LOG_QUERY_ACTION_TYPES_DESCRIPTION)
             @RequestParam(name = "actionTypes", required = false) String actionTypesStr) throws ThingsboardException {
         checkParameter("EntityId", strEntityId);
         checkParameter("EntityType", strEntityType);
@@ -178,27 +176,26 @@ 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,
-            produces = 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
     public PageData<AuditLog> getAuditLogs(
-            @ApiParam(value = PAGE_SIZE_DESCRIPTION)
+            @Parameter(description = PAGE_SIZE_DESCRIPTION)
             @RequestParam int pageSize,
-            @ApiParam(value = PAGE_NUMBER_DESCRIPTION)
+            @Parameter(description = PAGE_NUMBER_DESCRIPTION)
             @RequestParam int page,
-            @ApiParam(value = AUDIT_LOG_TEXT_SEARCH_DESCRIPTION)
+            @Parameter(description = AUDIT_LOG_TEXT_SEARCH_DESCRIPTION)
             @RequestParam(required = false) String textSearch,
-            @ApiParam(value = AUDIT_LOG_SORT_PROPERTY_DESCRIPTION, allowableValues = AUDIT_LOG_SORT_PROPERTY_ALLOWABLE_VALUES)
+            @Parameter(description = AUDIT_LOG_SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "entityType", "entityName", "userName", "actionType", "actionStatus"}))
             @RequestParam(required = false) String sortProperty,
-            @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
             @RequestParam(required = false) String sortOrder,
-            @ApiParam(value = AUDIT_LOG_QUERY_START_TIME_DESCRIPTION)
+            @Parameter(description = AUDIT_LOG_QUERY_START_TIME_DESCRIPTION)
             @RequestParam(required = false) Long startTime,
-            @ApiParam(value = AUDIT_LOG_QUERY_END_TIME_DESCRIPTION)
+            @Parameter(description = AUDIT_LOG_QUERY_END_TIME_DESCRIPTION)
             @RequestParam(required = false) Long endTime,
-            @ApiParam(value = AUDIT_LOG_QUERY_ACTION_TYPES_DESCRIPTION)
+            @Parameter(description = AUDIT_LOG_QUERY_ACTION_TYPES_DESCRIPTION)
             @RequestParam(name = "actionTypes", required = false) String actionTypesStr) throws ThingsboardException {
         TenantId tenantId = getCurrentUser().getTenantId();
         List<ActionType> actionTypes = parseActionTypesStr(actionTypesStr);
diff --git a/application/src/main/java/org/thingsboard/server/controller/AuthController.java b/application/src/main/java/org/thingsboard/server/controller/AuthController.java
index 92441bf1cb..2898689760 100644
--- a/application/src/main/java/org/thingsboard/server/controller/AuthController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/AuthController.java
@@ -16,8 +16,8 @@
 package org.thingsboard.server.controller;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Parameter;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
@@ -48,6 +48,7 @@ import org.thingsboard.server.common.data.security.event.UserSessionInvalidation
 import org.thingsboard.server.common.data.security.model.JwtPair;
 import org.thingsboard.server.common.data.security.model.SecuritySettings;
 import org.thingsboard.server.common.data.security.model.UserPasswordPolicy;
+import org.thingsboard.server.config.annotations.ApiOperation;
 import org.thingsboard.server.cache.limits.RateLimitService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.security.auth.rest.RestAuthenticationDetails;
@@ -60,7 +61,6 @@ import org.thingsboard.server.service.security.model.UserPrincipal;
 import org.thingsboard.server.service.security.model.token.JwtTokenFactory;
 import org.thingsboard.server.service.security.system.SystemSecurityService;
 
-import javax.servlet.http.HttpServletRequest;
 import java.net.URI;
 import java.net.URISyntaxException;
 
@@ -106,7 +106,7 @@ public class AuthController extends BaseController {
     @RequestMapping(value = "/auth/changePassword", method = RequestMethod.POST)
     @ResponseStatus(value = HttpStatus.OK)
     public ObjectNode changePassword(
-            @ApiParam(value = "Change Password Request")
+            @Parameter(description = "Change Password Request")
             @RequestBody ChangePasswordRequest changePasswordRequest) throws ThingsboardException {
         String currentPassword = changePasswordRequest.getCurrentPassword();
         String newPassword = changePasswordRequest.getNewPassword();
@@ -145,7 +145,7 @@ public class AuthController extends BaseController {
                     "If token is not valid, returns '409 Conflict'.")
     @RequestMapping(value = "/noauth/activate", params = {"activateToken"}, method = RequestMethod.GET)
     public ResponseEntity<String> checkActivateToken(
-            @ApiParam(value = "The activate token string.")
+            @Parameter(description = "The activate token string.")
             @RequestParam(value = "activateToken") String activateToken) {
         HttpHeaders headers = new HttpHeaders();
         HttpStatus responseStatus;
@@ -172,7 +172,7 @@ public class AuthController extends BaseController {
     @RequestMapping(value = "/noauth/resetPasswordByEmail", method = RequestMethod.POST)
     @ResponseStatus(value = HttpStatus.OK)
     public void requestResetPasswordByEmail(
-            @ApiParam(value = "The JSON object representing the reset password email request.")
+            @Parameter(description = "The JSON object representing the reset password email request.")
             @RequestBody ResetPasswordEmailRequest resetPasswordByEmailRequest,
             HttpServletRequest request) throws ThingsboardException {
         try {
@@ -195,7 +195,7 @@ public class AuthController extends BaseController {
                     "If token is not valid, returns '409 Conflict'.")
     @RequestMapping(value = "/noauth/resetPassword", params = {"resetToken"}, method = RequestMethod.GET)
     public ResponseEntity<String> checkResetToken(
-            @ApiParam(value = "The reset token string.")
+            @Parameter(description = "The reset token string.")
             @RequestParam(value = "resetToken") String resetToken) {
         HttpHeaders headers = new HttpHeaders();
         HttpStatus responseStatus;
@@ -231,7 +231,7 @@ public class AuthController extends BaseController {
     @ResponseStatus(value = HttpStatus.OK)
     @ResponseBody
     public JwtPair activateUser(
-            @ApiParam(value = "Activate user request.")
+            @Parameter(description = "Activate user request.")
             @RequestBody ActivateUserRequest activateRequest,
             @RequestParam(required = false, defaultValue = "true") boolean sendActivationMail,
             HttpServletRequest request) throws ThingsboardException {
@@ -267,7 +267,7 @@ public class AuthController extends BaseController {
     @ResponseStatus(value = HttpStatus.OK)
     @ResponseBody
     public JwtPair resetPassword(
-            @ApiParam(value = "Reset password request.")
+            @Parameter(description = "Reset password request.")
             @RequestBody ResetPasswordRequest resetPasswordRequest,
             HttpServletRequest request) throws ThingsboardException {
         String resetToken = resetPasswordRequest.getResetToken();
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 c40760dda3..0942329f40 100644
--- a/application/src/main/java/org/thingsboard/server/controller/BaseController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/BaseController.java
@@ -17,6 +17,9 @@ package org.thingsboard.server.controller;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.util.concurrent.ListenableFuture;
+import jakarta.mail.MessagingException;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.ConstraintViolation;
 import lombok.Getter;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.slf4j.Logger;
@@ -141,7 +144,7 @@ import org.thingsboard.server.queue.provider.TbQueueProducerProvider;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.action.EntityActionService;
 import org.thingsboard.server.service.component.ComponentDiscoveryService;
-import org.thingsboard.server.service.entitiy.TbNotificationEntityService;
+import org.thingsboard.server.service.entitiy.TbLogEntityActionService;
 import org.thingsboard.server.service.entitiy.user.TbUserSettingsService;
 import org.thingsboard.server.service.ota.OtaPackageStateService;
 import org.thingsboard.server.service.profile.TbAssetProfileCache;
@@ -156,9 +159,6 @@ import org.thingsboard.server.service.sync.vc.EntitiesVersionControlService;
 import org.thingsboard.server.service.telemetry.AlarmSubscriptionService;
 import org.thingsboard.server.service.telemetry.TelemetrySubscriptionService;
 
-import javax.mail.MessagingException;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.ConstraintViolation;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
@@ -299,7 +299,7 @@ public abstract class BaseController {
     protected EdgeService edgeService;
 
     @Autowired
-    protected TbNotificationEntityService notificationEntityService;
+    protected TbLogEntityActionService logEntityActionService;
 
     @Autowired
     protected EntityActionService entityActionService;
@@ -386,7 +386,7 @@ public abstract class BaseController {
     }
 
     /**
-     * Handles validation error for controller method arguments annotated with @{@link javax.validation.Valid}
+     * Handles validation error for controller method arguments annotated with @{@link jakarta.validation.Valid}
      * */
     @ExceptionHandler(MethodArgumentNotValidException.class)
     public void handleValidationError(MethodArgumentNotValidException validationError, HttpServletResponse response) {
@@ -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 53fc4f8c32..5271de2329 100644
--- a/application/src/main/java/org/thingsboard/server/controller/ComponentDescriptorController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/ComponentDescriptorController.java
@@ -15,8 +15,8 @@
  */
 package org.thingsboard.server.controller;
 
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -29,6 +29,7 @@ import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.plugin.ComponentDescriptor;
 import org.thingsboard.server.common.data.plugin.ComponentType;
 import org.thingsboard.server.common.data.rule.RuleChainType;
+import org.thingsboard.server.config.annotations.ApiOperation;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 
 import java.util.HashSet;
@@ -54,7 +55,7 @@ public class ComponentDescriptorController extends BaseController {
     @RequestMapping(value = "/component/{componentDescriptorClazz:.+}", method = RequestMethod.GET)
     @ResponseBody
     public ComponentDescriptor getComponentDescriptorByClazz(
-            @ApiParam(value = "Component Descriptor class name", required = true)
+            @Parameter(description = "Component Descriptor class name", required = true)
             @PathVariable("componentDescriptorClazz") String strComponentDescriptorClazz) throws ThingsboardException {
         checkParameter("strComponentDescriptorClazz", strComponentDescriptorClazz);
         return checkComponentDescriptorByClazz(strComponentDescriptorClazz);
@@ -67,9 +68,9 @@ public class ComponentDescriptorController extends BaseController {
     @RequestMapping(value = "/components/{componentType}", method = RequestMethod.GET)
     @ResponseBody
     public List<ComponentDescriptor> getComponentDescriptorsByType(
-            @ApiParam(value = "Type of the Rule Node", 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,
-            @ApiParam(value = "Type of the Rule Chain", allowableValues = "CORE,EDGE")
+            @Parameter(description = "Type of the Rule Chain", schema = @Schema(allowableValues = "CORE,EDGE"))
             @RequestParam(value = "ruleChainType", required = false) String strRuleChainType) throws ThingsboardException {
         checkParameter("componentType", strComponentType);
         return checkComponentDescriptorsByType(ComponentType.valueOf(strComponentType), getRuleChainType(strRuleChainType));
@@ -82,9 +83,9 @@ public class ComponentDescriptorController extends BaseController {
     @RequestMapping(value = "/components", params = {"componentTypes"}, method = RequestMethod.GET)
     @ResponseBody
     public List<ComponentDescriptor> getComponentDescriptorsByTypes(
-            @ApiParam(value = "List of types of the Rule Nodes, (ENRICHMENT, FILTER, TRANSFORMATION, ACTION or EXTERNAL)", required = true)
+            @Parameter(description = "List of types of the Rule Nodes, (ENRICHMENT, FILTER, TRANSFORMATION, ACTION or EXTERNAL)", required = true)
             @RequestParam("componentTypes") String[] strComponentTypes,
-            @ApiParam(value = "Type of the Rule Chain", allowableValues = "CORE,EDGE")
+            @Parameter(description = "Type of the Rule Chain", schema = @Schema(allowableValues = "CORE,EDGE"))
             @RequestParam(value = "ruleChainType", required = false) String strRuleChainType) throws ThingsboardException {
         checkArrayParameter("componentTypes", strComponentTypes);
         Set<ComponentType> componentTypes = new HashSet<>();
diff --git a/application/src/main/java/org/thingsboard/server/controller/ControllerConstants.java b/application/src/main/java/org/thingsboard/server/controller/ControllerConstants.java
index f7e767f017..d9232cda78 100644
--- a/application/src/main/java/org/thingsboard/server/controller/ControllerConstants.java
+++ b/application/src/main/java/org/thingsboard/server/controller/ControllerConstants.java
@@ -95,34 +95,8 @@ public class ControllerConstants {
     protected static final String EVENT_TEXT_SEARCH_DESCRIPTION = "The value is not used in searching.";
     protected static final String AUDIT_LOG_TEXT_SEARCH_DESCRIPTION = "The case insensitive 'substring' filter based on one of the next properties: entityType, entityName, userName, actionType, actionStatus.";
     protected static final String SORT_PROPERTY_DESCRIPTION = "Property of entity to sort by";
-    protected static final String DASHBOARD_SORT_PROPERTY_ALLOWABLE_VALUES = "createdTime, title";
-    protected static final String CUSTOMER_SORT_PROPERTY_ALLOWABLE_VALUES = "createdTime, title, email, country, city";
-    protected static final String RPC_SORT_PROPERTY_ALLOWABLE_VALUES = "createdTime, expirationTime, request, response";
-    protected static final String DEVICE_SORT_PROPERTY_ALLOWABLE_VALUES = "createdTime, name, deviceProfileName, label, customerTitle";
-    protected static final String ENTITY_VIEW_SORT_PROPERTY_ALLOWABLE_VALUES = "createdTime, name, type";
-    protected static final String ENTITY_VIEW_INFO_SORT_PROPERTY_ALLOWABLE_VALUES = "createdTime, name, type, customerTitle";
-    protected static final String USER_SORT_PROPERTY_ALLOWABLE_VALUES = "createdTime, firstName, lastName, email";
-    protected static final String TENANT_SORT_PROPERTY_ALLOWABLE_VALUES = "createdTime, title, email, country, state, city, address, address2, zip, phone, email";
-    protected static final String TENANT_PROFILE_SORT_PROPERTY_ALLOWABLE_VALUES = "createdTime, name, description, isDefault";
-    protected static final String TENANT_PROFILE_INFO_SORT_PROPERTY_ALLOWABLE_VALUES = "id, name";
-    protected static final String TENANT_INFO_SORT_PROPERTY_ALLOWABLE_VALUES = "createdTime, tenantProfileName, title, email, country, state, city, address, address2, zip, phone, email";
-    protected static final String DEVICE_PROFILE_SORT_PROPERTY_ALLOWABLE_VALUES = "createdTime, name, type, transportType, description, isDefault";
-
-    protected static final String ASSET_PROFILE_SORT_PROPERTY_ALLOWABLE_VALUES = "createdTime, name, description, isDefault";
-    protected static final String ASSET_SORT_PROPERTY_ALLOWABLE_VALUES = "createdTime, name, type, label, customerTitle";
-    protected static final String ALARM_SORT_PROPERTY_ALLOWABLE_VALUES = "createdTime, startTs, endTs, type, ackTs, clearTs, severity, status";
-    protected static final String ALARM_COMMENT_SORT_PROPERTY_ALLOWABLE_VALUES = "createdTime, id";
-    protected static final String EVENT_SORT_PROPERTY_ALLOWABLE_VALUES = "ts, id";
-    protected static final String EDGE_SORT_PROPERTY_ALLOWABLE_VALUES = "createdTime, name, type, label, customerTitle";
-    protected static final String RULE_CHAIN_SORT_PROPERTY_ALLOWABLE_VALUES = "createdTime, name, root";
-    protected static final String WIDGET_BUNDLE_SORT_PROPERTY_ALLOWABLE_VALUES = "createdTime, title, tenantId";
-    protected static final String WIDGET_TYPE_SORT_PROPERTY_ALLOWABLE_VALUES = "createdTime, name, deprecated, tenantId";
-    protected static final String AUDIT_LOG_SORT_PROPERTY_ALLOWABLE_VALUES = "createdTime, entityType, entityName, userName, actionType, actionStatus";
+
     protected static final String SORT_ORDER_DESCRIPTION = "Sort order. ASC (ASCENDING) or DESC (DESCENDING)";
-    protected static final String SORT_ORDER_ALLOWABLE_VALUES = "ASC, DESC";
-    protected static final String RPC_STATUS_ALLOWABLE_VALUES = "QUEUED, SENT, DELIVERED, SUCCESSFUL, TIMEOUT, EXPIRED, FAILED";
-    protected static final String RULE_CHAIN_TYPES_ALLOWABLE_VALUES = "CORE, EDGE";
-    protected static final String TRANSPORT_TYPE_ALLOWABLE_VALUES = "DEFAULT, MQTT, COAP, LWM2M, SNMP";
     protected static final String DEVICE_INFO_DESCRIPTION = "Device Info is an extension of the default Device object that contains information about the assigned customer name and device profile name. ";
     protected static final String ASSET_INFO_DESCRIPTION = "Asset Info is an extension of the default Asset object that contains information about the assigned customer name. ";
     protected static final String ALARM_INFO_DESCRIPTION = "Alarm Info is an extension of the default Alarm object that also contains name of the alarm originator.";
@@ -132,28 +106,21 @@ public class ControllerConstants {
 
     protected static final String ASSET_PROFILE_INFO_DESCRIPTION = "Asset Profile Info is a lightweight object that includes main information about Asset Profile. ";
     protected static final String QUEUE_SERVICE_TYPE_DESCRIPTION = "Service type (implemented only for the TB-RULE-ENGINE)";
-    protected static final String QUEUE_SERVICE_TYPE_ALLOWABLE_VALUES = "TB-RULE-ENGINE, TB-CORE, TB-TRANSPORT, JS-EXECUTOR";
     protected static final String QUEUE_QUEUE_TEXT_SEARCH_DESCRIPTION = "The case insensitive 'substring' filter based on the queue name.";
-    protected static final String QUEUE_SORT_PROPERTY_ALLOWABLE_VALUES = "createdTime, name, topic";
     protected static final String QUEUE_ID_PARAM_DESCRIPTION = "A string value representing the queue id. For example, '784f394c-42b6-435a-983c-b7beff2784f9'";
     protected static final String QUEUE_NAME_PARAM_DESCRIPTION = "A string value representing the queue id. For example, 'Main'";
     protected static final String OTA_PACKAGE_INFO_DESCRIPTION = "OTA Package Info is a lightweight object that includes main information about the OTA Package excluding the heavyweight data. ";
     protected static final String OTA_PACKAGE_DESCRIPTION = "OTA Package is a heavyweight object that includes main information about the OTA Package and also data. ";
-    protected static final String OTA_PACKAGE_CHECKSUM_ALGORITHM_ALLOWABLE_VALUES = "MD5, SHA256, SHA384, SHA512, CRC32, MURMUR3_32, MURMUR3_128";
     protected static final String OTA_PACKAGE_TEXT_SEARCH_DESCRIPTION = "The case insensitive 'substring' filter based on the ota package title.";
-    protected static final String OTA_PACKAGE_SORT_PROPERTY_ALLOWABLE_VALUES = "createdTime, type, title, version, tag, url, fileName, dataSize, checksum";
     protected static final String RESOURCE_INFO_DESCRIPTION = "Resource Info is a lightweight object that includes main information about the Resource excluding the heavyweight data. ";
     protected static final String RESOURCE_DESCRIPTION = "Resource is a heavyweight object that includes main information about the Resource and also data. ";
 
     protected static final String RESOURCE_INCLUDE_SYSTEM_IMAGES_DESCRIPTION = "Use 'true' to include system images. Disabled by default. Ignored for requests by users with system administrator authority.";
 
     protected static final String RESOURCE_TEXT_SEARCH_DESCRIPTION = "The case insensitive 'substring' filter based on the resource title.";
-    protected static final String RESOURCE_SORT_PROPERTY_ALLOWABLE_VALUES = "createdTime, title, resourceType, tenantId";
-    protected static final String RESOURCE_TYPE_PROPERTY_ALLOWABLE_VALUES = "LWM2M_MODEL, JKS, PKCS_12, JS_MODULE";
     protected static final String RESOURCE_TYPE = "A string value representing the resource type.";
 
     protected static final String LWM2M_OBJECT_DESCRIPTION = "LwM2M Object is a object that includes information about the LwM2M model which can be used in transport configuration for the LwM2M device profile. ";
-    protected static final String LWM2M_OBJECT_SORT_PROPERTY_ALLOWABLE_VALUES = "id, name";
 
     protected static final String DEVICE_NAME_DESCRIPTION = "A string value representing the Device name.";
     protected static final String ASSET_NAME_DESCRIPTION = "A string value representing the Asset name.";
@@ -1632,8 +1599,6 @@ public class ControllerConstants {
 
     protected static final String ATTRIBUTES_SCOPE_DESCRIPTION = "A string value representing the attributes scope. For example, 'SERVER_SCOPE'.";
     protected static final String ATTRIBUTES_KEYS_DESCRIPTION = "A string value representing the comma-separated list of attributes keys. For example, 'active,inactivityAlarmTime'.";
-    protected static final String ATTRIBUTES_SAVE_SCOPE_ALLOWED_VALUES = "SERVER_SCOPE, SHARED_SCOPE";
-    protected static final String ATTRIBUTES_SCOPE_ALLOWED_VALUES = ATTRIBUTES_SAVE_SCOPE_ALLOWED_VALUES + ", CLIENT_SCOPE";
     protected static final String ATTRIBUTES_JSON_REQUEST_DESCRIPTION = "A string value representing the json object. For example, '{\"key\":\"value\"}'. See API call description for more details.";
 
     protected static final String TELEMETRY_KEYS_BASE_DESCRIPTION = "A string value representing the comma-separated list of telemetry keys.";
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 b21127da63..a46cbe7dba 100644
--- a/application/src/main/java/org/thingsboard/server/controller/CustomerController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/CustomerController.java
@@ -17,8 +17,8 @@ package org.thingsboard.server.controller;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -37,6 +37,7 @@ import org.thingsboard.server.common.data.id.CustomerId;
 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.config.annotations.ApiOperation;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.entitiy.customer.TbCustomerService;
 import org.thingsboard.server.service.security.permission.Operation;
@@ -44,13 +45,11 @@ import org.thingsboard.server.service.security.permission.Resource;
 
 import static org.thingsboard.server.controller.ControllerConstants.CUSTOMER_ID;
 import static org.thingsboard.server.controller.ControllerConstants.CUSTOMER_ID_PARAM_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.CUSTOMER_SORT_PROPERTY_ALLOWABLE_VALUES;
 import static org.thingsboard.server.controller.ControllerConstants.CUSTOMER_TEXT_SEARCH_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.HOME_DASHBOARD;
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_DATA_PARAMETERS;
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_NUMBER_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_SIZE_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_ALLOWABLE_VALUES;
 import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.SORT_PROPERTY_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.TENANT_AUTHORITY_PARAGRAPH;
@@ -76,7 +75,7 @@ public class CustomerController extends BaseController {
     @RequestMapping(value = "/customer/{customerId}", method = RequestMethod.GET)
     @ResponseBody
     public Customer getCustomerById(
-            @ApiParam(value = CUSTOMER_ID_PARAM_DESCRIPTION)
+            @Parameter(description = CUSTOMER_ID_PARAM_DESCRIPTION)
             @PathVariable(CUSTOMER_ID) String strCustomerId) throws ThingsboardException {
         checkParameter(CUSTOMER_ID, strCustomerId);
         CustomerId customerId = new CustomerId(toUUID(strCustomerId));
@@ -95,7 +94,7 @@ public class CustomerController extends BaseController {
     @RequestMapping(value = "/customer/{customerId}/shortInfo", method = RequestMethod.GET)
     @ResponseBody
     public JsonNode getShortCustomerInfoById(
-            @ApiParam(value = CUSTOMER_ID_PARAM_DESCRIPTION)
+            @Parameter(description = CUSTOMER_ID_PARAM_DESCRIPTION)
             @PathVariable(CUSTOMER_ID) String strCustomerId) throws ThingsboardException {
         checkParameter(CUSTOMER_ID, strCustomerId);
         CustomerId customerId = new CustomerId(toUUID(strCustomerId));
@@ -113,7 +112,7 @@ public class CustomerController extends BaseController {
     @RequestMapping(value = "/customer/{customerId}/title", method = RequestMethod.GET, produces = "application/text")
     @ResponseBody
     public String getCustomerTitleById(
-            @ApiParam(value = CUSTOMER_ID_PARAM_DESCRIPTION)
+            @Parameter(description = CUSTOMER_ID_PARAM_DESCRIPTION)
             @PathVariable(CUSTOMER_ID) String strCustomerId) throws ThingsboardException {
         checkParameter(CUSTOMER_ID, strCustomerId);
         CustomerId customerId = new CustomerId(toUUID(strCustomerId));
@@ -131,7 +130,7 @@ public class CustomerController extends BaseController {
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/customer", method = RequestMethod.POST)
     @ResponseBody
-    public Customer saveCustomer(@ApiParam(value = "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());
@@ -144,7 +143,7 @@ public class CustomerController extends BaseController {
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/customer/{customerId}", method = RequestMethod.DELETE)
     @ResponseStatus(value = HttpStatus.OK)
-    public void deleteCustomer(@ApiParam(value = CUSTOMER_ID_PARAM_DESCRIPTION)
+    public void deleteCustomer(@Parameter(description = CUSTOMER_ID_PARAM_DESCRIPTION)
                                @PathVariable(CUSTOMER_ID) String strCustomerId) throws ThingsboardException {
         checkParameter(CUSTOMER_ID, strCustomerId);
         CustomerId customerId = new CustomerId(toUUID(strCustomerId));
@@ -159,15 +158,15 @@ public class CustomerController extends BaseController {
     @RequestMapping(value = "/customers", params = {"pageSize", "page"}, method = RequestMethod.GET)
     @ResponseBody
     public PageData<Customer> getCustomers(
-            @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
             @RequestParam int pageSize,
-            @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
             @RequestParam int page,
-            @ApiParam(value = CUSTOMER_TEXT_SEARCH_DESCRIPTION)
+            @Parameter(description = CUSTOMER_TEXT_SEARCH_DESCRIPTION)
             @RequestParam(required = false) String textSearch,
-            @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = CUSTOMER_SORT_PROPERTY_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "title", "email", "country, city"}))
             @RequestParam(required = false) String sortProperty,
-            @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
             @RequestParam(required = false) String sortOrder) throws ThingsboardException {
         PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder);
         TenantId tenantId = getCurrentUser().getTenantId();
@@ -180,7 +179,7 @@ public class CustomerController extends BaseController {
     @RequestMapping(value = "/tenant/customers", params = {"customerTitle"}, method = RequestMethod.GET)
     @ResponseBody
     public Customer getTenantCustomer(
-            @ApiParam(value = "A string value representing the Customer title.")
+            @Parameter(description = "A string value representing the Customer title.")
             @RequestParam String customerTitle) throws ThingsboardException {
             TenantId tenantId = getCurrentUser().getTenantId();
         return checkNotNull(customerService.findCustomerByTenantIdAndTitle(tenantId, customerTitle), "Customer with title [" + customerTitle + "] is not found");
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 6097ef10c8..013575361d 100644
--- a/application/src/main/java/org/thingsboard/server/controller/DashboardController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/DashboardController.java
@@ -17,11 +17,11 @@ package org.thingsboard.server.controller;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.Example;
-import io.swagger.annotations.ExampleProperty;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.ExampleObject;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpStatus;
@@ -52,6 +52,7 @@ 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.dao.resource.ImageService;
+import org.thingsboard.server.config.annotations.ApiOperation;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.entitiy.dashboard.TbDashboardService;
 import org.thingsboard.server.service.security.model.SecurityUser;
@@ -67,7 +68,6 @@ import java.util.stream.Collectors;
 import static org.thingsboard.server.controller.ControllerConstants.CUSTOMER_ID;
 import static org.thingsboard.server.controller.ControllerConstants.CUSTOMER_ID_PARAM_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.DASHBOARD_ID_PARAM_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.DASHBOARD_SORT_PROPERTY_ALLOWABLE_VALUES;
 import static org.thingsboard.server.controller.ControllerConstants.DASHBOARD_TEXT_SEARCH_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.EDGE_ASSIGN_ASYNC_FIRST_STEP_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.EDGE_ASSIGN_RECEIVE_STEP_DESCRIPTION;
@@ -80,7 +80,6 @@ import static org.thingsboard.server.controller.ControllerConstants.INLINE_IMAGE
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_DATA_PARAMETERS;
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_NUMBER_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_SIZE_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_ALLOWABLE_VALUES;
 import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.SORT_PROPERTY_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.SYSTEM_AUTHORITY_PARAGRAPH;
@@ -115,7 +114,7 @@ public class DashboardController extends BaseController {
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/dashboard/serverTime", method = RequestMethod.GET)
     @ResponseBody
-    @ApiResponse(code = 200, message = "OK", examples = @Example(value = @ExampleProperty(value = "1636023857137", mediaType = "application/json")))
+    @ApiResponse(responseCode = "200", description = "OK", content = @Content(mediaType = "application/json", examples = @ExampleObject(value = "1636023857137")))
     public long getServerTime() throws ThingsboardException {
         return System.currentTimeMillis();
     }
@@ -128,20 +127,18 @@ public class DashboardController extends BaseController {
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/dashboard/maxDatapointsLimit", method = RequestMethod.GET)
     @ResponseBody
-    @ApiResponse(code = 200, message = "OK", examples = @Example(value = @ExampleProperty(value = "5000", mediaType = "application/json")))
+    @ApiResponse(responseCode = "200", description = "OK", content = @Content(mediaType = "application/json", examples = @ExampleObject(value = "5000")))
     public long getMaxDatapointsLimit() throws ThingsboardException {
         return maxDatapointsLimit;
     }
 
     @ApiOperation(value = "Get Dashboard Info (getDashboardInfoById)",
-            notes = "Get the information about the dashboard based on 'dashboardId' parameter. " + DASHBOARD_INFO_DEFINITION,
-            produces = 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
     public DashboardInfo getDashboardInfoById(
-            @ApiParam(value = DASHBOARD_ID_PARAM_DESCRIPTION)
+            @Parameter(description = DASHBOARD_ID_PARAM_DESCRIPTION)
             @PathVariable(DASHBOARD_ID) String strDashboardId) throws ThingsboardException {
         checkParameter(DASHBOARD_ID, strDashboardId);
         DashboardId dashboardId = new DashboardId(toUUID(strDashboardId));
@@ -149,16 +146,15 @@ 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,
-            produces = 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)
     @ResponseBody
     public Dashboard getDashboardById(
-            @ApiParam(value = DASHBOARD_ID_PARAM_DESCRIPTION)
+            @Parameter(description = DASHBOARD_ID_PARAM_DESCRIPTION)
             @PathVariable(DASHBOARD_ID) String strDashboardId,
-            @ApiParam(value = INLINE_IMAGES_DESCRIPTION)
+            @Parameter(description = INLINE_IMAGES_DESCRIPTION)
             @RequestParam(value = INLINE_IMAGES, required = false) boolean inlineImages) throws ThingsboardException {
         checkParameter(DASHBOARD_ID, strDashboardId);
         DashboardId dashboardId = new DashboardId(toUUID(strDashboardId));
@@ -175,14 +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,
-            produces = MediaType.APPLICATION_JSON_VALUE,
-            consumes = MediaType.APPLICATION_JSON_VALUE)
+                    TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/dashboard", method = RequestMethod.POST)
     @ResponseBody
     public Dashboard saveDashboard(
-            @ApiParam(value = "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);
@@ -195,7 +189,7 @@ public class DashboardController extends BaseController {
     @RequestMapping(value = "/dashboard/{dashboardId}", method = RequestMethod.DELETE)
     @ResponseStatus(value = HttpStatus.OK)
     public void deleteDashboard(
-            @ApiParam(value = DASHBOARD_ID_PARAM_DESCRIPTION)
+            @Parameter(description = DASHBOARD_ID_PARAM_DESCRIPTION)
             @PathVariable(DASHBOARD_ID) String strDashboardId) throws ThingsboardException {
         checkParameter(DASHBOARD_ID, strDashboardId);
         DashboardId dashboardId = new DashboardId(toUUID(strDashboardId));
@@ -205,15 +199,14 @@ 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,
-            produces = 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
     public Dashboard assignDashboardToCustomer(
-            @ApiParam(value = CUSTOMER_ID_PARAM_DESCRIPTION)
+            @Parameter(description = CUSTOMER_ID_PARAM_DESCRIPTION)
             @PathVariable(CUSTOMER_ID) String strCustomerId,
-            @ApiParam(value = DASHBOARD_ID_PARAM_DESCRIPTION)
+            @Parameter(description = DASHBOARD_ID_PARAM_DESCRIPTION)
             @PathVariable(DASHBOARD_ID) String strDashboardId) throws ThingsboardException {
         checkParameter(CUSTOMER_ID, strCustomerId);
         checkParameter(DASHBOARD_ID, strDashboardId);
@@ -228,15 +221,14 @@ 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,
-            produces = 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
     public Dashboard unassignDashboardFromCustomer(
-            @ApiParam(value = CUSTOMER_ID_PARAM_DESCRIPTION)
+            @Parameter(description = CUSTOMER_ID_PARAM_DESCRIPTION)
             @PathVariable(CUSTOMER_ID) String strCustomerId,
-            @ApiParam(value = DASHBOARD_ID_PARAM_DESCRIPTION)
+            @Parameter(description = DASHBOARD_ID_PARAM_DESCRIPTION)
             @PathVariable(DASHBOARD_ID) String strDashboardId) throws ThingsboardException {
         checkParameter("customerId", strCustomerId);
         checkParameter(DASHBOARD_ID, strDashboardId);
@@ -249,17 +241,15 @@ 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,
-            produces = MediaType.APPLICATION_JSON_VALUE,
-            consumes = MediaType.APPLICATION_JSON_VALUE)
+                    "Returns the Dashboard object. " + TENANT_AUTHORITY_PARAGRAPH)
 
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/dashboard/{dashboardId}/customers", method = RequestMethod.POST)
     @ResponseBody
     public Dashboard updateDashboardCustomers(
-            @ApiParam(value = DASHBOARD_ID_PARAM_DESCRIPTION)
+            @Parameter(description = DASHBOARD_ID_PARAM_DESCRIPTION)
             @PathVariable(DASHBOARD_ID) String strDashboardId,
-            @ApiParam(value = "JSON array with the list of customer ids, or empty to remove all customers")
+            @Parameter(description = "JSON array with the list of customer ids, or empty to remove all customers")
             @RequestBody(required = false) String[] strCustomerIds) throws ThingsboardException {
         checkParameter(DASHBOARD_ID, strDashboardId);
         DashboardId dashboardId = new DashboardId(toUUID(strDashboardId));
@@ -270,16 +260,14 @@ 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,
-            produces = MediaType.APPLICATION_JSON_VALUE,
-            consumes = 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
     public Dashboard addDashboardCustomers(
-            @ApiParam(value = DASHBOARD_ID_PARAM_DESCRIPTION)
+            @Parameter(description = DASHBOARD_ID_PARAM_DESCRIPTION)
             @PathVariable(DASHBOARD_ID) String strDashboardId,
-            @ApiParam(value = "JSON array with the list of customer ids")
+            @Parameter(description = "JSON array with the list of customer ids")
             @RequestBody String[] strCustomerIds) throws ThingsboardException {
         checkParameter(DASHBOARD_ID, strDashboardId);
         DashboardId dashboardId = new DashboardId(toUUID(strDashboardId));
@@ -290,16 +278,14 @@ 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,
-            produces = MediaType.APPLICATION_JSON_VALUE,
-            consumes = 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
     public Dashboard removeDashboardCustomers(
-            @ApiParam(value = DASHBOARD_ID_PARAM_DESCRIPTION)
+            @Parameter(description = DASHBOARD_ID_PARAM_DESCRIPTION)
             @PathVariable(DASHBOARD_ID) String strDashboardId,
-            @ApiParam(value = "JSON array with the list of customer ids")
+            @Parameter(description = "JSON array with the list of customer ids")
             @RequestBody String[] strCustomerIds) throws ThingsboardException {
         checkParameter(DASHBOARD_ID, strDashboardId);
         DashboardId dashboardId = new DashboardId(toUUID(strDashboardId));
@@ -314,13 +300,12 @@ 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,
-            produces = 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
     public Dashboard assignDashboardToPublicCustomer(
-            @ApiParam(value = DASHBOARD_ID_PARAM_DESCRIPTION)
+            @Parameter(description = DASHBOARD_ID_PARAM_DESCRIPTION)
             @PathVariable(DASHBOARD_ID) String strDashboardId) throws ThingsboardException {
         checkParameter(DASHBOARD_ID, strDashboardId);
         DashboardId dashboardId = new DashboardId(toUUID(strDashboardId));
@@ -330,13 +315,12 @@ 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,
-            produces = 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
     public Dashboard unassignDashboardFromPublicCustomer(
-            @ApiParam(value = DASHBOARD_ID_PARAM_DESCRIPTION)
+            @Parameter(description = DASHBOARD_ID_PARAM_DESCRIPTION)
             @PathVariable(DASHBOARD_ID) String strDashboardId) throws ThingsboardException {
         checkParameter(DASHBOARD_ID, strDashboardId);
         DashboardId dashboardId = new DashboardId(toUUID(strDashboardId));
@@ -346,23 +330,22 @@ 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,
-            produces = MediaType.APPLICATION_JSON_VALUE)
+                    SYSTEM_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAuthority('SYS_ADMIN')")
     @RequestMapping(value = "/tenant/{tenantId}/dashboards", params = {"pageSize", "page"}, method = RequestMethod.GET)
     @ResponseBody
     public PageData<DashboardInfo> getTenantDashboards(
-            @ApiParam(value = TENANT_ID_PARAM_DESCRIPTION, required = true)
+            @Parameter(description = TENANT_ID_PARAM_DESCRIPTION, required = true)
             @PathVariable(TENANT_ID) String strTenantId,
-            @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
             @RequestParam int pageSize,
-            @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
             @RequestParam int page,
-            @ApiParam(value = DASHBOARD_TEXT_SEARCH_DESCRIPTION)
+            @Parameter(description = DASHBOARD_TEXT_SEARCH_DESCRIPTION)
             @RequestParam(required = false) String textSearch,
-            @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = DASHBOARD_SORT_PROPERTY_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "title"}))
             @RequestParam(required = false) String sortProperty,
-            @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
             @RequestParam(required = false) String sortOrder) throws ThingsboardException {
         TenantId tenantId = TenantId.fromUUID(toUUID(strTenantId));
         checkTenantId(tenantId, Operation.READ);
@@ -372,23 +355,22 @@ 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,
-            produces = 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
     public PageData<DashboardInfo> getTenantDashboards(
-            @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
             @RequestParam int pageSize,
-            @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
             @RequestParam int page,
-            @ApiParam(value = HIDDEN_FOR_MOBILE)
+            @Parameter(description = HIDDEN_FOR_MOBILE)
             @RequestParam(required = false) Boolean mobile,
-            @ApiParam(value = DASHBOARD_TEXT_SEARCH_DESCRIPTION)
+            @Parameter(description = DASHBOARD_TEXT_SEARCH_DESCRIPTION)
             @RequestParam(required = false) String textSearch,
-            @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = DASHBOARD_SORT_PROPERTY_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "title"}))
             @RequestParam(required = false) String sortProperty,
-            @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
             @RequestParam(required = false) String sortOrder) throws ThingsboardException {
         TenantId tenantId = getCurrentUser().getTenantId();
         PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder);
@@ -401,25 +383,24 @@ 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,
-            produces = 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
     public PageData<DashboardInfo> getCustomerDashboards(
-            @ApiParam(value = CUSTOMER_ID_PARAM_DESCRIPTION, required = true)
+            @Parameter(description = CUSTOMER_ID_PARAM_DESCRIPTION, required = true)
             @PathVariable(CUSTOMER_ID) String strCustomerId,
-            @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
             @RequestParam int pageSize,
-            @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
             @RequestParam int page,
-            @ApiParam(value = HIDDEN_FOR_MOBILE)
+            @Parameter(description = HIDDEN_FOR_MOBILE)
             @RequestParam(required = false) Boolean mobile,
-            @ApiParam(value = DASHBOARD_TEXT_SEARCH_DESCRIPTION)
+            @Parameter(description = DASHBOARD_TEXT_SEARCH_DESCRIPTION)
             @RequestParam(required = false) String textSearch,
-            @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = DASHBOARD_SORT_PROPERTY_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "title"}))
             @RequestParam(required = false) String sortProperty,
-            @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
             @RequestParam(required = false) String sortOrder) throws ThingsboardException {
         checkParameter(CUSTOMER_ID, strCustomerId);
         TenantId tenantId = getCurrentUser().getTenantId();
@@ -437,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,
-            produces = 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
@@ -470,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,
-            produces = 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
@@ -501,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,
-            produces = MediaType.APPLICATION_JSON_VALUE)
+                    TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/tenant/dashboard/home/info", method = RequestMethod.GET)
     @ResponseBody
@@ -523,13 +501,12 @@ 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,
-            produces = MediaType.APPLICATION_JSON_VALUE)
+                    TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/tenant/dashboard/home/info", method = RequestMethod.POST)
     @ResponseStatus(value = HttpStatus.OK)
     public void setTenantHomeDashboardInfo(
-            @ApiParam(value = "A JSON object that represents home dashboard id and other parameters", required = true)
+            @Parameter(description = "A JSON object that represents home dashboard id and other parameters", required = true)
             @RequestBody HomeDashboardInfo homeDashboardInfo) throws ThingsboardException {
 
         if (homeDashboardInfo.getDashboardId() != null) {
@@ -537,7 +514,7 @@ public class DashboardController extends BaseController {
         }
         Tenant tenant = tenantService.findTenantById(getTenantId());
         JsonNode additionalInfo = tenant.getAdditionalInfo();
-        if (additionalInfo == null || !(additionalInfo instanceof ObjectNode)) {
+        if (!(additionalInfo instanceof ObjectNode)) {
             additionalInfo = JacksonUtil.newObjectNode();
         }
         if (homeDashboardInfo.getDashboardId() != null) {
@@ -563,8 +540,7 @@ public class DashboardController extends BaseController {
                 }
                 return new HomeDashboardInfo(dashboardId, hideDashboardToolbar);
             }
-        } catch (Exception e) {
-        }
+        } catch (Exception ignored) {}
         return null;
     }
 
@@ -580,8 +556,7 @@ public class DashboardController extends BaseController {
                 }
                 return new HomeDashboard(dashboard, hideDashboardToolbar);
             }
-        } catch (Exception e) {
-        }
+        } catch (Exception ignored) {}
         return null;
     }
 
@@ -591,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,
-            produces = MediaType.APPLICATION_JSON_VALUE)
+                    TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/edge/{edgeId}/dashboard/{dashboardId}", method = RequestMethod.POST)
     @ResponseBody
@@ -615,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,
-            produces = MediaType.APPLICATION_JSON_VALUE)
+                    TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/edge/{edgeId}/dashboard/{dashboardId}", method = RequestMethod.DELETE)
     @ResponseBody
@@ -636,23 +609,22 @@ 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,
-            produces = 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
     public PageData<DashboardInfo> getEdgeDashboards(
-            @ApiParam(value = EDGE_ID_PARAM_DESCRIPTION, required = true)
+            @Parameter(description = EDGE_ID_PARAM_DESCRIPTION, required = true)
             @PathVariable(EDGE_ID) String strEdgeId,
-            @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
             @RequestParam int pageSize,
-            @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
             @RequestParam int page,
-            @ApiParam(value = DASHBOARD_TEXT_SEARCH_DESCRIPTION)
+            @Parameter(description = DASHBOARD_TEXT_SEARCH_DESCRIPTION)
             @RequestParam(required = false) String textSearch,
-            @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = DASHBOARD_SORT_PROPERTY_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "title"}))
             @RequestParam(required = false) String sortProperty,
-            @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
             @RequestParam(required = false) String sortOrder) throws ThingsboardException {
         checkParameter("edgeId", strEdgeId);
         TenantId tenantId = getCurrentUser().getTenantId();
diff --git a/application/src/main/java/org/thingsboard/server/controller/DeviceConnectivityController.java b/application/src/main/java/org/thingsboard/server/controller/DeviceConnectivityController.java
index 22a1b95843..48e99e474a 100644
--- a/application/src/main/java/org/thingsboard/server/controller/DeviceConnectivityController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/DeviceConnectivityController.java
@@ -16,10 +16,11 @@
 package org.thingsboard.server.controller;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.ExampleObject;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpHeaders;
@@ -36,12 +37,12 @@ import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.exception.ThingsboardErrorCode;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.id.DeviceId;
+import org.thingsboard.server.config.annotations.ApiOperation;
 import org.thingsboard.server.dao.device.DeviceConnectivityService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.security.permission.Operation;
 import org.thingsboard.server.service.security.system.SystemSecurityService;
 
-import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.net.URISyntaxException;
 
@@ -67,24 +68,38 @@ public class DeviceConnectivityController extends BaseController {
             notes = "Fetch the list of commands to publish device telemetry based on device profile " +
                     "If the user has the authority of 'Tenant Administrator', the server checks that the device is owned by the same tenant. " +
                     "If the user has the authority of 'Customer User', the server checks that the device is assigned to the same customer. " +
-                    TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
-    @ApiResponses(value = {
-            @ApiResponse(code = 200, message = "OK",
-                    examples = @io.swagger.annotations.Example(
-                            value = {
-                                    @io.swagger.annotations.ExampleProperty(
-                                            mediaType = "application/json",
-                                            value = "{\"http\":\"curl -v -X POST http://localhost:8080/api/v1/0ySs4FTOn5WU15XLmal8/telemetry --header Content-Type:application/json --data {temperature:25}\"," +
-                                                    "\"mqtt\":\"mosquitto_pub -d -q 1 -h localhost -t v1/devices/me/telemetry -i myClient1 -u myUsername1 -P myPassword -m {temperature:25}\"," +
-                                                    "\"coap\":\"coap-client -m POST coap://localhost:5683/api/v1/0ySs4FTOn5WU15XLmal8/telemetry -t json -e {temperature:25}\"}")}))})
+                    TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
+            responses = {
+                    @ApiResponse(
+                            responseCode = "200",
+                            description = "OK",
+                            content = @Content(
+                                    mediaType = MediaType.APPLICATION_JSON_VALUE,
+                                    examples = {
+                                            @ExampleObject(
+                                                    name = "http",
+                                                    value = "curl -v -X POST http://localhost:8080/api/v1/0ySs4FTOn5WU15XLmal8/telemetry --header Content-Type:application/json --data {temperature:25}"
+                                            ),
+                                            @ExampleObject(
+                                                    name = "mqtt",
+                                                    value = "mosquitto_pub -d -q 1 -h localhost -t v1/devices/me/telemetry -i myClient1 -u myUsername1 -P myPassword -m {temperature:25}"
+                                            ),
+                                            @ExampleObject(
+                                                    name = "coap",
+                                                    value = "coap-client -m POST coap://localhost:5683/api/v1/0ySs4FTOn5WU15XLmal8/telemetry -t json -e {temperature:25}"
+                                            )
+                                    }
+                            )
+                    )
+            })
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/device-connectivity/{deviceId}", method = RequestMethod.GET)
     @ResponseBody
-    public JsonNode getDevicePublishTelemetryCommands(@ApiParam(value = DEVICE_ID_PARAM_DESCRIPTION)
+    public JsonNode getDevicePublishTelemetryCommands(@Parameter(description = DEVICE_ID_PARAM_DESCRIPTION)
                                                       @PathVariable(DEVICE_ID) String strDeviceId, HttpServletRequest request) throws ThingsboardException, URISyntaxException {
         checkParameter(DEVICE_ID, strDeviceId);
         DeviceId deviceId = new DeviceId(toUUID(strDeviceId));
-        Device device = checkDeviceId(deviceId, Operation.READ_CREDENTIALS);
+        Device device = checkDeviceId(deviceId, org.thingsboard.server.service.security.permission.Operation.READ_CREDENTIALS);
 
         String baseUrl = systemSecurityService.getBaseUrl(getTenantId(), getCurrentUser().getCustomerId(), request);
         return deviceConnectivityService.findDevicePublishTelemetryCommands(baseUrl, device);
@@ -93,7 +108,7 @@ public class DeviceConnectivityController extends BaseController {
     @ApiOperation(value = "Download server certificate using file path defined in device.connectivity properties (downloadServerCertificate)", notes = "Download server certificate.")
     @RequestMapping(value = "/device-connectivity/{protocol}/certificate/download", method = RequestMethod.GET)
     @ResponseBody
-    public ResponseEntity<org.springframework.core.io.Resource> downloadServerCertificate(@ApiParam(value = PROTOCOL_PARAM_DESCRIPTION)
+    public ResponseEntity<org.springframework.core.io.Resource> downloadServerCertificate(@Parameter(description = PROTOCOL_PARAM_DESCRIPTION)
                                                                                           @PathVariable(PROTOCOL) String protocol) throws ThingsboardException, IOException {
         checkParameter(PROTOCOL, protocol);
         var pemCert =
@@ -110,7 +125,7 @@ public class DeviceConnectivityController extends BaseController {
     @ApiOperation(value = "Download generated docker-compose.yml file for gateway (downloadGatewayDockerCompose)", notes = "Download generated docker-compose.yml for gateway.")
     @RequestMapping(value = "/device-connectivity/gateway-launch/{deviceId}/docker-compose/download", method = RequestMethod.GET)
     @ResponseBody
-    public ResponseEntity<org.springframework.core.io.Resource> downloadGatewayDockerCompose(@ApiParam(value = DEVICE_ID_PARAM_DESCRIPTION)
+    public ResponseEntity<org.springframework.core.io.Resource> downloadGatewayDockerCompose(@Parameter(description = DEVICE_ID_PARAM_DESCRIPTION)
                                                                                              @PathVariable(DEVICE_ID) String strDeviceId, HttpServletRequest request) throws ThingsboardException, URISyntaxException, IOException {
         checkParameter(DEVICE_ID, strDeviceId);
         DeviceId deviceId = new DeviceId(toUUID(strDeviceId));
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 b93f0e0321..fedbd48503 100644
--- a/application/src/main/java/org/thingsboard/server/controller/DeviceController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/DeviceController.java
@@ -19,8 +19,11 @@ 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 io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+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 jakarta.annotation.Nullable;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
@@ -62,6 +65,7 @@ import org.thingsboard.server.common.data.page.TimePageLink;
 import org.thingsboard.server.common.data.security.DeviceCredentials;
 import org.thingsboard.server.common.data.sync.ie.importing.csv.BulkImportRequest;
 import org.thingsboard.server.common.data.sync.ie.importing.csv.BulkImportResult;
+import org.thingsboard.server.config.annotations.ApiOperation;
 import org.thingsboard.server.dao.device.claim.ClaimResponse;
 import org.thingsboard.server.dao.device.claim.ClaimResult;
 import org.thingsboard.server.dao.device.claim.ReclaimResult;
@@ -74,8 +78,7 @@ import org.thingsboard.server.service.security.model.SecurityUser;
 import org.thingsboard.server.service.security.permission.Operation;
 import org.thingsboard.server.service.security.permission.Resource;
 
-import javax.annotation.Nullable;
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
@@ -91,7 +94,6 @@ import static org.thingsboard.server.controller.ControllerConstants.DEVICE_ID_PA
 import static org.thingsboard.server.controller.ControllerConstants.DEVICE_INFO_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.DEVICE_NAME_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.DEVICE_PROFILE_ID_PARAM_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.DEVICE_SORT_PROPERTY_ALLOWABLE_VALUES;
 import static org.thingsboard.server.controller.ControllerConstants.DEVICE_TEXT_SEARCH_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.DEVICE_TYPE_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.DEVICE_UPDATE_CREDENTIALS_PARAM_ACCESS_TOKEN_DESCRIPTION_MARKDOWN;
@@ -111,7 +113,6 @@ import static org.thingsboard.server.controller.ControllerConstants.EDGE_UNASSIG
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_DATA_PARAMETERS;
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_NUMBER_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_SIZE_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_ALLOWABLE_VALUES;
 import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.SORT_PROPERTY_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.TENANT_AUTHORITY_PARAGRAPH;
@@ -142,7 +143,7 @@ public class DeviceController extends BaseController {
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/device/{deviceId}", method = RequestMethod.GET)
     @ResponseBody
-    public Device getDeviceById(@ApiParam(value = DEVICE_ID_PARAM_DESCRIPTION)
+    public Device getDeviceById(@Parameter(description = DEVICE_ID_PARAM_DESCRIPTION)
                                 @PathVariable(DEVICE_ID) String strDeviceId) throws ThingsboardException {
         checkParameter(DEVICE_ID, strDeviceId);
         DeviceId deviceId = new DeviceId(toUUID(strDeviceId));
@@ -157,7 +158,7 @@ public class DeviceController extends BaseController {
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/device/info/{deviceId}", method = RequestMethod.GET)
     @ResponseBody
-    public DeviceInfo getDeviceInfoById(@ApiParam(value = DEVICE_ID_PARAM_DESCRIPTION)
+    public DeviceInfo getDeviceInfoById(@Parameter(description = DEVICE_ID_PARAM_DESCRIPTION)
                                         @PathVariable(DEVICE_ID) String strDeviceId) throws ThingsboardException {
         checkParameter(DEVICE_ID, strDeviceId);
         DeviceId deviceId = new DeviceId(toUUID(strDeviceId));
@@ -176,17 +177,16 @@ public class DeviceController extends BaseController {
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/device", method = RequestMethod.POST)
     @ResponseBody
-    public Device saveDevice(@ApiParam(value = "A JSON value representing the device.") @RequestBody Device device,
-                             @ApiParam(value = "Optional value of the device credentials to be used during device creation. " +
+    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());
-        Device oldDevice = null;
         if (device.getId() != null) {
-            oldDevice = checkDeviceId(device.getId(), Operation.WRITE);
+            checkDeviceId(device.getId(), Operation.WRITE);
         } else {
             checkEntity(null, device, Resource.DEVICE);
         }
-        return tbDeviceService.save(device, oldDevice, accessToken, getCurrentUser());
+        return tbDeviceService.save(device, accessToken, getCurrentUser());
     }
 
     @ApiOperation(value = "Create Device (saveDevice) with credentials ",
@@ -210,7 +210,7 @@ public class DeviceController extends BaseController {
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/device-with-credentials", method = RequestMethod.POST)
     @ResponseBody
-    public Device saveDeviceWithCredentials(@ApiParam(value = "The JSON object with device and credentials. See method description above for example.")
+    public Device saveDeviceWithCredentials(@Parameter(description = "The JSON object with device and credentials. See method description above for example.")
                                             @Valid @RequestBody SaveDeviceWithCredentialsRequest deviceAndCredentials) throws ThingsboardException {
         Device device = deviceAndCredentials.getDevice();
         DeviceCredentials credentials = deviceAndCredentials.getCredentials();
@@ -224,7 +224,7 @@ public class DeviceController extends BaseController {
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/device/{deviceId}", method = RequestMethod.DELETE)
     @ResponseStatus(value = HttpStatus.OK)
-    public void deleteDevice(@ApiParam(value = DEVICE_ID_PARAM_DESCRIPTION)
+    public void deleteDevice(@Parameter(description = DEVICE_ID_PARAM_DESCRIPTION)
                              @PathVariable(DEVICE_ID) String strDeviceId) throws Exception {
         checkParameter(DEVICE_ID, strDeviceId);
         DeviceId deviceId = new DeviceId(toUUID(strDeviceId));
@@ -237,9 +237,9 @@ public class DeviceController extends BaseController {
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/customer/{customerId}/device/{deviceId}", method = RequestMethod.POST)
     @ResponseBody
-    public Device assignDeviceToCustomer(@ApiParam(value = CUSTOMER_ID_PARAM_DESCRIPTION)
+    public Device assignDeviceToCustomer(@Parameter(description = CUSTOMER_ID_PARAM_DESCRIPTION)
                                          @PathVariable("customerId") String strCustomerId,
-                                         @ApiParam(value = DEVICE_ID_PARAM_DESCRIPTION)
+                                         @Parameter(description = DEVICE_ID_PARAM_DESCRIPTION)
                                          @PathVariable(DEVICE_ID) String strDeviceId) throws ThingsboardException {
         checkParameter("customerId", strCustomerId);
         checkParameter(DEVICE_ID, strDeviceId);
@@ -255,7 +255,7 @@ public class DeviceController extends BaseController {
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/customer/device/{deviceId}", method = RequestMethod.DELETE)
     @ResponseBody
-    public Device unassignDeviceFromCustomer(@ApiParam(value = DEVICE_ID_PARAM_DESCRIPTION)
+    public Device unassignDeviceFromCustomer(@Parameter(description = DEVICE_ID_PARAM_DESCRIPTION)
                                              @PathVariable(DEVICE_ID) String strDeviceId) throws ThingsboardException {
         checkParameter(DEVICE_ID, strDeviceId);
         DeviceId deviceId = new DeviceId(toUUID(strDeviceId));
@@ -276,7 +276,7 @@ public class DeviceController extends BaseController {
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/customer/public/device/{deviceId}", method = RequestMethod.POST)
     @ResponseBody
-    public Device assignDeviceToPublicCustomer(@ApiParam(value = DEVICE_ID_PARAM_DESCRIPTION)
+    public Device assignDeviceToPublicCustomer(@Parameter(description = DEVICE_ID_PARAM_DESCRIPTION)
                                                @PathVariable(DEVICE_ID) String strDeviceId) throws ThingsboardException {
         checkParameter(DEVICE_ID, strDeviceId);
         DeviceId deviceId = new DeviceId(toUUID(strDeviceId));
@@ -289,7 +289,7 @@ public class DeviceController extends BaseController {
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/device/{deviceId}/credentials", method = RequestMethod.GET)
     @ResponseBody
-    public DeviceCredentials getDeviceCredentialsByDeviceId(@ApiParam(value = DEVICE_ID_PARAM_DESCRIPTION)
+    public DeviceCredentials getDeviceCredentialsByDeviceId(@Parameter(description = DEVICE_ID_PARAM_DESCRIPTION)
                                                             @PathVariable(DEVICE_ID) String strDeviceId) throws ThingsboardException {
         checkParameter(DEVICE_ID, strDeviceId);
         DeviceId deviceId = new DeviceId(toUUID(strDeviceId));
@@ -322,7 +322,7 @@ public class DeviceController extends BaseController {
     @RequestMapping(value = "/device/credentials", method = RequestMethod.POST)
     @ResponseBody
     public DeviceCredentials updateDeviceCredentials(
-            @ApiParam(value = "A JSON value representing the device credentials.")
+            @Parameter(description = "A JSON value representing the device credentials.")
             @RequestBody DeviceCredentials deviceCredentials) throws ThingsboardException {
         checkNotNull(deviceCredentials);
         Device device = checkDeviceId(deviceCredentials.getDeviceId(), Operation.WRITE_CREDENTIALS);
@@ -336,17 +336,17 @@ public class DeviceController extends BaseController {
     @RequestMapping(value = "/tenant/devices", params = {"pageSize", "page"}, method = RequestMethod.GET)
     @ResponseBody
     public PageData<Device> getTenantDevices(
-            @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
             @RequestParam int pageSize,
-            @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
             @RequestParam int page,
-            @ApiParam(value = DEVICE_TYPE_DESCRIPTION)
+            @Parameter(description = DEVICE_TYPE_DESCRIPTION)
             @RequestParam(required = false) String type,
-            @ApiParam(value = DEVICE_TEXT_SEARCH_DESCRIPTION)
+            @Parameter(description = DEVICE_TEXT_SEARCH_DESCRIPTION)
             @RequestParam(required = false) String textSearch,
-            @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = DEVICE_SORT_PROPERTY_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "name", "deviceProfileName", "label", "customerTitle"}))
             @RequestParam(required = false) String sortProperty,
-            @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
             @RequestParam(required = false) String sortOrder) throws ThingsboardException {
         TenantId tenantId = getCurrentUser().getTenantId();
         PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder);
@@ -364,21 +364,21 @@ public class DeviceController extends BaseController {
     @RequestMapping(value = "/tenant/deviceInfos", params = {"pageSize", "page"}, method = RequestMethod.GET)
     @ResponseBody
     public PageData<DeviceInfo> getTenantDeviceInfos(
-            @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
             @RequestParam int pageSize,
-            @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
             @RequestParam int page,
-            @ApiParam(value = DEVICE_TYPE_DESCRIPTION)
+            @Parameter(description = DEVICE_TYPE_DESCRIPTION)
             @RequestParam(required = false) String type,
-            @ApiParam(value = DEVICE_PROFILE_ID_PARAM_DESCRIPTION)
+            @Parameter(description = DEVICE_PROFILE_ID_PARAM_DESCRIPTION)
             @RequestParam(required = false) String deviceProfileId,
-            @ApiParam(value = DEVICE_ACTIVE_PARAM_DESCRIPTION)
+            @Parameter(description = DEVICE_ACTIVE_PARAM_DESCRIPTION)
             @RequestParam(required = false) Boolean active,
-            @ApiParam(value = DEVICE_TEXT_SEARCH_DESCRIPTION)
+            @Parameter(description = DEVICE_TEXT_SEARCH_DESCRIPTION)
             @RequestParam(required = false) String textSearch,
-            @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = DEVICE_SORT_PROPERTY_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "name", "deviceProfileName", "label", "customerTitle"}))
             @RequestParam(required = false) String sortProperty,
-            @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
             @RequestParam(required = false) String sortOrder
     ) throws ThingsboardException {
         TenantId tenantId = getCurrentUser().getTenantId();
@@ -401,7 +401,7 @@ public class DeviceController extends BaseController {
     @RequestMapping(value = "/tenant/devices", params = {"deviceName"}, method = RequestMethod.GET)
     @ResponseBody
     public Device getTenantDevice(
-            @ApiParam(value = DEVICE_NAME_DESCRIPTION)
+            @Parameter(description = DEVICE_NAME_DESCRIPTION)
             @RequestParam String deviceName) throws ThingsboardException {
         TenantId tenantId = getCurrentUser().getTenantId();
         return checkNotNull(deviceService.findDeviceByTenantIdAndName(tenantId, deviceName));
@@ -414,19 +414,19 @@ public class DeviceController extends BaseController {
     @RequestMapping(value = "/customer/{customerId}/devices", params = {"pageSize", "page"}, method = RequestMethod.GET)
     @ResponseBody
     public PageData<Device> getCustomerDevices(
-            @ApiParam(value = CUSTOMER_ID_PARAM_DESCRIPTION, required = true)
+            @Parameter(description = CUSTOMER_ID_PARAM_DESCRIPTION, required = true)
             @PathVariable(CUSTOMER_ID) String strCustomerId,
-            @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
             @RequestParam int pageSize,
-            @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
             @RequestParam int page,
-            @ApiParam(value = DEVICE_TYPE_DESCRIPTION)
+            @Parameter(description = DEVICE_TYPE_DESCRIPTION)
             @RequestParam(required = false) String type,
-            @ApiParam(value = DEVICE_TEXT_SEARCH_DESCRIPTION)
+            @Parameter(description = DEVICE_TEXT_SEARCH_DESCRIPTION)
             @RequestParam(required = false) String textSearch,
-            @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = DEVICE_SORT_PROPERTY_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "name", "deviceProfileName", "label", "customerTitle"}))
             @RequestParam(required = false) String sortProperty,
-            @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
             @RequestParam(required = false) String sortOrder) throws ThingsboardException {
         checkParameter("customerId", strCustomerId);
         TenantId tenantId = getCurrentUser().getTenantId();
@@ -447,23 +447,23 @@ public class DeviceController extends BaseController {
     @RequestMapping(value = "/customer/{customerId}/deviceInfos", params = {"pageSize", "page"}, method = RequestMethod.GET)
     @ResponseBody
     public PageData<DeviceInfo> getCustomerDeviceInfos(
-            @ApiParam(value = CUSTOMER_ID_PARAM_DESCRIPTION, required = true)
+            @Parameter(description = CUSTOMER_ID_PARAM_DESCRIPTION, required = true)
             @PathVariable("customerId") String strCustomerId,
-            @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
             @RequestParam int pageSize,
-            @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
             @RequestParam int page,
-            @ApiParam(value = DEVICE_TYPE_DESCRIPTION)
+            @Parameter(description = DEVICE_TYPE_DESCRIPTION)
             @RequestParam(required = false) String type,
-            @ApiParam(value = DEVICE_PROFILE_ID_PARAM_DESCRIPTION)
+            @Parameter(description = DEVICE_PROFILE_ID_PARAM_DESCRIPTION)
             @RequestParam(required = false) String deviceProfileId,
-            @ApiParam(value = DEVICE_ACTIVE_PARAM_DESCRIPTION)
+            @Parameter(description = DEVICE_ACTIVE_PARAM_DESCRIPTION)
             @RequestParam(required = false) Boolean active,
-            @ApiParam(value = DEVICE_TEXT_SEARCH_DESCRIPTION)
+            @Parameter(description = DEVICE_TEXT_SEARCH_DESCRIPTION)
             @RequestParam(required = false) String textSearch,
-            @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = DEVICE_SORT_PROPERTY_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "name", "deviceProfileName", "label", "customerTitle"}))
             @RequestParam(required = false) String sortProperty,
-            @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
             @RequestParam(required = false) String sortOrder) throws ThingsboardException {
         checkParameter("customerId", strCustomerId);
         TenantId tenantId = getCurrentUser().getTenantId();
@@ -488,7 +488,7 @@ public class DeviceController extends BaseController {
     @RequestMapping(value = "/devices", params = {"deviceIds"}, method = RequestMethod.GET)
     @ResponseBody
     public List<Device> getDevicesByIds(
-            @ApiParam(value = "A list of devices ids, separated by comma ','")
+            @Parameter(description = "A list of devices ids, separated by comma ','")
             @RequestParam("deviceIds") String[] strDeviceIds) throws ThingsboardException, ExecutionException, InterruptedException {
         checkArrayParameter("deviceIds", strDeviceIds);
         SecurityUser user = getCurrentUser();
@@ -515,7 +515,7 @@ public class DeviceController extends BaseController {
     @RequestMapping(value = "/devices", method = RequestMethod.POST)
     @ResponseBody
     public List<Device> findByQuery(
-            @ApiParam(value = "The device search query JSON")
+            @Parameter(description = "The device search query JSON")
             @RequestBody DeviceSearchQuery query) throws ThingsboardException, ExecutionException, InterruptedException {
         checkNotNull(query);
         checkNotNull(query.getParameters());
@@ -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,
-            produces = 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
@@ -557,9 +556,9 @@ public class DeviceController extends BaseController {
     @PreAuthorize("hasAuthority('CUSTOMER_USER')")
     @RequestMapping(value = "/customer/device/{deviceName}/claim", method = RequestMethod.POST)
     @ResponseBody
-    public DeferredResult<ResponseEntity> claimDevice(@ApiParam(value = "Unique name of the device which is going to be claimed")
+    public DeferredResult<ResponseEntity> claimDevice(@Parameter(description = "Unique name of the device which is going to be claimed")
                                                       @PathVariable(DEVICE_NAME) String deviceName,
-                                                      @ApiParam(value = "Claiming request which can optionally contain secret key")
+                                                      @Parameter(description = "Claiming request which can optionally contain secret key")
                                                       @RequestBody(required = false) ClaimRequest claimRequest) throws ThingsboardException {
         checkParameter(DEVICE_NAME, deviceName);
         final DeferredResult<ResponseEntity> deferredResult = new DeferredResult<>();
@@ -606,7 +605,7 @@ public class DeviceController extends BaseController {
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/customer/device/{deviceName}/claim", method = RequestMethod.DELETE)
     @ResponseStatus(value = HttpStatus.OK)
-    public DeferredResult<ResponseEntity> reClaimDevice(@ApiParam(value = "Unique name of the device which is going to be reclaimed")
+    public DeferredResult<ResponseEntity> reClaimDevice(@Parameter(description = "Unique name of the device which is going to be reclaimed")
                                                         @PathVariable(DEVICE_NAME) String deviceName) throws ThingsboardException {
         checkParameter(DEVICE_NAME, deviceName);
         final DeferredResult<ResponseEntity> deferredResult = new DeferredResult<>();
@@ -646,9 +645,9 @@ public class DeviceController extends BaseController {
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/tenant/{tenantId}/device/{deviceId}", method = RequestMethod.POST)
     @ResponseBody
-    public Device assignDeviceToTenant(@ApiParam(value = TENANT_ID_PARAM_DESCRIPTION)
+    public Device assignDeviceToTenant(@Parameter(description = TENANT_ID_PARAM_DESCRIPTION)
                                        @PathVariable(TENANT_ID) String strTenantId,
-                                       @ApiParam(value = DEVICE_ID_PARAM_DESCRIPTION)
+                                       @Parameter(description = DEVICE_ID_PARAM_DESCRIPTION)
                                        @PathVariable(DEVICE_ID) String strDeviceId) throws ThingsboardException {
         checkParameter(TENANT_ID, strTenantId);
         checkParameter(DEVICE_ID, strDeviceId);
@@ -668,14 +667,13 @@ 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,
-            produces = 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
-    public Device assignDeviceToEdge(@ApiParam(value = EDGE_ID_PARAM_DESCRIPTION)
+    public Device assignDeviceToEdge(@Parameter(description = EDGE_ID_PARAM_DESCRIPTION)
                                      @PathVariable(EDGE_ID) String strEdgeId,
-                                     @ApiParam(value = DEVICE_ID_PARAM_DESCRIPTION)
+                                     @Parameter(description = DEVICE_ID_PARAM_DESCRIPTION)
                                      @PathVariable(DEVICE_ID) String strDeviceId) throws ThingsboardException {
         checkParameter(EDGE_ID, strEdgeId);
         checkParameter(DEVICE_ID, strDeviceId);
@@ -693,14 +691,13 @@ 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,
-            produces = 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
-    public Device unassignDeviceFromEdge(@ApiParam(value = EDGE_ID_PARAM_DESCRIPTION)
+    public Device unassignDeviceFromEdge(@Parameter(description = EDGE_ID_PARAM_DESCRIPTION)
                                          @PathVariable(EDGE_ID) String strEdgeId,
-                                         @ApiParam(value = DEVICE_ID_PARAM_DESCRIPTION)
+                                         @Parameter(description = DEVICE_ID_PARAM_DESCRIPTION)
                                          @PathVariable(DEVICE_ID) String strDeviceId) throws ThingsboardException {
         checkParameter(EDGE_ID, strEdgeId);
         checkParameter(DEVICE_ID, strDeviceId);
@@ -719,27 +716,27 @@ public class DeviceController extends BaseController {
     @RequestMapping(value = "/edge/{edgeId}/devices", params = {"pageSize", "page"}, method = RequestMethod.GET)
     @ResponseBody
     public PageData<DeviceInfo> getEdgeDevices(
-            @ApiParam(value = EDGE_ID_PARAM_DESCRIPTION, required = true)
+            @Parameter(description = EDGE_ID_PARAM_DESCRIPTION, required = true)
             @PathVariable(EDGE_ID) String strEdgeId,
-            @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
             @RequestParam int pageSize,
-            @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
             @RequestParam int page,
-            @ApiParam(value = DEVICE_TYPE_DESCRIPTION)
+            @Parameter(description = DEVICE_TYPE_DESCRIPTION)
             @RequestParam(required = false) String type,
-            @ApiParam(value = DEVICE_PROFILE_ID_PARAM_DESCRIPTION)
+            @Parameter(description = DEVICE_PROFILE_ID_PARAM_DESCRIPTION)
             @RequestParam(required = false) String deviceProfileId,
-            @ApiParam(value = DEVICE_ACTIVE_PARAM_DESCRIPTION)
+            @Parameter(description = DEVICE_ACTIVE_PARAM_DESCRIPTION)
             @RequestParam(required = false) Boolean active,
-            @ApiParam(value = DEVICE_TEXT_SEARCH_DESCRIPTION)
+            @Parameter(description = DEVICE_TEXT_SEARCH_DESCRIPTION)
             @RequestParam(required = false) String textSearch,
-            @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = DEVICE_SORT_PROPERTY_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "name", "deviceProfileName", "label", "customerTitle"}))
             @RequestParam(required = false) String sortProperty,
-            @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
             @RequestParam(required = false) String sortOrder,
-            @ApiParam(value = "Timestamp. Devices with creation time before it won't be queried")
+            @Parameter(description = "Timestamp. Devices with creation time before it won't be queried")
             @RequestParam(required = false) Long startTime,
-            @ApiParam(value = "Timestamp. Devices with creation time after it won't be queried")
+            @Parameter(description = "Timestamp. Devices with creation time after it won't be queried")
             @RequestParam(required = false) Long endTime) throws ThingsboardException {
         checkParameter(EDGE_ID, strEdgeId);
         TenantId tenantId = getCurrentUser().getTenantId();
@@ -766,11 +763,11 @@ public class DeviceController extends BaseController {
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/devices/count/{otaPackageType}/{deviceProfileId}", method = RequestMethod.GET)
     @ResponseBody
-    public Long countByDeviceProfileAndEmptyOtaPackage
-            (@ApiParam(value = "OTA package type", allowableValues = "FIRMWARE, SOFTWARE")
-             @PathVariable("otaPackageType") String otaPackageType,
-             @ApiParam(value = "Device Profile Id. I.g. '784f394c-42b6-435a-983c-b7beff2784f9'")
-             @PathVariable("deviceProfileId") String deviceProfileId) throws ThingsboardException {
+    public Long countByDeviceProfileAndEmptyOtaPackage(
+            @Parameter(description = "OTA package type", schema = @Schema(allowableValues = {"FIRMWARE", "SOFTWARE"}))
+            @PathVariable("otaPackageType") String otaPackageType,
+            @Parameter(description = "Device Profile Id. I.g. '784f394c-42b6-435a-983c-b7beff2784f9'")
+            @PathVariable("deviceProfileId") String deviceProfileId) throws ThingsboardException {
         checkParameter("OtaPackageType", otaPackageType);
         checkParameter("DeviceProfileId", deviceProfileId);
         return deviceService.countDevicesByTenantIdAndDeviceProfileIdAndEmptyOtaPackage(
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 bcbd2e4ef1..b84e801d31 100644
--- a/application/src/main/java/org/thingsboard/server/controller/DeviceProfileController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/DeviceProfileController.java
@@ -15,12 +15,15 @@
  */
 package org.thingsboard.server.controller;
 
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+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;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -40,6 +43,7 @@ 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.dao.resource.ImageService;
+import org.thingsboard.server.config.annotations.ApiOperation;
 import org.thingsboard.server.dao.timeseries.TimeseriesService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.entitiy.device.profile.TbDeviceProfileService;
@@ -54,7 +58,6 @@ import static org.thingsboard.server.controller.ControllerConstants.DEVICE_PROFI
 import static org.thingsboard.server.controller.ControllerConstants.DEVICE_PROFILE_ID;
 import static org.thingsboard.server.controller.ControllerConstants.DEVICE_PROFILE_ID_PARAM_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.DEVICE_PROFILE_INFO_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.DEVICE_PROFILE_SORT_PROPERTY_ALLOWABLE_VALUES;
 import static org.thingsboard.server.controller.ControllerConstants.DEVICE_PROFILE_TEXT_SEARCH_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.INLINE_IMAGES;
 import static org.thingsboard.server.controller.ControllerConstants.INLINE_IMAGES_DESCRIPTION;
@@ -62,12 +65,10 @@ import static org.thingsboard.server.controller.ControllerConstants.NEW_LINE;
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_DATA_PARAMETERS;
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_NUMBER_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_SIZE_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_ALLOWABLE_VALUES;
 import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.SORT_PROPERTY_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.TENANT_AUTHORITY_PARAGRAPH;
 import static org.thingsboard.server.controller.ControllerConstants.TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH;
-import static org.thingsboard.server.controller.ControllerConstants.TRANSPORT_TYPE_ALLOWABLE_VALUES;
 import static org.thingsboard.server.controller.ControllerConstants.UUID_WIKI_LINK;
 
 @RestController
@@ -85,15 +86,14 @@ 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,
-            produces = "application/json")
+                    "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
     public DeviceProfile getDeviceProfileById(
-            @ApiParam(value = DEVICE_PROFILE_ID_PARAM_DESCRIPTION)
+            @Parameter(description = DEVICE_PROFILE_ID_PARAM_DESCRIPTION)
             @PathVariable(DEVICE_PROFILE_ID) String strDeviceProfileId,
-            @ApiParam(value = INLINE_IMAGES_DESCRIPTION)
+            @Parameter(description = INLINE_IMAGES_DESCRIPTION)
             @RequestParam(value = INLINE_IMAGES, required = false) boolean inlineImages) throws ThingsboardException {
         checkParameter(DEVICE_PROFILE_ID, strDeviceProfileId);
         DeviceProfileId deviceProfileId = new DeviceProfileId(toUUID(strDeviceProfileId));
@@ -106,13 +106,12 @@ 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,
-            produces = "application/json")
+                    + DEVICE_PROFILE_INFO_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/deviceProfileInfo/{deviceProfileId}", method = RequestMethod.GET)
     @ResponseBody
     public DeviceProfileInfo getDeviceProfileInfoById(
-            @ApiParam(value = DEVICE_PROFILE_ID_PARAM_DESCRIPTION)
+            @Parameter(description = DEVICE_PROFILE_ID_PARAM_DESCRIPTION)
             @PathVariable(DEVICE_PROFILE_ID) String strDeviceProfileId) throws ThingsboardException {
         checkParameter(DEVICE_PROFILE_ID, strDeviceProfileId);
         DeviceProfileId deviceProfileId = new DeviceProfileId(toUUID(strDeviceProfileId));
@@ -121,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,
-            produces = "application/json")
+                    DEVICE_PROFILE_INFO_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/deviceProfileInfo/default", method = RequestMethod.GET)
     @ResponseBody
@@ -135,13 +133,12 @@ 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,
-            produces = "application/json")
+                    TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/deviceProfile/devices/keys/timeseries", method = RequestMethod.GET)
     @ResponseBody
     public List<String> getTimeseriesKeys(
-            @ApiParam(value = DEVICE_PROFILE_ID_PARAM_DESCRIPTION)
+            @Parameter(description = DEVICE_PROFILE_ID_PARAM_DESCRIPTION)
             @RequestParam(name = DEVICE_PROFILE_ID, required = false) String deviceProfileIdStr) throws ThingsboardException {
         DeviceProfileId deviceProfileId;
         if (StringUtils.isNotEmpty(deviceProfileIdStr)) {
@@ -159,13 +156,12 @@ 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,
-            produces = "application/json")
+                    TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/deviceProfile/devices/keys/attributes", method = RequestMethod.GET)
     @ResponseBody
     public List<String> getAttributesKeys(
-            @ApiParam(value = DEVICE_PROFILE_ID_PARAM_DESCRIPTION)
+            @Parameter(description = DEVICE_PROFILE_ID_PARAM_DESCRIPTION)
             @RequestParam(name = DEVICE_PROFILE_ID, required = false) String deviceProfileIdStr) throws ThingsboardException {
         DeviceProfileId deviceProfileId;
         if (StringUtils.isNotEmpty(deviceProfileIdStr)) {
@@ -185,14 +181,12 @@ 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,
-            produces = "application/json",
-            consumes = "application/json")
+                    TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/deviceProfile", method = RequestMethod.POST)
     @ResponseBody
     public DeviceProfile saveDeviceProfile(
-            @ApiParam(value = "A JSON value representing the device profile.")
+            @Parameter(description = "A JSON value representing the device profile.")
             @RequestBody DeviceProfile deviceProfile) throws Exception {
         deviceProfile.setTenantId(getTenantId());
         checkEntity(deviceProfile.getId(), deviceProfile, Resource.DEVICE_PROFILE);
@@ -201,13 +195,12 @@ public class DeviceProfileController extends BaseController {
 
     @ApiOperation(value = "Delete device profile (deleteDeviceProfile)",
             notes = "Deletes the device profile. Referencing non-existing device profile Id will cause an error. " +
-                    "Can't delete the device profile if it is referenced by existing devices." + TENANT_AUTHORITY_PARAGRAPH,
-            produces = "application/json")
+                    "Can't delete the device profile if it is referenced by existing devices." + TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/deviceProfile/{deviceProfileId}", method = RequestMethod.DELETE)
     @ResponseStatus(value = HttpStatus.OK)
     public void deleteDeviceProfile(
-            @ApiParam(value = DEVICE_PROFILE_ID_PARAM_DESCRIPTION)
+            @Parameter(description = DEVICE_PROFILE_ID_PARAM_DESCRIPTION)
             @PathVariable(DEVICE_PROFILE_ID) String strDeviceProfileId) throws ThingsboardException {
         checkParameter(DEVICE_PROFILE_ID, strDeviceProfileId);
         DeviceProfileId deviceProfileId = new DeviceProfileId(toUUID(strDeviceProfileId));
@@ -216,13 +209,12 @@ 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,
-            produces = "application/json")
+            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
     public DeviceProfile setDefaultDeviceProfile(
-            @ApiParam(value = DEVICE_PROFILE_ID_PARAM_DESCRIPTION)
+            @Parameter(description = DEVICE_PROFILE_ID_PARAM_DESCRIPTION)
             @PathVariable(DEVICE_PROFILE_ID) String strDeviceProfileId) throws ThingsboardException {
         checkParameter(DEVICE_PROFILE_ID, strDeviceProfileId);
         DeviceProfileId deviceProfileId = new DeviceProfileId(toUUID(strDeviceProfileId));
@@ -233,21 +225,20 @@ 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,
-            produces = "application/json")
+                    PAGE_DATA_PARAMETERS + TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/deviceProfiles", params = {"pageSize", "page"}, method = RequestMethod.GET)
     @ResponseBody
     public PageData<DeviceProfile> getDeviceProfiles(
-            @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
             @RequestParam int pageSize,
-            @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
             @RequestParam int page,
-            @ApiParam(value = DEVICE_PROFILE_TEXT_SEARCH_DESCRIPTION)
+            @Parameter(description = DEVICE_PROFILE_TEXT_SEARCH_DESCRIPTION)
             @RequestParam(required = false) String textSearch,
-            @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = DEVICE_PROFILE_SORT_PROPERTY_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "name", "type", "transportType", "description", "isDefault"}))
             @RequestParam(required = false) String sortProperty,
-            @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
             @RequestParam(required = false) String sortOrder) throws ThingsboardException {
         PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder);
         return checkNotNull(deviceProfileService.findDeviceProfiles(getTenantId(), pageLink));
@@ -255,23 +246,22 @@ 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,
-            produces = "application/json")
+                    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
     public PageData<DeviceProfileInfo> getDeviceProfileInfos(
-            @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
             @RequestParam int pageSize,
-            @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
             @RequestParam int page,
-            @ApiParam(value = DEVICE_PROFILE_TEXT_SEARCH_DESCRIPTION)
+            @Parameter(description = DEVICE_PROFILE_TEXT_SEARCH_DESCRIPTION)
             @RequestParam(required = false) String textSearch,
-            @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = DEVICE_PROFILE_SORT_PROPERTY_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "name", "type", "transportType", "description", "isDefault"}))
             @RequestParam(required = false) String sortProperty,
-            @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
             @RequestParam(required = false) String sortOrder,
-            @ApiParam(value = "Type of the transport", allowableValues = TRANSPORT_TYPE_ALLOWABLE_VALUES)
+            @Parameter(description = "Type of the transport", schema = @Schema(allowableValues = {"DEFAULT", "MQTT", "COAP", "LWM2M", "SNMP"}))
             @RequestParam(required = false) String transportType) throws ThingsboardException {
         PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder);
         return checkNotNull(deviceProfileService.findDeviceProfileInfos(getTenantId(), pageLink, transportType));
@@ -284,7 +274,7 @@ public class DeviceProfileController extends BaseController {
     @RequestMapping(value = "/deviceProfile/names", method = RequestMethod.GET)
     @ResponseBody
     public List<EntityInfo> getDeviceProfileNames(
-            @ApiParam(value = "Flag indicating whether to retrieve exclusively the names of device profiles that are referenced by tenant's devices.")
+            @Parameter(description = "Flag indicating whether to retrieve exclusively the names of device profiles that are referenced by tenant's devices.")
             @RequestParam(value = "activeOnly", required = false, defaultValue = "false") boolean activeOnly) throws ThingsboardException {
         SecurityUser user = getCurrentUser();
         TenantId tenantId = user.getTenantId();
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 e07a9d5573..3042b8f2a1 100644
--- a/application/src/main/java/org/thingsboard/server/controller/EdgeController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/EdgeController.java
@@ -16,8 +16,11 @@
 package org.thingsboard.server.controller;
 
 import com.google.common.util.concurrent.ListenableFuture;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+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 jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
@@ -54,6 +57,7 @@ import org.thingsboard.server.common.data.sync.ie.importing.csv.BulkImportReques
 import org.thingsboard.server.common.data.sync.ie.importing.csv.BulkImportResult;
 import org.thingsboard.server.common.msg.edge.FromEdgeSyncResponse;
 import org.thingsboard.server.common.msg.edge.ToEdgeSyncRequest;
+import org.thingsboard.server.config.annotations.ApiOperation;
 import org.thingsboard.server.dao.exception.DataValidationException;
 import org.thingsboard.server.dao.exception.IncorrectParameterException;
 import org.thingsboard.server.dao.model.ModelConstants;
@@ -67,7 +71,6 @@ import org.thingsboard.server.service.security.model.SecurityUser;
 import org.thingsboard.server.service.security.permission.Operation;
 import org.thingsboard.server.service.security.permission.Resource;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
@@ -78,14 +81,12 @@ import java.util.stream.Collectors;
 import static org.thingsboard.server.controller.ControllerConstants.CUSTOMER_ID_PARAM_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.EDGE_ID_PARAM_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.EDGE_INFO_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.EDGE_SORT_PROPERTY_ALLOWABLE_VALUES;
 import static org.thingsboard.server.controller.ControllerConstants.EDGE_TEXT_SEARCH_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.EDGE_TYPE_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_DATA_PARAMETERS;
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_NUMBER_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_SIZE_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.RULE_CHAIN_ID_PARAM_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_ALLOWABLE_VALUES;
 import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.SORT_PROPERTY_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.TENANT_AUTHORITY_PARAGRAPH;
@@ -119,12 +120,11 @@ 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,
-            produces = 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
-    public Edge getEdgeById(@ApiParam(value = EDGE_ID_PARAM_DESCRIPTION, required = true)
+    public Edge getEdgeById(@Parameter(description = EDGE_ID_PARAM_DESCRIPTION, required = true)
                             @PathVariable(EDGE_ID) String strEdgeId) throws ThingsboardException {
         checkParameter(EDGE_ID, strEdgeId);
         EdgeId edgeId = new EdgeId(toUUID(strEdgeId));
@@ -132,12 +132,11 @@ 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,
-            produces = 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
-    public EdgeInfo getEdgeInfoById(@ApiParam(value = EDGE_ID_PARAM_DESCRIPTION, required = true)
+    public EdgeInfo getEdgeInfoById(@Parameter(description = EDGE_ID_PARAM_DESCRIPTION, required = true)
                                     @PathVariable(EDGE_ID) String strEdgeId) throws ThingsboardException {
         checkParameter(EDGE_ID, strEdgeId);
         EdgeId edgeId = new EdgeId(toUUID(strEdgeId));
@@ -151,12 +150,11 @@ 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,
-            produces = MediaType.APPLICATION_JSON_VALUE)
+                    TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/edge", method = RequestMethod.POST)
     @ResponseBody
-    public Edge saveEdge(@ApiParam(value = "A JSON value representing the edge.", required = true)
+    public Edge saveEdge(@Parameter(description = "A JSON value representing the edge.", required = true)
                          @RequestBody Edge edge) throws Exception {
         TenantId tenantId = getTenantId();
         edge.setTenantId(tenantId);
@@ -182,7 +180,7 @@ public class EdgeController extends BaseController {
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/edge/{edgeId}", method = RequestMethod.DELETE)
     @ResponseStatus(value = HttpStatus.OK)
-    public void deleteEdge(@ApiParam(value = EDGE_ID_PARAM_DESCRIPTION, required = true)
+    public void deleteEdge(@Parameter(description = EDGE_ID_PARAM_DESCRIPTION, required = true)
                            @PathVariable(EDGE_ID) String strEdgeId) throws ThingsboardException {
         checkParameter(EDGE_ID, strEdgeId);
         EdgeId edgeId = new EdgeId(toUUID(strEdgeId));
@@ -192,19 +190,19 @@ 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, produces = MediaType.APPLICATION_JSON_VALUE)
+                    PAGE_DATA_PARAMETERS + TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/edges", params = {"pageSize", "page"}, method = RequestMethod.GET)
     @ResponseBody
-    public PageData<Edge> getEdges(@ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+    public PageData<Edge> getEdges(@Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
                                    @RequestParam int pageSize,
-                                   @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+                                   @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
                                    @RequestParam int page,
-                                   @ApiParam(value = EDGE_TEXT_SEARCH_DESCRIPTION)
+                                   @Parameter(description = EDGE_TEXT_SEARCH_DESCRIPTION)
                                    @RequestParam(required = false) String textSearch,
-                                   @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = EDGE_SORT_PROPERTY_ALLOWABLE_VALUES)
+                                   @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "name", "type", "label", "customerTitle"}))
                                    @RequestParam(required = false) String sortProperty,
-                                   @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+                                   @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
                                    @RequestParam(required = false) String sortOrder) throws ThingsboardException {
         PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder);
         TenantId tenantId = getCurrentUser().getTenantId();
@@ -212,14 +210,13 @@ 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,
-            produces = 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
-    public Edge assignEdgeToCustomer(@ApiParam(value = CUSTOMER_ID_PARAM_DESCRIPTION, required = true)
+    public Edge assignEdgeToCustomer(@Parameter(description = CUSTOMER_ID_PARAM_DESCRIPTION, required = true)
                                      @PathVariable("customerId") String strCustomerId,
-                                     @ApiParam(value = EDGE_ID_PARAM_DESCRIPTION, required = true)
+                                     @Parameter(description = EDGE_ID_PARAM_DESCRIPTION, required = true)
                                      @PathVariable(EDGE_ID) String strEdgeId) throws ThingsboardException {
         checkParameter("customerId", strCustomerId);
         checkParameter(EDGE_ID, strEdgeId);
@@ -231,12 +228,11 @@ 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,
-            produces = 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
-    public Edge unassignEdgeFromCustomer(@ApiParam(value = EDGE_ID_PARAM_DESCRIPTION, required = true)
+    public Edge unassignEdgeFromCustomer(@Parameter(description = EDGE_ID_PARAM_DESCRIPTION, required = true)
                                          @PathVariable(EDGE_ID) String strEdgeId) throws ThingsboardException {
         checkParameter(EDGE_ID, strEdgeId);
         EdgeId edgeId = new EdgeId(toUUID(strEdgeId));
@@ -252,12 +248,11 @@ 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,
-            produces = 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
-    public Edge assignEdgeToPublicCustomer(@ApiParam(value = EDGE_ID_PARAM_DESCRIPTION, required = true)
+    public Edge assignEdgeToPublicCustomer(@Parameter(description = EDGE_ID_PARAM_DESCRIPTION, required = true)
                                            @PathVariable(EDGE_ID) String strEdgeId) throws ThingsboardException {
         checkParameter(EDGE_ID, strEdgeId);
         EdgeId edgeId = new EdgeId(toUUID(strEdgeId));
@@ -267,22 +262,22 @@ 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, produces = 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
     public PageData<Edge> getTenantEdges(
-            @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
             @RequestParam int pageSize,
-            @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
             @RequestParam int page,
-            @ApiParam(value = EDGE_TYPE_DESCRIPTION)
+            @Parameter(description = EDGE_TYPE_DESCRIPTION)
             @RequestParam(required = false) String type,
-            @ApiParam(value = EDGE_TEXT_SEARCH_DESCRIPTION)
+            @Parameter(description = EDGE_TEXT_SEARCH_DESCRIPTION)
             @RequestParam(required = false) String textSearch,
-            @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = EDGE_SORT_PROPERTY_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "name", "type", "label", "customerTitle"}))
             @RequestParam(required = false) String sortProperty,
-            @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
             @RequestParam(required = false) String sortOrder) throws ThingsboardException {
         TenantId tenantId = getCurrentUser().getTenantId();
         PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder);
@@ -295,23 +290,22 @@ 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,
-            produces = 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
     public PageData<EdgeInfo> getTenantEdgeInfos(
-            @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
             @RequestParam int pageSize,
-            @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
             @RequestParam int page,
-            @ApiParam(value = EDGE_TYPE_DESCRIPTION)
+            @Parameter(description = EDGE_TYPE_DESCRIPTION)
             @RequestParam(required = false) String type,
-            @ApiParam(value = EDGE_TEXT_SEARCH_DESCRIPTION)
+            @Parameter(description = EDGE_TEXT_SEARCH_DESCRIPTION)
             @RequestParam(required = false) String textSearch,
-            @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = EDGE_SORT_PROPERTY_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "name", "type", "label", "customerTitle"}))
             @RequestParam(required = false) String sortProperty,
-            @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
             @RequestParam(required = false) String sortOrder) throws ThingsboardException {
         TenantId tenantId = getCurrentUser().getTenantId();
         PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder);
@@ -324,12 +318,11 @@ 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,
-            produces = 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
-    public Edge getTenantEdge(@ApiParam(value = "Unique name of the edge", required = true)
+    public Edge getTenantEdge(@Parameter(description = "Unique name of the edge", required = true)
                               @RequestParam String edgeName) throws ThingsboardException {
         TenantId tenantId = getCurrentUser().getTenantId();
         return checkNotNull(edgeService.findEdgeByTenantIdAndName(tenantId, edgeName));
@@ -337,14 +330,13 @@ 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,
-            produces = 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
-    public Edge setEdgeRootRuleChain(@ApiParam(value = EDGE_ID_PARAM_DESCRIPTION, required = true)
+    public Edge setEdgeRootRuleChain(@Parameter(description = EDGE_ID_PARAM_DESCRIPTION, required = true)
                                      @PathVariable(EDGE_ID) String strEdgeId,
-                                     @ApiParam(value = RULE_CHAIN_ID_PARAM_DESCRIPTION, required = true)
+                                     @Parameter(description = RULE_CHAIN_ID_PARAM_DESCRIPTION, required = true)
                                      @PathVariable("ruleChainId") String strRuleChainId) throws Exception {
         checkParameter(EDGE_ID, strEdgeId);
         checkParameter("ruleChainId", strRuleChainId);
@@ -358,24 +350,24 @@ 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, produces = 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
     public PageData<Edge> getCustomerEdges(
-            @ApiParam(value = CUSTOMER_ID_PARAM_DESCRIPTION)
+            @Parameter(description = CUSTOMER_ID_PARAM_DESCRIPTION)
             @PathVariable("customerId") String strCustomerId,
-            @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
             @RequestParam int pageSize,
-            @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
             @RequestParam int page,
-            @ApiParam(value = EDGE_TYPE_DESCRIPTION)
+            @Parameter(description = EDGE_TYPE_DESCRIPTION)
             @RequestParam(required = false) String type,
-            @ApiParam(value = EDGE_TEXT_SEARCH_DESCRIPTION)
+            @Parameter(description = EDGE_TEXT_SEARCH_DESCRIPTION)
             @RequestParam(required = false) String textSearch,
-            @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = EDGE_SORT_PROPERTY_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "name", "type", "label", "customerTitle"}))
             @RequestParam(required = false) String sortProperty,
-            @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
             @RequestParam(required = false) String sortOrder) throws ThingsboardException {
         checkParameter("customerId", strCustomerId);
         SecurityUser user = getCurrentUser();
@@ -394,24 +386,24 @@ 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, produces = 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
     public PageData<EdgeInfo> getCustomerEdgeInfos(
-            @ApiParam(value = CUSTOMER_ID_PARAM_DESCRIPTION)
+            @Parameter(description = CUSTOMER_ID_PARAM_DESCRIPTION)
             @PathVariable("customerId") String strCustomerId,
-            @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
             @RequestParam int pageSize,
-            @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
             @RequestParam int page,
-            @ApiParam(value = EDGE_TYPE_DESCRIPTION)
+            @Parameter(description = EDGE_TYPE_DESCRIPTION)
             @RequestParam(required = false) String type,
-            @ApiParam(value = EDGE_TEXT_SEARCH_DESCRIPTION)
+            @Parameter(description = EDGE_TEXT_SEARCH_DESCRIPTION)
             @RequestParam(required = false) String textSearch,
-            @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = EDGE_SORT_PROPERTY_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "name", "type", "label", "customerTitle"}))
             @RequestParam(required = false) String sortProperty,
-            @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
             @RequestParam(required = false) String sortOrder) throws ThingsboardException {
         checkParameter("customerId", strCustomerId);
         SecurityUser user = getCurrentUser();
@@ -429,13 +421,12 @@ 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,
-            produces = 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
     public List<Edge> getEdgesByIds(
-            @ApiParam(value = "A list of edges ids, separated by comma ','", required = true)
+            @Parameter(description = "A list of edges ids, separated by comma ','", required = true)
             @RequestParam("edgeIds") String[] strEdgeIds) throws ThingsboardException, ExecutionException, InterruptedException {
         checkArrayParameter("edgeIds", strEdgeIds);
         SecurityUser user = getCurrentUser();
@@ -458,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,
-            produces = 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
@@ -484,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,
-            produces = MediaType.APPLICATION_JSON_VALUE)
+                    + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/edge/types", method = RequestMethod.GET)
     @ResponseBody
@@ -501,7 +490,7 @@ public class EdgeController extends BaseController {
                     "All entities that are assigned to particular edge are going to be send to remote edge service." + TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/edge/sync/{edgeId}", method = RequestMethod.POST)
-    public DeferredResult<ResponseEntity> syncEdge(@ApiParam(value = EDGE_ID_PARAM_DESCRIPTION, required = true)
+    public DeferredResult<ResponseEntity> syncEdge(@Parameter(description = EDGE_ID_PARAM_DESCRIPTION, required = true)
                          @PathVariable("edgeId") String strEdgeId) throws ThingsboardException {
         checkParameter("edgeId", strEdgeId);
         final DeferredResult<ResponseEntity> response = new DeferredResult<>();
@@ -531,7 +520,7 @@ public class EdgeController extends BaseController {
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/edge/missingToRelatedRuleChains/{edgeId}", method = RequestMethod.GET)
     @ResponseBody
-    public String findMissingToRelatedRuleChains(@ApiParam(value = EDGE_ID_PARAM_DESCRIPTION, required = true)
+    public String findMissingToRelatedRuleChains(@Parameter(description = EDGE_ID_PARAM_DESCRIPTION, required = true)
                                                  @PathVariable("edgeId") String strEdgeId) throws ThingsboardException {
         EdgeId edgeId = new EdgeId(toUUID(strEdgeId));
         edgeId = checkNotNull(edgeId);
@@ -541,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,
-            produces = 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 {
@@ -556,15 +544,14 @@ public class EdgeController extends BaseController {
     }
 
     @ApiOperation(value = "Get Edge Install Instructions (getEdgeInstallInstructions)",
-            notes = "Get an install instructions for provided edge id." + TENANT_AUTHORITY_PARAGRAPH,
-            produces = 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
     public EdgeInstructions getEdgeInstallInstructions(
-            @ApiParam(value = EDGE_ID_PARAM_DESCRIPTION, required = true)
+            @Parameter(description = EDGE_ID_PARAM_DESCRIPTION, required = true)
             @PathVariable("edgeId") String strEdgeId,
-            @ApiParam(value = "Installation method ('docker', 'ubuntu' or 'centos')", allowableValues = "docker, ubuntu, centos")
+            @Parameter(description = "Installation method ('docker', 'ubuntu' or 'centos')", schema = @Schema(allowableValues = {"docker", "ubuntu", "centos"}))
             @PathVariable("method") String installationMethod,
             HttpServletRequest request) throws ThingsboardException {
         if (isEdgesEnabled() && edgeInstallServiceOpt.isPresent()) {
@@ -578,15 +565,14 @@ public class EdgeController extends BaseController {
     }
 
     @ApiOperation(value = "Get Edge Upgrade Instructions (getEdgeUpgradeInstructions)",
-            notes = "Get an upgrade instructions for provided edge version." + TENANT_AUTHORITY_PARAGRAPH,
-            produces = 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
     public EdgeInstructions getEdgeUpgradeInstructions(
-            @ApiParam(value = "Edge version", required = true)
+            @Parameter(description = "Edge version", required = true)
             @PathVariable("edgeVersion") String edgeVersion,
-            @ApiParam(value = "Upgrade method ('docker', 'ubuntu' or 'centos')", allowableValues = "docker, ubuntu, centos")
+            @Parameter(description = "Upgrade method ('docker', 'ubuntu' or 'centos')", schema = @Schema(allowableValues = {"docker", "ubuntu", "centos"}))
             @PathVariable("method") String method) throws Exception {
         if (isEdgesEnabled() && edgeUpgradeServiceOpt.isPresent()) {
             return checkNotNull(edgeUpgradeServiceOpt.get().getUpgradeInstructions(edgeVersion, method));
@@ -601,7 +587,7 @@ public class EdgeController extends BaseController {
     @RequestMapping(value = "/edge/{edgeId}/upgrade/available", method = RequestMethod.GET)
     @ResponseBody
     public boolean isEdgeUpgradeAvailable(
-            @ApiParam(value = EDGE_ID_PARAM_DESCRIPTION, required = true)
+            @Parameter(description = EDGE_ID_PARAM_DESCRIPTION, required = true)
             @PathVariable("edgeId") String strEdgeId) throws Exception {
         if (isEdgesEnabled() && edgeUpgradeServiceOpt.isPresent()) {
             EdgeId edgeId = new EdgeId(toUUID(strEdgeId));
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 39e27bf260..d1912ba38f 100644
--- a/application/src/main/java/org/thingsboard/server/controller/EdgeEventController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/EdgeEventController.java
@@ -15,8 +15,10 @@
  */
 package org.thingsboard.server.controller;
 
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+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.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
@@ -33,16 +35,15 @@ import org.thingsboard.server.common.data.id.EdgeId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.TimePageLink;
+import org.thingsboard.server.config.annotations.ApiOperation;
 import org.thingsboard.server.dao.edge.EdgeEventService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.security.permission.Operation;
 
 import static org.thingsboard.server.controller.ControllerConstants.EDGE_ID_PARAM_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.EDGE_SORT_PROPERTY_ALLOWABLE_VALUES;
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_DATA_PARAMETERS;
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_NUMBER_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_SIZE_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_ALLOWABLE_VALUES;
 import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.SORT_PROPERTY_DESCRIPTION;
 
@@ -59,26 +60,26 @@ 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, produces = MediaType.APPLICATION_JSON_VALUE)
+                    PAGE_DATA_PARAMETERS)
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/edge/{edgeId}/events", method = RequestMethod.GET)
     @ResponseBody
     public PageData<EdgeEvent> getEdgeEvents(
-            @ApiParam(value = EDGE_ID_PARAM_DESCRIPTION, required = true)
+            @Parameter(description = EDGE_ID_PARAM_DESCRIPTION, required = true)
             @PathVariable(EDGE_ID) String strEdgeId,
-            @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
             @RequestParam int pageSize,
-            @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
             @RequestParam int page,
-            @ApiParam(value = "The case insensitive 'substring' filter based on the edge event type name.")
+            @Parameter(description = "The case insensitive 'substring' filter based on the edge event type name.")
             @RequestParam(required = false) String textSearch,
-            @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = EDGE_SORT_PROPERTY_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "name", "type", "label", "customerTitle"}))
             @RequestParam(required = false) String sortProperty,
-            @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
             @RequestParam(required = false) String sortOrder,
-            @ApiParam(value = "Timestamp. Edge events with creation time before it won't be queried")
+            @Parameter(description = "Timestamp. Edge events with creation time before it won't be queried")
             @RequestParam(required = false) Long startTime,
-            @ApiParam(value = "Timestamp. Edge events with creation time after it won't be queried")
+            @Parameter(description = "Timestamp. Edge events with creation time after it won't be queried")
             @RequestParam(required = false) Long endTime) throws ThingsboardException {
         checkParameter(EDGE_ID, strEdgeId);
         TenantId tenantId = getCurrentUser().getTenantId();
diff --git a/application/src/main/java/org/thingsboard/server/controller/EntitiesVersionControlController.java b/application/src/main/java/org/thingsboard/server/controller/EntitiesVersionControlController.java
index 1e8b14ea77..d3ca3e5ea0 100644
--- a/application/src/main/java/org/thingsboard/server/controller/EntitiesVersionControlController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/EntitiesVersionControlController.java
@@ -18,8 +18,8 @@ package org.thingsboard.server.controller;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -47,6 +47,7 @@ import org.thingsboard.server.common.data.sync.vc.VersionLoadResult;
 import org.thingsboard.server.common.data.sync.vc.VersionedEntityInfo;
 import org.thingsboard.server.common.data.sync.vc.request.create.VersionCreateRequest;
 import org.thingsboard.server.common.data.sync.vc.request.load.VersionLoadRequest;
+import org.thingsboard.server.config.annotations.ApiOperation;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.security.model.SecurityUser;
 import org.thingsboard.server.service.security.permission.Operation;
@@ -68,7 +69,6 @@ import static org.thingsboard.server.controller.ControllerConstants.NEW_LINE;
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_DATA_PARAMETERS;
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_NUMBER_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_SIZE_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_ALLOWABLE_VALUES;
 import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.SORT_PROPERTY_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.TENANT_AUTHORITY_PARAGRAPH;
@@ -192,7 +192,7 @@ public class EntitiesVersionControlController extends BaseController {
             MARKDOWN_CODE_BLOCK_END +
             TENANT_AUTHORITY_PARAGRAPH)
     @GetMapping(value = "/version/{requestId}/status")
-    public VersionCreationResult getVersionCreateRequestStatus(@ApiParam(value = VC_REQUEST_ID_PARAM_DESCRIPTION, required = true)
+    public VersionCreationResult getVersionCreateRequestStatus(@Parameter(description = VC_REQUEST_ID_PARAM_DESCRIPTION, required = true)
                                                                @PathVariable UUID requestId) throws Exception {
         accessControlService.checkPermission(getCurrentUser(), Resource.VERSION_CONTROL, Operation.WRITE);
         return versionControlService.getVersionCreateStatus(getCurrentUser(), requestId);
@@ -235,21 +235,21 @@ public class EntitiesVersionControlController extends BaseController {
             MARKDOWN_CODE_BLOCK_END +
             TENANT_AUTHORITY_PARAGRAPH)
     @GetMapping(value = "/version/{entityType}/{externalEntityUuid}", params = {"branch", "pageSize", "page"})
-    public DeferredResult<PageData<EntityVersion>> listEntityVersions(@ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true)
+    public DeferredResult<PageData<EntityVersion>> listEntityVersions(@Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true)
                                                                       @PathVariable EntityType entityType,
-                                                                      @ApiParam(value = "A string value representing external entity id. This is `externalId` property of an entity, or otherwise if not set - simply id of this entity.")
+                                                                      @Parameter(description = "A string value representing external entity id. This is `externalId` property of an entity, or otherwise if not set - simply id of this entity.")
                                                                       @PathVariable UUID externalEntityUuid,
-                                                                      @ApiParam(value = BRANCH_PARAM_DESCRIPTION)
+                                                                      @Parameter(description = BRANCH_PARAM_DESCRIPTION)
                                                                       @RequestParam String branch,
-                                                                      @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+                                                                      @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
                                                                       @RequestParam int pageSize,
-                                                                      @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+                                                                      @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
                                                                       @RequestParam int page,
-                                                                      @ApiParam(value = ENTITY_VERSION_TEXT_SEARCH_DESCRIPTION)
+                                                                      @Parameter(description = ENTITY_VERSION_TEXT_SEARCH_DESCRIPTION)
                                                                       @RequestParam(required = false) String textSearch,
-                                                                      @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = "timestamp")
+                                                                      @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = "timestamp"))
                                                                       @RequestParam(required = false) String sortProperty,
-                                                                      @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+                                                                      @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
                                                                       @RequestParam(required = false) String sortOrder) throws Exception {
         accessControlService.checkPermission(getCurrentUser(), Resource.VERSION_CONTROL, Operation.READ);
         EntityId externalEntityId = EntityIdFactory.getByTypeAndUuid(entityType, externalEntityUuid);
@@ -264,19 +264,19 @@ public class EntitiesVersionControlController extends BaseController {
             "The response structure is the same as for `listEntityVersions` API method." +
             TENANT_AUTHORITY_PARAGRAPH)
     @GetMapping(value = "/version/{entityType}", params = {"branch", "pageSize", "page"})
-    public DeferredResult<PageData<EntityVersion>> listEntityTypeVersions(@ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true)
+    public DeferredResult<PageData<EntityVersion>> listEntityTypeVersions(@Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true)
                                                                           @PathVariable EntityType entityType,
-                                                                          @ApiParam(value = BRANCH_PARAM_DESCRIPTION, required = true)
+                                                                          @Parameter(description = BRANCH_PARAM_DESCRIPTION, required = true)
                                                                           @RequestParam String branch,
-                                                                          @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+                                                                          @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
                                                                           @RequestParam int pageSize,
-                                                                          @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+                                                                          @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
                                                                           @RequestParam int page,
-                                                                          @ApiParam(value = ENTITY_VERSION_TEXT_SEARCH_DESCRIPTION)
+                                                                          @Parameter(description = ENTITY_VERSION_TEXT_SEARCH_DESCRIPTION)
                                                                           @RequestParam(required = false) String textSearch,
-                                                                          @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = "timestamp")
+                                                                          @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = "timestamp"))
                                                                           @RequestParam(required = false) String sortProperty,
-                                                                          @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+                                                                          @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
                                                                           @RequestParam(required = false) String sortOrder) throws Exception {
         accessControlService.checkPermission(getCurrentUser(), Resource.VERSION_CONTROL, Operation.READ);
         PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder);
@@ -289,17 +289,17 @@ public class EntitiesVersionControlController extends BaseController {
             "The response format is the same as for `listEntityVersions` API method." +
             TENANT_AUTHORITY_PARAGRAPH)
     @GetMapping(value = "/version", params = {"branch", "pageSize", "page"})
-    public DeferredResult<PageData<EntityVersion>> listVersions(@ApiParam(value = BRANCH_PARAM_DESCRIPTION, required = true)
+    public DeferredResult<PageData<EntityVersion>> listVersions(@Parameter(description = BRANCH_PARAM_DESCRIPTION, required = true)
                                                                 @RequestParam String branch,
-                                                                @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+                                                                @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
                                                                 @RequestParam int pageSize,
-                                                                @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+                                                                @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
                                                                 @RequestParam int page,
-                                                                @ApiParam(value = ENTITY_VERSION_TEXT_SEARCH_DESCRIPTION)
+                                                                @Parameter(description = ENTITY_VERSION_TEXT_SEARCH_DESCRIPTION)
                                                                 @RequestParam(required = false) String textSearch,
-                                                                @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = "timestamp")
+                                                                @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = "timestamp"))
                                                                 @RequestParam(required = false) String sortProperty,
-                                                                @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+                                                                @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
                                                                 @RequestParam(required = false) String sortOrder) throws Exception {
         accessControlService.checkPermission(getCurrentUser(), Resource.VERSION_CONTROL, Operation.READ);
         PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder);
@@ -313,9 +313,9 @@ public class EntitiesVersionControlController extends BaseController {
             "Entities order will be the same as in the repository." +
             TENANT_AUTHORITY_PARAGRAPH)
     @GetMapping(value = "/entity/{entityType}/{versionId}")
-    public DeferredResult<List<VersionedEntityInfo>> listEntitiesAtVersion(@ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true)
+    public DeferredResult<List<VersionedEntityInfo>> listEntitiesAtVersion(@Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true)
                                                                            @PathVariable EntityType entityType,
-                                                                           @ApiParam(value = VERSION_ID_PARAM_DESCRIPTION, required = true)
+                                                                           @Parameter(description = VERSION_ID_PARAM_DESCRIPTION, required = true)
                                                                            @PathVariable String versionId) throws Exception {
         accessControlService.checkPermission(getCurrentUser(), Resource.VERSION_CONTROL, Operation.READ);
         return wrapFuture(versionControlService.listEntitiesAtVersion(getTenantId(), versionId, entityType));
@@ -327,7 +327,7 @@ public class EntitiesVersionControlController extends BaseController {
             "Returned entities order will be the same as in the repository." +
             TENANT_AUTHORITY_PARAGRAPH)
     @GetMapping(value = "/entity/{versionId}")
-    public DeferredResult<List<VersionedEntityInfo>> listAllEntitiesAtVersion(@ApiParam(value = VERSION_ID_PARAM_DESCRIPTION, required = true)
+    public DeferredResult<List<VersionedEntityInfo>> listAllEntitiesAtVersion(@Parameter(description = VERSION_ID_PARAM_DESCRIPTION, required = true)
                                                                               @PathVariable String versionId) throws Exception {
         accessControlService.checkPermission(getCurrentUser(), Resource.VERSION_CONTROL, Operation.READ);
         return wrapFuture(versionControlService.listAllEntitiesAtVersion(getTenantId(), versionId));
@@ -340,11 +340,11 @@ public class EntitiesVersionControlController extends BaseController {
             "`hasCredentials` (whether stored device data has credentials)." +
             TENANT_AUTHORITY_PARAGRAPH)
     @GetMapping("/info/{versionId}/{entityType}/{externalEntityUuid}")
-    public DeferredResult<EntityDataInfo> getEntityDataInfo(@ApiParam(value = VERSION_ID_PARAM_DESCRIPTION, required = true)
+    public DeferredResult<EntityDataInfo> getEntityDataInfo(@Parameter(description = VERSION_ID_PARAM_DESCRIPTION, required = true)
                                                             @PathVariable String versionId,
-                                                            @ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true)
+                                                            @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true)
                                                             @PathVariable EntityType entityType,
-                                                            @ApiParam(value = "A string value representing external entity id", required = true)
+                                                            @Parameter(description = "A string value representing external entity id", required = true)
                                                             @PathVariable UUID externalEntityUuid) throws Exception {
         accessControlService.checkPermission(getCurrentUser(), Resource.VERSION_CONTROL, Operation.READ);
         EntityId entityId = EntityIdFactory.getByTypeAndUuid(entityType, externalEntityUuid);
@@ -356,11 +356,11 @@ public class EntitiesVersionControlController extends BaseController {
             "Entity data structure is the same as stored in a repository. " +
             TENANT_AUTHORITY_PARAGRAPH)
     @GetMapping(value = "/diff/{entityType}/{internalEntityUuid}", params = {"versionId"})
-    public DeferredResult<EntityDataDiff> compareEntityDataToVersion(@ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true)
+    public DeferredResult<EntityDataDiff> compareEntityDataToVersion(@Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true)
                                                                      @PathVariable EntityType entityType,
-                                                                     @ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true)
+                                                                     @Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true)
                                                                      @PathVariable UUID internalEntityUuid,
-                                                                     @ApiParam(value = VERSION_ID_PARAM_DESCRIPTION, required = true)
+                                                                     @Parameter(description = VERSION_ID_PARAM_DESCRIPTION, required = true)
                                                                      @RequestParam String versionId) throws Exception {
         accessControlService.checkPermission(getCurrentUser(), Resource.VERSION_CONTROL, Operation.READ);
         EntityId entityId = EntityIdFactory.getByTypeAndUuid(entityType, internalEntityUuid);
@@ -469,7 +469,7 @@ public class EntitiesVersionControlController extends BaseController {
             TENANT_AUTHORITY_PARAGRAPH
     )
     @GetMapping(value = "/entity/{requestId}/status")
-    public VersionLoadResult getVersionLoadRequestStatus(@ApiParam(value = VC_REQUEST_ID_PARAM_DESCRIPTION, required = true)
+    public VersionLoadResult getVersionLoadRequestStatus(@Parameter(description = VC_REQUEST_ID_PARAM_DESCRIPTION, required = true)
                                                          @PathVariable UUID requestId) throws Exception {
         accessControlService.checkPermission(getCurrentUser(), Resource.VERSION_CONTROL, Operation.WRITE);
         return versionControlService.getVersionLoadStatus(getCurrentUser(), requestId);
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 4d11a388ff..505244539b 100644
--- a/application/src/main/java/org/thingsboard/server/controller/EntityQueryController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/EntityQueryController.java
@@ -15,12 +15,11 @@
  */
 package org.thingsboard.server.controller;
 
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Parameter;
+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;
@@ -39,12 +38,12 @@ 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.config.annotations.ApiOperation;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.query.EntityQueryService;
 import org.thingsboard.server.service.security.permission.Operation;
 
 import static org.thingsboard.server.controller.ControllerConstants.ALARM_DATA_QUERY_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.ATTRIBUTES_SCOPE_ALLOWED_VALUES;
 import static org.thingsboard.server.controller.ControllerConstants.ATTRIBUTES_SCOPE_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.ENTITY_COUNT_QUERY_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.ENTITY_DATA_QUERY_DESCRIPTION;
@@ -64,7 +63,7 @@ public class EntityQueryController extends BaseController {
     @RequestMapping(value = "/entitiesQuery/count", method = RequestMethod.POST)
     @ResponseBody
     public long countEntitiesByQuery(
-            @ApiParam(value = "A JSON value representing the entity count query. See API call notes above for more details.")
+            @Parameter(description = "A JSON value representing the entity count query. See API call notes above for more details.")
             @RequestBody EntityCountQuery query) throws ThingsboardException {
         checkNotNull(query);
         return this.entityQueryService.countEntitiesByQuery(getCurrentUser(), query);
@@ -75,7 +74,7 @@ public class EntityQueryController extends BaseController {
     @RequestMapping(value = "/entitiesQuery/find", method = RequestMethod.POST)
     @ResponseBody
     public PageData<EntityData> findEntityDataByQuery(
-            @ApiParam(value = "A JSON value representing the entity data query. See API call notes above for more details.")
+            @Parameter(description = "A JSON value representing the entity data query. See API call notes above for more details.")
             @RequestBody EntityDataQuery query) throws ThingsboardException {
         checkNotNull(query);
         return this.entityQueryService.findEntityDataByQuery(getCurrentUser(), query);
@@ -86,7 +85,7 @@ public class EntityQueryController extends BaseController {
     @RequestMapping(value = "/alarmsQuery/find", method = RequestMethod.POST)
     @ResponseBody
     public PageData<AlarmData> findAlarmDataByQuery(
-            @ApiParam(value = "A JSON value representing the alarm data query. See API call notes above for more details.")
+            @Parameter(description = "A JSON value representing the alarm data query. See API call notes above for more details.")
             @RequestBody AlarmDataQuery query) throws ThingsboardException {
         checkNotNull(query);
         checkNotNull(query.getPageLink());
@@ -101,7 +100,7 @@ public class EntityQueryController extends BaseController {
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/alarmsQuery/count", method = RequestMethod.POST)
     @ResponseBody
-    public long countAlarmsByQuery(@ApiParam(value = "A JSON value representing the alarm count query.")
+    public long countAlarmsByQuery(@Parameter(description = "A JSON value representing the alarm count query.")
                                    @RequestBody AlarmCountQuery query) throws ThingsboardException {
         checkNotNull(query);
         UserId assigneeId = query.getAssigneeId();
@@ -117,13 +116,13 @@ public class EntityQueryController extends BaseController {
     @RequestMapping(value = "/entitiesQuery/find/keys", method = RequestMethod.POST)
     @ResponseBody
     public DeferredResult<ResponseEntity> findEntityTimeseriesAndAttributesKeysByQuery(
-            @ApiParam(value = "A JSON value representing the entity data query. See API call notes above for more details.")
+            @Parameter(description = "A JSON value representing the entity data query. See API call notes above for more details.")
             @RequestBody EntityDataQuery query,
-            @ApiParam(value = "Include all unique time-series keys to the result.")
+            @Parameter(description = "Include all unique time-series keys to the result.")
             @RequestParam("timeseries") boolean isTimeseries,
-            @ApiParam(value = "Include all unique attribute keys to the result.")
+            @Parameter(description = "Include all unique attribute keys to the result.")
             @RequestParam("attributes") boolean isAttributes,
-            @ApiParam(value = ATTRIBUTES_SCOPE_DESCRIPTION, allowableValues = ATTRIBUTES_SCOPE_ALLOWED_VALUES)
+            @Parameter(description = ATTRIBUTES_SCOPE_DESCRIPTION, schema = @Schema(allowableValues = {"SERVER_SCOPE", "SHARED_SCOPE", "CLIENT_SCOPE"}))
             @RequestParam(value = "scope", required = false) String scope) throws ThingsboardException {
         TenantId tenantId = getTenantId();
         checkNotNull(query);
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 bbd952ca7c..0cd31a729b 100644
--- a/application/src/main/java/org/thingsboard/server/controller/EntityRelationController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/EntityRelationController.java
@@ -15,8 +15,9 @@
  */
 package org.thingsboard.server.controller;
 
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -35,6 +36,7 @@ import org.thingsboard.server.common.data.relation.EntityRelation;
 import org.thingsboard.server.common.data.relation.EntityRelationInfo;
 import org.thingsboard.server.common.data.relation.EntityRelationsQuery;
 import org.thingsboard.server.common.data.relation.RelationTypeGroup;
+import org.thingsboard.server.config.annotations.ApiOperation;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.entitiy.entity.relation.TbEntityRelationService;
 import org.thingsboard.server.service.security.model.SecurityUser;
@@ -79,7 +81,7 @@ public class EntityRelationController extends BaseController {
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/relation", method = RequestMethod.POST)
     @ResponseStatus(value = HttpStatus.OK)
-    public void saveRelation(@ApiParam(value = "A JSON value representing the relation.", required = true)
+    public void saveRelation(@Parameter(description = "A JSON value representing the relation.", required = true)
                              @RequestBody EntityRelation relation) throws ThingsboardException {
         checkNotNull(relation);
         checkCanCreateRelation(relation.getFrom());
@@ -96,12 +98,12 @@ public class EntityRelationController extends BaseController {
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/relation", method = RequestMethod.DELETE, params = {FROM_ID, FROM_TYPE, RELATION_TYPE, TO_ID, TO_TYPE})
     @ResponseStatus(value = HttpStatus.OK)
-    public void deleteRelation(@ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true) @RequestParam(FROM_ID) String strFromId,
-                               @ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true) @RequestParam(FROM_TYPE) String strFromType,
-                               @ApiParam(value = RELATION_TYPE_PARAM_DESCRIPTION, required = true) @RequestParam(RELATION_TYPE) String strRelationType,
-                               @ApiParam(value = RELATION_TYPE_GROUP_PARAM_DESCRIPTION) @RequestParam(value = "relationTypeGroup", required = false) String strRelationTypeGroup,
-                               @ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true) @RequestParam(TO_ID) String strToId,
-                               @ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true) @RequestParam(TO_TYPE) String strToType) throws ThingsboardException {
+    public void deleteRelation(@Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true) @RequestParam(FROM_ID) String strFromId,
+                               @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true) @RequestParam(FROM_TYPE) String strFromType,
+                               @Parameter(description = RELATION_TYPE_PARAM_DESCRIPTION, required = true) @RequestParam(RELATION_TYPE) String strRelationType,
+                               @Parameter(description = RELATION_TYPE_GROUP_PARAM_DESCRIPTION) @RequestParam(value = "relationTypeGroup", required = false) String strRelationTypeGroup,
+                               @Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true) @RequestParam(TO_ID) String strToId,
+                               @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true) @RequestParam(TO_TYPE) String strToType) throws ThingsboardException {
         checkParameter(FROM_ID, strFromId);
         checkParameter(FROM_TYPE, strFromType);
         checkParameter(RELATION_TYPE, strRelationType);
@@ -123,8 +125,8 @@ public class EntityRelationController extends BaseController {
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN','TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/relations", method = RequestMethod.DELETE, params = {"entityId", "entityType"})
     @ResponseStatus(value = HttpStatus.OK)
-    public void deleteRelations(@ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true) @RequestParam("entityId") String strId,
-                                @ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true) @RequestParam("entityType") String strType) throws ThingsboardException {
+    public void deleteRelations(@Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true) @RequestParam("entityId") String strId,
+                                @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true) @RequestParam("entityType") String strType) throws ThingsboardException {
         checkParameter("entityId", strId);
         checkParameter("entityType", strType);
         EntityId entityId = EntityIdFactory.getByTypeAndId(strType, strId);
@@ -133,17 +135,16 @@ 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,
-            produces = 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
-    public EntityRelation getRelation(@ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true) @RequestParam(FROM_ID) String strFromId,
-                                      @ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true) @RequestParam(FROM_TYPE) String strFromType,
-                                      @ApiParam(value = RELATION_TYPE_PARAM_DESCRIPTION, required = true) @RequestParam(RELATION_TYPE) String strRelationType,
-                                      @ApiParam(value = RELATION_TYPE_GROUP_PARAM_DESCRIPTION) @RequestParam(value = "relationTypeGroup", required = false) String strRelationTypeGroup,
-                                      @ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true) @RequestParam(TO_ID) String strToId,
-                                      @ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true) @RequestParam(TO_TYPE) String strToType) throws ThingsboardException {
+    public EntityRelation getRelation(@Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true) @RequestParam(FROM_ID) String strFromId,
+                                      @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true) @RequestParam(FROM_TYPE) String strFromType,
+                                      @Parameter(description = RELATION_TYPE_PARAM_DESCRIPTION, required = true) @RequestParam(RELATION_TYPE) String strRelationType,
+                                      @Parameter(description = RELATION_TYPE_GROUP_PARAM_DESCRIPTION) @RequestParam(value = "relationTypeGroup", required = false) String strRelationTypeGroup,
+                                      @Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true) @RequestParam(TO_ID) String strToId,
+                                      @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true) @RequestParam(TO_TYPE) String strToType) throws ThingsboardException {
         checkParameter(FROM_ID, strFromId);
         checkParameter(FROM_TYPE, strFromType);
         checkParameter(RELATION_TYPE, strRelationType);
@@ -159,14 +160,13 @@ 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,
-            produces = 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
-    public List<EntityRelation> findByFrom(@ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true) @RequestParam(FROM_ID) String strFromId,
-                                           @ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true) @RequestParam(FROM_TYPE) String strFromType,
-                                           @ApiParam(value = RELATION_TYPE_GROUP_PARAM_DESCRIPTION)
+    public List<EntityRelation> findByFrom(@Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true) @RequestParam(FROM_ID) String strFromId,
+                                           @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true) @RequestParam(FROM_TYPE) String strFromType,
+                                           @Parameter(description = RELATION_TYPE_GROUP_PARAM_DESCRIPTION)
                                            @RequestParam(value = "relationTypeGroup", required = false) String strRelationTypeGroup) throws ThingsboardException {
         checkParameter(FROM_ID, strFromId);
         checkParameter(FROM_TYPE, strFromType);
@@ -178,14 +178,13 @@ 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,
-            produces = 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
-    public List<EntityRelationInfo> findInfoByFrom(@ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true) @RequestParam(FROM_ID) String strFromId,
-                                                   @ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true) @RequestParam(FROM_TYPE) String strFromType,
-                                                   @ApiParam(value = RELATION_TYPE_GROUP_PARAM_DESCRIPTION)
+    public List<EntityRelationInfo> findInfoByFrom(@Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true) @RequestParam(FROM_ID) String strFromId,
+                                                   @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true) @RequestParam(FROM_TYPE) String strFromType,
+                                                   @Parameter(description = RELATION_TYPE_GROUP_PARAM_DESCRIPTION)
                                                    @RequestParam(value = "relationTypeGroup", required = false) String strRelationTypeGroup) throws ThingsboardException, ExecutionException, InterruptedException {
         checkParameter(FROM_ID, strFromId);
         checkParameter(FROM_TYPE, strFromType);
@@ -197,15 +196,14 @@ 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,
-            produces = 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
-    public List<EntityRelation> findByFrom(@ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true) @RequestParam(FROM_ID) String strFromId,
-                                           @ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true) @RequestParam(FROM_TYPE) String strFromType,
-                                           @ApiParam(value = RELATION_TYPE_PARAM_DESCRIPTION, required = true) @RequestParam(RELATION_TYPE) String strRelationType,
-                                           @ApiParam(value = RELATION_TYPE_GROUP_PARAM_DESCRIPTION)
+    public List<EntityRelation> findByFrom(@Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true) @RequestParam(FROM_ID) String strFromId,
+                                           @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true) @RequestParam(FROM_TYPE) String strFromType,
+                                           @Parameter(description = RELATION_TYPE_PARAM_DESCRIPTION, required = true) @RequestParam(RELATION_TYPE) String strRelationType,
+                                           @Parameter(description = RELATION_TYPE_GROUP_PARAM_DESCRIPTION)
                                            @RequestParam(value = "relationTypeGroup", required = false) String strRelationTypeGroup) throws ThingsboardException {
         checkParameter(FROM_ID, strFromId);
         checkParameter(FROM_TYPE, strFromType);
@@ -218,14 +216,13 @@ 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,
-            produces = 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
-    public List<EntityRelation> findByTo(@ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true) @RequestParam(TO_ID) String strToId,
-                                         @ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true) @RequestParam(TO_TYPE) String strToType,
-                                         @ApiParam(value = RELATION_TYPE_GROUP_PARAM_DESCRIPTION)
+    public List<EntityRelation> findByTo(@Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true) @RequestParam(TO_ID) String strToId,
+                                         @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true) @RequestParam(TO_TYPE) String strToType,
+                                         @Parameter(description = RELATION_TYPE_GROUP_PARAM_DESCRIPTION)
                                          @RequestParam(value = "relationTypeGroup", required = false) String strRelationTypeGroup) throws ThingsboardException {
         checkParameter(TO_ID, strToId);
         checkParameter(TO_TYPE, strToType);
@@ -237,14 +234,13 @@ 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,
-            produces = 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
-    public List<EntityRelationInfo> findInfoByTo(@ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true) @RequestParam(TO_ID) String strToId,
-                                                 @ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true) @RequestParam(TO_TYPE) String strToType,
-                                                 @ApiParam(value = RELATION_TYPE_GROUP_PARAM_DESCRIPTION)
+    public List<EntityRelationInfo> findInfoByTo(@Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true) @RequestParam(TO_ID) String strToId,
+                                                 @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true) @RequestParam(TO_TYPE) String strToType,
+                                                 @Parameter(description = RELATION_TYPE_GROUP_PARAM_DESCRIPTION)
                                                  @RequestParam(value = "relationTypeGroup", required = false) String strRelationTypeGroup) throws ThingsboardException, ExecutionException, InterruptedException {
         checkParameter(TO_ID, strToId);
         checkParameter(TO_TYPE, strToType);
@@ -256,15 +252,14 @@ 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,
-            produces = 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
-    public List<EntityRelation> findByTo(@ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true) @RequestParam(TO_ID) String strToId,
-                                         @ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true) @RequestParam(TO_TYPE) String strToType,
-                                         @ApiParam(value = RELATION_TYPE_PARAM_DESCRIPTION, required = true) @RequestParam(RELATION_TYPE) String strRelationType,
-                                         @ApiParam(value = RELATION_TYPE_GROUP_PARAM_DESCRIPTION)
+    public List<EntityRelation> findByTo(@Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true) @RequestParam(TO_ID) String strToId,
+                                         @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true) @RequestParam(TO_TYPE) String strToType,
+                                         @Parameter(description = RELATION_TYPE_PARAM_DESCRIPTION, required = true) @RequestParam(RELATION_TYPE) String strRelationType,
+                                         @Parameter(description = RELATION_TYPE_GROUP_PARAM_DESCRIPTION)
                                          @RequestParam(value = "relationTypeGroup", required = false) String strRelationTypeGroup) throws ThingsboardException {
         checkParameter(TO_ID, strToId);
         checkParameter(TO_TYPE, strToType);
@@ -278,11 +273,11 @@ 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.", produces = 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
-    public List<EntityRelation> findByQuery(@ApiParam(value = "A JSON value representing the entity relations query object.", required = true)
+    public List<EntityRelation> findByQuery(@Parameter(description = "A JSON value representing the entity relations query object.", required = true)
                                             @RequestBody EntityRelationsQuery query) throws ThingsboardException, ExecutionException, InterruptedException {
         checkNotNull(query);
         checkNotNull(query.getParameters());
@@ -294,11 +289,11 @@ 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, produces = 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
-    public List<EntityRelationInfo> findInfoByQuery(@ApiParam(value = "A JSON value representing the entity relations query object.", required = true)
+    public List<EntityRelationInfo> findInfoByQuery(@Parameter(description = "A JSON value representing the entity relations query object.", required = true)
                                                     @RequestBody EntityRelationsQuery query) throws ThingsboardException, ExecutionException, InterruptedException {
         checkNotNull(query);
         checkNotNull(query.getParameters());
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 66a14502d5..8b33aeeb15 100644
--- a/application/src/main/java/org/thingsboard/server/controller/EntityViewController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/EntityViewController.java
@@ -16,8 +16,10 @@
 package org.thingsboard.server.controller;
 
 import com.google.common.util.concurrent.ListenableFuture;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+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.http.HttpStatus;
@@ -45,6 +47,7 @@ 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.TimePageLink;
+import org.thingsboard.server.config.annotations.ApiOperation;
 import org.thingsboard.server.dao.exception.IncorrectParameterException;
 import org.thingsboard.server.dao.model.ModelConstants;
 import org.thingsboard.server.queue.util.TbCoreComponent;
@@ -66,15 +69,12 @@ import static org.thingsboard.server.controller.ControllerConstants.EDGE_UNASSIG
 import static org.thingsboard.server.controller.ControllerConstants.ENTITY_VIEW_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.ENTITY_VIEW_ID_PARAM_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.ENTITY_VIEW_INFO_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.ENTITY_VIEW_INFO_SORT_PROPERTY_ALLOWABLE_VALUES;
-import static org.thingsboard.server.controller.ControllerConstants.ENTITY_VIEW_SORT_PROPERTY_ALLOWABLE_VALUES;
 import static org.thingsboard.server.controller.ControllerConstants.ENTITY_VIEW_TEXT_SEARCH_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.ENTITY_VIEW_TYPE;
 import static org.thingsboard.server.controller.ControllerConstants.MODEL_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_DATA_PARAMETERS;
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_NUMBER_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_SIZE_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_ALLOWABLE_VALUES;
 import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.SORT_PROPERTY_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.TENANT_AUTHORITY_PARAGRAPH;
@@ -97,13 +97,12 @@ 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,
-            produces = 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
     public EntityView getEntityViewById(
-            @ApiParam(value = ENTITY_VIEW_ID_PARAM_DESCRIPTION)
+            @Parameter(description = ENTITY_VIEW_ID_PARAM_DESCRIPTION)
             @PathVariable(ENTITY_VIEW_ID) String strEntityViewId) throws ThingsboardException {
         checkParameter(ENTITY_VIEW_ID, strEntityViewId);
         return checkEntityViewId(new EntityViewId(toUUID(strEntityViewId)), Operation.READ);
@@ -111,13 +110,12 @@ 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,
-            produces = 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
     public EntityViewInfo getEntityViewInfoById(
-            @ApiParam(value = ENTITY_VIEW_ID_PARAM_DESCRIPTION)
+            @Parameter(description = ENTITY_VIEW_ID_PARAM_DESCRIPTION)
             @PathVariable(ENTITY_VIEW_ID) String strEntityViewId) throws ThingsboardException {
         checkParameter(ENTITY_VIEW_ID, strEntityViewId);
         EntityViewId entityViewId = new EntityViewId(toUUID(strEntityViewId));
@@ -127,13 +125,12 @@ 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,
-            produces = MediaType.APPLICATION_JSON_VALUE)
+                    TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/entityView", method = RequestMethod.POST)
     @ResponseBody
     public EntityView saveEntityView(
-            @ApiParam(value = "A JSON object representing the entity view.")
+            @Parameter(description = "A JSON object representing the entity view.")
             @RequestBody EntityView entityView) throws Exception {
         entityView.setTenantId(getCurrentUser().getTenantId());
         EntityView existingEntityView = null;
@@ -153,7 +150,7 @@ public class EntityViewController extends BaseController {
     @RequestMapping(value = "/entityView/{entityViewId}", method = RequestMethod.DELETE)
     @ResponseStatus(value = HttpStatus.OK)
     public void deleteEntityView(
-            @ApiParam(value = ENTITY_VIEW_ID_PARAM_DESCRIPTION)
+            @Parameter(description = ENTITY_VIEW_ID_PARAM_DESCRIPTION)
             @PathVariable(ENTITY_VIEW_ID) String strEntityViewId) throws ThingsboardException {
         checkParameter(ENTITY_VIEW_ID, strEntityViewId);
         EntityViewId entityViewId = new EntityViewId(toUUID(strEntityViewId));
@@ -162,13 +159,12 @@ 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,
-            produces = 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
     public EntityView getTenantEntityView(
-            @ApiParam(value = "Entity View name")
+            @Parameter(description = "Entity View name")
             @RequestParam String entityViewName) throws ThingsboardException {
         TenantId tenantId = getCurrentUser().getTenantId();
         return checkNotNull(entityViewService.findEntityViewByTenantIdAndName(tenantId, entityViewName));
@@ -180,9 +176,9 @@ public class EntityViewController extends BaseController {
     @RequestMapping(value = "/customer/{customerId}/entityView/{entityViewId}", method = RequestMethod.POST)
     @ResponseBody
     public EntityView assignEntityViewToCustomer(
-            @ApiParam(value = CUSTOMER_ID_PARAM_DESCRIPTION)
+            @Parameter(description = CUSTOMER_ID_PARAM_DESCRIPTION)
             @PathVariable(CUSTOMER_ID) String strCustomerId,
-            @ApiParam(value = ENTITY_VIEW_ID_PARAM_DESCRIPTION)
+            @Parameter(description = ENTITY_VIEW_ID_PARAM_DESCRIPTION)
             @PathVariable(ENTITY_VIEW_ID) String strEntityViewId) throws ThingsboardException {
         checkParameter(CUSTOMER_ID, strCustomerId);
         checkParameter(ENTITY_VIEW_ID, strEntityViewId);
@@ -202,7 +198,7 @@ public class EntityViewController extends BaseController {
     @RequestMapping(value = "/customer/entityView/{entityViewId}", method = RequestMethod.DELETE)
     @ResponseBody
     public EntityView unassignEntityViewFromCustomer(
-            @ApiParam(value = ENTITY_VIEW_ID_PARAM_DESCRIPTION)
+            @Parameter(description = ENTITY_VIEW_ID_PARAM_DESCRIPTION)
             @PathVariable(ENTITY_VIEW_ID) String strEntityViewId) throws ThingsboardException {
         checkParameter(ENTITY_VIEW_ID, strEntityViewId);
         EntityViewId entityViewId = new EntityViewId(toUUID(strEntityViewId));
@@ -223,19 +219,19 @@ public class EntityViewController extends BaseController {
     @RequestMapping(value = "/customer/{customerId}/entityViews", params = {"pageSize", "page"}, method = RequestMethod.GET)
     @ResponseBody
     public PageData<EntityView> getCustomerEntityViews(
-            @ApiParam(value = CUSTOMER_ID_PARAM_DESCRIPTION, required = true)
+            @Parameter(description = CUSTOMER_ID_PARAM_DESCRIPTION, required = true)
             @PathVariable(CUSTOMER_ID) String strCustomerId,
-            @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
             @RequestParam int pageSize,
-            @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
             @RequestParam int page,
-            @ApiParam(value = ENTITY_VIEW_TYPE)
+            @Parameter(description = ENTITY_VIEW_TYPE)
             @RequestParam(required = false) String type,
-            @ApiParam(value = ENTITY_VIEW_TEXT_SEARCH_DESCRIPTION)
+            @Parameter(description = ENTITY_VIEW_TEXT_SEARCH_DESCRIPTION)
             @RequestParam(required = false) String textSearch,
-            @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = ENTITY_VIEW_SORT_PROPERTY_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "name, type"}))
             @RequestParam(required = false) String sortProperty,
-            @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
             @RequestParam(required = false) String sortOrder) throws ThingsboardException {
         checkParameter(CUSTOMER_ID, strCustomerId);
         TenantId tenantId = getCurrentUser().getTenantId();
@@ -256,19 +252,19 @@ public class EntityViewController extends BaseController {
     @RequestMapping(value = "/customer/{customerId}/entityViewInfos", params = {"pageSize", "page"}, method = RequestMethod.GET)
     @ResponseBody
     public PageData<EntityViewInfo> getCustomerEntityViewInfos(
-            @ApiParam(value = CUSTOMER_ID_PARAM_DESCRIPTION, required = true)
+            @Parameter(description = CUSTOMER_ID_PARAM_DESCRIPTION, required = true)
             @PathVariable(CUSTOMER_ID) String strCustomerId,
-            @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
             @RequestParam int pageSize,
-            @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
             @RequestParam int page,
-            @ApiParam(value = ENTITY_VIEW_TYPE)
+            @Parameter(description = ENTITY_VIEW_TYPE)
             @RequestParam(required = false) String type,
-            @ApiParam(value = ENTITY_VIEW_TEXT_SEARCH_DESCRIPTION)
+            @Parameter(description = ENTITY_VIEW_TEXT_SEARCH_DESCRIPTION)
             @RequestParam(required = false) String textSearch,
-            @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = ENTITY_VIEW_INFO_SORT_PROPERTY_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "name", "type", "customerTitle"}))
             @RequestParam(required = false) String sortProperty,
-            @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
             @RequestParam(required = false) String sortOrder) throws ThingsboardException {
         checkParameter("customerId", strCustomerId);
         TenantId tenantId = getCurrentUser().getTenantId();
@@ -289,17 +285,17 @@ public class EntityViewController extends BaseController {
     @RequestMapping(value = "/tenant/entityViews", params = {"pageSize", "page"}, method = RequestMethod.GET)
     @ResponseBody
     public PageData<EntityView> getTenantEntityViews(
-            @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
             @RequestParam int pageSize,
-            @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
             @RequestParam int page,
-            @ApiParam(value = ENTITY_VIEW_TYPE)
+            @Parameter(description = ENTITY_VIEW_TYPE)
             @RequestParam(required = false) String type,
-            @ApiParam(value = ENTITY_VIEW_TEXT_SEARCH_DESCRIPTION)
+            @Parameter(description = ENTITY_VIEW_TEXT_SEARCH_DESCRIPTION)
             @RequestParam(required = false) String textSearch,
-            @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = ENTITY_VIEW_SORT_PROPERTY_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "name, type"}))
             @RequestParam(required = false) String sortProperty,
-            @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
             @RequestParam(required = false) String sortOrder) throws ThingsboardException {
         TenantId tenantId = getCurrentUser().getTenantId();
         PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder);
@@ -318,17 +314,17 @@ public class EntityViewController extends BaseController {
     @RequestMapping(value = "/tenant/entityViewInfos", params = {"pageSize", "page"}, method = RequestMethod.GET)
     @ResponseBody
     public PageData<EntityViewInfo> getTenantEntityViewInfos(
-            @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
             @RequestParam int pageSize,
-            @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
             @RequestParam int page,
-            @ApiParam(value = ENTITY_VIEW_TYPE)
+            @Parameter(description = ENTITY_VIEW_TYPE)
             @RequestParam(required = false) String type,
-            @ApiParam(value = ENTITY_VIEW_TEXT_SEARCH_DESCRIPTION)
+            @Parameter(description = ENTITY_VIEW_TEXT_SEARCH_DESCRIPTION)
             @RequestParam(required = false) String textSearch,
-            @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = ENTITY_VIEW_INFO_SORT_PROPERTY_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "name", "type", "customerTitle"}))
             @RequestParam(required = false) String sortProperty,
-            @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
             @RequestParam(required = false) String sortOrder) throws ThingsboardException {
         TenantId tenantId = getCurrentUser().getTenantId();
         PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder);
@@ -347,7 +343,7 @@ public class EntityViewController extends BaseController {
     @RequestMapping(value = "/entityViews", method = RequestMethod.POST)
     @ResponseBody
     public List<EntityView> findByQuery(
-            @ApiParam(value = "The entity view search query JSON")
+            @Parameter(description = "The entity view search query JSON")
             @RequestBody EntityViewSearchQuery query) throws ThingsboardException, ExecutionException, InterruptedException {
         checkNotNull(query);
         checkNotNull(query.getParameters());
@@ -386,7 +382,7 @@ public class EntityViewController extends BaseController {
     @RequestMapping(value = "/customer/public/entityView/{entityViewId}", method = RequestMethod.POST)
     @ResponseBody
     public EntityView assignEntityViewToPublicCustomer(
-            @ApiParam(value = ENTITY_VIEW_ID_PARAM_DESCRIPTION)
+            @Parameter(description = ENTITY_VIEW_ID_PARAM_DESCRIPTION)
             @PathVariable(ENTITY_VIEW_ID) String strEntityViewId) throws ThingsboardException {
         checkParameter(ENTITY_VIEW_ID, strEntityViewId);
         EntityViewId entityViewId = new EntityViewId(toUUID(strEntityViewId));
@@ -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.",
-            produces = 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.",
-            produces = 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 fd203361cf..372d724912 100644
--- a/application/src/main/java/org/thingsboard/server/controller/EventController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/EventController.java
@@ -15,8 +15,10 @@
  */
 package org.thingsboard.server.controller;
 
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+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 org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -39,6 +41,7 @@ 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.TimePageLink;
+import org.thingsboard.server.config.annotations.ApiOperation;
 import org.thingsboard.server.dao.event.EventService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.security.permission.Operation;
@@ -52,7 +55,6 @@ import static org.thingsboard.server.controller.ControllerConstants.EVENT_DEBUG_
 import static org.thingsboard.server.controller.ControllerConstants.EVENT_END_TIME_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.EVENT_ERROR_FILTER_OBJ;
 import static org.thingsboard.server.controller.ControllerConstants.EVENT_LC_EVENT_FILTER_OBJ;
-import static org.thingsboard.server.controller.ControllerConstants.EVENT_SORT_PROPERTY_ALLOWABLE_VALUES;
 import static org.thingsboard.server.controller.ControllerConstants.EVENT_START_TIME_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.EVENT_STATS_FILTER_OBJ;
 import static org.thingsboard.server.controller.ControllerConstants.EVENT_TEXT_SEARCH_DESCRIPTION;
@@ -60,7 +62,6 @@ import static org.thingsboard.server.controller.ControllerConstants.NEW_LINE;
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_DATA_PARAMETERS;
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_NUMBER_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_SIZE_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_ALLOWABLE_VALUES;
 import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.SORT_PROPERTY_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.TENANT_ID;
@@ -107,32 +108,32 @@ 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, produces = 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
     public PageData<EventInfo> getEvents(
-            @ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true)
+            @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true)
             @PathVariable(ENTITY_TYPE) String strEntityType,
-            @ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true)
+            @Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true)
             @PathVariable(ENTITY_ID) String strEntityId,
-            @ApiParam(value = "A string value representing event type", example = "STATS", required = true)
+            @Parameter(description = "A string value representing event type", example = "STATS", required = true)
             @PathVariable("eventType") String eventType,
-            @ApiParam(value = TENANT_ID_PARAM_DESCRIPTION, required = true)
+            @Parameter(description = TENANT_ID_PARAM_DESCRIPTION, required = true)
             @RequestParam(TENANT_ID) String strTenantId,
-            @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
             @RequestParam int pageSize,
-            @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
             @RequestParam int page,
-            @ApiParam(value = EVENT_TEXT_SEARCH_DESCRIPTION)
+            @Parameter(description = EVENT_TEXT_SEARCH_DESCRIPTION)
             @RequestParam(required = false) String textSearch,
-            @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = EVENT_SORT_PROPERTY_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"ts", "id"}))
             @RequestParam(required = false) String sortProperty,
-            @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
             @RequestParam(required = false) String sortOrder,
-            @ApiParam(value = EVENT_START_TIME_DESCRIPTION)
+            @Parameter(description = EVENT_START_TIME_DESCRIPTION)
             @RequestParam(required = false) Long startTime,
-            @ApiParam(value = EVENT_END_TIME_DESCRIPTION)
+            @Parameter(description = EVENT_END_TIME_DESCRIPTION)
             @RequestParam(required = false) Long endTime) throws ThingsboardException {
         checkParameter("EntityId", strEntityId);
         checkParameter("EntityType", strEntityType);
@@ -149,30 +150,30 @@ 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, produces = MediaType.APPLICATION_JSON_VALUE)
+                    PAGE_DATA_PARAMETERS)
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/events/{entityType}/{entityId}", method = RequestMethod.GET)
     @ResponseBody
     public PageData<EventInfo> getEvents(
-            @ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true)
+            @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true)
             @PathVariable(ENTITY_TYPE) String strEntityType,
-            @ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true)
+            @Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true)
             @PathVariable(ENTITY_ID) String strEntityId,
-            @ApiParam(value = TENANT_ID_PARAM_DESCRIPTION, required = true)
+            @Parameter(description = TENANT_ID_PARAM_DESCRIPTION, required = true)
             @RequestParam("tenantId") String strTenantId,
-            @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
             @RequestParam int pageSize,
-            @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
             @RequestParam int page,
-            @ApiParam(value = EVENT_TEXT_SEARCH_DESCRIPTION)
+            @Parameter(description = EVENT_TEXT_SEARCH_DESCRIPTION)
             @RequestParam(required = false) String textSearch,
-            @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = EVENT_SORT_PROPERTY_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"ts", "id"}))
             @RequestParam(required = false) String sortProperty,
-            @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
             @RequestParam(required = false) String sortOrder,
-            @ApiParam(value = EVENT_START_TIME_DESCRIPTION)
+            @Parameter(description = EVENT_START_TIME_DESCRIPTION)
             @RequestParam(required = false) Long startTime,
-            @ApiParam(value = EVENT_END_TIME_DESCRIPTION)
+            @Parameter(description = EVENT_END_TIME_DESCRIPTION)
             @RequestParam(required = false) Long endTime) throws ThingsboardException {
         checkParameter("EntityId", strEntityId);
         checkParameter("EntityType", strEntityType);
@@ -189,33 +190,32 @@ 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,
-            produces = MediaType.APPLICATION_JSON_VALUE)
+                    EVENT_FILTER_DEFINITION)
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/events/{entityType}/{entityId}", method = RequestMethod.POST)
     @ResponseBody
     public PageData<EventInfo> getEvents(
-            @ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true)
+            @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true)
             @PathVariable(ENTITY_TYPE) String strEntityType,
-            @ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true)
+            @Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true)
             @PathVariable(ENTITY_ID) String strEntityId,
-            @ApiParam(value = TENANT_ID_PARAM_DESCRIPTION, required = true)
+            @Parameter(description = TENANT_ID_PARAM_DESCRIPTION, required = true)
             @RequestParam(TENANT_ID) String strTenantId,
-            @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
             @RequestParam int pageSize,
-            @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
             @RequestParam int page,
-            @ApiParam(value = "A JSON value representing the event filter.", required = true)
+            @Parameter(description = "A JSON value representing the event filter.", required = true)
             @RequestBody EventFilter eventFilter,
-            @ApiParam(value = EVENT_TEXT_SEARCH_DESCRIPTION)
+            @Parameter(description = EVENT_TEXT_SEARCH_DESCRIPTION)
             @RequestParam(required = false) String textSearch,
-            @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = EVENT_SORT_PROPERTY_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"ts", "id"}))
             @RequestParam(required = false) String sortProperty,
-            @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
             @RequestParam(required = false) String sortOrder,
-            @ApiParam(value = EVENT_START_TIME_DESCRIPTION)
+            @Parameter(description = EVENT_START_TIME_DESCRIPTION)
             @RequestParam(required = false) Long startTime,
-            @ApiParam(value = EVENT_END_TIME_DESCRIPTION)
+            @Parameter(description = EVENT_END_TIME_DESCRIPTION)
             @RequestParam(required = false) Long endTime) throws ThingsboardException {
         checkParameter("EntityId", strEntityId);
         checkParameter("EntityType", strEntityType);
@@ -232,15 +232,15 @@ public class EventController extends BaseController {
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/events/{entityType}/{entityId}/clear", method = RequestMethod.POST)
     @ResponseStatus(HttpStatus.OK)
-    public void clearEvents(@ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true)
+    public void clearEvents(@Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true)
                             @PathVariable(ENTITY_TYPE) String strEntityType,
-                            @ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true)
+                            @Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true)
                             @PathVariable(ENTITY_ID) String strEntityId,
-                            @ApiParam(value = EVENT_START_TIME_DESCRIPTION)
+                            @Parameter(description = EVENT_START_TIME_DESCRIPTION)
                             @RequestParam(required = false) Long startTime,
-                            @ApiParam(value = EVENT_END_TIME_DESCRIPTION)
+                            @Parameter(description = EVENT_END_TIME_DESCRIPTION)
                             @RequestParam(required = false) Long endTime,
-                            @ApiParam(value = EVENT_FILTER_DEFINITION)
+                            @Parameter(description = EVENT_FILTER_DEFINITION)
                             @RequestBody EventFilter eventFilter) throws ThingsboardException {
         checkParameter("EntityId", strEntityId);
         checkParameter("EntityType", strEntityType);
diff --git a/application/src/main/java/org/thingsboard/server/controller/ImageController.java b/application/src/main/java/org/thingsboard/server/controller/ImageController.java
index 516a8941a8..c8d24d6081 100644
--- a/application/src/main/java/org/thingsboard/server/controller/ImageController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/ImageController.java
@@ -15,7 +15,8 @@
  */
 package org.thingsboard.server.controller;
 
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -26,7 +27,6 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.util.Base64Utils;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -59,14 +59,13 @@ import org.thingsboard.server.service.security.model.SecurityUser;
 import org.thingsboard.server.service.security.permission.Operation;
 import org.thingsboard.server.service.security.permission.Resource;
 
+import java.util.Base64;
 import java.util.concurrent.TimeUnit;
 
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_NUMBER_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_SIZE_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.RESOURCE_INCLUDE_SYSTEM_IMAGES_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.RESOURCE_SORT_PROPERTY_ALLOWABLE_VALUES;
 import static org.thingsboard.server.controller.ControllerConstants.RESOURCE_TEXT_SEARCH_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_ALLOWABLE_VALUES;
 import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.SORT_PROPERTY_DESCRIPTION;
 
@@ -120,9 +119,9 @@ public class ImageController extends BaseController {
 
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
     @PutMapping(IMAGE_URL)
-    public TbResourceInfo updateImage(@ApiParam(value = IMAGE_TYPE_PARAM_DESCRIPTION, allowableValues = IMAGE_TYPE_PARAM_ALLOWABLE_VALUES, required = true)
+    public TbResourceInfo updateImage(@Parameter(description = IMAGE_TYPE_PARAM_DESCRIPTION, schema = @Schema(allowableValues = {"tenant", "system"}), required = true)
                                       @PathVariable String type,
-                                      @ApiParam(value = IMAGE_KEY_PARAM_DESCRIPTION, required = true)
+                                      @Parameter(description = IMAGE_KEY_PARAM_DESCRIPTION, required = true)
                                       @PathVariable String key,
                                       @RequestPart MultipartFile file) throws Exception {
         TbResourceInfo imageInfo = checkImageInfo(type, key, Operation.WRITE);
@@ -140,9 +139,9 @@ public class ImageController extends BaseController {
 
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
     @PutMapping(IMAGE_URL + "/info")
-    public TbResourceInfo updateImageInfo(@ApiParam(value = IMAGE_TYPE_PARAM_DESCRIPTION, allowableValues = IMAGE_TYPE_PARAM_ALLOWABLE_VALUES, required = true)
+    public TbResourceInfo updateImageInfo(@Parameter(description = IMAGE_TYPE_PARAM_DESCRIPTION, schema = @Schema(allowableValues = {"tenant", "system"}), required = true)
                                           @PathVariable String type,
-                                          @ApiParam(value = IMAGE_KEY_PARAM_DESCRIPTION, required = true)
+                                          @Parameter(description = IMAGE_KEY_PARAM_DESCRIPTION, required = true)
                                           @PathVariable String key,
                                           @RequestBody TbResourceInfo request) throws ThingsboardException {
         TbResourceInfo imageInfo = checkImageInfo(type, key, Operation.WRITE);
@@ -153,9 +152,9 @@ public class ImageController extends BaseController {
 
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
     @PutMapping(IMAGE_URL + "/public/{isPublic}")
-    public TbResourceInfo updateImagePublicStatus(@ApiParam(value = IMAGE_TYPE_PARAM_DESCRIPTION, allowableValues = IMAGE_TYPE_PARAM_ALLOWABLE_VALUES, required = true)
+    public TbResourceInfo updateImagePublicStatus(@Parameter(description = IMAGE_TYPE_PARAM_DESCRIPTION, schema = @Schema(allowableValues = {"tenant", "system"}), required = true)
                                                   @PathVariable String type,
-                                                  @ApiParam(value = IMAGE_KEY_PARAM_DESCRIPTION, required = true)
+                                                  @Parameter(description = IMAGE_KEY_PARAM_DESCRIPTION, required = true)
                                                   @PathVariable String key,
                                                   @PathVariable boolean isPublic) throws ThingsboardException {
         TbResourceInfo imageInfo = checkImageInfo(type, key, Operation.WRITE);
@@ -166,9 +165,9 @@ public class ImageController extends BaseController {
 
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
     @GetMapping(value = IMAGE_URL, produces = "image/*")
-    public ResponseEntity<ByteArrayResource> downloadImage(@ApiParam(value = IMAGE_TYPE_PARAM_DESCRIPTION, allowableValues = IMAGE_TYPE_PARAM_ALLOWABLE_VALUES, required = true)
+    public ResponseEntity<ByteArrayResource> downloadImage(@Parameter(description = IMAGE_TYPE_PARAM_DESCRIPTION, schema = @Schema(allowableValues = {"tenant", "system"}), required = true)
                                                            @PathVariable String type,
-                                                           @ApiParam(value = IMAGE_KEY_PARAM_DESCRIPTION, required = true)
+                                                           @Parameter(description = IMAGE_KEY_PARAM_DESCRIPTION, required = true)
                                                            @PathVariable String key,
                                                            @RequestHeader(name = HttpHeaders.IF_NONE_MATCH, required = false) String etag) throws Exception {
         return downloadIfChanged(type, key, etag, false);
@@ -183,9 +182,9 @@ public class ImageController extends BaseController {
 
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
     @GetMapping(value = IMAGE_URL + "/export")
-    public ImageExportData exportImage(@ApiParam(value = IMAGE_TYPE_PARAM_DESCRIPTION, allowableValues = IMAGE_TYPE_PARAM_ALLOWABLE_VALUES, required = true)
+    public ImageExportData exportImage(@Parameter(description = IMAGE_TYPE_PARAM_DESCRIPTION, schema = @Schema(allowableValues = {"tenant", "system"}), required = true)
                                        @PathVariable String type,
-                                       @ApiParam(value = IMAGE_KEY_PARAM_DESCRIPTION, required = true)
+                                       @Parameter(description = IMAGE_KEY_PARAM_DESCRIPTION, required = true)
                                        @PathVariable String key) throws Exception {
         TbResourceInfo imageInfo = checkImageInfo(type, key, Operation.READ);
         ImageDescriptor descriptor = imageInfo.getDescriptor(ImageDescriptor.class);
@@ -197,7 +196,7 @@ public class ImageController extends BaseController {
                 .resourceKey(imageInfo.getResourceKey())
                 .isPublic(imageInfo.isPublic())
                 .publicResourceKey(imageInfo.getPublicResourceKey())
-                .data(Base64Utils.encodeToString(data))
+                .data(Base64.getEncoder().encodeToString(data))
                 .build();
     }
 
@@ -222,15 +221,15 @@ public class ImageController extends BaseController {
         ImageDescriptor descriptor = new ImageDescriptor();
         descriptor.setMediaType(imageData.getMediaType());
         image.setDescriptorValue(descriptor);
-        image.setData(Base64Utils.decodeFromString(imageData.getData()));
+        image.setData(Base64.getDecoder().decode(imageData.getData()));
         return tbImageService.save(image, user);
     }
 
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
     @GetMapping(value = IMAGE_URL + "/preview", produces = "image/png")
-    public ResponseEntity<ByteArrayResource> downloadImagePreview(@ApiParam(value = IMAGE_TYPE_PARAM_DESCRIPTION, allowableValues = IMAGE_TYPE_PARAM_ALLOWABLE_VALUES, required = true)
+    public ResponseEntity<ByteArrayResource> downloadImagePreview(@Parameter(description = IMAGE_TYPE_PARAM_DESCRIPTION, schema = @Schema(allowableValues = {"tenant", "system"}), required = true)
                                                                   @PathVariable String type,
-                                                                  @ApiParam(value = IMAGE_KEY_PARAM_DESCRIPTION, required = true)
+                                                                  @Parameter(description = IMAGE_KEY_PARAM_DESCRIPTION, required = true)
                                                                   @PathVariable String key,
                                                                   @RequestHeader(name = HttpHeaders.IF_NONE_MATCH, required = false) String etag) throws Exception {
         return downloadIfChanged(type, key, etag, true);
@@ -238,26 +237,26 @@ public class ImageController extends BaseController {
 
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
     @GetMapping(IMAGE_URL + "/info")
-    public TbResourceInfo getImageInfo(@ApiParam(value = IMAGE_TYPE_PARAM_DESCRIPTION, allowableValues = IMAGE_TYPE_PARAM_ALLOWABLE_VALUES, required = true)
+    public TbResourceInfo getImageInfo(@Parameter(description = IMAGE_TYPE_PARAM_DESCRIPTION, schema = @Schema(allowableValues = {"tenant", "system"}), required = true)
                                        @PathVariable String type,
-                                       @ApiParam(value = IMAGE_KEY_PARAM_DESCRIPTION, required = true)
+                                       @Parameter(description = IMAGE_KEY_PARAM_DESCRIPTION, required = true)
                                        @PathVariable String key) throws ThingsboardException {
         return checkImageInfo(type, key, Operation.READ);
     }
 
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
     @GetMapping("/api/images")
-    public PageData<TbResourceInfo> getImages(@ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+    public PageData<TbResourceInfo> getImages(@Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
                                               @RequestParam int pageSize,
-                                              @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+                                              @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
                                               @RequestParam int page,
-                                              @ApiParam(value = RESOURCE_INCLUDE_SYSTEM_IMAGES_DESCRIPTION)
+                                              @Parameter(description = RESOURCE_INCLUDE_SYSTEM_IMAGES_DESCRIPTION)
                                               @RequestParam(required = false) boolean includeSystemImages,
-                                              @ApiParam(value = RESOURCE_TEXT_SEARCH_DESCRIPTION)
+                                              @Parameter(description = RESOURCE_TEXT_SEARCH_DESCRIPTION)
                                               @RequestParam(required = false) String textSearch,
-                                              @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = RESOURCE_SORT_PROPERTY_ALLOWABLE_VALUES)
+                                              @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "title", "resourceType", "tenantId"}))
                                               @RequestParam(required = false) String sortProperty,
-                                              @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+                                              @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
                                               @RequestParam(required = false) String sortOrder) throws ThingsboardException {
         // PE: generic permission
         PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder);
@@ -271,9 +270,9 @@ public class ImageController extends BaseController {
 
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
     @DeleteMapping(IMAGE_URL)
-    public ResponseEntity<TbImageDeleteResult> deleteImage(@ApiParam(value = IMAGE_TYPE_PARAM_DESCRIPTION, allowableValues = IMAGE_TYPE_PARAM_ALLOWABLE_VALUES, required = true)
+    public ResponseEntity<TbImageDeleteResult> deleteImage(@Parameter(description = IMAGE_TYPE_PARAM_DESCRIPTION, schema = @Schema(allowableValues = {"tenant", "system"}), required = true)
                                                            @PathVariable String type,
-                                                           @ApiParam(value = IMAGE_KEY_PARAM_DESCRIPTION, required = true)
+                                                           @Parameter(description = IMAGE_KEY_PARAM_DESCRIPTION, required = true)
                                                            @PathVariable String key,
                                                            @RequestParam(name = "force", required = false) boolean force) throws ThingsboardException {
         TbResourceInfo imageInfo = checkImageInfo(type, key, Operation.DELETE);
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 fdfa55f5e7..25e49eb198 100644
--- a/application/src/main/java/org/thingsboard/server/controller/Lwm2mController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/Lwm2mController.java
@@ -15,11 +15,13 @@
  */
 package org.thingsboard.server.controller;
 
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
+import org.springframework.http.MediaType;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -33,6 +35,7 @@ import org.thingsboard.server.common.data.SaveDeviceWithCredentialsRequest;
 import org.thingsboard.server.common.data.device.profile.lwm2m.bootstrap.LwM2MServerSecurityConfigDefault;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.security.DeviceCredentials;
+import org.thingsboard.server.config.annotations.ApiOperation;
 import org.thingsboard.server.service.lwm2m.LwM2MService;
 
 import java.util.Map;
@@ -56,13 +59,12 @@ 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,
-            produces = "application/json")
+                    TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/lwm2m/deviceProfile/bootstrap/{isBootstrapServer}", method = RequestMethod.GET)
     @ResponseBody
     public LwM2MServerSecurityConfigDefault getLwm2mBootstrapSecurityInfo(
-        @ApiParam(value = IS_BOOTSTRAP_SERVER_PARAM_DESCRIPTION)
+        @Parameter(description = IS_BOOTSTRAP_SERVER_PARAM_DESCRIPTION)
         @PathVariable(IS_BOOTSTRAP_SERVER) boolean bootstrapServer) throws ThingsboardException {
             return lwM2MService.getServerSecurityInfo(bootstrapServer);
     }
diff --git a/application/src/main/java/org/thingsboard/server/controller/MailConfigTemplateController.java b/application/src/main/java/org/thingsboard/server/controller/MailConfigTemplateController.java
index c1db70ebed..e17d8e55bc 100644
--- a/application/src/main/java/org/thingsboard/server/controller/MailConfigTemplateController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/MailConfigTemplateController.java
@@ -16,7 +16,6 @@
 package org.thingsboard.server.controller;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -25,6 +24,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.config.annotations.ApiOperation;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.mail.TbMailConfigTemplateService;
 import org.thingsboard.server.service.security.permission.Operation;
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 d2b095c7fa..96f38daf35 100644
--- a/application/src/main/java/org/thingsboard/server/controller/NotificationController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/NotificationController.java
@@ -15,8 +15,9 @@
  */
 package org.thingsboard.server.controller;
 
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+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;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -57,6 +58,7 @@ import org.thingsboard.server.common.data.notification.template.NotificationTemp
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.common.data.page.SortOrder;
+import org.thingsboard.server.config.annotations.ApiOperation;
 import org.thingsboard.server.dao.notification.NotificationRequestService;
 import org.thingsboard.server.dao.notification.NotificationService;
 import org.thingsboard.server.dao.notification.NotificationSettingsService;
@@ -68,7 +70,6 @@ import org.thingsboard.server.service.security.model.SecurityUser;
 import org.thingsboard.server.service.security.permission.Operation;
 import org.thingsboard.server.service.security.permission.Resource;
 
-import javax.validation.Valid;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -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 +
@@ -160,22 +163,35 @@ public class NotificationController extends BaseController {
                     "}\n```")
     @GetMapping("/notifications")
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
-    public PageData<Notification> getNotifications(@ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+    public PageData<Notification> getNotifications(@Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
                                                    @RequestParam int pageSize,
-                                                   @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+                                                   @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
                                                    @RequestParam int page,
-                                                   @ApiParam(value = "Case-insensitive 'substring' filter based on notification subject or text")
+                                                   @Parameter(description = "Case-insensitive 'substring' filter based on notification subject or text")
                                                    @RequestParam(required = false) String textSearch,
-                                                   @ApiParam(value = SORT_PROPERTY_DESCRIPTION)
+                                                   @Parameter(description = SORT_PROPERTY_DESCRIPTION)
                                                    @RequestParam(required = false) String sortProperty,
-                                                   @ApiParam(value = SORT_ORDER_DESCRIPTION)
+                                                   @Parameter(description = SORT_ORDER_DESCRIPTION)
                                                    @RequestParam(required = false) String sortOrder,
-                                                   @ApiParam(value = "To search for unread notifications only")
+                                                   @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)",
@@ -268,7 +286,7 @@ public class NotificationController extends BaseController {
     @PostMapping("/notification/request/preview")
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
     public NotificationRequestPreview getNotificationRequestPreview(@RequestBody @Valid NotificationRequest request,
-                                                                    @ApiParam(value = "Amount of the recipients to show in preview")
+                                                                    @Parameter(description = "Amount of the recipients to show in preview")
                                                                     @RequestParam(defaultValue = "20") int recipientsPreviewSize,
                                                                     @AuthenticationPrincipal SecurityUser user) throws ThingsboardException {
         // PE: generic permission
@@ -376,15 +394,15 @@ public class NotificationController extends BaseController {
                     SYSTEM_OR_TENANT_AUTHORITY_PARAGRAPH)
     @GetMapping("/notification/requests")
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
-    public PageData<NotificationRequestInfo> getNotificationRequests(@ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+    public PageData<NotificationRequestInfo> getNotificationRequests(@Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
                                                                      @RequestParam int pageSize,
-                                                                     @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+                                                                     @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
                                                                      @RequestParam int page,
-                                                                     @ApiParam(value = "Case-insensitive 'substring' filed based on the used template name")
+                                                                     @Parameter(description = "Case-insensitive 'substring' filed based on the used template name")
                                                                      @RequestParam(required = false) String textSearch,
-                                                                     @ApiParam(value = SORT_PROPERTY_DESCRIPTION)
+                                                                     @Parameter(description = SORT_PROPERTY_DESCRIPTION)
                                                                      @RequestParam(required = false) String sortProperty,
-                                                                     @ApiParam(value = SORT_ORDER_DESCRIPTION)
+                                                                     @Parameter(description = SORT_ORDER_DESCRIPTION)
                                                                      @RequestParam(required = false) String sortOrder,
                                                                      @AuthenticationPrincipal SecurityUser user) throws ThingsboardException {
         // PE: generic permission
diff --git a/application/src/main/java/org/thingsboard/server/controller/NotificationRuleController.java b/application/src/main/java/org/thingsboard/server/controller/NotificationRuleController.java
index 159a5d00f2..f3a7309212 100644
--- a/application/src/main/java/org/thingsboard/server/controller/NotificationRuleController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/NotificationRuleController.java
@@ -15,8 +15,8 @@
  */
 package org.thingsboard.server.controller;
 
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Parameter;
+import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -37,13 +37,12 @@ import org.thingsboard.server.common.data.notification.rule.NotificationRuleInfo
 import org.thingsboard.server.common.data.notification.rule.trigger.config.NotificationRuleTriggerType;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
-import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent;
+import org.thingsboard.server.config.annotations.ApiOperation;
 import org.thingsboard.server.dao.notification.NotificationRuleService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.security.model.SecurityUser;
 import org.thingsboard.server.service.security.permission.Operation;
 
-import javax.validation.Valid;
 import java.util.UUID;
 
 import static org.thingsboard.server.controller.ControllerConstants.MARKDOWN_CODE_BLOCK_END;
@@ -125,11 +124,7 @@ public class NotificationRuleController extends BaseController {
             throw new IllegalArgumentException("Trigger type " + triggerType + " is not available");
         }
 
-        boolean created = notificationRule.getId() == null;
-        notificationRule = doSaveAndLog(EntityType.NOTIFICATION_RULE, notificationRule, notificationRuleService::saveNotificationRule);
-        tbClusterService.broadcastEntityStateChangeEvent(user.getTenantId(), notificationRule.getId(), created ?
-                ComponentLifecycleEvent.CREATED : ComponentLifecycleEvent.UPDATED);
-        return notificationRule;
+        return doSaveAndLog(EntityType.NOTIFICATION_RULE, notificationRule, notificationRuleService::saveNotificationRule);
     }
 
     @ApiOperation(value = "Get notification rule by id (getNotificationRuleById)",
@@ -150,15 +145,15 @@ public class NotificationRuleController extends BaseController {
                     SYSTEM_OR_TENANT_AUTHORITY_PARAGRAPH)
     @GetMapping("/rules")
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
-    public PageData<NotificationRuleInfo> getNotificationRules(@ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+    public PageData<NotificationRuleInfo> getNotificationRules(@Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
                                                                @RequestParam int pageSize,
-                                                               @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+                                                               @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
                                                                @RequestParam int page,
-                                                               @ApiParam(value = "Case-insensitive 'substring' filter based on rule's name")
+                                                               @Parameter(description = "Case-insensitive 'substring' filter based on rule's name")
                                                                @RequestParam(required = false) String textSearch,
-                                                               @ApiParam(value = SORT_PROPERTY_DESCRIPTION)
+                                                               @Parameter(description = SORT_PROPERTY_DESCRIPTION)
                                                                @RequestParam(required = false) String sortProperty,
-                                                               @ApiParam(value = SORT_ORDER_DESCRIPTION)
+                                                               @Parameter(description = SORT_ORDER_DESCRIPTION)
                                                                @RequestParam(required = false) String sortOrder,
                                                                @AuthenticationPrincipal SecurityUser user) throws ThingsboardException {
         // PE: generic permission
@@ -177,7 +172,6 @@ public class NotificationRuleController extends BaseController {
         NotificationRuleId notificationRuleId = new NotificationRuleId(id);
         NotificationRule notificationRule = checkEntityId(notificationRuleId, notificationRuleService::findNotificationRuleById, Operation.DELETE);
         doDeleteAndLog(EntityType.NOTIFICATION_RULE, notificationRule, notificationRuleService::deleteNotificationRuleById);
-        tbClusterService.broadcastEntityStateChangeEvent(user.getTenantId(), notificationRuleId, ComponentLifecycleEvent.DELETED);
     }
 
 }
diff --git a/application/src/main/java/org/thingsboard/server/controller/NotificationTargetController.java b/application/src/main/java/org/thingsboard/server/controller/NotificationTargetController.java
index 5464f4b8a2..8436e8fe35 100644
--- a/application/src/main/java/org/thingsboard/server/controller/NotificationTargetController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/NotificationTargetController.java
@@ -15,11 +15,11 @@
  */
 package org.thingsboard.server.controller;
 
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Parameter;
+import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
@@ -48,12 +48,12 @@ import org.thingsboard.server.common.data.notification.targets.platform.UserList
 import org.thingsboard.server.common.data.notification.targets.platform.UsersFilter;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
+import org.thingsboard.server.config.annotations.ApiOperation;
 import org.thingsboard.server.dao.notification.NotificationTargetService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.security.model.SecurityUser;
 import org.thingsboard.server.service.security.permission.Operation;
 
-import javax.validation.Valid;
 import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
@@ -134,9 +134,9 @@ public class NotificationTargetController extends BaseController {
     @PostMapping("/target/recipients")
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
     public PageData<User> getRecipientsForNotificationTargetConfig(@RequestBody NotificationTarget notificationTarget,
-                                                                   @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+                                                                   @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
                                                                    @RequestParam int pageSize,
-                                                                   @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+                                                                   @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
                                                                    @RequestParam int page,
                                                                    @AuthenticationPrincipal SecurityUser user) throws ThingsboardException {
         // PE: generic permission
@@ -156,7 +156,7 @@ public class NotificationTargetController extends BaseController {
                     SYSTEM_OR_TENANT_AUTHORITY_PARAGRAPH)
     @GetMapping(value = "/targets", params = {"ids"})
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
-    public List<NotificationTarget> getNotificationTargetsByIds(@ApiParam(value = "Comma-separated list of uuids representing targets ids", required = true)
+    public List<NotificationTarget> getNotificationTargetsByIds(@Parameter(description = "Comma-separated list of uuids representing targets ids", required = true)
                                                                 @RequestParam("ids") UUID[] ids,
                                                                 @AuthenticationPrincipal SecurityUser user) {
         // PE: generic permission
@@ -170,15 +170,15 @@ public class NotificationTargetController extends BaseController {
                     SYSTEM_OR_TENANT_AUTHORITY_PARAGRAPH)
     @GetMapping("/targets")
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
-    public PageData<NotificationTarget> getNotificationTargets(@ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+    public PageData<NotificationTarget> getNotificationTargets(@Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
                                                                @RequestParam int pageSize,
-                                                               @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+                                                               @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
                                                                @RequestParam int page,
-                                                               @ApiParam(value = "Case-insensitive 'substring' filed based on the target's name")
+                                                               @Parameter(description = "Case-insensitive 'substring' filed based on the target's name")
                                                                @RequestParam(required = false) String textSearch,
-                                                               @ApiParam(value = SORT_PROPERTY_DESCRIPTION)
+                                                               @Parameter(description = SORT_PROPERTY_DESCRIPTION)
                                                                @RequestParam(required = false) String sortProperty,
-                                                               @ApiParam(value = SORT_ORDER_DESCRIPTION)
+                                                               @Parameter(description = SORT_ORDER_DESCRIPTION)
                                                                @RequestParam(required = false) String sortOrder,
                                                                @AuthenticationPrincipal SecurityUser user) throws ThingsboardException {
         // PE: generic permission
diff --git a/application/src/main/java/org/thingsboard/server/controller/NotificationTemplateController.java b/application/src/main/java/org/thingsboard/server/controller/NotificationTemplateController.java
index 574a72e96f..6948218531 100644
--- a/application/src/main/java/org/thingsboard/server/controller/NotificationTemplateController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/NotificationTemplateController.java
@@ -15,8 +15,8 @@
  */
 package org.thingsboard.server.controller;
 
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Parameter;
+import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -42,13 +42,13 @@ import org.thingsboard.server.common.data.notification.targets.slack.SlackConver
 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.config.annotations.ApiOperation;
 import org.thingsboard.server.dao.notification.NotificationSettingsService;
 import org.thingsboard.server.dao.notification.NotificationTemplateService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.security.model.SecurityUser;
 import org.thingsboard.server.service.security.permission.Operation;
 
-import javax.validation.Valid;
 import java.util.List;
 import java.util.UUID;
 
@@ -137,17 +137,17 @@ public class NotificationTemplateController extends BaseController {
                     SYSTEM_OR_TENANT_AUTHORITY_PARAGRAPH)
     @GetMapping("/templates")
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
-    public PageData<NotificationTemplate> getNotificationTemplates(@ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+    public PageData<NotificationTemplate> getNotificationTemplates(@Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
                                                                    @RequestParam int pageSize,
-                                                                   @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+                                                                   @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
                                                                    @RequestParam int page,
-                                                                   @ApiParam(value = "Case-insensitive 'substring' filter based on template's name and notification type")
+                                                                   @Parameter(description = "Case-insensitive 'substring' filter based on template's name and notification type")
                                                                    @RequestParam(required = false) String textSearch,
-                                                                   @ApiParam(value = SORT_PROPERTY_DESCRIPTION)
+                                                                   @Parameter(description = SORT_PROPERTY_DESCRIPTION)
                                                                    @RequestParam(required = false) String sortProperty,
-                                                                   @ApiParam(value = SORT_ORDER_DESCRIPTION)
+                                                                   @Parameter(description = SORT_ORDER_DESCRIPTION)
                                                                    @RequestParam(required = false) String sortOrder,
-                                                                   @ApiParam(value = "Comma-separated list of notification types to filter the templates")
+                                                                   @Parameter(description = "Comma-separated list of notification types to filter the templates")
                                                                    @RequestParam(required = false) NotificationType[] notificationTypes,
                                                                    @AuthenticationPrincipal SecurityUser user) throws ThingsboardException {
         // PE: generic permission
@@ -177,7 +177,7 @@ public class NotificationTemplateController extends BaseController {
     @GetMapping("/slack/conversations")
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
     public List<SlackConversation> listSlackConversations(@RequestParam SlackConversationType type,
-                                                          @ApiParam(value = "Slack bot token. If absent - system Slack settings will be used")
+                                                          @Parameter(description = "Slack bot token. If absent - system Slack settings will be used")
                                                           @RequestParam(required = false) String token,
                                                           @AuthenticationPrincipal SecurityUser user) {
         // PE: generic permission
diff --git a/application/src/main/java/org/thingsboard/server/controller/OAuth2ConfigTemplateController.java b/application/src/main/java/org/thingsboard/server/controller/OAuth2ConfigTemplateController.java
index d9879b73a2..8924578900 100644
--- a/application/src/main/java/org/thingsboard/server/controller/OAuth2ConfigTemplateController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/OAuth2ConfigTemplateController.java
@@ -15,8 +15,7 @@
  */
 package org.thingsboard.server.controller;
 
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Parameter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -30,6 +29,7 @@ import org.springframework.web.bind.annotation.RestController;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.id.OAuth2ClientRegistrationTemplateId;
 import org.thingsboard.server.common.data.oauth2.OAuth2ClientRegistrationTemplate;
+import org.thingsboard.server.config.annotations.ApiOperation;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.security.permission.Operation;
 import org.thingsboard.server.service.security.permission.Resource;
@@ -63,7 +63,7 @@ public class OAuth2ConfigTemplateController extends BaseController {
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN')")
     @RequestMapping(value = "/{clientRegistrationTemplateId}", method = RequestMethod.DELETE)
     @ResponseStatus(value = HttpStatus.OK)
-    public void deleteClientRegistrationTemplate(@ApiParam(value = "String representation of client registration template id to delete", example = "139b1f81-2f5d-11ec-9dbe-9b627e1a88f4")
+    public void deleteClientRegistrationTemplate(@Parameter(description = "String representation of client registration template id to delete", example = "139b1f81-2f5d-11ec-9dbe-9b627e1a88f4")
                                                  @PathVariable(CLIENT_REGISTRATION_TEMPLATE_ID) String strClientRegistrationTemplateId) throws ThingsboardException {
         checkParameter(CLIENT_REGISTRATION_TEMPLATE_ID, strClientRegistrationTemplateId);
         accessControlService.checkPermission(getCurrentUser(), Resource.OAUTH2_CONFIGURATION_TEMPLATE, Operation.DELETE);
diff --git a/application/src/main/java/org/thingsboard/server/controller/OAuth2Controller.java b/application/src/main/java/org/thingsboard/server/controller/OAuth2Controller.java
index eeedd2842d..c0a9d6d26f 100644
--- a/application/src/main/java/org/thingsboard/server/controller/OAuth2Controller.java
+++ b/application/src/main/java/org/thingsboard/server/controller/OAuth2Controller.java
@@ -15,8 +15,9 @@
  */
 package org.thingsboard.server.controller;
 
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -33,13 +34,13 @@ import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.oauth2.OAuth2ClientInfo;
 import org.thingsboard.server.common.data.oauth2.OAuth2Info;
 import org.thingsboard.server.common.data.oauth2.PlatformType;
+import org.thingsboard.server.config.annotations.ApiOperation;
 import org.thingsboard.server.dao.oauth2.OAuth2Configuration;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.security.permission.Operation;
 import org.thingsboard.server.service.security.permission.Resource;
 import org.thingsboard.server.utils.MiscUtils;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.Enumeration;
 import java.util.List;
 
@@ -61,13 +62,13 @@ public class OAuth2Controller extends BaseController {
     @RequestMapping(value = "/noauth/oauth2Clients", method = RequestMethod.POST)
     @ResponseBody
     public List<OAuth2ClientInfo> getOAuth2Clients(HttpServletRequest request,
-                                                   @ApiParam(value = "Mobile application package name, to find OAuth2 clients " +
+                                                   @Parameter(description = "Mobile application package name, to find OAuth2 clients " +
                                                            "where there is configured mobile application with such package name")
                                                    @RequestParam(required = false) String pkgName,
-                                                   @ApiParam(value = "Platform type to search OAuth2 clients for which " +
+                                                   @Parameter(description = "Platform type to search OAuth2 clients for which " +
                                                            "the usage with this platform type is allowed in the settings. " +
                                                            "If platform type is not one of allowable values - it will just be ignored",
-                                                           allowableValues = "WEB, ANDROID, IOS")
+                                                           schema = @Schema(allowableValues = "WEB, ANDROID, IOS"))
                                                    @RequestParam(required = false) String platform) throws ThingsboardException {
         if (log.isDebugEnabled()) {
             log.debug("Executing getOAuth2Clients: [{}][{}][{}]", request.getScheme(), request.getServerName(), request.getServerPort());
@@ -81,7 +82,8 @@ public class OAuth2Controller extends BaseController {
         if (StringUtils.isNotEmpty(platform)) {
             try {
                 platformType = PlatformType.valueOf(platform);
-            } catch (Exception e) {}
+            } catch (Exception e) {
+            }
         }
         return oAuth2Service.getOAuth2Clients(MiscUtils.getScheme(request), MiscUtils.getDomainNameAndPort(request), pkgName, platformType);
     }
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 72b477f17a..f2b77c3b7b 100644
--- a/application/src/main/java/org/thingsboard/server/controller/OtaPackageController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/OtaPackageController.java
@@ -15,8 +15,10 @@
  */
 package org.thingsboard.server.controller;
 
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+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.core.io.ByteArrayResource;
@@ -42,6 +44,7 @@ import org.thingsboard.server.common.data.ota.ChecksumAlgorithm;
 import org.thingsboard.server.common.data.ota.OtaPackageType;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
+import org.thingsboard.server.config.annotations.ApiOperation;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.entitiy.ota.TbOtaPackageService;
 import org.thingsboard.server.service.security.permission.Operation;
@@ -52,16 +55,13 @@ import java.io.IOException;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.http.MediaType.MULTIPART_FORM_DATA_VALUE;
 import static org.thingsboard.server.controller.ControllerConstants.DEVICE_PROFILE_ID_PARAM_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.OTA_PACKAGE_CHECKSUM_ALGORITHM_ALLOWABLE_VALUES;
 import static org.thingsboard.server.controller.ControllerConstants.OTA_PACKAGE_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.OTA_PACKAGE_ID_PARAM_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.OTA_PACKAGE_INFO_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.OTA_PACKAGE_SORT_PROPERTY_ALLOWABLE_VALUES;
 import static org.thingsboard.server.controller.ControllerConstants.OTA_PACKAGE_TEXT_SEARCH_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_DATA_PARAMETERS;
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_NUMBER_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_SIZE_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_ALLOWABLE_VALUES;
 import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.SORT_PROPERTY_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.TENANT_AUTHORITY_PARAGRAPH;
@@ -84,7 +84,7 @@ public class OtaPackageController extends BaseController {
     @PreAuthorize("hasAnyAuthority( 'TENANT_ADMIN')")
     @RequestMapping(value = "/otaPackage/{otaPackageId}/download", method = RequestMethod.GET)
     @ResponseBody
-    public ResponseEntity<org.springframework.core.io.Resource> downloadOtaPackage(@ApiParam(value = OTA_PACKAGE_ID_PARAM_DESCRIPTION)
+    public ResponseEntity<org.springframework.core.io.Resource> downloadOtaPackage(@Parameter(description = OTA_PACKAGE_ID_PARAM_DESCRIPTION)
                                                                                    @PathVariable(OTA_PACKAGE_ID) String strOtaPackageId) throws ThingsboardException {
         checkParameter(OTA_PACKAGE_ID, strOtaPackageId);
         OtaPackageId otaPackageId = new OtaPackageId(toUUID(strOtaPackageId));
@@ -105,12 +105,11 @@ 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,
-            produces = 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
-    public OtaPackageInfo getOtaPackageInfoById(@ApiParam(value = OTA_PACKAGE_ID_PARAM_DESCRIPTION)
+    public OtaPackageInfo getOtaPackageInfoById(@Parameter(description = OTA_PACKAGE_ID_PARAM_DESCRIPTION)
                                                 @PathVariable(OTA_PACKAGE_ID) String strOtaPackageId) throws ThingsboardException {
         checkParameter(OTA_PACKAGE_ID, strOtaPackageId);
         OtaPackageId otaPackageId = new OtaPackageId(toUUID(strOtaPackageId));
@@ -119,12 +118,11 @@ 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,
-            produces = 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
-    public OtaPackage getOtaPackageById(@ApiParam(value = OTA_PACKAGE_ID_PARAM_DESCRIPTION)
+    public OtaPackage getOtaPackageById(@Parameter(description = OTA_PACKAGE_ID_PARAM_DESCRIPTION)
                                         @PathVariable(OTA_PACKAGE_ID) String strOtaPackageId) throws ThingsboardException {
         checkParameter(OTA_PACKAGE_ID, strOtaPackageId);
         OtaPackageId otaPackageId = new OtaPackageId(toUUID(strOtaPackageId));
@@ -136,13 +134,11 @@ 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,
-            produces = APPLICATION_JSON_VALUE,
-            consumes = 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
-    public OtaPackageInfo saveOtaPackageInfo(@ApiParam(value = "A JSON value representing the OTA Package.")
+    public OtaPackageInfo saveOtaPackageInfo(@Parameter(description = "A JSON value representing the OTA Package.")
                                              @RequestBody SaveOtaPackageInfoRequest otaPackageInfo) throws ThingsboardException {
         otaPackageInfo.setTenantId(getTenantId());
         checkEntity(otaPackageInfo.getId(), otaPackageInfo, Resource.OTA_PACKAGE);
@@ -152,18 +148,17 @@ 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,
-            produces = APPLICATION_JSON_VALUE,
-            consumes = MULTIPART_FORM_DATA_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)
     @ResponseBody
-    public OtaPackageInfo saveOtaPackageData(@ApiParam(value = OTA_PACKAGE_ID_PARAM_DESCRIPTION)
+    public OtaPackageInfo saveOtaPackageData(@Parameter(description = OTA_PACKAGE_ID_PARAM_DESCRIPTION)
                                              @PathVariable(OTA_PACKAGE_ID) String strOtaPackageId,
-                                             @ApiParam(value = "OTA Package checksum. For example, '0xd87f7e0c'")
+                                             @Parameter(description = "OTA Package checksum. For example, '0xd87f7e0c'")
                                              @RequestParam(required = false) String checksum,
-                                             @ApiParam(value = "OTA Package checksum algorithm.", allowableValues = OTA_PACKAGE_CHECKSUM_ALGORITHM_ALLOWABLE_VALUES)
+                                             @Parameter(description = "OTA Package checksum algorithm.", schema = @Schema(allowableValues = {"MD5", "SHA256", "SHA384", "SHA512", "CRC32", "MURMUR3_32", "MURMUR3_128"}))
                                              @RequestParam(CHECKSUM_ALGORITHM) String checksumAlgorithmStr,
-                                             @ApiParam(value = "OTA Package data.")
+                                             @Parameter(description = "OTA Package data.")
                                              @RequestPart MultipartFile file) throws ThingsboardException, IOException {
         checkParameter(OTA_PACKAGE_ID, strOtaPackageId);
         checkParameter(CHECKSUM_ALGORITHM, checksumAlgorithmStr);
@@ -177,20 +172,19 @@ 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,
-            produces = 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
-    public PageData<OtaPackageInfo> getOtaPackages(@ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+    public PageData<OtaPackageInfo> getOtaPackages(@Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
                                                    @RequestParam int pageSize,
-                                                   @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+                                                   @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
                                                    @RequestParam int page,
-                                                   @ApiParam(value = OTA_PACKAGE_TEXT_SEARCH_DESCRIPTION)
+                                                   @Parameter(description = OTA_PACKAGE_TEXT_SEARCH_DESCRIPTION)
                                                    @RequestParam(required = false) String textSearch,
-                                                   @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = OTA_PACKAGE_SORT_PROPERTY_ALLOWABLE_VALUES)
+                                                   @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "type", "title", "version", "tag", "url", "fileName", "dataSize", "checksum"}))
                                                    @RequestParam(required = false) String sortProperty,
-                                                   @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+                                                   @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
                                                    @RequestParam(required = false) String sortOrder) throws ThingsboardException {
         PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder);
         return checkNotNull(otaPackageService.findTenantOtaPackagesByTenantId(getTenantId(), pageLink));
@@ -198,24 +192,23 @@ 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,
-            produces = 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
-    public PageData<OtaPackageInfo> getOtaPackages(@ApiParam(value = DEVICE_PROFILE_ID_PARAM_DESCRIPTION)
+    public PageData<OtaPackageInfo> getOtaPackages(@Parameter(description = DEVICE_PROFILE_ID_PARAM_DESCRIPTION)
                                                    @PathVariable("deviceProfileId") String strDeviceProfileId,
-                                                   @ApiParam(value = "OTA Package type.", allowableValues = "FIRMWARE, SOFTWARE")
+                                                   @Parameter(description = "OTA Package type.", schema = @Schema(allowableValues = "FIRMWARE, SOFTWARE"))
                                                    @PathVariable("type") String strType,
-                                                   @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+                                                   @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
                                                    @RequestParam int pageSize,
-                                                   @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+                                                   @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
                                                    @RequestParam int page,
-                                                   @ApiParam(value = OTA_PACKAGE_TEXT_SEARCH_DESCRIPTION)
+                                                   @Parameter(description = OTA_PACKAGE_TEXT_SEARCH_DESCRIPTION)
                                                    @RequestParam(required = false) String textSearch,
-                                                   @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = OTA_PACKAGE_SORT_PROPERTY_ALLOWABLE_VALUES)
+                                                   @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "type", "title", "version", "tag", "url", "fileName", "dataSize", "checksum"}))
                                                    @RequestParam(required = false) String sortProperty,
-                                                   @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+                                                   @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
                                                    @RequestParam(required = false) String sortOrder) throws ThingsboardException {
         checkParameter("deviceProfileId", strDeviceProfileId);
         checkParameter("type", strType);
@@ -226,12 +219,11 @@ 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,
-            produces = 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
-    public void deleteOtaPackage(@ApiParam(value = OTA_PACKAGE_ID_PARAM_DESCRIPTION)
+    public void deleteOtaPackage(@Parameter(description = OTA_PACKAGE_ID_PARAM_DESCRIPTION)
                                  @PathVariable("otaPackageId") String strOtaPackageId) throws ThingsboardException {
         checkParameter(OTA_PACKAGE_ID, strOtaPackageId);
         OtaPackageId otaPackageId = new OtaPackageId(toUUID(strOtaPackageId));
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 b5f00efdfe..6b90f8f8fd 100644
--- a/application/src/main/java/org/thingsboard/server/controller/QueueController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/QueueController.java
@@ -15,8 +15,8 @@
  */
 package org.thingsboard.server.controller;
 
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -32,6 +32,7 @@ import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.common.data.queue.Queue;
 import org.thingsboard.server.common.msg.queue.ServiceType;
+import org.thingsboard.server.config.annotations.ApiOperation;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.entitiy.queue.TbQueueService;
 import org.thingsboard.server.service.security.permission.Operation;
@@ -45,10 +46,7 @@ import static org.thingsboard.server.controller.ControllerConstants.PAGE_SIZE_DE
 import static org.thingsboard.server.controller.ControllerConstants.QUEUE_ID_PARAM_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.QUEUE_NAME_PARAM_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.QUEUE_QUEUE_TEXT_SEARCH_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.QUEUE_SERVICE_TYPE_ALLOWABLE_VALUES;
 import static org.thingsboard.server.controller.ControllerConstants.QUEUE_SERVICE_TYPE_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.QUEUE_SORT_PROPERTY_ALLOWABLE_VALUES;
-import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_ALLOWABLE_VALUES;
 import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.SORT_PROPERTY_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.SYSTEM_AUTHORITY_PARAGRAPH;
@@ -69,17 +67,17 @@ 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(@ApiParam(value = QUEUE_SERVICE_TYPE_DESCRIPTION, allowableValues = QUEUE_SERVICE_TYPE_ALLOWABLE_VALUES, 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,
-                                                        @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+                                                        @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
                                                         @RequestParam int pageSize,
-                                                        @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+                                                        @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
                                                         @RequestParam int page,
-                                                        @ApiParam(value = QUEUE_QUEUE_TEXT_SEARCH_DESCRIPTION)
+                                                        @Parameter(description = QUEUE_QUEUE_TEXT_SEARCH_DESCRIPTION)
                                                         @RequestParam(required = false) String textSearch,
-                                                        @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = QUEUE_SORT_PROPERTY_ALLOWABLE_VALUES)
+                                                        @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "name", "topic"}))
                                                         @RequestParam(required = false) String sortProperty,
-                                                        @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+                                                        @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
                                                         @RequestParam(required = false) String sortOrder) throws ThingsboardException {
         checkParameter("serviceType", serviceType);
         PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder);
@@ -97,7 +95,7 @@ public class QueueController extends BaseController {
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
     @RequestMapping(value = "/queues/{queueId}", method = RequestMethod.GET)
     @ResponseBody
-    public Queue getQueueById(@ApiParam(value = QUEUE_ID_PARAM_DESCRIPTION)
+    public Queue getQueueById(@Parameter(description = QUEUE_ID_PARAM_DESCRIPTION)
                               @PathVariable("queueId") String queueIdStr) throws ThingsboardException {
         checkParameter("queueId", queueIdStr);
         QueueId queueId = new QueueId(UUID.fromString(queueIdStr));
@@ -110,7 +108,7 @@ public class QueueController extends BaseController {
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
     @RequestMapping(value = "/queues/name/{queueName}", method = RequestMethod.GET)
     @ResponseBody
-    public Queue getQueueByName(@ApiParam(value = QUEUE_NAME_PARAM_DESCRIPTION)
+    public Queue getQueueByName(@Parameter(description = QUEUE_NAME_PARAM_DESCRIPTION)
                                 @PathVariable("queueName") String queueName) throws ThingsboardException {
         checkParameter("queueName", queueName);
         return checkNotNull(queueService.findQueueByTenantIdAndName(getTenantId(), queueName));
@@ -126,9 +124,9 @@ public class QueueController extends BaseController {
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN')")
     @RequestMapping(value = "/queues", params = {"serviceType"}, method = RequestMethod.POST)
     @ResponseBody
-    public Queue saveQueue(@ApiParam(value = "A JSON value representing the queue.")
+    public Queue saveQueue(@Parameter(description = "A JSON value representing the queue.")
                            @RequestBody Queue queue,
-                           @ApiParam(value = QUEUE_SERVICE_TYPE_DESCRIPTION, allowableValues = QUEUE_SERVICE_TYPE_ALLOWABLE_VALUES, 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());
@@ -151,7 +149,7 @@ public class QueueController extends BaseController {
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN')")
     @RequestMapping(value = "/queues/{queueId}", method = RequestMethod.DELETE)
     @ResponseBody
-    public void deleteQueue(@ApiParam(value = QUEUE_ID_PARAM_DESCRIPTION)
+    public void deleteQueue(@Parameter(description = QUEUE_ID_PARAM_DESCRIPTION)
                             @PathVariable("queueId") String queueIdStr) throws ThingsboardException {
         checkParameter("queueId", queueIdStr);
         QueueId queueId = new QueueId(toUUID(queueIdStr));
diff --git a/application/src/main/java/org/thingsboard/server/controller/RpcV1Controller.java b/application/src/main/java/org/thingsboard/server/controller/RpcV1Controller.java
index 0ac83bd11b..c87f5386db 100644
--- a/application/src/main/java/org/thingsboard/server/controller/RpcV1Controller.java
+++ b/application/src/main/java/org/thingsboard/server/controller/RpcV1Controller.java
@@ -15,8 +15,7 @@
  */
 package org.thingsboard.server.controller;
 
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Parameter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -30,6 +29,7 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.context.request.async.DeferredResult;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.id.DeviceId;
+import org.thingsboard.server.config.annotations.ApiOperation;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 
 import java.util.UUID;
@@ -48,9 +48,9 @@ public class RpcV1Controller extends AbstractRpcController {
     @RequestMapping(value = "/oneway/{deviceId}", method = RequestMethod.POST)
     @ResponseBody
     public DeferredResult<ResponseEntity> handleOneWayDeviceRPCRequest(
-            @ApiParam(value = DEVICE_ID_PARAM_DESCRIPTION)
+            @Parameter(description = DEVICE_ID_PARAM_DESCRIPTION)
             @PathVariable("deviceId") String deviceIdStr,
-            @ApiParam(value = "A JSON value representing the RPC request.")
+            @Parameter(description = "A JSON value representing the RPC request.")
             @RequestBody String requestBody) throws ThingsboardException {
         return handleDeviceRPCRequest(true, new DeviceId(UUID.fromString(deviceIdStr)), requestBody, HttpStatus.REQUEST_TIMEOUT, HttpStatus.CONFLICT);
     }
@@ -60,9 +60,9 @@ public class RpcV1Controller extends AbstractRpcController {
     @RequestMapping(value = "/twoway/{deviceId}", method = RequestMethod.POST)
     @ResponseBody
     public DeferredResult<ResponseEntity> handleTwoWayDeviceRPCRequest(
-            @ApiParam(value = DEVICE_ID_PARAM_DESCRIPTION)
+            @Parameter(description = DEVICE_ID_PARAM_DESCRIPTION)
             @PathVariable("deviceId") String deviceIdStr,
-            @ApiParam(value = "A JSON value representing the RPC request.")
+            @Parameter(description = "A JSON value representing the RPC request.")
             @RequestBody String requestBody) throws ThingsboardException {
         return handleDeviceRPCRequest(false, new DeviceId(UUID.fromString(deviceIdStr)), requestBody, HttpStatus.REQUEST_TIMEOUT, HttpStatus.CONFLICT);
     }
diff --git a/application/src/main/java/org/thingsboard/server/controller/RpcV2Controller.java b/application/src/main/java/org/thingsboard/server/controller/RpcV2Controller.java
index f9de7a5b1c..6c08f4a2e2 100644
--- a/application/src/main/java/org/thingsboard/server/controller/RpcV2Controller.java
+++ b/application/src/main/java/org/thingsboard/server/controller/RpcV2Controller.java
@@ -16,10 +16,11 @@
 package org.thingsboard.server.controller;
 
 import com.google.common.util.concurrent.FutureCallback;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import jakarta.annotation.Nullable;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -45,12 +46,12 @@ import org.thingsboard.server.common.data.rpc.Rpc;
 import org.thingsboard.server.common.data.rpc.RpcStatus;
 import org.thingsboard.server.common.msg.TbMsg;
 import org.thingsboard.server.common.msg.TbMsgMetaData;
+import org.thingsboard.server.config.annotations.ApiOperation;
 import org.thingsboard.server.exception.ToErrorResponseEntity;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.common.msg.rpc.RemoveRpcActorMsg;
 import org.thingsboard.server.service.security.permission.Operation;
 
-import javax.annotation.Nullable;
 import java.util.UUID;
 
 import static org.thingsboard.server.controller.ControllerConstants.DEVICE_ID;
@@ -61,10 +62,7 @@ import static org.thingsboard.server.controller.ControllerConstants.PAGE_NUMBER_
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_SIZE_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.RPC_ID;
 import static org.thingsboard.server.controller.ControllerConstants.RPC_ID_PARAM_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.RPC_SORT_PROPERTY_ALLOWABLE_VALUES;
-import static org.thingsboard.server.controller.ControllerConstants.RPC_STATUS_ALLOWABLE_VALUES;
 import static org.thingsboard.server.controller.ControllerConstants.RPC_TEXT_SEARCH_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_ALLOWABLE_VALUES;
 import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.SORT_PROPERTY_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.TENANT_AUTHORITY_PARAGRAPH;
@@ -117,36 +115,36 @@ public class RpcV2Controller extends AbstractRpcController {
 
     @ApiOperation(value = "Send one-way RPC request", notes = ONE_WAY_RPC_REQUEST_DESCRIPTION)
     @ApiResponses(value = {
-            @ApiResponse(code = 200, message = "Persistent RPC request was saved to the database or lightweight RPC request was sent to the device."),
-            @ApiResponse(code = 400, message = "Invalid structure of the request."),
-            @ApiResponse(code = 401, message = "User is not authorized to send the RPC request. Most likely, User belongs to different Customer or Tenant."),
-            @ApiResponse(code = 504, message = "Timeout to process the RPC call. Most likely, device is offline."),
+            @ApiResponse(responseCode = "200", description = "Persistent RPC request was saved to the database or lightweight RPC request was sent to the device."),
+            @ApiResponse(responseCode = "400", description = "Invalid structure of the request."),
+            @ApiResponse(responseCode = "401", description = "User is not authorized to send the RPC request. Most likely, User belongs to different Customer or Tenant."),
+            @ApiResponse(responseCode = "504", description = "Timeout to process the RPC call. Most likely, device is offline."),
     })
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/oneway/{deviceId}", method = RequestMethod.POST)
     @ResponseBody
     public DeferredResult<ResponseEntity> handleOneWayDeviceRPCRequest(
-            @ApiParam(value = DEVICE_ID_PARAM_DESCRIPTION)
+            @Parameter(description = DEVICE_ID_PARAM_DESCRIPTION)
             @PathVariable("deviceId") String deviceIdStr,
-            @ApiParam(value = "A JSON value representing the RPC request.")
+            @Parameter(description = "A JSON value representing the RPC request.")
             @RequestBody String requestBody) throws ThingsboardException {
         return handleDeviceRPCRequest(true, new DeviceId(UUID.fromString(deviceIdStr)), requestBody, HttpStatus.GATEWAY_TIMEOUT, HttpStatus.GATEWAY_TIMEOUT);
     }
 
     @ApiOperation(value = "Send two-way RPC request", notes = TWO_WAY_RPC_REQUEST_DESCRIPTION)
     @ApiResponses(value = {
-            @ApiResponse(code = 200, message = "Persistent RPC request was saved to the database or lightweight RPC response received."),
-            @ApiResponse(code = 400, message = "Invalid structure of the request."),
-            @ApiResponse(code = 401, message = "User is not authorized to send the RPC request. Most likely, User belongs to different Customer or Tenant."),
-            @ApiResponse(code = 504, message = "Timeout to process the RPC call. Most likely, device is offline."),
+            @ApiResponse(responseCode = "200", description = "Persistent RPC request was saved to the database or lightweight RPC response received."),
+            @ApiResponse(responseCode = "400", description = "Invalid structure of the request."),
+            @ApiResponse(responseCode = "401", description = "User is not authorized to send the RPC request. Most likely, User belongs to different Customer or Tenant."),
+            @ApiResponse(responseCode = "504", description = "Timeout to process the RPC call. Most likely, device is offline."),
     })
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/twoway/{deviceId}", method = RequestMethod.POST)
     @ResponseBody
     public DeferredResult<ResponseEntity> handleTwoWayDeviceRPCRequest(
-            @ApiParam(value = DEVICE_ID_PARAM_DESCRIPTION)
+            @Parameter(description = DEVICE_ID_PARAM_DESCRIPTION)
             @PathVariable(DEVICE_ID) String deviceIdStr,
-            @ApiParam(value = "A JSON value representing the RPC request.")
+            @Parameter(description = "A JSON value representing the RPC request.")
             @RequestBody String requestBody) throws ThingsboardException {
         return handleDeviceRPCRequest(false, new DeviceId(UUID.fromString(deviceIdStr)), requestBody, HttpStatus.GATEWAY_TIMEOUT, HttpStatus.GATEWAY_TIMEOUT);
     }
@@ -156,7 +154,7 @@ public class RpcV2Controller extends AbstractRpcController {
     @RequestMapping(value = "/persistent/{rpcId}", method = RequestMethod.GET)
     @ResponseBody
     public Rpc getPersistedRpc(
-            @ApiParam(value = RPC_ID_PARAM_DESCRIPTION, required = true)
+            @Parameter(description = RPC_ID_PARAM_DESCRIPTION, required = true)
             @PathVariable(RPC_ID) String strRpc) throws ThingsboardException {
         checkParameter("RpcId", strRpc);
         RpcId rpcId = new RpcId(UUID.fromString(strRpc));
@@ -168,19 +166,19 @@ public class RpcV2Controller extends AbstractRpcController {
     @RequestMapping(value = "/persistent/device/{deviceId}", method = RequestMethod.GET)
     @ResponseBody
     public DeferredResult<ResponseEntity> getPersistedRpcByDevice(
-            @ApiParam(value = DEVICE_ID_PARAM_DESCRIPTION, required = true)
+            @Parameter(description = DEVICE_ID_PARAM_DESCRIPTION, required = true)
             @PathVariable(DEVICE_ID) String strDeviceId,
-            @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
             @RequestParam int pageSize,
-            @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
             @RequestParam int page,
-            @ApiParam(value = "Status of the RPC", allowableValues = RPC_STATUS_ALLOWABLE_VALUES)
+            @Parameter(description = "Status of the RPC", schema = @Schema(allowableValues = {"QUEUED", "SENT", "DELIVERED", "SUCCESSFUL", "TIMEOUT", "EXPIRED", "FAILED"}))
             @RequestParam(required = false) RpcStatus rpcStatus,
-            @ApiParam(value = RPC_TEXT_SEARCH_DESCRIPTION)
+            @Parameter(description = RPC_TEXT_SEARCH_DESCRIPTION)
             @RequestParam(required = false) String textSearch,
-            @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = RPC_SORT_PROPERTY_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "expirationTime", "request", "response"}))
             @RequestParam(required = false) String sortProperty,
-            @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
             @RequestParam(required = false) String sortOrder) throws ThingsboardException {
         checkParameter("DeviceId", strDeviceId);
         if (rpcStatus != null && rpcStatus.equals(RpcStatus.DELETED)) {
@@ -223,7 +221,7 @@ public class RpcV2Controller extends AbstractRpcController {
     @RequestMapping(value = "/persistent/{rpcId}", method = RequestMethod.DELETE)
     @ResponseBody
     public void deleteRpc(
-            @ApiParam(value = RPC_ID_PARAM_DESCRIPTION, required = true)
+            @Parameter(description = RPC_ID_PARAM_DESCRIPTION, required = true)
             @PathVariable(RPC_ID) String strRpc) throws ThingsboardException {
         checkParameter("RpcId", strRpc);
         RpcId rpcId = new RpcId(UUID.fromString(strRpc));
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 2d21986834..63a435e6f1 100644
--- a/application/src/main/java/org/thingsboard/server/controller/RuleChainController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/RuleChainController.java
@@ -20,13 +20,12 @@ import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Schema;
 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.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -45,7 +44,6 @@ 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.EdgeId;
 import org.thingsboard.server.common.data.id.RuleChainId;
@@ -54,7 +52,6 @@ import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageDataIterableByTenant;
 import org.thingsboard.server.common.data.page.PageLink;
-import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent;
 import org.thingsboard.server.common.data.rule.DefaultRuleChainCreateRequest;
 import org.thingsboard.server.common.data.rule.RuleChain;
 import org.thingsboard.server.common.data.rule.RuleChainData;
@@ -66,6 +63,7 @@ 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 org.thingsboard.server.config.annotations.ApiOperation;
 import org.thingsboard.server.dao.event.EventService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.rule.TbRuleChainService;
@@ -77,6 +75,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;
@@ -93,12 +92,9 @@ import static org.thingsboard.server.controller.ControllerConstants.PAGE_DATA_PA
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_NUMBER_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_SIZE_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.RULE_CHAIN_ID_PARAM_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.RULE_CHAIN_SORT_PROPERTY_ALLOWABLE_VALUES;
 import static org.thingsboard.server.controller.ControllerConstants.RULE_CHAIN_TEXT_SEARCH_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.RULE_CHAIN_TYPES_ALLOWABLE_VALUES;
 import static org.thingsboard.server.controller.ControllerConstants.RULE_CHAIN_TYPE_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.RULE_NODE_ID_PARAM_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_ALLOWABLE_VALUES;
 import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.SORT_PROPERTY_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.TENANT_AUTHORITY_PARAGRAPH;
@@ -163,7 +159,7 @@ public class RuleChainController extends BaseController {
     @RequestMapping(value = "/ruleChain/{ruleChainId}", method = RequestMethod.GET)
     @ResponseBody
     public RuleChain getRuleChainById(
-            @ApiParam(value = RULE_CHAIN_ID_PARAM_DESCRIPTION)
+            @Parameter(description = RULE_CHAIN_ID_PARAM_DESCRIPTION)
             @PathVariable(RULE_CHAIN_ID) String strRuleChainId) throws ThingsboardException {
         checkParameter(RULE_CHAIN_ID, strRuleChainId);
         RuleChainId ruleChainId = new RuleChainId(toUUID(strRuleChainId));
@@ -177,7 +173,7 @@ public class RuleChainController extends BaseController {
     @RequestMapping(value = "/ruleChain/{ruleChainId}/output/labels", method = RequestMethod.GET)
     @ResponseBody
     public Set<String> getRuleChainOutputLabels(
-            @ApiParam(value = RULE_CHAIN_ID_PARAM_DESCRIPTION)
+            @Parameter(description = RULE_CHAIN_ID_PARAM_DESCRIPTION)
             @PathVariable(RULE_CHAIN_ID) String strRuleChainId) throws ThingsboardException {
         checkParameter(RULE_CHAIN_ID, strRuleChainId);
         RuleChainId ruleChainId = new RuleChainId(toUUID(strRuleChainId));
@@ -192,7 +188,7 @@ public class RuleChainController extends BaseController {
     @RequestMapping(value = "/ruleChain/{ruleChainId}/output/labels/usage", method = RequestMethod.GET)
     @ResponseBody
     public List<RuleChainOutputLabelsUsage> getRuleChainOutputLabelsUsage(
-            @ApiParam(value = RULE_CHAIN_ID_PARAM_DESCRIPTION)
+            @Parameter(description = RULE_CHAIN_ID_PARAM_DESCRIPTION)
             @PathVariable(RULE_CHAIN_ID) String strRuleChainId) throws ThingsboardException {
         checkParameter(RULE_CHAIN_ID, strRuleChainId);
         RuleChainId ruleChainId = new RuleChainId(toUUID(strRuleChainId));
@@ -206,7 +202,7 @@ public class RuleChainController extends BaseController {
     @RequestMapping(value = "/ruleChain/{ruleChainId}/metadata", method = RequestMethod.GET)
     @ResponseBody
     public RuleChainMetaData getRuleChainMetaData(
-            @ApiParam(value = RULE_CHAIN_ID_PARAM_DESCRIPTION)
+            @Parameter(description = RULE_CHAIN_ID_PARAM_DESCRIPTION)
             @PathVariable(RULE_CHAIN_ID) String strRuleChainId) throws ThingsboardException {
         checkParameter(RULE_CHAIN_ID, strRuleChainId);
         RuleChainId ruleChainId = new RuleChainId(toUUID(strRuleChainId));
@@ -226,7 +222,7 @@ public class RuleChainController extends BaseController {
     @RequestMapping(value = "/ruleChain", method = RequestMethod.POST)
     @ResponseBody
     public RuleChain saveRuleChain(
-            @ApiParam(value = "A JSON value representing the rule chain.")
+            @Parameter(description = "A JSON value representing the rule chain.")
             @RequestBody RuleChain ruleChain) throws Exception {
         ruleChain.setTenantId(getCurrentUser().getTenantId());
         checkEntity(ruleChain.getId(), ruleChain, Resource.RULE_CHAIN);
@@ -240,7 +236,7 @@ public class RuleChainController extends BaseController {
     @RequestMapping(value = "/ruleChain/device/default", method = RequestMethod.POST)
     @ResponseBody
     public RuleChain saveRuleChain(
-            @ApiParam(value = "A JSON value representing the request.")
+            @Parameter(description = "A JSON value representing the request.")
             @RequestBody DefaultRuleChainCreateRequest request) throws Exception {
         checkNotNull(request);
         checkParameter(request.getName(), "name");
@@ -253,7 +249,7 @@ public class RuleChainController extends BaseController {
     @RequestMapping(value = "/ruleChain/{ruleChainId}/root", method = RequestMethod.POST)
     @ResponseBody
     public RuleChain setRootRuleChain(
-            @ApiParam(value = RULE_CHAIN_ID_PARAM_DESCRIPTION)
+            @Parameter(description = RULE_CHAIN_ID_PARAM_DESCRIPTION)
             @PathVariable(RULE_CHAIN_ID) String strRuleChainId) throws ThingsboardException {
         checkParameter(RULE_CHAIN_ID, strRuleChainId);
         RuleChainId ruleChainId = new RuleChainId(toUUID(strRuleChainId));
@@ -267,9 +263,9 @@ public class RuleChainController extends BaseController {
     @RequestMapping(value = "/ruleChain/metadata", method = RequestMethod.POST)
     @ResponseBody
     public RuleChainMetaData saveRuleChainMetaData(
-            @ApiParam(value = "A JSON value representing the rule chain metadata.")
+            @Parameter(description = "A JSON value representing the rule chain metadata.")
             @RequestBody RuleChainMetaData ruleChainMetaData,
-            @ApiParam(value = "Update related rule nodes.")
+            @Parameter(description = "Update related rule nodes.")
             @RequestParam(value = "updateRelated", required = false, defaultValue = "true") boolean updateRelated
     ) throws Exception {
         TenantId tenantId = getTenantId();
@@ -291,17 +287,17 @@ public class RuleChainController extends BaseController {
     @RequestMapping(value = "/ruleChains", params = {"pageSize", "page"}, method = RequestMethod.GET)
     @ResponseBody
     public PageData<RuleChain> getRuleChains(
-            @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
             @RequestParam int pageSize,
-            @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
             @RequestParam int page,
-            @ApiParam(value = RULE_CHAIN_TYPE_DESCRIPTION, allowableValues = RULE_CHAIN_TYPES_ALLOWABLE_VALUES)
+            @Parameter(description = RULE_CHAIN_TYPE_DESCRIPTION, schema = @Schema(allowableValues = {"CORE", "EDGE"}))
             @RequestParam(value = "type", required = false) String typeStr,
-            @ApiParam(value = RULE_CHAIN_TEXT_SEARCH_DESCRIPTION)
+            @Parameter(description = RULE_CHAIN_TEXT_SEARCH_DESCRIPTION)
             @RequestParam(required = false) String textSearch,
-            @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = RULE_CHAIN_SORT_PROPERTY_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "name", "root"}))
             @RequestParam(required = false) String sortProperty,
-            @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
             @RequestParam(required = false) String sortOrder) throws ThingsboardException {
         TenantId tenantId = getCurrentUser().getTenantId();
         PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder);
@@ -319,7 +315,7 @@ public class RuleChainController extends BaseController {
     @RequestMapping(value = "/ruleChain/{ruleChainId}", method = RequestMethod.DELETE)
     @ResponseStatus(value = HttpStatus.OK)
     public void deleteRuleChain(
-            @ApiParam(value = RULE_CHAIN_ID_PARAM_DESCRIPTION)
+            @Parameter(description = RULE_CHAIN_ID_PARAM_DESCRIPTION)
             @PathVariable(RULE_CHAIN_ID) String strRuleChainId) throws ThingsboardException {
         checkParameter(RULE_CHAIN_ID, strRuleChainId);
         RuleChainId ruleChainId = new RuleChainId(toUUID(strRuleChainId));
@@ -334,24 +330,14 @@ public class RuleChainController extends BaseController {
     @RequestMapping(value = "/ruleNode/{ruleNodeId}/debugIn", method = RequestMethod.GET)
     @ResponseBody
     public JsonNode getLatestRuleNodeDebugInput(
-            @ApiParam(value = RULE_NODE_ID_PARAM_DESCRIPTION)
+            @Parameter(description = RULE_NODE_ID_PARAM_DESCRIPTION)
             @PathVariable(RULE_NODE_ID) String strRuleNodeId) throws ThingsboardException {
         checkParameter(RULE_NODE_ID, strRuleNodeId);
         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",
@@ -369,9 +355,9 @@ public class RuleChainController extends BaseController {
     @RequestMapping(value = "/ruleChain/testScript", method = RequestMethod.POST)
     @ResponseBody
     public JsonNode testScript(
-            @ApiParam(value = "Script language: JS or TBEL")
+            @Parameter(description = "Script language: JS or TBEL")
             @RequestParam(required = false) ScriptLanguage scriptLang,
-            @ApiParam(value = "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();
@@ -443,7 +429,7 @@ public class RuleChainController extends BaseController {
     @RequestMapping(value = "/ruleChains/export", params = {"limit"}, method = RequestMethod.GET)
     @ResponseBody
     public RuleChainData exportRuleChains(
-            @ApiParam(value = "A limit of rule chains to export.", required = true)
+            @Parameter(description = "A limit of rule chains to export.", required = true)
             @RequestParam("limit") int limit) throws ThingsboardException {
         TenantId tenantId = getCurrentUser().getTenantId();
         PageLink pageLink = new PageLink(limit);
@@ -455,19 +441,12 @@ public class RuleChainController extends BaseController {
     @RequestMapping(value = "/ruleChains/import", method = RequestMethod.POST)
     @ResponseBody
     public List<RuleChainImportResult> importRuleChains(
-            @ApiParam(value = "A JSON value representing the rule chains.")
+            @Parameter(description = "A JSON value representing the rule chains.")
             @RequestBody RuleChainData ruleChainData,
-            @ApiParam(value = "Enables overwrite for existing rule chains with the same name.")
+            @Parameter(description = "Enables overwrite for existing rule chains with the same name.")
             @RequestParam(required = false, defaultValue = "false") boolean overwrite) throws ThingsboardException {
         TenantId tenantId = getCurrentUser().getTenantId();
-        List<RuleChainImportResult> importResults = ruleChainService.importTenantRuleChains(tenantId, ruleChainData, overwrite, tbRuleChainService::updateRuleNodeConfiguration);
-        for (RuleChainImportResult importResult : importResults) {
-            if (importResult.getError() == null) {
-                tbClusterService.broadcastEntityStateChangeEvent(importResult.getTenantId(), importResult.getRuleChainId(),
-                        importResult.isUpdated() ? ComponentLifecycleEvent.UPDATED : ComponentLifecycleEvent.CREATED);
-            }
-        }
-        return importResults;
+        return ruleChainService.importTenantRuleChains(tenantId, ruleChainData, overwrite, tbRuleChainService::updateRuleNodeConfiguration);
     }
 
     private String msgToOutput(TbMsg msg) throws Exception {
@@ -506,8 +485,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,
-            produces = 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
@@ -529,8 +507,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,
-            produces = 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
@@ -552,17 +529,17 @@ public class RuleChainController extends BaseController {
     @RequestMapping(value = "/edge/{edgeId}/ruleChains", params = {"pageSize", "page"}, method = RequestMethod.GET)
     @ResponseBody
     public PageData<RuleChain> getEdgeRuleChains(
-            @ApiParam(value = EDGE_ID_PARAM_DESCRIPTION, required = true)
+            @Parameter(description = EDGE_ID_PARAM_DESCRIPTION, required = true)
             @PathVariable(EDGE_ID) String strEdgeId,
-            @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
             @RequestParam int pageSize,
-            @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
             @RequestParam int page,
-            @ApiParam(value = RULE_CHAIN_TEXT_SEARCH_DESCRIPTION)
+            @Parameter(description = RULE_CHAIN_TEXT_SEARCH_DESCRIPTION)
             @RequestParam(required = false) String textSearch,
-            @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = RULE_CHAIN_SORT_PROPERTY_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "name", "root"}))
             @RequestParam(required = false) String sortProperty,
-            @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
             @RequestParam(required = false) String sortOrder) throws ThingsboardException {
         checkParameter(EDGE_ID, strEdgeId);
         TenantId tenantId = getCurrentUser().getTenantId();
@@ -578,7 +555,7 @@ public class RuleChainController extends BaseController {
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/ruleChain/{ruleChainId}/edgeTemplateRoot", method = RequestMethod.POST)
     @ResponseBody
-    public RuleChain setEdgeTemplateRootRuleChain(@ApiParam(value = RULE_CHAIN_ID_PARAM_DESCRIPTION)
+    public RuleChain setEdgeTemplateRootRuleChain(@Parameter(description = RULE_CHAIN_ID_PARAM_DESCRIPTION)
                                                   @PathVariable(RULE_CHAIN_ID) String strRuleChainId) throws ThingsboardException {
         checkParameter(RULE_CHAIN_ID, strRuleChainId);
         RuleChainId ruleChainId = new RuleChainId(toUUID(strRuleChainId));
@@ -592,7 +569,7 @@ public class RuleChainController extends BaseController {
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/ruleChain/{ruleChainId}/autoAssignToEdge", method = RequestMethod.POST)
     @ResponseBody
-    public RuleChain setAutoAssignToEdgeRuleChain(@ApiParam(value = RULE_CHAIN_ID_PARAM_DESCRIPTION)
+    public RuleChain setAutoAssignToEdgeRuleChain(@Parameter(description = RULE_CHAIN_ID_PARAM_DESCRIPTION)
                                                   @PathVariable(RULE_CHAIN_ID) String strRuleChainId) throws ThingsboardException {
         checkParameter(RULE_CHAIN_ID, strRuleChainId);
         RuleChainId ruleChainId = new RuleChainId(toUUID(strRuleChainId));
@@ -606,7 +583,7 @@ public class RuleChainController extends BaseController {
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/ruleChain/{ruleChainId}/autoAssignToEdge", method = RequestMethod.DELETE)
     @ResponseBody
-    public RuleChain unsetAutoAssignToEdgeRuleChain(@ApiParam(value = RULE_CHAIN_ID_PARAM_DESCRIPTION)
+    public RuleChain unsetAutoAssignToEdgeRuleChain(@Parameter(description = RULE_CHAIN_ID_PARAM_DESCRIPTION)
                                                     @PathVariable(RULE_CHAIN_ID) String strRuleChainId) throws ThingsboardException {
         checkParameter(RULE_CHAIN_ID, strRuleChainId);
         RuleChainId ruleChainId = new RuleChainId(toUUID(strRuleChainId));
diff --git a/application/src/main/java/org/thingsboard/server/controller/SystemInfoController.java b/application/src/main/java/org/thingsboard/server/controller/SystemInfoController.java
index 01a7cae420..cb2033b29d 100644
--- a/application/src/main/java/org/thingsboard/server/controller/SystemInfoController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/SystemInfoController.java
@@ -17,6 +17,8 @@ package org.thingsboard.server.controller;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import io.swagger.v3.oas.annotations.Hidden;
+import jakarta.annotation.PostConstruct;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -40,14 +42,12 @@ import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.security.model.SecurityUser;
 import org.thingsboard.server.service.security.model.UserPrincipal;
 import org.thingsboard.server.service.sync.vc.EntitiesVersionControlService;
-import springfox.documentation.annotations.ApiIgnore;
 
-import javax.annotation.PostConstruct;
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
-@ApiIgnore
+@Hidden
 @RestController
 @TbCoreComponent
 @RequestMapping("/api")
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 56c67f4fa5..e646c34e4f 100644
--- a/application/src/main/java/org/thingsboard/server/controller/TbResourceController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/TbResourceController.java
@@ -15,8 +15,10 @@
  */
 package org.thingsboard.server.controller;
 
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+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.apache.commons.lang3.StringUtils;
@@ -47,6 +49,7 @@ import org.thingsboard.server.common.data.lwm2m.LwM2mObject;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.common.data.security.Authority;
+import org.thingsboard.server.config.annotations.ApiOperation;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.resource.TbResourceService;
 import org.thingsboard.server.service.security.permission.Operation;
@@ -60,18 +63,14 @@ import java.util.Set;
 
 import static org.thingsboard.server.controller.ControllerConstants.AVAILABLE_FOR_ANY_AUTHORIZED_USER;
 import static org.thingsboard.server.controller.ControllerConstants.LWM2M_OBJECT_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.LWM2M_OBJECT_SORT_PROPERTY_ALLOWABLE_VALUES;
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_DATA_PARAMETERS;
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_NUMBER_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_SIZE_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.RESOURCE_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.RESOURCE_ID_PARAM_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.RESOURCE_INFO_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.RESOURCE_SORT_PROPERTY_ALLOWABLE_VALUES;
 import static org.thingsboard.server.controller.ControllerConstants.RESOURCE_TEXT_SEARCH_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.RESOURCE_TYPE;
-import static org.thingsboard.server.controller.ControllerConstants.RESOURCE_TYPE_PROPERTY_ALLOWABLE_VALUES;
-import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_ALLOWABLE_VALUES;
 import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.SORT_PROPERTY_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.SYSTEM_OR_TENANT_AUTHORITY_PARAGRAPH;
@@ -93,7 +92,7 @@ public class TbResourceController extends BaseController {
     @ApiOperation(value = "Download Resource (downloadResource)", notes = "Download Resource based on the provided Resource Id." + SYSTEM_OR_TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
     @GetMapping(value = "/resource/{resourceId}/download")
-    public ResponseEntity<ByteArrayResource> downloadResource(@ApiParam(value = RESOURCE_ID_PARAM_DESCRIPTION)
+    public ResponseEntity<ByteArrayResource> downloadResource(@Parameter(description = RESOURCE_ID_PARAM_DESCRIPTION)
                                                               @PathVariable(RESOURCE_ID) String strResourceId) throws ThingsboardException {
         checkParameter(RESOURCE_ID, strResourceId);
         TbResourceId resourceId = new TbResourceId(toUUID(strResourceId));
@@ -111,7 +110,7 @@ public class TbResourceController extends BaseController {
     @ApiOperation(value = "Download LWM2M Resource (downloadLwm2mResourceIfChanged)", notes = DOWNLOAD_RESOURCE_IF_NOT_CHANGED + SYSTEM_OR_TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
     @GetMapping(value = "/resource/lwm2m/{resourceId}/download", produces = "application/xml")
-    public ResponseEntity<ByteArrayResource> downloadLwm2mResourceIfChanged(@ApiParam(value = RESOURCE_ID_PARAM_DESCRIPTION)
+    public ResponseEntity<ByteArrayResource> downloadLwm2mResourceIfChanged(@Parameter(description = RESOURCE_ID_PARAM_DESCRIPTION)
                                                                             @PathVariable(RESOURCE_ID) String strResourceId,
                                                                             @RequestHeader(name = HttpHeaders.IF_NONE_MATCH, required = false) String etag) throws ThingsboardException {
         return downloadResourceIfChanged(ResourceType.LWM2M_MODEL, strResourceId, etag);
@@ -120,7 +119,7 @@ public class TbResourceController extends BaseController {
     @ApiOperation(value = "Download PKCS_12 Resource (downloadPkcs12ResourceIfChanged)", notes = DOWNLOAD_RESOURCE_IF_NOT_CHANGED + SYSTEM_OR_TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
     @RequestMapping(value = "/resource/pkcs12/{resourceId}/download", method = RequestMethod.GET, produces = "application/x-pkcs12")
-    public ResponseEntity<ByteArrayResource> downloadPkcs12ResourceIfChanged(@ApiParam(value = RESOURCE_ID_PARAM_DESCRIPTION)
+    public ResponseEntity<ByteArrayResource> downloadPkcs12ResourceIfChanged(@Parameter(description = RESOURCE_ID_PARAM_DESCRIPTION)
                                                                              @PathVariable(RESOURCE_ID) String strResourceId,
                                                                              @RequestHeader(name = HttpHeaders.IF_NONE_MATCH, required = false) String etag) throws ThingsboardException {
         return downloadResourceIfChanged(ResourceType.PKCS_12, strResourceId, etag);
@@ -130,7 +129,7 @@ public class TbResourceController extends BaseController {
             notes = DOWNLOAD_RESOURCE_IF_NOT_CHANGED + SYSTEM_OR_TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
     @GetMapping(value = "/resource/jks/{resourceId}/download", produces = "application/x-java-keystore")
-    public ResponseEntity<ByteArrayResource> downloadJksResourceIfChanged(@ApiParam(value = RESOURCE_ID_PARAM_DESCRIPTION)
+    public ResponseEntity<ByteArrayResource> downloadJksResourceIfChanged(@Parameter(description = RESOURCE_ID_PARAM_DESCRIPTION)
                                                                           @PathVariable(RESOURCE_ID) String strResourceId,
                                                                           @RequestHeader(name = HttpHeaders.IF_NONE_MATCH, required = false) String etag) throws ThingsboardException {
         return downloadResourceIfChanged(ResourceType.JKS, strResourceId, etag);
@@ -139,7 +138,7 @@ public class TbResourceController extends BaseController {
     @ApiOperation(value = "Download JS Resource (downloadJsResourceIfChanged)", notes = DOWNLOAD_RESOURCE_IF_NOT_CHANGED + AVAILABLE_FOR_ANY_AUTHORIZED_USER)
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
     @GetMapping(value = "/resource/js/{resourceId}/download", produces = "application/javascript")
-    public ResponseEntity<ByteArrayResource> downloadJsResourceIfChanged(@ApiParam(value = RESOURCE_ID_PARAM_DESCRIPTION)
+    public ResponseEntity<ByteArrayResource> downloadJsResourceIfChanged(@Parameter(description = RESOURCE_ID_PARAM_DESCRIPTION)
                                                                          @PathVariable(RESOURCE_ID) String strResourceId,
                                                                          @RequestHeader(name = HttpHeaders.IF_NONE_MATCH, required = false) String etag) throws ThingsboardException {
         return downloadResourceIfChanged(ResourceType.JS_MODULE, strResourceId, etag);
@@ -147,11 +146,10 @@ 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,
-            produces = "application/json")
+                    RESOURCE_INFO_DESCRIPTION + SYSTEM_OR_TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
     @GetMapping(value = "/resource/info/{resourceId}")
-    public TbResourceInfo getResourceInfoById(@ApiParam(value = RESOURCE_ID_PARAM_DESCRIPTION)
+    public TbResourceInfo getResourceInfoById(@Parameter(description = RESOURCE_ID_PARAM_DESCRIPTION)
                                               @PathVariable(RESOURCE_ID) String strResourceId) throws ThingsboardException {
         checkParameter(RESOURCE_ID, strResourceId);
         TbResourceId resourceId = new TbResourceId(toUUID(strResourceId));
@@ -160,12 +158,11 @@ 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,
-            produces = "application/json", 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}")
-    public TbResource getResourceById(@ApiParam(value = RESOURCE_ID_PARAM_DESCRIPTION)
+    public TbResource getResourceById(@Parameter(description = RESOURCE_ID_PARAM_DESCRIPTION)
                                       @PathVariable(RESOURCE_ID) String strResourceId) throws ThingsboardException {
         checkParameter(RESOURCE_ID, strResourceId);
         TbResourceId resourceId = new TbResourceId(toUUID(strResourceId));
@@ -179,12 +176,10 @@ 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,
-            produces = "application/json",
-            consumes = "application/json")
+                    SYSTEM_OR_TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
     @PostMapping(value = "/resource")
-    public TbResourceInfo saveResource(@ApiParam(value = "A JSON value representing the Resource.")
+    public TbResourceInfo saveResource(@Parameter(description = "A JSON value representing the Resource.")
                                        @RequestBody TbResource resource) throws Exception {
         resource.setTenantId(getTenantId());
         checkEntity(resource.getId(), resource, Resource.TB_RESOURCE);
@@ -193,21 +188,20 @@ 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,
-            produces = "application/json")
+                    PAGE_DATA_PARAMETERS + RESOURCE_INFO_DESCRIPTION + SYSTEM_OR_TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
     @GetMapping(value = "/resource")
-    public PageData<TbResourceInfo> getResources(@ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+    public PageData<TbResourceInfo> getResources(@Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
                                                  @RequestParam int pageSize,
-                                                 @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+                                                 @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
                                                  @RequestParam int page,
-                                                 @ApiParam(value = RESOURCE_TYPE, allowableValues = RESOURCE_TYPE_PROPERTY_ALLOWABLE_VALUES)
+                                                 @Parameter(description = RESOURCE_TYPE, schema = @Schema(allowableValues = {"LWM2M_MODEL", "JKS", "PKCS_12", "JS_MODULE"}))
                                                  @RequestParam(required = false) String resourceType,
-                                                 @ApiParam(value = RESOURCE_TEXT_SEARCH_DESCRIPTION)
+                                                 @Parameter(description = RESOURCE_TEXT_SEARCH_DESCRIPTION)
                                                  @RequestParam(required = false) String textSearch,
-                                                 @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = RESOURCE_SORT_PROPERTY_ALLOWABLE_VALUES)
+                                                 @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "title", "resourceType", "tenantId"}))
                                                  @RequestParam(required = false) String sortProperty,
-                                                 @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+                                                 @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
                                                  @RequestParam(required = false) String sortOrder) throws ThingsboardException {
         PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder);
         TbResourceInfoFilter.TbResourceInfoFilterBuilder filter = TbResourceInfoFilter.builder();
@@ -229,19 +223,18 @@ 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,
-            produces = "application/json")
+                    PAGE_DATA_PARAMETERS + RESOURCE_INFO_DESCRIPTION + TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
     @GetMapping(value = "/resource/tenant")
-    public PageData<TbResourceInfo> getTenantResources(@ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+    public PageData<TbResourceInfo> getTenantResources(@Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
                                                        @RequestParam int pageSize,
-                                                       @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+                                                       @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
                                                        @RequestParam int page,
-                                                       @ApiParam(value = RESOURCE_TEXT_SEARCH_DESCRIPTION)
+                                                       @Parameter(description = RESOURCE_TEXT_SEARCH_DESCRIPTION)
                                                        @RequestParam(required = false) String textSearch,
-                                                       @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = RESOURCE_SORT_PROPERTY_ALLOWABLE_VALUES)
+                                                       @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "title", "resourceType", "tenantId"}))
                                                        @RequestParam(required = false) String sortProperty,
-                                                       @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+                                                       @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
                                                        @RequestParam(required = false) String sortOrder) throws ThingsboardException {
         PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder);
         TbResourceInfoFilter filter = TbResourceInfoFilter.builder()
@@ -253,19 +246,18 @@ 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,
-            produces = "application/json")
+                    PAGE_DATA_PARAMETERS + LWM2M_OBJECT_DESCRIPTION + TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
     @GetMapping(value = "/resource/lwm2m/page")
-    public List<LwM2mObject> getLwm2mListObjectsPage(@ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+    public List<LwM2mObject> getLwm2mListObjectsPage(@Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
                                                      @RequestParam int pageSize,
-                                                     @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+                                                     @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
                                                      @RequestParam int page,
-                                                     @ApiParam(value = RESOURCE_TEXT_SEARCH_DESCRIPTION)
+                                                     @Parameter(description = RESOURCE_TEXT_SEARCH_DESCRIPTION)
                                                      @RequestParam(required = false) String textSearch,
-                                                     @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = LWM2M_OBJECT_SORT_PROPERTY_ALLOWABLE_VALUES)
+                                                     @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"id", "name"}))
                                                      @RequestParam(required = false) String sortProperty,
-                                                     @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+                                                     @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
                                                      @RequestParam(required = false) String sortOrder) throws ThingsboardException {
         PageLink pageLink = new PageLink(pageSize, page, textSearch);
         return checkNotNull(tbResourceService.findLwM2mObjectPage(getTenantId(), sortProperty, sortOrder, pageLink));
@@ -273,15 +265,14 @@ 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,
-            produces = "application/json")
+                    "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(@ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES, required = true)
+    public List<LwM2mObject> getLwm2mListObjects(@Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}, requiredMode = Schema.RequiredMode.REQUIRED))
                                                  @RequestParam String sortOrder,
-                                                 @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = LWM2M_OBJECT_SORT_PROPERTY_ALLOWABLE_VALUES, required = true)
+                                                 @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"id", "name"}, requiredMode = Schema.RequiredMode.REQUIRED))
                                                  @RequestParam String sortProperty,
-                                                 @ApiParam(value = "LwM2M Object ids.", required = true)
+                                                 @Parameter(description = "LwM2M Object ids.", required = true)
                                                  @RequestParam(required = false) String[] objectIds) throws ThingsboardException {
         return checkNotNull(tbResourceService.findLwM2mObject(getTenantId(), sortOrder, sortProperty, objectIds));
     }
@@ -290,7 +281,7 @@ public class TbResourceController extends BaseController {
             notes = "Deletes the Resource. Referencing non-existing Resource Id will cause an error." + SYSTEM_OR_TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
     @DeleteMapping(value = "/resource/{resourceId}")
-    public void deleteResource(@ApiParam(value = RESOURCE_ID_PARAM_DESCRIPTION)
+    public void deleteResource(@Parameter(description = RESOURCE_ID_PARAM_DESCRIPTION)
                                @PathVariable("resourceId") String strResourceId) throws ThingsboardException {
         checkParameter(RESOURCE_ID, strResourceId);
         TbResourceId resourceId = new TbResourceId(toUUID(strResourceId));
@@ -324,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 288828f046..5f1de4e3e3 100644
--- a/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java
@@ -24,15 +24,17 @@ import com.google.common.util.concurrent.MoreExecutors;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonParseException;
 import com.google.gson.JsonParser;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import jakarta.annotation.Nullable;
+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;
 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;
@@ -45,10 +47,8 @@ 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.data.DataConstants;
+import org.thingsboard.server.common.adaptor.JsonConverter;
+import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.TenantProfile;
@@ -60,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;
@@ -69,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;
@@ -76,7 +78,8 @@ import org.thingsboard.server.common.data.kv.ReadTsKvQuery;
 import org.thingsboard.server.common.data.kv.StringDataEntry;
 import org.thingsboard.server.common.data.kv.TsKvEntry;
 import org.thingsboard.server.common.data.tenant.profile.DefaultTenantProfileConfiguration;
-import org.thingsboard.server.common.adaptor.JsonConverter;
+import org.thingsboard.server.common.msg.rule.engine.DeviceAttributesEventNotificationMsg;
+import org.thingsboard.server.config.annotations.ApiOperation;
 import org.thingsboard.server.dao.timeseries.TimeseriesService;
 import org.thingsboard.server.exception.InvalidParametersException;
 import org.thingsboard.server.exception.UncheckedApiException;
@@ -87,9 +90,6 @@ import org.thingsboard.server.service.security.permission.Operation;
 import org.thingsboard.server.service.telemetry.AttributeData;
 import org.thingsboard.server.service.telemetry.TsData;
 
-import javax.annotation.Nullable;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.LinkedHashMap;
@@ -102,8 +102,6 @@ import java.util.stream.Collectors;
 
 import static org.thingsboard.server.controller.ControllerConstants.ATTRIBUTES_JSON_REQUEST_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.ATTRIBUTES_KEYS_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.ATTRIBUTES_SAVE_SCOPE_ALLOWED_VALUES;
-import static org.thingsboard.server.controller.ControllerConstants.ATTRIBUTES_SCOPE_ALLOWED_VALUES;
 import static org.thingsboard.server.controller.ControllerConstants.ATTRIBUTES_SCOPE_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.ATTRIBUTE_DATA_EXAMPLE;
 import static org.thingsboard.server.controller.ControllerConstants.DEVICE_ID;
@@ -128,7 +126,6 @@ import static org.thingsboard.server.controller.ControllerConstants.SAVE_ENTITY_
 import static org.thingsboard.server.controller.ControllerConstants.SAVE_ENTITY_TIMESERIES_STATUS_OK;
 import static org.thingsboard.server.controller.ControllerConstants.SAVE_ENTITY_TIMESERIES_STATUS_UNAUTHORIZED;
 import static org.thingsboard.server.controller.ControllerConstants.SAVE_TIMESERIES_REQUEST_PAYLOAD;
-import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_ALLOWABLE_VALUES;
 import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.STRICT_DATA_TYPES_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.TELEMETRY_JSON_REQUEST_DESCRIPTION;
@@ -177,14 +174,13 @@ 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,
-            produces = 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
     public DeferredResult<ResponseEntity> getAttributeKeys(
-            @ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, defaultValue = "DEVICE") @PathVariable("entityType") String entityType,
-            @ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true) @PathVariable("entityId") String entityIdStr) throws ThingsboardException {
+            @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) throws ThingsboardException {
         return accessValidator.validateEntityAndCallback(getCurrentUser(), Operation.READ_ATTRIBUTES, entityType, entityIdStr, this::getAttributeKeysCallback);
     }
 
@@ -193,15 +189,14 @@ 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,
-            produces = 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
     public DeferredResult<ResponseEntity> getAttributeKeysByScope(
-            @ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, defaultValue = "DEVICE") @PathVariable("entityType") String entityType,
-            @ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true) @PathVariable("entityId") String entityIdStr,
-            @ApiParam(value = ATTRIBUTES_SCOPE_DESCRIPTION, required = true, allowableValues = ATTRIBUTES_SCOPE_ALLOWED_VALUES) @PathVariable("scope") String scope) throws ThingsboardException {
+            @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, required = true, schema = @Schema(allowableValues = {"SERVER_SCOPE", "SHARED_SCOPE", "CLIENT_SCOPE"})) @PathVariable("scope") AttributeScope scope) throws ThingsboardException {
         return accessValidator.validateEntityAndCallback(getCurrentUser(), Operation.READ_ATTRIBUTES, entityType, entityIdStr,
                 (result, tenantId, entityId) -> getAttributeKeysCallback(result, tenantId, entityId, scope));
     }
@@ -212,15 +207,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,
-            produces = 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
     public DeferredResult<ResponseEntity> getAttributes(
-            @ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, defaultValue = "DEVICE") @PathVariable("entityType") String entityType,
-            @ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true) @PathVariable("entityId") String entityIdStr,
-            @ApiParam(value = ATTRIBUTES_KEYS_DESCRIPTION) @RequestParam(name = "keys", required = false) String keysStr) throws ThingsboardException {
+            @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_KEYS_DESCRIPTION) @RequestParam(name = "keys", required = false) String keysStr) throws ThingsboardException {
         SecurityUser user = getCurrentUser();
         return accessValidator.validateEntityAndCallback(getCurrentUser(), Operation.READ_ATTRIBUTES, entityType, entityIdStr,
                 (result, tenantId, entityId) -> getAttributeValuesCallback(result, user, entityId, null, keysStr));
@@ -235,16 +229,15 @@ 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,
-            produces = 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(
-            @ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, defaultValue = "DEVICE") @PathVariable("entityType") String entityType,
-            @ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true) @PathVariable("entityId") String entityIdStr,
-            @ApiParam(value = ATTRIBUTES_SCOPE_DESCRIPTION, allowableValues = ATTRIBUTES_SCOPE_ALLOWED_VALUES, required = true) @PathVariable("scope") String scope,
-            @ApiParam(value = ATTRIBUTES_KEYS_DESCRIPTION) @RequestParam(name = "keys", required = false) String keysStr) throws ThingsboardException {
+            @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"}, 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,
                 (result, tenantId, entityId) -> getAttributeValuesCallback(result, user, entityId, scope, keysStr));
@@ -252,14 +245,13 @@ 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,
-            produces = 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
     public DeferredResult<ResponseEntity> getTimeseriesKeys(
-            @ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, defaultValue = "DEVICE") @PathVariable("entityType") String entityType,
-            @ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true) @PathVariable("entityId") String entityIdStr) throws ThingsboardException {
+            @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) throws ThingsboardException {
         return accessValidator.validateEntityAndCallback(getCurrentUser(), Operation.READ_TELEMETRY, entityType, entityIdStr,
                 (result, tenantId, entityId) -> Futures.addCallback(tsService.findAllLatest(tenantId, entityId), getTsKeysToResponseCallback(result), MoreExecutors.directExecutor()));
     }
@@ -275,16 +267,15 @@ 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,
-            produces = 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
     public DeferredResult<ResponseEntity> getLatestTimeseries(
-            @ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, defaultValue = "DEVICE") @PathVariable("entityType") String entityType,
-            @ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true) @PathVariable("entityId") String entityIdStr,
-            @ApiParam(value = TELEMETRY_KEYS_DESCRIPTION) @RequestParam(name = "keys", required = false) String keysStr,
-            @ApiParam(value = STRICT_DATA_TYPES_DESCRIPTION)
+            @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_KEYS_DESCRIPTION) @RequestParam(name = "keys", required = false) String keysStr,
+            @Parameter(description = STRICT_DATA_TYPES_DESCRIPTION)
             @RequestParam(name = "useStrictDataTypes", required = false, defaultValue = "false") Boolean useStrictDataTypes) throws ThingsboardException {
         SecurityUser user = getCurrentUser();
         return accessValidator.validateEntityAndCallback(getCurrentUser(), Operation.READ_TELEMETRY, entityType, entityIdStr,
@@ -299,35 +290,34 @@ 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,
-            produces = 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
     public DeferredResult<ResponseEntity> getTimeseries(
-            @ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, defaultValue = "DEVICE") @PathVariable("entityType") String entityType,
-            @ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true) @PathVariable("entityId") String entityIdStr,
-            @ApiParam(value = TELEMETRY_KEYS_BASE_DESCRIPTION, required = true) @RequestParam(name = "keys") String keys,
-            @ApiParam(value = "A long value representing the start timestamp of the time range in milliseconds, UTC.")
+            @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_KEYS_BASE_DESCRIPTION, required = true) @RequestParam(name = "keys") String keys,
+            @Parameter(description = "A long value representing the start timestamp of the time range in milliseconds, UTC.")
             @RequestParam(name = "startTs") Long startTs,
-            @ApiParam(value = "A long value representing the end timestamp of the time range in milliseconds, UTC.")
+            @Parameter(description = "A long value representing the end timestamp of the time range in milliseconds, UTC.")
             @RequestParam(name = "endTs") Long endTs,
-            @ApiParam(value = "A string value representing the type fo the interval.", allowableValues = "MILLISECONDS, WEEK, WEEK_ISO, MONTH, QUARTER")
+            @Parameter(description = "A string value representing the type fo the interval.", schema = @Schema(allowableValues = {"MILLISECONDS", "WEEK", "WEEK_ISO", "MONTH", "QUARTER"}))
             @RequestParam(name = "intervalType", required = false) IntervalType intervalType,
-            @ApiParam(value = "A long value representing the aggregation interval range in milliseconds.")
+            @Parameter(description = "A long value representing the aggregation interval range in milliseconds.")
             @RequestParam(name = "interval", defaultValue = "0") Long interval,
-            @ApiParam(value = "A string value representing the timezone that will be used to calculate exact timestamps for 'WEEK', 'WEEK_ISO', 'MONTH' and 'QUARTER' interval types.")
+            @Parameter(description = "A string value representing the timezone that will be used to calculate exact timestamps for 'WEEK', 'WEEK_ISO', 'MONTH' and 'QUARTER' interval types.")
             @RequestParam(name = "timeZone", required = false) String timeZone,
-            @ApiParam(value = "An integer value that represents a max number of timeseries data points to fetch." +
-                    " This parameter is used only in the case if 'agg' parameter is set to 'NONE'.", defaultValue = "100")
+            @Parameter(description = "An integer value that represents a max number of timeseries data points to fetch." +
+                    " This parameter is used only in the case if 'agg' parameter is set to 'NONE'.", schema = @Schema(defaultValue = "100"))
             @RequestParam(name = "limit", defaultValue = "100") Integer limit,
-            @ApiParam(value = "A string value representing the aggregation function. " +
+            @Parameter(description = "A string value representing the aggregation function. " +
                     "If the interval is not specified, 'agg' parameter will use 'NONE' value.",
-                    allowableValues = "MIN, MAX, AVG, SUM, COUNT, NONE")
+                    schema = @Schema(allowableValues = {"MIN", "MAX", "AVG", "SUM", "COUNT", "NONE"}))
             @RequestParam(name = "agg", defaultValue = "NONE") String aggStr,
-            @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
             @RequestParam(name = "orderBy", defaultValue = "DESC") String orderBy,
-            @ApiParam(value = STRICT_DATA_TYPES_DESCRIPTION)
+            @Parameter(description = STRICT_DATA_TYPES_DESCRIPTION)
             @RequestParam(name = "useStrictDataTypes", required = false, defaultValue = "false") Boolean useStrictDataTypes) throws ThingsboardException {
         return accessValidator.validateEntityAndCallback(getCurrentUser(), Operation.READ_TELEMETRY, entityType, entityIdStr,
                 (result, tenantId, entityId) -> {
@@ -348,24 +338,23 @@ 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,
-            produces = MediaType.APPLICATION_JSON_VALUE)
+                    + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @ApiResponses(value = {
-            @ApiResponse(code = 200, message = SAVE_ATTIRIBUTES_STATUS_OK +
+            @ApiResponse(responseCode = "200", description = SAVE_ATTIRIBUTES_STATUS_OK +
                     "Platform creates an audit log event about device attributes updates with action type 'ATTRIBUTES_UPDATED', " +
                     "and also sends event msg to the rule engine with msg type 'ATTRIBUTES_UPDATED'."),
-            @ApiResponse(code = 400, message = SAVE_ATTIRIBUTES_STATUS_BAD_REQUEST),
-            @ApiResponse(code = 401, message = "User is not authorized to save device attributes for selected device. Most likely, User belongs to different Customer or Tenant."),
-            @ApiResponse(code = 500, message = "The exception was thrown during processing the request. " +
+            @ApiResponse(responseCode = "400", description = SAVE_ATTIRIBUTES_STATUS_BAD_REQUEST),
+            @ApiResponse(responseCode = "401", description = "User is not authorized to save device attributes for selected device. Most likely, User belongs to different Customer or Tenant."),
+            @ApiResponse(responseCode = "500", description = "The exception was thrown during processing the request. " +
                     "Platform creates an audit log event about device attributes updates with action type 'ATTRIBUTES_UPDATED' that includes an error stacktrace."),
     })
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/{deviceId}/{scope}", method = RequestMethod.POST)
     @ResponseBody
     public DeferredResult<ResponseEntity> saveDeviceAttributes(
-            @ApiParam(value = DEVICE_ID_PARAM_DESCRIPTION, required = true) @PathVariable("deviceId") String deviceIdStr,
-            @ApiParam(value = ATTRIBUTES_SCOPE_DESCRIPTION, allowableValues = ATTRIBUTES_SAVE_SCOPE_ALLOWED_VALUES, required = true) @PathVariable("scope") String scope,
-            @ApiParam(value = ATTRIBUTES_JSON_REQUEST_DESCRIPTION, required = true) @RequestBody JsonNode request) throws ThingsboardException {
+            @Parameter(description = DEVICE_ID_PARAM_DESCRIPTION, required = true) @PathVariable("deviceId") String deviceIdStr,
+            @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,22 +363,21 @@ 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,
-            produces = MediaType.APPLICATION_JSON_VALUE)
+                    + INVALID_ENTITY_ID_OR_ENTITY_TYPE_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @ApiResponses(value = {
-            @ApiResponse(code = 200, message = SAVE_ATTIRIBUTES_STATUS_OK + SAVE_ENTITY_ATTRIBUTES_STATUS_OK),
-            @ApiResponse(code = 400, message = SAVE_ATTIRIBUTES_STATUS_BAD_REQUEST),
-            @ApiResponse(code = 401, message = SAVE_ENTITY_ATTRIBUTES_STATUS_UNAUTHORIZED),
-            @ApiResponse(code = 500, message = SAVE_ENTITY_ATTRIBUTES_STATUS_INTERNAL_SERVER_ERROR),
+            @ApiResponse(responseCode = "200", description = SAVE_ATTIRIBUTES_STATUS_OK + SAVE_ENTITY_ATTRIBUTES_STATUS_OK),
+            @ApiResponse(responseCode = "400", description = SAVE_ATTIRIBUTES_STATUS_BAD_REQUEST),
+            @ApiResponse(responseCode = "401", description = SAVE_ENTITY_ATTRIBUTES_STATUS_UNAUTHORIZED),
+            @ApiResponse(responseCode = "500", description = SAVE_ENTITY_ATTRIBUTES_STATUS_INTERNAL_SERVER_ERROR),
     })
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/{entityType}/{entityId}/{scope}", method = RequestMethod.POST)
     @ResponseBody
     public DeferredResult<ResponseEntity> saveEntityAttributesV1(
-            @ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, defaultValue = "DEVICE") @PathVariable("entityType") String entityType,
-            @ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true) @PathVariable("entityId") String entityIdStr,
-            @ApiParam(value = ATTRIBUTES_SCOPE_DESCRIPTION, allowableValues = ATTRIBUTES_SAVE_SCOPE_ALLOWED_VALUES) @PathVariable("scope") String scope,
-            @ApiParam(value = ATTRIBUTES_JSON_REQUEST_DESCRIPTION, required = true) @RequestBody JsonNode request) throws ThingsboardException {
+            @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,
+            @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,22 +386,21 @@ 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,
-            produces = MediaType.APPLICATION_JSON_VALUE)
+                    + INVALID_ENTITY_ID_OR_ENTITY_TYPE_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @ApiResponses(value = {
-            @ApiResponse(code = 200, message = SAVE_ATTIRIBUTES_STATUS_OK + SAVE_ENTITY_ATTRIBUTES_STATUS_OK),
-            @ApiResponse(code = 400, message = SAVE_ATTIRIBUTES_STATUS_BAD_REQUEST),
-            @ApiResponse(code = 401, message = SAVE_ENTITY_ATTRIBUTES_STATUS_UNAUTHORIZED),
-            @ApiResponse(code = 500, message = SAVE_ENTITY_ATTRIBUTES_STATUS_INTERNAL_SERVER_ERROR),
+            @ApiResponse(responseCode = "200", description = SAVE_ATTIRIBUTES_STATUS_OK + SAVE_ENTITY_ATTRIBUTES_STATUS_OK),
+            @ApiResponse(responseCode = "400", description = SAVE_ATTIRIBUTES_STATUS_BAD_REQUEST),
+            @ApiResponse(responseCode = "401", description = SAVE_ENTITY_ATTRIBUTES_STATUS_UNAUTHORIZED),
+            @ApiResponse(responseCode = "500", description = SAVE_ENTITY_ATTRIBUTES_STATUS_INTERNAL_SERVER_ERROR),
     })
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/{entityType}/{entityId}/attributes/{scope}", method = RequestMethod.POST)
     @ResponseBody
     public DeferredResult<ResponseEntity> saveEntityAttributesV2(
-            @ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, defaultValue = "DEVICE") @PathVariable("entityType") String entityType,
-            @ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true) @PathVariable("entityId") String entityIdStr,
-            @ApiParam(value = ATTRIBUTES_SCOPE_DESCRIPTION, allowableValues = ATTRIBUTES_SAVE_SCOPE_ALLOWED_VALUES, required = true) @PathVariable("scope") String scope,
-            @ApiParam(value = ATTRIBUTES_JSON_REQUEST_DESCRIPTION, required = true) @RequestBody JsonNode request) throws ThingsboardException {
+            @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"}, 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,22 +410,21 @@ 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,
-            produces = MediaType.APPLICATION_JSON_VALUE)
+                    + INVALID_ENTITY_ID_OR_ENTITY_TYPE_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @ApiResponses(value = {
-            @ApiResponse(code = 200, message = SAVE_ENTITY_TIMESERIES_STATUS_OK),
-            @ApiResponse(code = 400, message = INVALID_STRUCTURE_OF_THE_REQUEST),
-            @ApiResponse(code = 401, message = SAVE_ENTITY_TIMESERIES_STATUS_UNAUTHORIZED),
-            @ApiResponse(code = 500, message = SAVE_ENTITY_TIMESERIES_STATUS_INTERNAL_SERVER_ERROR),
+            @ApiResponse(responseCode = "200", description = SAVE_ENTITY_TIMESERIES_STATUS_OK),
+            @ApiResponse(responseCode = "400", description = INVALID_STRUCTURE_OF_THE_REQUEST),
+            @ApiResponse(responseCode = "401", description = SAVE_ENTITY_TIMESERIES_STATUS_UNAUTHORIZED),
+            @ApiResponse(responseCode = "500", description = SAVE_ENTITY_TIMESERIES_STATUS_INTERNAL_SERVER_ERROR),
     })
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/{entityType}/{entityId}/timeseries/{scope}", method = RequestMethod.POST)
     @ResponseBody
     public DeferredResult<ResponseEntity> saveEntityTelemetry(
-            @ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, defaultValue = "DEVICE") @PathVariable("entityType") String entityType,
-            @ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true) @PathVariable("entityId") String entityIdStr,
-            @ApiParam(value = TELEMETRY_SCOPE_DESCRIPTION, required = true, allowableValues = "ANY") @PathVariable("scope") String scope,
-            @ApiParam(value = TELEMETRY_JSON_REQUEST_DESCRIPTION, required = true) @RequestBody String requestBody) throws ThingsboardException {
+            @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,
+            @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,23 +434,22 @@ 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,
-            produces = MediaType.APPLICATION_JSON_VALUE)
+                    + INVALID_ENTITY_ID_OR_ENTITY_TYPE_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @ApiResponses(value = {
-            @ApiResponse(code = 200, message = SAVE_ENTITY_TIMESERIES_STATUS_OK),
-            @ApiResponse(code = 400, message = INVALID_STRUCTURE_OF_THE_REQUEST),
-            @ApiResponse(code = 401, message = SAVE_ENTITY_TIMESERIES_STATUS_UNAUTHORIZED),
-            @ApiResponse(code = 500, message = SAVE_ENTITY_TIMESERIES_STATUS_INTERNAL_SERVER_ERROR),
+            @ApiResponse(responseCode = "200", description = SAVE_ENTITY_TIMESERIES_STATUS_OK),
+            @ApiResponse(responseCode = "400", description = INVALID_STRUCTURE_OF_THE_REQUEST),
+            @ApiResponse(responseCode = "401", description = SAVE_ENTITY_TIMESERIES_STATUS_UNAUTHORIZED),
+            @ApiResponse(responseCode = "500", description = SAVE_ENTITY_TIMESERIES_STATUS_INTERNAL_SERVER_ERROR),
     })
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/{entityType}/{entityId}/timeseries/{scope}/{ttl}", method = RequestMethod.POST)
     @ResponseBody
     public DeferredResult<ResponseEntity> saveEntityTelemetryWithTTL(
-            @ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, defaultValue = "DEVICE") @PathVariable("entityType") String entityType,
-            @ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true) @PathVariable("entityId") String entityIdStr,
-            @ApiParam(value = TELEMETRY_SCOPE_DESCRIPTION, required = true, allowableValues = "ANY") @PathVariable("scope") String scope,
-            @ApiParam(value = "A long value representing TTL (Time to Live) parameter.", required = true) @PathVariable("ttl") Long ttl,
-            @ApiParam(value = TELEMETRY_JSON_REQUEST_DESCRIPTION, required = true) @RequestBody String requestBody) throws ThingsboardException {
+            @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")AttributeScope scope,
+                    @Parameter(description = "A long value representing TTL (Time to Live) parameter.", required = true)@PathVariable("ttl")Long ttl,
+            @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,32 +461,31 @@ 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,
-            produces = MediaType.APPLICATION_JSON_VALUE)
+                    TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @ApiResponses(value = {
-            @ApiResponse(code = 200, message = "Timeseries for the selected keys in the request was removed. " +
+            @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'."),
-            @ApiResponse(code = 400, message = "Platform returns a bad request in case if keys list is empty or start and end timestamp values is empty when deleteAllDataForKeys is set to false."),
-            @ApiResponse(code = 401, message = "User is not authorized to delete entity timeseries for selected entity. Most likely, User belongs to different Customer or Tenant."),
-            @ApiResponse(code = 500, message = "The exception was thrown during processing the request. " +
+            @ApiResponse(responseCode = "400", description = "Platform returns a bad request in case if keys list is empty or start and end timestamp values is empty when deleteAllDataForKeys is set to false."),
+            @ApiResponse(responseCode = "401", description = "User is not authorized to delete entity timeseries for selected entity. Most likely, User belongs to different Customer or Tenant."),
+            @ApiResponse(responseCode = "500", description = "The exception was thrown during processing the request. " +
                     "Platform creates an audit log event about entity timeseries removal with action type 'TIMESERIES_DELETED' that includes an error stacktrace."),
     })
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/{entityType}/{entityId}/timeseries/delete", method = RequestMethod.DELETE)
     @ResponseBody
     public DeferredResult<ResponseEntity> deleteEntityTimeseries(
-            @ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, defaultValue = "DEVICE") @PathVariable("entityType") String entityType,
-            @ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true) @PathVariable("entityId") String entityIdStr,
-            @ApiParam(value = TELEMETRY_KEYS_DESCRIPTION, required = true) @RequestParam(name = "keys") String keysStr,
-            @ApiParam(value = "A boolean value to specify if should be deleted all data for selected keys or only data that are in the selected time range.")
+            @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_KEYS_DESCRIPTION, required = true) @RequestParam(name = "keys") String keysStr,
+            @Parameter(description = "A boolean value to specify if should be deleted all data for selected keys or only data that are in the selected time range.")
             @RequestParam(name = "deleteAllDataForKeys", defaultValue = "false") boolean deleteAllDataForKeys,
-            @ApiParam(value = "A long value representing the start timestamp of removal time range in milliseconds.")
+            @Parameter(description = "A long value representing the start timestamp of removal time range in milliseconds.")
             @RequestParam(name = "startTs", required = false) Long startTs,
-            @ApiParam(value = "A long value representing the end timestamp of removal time range in milliseconds.")
+            @Parameter(description = "A long value representing the end timestamp of removal time range in milliseconds.")
             @RequestParam(name = "endTs", required = false) Long endTs,
-            @ApiParam(value = "If the parameter is set to true, the latest telemetry can be removed, otherwise, in case that parameter is set to false the latest value will not removed.")
+            @Parameter(description = "If the parameter is set to true, the latest telemetry can be removed, otherwise, in case that parameter is set to false the latest value will not removed.")
             @RequestParam(name = "deleteLatest", required = false, defaultValue = "true") boolean deleteLatest,
-            @ApiParam(value = "If the parameter is set to true, the latest telemetry will be rewritten in case that current latest value was removed, otherwise, in case that parameter is set to false the new latest value will not set.")
+            @Parameter(description = "If the parameter is set to true, the latest telemetry will be rewritten in case that current latest value was removed, otherwise, in case that parameter is set to false the new latest value will not set.")
             @RequestParam(name = "rewriteLatestIfDeleted", defaultValue = "false") boolean rewriteLatestIfDeleted) throws ThingsboardException {
         EntityId entityId = EntityIdFactory.getByTypeAndId(entityType, entityIdStr);
         return deleteTimeseries(entityId, keysStr, deleteAllDataForKeys, startTs, endTs, rewriteLatestIfDeleted, deleteLatest);
@@ -552,88 +536,80 @@ 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,
-            produces = MediaType.APPLICATION_JSON_VALUE)
+                    "Referencing a non-existing Device Id will cause an error" + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @ApiResponses(value = {
-            @ApiResponse(code = 200, message = "Device attributes was removed for the selected keys in the request. " +
+            @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'."),
-            @ApiResponse(code = 400, message = "Platform returns a bad request in case if keys or scope are not specified."),
-            @ApiResponse(code = 401, message = "User is not authorized to delete device attributes for selected entity. Most likely, User belongs to different Customer or Tenant."),
-            @ApiResponse(code = 500, message = "The exception was thrown during processing the request. " +
+            @ApiResponse(responseCode = "400", description = "Platform returns a bad request in case if keys or scope are not specified."),
+            @ApiResponse(responseCode = "401", description = "User is not authorized to delete device attributes for selected entity. Most likely, User belongs to different Customer or Tenant."),
+            @ApiResponse(responseCode = "500", description = "The exception was thrown during processing the request. " +
                     "Platform creates an audit log event about device attributes removal with action type 'ATTRIBUTES_DELETED' that includes an error stacktrace."),
     })
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/{deviceId}/{scope}", method = RequestMethod.DELETE)
     @ResponseBody
     public DeferredResult<ResponseEntity> deleteDeviceAttributes(
-            @ApiParam(value = DEVICE_ID_PARAM_DESCRIPTION, required = true) @PathVariable(DEVICE_ID) String deviceIdStr,
-            @ApiParam(value = ATTRIBUTES_SCOPE_DESCRIPTION, allowableValues = ATTRIBUTES_SCOPE_ALLOWED_VALUES, required = true) @PathVariable("scope") String scope,
-            @ApiParam(value = ATTRIBUTES_KEYS_DESCRIPTION, required = true) @RequestParam(name = "keys") String keysStr) throws ThingsboardException {
+            @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"}, 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);
     }
 
     @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,
-            produces = MediaType.APPLICATION_JSON_VALUE)
+                    INVALID_ENTITY_ID_OR_ENTITY_TYPE_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @ApiResponses(value = {
-            @ApiResponse(code = 200, message = "Entity attributes was removed for the selected keys in the request. " +
+            @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'."),
-            @ApiResponse(code = 400, message = "Platform returns a bad request in case if keys or scope are not specified."),
-            @ApiResponse(code = 401, message = "User is not authorized to delete entity attributes for selected entity. Most likely, User belongs to different Customer or Tenant."),
-            @ApiResponse(code = 500, message = "The exception was thrown during processing the request. " +
+            @ApiResponse(responseCode = "400", description = "Platform returns a bad request in case if keys or scope are not specified."),
+            @ApiResponse(responseCode = "401", description = "User is not authorized to delete entity attributes for selected entity. Most likely, User belongs to different Customer or Tenant."),
+            @ApiResponse(responseCode = "500", description = "The exception was thrown during processing the request. " +
                     "Platform creates an audit log event about entity attributes removal with action type 'ATTRIBUTES_DELETED' that includes an error stacktrace."),
     })
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/{entityType}/{entityId}/{scope}", method = RequestMethod.DELETE)
     @ResponseBody
     public DeferredResult<ResponseEntity> deleteEntityAttributes(
-            @ApiParam(value = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, defaultValue = "DEVICE") @PathVariable("entityType") String entityType,
-            @ApiParam(value = ENTITY_ID_PARAM_DESCRIPTION, required = true) @PathVariable("entityId") String entityIdStr,
-            @ApiParam(value = ATTRIBUTES_SCOPE_DESCRIPTION, required = true, allowableValues = ATTRIBUTES_SCOPE_ALLOWED_VALUES) @PathVariable("scope") String scope,
-            @ApiParam(value = ATTRIBUTES_KEYS_DESCRIPTION, required = true) @RequestParam(name = "keys") String keysStr) throws ThingsboardException {
+            @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, required = true, schema = @Schema(allowableValues = {"SERVER_SCOPE", "SHARED_SCOPE", "CLIENT_SCOPE"})) @PathVariable("scope")AttributeScope scope,
+                    @Parameter(description = ATTRIBUTES_KEYS_DESCRIPTION, required = true)@RequestParam(name = "keys")String keysStr) throws ThingsboardException {
         EntityId entityId = EntityIdFactory.getByTypeAndId(entityType, entityIdStr);
         return deleteAttributes(entityId, scope, keysStr);
     }
 
-    private DeferredResult<ResponseEntity> deleteAttributes(EntityId entityIdSrc, String scope, String keysStr) throws ThingsboardException {
+    private DeferredResult<ResponseEntity> deleteAttributes(EntityId entityIdSrc, AttributeScope scope, String keysStr) throws ThingsboardException {
         List<String> keys = toKeysList(keysStr);
         if (keys.isEmpty()) {
             return getImmediateDeferredResult("Empty keys: " + keysStr, HttpStatus.BAD_REQUEST);
         }
         SecurityUser user = getCurrentUser();
 
-        if (DataConstants.SERVER_SCOPE.equals(scope) ||
-                DataConstants.SHARED_SCOPE.equals(scope) ||
-                DataConstants.CLIENT_SCOPE.equals(scope)) {
-            return accessValidator.validateEntityAndCallback(getCurrentUser(), Operation.WRITE_ATTRIBUTES, entityIdSrc, (result, tenantId, entityId) -> {
-                tsSubService.deleteAndNotify(tenantId, entityId, scope, keys, new FutureCallback<Void>() {
-                    @Override
-                    public void onSuccess(@Nullable Void tmp) {
-                        logAttributesDeleted(user, entityId, scope, keys, null);
-                        if (entityIdSrc.getEntityType().equals(EntityType.DEVICE)) {
-                            DeviceId deviceId = new DeviceId(entityId.getId());
-                            tbClusterService.pushMsgToCore(DeviceAttributesEventNotificationMsg.onDelete(
-                                    user.getTenantId(), deviceId, scope, keys), null);
-                        }
-                        result.setResult(new ResponseEntity<>(HttpStatus.OK));
+        return accessValidator.validateEntityAndCallback(getCurrentUser(), Operation.WRITE_ATTRIBUTES, entityIdSrc, (result, tenantId, entityId) -> {
+            tsSubService.deleteAndNotify(tenantId, entityId, scope.name(), keys, new FutureCallback<Void>() {
+                @Override
+                public void onSuccess(@Nullable Void tmp) {
+                    logAttributesDeleted(user, entityId, scope, keys, null);
+                    if (entityIdSrc.getEntityType().equals(EntityType.DEVICE)) {
+                        DeviceId deviceId = new DeviceId(entityId.getId());
+                        tbClusterService.pushMsgToCore(DeviceAttributesEventNotificationMsg.onDelete(
+                                user.getTenantId(), deviceId, scope.name(), keys), null);
                     }
+                    result.setResult(new ResponseEntity<>(HttpStatus.OK));
+                }
 
-                    @Override
-                    public void onFailure(Throwable t) {
-                        logAttributesDeleted(user, entityId, scope, keys, t);
-                        result.setResult(new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR));
-                    }
-                });
+                @Override
+                public void onFailure(Throwable t) {
+                    logAttributesDeleted(user, entityId, scope, keys, t);
+                    result.setResult(new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR));
+                }
             });
-        } else {
-            return getImmediateDeferredResult("Invalid attribute scope: " + scope, HttpStatus.BAD_REQUEST);
-        }
+        });
     }
 
-    private DeferredResult<ResponseEntity> saveAttributes(TenantId srcTenantId, EntityId entityIdSrc, String scope, JsonNode json) throws ThingsboardException {
-        if (!DataConstants.SERVER_SCOPE.equals(scope) && !DataConstants.SHARED_SCOPE.equals(scope)) {
+    private DeferredResult<ResponseEntity> saveAttributes(TenantId srcTenantId, EntityId entityIdSrc, AttributeScope scope, JsonNode json) throws ThingsboardException {
+        if (AttributeScope.SERVER_SCOPE != scope && AttributeScope.SHARED_SCOPE != scope) {
             return getImmediateDeferredResult("Invalid scope: " + scope, HttpStatus.BAD_REQUEST);
         }
         if (json.isObject()) {
@@ -671,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);
         }
@@ -722,10 +698,10 @@ public class TelemetryController extends BaseController {
         Futures.addCallback(future, getTsKvListCallback(result, useStrictDataTypes), MoreExecutors.directExecutor());
     }
 
-    private void getAttributeValuesCallback(@Nullable DeferredResult<ResponseEntity> result, SecurityUser user, EntityId entityId, String scope, String keys) {
+    private void getAttributeValuesCallback(@Nullable DeferredResult<ResponseEntity> result, SecurityUser user, EntityId entityId, AttributeScope scope, String keys) {
         List<String> keyList = toKeysList(keys);
         FutureCallback<List<AttributeKvEntry>> callback = getAttributeValuesToResponseCallback(result, user, scope, entityId, keyList);
-        if (!StringUtils.isEmpty(scope)) {
+        if (scope != null) {
             if (keyList != null && !keyList.isEmpty()) {
                 Futures.addCallback(attributesService.find(user.getTenantId(), entityId, scope, keyList), callback, MoreExecutors.directExecutor());
             } else {
@@ -733,7 +709,7 @@ public class TelemetryController extends BaseController {
             }
         } else {
             List<ListenableFuture<List<AttributeKvEntry>>> futures = new ArrayList<>();
-            for (String tmpScope : DataConstants.allScopes()) {
+            for (AttributeScope tmpScope : AttributeScope.values()) {
                 if (keyList != null && !keyList.isEmpty()) {
                     futures.add(attributesService.find(user.getTenantId(), entityId, tmpScope, keyList));
                 } else {
@@ -747,13 +723,13 @@ public class TelemetryController extends BaseController {
         }
     }
 
-    private void getAttributeKeysCallback(@Nullable DeferredResult<ResponseEntity> result, TenantId tenantId, EntityId entityId, String scope) {
+    private void getAttributeKeysCallback(@Nullable DeferredResult<ResponseEntity> result, TenantId tenantId, EntityId entityId, AttributeScope scope) {
         Futures.addCallback(attributesService.findAll(tenantId, entityId, scope), getAttributeKeysToResponseCallback(result), MoreExecutors.directExecutor());
     }
 
     private void getAttributeKeysCallback(@Nullable DeferredResult<ResponseEntity> result, TenantId tenantId, EntityId entityId) {
         List<ListenableFuture<List<AttributeKvEntry>>> futures = new ArrayList<>();
-        for (String scope : DataConstants.allScopes()) {
+        for (AttributeScope scope : AttributeScope.values()) {
             futures.add(attributesService.findAll(tenantId, entityId, scope));
         }
 
@@ -796,7 +772,7 @@ public class TelemetryController extends BaseController {
     }
 
     private FutureCallback<List<AttributeKvEntry>> getAttributeValuesToResponseCallback(final DeferredResult<ResponseEntity> response,
-                                                                                        final SecurityUser user, final String scope,
+                                                                                        final SecurityUser user, final AttributeScope scope,
                                                                                         final EntityId entityId, final List<String> keyList) {
         return new FutureCallback<>() {
             @Override
@@ -838,28 +814,28 @@ public class TelemetryController extends BaseController {
     }
 
     private void logTimeseriesDeleted(SecurityUser user, EntityId entityId, List<String> keys, long startTs, long endTs, Throwable e) {
-        notificationEntityService.logEntityAction(user.getTenantId(), entityId, ActionType.TIMESERIES_DELETED, user,
+        logEntityActionService.logEntityAction(user.getTenantId(), entityId, ActionType.TIMESERIES_DELETED, user,
                 toException(e), keys, startTs, endTs);
     }
 
     private void logTelemetryUpdated(SecurityUser user, EntityId entityId, List<TsKvEntry> telemetry, Throwable e) {
-        notificationEntityService.logEntityAction(user.getTenantId(), entityId, ActionType.TIMESERIES_UPDATED, user,
+        logEntityActionService.logEntityAction(user.getTenantId(), entityId, ActionType.TIMESERIES_UPDATED, user,
                 toException(e), telemetry);
     }
 
-    private void logAttributesDeleted(SecurityUser user, EntityId entityId, String scope, List<String> keys, Throwable e) {
-        notificationEntityService.logEntityAction(user.getTenantId(), (UUIDBased & EntityId) entityId,
+    private void logAttributesDeleted(SecurityUser user, EntityId entityId, AttributeScope scope, List<String> keys, Throwable e) {
+        logEntityActionService.logEntityAction(user.getTenantId(), (UUIDBased & EntityId) entityId,
                 ActionType.ATTRIBUTES_DELETED, user, toException(e), scope, keys);
     }
 
-    private void logAttributesUpdated(SecurityUser user, EntityId entityId, String scope, List<AttributeKvEntry> attributes, Throwable e) {
-        notificationEntityService.logEntityAction(user.getTenantId(), entityId, ActionType.ATTRIBUTES_UPDATED, user,
+    private void logAttributesUpdated(SecurityUser user, EntityId entityId, AttributeScope scope, List<AttributeKvEntry> attributes, Throwable e) {
+        logEntityActionService.logEntityAction(user.getTenantId(), entityId, ActionType.ATTRIBUTES_UPDATED, user,
                 toException(e), scope, attributes);
     }
 
 
-    private void logAttributesRead(SecurityUser user, EntityId entityId, String scope, List<String> keys, Throwable e) {
-        notificationEntityService.logEntityAction(user.getTenantId(), entityId, ActionType.ATTRIBUTES_READ, user,
+    private void logAttributesRead(SecurityUser user, EntityId entityId, AttributeScope scope, List<String> keys, Throwable e) {
+        logEntityActionService.logEntityAction(user.getTenantId(), entityId, ActionType.ATTRIBUTES_READ, user,
                 toException(e), scope, keys);
     }
 
@@ -939,4 +915,5 @@ public class TelemetryController extends BaseController {
         }
         return entry.getValue();
     }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/controller/TenantController.java b/application/src/main/java/org/thingsboard/server/controller/TenantController.java
index 6d37ad44ef..fa6cae9bea 100644
--- a/application/src/main/java/org/thingsboard/server/controller/TenantController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/TenantController.java
@@ -16,8 +16,8 @@
 package org.thingsboard.server.controller;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
@@ -36,6 +36,7 @@ import org.thingsboard.server.common.data.exception.ThingsboardException;
 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.config.annotations.ApiOperation;
 import org.thingsboard.server.dao.tenant.TenantService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.entitiy.tenant.TbTenantService;
@@ -46,15 +47,12 @@ import static org.thingsboard.server.controller.ControllerConstants.HOME_DASHBOA
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_DATA_PARAMETERS;
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_NUMBER_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_SIZE_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_ALLOWABLE_VALUES;
 import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.SORT_PROPERTY_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.SYSTEM_AUTHORITY_PARAGRAPH;
 import static org.thingsboard.server.controller.ControllerConstants.SYSTEM_OR_TENANT_AUTHORITY_PARAGRAPH;
 import static org.thingsboard.server.controller.ControllerConstants.TENANT_ID;
 import static org.thingsboard.server.controller.ControllerConstants.TENANT_ID_PARAM_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.TENANT_INFO_SORT_PROPERTY_ALLOWABLE_VALUES;
-import static org.thingsboard.server.controller.ControllerConstants.TENANT_SORT_PROPERTY_ALLOWABLE_VALUES;
 import static org.thingsboard.server.controller.ControllerConstants.TENANT_TEXT_SEARCH_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.UUID_WIKI_LINK;
 
@@ -76,7 +74,7 @@ public class TenantController extends BaseController {
     @RequestMapping(value = "/tenant/{tenantId}", method = RequestMethod.GET)
     @ResponseBody
     public Tenant getTenantById(
-            @ApiParam(value = TENANT_ID_PARAM_DESCRIPTION)
+            @Parameter(description = TENANT_ID_PARAM_DESCRIPTION)
             @PathVariable(TENANT_ID) String strTenantId) throws ThingsboardException {
         checkParameter(TENANT_ID, strTenantId);
         TenantId tenantId = TenantId.fromUUID(toUUID(strTenantId));
@@ -94,7 +92,7 @@ public class TenantController extends BaseController {
     @RequestMapping(value = "/tenant/info/{tenantId}", method = RequestMethod.GET)
     @ResponseBody
     public TenantInfo getTenantInfoById(
-            @ApiParam(value = TENANT_ID_PARAM_DESCRIPTION)
+            @Parameter(description = TENANT_ID_PARAM_DESCRIPTION)
             @PathVariable(TENANT_ID) String strTenantId) throws ThingsboardException {
         checkParameter(TENANT_ID, strTenantId);
         TenantId tenantId = TenantId.fromUUID(toUUID(strTenantId));
@@ -112,7 +110,7 @@ public class TenantController extends BaseController {
     @PreAuthorize("hasAuthority('SYS_ADMIN')")
     @RequestMapping(value = "/tenant", method = RequestMethod.POST)
     @ResponseBody
-    public Tenant saveTenant(@ApiParam(value = "A JSON value representing the tenant.")
+    public Tenant saveTenant(@Parameter(description = "A JSON value representing the tenant.")
                              @RequestBody Tenant tenant) throws Exception {
         checkEntity(tenant.getId(), tenant, Resource.TENANT);
         return tbTenantService.save(tenant);
@@ -123,7 +121,7 @@ public class TenantController extends BaseController {
     @PreAuthorize("hasAuthority('SYS_ADMIN')")
     @RequestMapping(value = "/tenant/{tenantId}", method = RequestMethod.DELETE)
     @ResponseStatus(value = HttpStatus.OK)
-    public void deleteTenant(@ApiParam(value = TENANT_ID_PARAM_DESCRIPTION)
+    public void deleteTenant(@Parameter(description = TENANT_ID_PARAM_DESCRIPTION)
                              @PathVariable(TENANT_ID) String strTenantId) throws Exception {
         checkParameter(TENANT_ID, strTenantId);
         TenantId tenantId = TenantId.fromUUID(toUUID(strTenantId));
@@ -136,15 +134,15 @@ public class TenantController extends BaseController {
     @RequestMapping(value = "/tenants", params = {"pageSize", "page"}, method = RequestMethod.GET)
     @ResponseBody
     public PageData<Tenant> getTenants(
-            @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
             @RequestParam int pageSize,
-            @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
             @RequestParam int page,
-            @ApiParam(value = TENANT_TEXT_SEARCH_DESCRIPTION)
+            @Parameter(description = TENANT_TEXT_SEARCH_DESCRIPTION)
             @RequestParam(required = false) String textSearch,
-            @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = TENANT_SORT_PROPERTY_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "title", "email", "country", "state", "city", "address", "address2", "zip", "phone", "email"}))
             @RequestParam(required = false) String sortProperty,
-            @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
             @RequestParam(required = false) String sortOrder) throws ThingsboardException {
         PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder);
         return checkNotNull(tenantService.findTenants(pageLink));
@@ -156,15 +154,15 @@ public class TenantController extends BaseController {
     @RequestMapping(value = "/tenantInfos", params = {"pageSize", "page"}, method = RequestMethod.GET)
     @ResponseBody
     public PageData<TenantInfo> getTenantInfos(
-            @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
             @RequestParam int pageSize,
-            @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
             @RequestParam int page,
-            @ApiParam(value = TENANT_TEXT_SEARCH_DESCRIPTION)
+            @Parameter(description = TENANT_TEXT_SEARCH_DESCRIPTION)
             @RequestParam(required = false) String textSearch,
-            @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = TENANT_INFO_SORT_PROPERTY_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "tenantProfileName", "title", "email", "country", "state", "city", "address", "address2", "zip", "phone", "email"}))
             @RequestParam(required = false) String sortProperty,
-            @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
             @RequestParam(required = false) String sortOrder
     ) throws ThingsboardException {
         PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder);
diff --git a/application/src/main/java/org/thingsboard/server/controller/TenantProfileController.java b/application/src/main/java/org/thingsboard/server/controller/TenantProfileController.java
index 9c6f485d1f..8796b8c8a2 100644
--- a/application/src/main/java/org/thingsboard/server/controller/TenantProfileController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/TenantProfileController.java
@@ -15,8 +15,8 @@
  */
 package org.thingsboard.server.controller;
 
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
@@ -37,6 +37,7 @@ import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.TenantProfileId;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
+import org.thingsboard.server.config.annotations.ApiOperation;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.entitiy.tenant.profile.TbTenantProfileService;
 import org.thingsboard.server.service.security.permission.Operation;
@@ -50,13 +51,10 @@ import static org.thingsboard.server.controller.ControllerConstants.MARKDOWN_COD
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_DATA_PARAMETERS;
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_NUMBER_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_SIZE_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_ALLOWABLE_VALUES;
 import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.SORT_PROPERTY_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.SYSTEM_AUTHORITY_PARAGRAPH;
 import static org.thingsboard.server.controller.ControllerConstants.TENANT_PROFILE_ID_PARAM_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.TENANT_PROFILE_INFO_SORT_PROPERTY_ALLOWABLE_VALUES;
-import static org.thingsboard.server.controller.ControllerConstants.TENANT_PROFILE_SORT_PROPERTY_ALLOWABLE_VALUES;
 import static org.thingsboard.server.controller.ControllerConstants.TENANT_PROFILE_TEXT_SEARCH_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.UUID_WIKI_LINK;
 
@@ -77,7 +75,7 @@ public class TenantProfileController extends BaseController {
     @RequestMapping(value = "/tenantProfile/{tenantProfileId}", method = RequestMethod.GET)
     @ResponseBody
     public TenantProfile getTenantProfileById(
-            @ApiParam(value = TENANT_PROFILE_ID_PARAM_DESCRIPTION)
+            @Parameter(description = TENANT_PROFILE_ID_PARAM_DESCRIPTION)
             @PathVariable("tenantProfileId") String strTenantProfileId) throws ThingsboardException {
         checkParameter("tenantProfileId", strTenantProfileId);
         TenantProfileId tenantProfileId = new TenantProfileId(toUUID(strTenantProfileId));
@@ -90,7 +88,7 @@ public class TenantProfileController extends BaseController {
     @RequestMapping(value = "/tenantProfileInfo/{tenantProfileId}", method = RequestMethod.GET)
     @ResponseBody
     public EntityInfo getTenantProfileInfoById(
-            @ApiParam(value = TENANT_PROFILE_ID_PARAM_DESCRIPTION)
+            @Parameter(description = TENANT_PROFILE_ID_PARAM_DESCRIPTION)
             @PathVariable("tenantProfileId") String strTenantProfileId) throws ThingsboardException {
         checkParameter("tenantProfileId", strTenantProfileId);
         TenantProfileId tenantProfileId = new TenantProfileId(toUUID(strTenantProfileId));
@@ -165,7 +163,7 @@ public class TenantProfileController extends BaseController {
     @PreAuthorize("hasAuthority('SYS_ADMIN')")
     @RequestMapping(value = "/tenantProfile", method = RequestMethod.POST)
     @ResponseBody
-    public TenantProfile saveTenantProfile(@ApiParam(value = "A JSON value representing the tenant profile.")
+    public TenantProfile saveTenantProfile(@Parameter(description = "A JSON value representing the tenant profile.")
                                            @RequestBody TenantProfile tenantProfile) throws ThingsboardException {
         TenantProfile oldProfile;
         if (tenantProfile.getId() == null) {
@@ -183,7 +181,7 @@ public class TenantProfileController extends BaseController {
     @PreAuthorize("hasAuthority('SYS_ADMIN')")
     @RequestMapping(value = "/tenantProfile/{tenantProfileId}", method = RequestMethod.DELETE)
     @ResponseStatus(value = HttpStatus.OK)
-    public void deleteTenantProfile(@ApiParam(value = TENANT_PROFILE_ID_PARAM_DESCRIPTION)
+    public void deleteTenantProfile(@Parameter(description = TENANT_PROFILE_ID_PARAM_DESCRIPTION)
                                     @PathVariable("tenantProfileId") String strTenantProfileId) throws ThingsboardException {
         checkParameter("tenantProfileId", strTenantProfileId);
         TenantProfileId tenantProfileId = new TenantProfileId(toUUID(strTenantProfileId));
@@ -197,7 +195,7 @@ public class TenantProfileController extends BaseController {
     @RequestMapping(value = "/tenantProfile/{tenantProfileId}/default", method = RequestMethod.POST)
     @ResponseBody
     public TenantProfile setDefaultTenantProfile(
-            @ApiParam(value = TENANT_PROFILE_ID_PARAM_DESCRIPTION)
+            @Parameter(description = TENANT_PROFILE_ID_PARAM_DESCRIPTION)
             @PathVariable("tenantProfileId") String strTenantProfileId) throws ThingsboardException {
         checkParameter("tenantProfileId", strTenantProfileId);
         TenantProfileId tenantProfileId = new TenantProfileId(toUUID(strTenantProfileId));
@@ -211,15 +209,15 @@ public class TenantProfileController extends BaseController {
     @RequestMapping(value = "/tenantProfiles", params = {"pageSize", "page"}, method = RequestMethod.GET)
     @ResponseBody
     public PageData<TenantProfile> getTenantProfiles(
-            @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
             @RequestParam int pageSize,
-            @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
             @RequestParam int page,
-            @ApiParam(value = TENANT_PROFILE_TEXT_SEARCH_DESCRIPTION)
+            @Parameter(description = TENANT_PROFILE_TEXT_SEARCH_DESCRIPTION)
             @RequestParam(required = false) String textSearch,
-            @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = TENANT_PROFILE_SORT_PROPERTY_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "name", "description", "isDefault"}))
             @RequestParam(required = false) String sortProperty,
-            @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
             @RequestParam(required = false) String sortOrder) throws ThingsboardException {
         PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder);
         return checkNotNull(tenantProfileService.findTenantProfiles(getTenantId(), pageLink));
@@ -231,15 +229,15 @@ public class TenantProfileController extends BaseController {
     @RequestMapping(value = "/tenantProfileInfos", params = {"pageSize", "page"}, method = RequestMethod.GET)
     @ResponseBody
     public PageData<EntityInfo> getTenantProfileInfos(
-            @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
             @RequestParam int pageSize,
-            @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
             @RequestParam int page,
-            @ApiParam(value = TENANT_PROFILE_TEXT_SEARCH_DESCRIPTION)
+            @Parameter(description = TENANT_PROFILE_TEXT_SEARCH_DESCRIPTION)
             @RequestParam(required = false) String textSearch,
-            @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = TENANT_PROFILE_INFO_SORT_PROPERTY_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"id", "name"}))
             @RequestParam(required = false) String sortProperty,
-            @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
             @RequestParam(required = false) String sortOrder) throws ThingsboardException {
         PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder);
         return checkNotNull(tenantProfileService.findTenantProfileInfos(getTenantId(), pageLink));
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 90130cd184..01487b20a0 100644
--- a/application/src/main/java/org/thingsboard/server/controller/TwoFactorAuthConfigController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/TwoFactorAuthConfigController.java
@@ -15,8 +15,9 @@
  */
 package org.thingsboard.server.controller;
 
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.Valid;
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -34,12 +35,12 @@ import org.thingsboard.server.common.data.security.model.mfa.account.AccountTwoF
 import org.thingsboard.server.common.data.security.model.mfa.account.TwoFaAccountConfig;
 import org.thingsboard.server.common.data.security.model.mfa.provider.TwoFaProviderConfig;
 import org.thingsboard.server.common.data.security.model.mfa.provider.TwoFaProviderType;
+import org.thingsboard.server.config.annotations.ApiOperation;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.security.auth.mfa.TwoFactorAuthService;
 import org.thingsboard.server.service.security.auth.mfa.config.TwoFaConfigManager;
 import org.thingsboard.server.service.security.model.SecurityUser;
 
-import javax.validation.Valid;
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -99,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(@ApiParam(value = "2FA provider type to generate new account config for", 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);
@@ -258,7 +259,7 @@ public class TwoFactorAuthConfigController extends BaseController {
                     ControllerConstants.SYSTEM_OR_TENANT_AUTHORITY_PARAGRAPH)
     @PostMapping("/settings")
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN')")
-    public PlatformTwoFaSettings savePlatformTwoFaSettings(@ApiParam(value = "Settings value", required = true)
+    public PlatformTwoFaSettings savePlatformTwoFaSettings(@Parameter(description = "Settings value", required = true)
                                           @RequestBody PlatformTwoFaSettings twoFaSettings) throws ThingsboardException {
         return twoFaConfigManager.savePlatformTwoFaSettings(getTenantId(), twoFaSettings);
     }
diff --git a/application/src/main/java/org/thingsboard/server/controller/TwoFactorAuthController.java b/application/src/main/java/org/thingsboard/server/controller/TwoFactorAuthController.java
index 30f165f9c8..4e4b30a542 100644
--- a/application/src/main/java/org/thingsboard/server/controller/TwoFactorAuthController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/TwoFactorAuthController.java
@@ -15,7 +15,7 @@
  */
 package org.thingsboard.server.controller;
 
-import io.swagger.annotations.ApiOperation;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -35,6 +35,7 @@ import org.thingsboard.server.common.data.security.model.mfa.PlatformTwoFaSettin
 import org.thingsboard.server.common.data.security.model.mfa.account.EmailTwoFaAccountConfig;
 import org.thingsboard.server.common.data.security.model.mfa.account.SmsTwoFaAccountConfig;
 import org.thingsboard.server.common.data.security.model.mfa.provider.TwoFaProviderType;
+import org.thingsboard.server.config.annotations.ApiOperation;
 import org.thingsboard.server.dao.user.UserService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.security.auth.mfa.TwoFactorAuthService;
@@ -44,7 +45,6 @@ import org.thingsboard.server.service.security.model.SecurityUser;
 import org.thingsboard.server.service.security.model.token.JwtTokenFactory;
 import org.thingsboard.server.service.security.system.SystemSecurityService;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
diff --git a/application/src/main/java/org/thingsboard/server/controller/UiSettingsController.java b/application/src/main/java/org/thingsboard/server/controller/UiSettingsController.java
index ff7ee6f1f6..8bdd8dfeec 100644
--- a/application/src/main/java/org/thingsboard/server/controller/UiSettingsController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/UiSettingsController.java
@@ -15,7 +15,6 @@
  */
 package org.thingsboard.server.controller;
 
-import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -23,6 +22,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.config.annotations.ApiOperation;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 
 @RestController
diff --git a/application/src/main/java/org/thingsboard/server/controller/UserController.java b/application/src/main/java/org/thingsboard/server/controller/UserController.java
index a08e5e4bf7..1772a64772 100644
--- a/application/src/main/java/org/thingsboard/server/controller/UserController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/UserController.java
@@ -17,8 +17,9 @@ package org.thingsboard.server.controller;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -68,6 +69,7 @@ import org.thingsboard.server.common.data.settings.UserDashboardAction;
 import org.thingsboard.server.common.data.settings.UserDashboardsInfo;
 import org.thingsboard.server.common.data.settings.UserSettings;
 import org.thingsboard.server.common.data.settings.UserSettingsType;
+import org.thingsboard.server.config.annotations.ApiOperation;
 import org.thingsboard.server.dao.entity.EntityService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.entitiy.user.TbUserService;
@@ -79,7 +81,6 @@ import org.thingsboard.server.service.security.permission.Operation;
 import org.thingsboard.server.service.security.permission.Resource;
 import org.thingsboard.server.service.security.system.SystemSecurityService;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -96,7 +97,6 @@ import static org.thingsboard.server.controller.ControllerConstants.HOME_DASHBOA
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_DATA_PARAMETERS;
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_NUMBER_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_SIZE_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_ALLOWABLE_VALUES;
 import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.SORT_PROPERTY_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.SYSTEM_AUTHORITY_PARAGRAPH;
@@ -106,7 +106,6 @@ import static org.thingsboard.server.controller.ControllerConstants.TENANT_ID;
 import static org.thingsboard.server.controller.ControllerConstants.TENANT_ID_PARAM_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH;
 import static org.thingsboard.server.controller.ControllerConstants.USER_ID_PARAM_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.USER_SORT_PROPERTY_ALLOWABLE_VALUES;
 import static org.thingsboard.server.controller.ControllerConstants.USER_TEXT_SEARCH_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.UUID_WIKI_LINK;
 import static org.thingsboard.server.dao.entity.BaseEntityService.NULL_CUSTOMER_ID;
@@ -147,7 +146,7 @@ public class UserController extends BaseController {
     @RequestMapping(value = "/user/{userId}", method = RequestMethod.GET)
     @ResponseBody
     public User getUserById(
-            @ApiParam(value = USER_ID_PARAM_DESCRIPTION)
+            @Parameter(description = USER_ID_PARAM_DESCRIPTION)
             @PathVariable(USER_ID) String strUserId) throws ThingsboardException {
         checkParameter(USER_ID, strUserId);
         UserId userId = new UserId(toUUID(strUserId));
@@ -183,7 +182,7 @@ public class UserController extends BaseController {
     @RequestMapping(value = "/user/{userId}/token", method = RequestMethod.GET)
     @ResponseBody
     public JwtPair getUserToken(
-            @ApiParam(value = USER_ID_PARAM_DESCRIPTION)
+            @Parameter(description = USER_ID_PARAM_DESCRIPTION)
             @PathVariable(USER_ID) String strUserId) throws ThingsboardException {
         checkParameter(USER_ID, strUserId);
         if (!userTokenAccessEnabled) {
@@ -211,9 +210,9 @@ public class UserController extends BaseController {
     @RequestMapping(value = "/user", method = RequestMethod.POST)
     @ResponseBody
     public User saveUser(
-            @ApiParam(value = "A JSON value representing the User.", required = true)
+            @Parameter(description = "A JSON value representing the User.", required = true)
             @RequestBody User user,
-            @ApiParam(value = "Send activation email (or use activation link)", defaultValue = "true")
+            @Parameter(description = "Send activation email (or use activation link)" , schema = @Schema(defaultValue = "true"))
             @RequestParam(required = false, defaultValue = "true") boolean sendActivationMail, HttpServletRequest request) throws ThingsboardException {
         if (!Authority.SYS_ADMIN.equals(getCurrentUser().getAuthority())) {
             user.setTenantId(getCurrentUser().getTenantId());
@@ -228,7 +227,7 @@ public class UserController extends BaseController {
     @RequestMapping(value = "/user/sendActivationMail", method = RequestMethod.POST)
     @ResponseStatus(value = HttpStatus.OK)
     public void sendActivationEmail(
-            @ApiParam(value = "Email of the user", required = true)
+            @Parameter(description = "Email of the user", required = true)
             @RequestParam(value = "email") String email,
             HttpServletRequest request) throws ThingsboardException {
         User user = checkNotNull(userService.findUserByEmail(getCurrentUser().getTenantId(), email));
@@ -254,7 +253,7 @@ public class UserController extends BaseController {
     @RequestMapping(value = "/user/{userId}/activationLink", method = RequestMethod.GET, produces = "text/plain")
     @ResponseBody
     public String getActivationLink(
-            @ApiParam(value = USER_ID_PARAM_DESCRIPTION)
+            @Parameter(description = USER_ID_PARAM_DESCRIPTION)
             @PathVariable(USER_ID) String strUserId,
             HttpServletRequest request) throws ThingsboardException {
         checkParameter(USER_ID, strUserId);
@@ -279,7 +278,7 @@ public class UserController extends BaseController {
     @RequestMapping(value = "/user/{userId}", method = RequestMethod.DELETE)
     @ResponseStatus(value = HttpStatus.OK)
     public void deleteUser(
-            @ApiParam(value = USER_ID_PARAM_DESCRIPTION)
+            @Parameter(description = USER_ID_PARAM_DESCRIPTION)
             @PathVariable(USER_ID) String strUserId) throws ThingsboardException {
         checkParameter(USER_ID, strUserId);
         UserId userId = new UserId(toUUID(strUserId));
@@ -297,15 +296,15 @@ public class UserController extends BaseController {
     @RequestMapping(value = "/users", params = {"pageSize", "page"}, method = RequestMethod.GET)
     @ResponseBody
     public PageData<User> getUsers(
-            @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
             @RequestParam int pageSize,
-            @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
             @RequestParam int page,
-            @ApiParam(value = USER_TEXT_SEARCH_DESCRIPTION)
+            @Parameter(description = USER_TEXT_SEARCH_DESCRIPTION)
             @RequestParam(required = false) String textSearch,
-            @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = USER_SORT_PROPERTY_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "firstName", "lastName", "email"}))
             @RequestParam(required = false) String sortProperty,
-            @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
             @RequestParam(required = false) String sortOrder) throws ThingsboardException {
         PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder);
         SecurityUser currentUser = getCurrentUser();
@@ -323,15 +322,15 @@ public class UserController extends BaseController {
     @RequestMapping(value = "/users/info", method = RequestMethod.GET)
     @ResponseBody
     public PageData<UserEmailInfo> findUsersByQuery(
-            @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
             @RequestParam int pageSize,
-            @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
             @RequestParam int page,
-            @ApiParam(value = USER_TEXT_SEARCH_DESCRIPTION)
+            @Parameter(description = USER_TEXT_SEARCH_DESCRIPTION)
             @RequestParam(required = false) String textSearch,
-            @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = USER_SORT_PROPERTY_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "firstName", "lastName", "email"}))
             @RequestParam(required = false) String sortProperty,
-            @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
             @RequestParam(required = false) String sortOrder) throws ThingsboardException {
         SecurityUser securityUser = getCurrentUser();
 
@@ -360,17 +359,17 @@ public class UserController extends BaseController {
     @RequestMapping(value = "/tenant/{tenantId}/users", params = {"pageSize", "page"}, method = RequestMethod.GET)
     @ResponseBody
     public PageData<User> getTenantAdmins(
-            @ApiParam(value = TENANT_ID_PARAM_DESCRIPTION, required = true)
+            @Parameter(description = TENANT_ID_PARAM_DESCRIPTION, required = true)
             @PathVariable(TENANT_ID) String strTenantId,
-            @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
             @RequestParam int pageSize,
-            @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
             @RequestParam int page,
-            @ApiParam(value = USER_TEXT_SEARCH_DESCRIPTION)
+            @Parameter(description = USER_TEXT_SEARCH_DESCRIPTION)
             @RequestParam(required = false) String textSearch,
-            @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = USER_SORT_PROPERTY_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "firstName", "lastName", "email"}))
             @RequestParam(required = false) String sortProperty,
-            @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
             @RequestParam(required = false) String sortOrder) throws ThingsboardException {
         checkParameter("tenantId", strTenantId);
         TenantId tenantId = TenantId.fromUUID(toUUID(strTenantId));
@@ -384,17 +383,17 @@ public class UserController extends BaseController {
     @RequestMapping(value = "/customer/{customerId}/users", params = {"pageSize", "page"}, method = RequestMethod.GET)
     @ResponseBody
     public PageData<User> getCustomerUsers(
-            @ApiParam(value = CUSTOMER_ID_PARAM_DESCRIPTION, required = true)
+            @Parameter(description = CUSTOMER_ID_PARAM_DESCRIPTION, required = true)
             @PathVariable(CUSTOMER_ID) String strCustomerId,
-            @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
             @RequestParam int pageSize,
-            @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
             @RequestParam int page,
-            @ApiParam(value = USER_TEXT_SEARCH_DESCRIPTION)
+            @Parameter(description = USER_TEXT_SEARCH_DESCRIPTION)
             @RequestParam(required = false) String textSearch,
-            @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = USER_SORT_PROPERTY_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "firstName", "lastName", "email"}))
             @RequestParam(required = false) String sortProperty,
-            @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
             @RequestParam(required = false) String sortOrder) throws ThingsboardException {
         checkParameter("customerId", strCustomerId);
         CustomerId customerId = new CustomerId(toUUID(strCustomerId));
@@ -410,9 +409,9 @@ public class UserController extends BaseController {
     @RequestMapping(value = "/user/{userId}/userCredentialsEnabled", method = RequestMethod.POST)
     @ResponseBody
     public void setUserCredentialsEnabled(
-            @ApiParam(value = USER_ID_PARAM_DESCRIPTION)
+            @Parameter(description = USER_ID_PARAM_DESCRIPTION)
             @PathVariable(USER_ID) String strUserId,
-            @ApiParam(value = "Enable (\"true\") or disable (\"false\") the credentials.", defaultValue = "true")
+            @Parameter(description = "Enable (\"true\") or disable (\"false\") the credentials." , schema = @Schema(defaultValue = "true"))
             @RequestParam(required = false, defaultValue = "true") boolean userCredentialsEnabled) throws ThingsboardException {
         checkParameter(USER_ID, strUserId);
         UserId userId = new UserId(toUUID(strUserId));
@@ -433,17 +432,17 @@ public class UserController extends BaseController {
     @RequestMapping(value = "/users/assign/{alarmId}", params = {"pageSize", "page"}, method = RequestMethod.GET)
     @ResponseBody
     public PageData<UserEmailInfo> getUsersForAssign(
-            @ApiParam(value = ALARM_ID_PARAM_DESCRIPTION, required = true)
+            @Parameter(description = ALARM_ID_PARAM_DESCRIPTION, required = true)
             @PathVariable("alarmId") String strAlarmId,
-            @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
             @RequestParam int pageSize,
-            @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
             @RequestParam int page,
-            @ApiParam(value = USER_TEXT_SEARCH_DESCRIPTION)
+            @Parameter(description = USER_TEXT_SEARCH_DESCRIPTION)
             @RequestParam(required = false) String textSearch,
-            @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = USER_SORT_PROPERTY_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "firstName", "lastName", "email"}))
             @RequestParam(required = false) String sortProperty,
-            @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
             @RequestParam(required = false) String sortOrder) throws ThingsboardException {
         checkParameter("alarmId", strAlarmId);
         AlarmId alarmEntityId = new AlarmId(toUUID(strAlarmId));
@@ -510,7 +509,7 @@ public class UserController extends BaseController {
                     "Example: to delete B and C element in { \"A\": {\"B\": 5}, \"C\": 15} send A.B,C in jsonPaths request parameter")
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/user/settings/{paths}", method = RequestMethod.DELETE)
-    public void deleteUserSettings(@ApiParam(value = PATHS)
+    public void deleteUserSettings(@Parameter(description = PATHS)
                                    @PathVariable(PATHS) String paths) throws ThingsboardException {
         checkParameter(USER_ID, paths);
 
@@ -524,7 +523,7 @@ public class UserController extends BaseController {
                     "{A:5, B:{C:10, D:30}}. The same could be achieved by putting {B.D:30}")
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
     @PutMapping(value = "/user/settings/{type}")
-    public void putUserSettings(@ApiParam(value = "Settings type, case insensitive, one of: \"general\", \"quick_links\", \"doc_links\" or \"dashboards\".")
+    public void putUserSettings(@Parameter(description = "Settings type, case insensitive, one of: \"general\", \"quick_links\", \"doc_links\" or \"dashboards\".")
                                 @PathVariable("type") String strType, @RequestBody JsonNode settings) throws ThingsboardException {
         SecurityUser currentUser = getCurrentUser();
         UserSettingsType type = checkEnumParameter("Settings type", strType, UserSettingsType::valueOf);
@@ -536,7 +535,7 @@ public class UserController extends BaseController {
             notes = "Fetch the User settings based on authorized user. ")
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
     @GetMapping(value = "/user/settings/{type}")
-    public JsonNode getUserSettings(@ApiParam(value = "Settings type, case insensitive, one of: \"general\", \"quick_links\", \"doc_links\" or \"dashboards\".")
+    public JsonNode getUserSettings(@Parameter(description = "Settings type, case insensitive, one of: \"general\", \"quick_links\", \"doc_links\" or \"dashboards\".")
                                     @PathVariable("type") String strType) throws ThingsboardException {
         SecurityUser currentUser = getCurrentUser();
         UserSettingsType type = checkEnumParameter("Settings type", strType, UserSettingsType::valueOf);
@@ -550,9 +549,9 @@ public class UserController extends BaseController {
                     "Example: to delete B and C element in { \"A\": {\"B\": 5}, \"C\": 15} send A.B,C in jsonPaths request parameter")
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/user/settings/{type}/{paths}", method = RequestMethod.DELETE)
-    public void deleteUserSettings(@ApiParam(value = PATHS)
+    public void deleteUserSettings(@Parameter(description = PATHS)
                                    @PathVariable(PATHS) String paths,
-                                   @ApiParam(value = "Settings type, case insensitive, one of: \"general\", \"quick_links\", \"doc_links\" or \"dashboards\".")
+                                   @Parameter(description = "Settings type, case insensitive, one of: \"general\", \"quick_links\", \"doc_links\" or \"dashboards\".")
                                    @PathVariable("type") String strType) throws ThingsboardException {
         checkParameter(USER_ID, paths);
         UserSettingsType type = checkEnumParameter("Settings type", strType, UserSettingsType::valueOf);
@@ -576,9 +575,9 @@ public class UserController extends BaseController {
     @RequestMapping(value = "/user/dashboards/{dashboardId}/{action}", method = RequestMethod.GET)
     @ResponseBody
     public UserDashboardsInfo reportUserDashboardAction(
-            @ApiParam(value = DASHBOARD_ID_PARAM_DESCRIPTION)
+            @Parameter(description = DASHBOARD_ID_PARAM_DESCRIPTION)
             @PathVariable(DashboardController.DASHBOARD_ID) String strDashboardId,
-            @ApiParam(value = "Dashboard action, one of: \"visit\", \"star\" or \"unstar\".")
+            @Parameter(description = "Dashboard action, one of: \"visit\", \"star\" or \"unstar\".")
             @PathVariable("action") String strAction) throws ThingsboardException {
         checkParameter(DashboardController.DASHBOARD_ID, strDashboardId);
         checkParameter("action", strAction);
diff --git a/application/src/main/java/org/thingsboard/server/controller/WidgetTypeController.java b/application/src/main/java/org/thingsboard/server/controller/WidgetTypeController.java
index 915c697e59..f2e3f9192f 100644
--- a/application/src/main/java/org/thingsboard/server/controller/WidgetTypeController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/WidgetTypeController.java
@@ -15,9 +15,10 @@
  */
 package org.thingsboard.server.controller;
 
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -42,6 +43,7 @@ import org.thingsboard.server.common.data.widget.WidgetType;
 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.config.annotations.ApiOperation;
 import org.thingsboard.server.dao.model.ModelConstants;
 import org.thingsboard.server.dao.resource.ImageService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
@@ -59,13 +61,11 @@ import static org.thingsboard.server.controller.ControllerConstants.INLINE_IMAGE
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_DATA_PARAMETERS;
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_NUMBER_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_SIZE_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_ALLOWABLE_VALUES;
 import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.SORT_PROPERTY_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.SYSTEM_OR_TENANT_AUTHORITY_PARAGRAPH;
 import static org.thingsboard.server.controller.ControllerConstants.UUID_WIKI_LINK;
 import static org.thingsboard.server.controller.ControllerConstants.WIDGET_TYPE_ID_PARAM_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.WIDGET_TYPE_SORT_PROPERTY_ALLOWABLE_VALUES;
 import static org.thingsboard.server.controller.ControllerConstants.WIDGET_TYPE_TEXT_SEARCH_DESCRIPTION;
 
 @RestController
@@ -83,11 +83,9 @@ public class WidgetTypeController extends AutoCommitController {
     private static final String WIDGET_TYPE_INFO_DESCRIPTION = "Widget Type Info is a lightweight object that represents Widget Type but does not contain the heavyweight widget descriptor JSON";
     private static final String TENANT_ONLY_PARAM_DESCRIPTION = "Optional boolean parameter indicating whether only tenant widget types should be returned";
     private static final String FULL_SEARCH_PARAM_DESCRIPTION = "Optional boolean parameter indicating whether search widgets by description not only by name";
-    private static final String DEPRECATED_FILTER_ALLOWABLE_VALUES = "ALL, ACTUAL, DEPRECATED";
     private static final String DEPRECATED_FILTER_PARAM_DESCRIPTION = "Optional string parameter indicating whether to include deprecated widgets";
     private static final String UPDATE_EXISTING_BY_FQN_PARAM_DESCRIPTION = "Optional boolean parameter indicating whether to update existing widget type by FQN if present instead of creating new one";
     private static final String WIDGET_TYPE_ARRAY_DESCRIPTION = "A list of string values separated by comma ',' representing one of the widget type value";
-    private static final String WIDGET_TYPE_ALLOWABLE_VALUES = "timeseries, latest, control, alarm, static";
 
     @ApiOperation(value = "Get Widget Type Details (getWidgetTypeById)",
             notes = "Get the Widget Type Details based on the provided Widget Type Id. " + WIDGET_TYPE_DETAILS_DESCRIPTION + SYSTEM_OR_TENANT_AUTHORITY_PARAGRAPH)
@@ -95,9 +93,9 @@ public class WidgetTypeController extends AutoCommitController {
     @RequestMapping(value = "/widgetType/{widgetTypeId}", method = RequestMethod.GET)
     @ResponseBody
     public WidgetTypeDetails getWidgetTypeById(
-            @ApiParam(value = WIDGET_TYPE_ID_PARAM_DESCRIPTION, required = true)
+            @Parameter(description = WIDGET_TYPE_ID_PARAM_DESCRIPTION, required = true)
             @PathVariable("widgetTypeId") String strWidgetTypeId,
-            @ApiParam(value = INLINE_IMAGES_DESCRIPTION)
+            @Parameter(description = INLINE_IMAGES_DESCRIPTION)
             @RequestParam(value = INLINE_IMAGES, required = false) boolean inlineImages) throws ThingsboardException {
         checkParameter("widgetTypeId", strWidgetTypeId);
         WidgetTypeId widgetTypeId = new WidgetTypeId(toUUID(strWidgetTypeId));
@@ -114,7 +112,7 @@ public class WidgetTypeController extends AutoCommitController {
     @RequestMapping(value = "/widgetTypeInfo/{widgetTypeId}", method = RequestMethod.GET)
     @ResponseBody
     public WidgetTypeInfo getWidgetTypeInfoById(
-            @ApiParam(value = WIDGET_TYPE_ID_PARAM_DESCRIPTION, required = true)
+            @Parameter(description = WIDGET_TYPE_ID_PARAM_DESCRIPTION, required = true)
             @PathVariable("widgetTypeId") String strWidgetTypeId) throws ThingsboardException {
         checkParameter("widgetTypeId", strWidgetTypeId);
         WidgetTypeId widgetTypeId = new WidgetTypeId(toUUID(strWidgetTypeId));
@@ -135,9 +133,9 @@ public class WidgetTypeController extends AutoCommitController {
     @RequestMapping(value = "/widgetType", method = RequestMethod.POST)
     @ResponseBody
     public WidgetTypeDetails saveWidgetType(
-            @ApiParam(value = "A JSON value representing the Widget Type Details.", required = true)
+            @Parameter(description = "A JSON value representing the Widget Type Details.", required = true)
             @RequestBody WidgetTypeDetails widgetTypeDetails,
-            @ApiParam(value = UPDATE_EXISTING_BY_FQN_PARAM_DESCRIPTION)
+            @Parameter(description = UPDATE_EXISTING_BY_FQN_PARAM_DESCRIPTION)
             @RequestParam(required = false) Boolean updateExistingByFqn) throws Exception {
         var currentUser = getCurrentUser();
         if (Authority.SYS_ADMIN.equals(currentUser.getAuthority())) {
@@ -156,7 +154,7 @@ public class WidgetTypeController extends AutoCommitController {
     @RequestMapping(value = "/widgetType/{widgetTypeId}", method = RequestMethod.DELETE)
     @ResponseStatus(value = HttpStatus.OK)
     public void deleteWidgetType(
-            @ApiParam(value = WIDGET_TYPE_ID_PARAM_DESCRIPTION, required = true)
+            @Parameter(description = WIDGET_TYPE_ID_PARAM_DESCRIPTION, required = true)
             @PathVariable("widgetTypeId") String strWidgetTypeId) throws Exception {
         checkParameter("widgetTypeId", strWidgetTypeId);
         WidgetTypeId widgetTypeId = new WidgetTypeId(toUUID(strWidgetTypeId));
@@ -171,23 +169,23 @@ public class WidgetTypeController extends AutoCommitController {
     @RequestMapping(value = "/widgetTypes", params = {"pageSize", "page"}, method = RequestMethod.GET)
     @ResponseBody
     public PageData<WidgetTypeInfo> getWidgetTypes(
-            @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
             @RequestParam int pageSize,
-            @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
             @RequestParam int page,
-            @ApiParam(value = WIDGET_TYPE_TEXT_SEARCH_DESCRIPTION)
+            @Parameter(description = WIDGET_TYPE_TEXT_SEARCH_DESCRIPTION)
             @RequestParam(required = false) String textSearch,
-            @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = WIDGET_TYPE_SORT_PROPERTY_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "name", "deprecated", "tenantId"}))
             @RequestParam(required = false) String sortProperty,
-            @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC, DESC"}))
             @RequestParam(required = false) String sortOrder,
-            @ApiParam(value = TENANT_ONLY_PARAM_DESCRIPTION)
+            @Parameter(description = TENANT_ONLY_PARAM_DESCRIPTION)
             @RequestParam(required = false) Boolean tenantOnly,
-            @ApiParam(value = FULL_SEARCH_PARAM_DESCRIPTION)
+            @Parameter(description = FULL_SEARCH_PARAM_DESCRIPTION)
             @RequestParam(required = false) Boolean fullSearch,
-            @ApiParam(value = DEPRECATED_FILTER_PARAM_DESCRIPTION, allowableValues = DEPRECATED_FILTER_ALLOWABLE_VALUES)
+            @Parameter(description = DEPRECATED_FILTER_PARAM_DESCRIPTION, schema = @Schema(allowableValues = {"ALL", "ACTUAL", "DEPRECATED"}))
             @RequestParam(required = false) String deprecatedFilter,
-            @ApiParam(value = WIDGET_TYPE_ARRAY_DESCRIPTION, allowableValues = WIDGET_TYPE_ALLOWABLE_VALUES)
+            @Parameter(description = WIDGET_TYPE_ARRAY_DESCRIPTION, schema = @Schema(allowableValues = {"timeseries", "latest", "control", "alarm", "static"}))
             @RequestParam(required = false) String[] widgetTypeList) throws ThingsboardException {
         PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder);
         List<String> widgetTypes = widgetTypeList != null ? Arrays.asList(widgetTypeList) : Collections.emptyList();
@@ -211,9 +209,9 @@ public class WidgetTypeController extends AutoCommitController {
     @ResponseBody
     @Deprecated
     public List<WidgetType> getBundleWidgetTypesByBundleAlias(
-            @ApiParam(value = "System or Tenant", required = true)
+            @Parameter(description = "System or Tenant", required = true)
             @RequestParam boolean isSystem,
-            @ApiParam(value = "Widget Bundle alias", required = true)
+            @Parameter(description = "Widget Bundle alias", required = true)
             @RequestParam String bundleAlias) throws ThingsboardException {
         TenantId tenantId;
         if (isSystem) {
@@ -231,7 +229,7 @@ public class WidgetTypeController extends AutoCommitController {
     @RequestMapping(value = "/widgetTypes", params = {"widgetsBundleId"}, method = RequestMethod.GET)
     @ResponseBody
     public List<WidgetType> getBundleWidgetTypes(
-            @ApiParam(value = "Widget Bundle Id", required = true)
+            @Parameter(description = "Widget Bundle Id", required = true)
             @RequestParam("widgetsBundleId") String strWidgetsBundleId) throws ThingsboardException {
         WidgetsBundleId widgetsBundleId = new WidgetsBundleId(toUUID(strWidgetsBundleId));
         return checkNotNull(widgetTypeService.findWidgetTypesByWidgetsBundleId(getTenantId(), widgetsBundleId));
@@ -244,9 +242,9 @@ public class WidgetTypeController extends AutoCommitController {
     @ResponseBody
     @Deprecated
     public List<WidgetTypeDetails> getBundleWidgetTypesDetailsByBundleAlias(
-            @ApiParam(value = "System or Tenant", required = true)
+            @Parameter(description = "System or Tenant", required = true)
             @RequestParam boolean isSystem,
-            @ApiParam(value = "Widget Bundle alias", required = true)
+            @Parameter(description = "Widget Bundle alias", required = true)
             @RequestParam String bundleAlias) throws ThingsboardException {
         TenantId tenantId;
         if (isSystem) {
@@ -264,9 +262,9 @@ public class WidgetTypeController extends AutoCommitController {
     @RequestMapping(value = "/widgetTypesDetails", params = {"widgetsBundleId"}, method = RequestMethod.GET)
     @ResponseBody
     public List<WidgetTypeDetails> getBundleWidgetTypesDetails(
-            @ApiParam(value = "Widget Bundle Id", required = true)
+            @Parameter(description = "Widget Bundle Id", required = true)
             @RequestParam("widgetsBundleId") String strWidgetsBundleId,
-            @ApiParam(value = INLINE_IMAGES_DESCRIPTION)
+            @Parameter(description = INLINE_IMAGES_DESCRIPTION)
             @RequestParam(value = INLINE_IMAGES, required = false) boolean inlineImages
     ) throws ThingsboardException {
         WidgetsBundleId widgetsBundleId = new WidgetsBundleId(toUUID(strWidgetsBundleId));
@@ -283,7 +281,7 @@ public class WidgetTypeController extends AutoCommitController {
     @RequestMapping(value = "/widgetTypeFqns", params = {"widgetsBundleId"}, method = RequestMethod.GET)
     @ResponseBody
     public List<String> getBundleWidgetTypeFqns(
-            @ApiParam(value = "Widget Bundle Id", required = true)
+            @Parameter(description = "Widget Bundle Id", required = true)
             @RequestParam("widgetsBundleId") String strWidgetsBundleId) throws ThingsboardException {
         WidgetsBundleId widgetsBundleId = new WidgetsBundleId(toUUID(strWidgetsBundleId));
         return checkNotNull(widgetTypeService.findWidgetFqnsByWidgetsBundleId(getTenantId(), widgetsBundleId));
@@ -296,9 +294,9 @@ public class WidgetTypeController extends AutoCommitController {
     @ResponseBody
     @Deprecated
     public List<WidgetTypeInfo> getBundleWidgetTypesInfosByBundleAlias(
-            @ApiParam(value = "System or Tenant", required = true)
+            @Parameter(description = "System or Tenant", required = true)
             @RequestParam boolean isSystem,
-            @ApiParam(value = "Widget Bundle alias", required = true)
+            @Parameter(description = "Widget Bundle alias", required = true)
             @RequestParam String bundleAlias) throws ThingsboardException {
         TenantId tenantId;
         if (isSystem) {
@@ -317,23 +315,23 @@ public class WidgetTypeController extends AutoCommitController {
     @RequestMapping(value = "/widgetTypesInfos", params = {"widgetsBundleId", "pageSize", "page"}, method = RequestMethod.GET)
     @ResponseBody
     public PageData<WidgetTypeInfo> getBundleWidgetTypesInfos(
-            @ApiParam(value = "Widget Bundle Id", required = true)
+            @Parameter(description = "Widget Bundle Id", required = true)
             @RequestParam("widgetsBundleId") String strWidgetsBundleId,
-            @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
             @RequestParam int pageSize,
-            @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
             @RequestParam int page,
-            @ApiParam(value = WIDGET_TYPE_TEXT_SEARCH_DESCRIPTION)
+            @Parameter(description = WIDGET_TYPE_TEXT_SEARCH_DESCRIPTION)
             @RequestParam(required = false) String textSearch,
-            @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = WIDGET_TYPE_SORT_PROPERTY_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "name", "deprecated", "tenantId"}))
             @RequestParam(required = false) String sortProperty,
-            @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
             @RequestParam(required = false) String sortOrder,
-            @ApiParam(value = FULL_SEARCH_PARAM_DESCRIPTION)
+            @Parameter(description = FULL_SEARCH_PARAM_DESCRIPTION)
             @RequestParam(required = false) Boolean fullSearch,
-            @ApiParam(value = DEPRECATED_FILTER_PARAM_DESCRIPTION, allowableValues = DEPRECATED_FILTER_ALLOWABLE_VALUES)
+            @Parameter(description = DEPRECATED_FILTER_PARAM_DESCRIPTION, schema = @Schema(allowableValues = {"ALL", "ACTUAL", "DEPRECATED"}))
             @RequestParam(required = false) String deprecatedFilter,
-            @ApiParam(value = WIDGET_TYPE_ARRAY_DESCRIPTION, allowableValues = WIDGET_TYPE_ALLOWABLE_VALUES)
+            @Parameter(description = WIDGET_TYPE_ARRAY_DESCRIPTION, schema = @Schema(allowableValues = {"timeseries", "latest", "control", "alarm", "static"}))
             @RequestParam(required = false) String[] widgetTypeList) throws ThingsboardException {
         WidgetsBundleId widgetsBundleId = new WidgetsBundleId(toUUID(strWidgetsBundleId));
         PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder);
@@ -350,11 +348,11 @@ public class WidgetTypeController extends AutoCommitController {
     @ResponseBody
     @Deprecated
     public WidgetType getWidgetTypeByBundleAliasAndTypeAlias(
-            @ApiParam(value = "System or Tenant", required = true)
+            @Parameter(description = "System or Tenant", required = true)
             @RequestParam boolean isSystem,
-            @ApiParam(value = "Widget Bundle alias", required = true)
+            @Parameter(description = "Widget Bundle alias", required = true)
             @RequestParam String bundleAlias,
-            @ApiParam(value = "Widget Type alias", required = true)
+            @Parameter(description = "Widget Type alias", required = true)
             @RequestParam String alias) throws ThingsboardException {
         TenantId tenantId;
         if (isSystem) {
@@ -374,7 +372,7 @@ public class WidgetTypeController extends AutoCommitController {
     @RequestMapping(value = "/widgetType", params = {"fqn"}, method = RequestMethod.GET)
     @ResponseBody
     public WidgetType getWidgetType(
-            @ApiParam(value = "Widget Type fqn", required = true)
+            @Parameter(description = "Widget Type fqn", required = true)
             @RequestParam String fqn) throws ThingsboardException {
         String[] parts = fqn.split("\\.");
         String scopeQualifier = parts.length > 0 ? parts[0] : null;
diff --git a/application/src/main/java/org/thingsboard/server/controller/WidgetsBundleController.java b/application/src/main/java/org/thingsboard/server/controller/WidgetsBundleController.java
index 0168d7d259..f652e78b85 100644
--- a/application/src/main/java/org/thingsboard/server/controller/WidgetsBundleController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/WidgetsBundleController.java
@@ -15,8 +15,8 @@
  */
 package org.thingsboard.server.controller;
 
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -37,6 +37,7 @@ import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.common.data.security.Authority;
 import org.thingsboard.server.common.data.widget.WidgetsBundle;
 import org.thingsboard.server.dao.resource.ImageService;
+import org.thingsboard.server.config.annotations.ApiOperation;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.entitiy.widgets.bundle.TbWidgetsBundleService;
 import org.thingsboard.server.service.security.permission.Operation;
@@ -53,13 +54,11 @@ import static org.thingsboard.server.controller.ControllerConstants.INLINE_IMAGE
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_DATA_PARAMETERS;
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_NUMBER_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_SIZE_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_ALLOWABLE_VALUES;
 import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.SORT_PROPERTY_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.SYSTEM_OR_TENANT_AUTHORITY_PARAGRAPH;
 import static org.thingsboard.server.controller.ControllerConstants.UUID_WIKI_LINK;
 import static org.thingsboard.server.controller.ControllerConstants.WIDGET_BUNDLE_ID_PARAM_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.WIDGET_BUNDLE_SORT_PROPERTY_ALLOWABLE_VALUES;
 import static org.thingsboard.server.controller.ControllerConstants.WIDGET_BUNDLE_TEXT_SEARCH_DESCRIPTION;
 
 @RestController
@@ -81,9 +80,9 @@ public class WidgetsBundleController extends BaseController {
     @RequestMapping(value = "/widgetsBundle/{widgetsBundleId}", method = RequestMethod.GET)
     @ResponseBody
     public WidgetsBundle getWidgetsBundleById(
-            @ApiParam(value = WIDGET_BUNDLE_ID_PARAM_DESCRIPTION, required = true)
+            @Parameter(description = WIDGET_BUNDLE_ID_PARAM_DESCRIPTION, required = true)
             @PathVariable("widgetsBundleId") String strWidgetsBundleId,
-            @ApiParam(value = INLINE_IMAGES_DESCRIPTION)
+            @Parameter(description = INLINE_IMAGES_DESCRIPTION)
             @RequestParam(value = INLINE_IMAGES, required = false) boolean inlineImages) throws ThingsboardException {
         checkParameter("widgetsBundleId", strWidgetsBundleId);
         WidgetsBundleId widgetsBundleId = new WidgetsBundleId(toUUID(strWidgetsBundleId));
@@ -108,7 +107,7 @@ public class WidgetsBundleController extends BaseController {
     @RequestMapping(value = "/widgetsBundle", method = RequestMethod.POST)
     @ResponseBody
     public WidgetsBundle saveWidgetsBundle(
-            @ApiParam(value = "A JSON value representing the Widget Bundle.", required = true)
+            @Parameter(description = "A JSON value representing the Widget Bundle.", required = true)
             @RequestBody WidgetsBundle widgetsBundle) throws Exception {
         var currentUser = getCurrentUser();
         if (Authority.SYS_ADMIN.equals(currentUser.getAuthority())) {
@@ -128,9 +127,9 @@ public class WidgetsBundleController extends BaseController {
     @RequestMapping(value = "/widgetsBundle/{widgetsBundleId}/widgetTypes", method = RequestMethod.POST)
     @ResponseStatus(value = HttpStatus.OK)
     public void updateWidgetsBundleWidgetTypes(
-            @ApiParam(value = WIDGET_BUNDLE_ID_PARAM_DESCRIPTION, required = true)
+            @Parameter(description = WIDGET_BUNDLE_ID_PARAM_DESCRIPTION, required = true)
             @PathVariable("widgetsBundleId") String strWidgetsBundleId,
-            @ApiParam(value = "Ordered list of widget type Ids to be included by widgets bundle")
+            @Parameter(description = "Ordered list of widget type Ids to be included by widgets bundle")
             @RequestBody List<String> strWidgetTypeIds) throws Exception {
         checkParameter("widgetsBundleId", strWidgetsBundleId);
         WidgetsBundleId widgetsBundleId = new WidgetsBundleId(toUUID(strWidgetsBundleId));
@@ -154,9 +153,9 @@ public class WidgetsBundleController extends BaseController {
     @RequestMapping(value = "/widgetsBundle/{widgetsBundleId}/widgetTypeFqns", method = RequestMethod.POST)
     @ResponseStatus(value = HttpStatus.OK)
     public void updateWidgetsBundleWidgetFqns(
-            @ApiParam(value = WIDGET_BUNDLE_ID_PARAM_DESCRIPTION, required = true)
+            @Parameter(description = WIDGET_BUNDLE_ID_PARAM_DESCRIPTION, required = true)
             @PathVariable("widgetsBundleId") String strWidgetsBundleId,
-            @ApiParam(value = "Ordered list of widget type FQNs to be included by widgets bundle")
+            @Parameter(description = "Ordered list of widget type FQNs to be included by widgets bundle")
             @RequestBody List<String> widgetTypeFqns) throws Exception {
         checkParameter("widgetsBundleId", strWidgetsBundleId);
         WidgetsBundleId widgetsBundleId = new WidgetsBundleId(toUUID(strWidgetsBundleId));
@@ -171,7 +170,7 @@ public class WidgetsBundleController extends BaseController {
     @RequestMapping(value = "/widgetsBundle/{widgetsBundleId}", method = RequestMethod.DELETE)
     @ResponseStatus(value = HttpStatus.OK)
     public void deleteWidgetsBundle(
-            @ApiParam(value = WIDGET_BUNDLE_ID_PARAM_DESCRIPTION, required = true)
+            @Parameter(description = WIDGET_BUNDLE_ID_PARAM_DESCRIPTION, required = true)
             @PathVariable("widgetsBundleId") String strWidgetsBundleId) throws ThingsboardException {
         checkParameter("widgetsBundleId", strWidgetsBundleId);
         WidgetsBundleId widgetsBundleId = new WidgetsBundleId(toUUID(strWidgetsBundleId));
@@ -186,19 +185,19 @@ public class WidgetsBundleController extends BaseController {
     @RequestMapping(value = "/widgetsBundles", params = {"pageSize", "page"}, method = RequestMethod.GET)
     @ResponseBody
     public PageData<WidgetsBundle> getWidgetsBundles(
-            @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
             @RequestParam int pageSize,
-            @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+            @Parameter(description = PAGE_NUMBER_DESCRIPTION, required = true)
             @RequestParam int page,
-            @ApiParam(value = WIDGET_BUNDLE_TEXT_SEARCH_DESCRIPTION)
+            @Parameter(description = WIDGET_BUNDLE_TEXT_SEARCH_DESCRIPTION)
             @RequestParam(required = false) String textSearch,
-            @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = WIDGET_BUNDLE_SORT_PROPERTY_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "title", "tenantId"}))
             @RequestParam(required = false) String sortProperty,
-            @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+            @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
             @RequestParam(required = false) String sortOrder,
-            @ApiParam(value = TENANT_BUNDLES_ONLY_DESCRIPTION)
+            @Parameter(description = TENANT_BUNDLES_ONLY_DESCRIPTION)
             @RequestParam(required = false) Boolean tenantOnly,
-            @ApiParam(value = FULL_SEARCH_PARAM_DESCRIPTION)
+            @Parameter(description = FULL_SEARCH_PARAM_DESCRIPTION)
             @RequestParam(required = false) Boolean fullSearch) throws ThingsboardException {
         PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder);
         if (Authority.SYS_ADMIN.equals(getCurrentUser().getAuthority())) {
diff --git a/application/src/main/java/org/thingsboard/server/controller/plugin/TbWebSocketHandler.java b/application/src/main/java/org/thingsboard/server/controller/plugin/TbWebSocketHandler.java
index 64536ddb54..71350bb1fd 100644
--- a/application/src/main/java/org/thingsboard/server/controller/plugin/TbWebSocketHandler.java
+++ b/application/src/main/java/org/thingsboard/server/controller/plugin/TbWebSocketHandler.java
@@ -18,6 +18,10 @@ package org.thingsboard.server.controller.plugin;
 import com.github.benmanes.caffeine.cache.Cache;
 import com.github.benmanes.caffeine.cache.Caffeine;
 import com.github.benmanes.caffeine.cache.RemovalCause;
+import jakarta.websocket.RemoteEndpoint;
+import jakarta.websocket.SendHandler;
+import jakarta.websocket.SendResult;
+import jakarta.websocket.Session;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
@@ -46,6 +50,7 @@ import org.thingsboard.server.dao.tenant.TbTenantProfileCache;
 import org.thingsboard.server.cache.limits.RateLimitService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.security.auth.jwt.JwtAuthenticationProvider;
+import org.thingsboard.server.service.security.exception.JwtExpiredTokenException;
 import org.thingsboard.server.service.security.model.SecurityUser;
 import org.thingsboard.server.service.security.model.UserPrincipal;
 import org.thingsboard.server.service.subscription.SubscriptionErrorCode;
@@ -60,10 +65,6 @@ import org.thingsboard.server.service.ws.notification.cmd.NotificationCmdsWrappe
 import org.thingsboard.server.service.ws.telemetry.cmd.TelemetryCmdsWrapper;
 
 import javax.annotation.PostConstruct;
-import javax.websocket.RemoteEndpoint;
-import javax.websocket.SendHandler;
-import javax.websocket.SendResult;
-import javax.websocket.Session;
 import java.io.IOException;
 import java.security.InvalidParameterException;
 import java.util.Optional;
@@ -232,6 +233,9 @@ public class TbWebSocketHandler extends TextWebSocketHandler implements WebSocke
         } catch (InvalidParameterException e) {
             log.warn("[{}] Failed to start session", session.getId(), e);
             session.close(CloseStatus.BAD_DATA.withReason(e.getMessage()));
+        } catch (JwtExpiredTokenException e) {
+            log.trace("[{}] Failed to start session", session.getId(), e);
+            session.close(CloseStatus.SERVER_ERROR.withReason(e.getMessage()));
         } catch (Exception e) {
             log.warn("[{}] Failed to start session", session.getId(), e);
             session.close(CloseStatus.SERVER_ERROR.withReason(e.getMessage()));
diff --git a/application/src/main/java/org/thingsboard/server/exception/ThingsboardCredentialsExpiredResponse.java b/application/src/main/java/org/thingsboard/server/exception/ThingsboardCredentialsExpiredResponse.java
index 6817ee75e4..80bcb2439b 100644
--- a/application/src/main/java/org/thingsboard/server/exception/ThingsboardCredentialsExpiredResponse.java
+++ b/application/src/main/java/org/thingsboard/server/exception/ThingsboardCredentialsExpiredResponse.java
@@ -15,12 +15,11 @@
  */
 package org.thingsboard.server.exception;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.springframework.http.HttpStatus;
 import org.thingsboard.server.common.data.exception.ThingsboardErrorCode;
 
-@ApiModel
+@Schema
 public class ThingsboardCredentialsExpiredResponse extends ThingsboardErrorResponse {
 
     private final String resetToken;
@@ -34,7 +33,7 @@ public class ThingsboardCredentialsExpiredResponse extends ThingsboardErrorRespo
         return new ThingsboardCredentialsExpiredResponse(message, resetToken);
     }
 
-    @ApiModelProperty(position = 5, value = "Password reset token", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Password reset token", accessMode = Schema.AccessMode.READ_ONLY)
     public String getResetToken() {
         return resetToken;
     }
diff --git a/application/src/main/java/org/thingsboard/server/exception/ThingsboardCredentialsViolationResponse.java b/application/src/main/java/org/thingsboard/server/exception/ThingsboardCredentialsViolationResponse.java
index cb49466448..64671aa3a5 100644
--- a/application/src/main/java/org/thingsboard/server/exception/ThingsboardCredentialsViolationResponse.java
+++ b/application/src/main/java/org/thingsboard/server/exception/ThingsboardCredentialsViolationResponse.java
@@ -15,11 +15,11 @@
  */
 package org.thingsboard.server.exception;
 
-import io.swagger.annotations.ApiModel;
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.springframework.http.HttpStatus;
 import org.thingsboard.server.common.data.exception.ThingsboardErrorCode;
 
-@ApiModel
+@Schema
 public class ThingsboardCredentialsViolationResponse extends ThingsboardErrorResponse {
 
     protected ThingsboardCredentialsViolationResponse(String message) {
diff --git a/application/src/main/java/org/thingsboard/server/exception/ThingsboardErrorResponse.java b/application/src/main/java/org/thingsboard/server/exception/ThingsboardErrorResponse.java
index 26084ad077..ada5cea2e9 100644
--- a/application/src/main/java/org/thingsboard/server/exception/ThingsboardErrorResponse.java
+++ b/application/src/main/java/org/thingsboard/server/exception/ThingsboardErrorResponse.java
@@ -15,14 +15,11 @@
  */
 package org.thingsboard.server.exception;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.springframework.http.HttpStatus;
 import org.thingsboard.server.common.data.exception.ThingsboardErrorCode;
 
-import java.util.Date;
-
-@ApiModel
+@Schema
 public class ThingsboardErrorResponse {
     // HTTP Response Status Code
     private final HttpStatus status;
@@ -33,30 +30,30 @@ public class ThingsboardErrorResponse {
     // Error code
     private final ThingsboardErrorCode errorCode;
 
-    private final Date timestamp;
+    private final long timestamp;
 
     protected ThingsboardErrorResponse(final String message, final ThingsboardErrorCode errorCode, HttpStatus status) {
         this.message = message;
         this.errorCode = errorCode;
         this.status = status;
-        this.timestamp = new java.util.Date();
+        this.timestamp = System.currentTimeMillis();
     }
 
     public static ThingsboardErrorResponse of(final String message, final ThingsboardErrorCode errorCode, HttpStatus status) {
         return new ThingsboardErrorResponse(message, errorCode, status);
     }
 
-    @ApiModelProperty(position = 1, value = "HTTP Response Status Code", example = "401", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "HTTP Response Status Code", example = "401", accessMode = Schema.AccessMode.READ_ONLY)
     public Integer getStatus() {
         return status.value();
     }
 
-    @ApiModelProperty(position = 2, value = "Error message", example = "Authentication failed", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Error message", example = "Authentication failed", accessMode = Schema.AccessMode.READ_ONLY)
     public String getMessage() {
         return message;
     }
 
-    @ApiModelProperty(position = 3, value = "Platform error code:" +
+    @Schema(description = "Platform error code:" +
             "\n* `2` - General error (HTTP: 500 - Internal Server Error)" +
             "\n\n* `10` - Authentication failed (HTTP: 401 - Unauthorized)" +
             "\n\n* `11` - JWT token expired (HTTP: 401 - Unauthorized)" +
@@ -68,14 +65,14 @@ public class ThingsboardErrorResponse {
             "\n\n* `33` - Too many requests (HTTP: 429 - Too Many Requests)" +
             "\n\n* `34` - Too many updates (Too many updates over Websocket session)" +
             "\n\n* `40` - Subscription violation (HTTP: 403 - Forbidden)",
-            example = "10", dataType = "integer",
-            accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+            example = "10", type = "integer",
+            accessMode = Schema.AccessMode.READ_ONLY)
     public ThingsboardErrorCode getErrorCode() {
         return errorCode;
     }
 
-    @ApiModelProperty(position = 4, value = "Timestamp", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
-    public Date getTimestamp() {
+    @Schema(description = "Timestamp", accessMode = Schema.AccessMode.READ_ONLY)
+    public long getTimestamp() {
         return timestamp;
     }
 }
diff --git a/application/src/main/java/org/thingsboard/server/exception/ThingsboardErrorResponseHandler.java b/application/src/main/java/org/thingsboard/server/exception/ThingsboardErrorResponseHandler.java
index b2509187d5..d097beb4c2 100644
--- a/application/src/main/java/org/thingsboard/server/exception/ThingsboardErrorResponseHandler.java
+++ b/application/src/main/java/org/thingsboard/server/exception/ThingsboardErrorResponseHandler.java
@@ -15,9 +15,16 @@
  */
 package org.thingsboard.server.exception;
 
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.exception.ExceptionUtils;
+import org.springframework.boot.web.servlet.error.ErrorController;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.HttpStatusCode;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.lang.Nullable;
@@ -28,7 +35,9 @@ import org.springframework.security.authentication.LockedException;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.security.web.access.AccessDeniedHandler;
+import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 import org.springframework.web.client.HttpClientErrorException;
 import org.springframework.web.context.request.WebRequest;
@@ -43,18 +52,18 @@ import org.thingsboard.server.service.security.exception.JwtExpiredTokenExceptio
 import org.thingsboard.server.service.security.exception.UserPasswordExpiredException;
 import org.thingsboard.server.service.security.exception.UserPasswordNotValidException;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Optional;
 
 @Slf4j
+@Controller
 @RestControllerAdvice
-public class ThingsboardErrorResponseHandler extends ResponseEntityExceptionHandler implements AccessDeniedHandler {
+public class ThingsboardErrorResponseHandler extends ResponseEntityExceptionHandler implements AccessDeniedHandler, ErrorController {
 
     private static final Map<HttpStatus, ThingsboardErrorCode> statusToErrorCodeMap = new HashMap<>();
+
     static {
         statusToErrorCodeMap.put(HttpStatus.BAD_REQUEST, ThingsboardErrorCode.BAD_REQUEST_PARAMS);
         statusToErrorCodeMap.put(HttpStatus.UNAUTHORIZED, ThingsboardErrorCode.AUTHENTICATION);
@@ -67,7 +76,9 @@ public class ThingsboardErrorResponseHandler extends ResponseEntityExceptionHand
         statusToErrorCodeMap.put(HttpStatus.INTERNAL_SERVER_ERROR, ThingsboardErrorCode.GENERAL);
         statusToErrorCodeMap.put(HttpStatus.SERVICE_UNAVAILABLE, ThingsboardErrorCode.GENERAL);
     }
+
     private static final Map<ThingsboardErrorCode, HttpStatus> errorCodeToStatusMap = new HashMap<>();
+
     static {
         errorCodeToStatusMap.put(ThingsboardErrorCode.GENERAL, HttpStatus.INTERNAL_SERVER_ERROR);
         errorCodeToStatusMap.put(ThingsboardErrorCode.AUTHENTICATION, HttpStatus.UNAUTHORIZED);
@@ -90,6 +101,17 @@ public class ThingsboardErrorResponseHandler extends ResponseEntityExceptionHand
         return errorCodeToStatusMap.getOrDefault(errorCode, HttpStatus.INTERNAL_SERVER_ERROR);
     }
 
+    @RequestMapping("/error")
+    public ResponseEntity<Object> handleError(HttpServletRequest request) {
+        HttpStatus httpStatus = Optional.ofNullable(request.getAttribute(RequestDispatcher.ERROR_STATUS_CODE))
+                .map(status -> HttpStatus.resolve(Integer.parseInt(status.toString())))
+                .orElse(HttpStatus.INTERNAL_SERVER_ERROR);
+        String errorMessage = Optional.ofNullable(request.getAttribute(RequestDispatcher.ERROR_EXCEPTION))
+                .map(e -> (ExceptionUtils.getMessage((Throwable) e)))
+                .orElse(httpStatus.getReasonPhrase());
+        return new ResponseEntity<>(ThingsboardErrorResponse.of(errorMessage, statusToErrorCode(httpStatus), httpStatus), httpStatus);
+    }
+
     @Override
     @ExceptionHandler(AccessDeniedException.class)
     public void handle(HttpServletRequest request, HttpServletResponse response,
@@ -138,13 +160,13 @@ public class ThingsboardErrorResponseHandler extends ResponseEntityExceptionHand
     @Override
     protected ResponseEntity<Object> handleExceptionInternal(
             Exception ex, @Nullable Object body,
-            HttpHeaders headers, HttpStatus status,
+            HttpHeaders headers, HttpStatusCode statusCode,
             WebRequest request) {
-        if (HttpStatus.INTERNAL_SERVER_ERROR.equals(status)) {
+        if (HttpStatus.INTERNAL_SERVER_ERROR.equals(statusCode)) {
             request.setAttribute(WebUtils.ERROR_EXCEPTION_ATTRIBUTE, ex, WebRequest.SCOPE_REQUEST);
         }
-        ThingsboardErrorCode errorCode = statusToErrorCode(status);
-        return new ResponseEntity<>(ThingsboardErrorResponse.of(ex.getMessage(), errorCode, status), headers, status);
+        ThingsboardErrorCode errorCode = statusToErrorCode((HttpStatus) statusCode);
+        return new ResponseEntity<>(ThingsboardErrorResponse.of(ex.getMessage(), errorCode, (HttpStatus) statusCode), headers, statusCode);
     }
 
     private void handleThingsboardException(ThingsboardException thingsboardException, HttpServletResponse response) throws IOException {
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 44d81902a8..2eecd61798 100644
--- a/application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java
+++ b/application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java
@@ -110,7 +110,7 @@ public class ThingsboardInstallService {
                             log.info("Upgrading ThingsBoard from version 3.5.1 to 3.6.0 ...");
                             databaseEntitiesUpgradeService.upgradeDatabase("3.5.1");
                             dataUpdateService.updateData("3.5.1");
-                            systemDataLoaderService.updateDefaultNotificationConfigs();
+                            systemDataLoaderService.updateDefaultNotificationConfigs(true);
                         case "3.6.0":
                             log.info("Upgrading ThingsBoard from version 3.6.0 to 3.6.1 ...");
                             databaseEntitiesUpgradeService.upgradeDatabase("3.6.0");
@@ -126,7 +126,14 @@ public class ThingsboardInstallService {
                         case "3.6.2":
                             log.info("Upgrading ThingsBoard from version 3.6.2 to 3.6.3 ...");
                             databaseEntitiesUpgradeService.upgradeDatabase("3.6.2");
-                            systemDataLoaderService.updateDefaultNotificationConfigs();
+                            systemDataLoaderService.updateDefaultNotificationConfigs(true);
+                        case "3.6.3":
+                            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");
+                            systemDataLoaderService.updateDefaultNotificationConfigs(false);
                             //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/apiusage/DefaultTbApiUsageStateService.java b/application/src/main/java/org/thingsboard/server/service/apiusage/DefaultTbApiUsageStateService.java
index 6157ff4c40..aef3a4ddcf 100644
--- a/application/src/main/java/org/thingsboard/server/service/apiusage/DefaultTbApiUsageStateService.java
+++ b/application/src/main/java/org/thingsboard/server/service/apiusage/DefaultTbApiUsageStateService.java
@@ -25,7 +25,6 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.thingsboard.rule.engine.api.MailService;
-import org.thingsboard.server.cluster.TbClusterService;
 import org.thingsboard.server.common.data.ApiFeature;
 import org.thingsboard.server.common.data.ApiUsageRecordKey;
 import org.thingsboard.server.common.data.ApiUsageRecordState;
@@ -45,10 +44,11 @@ import org.thingsboard.server.common.data.kv.BasicTsKvEntry;
 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.notification.rule.trigger.ApiUsageLimitTrigger;
 import org.thingsboard.server.common.data.page.PageDataIterable;
 import org.thingsboard.server.common.data.tenant.profile.TenantProfileConfiguration;
 import org.thingsboard.server.common.data.tenant.profile.TenantProfileData;
-import org.thingsboard.server.common.data.notification.rule.trigger.ApiUsageLimitTrigger;
+import org.thingsboard.server.common.msg.notification.NotificationRuleProcessor;
 import org.thingsboard.server.common.msg.queue.ServiceType;
 import org.thingsboard.server.common.msg.queue.TbCallback;
 import org.thingsboard.server.common.msg.queue.TopicPartitionInfo;
@@ -61,15 +61,14 @@ import org.thingsboard.server.gen.transport.TransportProtos.ToUsageStatsServiceM
 import org.thingsboard.server.gen.transport.TransportProtos.UsageStatsKVProto;
 import org.thingsboard.server.queue.common.TbProtoQueueMsg;
 import org.thingsboard.server.queue.discovery.PartitionService;
-import org.thingsboard.server.common.msg.notification.NotificationRuleProcessor;
 import org.thingsboard.server.service.apiusage.BaseApiUsageState.StatsCalculationResult;
 import org.thingsboard.server.service.executors.DbCallbackExecutorService;
 import org.thingsboard.server.service.mail.MailExecutorService;
 import org.thingsboard.server.service.partition.AbstractPartitionBasedService;
 import org.thingsboard.server.service.telemetry.InternalTelemetryService;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -101,7 +100,6 @@ public class DefaultTbApiUsageStateService extends AbstractPartitionBasedService
         public void onFailure(Throwable t) {
         }
     };
-    private final TbClusterService clusterService;
     private final PartitionService partitionService;
     private final TenantService tenantService;
     private final TimeseriesService tsService;
@@ -343,7 +341,6 @@ public class DefaultTbApiUsageStateService extends AbstractPartitionBasedService
     private void persistAndNotify(BaseApiUsageState state, Map<ApiFeature, ApiUsageStateValue> result) {
         log.info("[{}] Detected update of the API state for {}: {}", state.getEntityId(), state.getEntityType(), result);
         apiUsageStateService.update(state.getApiUsageState());
-        clusterService.onApiStateChange(state.getApiUsageState(), null);
         long ts = System.currentTimeMillis();
         List<TsKvEntry> stateTelemetry = new ArrayList<>();
         result.forEach((apiFeature, aState) -> stateTelemetry.add(new BasicTsKvEntry(ts, new StringDataEntry(apiFeature.getApiStateKey(), aState.name()))));
diff --git a/application/src/main/java/org/thingsboard/server/service/component/AnnotationComponentDiscoveryService.java b/application/src/main/java/org/thingsboard/server/service/component/AnnotationComponentDiscoveryService.java
index 84da68385e..63ee2cb9eb 100644
--- a/application/src/main/java/org/thingsboard/server/service/component/AnnotationComponentDiscoveryService.java
+++ b/application/src/main/java/org/thingsboard/server/service/component/AnnotationComponentDiscoveryService.java
@@ -41,7 +41,7 @@ import org.thingsboard.server.common.data.plugin.ComponentType;
 import org.thingsboard.server.common.data.rule.RuleChainType;
 import org.thingsboard.server.dao.component.ComponentDescriptorService;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import java.lang.annotation.Annotation;
 import java.util.ArrayList;
 import java.util.Arrays;
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 092c9de721..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,9 +29,8 @@ 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.DataConstants;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.id.CustomerId;
@@ -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 javax.annotation.Nullable;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 
@@ -67,8 +65,6 @@ public class ClaimDevicesServiceImpl implements ClaimDevicesService {
     private static final String CLAIM_ATTRIBUTE_NAME = "claimingAllowed";
     private static final String CLAIM_DATA_ATTRIBUTE_NAME = "claimingData";
 
-    @Autowired
-    private TbClusterService clusterService;
     @Autowired
     private DeviceService deviceService;
     @Autowired
@@ -91,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(),
-                    DataConstants.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();
@@ -110,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());
         }
     }
@@ -123,7 +118,7 @@ public class ClaimDevicesServiceImpl implements ClaimDevicesService {
             return Futures.immediateFuture(new ClaimDataInfo(true, key, claimDataFromCache));
         } else {
             ListenableFuture<Optional<AttributeKvEntry>> claimDataAttrFuture = attributesService.find(device.getTenantId(), device.getId(),
-                    DataConstants.SERVER_SCOPE, CLAIM_DATA_ATTRIBUTE_NAME);
+                    AttributeScope.SERVER_SCOPE, CLAIM_DATA_ATTRIBUTE_NAME);
 
             return Futures.transform(claimDataAttrFuture, claimDataAttr -> {
                 if (claimDataAttr.isPresent()) {
@@ -153,7 +148,6 @@ public class ClaimDevicesServiceImpl implements ClaimDevicesService {
                     if (device.getCustomerId().getId().equals(ModelConstants.NULL_UUID)) {
                         device.setCustomerId(customerId);
                         Device savedDevice = deviceService.saveDevice(device);
-                        clusterService.onDeviceUpdated(savedDevice, device);
                         return Futures.transform(removeClaimingSavedData(cache, claimData, device), result -> new ClaimResult(savedDevice, ClaimResponse.SUCCESS), MoreExecutors.directExecutor());
                     }
                     return Futures.transform(removeClaimingSavedData(cache, claimData, device), result -> new ClaimResult(null, ClaimResponse.CLAIMED), MoreExecutors.directExecutor());
@@ -180,13 +174,12 @@ public class ClaimDevicesServiceImpl implements ClaimDevicesService {
             Customer unassignedCustomer = customerService.findCustomerById(tenantId, device.getCustomerId());
             device.setCustomerId(null);
             Device savedDevice = deviceService.saveDevice(device);
-            clusterService.onDeviceUpdated(savedDevice, device);
             if (isAllowedClaimingByDefault) {
                 return Futures.immediateFuture(new ReclaimResult(unassignedCustomer));
             }
             SettableFuture<ReclaimResult> result = SettableFuture.create();
             telemetryService.saveAndNotify(
-                    tenantId, savedDevice.getId(), DataConstants.SERVER_SCOPE, Collections.singletonList(
+                    tenantId, savedDevice.getId(), AttributeScope.SERVER_SCOPE, List.of(
                             new BaseAttributeKvEntry(new BooleanDataEntry(CLAIM_ATTRIBUTE_NAME, true), System.currentTimeMillis())
                     ),
                     new FutureCallback<>() {
@@ -207,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) {
@@ -229,7 +222,7 @@ public class ClaimDevicesServiceImpl implements ClaimDevicesService {
         }
         SettableFuture<Void> result = SettableFuture.create();
         telemetryService.deleteAndNotify(device.getTenantId(),
-                device.getId(), DataConstants.SERVER_SCOPE, Arrays.asList(CLAIM_ATTRIBUTE_NAME, CLAIM_DATA_ATTRIBUTE_NAME), new FutureCallback<>() {
+                device.getId(), AttributeScope.SERVER_SCOPE, Arrays.asList(CLAIM_ATTRIBUTE_NAME, CLAIM_DATA_ATTRIBUTE_NAME), new FutureCallback<>() {
                     @Override
                     public void onSuccess(@Nullable Void tmp) {
                         result.set(tmp);
diff --git a/application/src/main/java/org/thingsboard/server/service/device/DeviceBulkImportService.java b/application/src/main/java/org/thingsboard/server/service/device/DeviceBulkImportService.java
index 289d6b2058..0c3146a6c6 100644
--- a/application/src/main/java/org/thingsboard/server/service/device/DeviceBulkImportService.java
+++ b/application/src/main/java/org/thingsboard/server/service/device/DeviceBulkImportService.java
@@ -20,7 +20,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fasterxml.jackson.databind.node.TextNode;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.Device;
diff --git a/application/src/main/java/org/thingsboard/server/service/device/DeviceProvisionServiceImpl.java b/application/src/main/java/org/thingsboard/server/service/device/DeviceProvisionServiceImpl.java
index 1e7ea31d23..bedf9c7537 100644
--- a/application/src/main/java/org/thingsboard/server/service/device/DeviceProvisionServiceImpl.java
+++ b/application/src/main/java/org/thingsboard/server/service/device/DeviceProvisionServiceImpl.java
@@ -22,8 +22,7 @@ import com.google.common.util.concurrent.ListenableFuture;
 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.DataConstants;
+import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.DeviceProfileProvisionType;
@@ -81,7 +80,6 @@ public class DeviceProvisionServiceImpl implements DeviceProvisionService {
     private static final String DEVICE_PROVISION_STATE = "provisionState";
     private static final String PROVISIONED_STATE = "provisioned";
 
-    private final TbClusterService clusterService;
     private final DeviceProfileService deviceProfileService;
     private final DeviceService deviceService;
     private final DeviceCredentialsService deviceCredentialsService;
@@ -89,9 +87,8 @@ public class DeviceProvisionServiceImpl implements DeviceProvisionService {
     private final AuditLogService auditLogService;
     private final PartitionService partitionService;
 
-    public DeviceProvisionServiceImpl(TbQueueProducerProvider producerProvider, TbClusterService clusterService, DeviceProfileService deviceProfileService, DeviceService deviceService, DeviceCredentialsService deviceCredentialsService, AttributesService attributesService, AuditLogService auditLogService, PartitionService partitionService) {
+    public DeviceProvisionServiceImpl(TbQueueProducerProvider producerProvider, DeviceProfileService deviceProfileService, DeviceService deviceService, DeviceCredentialsService deviceCredentialsService, AttributesService attributesService, AuditLogService auditLogService, PartitionService partitionService) {
         ruleEngineMsgProducer = producerProvider.getRuleEngineMsgProducer();
-        this.clusterService = clusterService;
         this.deviceProfileService = deviceProfileService;
         this.deviceService = deviceService;
         this.deviceCredentialsService = deviceCredentialsService;
@@ -189,7 +186,7 @@ public class DeviceProvisionServiceImpl implements DeviceProvisionService {
     private ProvisionResponse processProvision(Device device, ProvisionRequest provisionRequest) {
         try {
             Optional<AttributeKvEntry> provisionState = attributesService.find(device.getTenantId(), device.getId(),
-                    DataConstants.SERVER_SCOPE, DEVICE_PROVISION_STATE).get();
+                    AttributeScope.SERVER_SCOPE, DEVICE_PROVISION_STATE).get();
             if (provisionState != null && provisionState.isPresent() && !provisionState.get().getValueAsString().equals(PROVISIONED_STATE)) {
                 notify(device, provisionRequest, TbMsgType.PROVISION_FAILURE, false);
                 throw new ProvisionFailedException(ProvisionResponseStatus.FAILURE.name());
@@ -220,7 +217,6 @@ public class DeviceProvisionServiceImpl implements DeviceProvisionService {
                 provisionRequest.setDeviceName(newDeviceName);
             }
             Device savedDevice = deviceService.saveDevice(provisionRequest, profile);
-            clusterService.onDeviceUpdated(savedDevice, null);
             saveProvisionStateAttribute(savedDevice).get();
             pushDeviceCreatedEventToRuleEngine(savedDevice);
             notify(savedDevice, provisionRequest, TbMsgType.PROVISION_SUCCESS, true);
@@ -245,7 +241,7 @@ public class DeviceProvisionServiceImpl implements DeviceProvisionService {
     }
 
     private ListenableFuture<List<String>> saveProvisionStateAttribute(Device device) {
-        return attributesService.save(device.getTenantId(), device.getId(), DataConstants.SERVER_SCOPE,
+        return attributesService.save(device.getTenantId(), device.getId(), AttributeScope.SERVER_SCOPE,
                 Collections.singletonList(new BaseAttributeKvEntry(new StringDataEntry(DEVICE_PROVISION_STATE, PROVISIONED_STATE),
                         System.currentTimeMillis())));
     }
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 03fb982d6d..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 javax.annotation.PostConstruct;
-import javax.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 2f157af70e..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
@@ -19,6 +19,7 @@ import lombok.Data;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
+import org.thingsboard.server.cache.limits.RateLimitService;
 import org.thingsboard.server.cluster.TbClusterService;
 import org.thingsboard.server.common.msg.notification.NotificationRuleProcessor;
 import org.thingsboard.server.dao.asset.AssetProfileService;
@@ -31,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;
@@ -60,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;
@@ -150,6 +157,21 @@ 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;
+
     @Autowired
     private NotificationRuleProcessor notificationRuleProcessor;
 
@@ -216,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 260707cf68..651339e3a4 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
@@ -24,13 +24,17 @@ import org.springframework.transaction.event.TransactionalEventListener;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.cluster.TbClusterService;
 import org.thingsboard.server.common.data.EdgeUtils;
+import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.OtaPackageInfo;
 import org.thingsboard.server.common.data.User;
 import org.thingsboard.server.common.data.alarm.Alarm;
 import org.thingsboard.server.common.data.alarm.AlarmApiCallResult;
 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.id.TenantId;
+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;
@@ -41,6 +45,7 @@ import org.thingsboard.server.dao.eventsourcing.ActionEntityEvent;
 import org.thingsboard.server.dao.eventsourcing.DeleteEntityEvent;
 import org.thingsboard.server.dao.eventsourcing.RelationActionEvent;
 import org.thingsboard.server.dao.eventsourcing.SaveEntityEvent;
+import org.thingsboard.server.dao.tenant.TenantService;
 import org.thingsboard.server.dao.user.UserServiceImpl;
 
 import javax.annotation.PostConstruct;
@@ -66,6 +71,7 @@ public class EdgeEventSourcingListener {
 
     private final TbClusterService tbClusterService;
     private final EdgeSynchronizationManager edgeSynchronizationManager;
+    private final TenantService tenantService;
 
     @PostConstruct
     public void init() {
@@ -75,7 +81,7 @@ public class EdgeEventSourcingListener {
     @TransactionalEventListener(fallbackExecution = true)
     public void handleEvent(SaveEntityEvent<?> event) {
         try {
-            if (!isValidSaveEntityEventForEdgeProcessing(event.getEntity(), event.getOldEntity())) {
+            if (!isValidSaveEntityEventForEdgeProcessing(event)) {
                 return;
             }
             log.trace("[{}] SaveEntityEvent called: {}", event.getTenantId(), event);
@@ -92,15 +98,24 @@ public class EdgeEventSourcingListener {
 
     @TransactionalEventListener(fallbackExecution = true)
     public void handleEvent(DeleteEntityEvent<?> event) {
+        TenantId tenantId = event.getTenantId();
+        EntityType entityType = event.getEntityId().getEntityType();
+        if (!tenantId.isSysTenantId() && !tenantService.tenantExists(tenantId)) {
+            log.debug("[{}] Ignoring DeleteEntityEvent because tenant does not exist: {}", tenantId, event);
+            return;
+        }
         try {
-            log.trace("[{}] DeleteEntityEvent called: {}", event.getTenantId(), event);
+            if (EntityType.EDGE.equals(entityType) || EntityType.TENANT.equals(entityType)) {
+                return;
+            }
+            log.trace("[{}] DeleteEntityEvent called: {}", tenantId, event);
             EdgeEventType type = getEdgeEventTypeForEntityEvent(event.getEntity());
             EdgeEventActionType actionType = getEdgeEventActionTypeForEntityEvent(event.getEntity());
-            tbClusterService.sendNotificationMsgToEdge(event.getTenantId(), null, event.getEntityId(),
+            tbClusterService.sendNotificationMsgToEdge(tenantId, null, event.getEntityId(),
                     JacksonUtil.toString(event.getEntity()), type, actionType,
                     edgeSynchronizationManager.getEdgeId().get());
         } catch (Exception e) {
-            log.error("[{}] failed to process DeleteEntityEvent: {}", event.getTenantId(), event, e);
+            log.error("[{}] failed to process DeleteEntityEvent: {}", tenantId, event, e);
         }
     }
 
@@ -114,7 +129,11 @@ public class EdgeEventSourcingListener {
     }
 
     @TransactionalEventListener(fallbackExecution = true)
-    public void handleEvent(ActionEntityEvent event) {
+    public void handleEvent(ActionEntityEvent<?> event) {
+        if (EntityType.DEVICE.equals(event.getEntityId().getEntityType())
+                && ActionType.ASSIGNED_TO_TENANT.equals(event.getActionType())) {
+            return;
+        }
         try {
             log.trace("[{}] ActionEntityEvent called: {}", event.getTenantId(), event);
             tbClusterService.sendNotificationMsgToEdge(event.getTenantId(), event.getEdgeId(), event.getEntityId(),
@@ -146,26 +165,44 @@ public class EdgeEventSourcingListener {
         }
     }
 
-    private boolean isValidSaveEntityEventForEdgeProcessing(Object entity, Object oldEntity) {
-        if (entity instanceof OtaPackageInfo) {
-            OtaPackageInfo otaPackageInfo = (OtaPackageInfo) entity;
-            return otaPackageInfo.hasUrl() || otaPackageInfo.isHasData();
-        } else if (entity instanceof RuleChain) {
-            RuleChain ruleChain = (RuleChain) entity;
-            return RuleChainType.EDGE.equals(ruleChain.getType());
-        } else if (entity instanceof User) {
-            User user = (User) entity;
-            if (Authority.SYS_ADMIN.equals(user.getAuthority())) {
-                return false;
-            }
-            if (oldEntity != null) {
-                User oldUser = (User) oldEntity;
-                cleanUpUserAdditionalInfo(oldUser);
-                cleanUpUserAdditionalInfo(user);
-                return !user.equals(oldUser);
+    private boolean isValidSaveEntityEventForEdgeProcessing(SaveEntityEvent<?> event) {
+        Object entity = event.getEntity();
+        Object oldEntity = event.getOldEntity();
+        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);
+                        }
+                    }
+                    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 TENANT:
+                    return !event.getCreated();
+                case API_USAGE_STATE, EDGE:
+                    return false;
             }
-        } else if (entity instanceof AlarmApiCallResult || entity instanceof Alarm) {
-            return false;
         }
         // Default: If the entity doesn't match any of the conditions, consider it as valid.
         return true;
@@ -176,8 +213,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()) {
@@ -191,6 +227,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;
     }
@@ -198,6 +236,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;
     }
@@ -208,4 +248,5 @@ public class EdgeEventSourcingListener {
         }
         return isCreated ? EdgeEventActionType.ADDED : EdgeEventActionType.UPDATED;
     }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/instructions/DefaultEdgeInstallInstructionsService.java b/application/src/main/java/org/thingsboard/server/service/edge/instructions/DefaultEdgeInstallInstructionsService.java
index fa53052703..fd0d9fc2dd 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/instructions/DefaultEdgeInstallInstructionsService.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/instructions/DefaultEdgeInstallInstructionsService.java
@@ -27,7 +27,7 @@ import org.thingsboard.server.dao.util.DeviceConnectivityUtil;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.install.InstallScripts;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/instructions/DefaultEdgeUpgradeInstructionsService.java b/application/src/main/java/org/thingsboard/server/service/edge/instructions/DefaultEdgeUpgradeInstructionsService.java
index 55b03b3609..3ff8ae784a 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/instructions/DefaultEdgeUpgradeInstructionsService.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/instructions/DefaultEdgeUpgradeInstructionsService.java
@@ -21,6 +21,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Service;
+import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.EdgeUpgradeInfo;
 import org.thingsboard.server.common.data.edge.EdgeInstructions;
@@ -83,7 +84,7 @@ public class DefaultEdgeUpgradeInstructionsService implements EdgeUpgradeInstruc
 
     @Override
     public boolean isUpgradeAvailable(TenantId tenantId, EdgeId edgeId) throws Exception {
-        Optional<AttributeKvEntry> attributeKvEntryOpt = attributesService.find(tenantId, edgeId, DataConstants.SERVER_SCOPE, DataConstants.EDGE_VERSION_ATTR_KEY).get();
+        Optional<AttributeKvEntry> attributeKvEntryOpt = attributesService.find(tenantId, edgeId, AttributeScope.SERVER_SCOPE, DataConstants.EDGE_VERSION_ATTR_KEY).get();
         if (attributeKvEntryOpt.isPresent()) {
             String edgeVersionFormatted = convertEdgeVersionToDocsFormat(attributeKvEntryOpt.get().getValueAsString());
             return isVersionGreaterOrEqualsThan(edgeVersionFormatted, "3.6.0") && !isVersionGreaterOrEqualsThan(edgeVersionFormatted, appVersion);
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/instructions/EdgeInstallInstructionsService.java b/application/src/main/java/org/thingsboard/server/service/edge/instructions/EdgeInstallInstructionsService.java
index c9bf773d68..15b2383f21 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/instructions/EdgeInstallInstructionsService.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/instructions/EdgeInstallInstructionsService.java
@@ -18,7 +18,7 @@ package org.thingsboard.server.service.edge.instructions;
 import org.thingsboard.server.common.data.edge.Edge;
 import org.thingsboard.server.common.data.edge.EdgeInstructions;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 public interface EdgeInstallInstructionsService {
 
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcService.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcService.java
index 026ca51e8d..c5334f382b 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcService.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcService.java
@@ -29,6 +29,7 @@ import org.springframework.stereotype.Service;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.common.util.ThingsBoardThreadFactory;
 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.ResourceUtils;
 import org.thingsboard.server.common.data.edge.Edge;
@@ -54,9 +55,9 @@ import org.thingsboard.server.service.edge.EdgeContextComponent;
 import org.thingsboard.server.service.state.DefaultDeviceStateService;
 import org.thingsboard.server.service.telemetry.TelemetrySubscriptionService;
 
-import javax.annotation.Nullable;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.Nullable;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Collections;
@@ -415,7 +416,7 @@ public class EdgeGrpcService extends EdgeRpcServiceGrpc.EdgeRpcServiceImplBase i
                     Collections.singletonList(new BasicTsKvEntry(System.currentTimeMillis(), new LongDataEntry(key, value))),
                     new AttributeSaveCallback(tenantId, edgeId, key, value));
         } else {
-            tsSubService.saveAttrAndNotify(tenantId, edgeId, DataConstants.SERVER_SCOPE, key, value, new AttributeSaveCallback(tenantId, edgeId, key, value));
+            tsSubService.saveAttrAndNotify(tenantId, edgeId, AttributeScope.SERVER_SCOPE, key, value, new AttributeSaveCallback(tenantId, edgeId, key, value));
         }
     }
 
@@ -427,7 +428,7 @@ public class EdgeGrpcService extends EdgeRpcServiceGrpc.EdgeRpcServiceImplBase i
                     Collections.singletonList(new BasicTsKvEntry(System.currentTimeMillis(), new BooleanDataEntry(key, value))),
                     new AttributeSaveCallback(tenantId, edgeId, key, value));
         } else {
-            tsSubService.saveAttrAndNotify(tenantId, edgeId, DataConstants.SERVER_SCOPE, key, value, new AttributeSaveCallback(tenantId, edgeId, key, value));
+            tsSubService.saveAttrAndNotify(tenantId, edgeId, AttributeScope.SERVER_SCOPE, key, value, new AttributeSaveCallback(tenantId, edgeId, key, value));
         }
     }
 
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 4924827e35..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
@@ -25,6 +25,7 @@ import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.springframework.data.util.Pair;
+import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.EdgeUtils;
 import org.thingsboard.server.common.data.edge.Edge;
@@ -35,6 +36,7 @@ import org.thingsboard.server.common.data.kv.AttributeKvEntry;
 import org.thingsboard.server.common.data.kv.BaseAttributeKvEntry;
 import org.thingsboard.server.common.data.kv.LongDataEntry;
 import org.thingsboard.server.common.data.kv.StringDataEntry;
+import org.thingsboard.server.common.data.limit.LimitedApi;
 import org.thingsboard.server.common.data.notification.rule.trigger.EdgeCommunicationFailureTrigger;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
@@ -109,6 +111,7 @@ public final class EdgeGrpcSession implements Closeable {
 
     private static final String QUEUE_START_TS_ATTR_KEY = "queueStartTs";
     private static final String QUEUE_START_SEQ_ID_ATTR_KEY = "queueStartSeqId";
+    private static final String RATE_LIMIT_REACHED = "Rate limit reached";
 
     private final UUID sessionId;
     private final BiConsumer<EdgeId, EdgeGrpcSession> sessionOpenListener;
@@ -264,36 +267,51 @@ public final class EdgeGrpcSession implements Closeable {
     }
 
     private void onUplinkMsg(UplinkMsg uplinkMsg) {
+        if (isRateLimitViolated(uplinkMsg)) {
+            return;
+        }
         ListenableFuture<List<Void>> future = processUplinkMsg(uplinkMsg);
         Futures.addCallback(future, new FutureCallback<>() {
             @Override
             public void onSuccess(@Nullable List<Void> result) {
-                UplinkResponseMsg uplinkResponseMsg = UplinkResponseMsg.newBuilder()
-                        .setUplinkMsgId(uplinkMsg.getUplinkMsgId())
-                        .setSuccess(true).build();
-                sendDownlinkMsg(ResponseMsg.newBuilder()
-                        .setUplinkResponseMsg(uplinkResponseMsg)
-                        .build());
+                sendResponseMessage(uplinkMsg.getUplinkMsgId(), true, null);
             }
 
             @Override
             public void onFailure(Throwable t) {
                 String errorMsg = EdgeUtils.createErrorMsgFromRootCauseAndStackTrace(t);
-                UplinkResponseMsg uplinkResponseMsg = UplinkResponseMsg.newBuilder()
-                        .setUplinkMsgId(uplinkMsg.getUplinkMsgId())
-                        .setSuccess(false).setErrorMsg(errorMsg).build();
-                sendDownlinkMsg(ResponseMsg.newBuilder()
-                        .setUplinkResponseMsg(uplinkResponseMsg)
-                        .build());
+                sendResponseMessage(uplinkMsg.getUplinkMsgId(), false, errorMsg);
             }
         }, ctx.getGrpcCallbackExecutorService());
     }
 
+    private boolean isRateLimitViolated(UplinkMsg uplinkMsg) {
+        if (!ctx.getRateLimitService().checkRateLimit(LimitedApi.EDGE_UPLINK_MESSAGES, tenantId) ||
+                !ctx.getRateLimitService().checkRateLimit(LimitedApi.EDGE_UPLINK_MESSAGES_PER_EDGE, tenantId, edge.getId())) {
+            String errorMsg = String.format("Failed to process uplink message. %s", RATE_LIMIT_REACHED);
+            sendResponseMessage(uplinkMsg.getUplinkMsgId(), false, errorMsg);
+            return true;
+        }
+        return false;
+    }
+
+    private void sendResponseMessage(int uplinkMsgId, boolean success, String errorMsg) {
+        UplinkResponseMsg.Builder responseBuilder = UplinkResponseMsg.newBuilder()
+                .setUplinkMsgId(uplinkMsgId)
+                .setSuccess(success);
+        if (errorMsg != null) {
+            responseBuilder.setErrorMsg(errorMsg);
+        }
+        sendDownlinkMsg(ResponseMsg.newBuilder()
+                .setUplinkResponseMsg(responseBuilder.build())
+                .build());
+    }
+
     private void onDownlinkResponse(DownlinkResponseMsg msg) {
         try {
             if (msg.getSuccess()) {
                 sessionState.getPendingMsgsMap().remove(msg.getDownlinkMsgId());
-                log.debug("[{}][{}] Msg has been processed successfully!Msg Id: [{}], Msg: {}", this.tenantId, edge.getRoutingKey(), msg.getDownlinkMsgId(), msg);
+                log.debug("[{}][{}] Msg has been processed successfully! Msg Id: [{}], Msg: {}", this.tenantId, edge.getRoutingKey(), msg.getDownlinkMsgId(), msg);
             } else {
                 log.error("[{}][{}] Msg processing failed! Msg Id: [{}], Error msg: {}", this.tenantId, edge.getRoutingKey(), msg.getDownlinkMsgId(), msg.getErrorMsg());
             }
@@ -480,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)
@@ -533,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);
@@ -575,7 +571,7 @@ public final class EdgeGrpcSession implements Closeable {
 
     private ListenableFuture<Pair<Long, Long>> getQueueStartTsAndSeqId() {
         ListenableFuture<List<AttributeKvEntry>> future =
-                ctx.getAttributesService().find(edge.getTenantId(), edge.getId(), DataConstants.SERVER_SCOPE, Arrays.asList(QUEUE_START_TS_ATTR_KEY, QUEUE_START_SEQ_ID_ATTR_KEY));
+                ctx.getAttributesService().find(edge.getTenantId(), edge.getId(), AttributeScope.SERVER_SCOPE, Arrays.asList(QUEUE_START_TS_ATTR_KEY, QUEUE_START_SEQ_ID_ATTR_KEY));
         return Futures.transform(future, attributeKvEntries -> {
             long startTs = 0L;
             long startSeqId = 0L;
@@ -637,7 +633,7 @@ public final class EdgeGrpcSession implements Closeable {
         List<AttributeKvEntry> attributes = Arrays.asList(
                 new BaseAttributeKvEntry(new LongDataEntry(QUEUE_START_TS_ATTR_KEY, this.newStartTs), System.currentTimeMillis()),
                 new BaseAttributeKvEntry(new LongDataEntry(QUEUE_START_SEQ_ID_ATTR_KEY, this.newStartSeqId), System.currentTimeMillis()));
-        return ctx.getAttributesService().save(edge.getTenantId(), edge.getId(), DataConstants.SERVER_SCOPE, attributes);
+        return ctx.getAttributesService().save(edge.getTenantId(), edge.getId(), AttributeScope.SERVER_SCOPE, attributes);
     }
 
     private DownlinkMsg convertEntityEventToDownlink(EdgeEvent edgeEvent) {
@@ -687,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;
@@ -837,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()
@@ -863,7 +867,7 @@ public final class EdgeGrpcSession implements Closeable {
 
     private void processSaveEdgeVersionAsAttribute(String edgeVersion) {
         AttributeKvEntry attributeKvEntry = new BaseAttributeKvEntry(new StringDataEntry(DataConstants.EDGE_VERSION_ATTR_KEY, edgeVersion), System.currentTimeMillis());
-        ctx.getAttributesService().save(this.tenantId, this.edge.getId(), DataConstants.SERVER_SCOPE, attributeKvEntry);
+        ctx.getAttributesService().save(this.tenantId, this.edge.getId(), AttributeScope.SERVER_SCOPE, attributeKvEntry);
     }
 
     @Override
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/asset/AssetMsgConstructorV1.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/asset/AssetMsgConstructorV1.java
index acdd3f506a..524edbb5a5 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/asset/AssetMsgConstructorV1.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/asset/AssetMsgConstructorV1.java
@@ -63,6 +63,7 @@ public class AssetMsgConstructorV1 extends BaseAssetMsgConstructor {
 
     @Override
     public AssetProfileUpdateMsg constructAssetProfileUpdatedMsg(UpdateMsgType msgType, AssetProfile assetProfile) {
+        assetProfile = JacksonUtil.clone(assetProfile);
         imageService.inlineImageForEdge(assetProfile);
         AssetProfileUpdateMsg.Builder builder = AssetProfileUpdateMsg.newBuilder()
                 .setMsgType(msgType)
@@ -89,4 +90,5 @@ public class AssetMsgConstructorV1 extends BaseAssetMsgConstructor {
         }
         return builder.build();
     }
+
 }
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/DashboardMsgConstructorV1.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/dashboard/DashboardMsgConstructorV1.java
index 3df0d6563f..ec2d216a03 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/dashboard/DashboardMsgConstructorV1.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/dashboard/DashboardMsgConstructorV1.java
@@ -33,6 +33,7 @@ public class DashboardMsgConstructorV1 extends BaseDashboardMsgConstructor {
 
     @Override
     public DashboardUpdateMsg constructDashboardUpdatedMsg(UpdateMsgType msgType, Dashboard dashboard) {
+        dashboard = JacksonUtil.clone(dashboard);
         imageService.inlineImagesForEdge(dashboard);
         DashboardUpdateMsg.Builder builder = DashboardUpdateMsg.newBuilder()
                 .setMsgType(msgType)
@@ -52,4 +53,5 @@ public class DashboardMsgConstructorV1 extends BaseDashboardMsgConstructor {
         }
         return builder.build();
     }
+
 }
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/DeviceMsgConstructorV1.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/device/DeviceMsgConstructorV1.java
index 35c07abc5a..7b59bab3ba 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/device/DeviceMsgConstructorV1.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/device/DeviceMsgConstructorV1.java
@@ -27,7 +27,6 @@ import org.thingsboard.server.gen.edge.v1.DeviceCredentialsUpdateMsg;
 import org.thingsboard.server.gen.edge.v1.DeviceProfileUpdateMsg;
 import org.thingsboard.server.gen.edge.v1.DeviceUpdateMsg;
 import org.thingsboard.server.gen.edge.v1.UpdateMsgType;
-import org.thingsboard.server.queue.util.DataDecodingEncodingService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 
 import java.nio.charset.StandardCharsets;
@@ -36,9 +35,6 @@ import java.nio.charset.StandardCharsets;
 @TbCoreComponent
 public class DeviceMsgConstructorV1 extends BaseDeviceMsgConstructor {
 
-    @Autowired
-    private DataDecodingEncodingService dataDecodingEncodingService;
-
     @Autowired
     private ImageService imageService;
 
@@ -73,7 +69,7 @@ public class DeviceMsgConstructorV1 extends BaseDeviceMsgConstructor {
                     .setSoftwareIdLSB(device.getSoftwareId().getId().getLeastSignificantBits());
         }
         if (device.getDeviceData() != null) {
-            builder.setDeviceDataBytes(ByteString.copyFrom(dataDecodingEncodingService.encode(device.getDeviceData())));
+            builder.setDeviceDataBytes(ByteString.copyFrom(device.getDeviceDataBytes()));
         }
         return builder.build();
     }
@@ -95,6 +91,7 @@ public class DeviceMsgConstructorV1 extends BaseDeviceMsgConstructor {
 
     @Override
     public DeviceProfileUpdateMsg constructDeviceProfileUpdatedMsg(UpdateMsgType msgType, DeviceProfile deviceProfile) {
+        deviceProfile = JacksonUtil.clone(deviceProfile);
         imageService.inlineImageForEdge(deviceProfile);
         DeviceProfileUpdateMsg.Builder builder = DeviceProfileUpdateMsg.newBuilder()
                 .setMsgType(msgType)
@@ -103,7 +100,7 @@ public class DeviceMsgConstructorV1 extends BaseDeviceMsgConstructor {
                 .setName(deviceProfile.getName())
                 .setDefault(deviceProfile.isDefault())
                 .setType(deviceProfile.getType().name())
-                .setProfileDataBytes(ByteString.copyFrom(dataDecodingEncodingService.encode(deviceProfile.getProfileData())));
+                .setProfileDataBytes(ByteString.copyFrom(deviceProfile.getProfileDataBytes()));
         if (deviceProfile.getDefaultQueueName() != null) {
             builder.setDefaultQueueName(deviceProfile.getDefaultQueueName());
         }
@@ -140,4 +137,5 @@ public class DeviceMsgConstructorV1 extends BaseDeviceMsgConstructor {
         }
         return builder.build();
     }
+
 }
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 6b72e49df6..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
@@ -16,7 +16,6 @@
 package org.thingsboard.server.service.edge.rpc.constructor.tenant;
 
 import com.google.protobuf.ByteString;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.Tenant;
@@ -25,7 +24,6 @@ import org.thingsboard.server.gen.edge.v1.EdgeVersion;
 import org.thingsboard.server.gen.edge.v1.TenantProfileUpdateMsg;
 import org.thingsboard.server.gen.edge.v1.TenantUpdateMsg;
 import org.thingsboard.server.gen.edge.v1.UpdateMsgType;
-import org.thingsboard.server.queue.util.DataDecodingEncodingService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.edge.rpc.utils.EdgeVersionUtils;
 
@@ -33,9 +31,6 @@ import org.thingsboard.server.service.edge.rpc.utils.EdgeVersionUtils;
 @TbCoreComponent
 public class TenantMsgConstructorV1 implements TenantMsgConstructor {
 
-    @Autowired
-    private DataDecodingEncodingService dataDecodingEncodingService;
-
     @Override
     public TenantUpdateMsg constructTenantUpdateMsg(UpdateMsgType msgType, Tenant tenant) {
         TenantUpdateMsg.Builder builder = TenantUpdateMsg.newBuilder()
@@ -78,8 +73,26 @@ 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(dataDecodingEncodingService.encode(tenantProfile.getProfileData()));
+                ByteString.empty() : ByteString.copyFrom(tenantProfile.getProfileDataBytes());
         TenantProfileUpdateMsg.Builder builder = TenantProfileUpdateMsg.newBuilder()
                 .setMsgType(msgType)
                 .setIdMSB(tenantProfile.getId().getId().getMostSignificantBits())
@@ -93,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/constructor/widget/WidgetMsgConstructorV1.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/widget/WidgetMsgConstructorV1.java
index 92fdb32fee..0201f6276b 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/widget/WidgetMsgConstructorV1.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/widget/WidgetMsgConstructorV1.java
@@ -43,6 +43,7 @@ public class WidgetMsgConstructorV1 extends BaseWidgetMsgConstructor {
 
     @Override
     public WidgetsBundleUpdateMsg constructWidgetsBundleUpdateMsg(UpdateMsgType msgType, WidgetsBundle widgetsBundle, List<String> widgets) {
+        widgetsBundle = JacksonUtil.clone(widgetsBundle);
         imageService.inlineImageForEdge(widgetsBundle);
         WidgetsBundleUpdateMsg.Builder builder = WidgetsBundleUpdateMsg.newBuilder()
                 .setMsgType(msgType)
@@ -68,6 +69,7 @@ public class WidgetMsgConstructorV1 extends BaseWidgetMsgConstructor {
 
     @Override
     public WidgetTypeUpdateMsg constructWidgetTypeUpdateMsg(UpdateMsgType msgType, WidgetTypeDetails widgetTypeDetails, EdgeVersion edgeVersion) {
+        widgetTypeDetails = JacksonUtil.clone(widgetTypeDetails);
         imageService.inlineImagesForEdge(widgetTypeDetails);
         WidgetTypeUpdateMsg.Builder builder = WidgetTypeUpdateMsg.newBuilder()
                 .setMsgType(msgType)
@@ -109,4 +111,5 @@ public class WidgetMsgConstructorV1 extends BaseWidgetMsgConstructor {
         }
         return builder.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 db442f76b2..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
@@ -23,8 +23,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 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;
@@ -50,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;
@@ -74,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;
@@ -99,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;
@@ -112,7 +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.TbNotificationEntityService;
+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;
@@ -139,7 +144,7 @@ public abstract class BaseEdgeProcessor {
     protected TelemetrySubscriptionService tsSubService;
 
     @Autowired
-    protected TbNotificationEntityService notificationEntityService;
+    protected TbLogEntityActionService logEntityActionService;
 
     @Autowired
     protected RuleChainService ruleChainService;
@@ -225,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;
@@ -256,6 +273,13 @@ public abstract class BaseEdgeProcessor {
     @Autowired
     protected EntityDataMsgConstructor entityDataMsgConstructor;
 
+    @Autowired
+    protected NotificationMsgConstructor notificationMsgConstructor;
+
+    @Autowired
+    protected OAuth2MsgConstructor oAuth2MsgConstructor;
+
+
     @Autowired
     protected RuleChainMsgConstructorFactory ruleChainMsgConstructorFactory;
 
@@ -323,7 +347,7 @@ public abstract class BaseEdgeProcessor {
                                                    EntityId entityId,
                                                    JsonNode body) {
         ListenableFuture<Optional<AttributeKvEntry>> future =
-                attributesService.find(tenantId, edgeId, DataConstants.SERVER_SCOPE, DefaultDeviceStateService.ACTIVITY_STATE);
+                attributesService.find(tenantId, edgeId, AttributeScope.SERVER_SCOPE, DefaultDeviceStateService.ACTIVITY_STATE);
         return Futures.transformAsync(future, activeOpt -> {
             if (activeOpt.isEmpty()) {
                 log.trace("Edge is not activated. Skipping event. tenantId [{}], edgeId [{}], type[{}], " +
@@ -348,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) {
@@ -386,26 +391,18 @@ public abstract class BaseEdgeProcessor {
 
         EdgeEvent edgeEvent = EdgeUtils.constructEdgeEvent(tenantId, edgeId, type, action, entityId, body);
 
-        return Futures.transform(edgeEventService.saveAsync(edgeEvent), unused -> {
-            tbClusterService.onEdgeEventUpdate(tenantId, edgeId);
-            return null;
-        }, dbCallbackExecutorService);
+        return edgeEventService.saveAsync(edgeEvent);
     }
 
     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);
         }
@@ -418,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;
     }
 
@@ -444,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) {
@@ -541,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) {
@@ -625,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) {
@@ -683,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;
     }
@@ -728,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/asset/profile/BaseAssetProfileProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/asset/profile/BaseAssetProfileProcessor.java
index 1b96ec09bd..3a4dbc86ed 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/asset/profile/BaseAssetProfileProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/asset/profile/BaseAssetProfileProcessor.java
@@ -66,7 +66,7 @@ public abstract class BaseAssetProfileProcessor extends BaseEdgeProcessor {
             if (created) {
                 assetProfile.setId(assetProfileId);
             }
-            assetProfileService.saveAssetProfile(assetProfile, false);
+            assetProfileService.saveAssetProfile(assetProfile, false, true);
         } catch (Exception e) {
             log.error("[{}] Failed to process asset profile update msg [{}]", tenantId, assetProfileUpdateMsg, e);
             throw e;
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/DeviceEdgeProcessorV1.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/device/DeviceEdgeProcessorV1.java
index 79ab080379..6756c6c2f8 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/device/DeviceEdgeProcessorV1.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/device/DeviceEdgeProcessorV1.java
@@ -16,11 +16,9 @@
 package org.thingsboard.server.service.edge.rpc.processor.device;
 
 import com.datastax.oss.driver.api.core.uuid.Uuids;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.Device;
-import org.thingsboard.server.common.data.device.data.DeviceData;
 import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
@@ -30,19 +28,14 @@ import org.thingsboard.server.common.data.security.DeviceCredentials;
 import org.thingsboard.server.common.data.security.DeviceCredentialsType;
 import org.thingsboard.server.gen.edge.v1.DeviceCredentialsUpdateMsg;
 import org.thingsboard.server.gen.edge.v1.DeviceUpdateMsg;
-import org.thingsboard.server.queue.util.DataDecodingEncodingService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 
-import java.util.Optional;
 import java.util.UUID;
 
 @Component
 @TbCoreComponent
 public class DeviceEdgeProcessorV1 extends DeviceEdgeProcessor {
 
-    @Autowired
-    private DataDecodingEncodingService dataDecodingEncodingService;
-
     @Override
     protected Device constructDeviceFromUpdateMsg(TenantId tenantId, DeviceId deviceId, DeviceUpdateMsg deviceUpdateMsg) {
         Device device = new Device();
@@ -57,8 +50,7 @@ public class DeviceEdgeProcessorV1 extends DeviceEdgeProcessor {
         UUID deviceProfileUUID = safeGetUUID(deviceUpdateMsg.getDeviceProfileIdMSB(), deviceUpdateMsg.getDeviceProfileIdLSB());
         device.setDeviceProfileId(deviceProfileUUID != null ? new DeviceProfileId(deviceProfileUUID) : null);
 
-        Optional<DeviceData> deviceDataOpt = dataDecodingEncodingService.decode(deviceUpdateMsg.getDeviceDataBytes().toByteArray());
-        device.setDeviceData(deviceDataOpt.orElse(null));
+        device.setDeviceDataBytes(deviceUpdateMsg.getDeviceDataBytes().toByteArray());
 
         UUID firmwareUUID = safeGetUUID(deviceUpdateMsg.getFirmwareIdMSB(), deviceUpdateMsg.getFirmwareIdLSB());
         device.setFirmwareId(firmwareUUID != null ? new OtaPackageId(firmwareUUID) : null);
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/device/profile/BaseDeviceProfileProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/device/profile/BaseDeviceProfileProcessor.java
index faec873a21..5f84e40dee 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/device/profile/BaseDeviceProfileProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/device/profile/BaseDeviceProfileProcessor.java
@@ -66,7 +66,7 @@ public abstract class BaseDeviceProfileProcessor extends BaseEdgeProcessor {
             if (created) {
                 deviceProfile.setId(deviceProfileId);
             }
-            deviceProfileService.saveDeviceProfile(deviceProfile, false);
+            deviceProfileService.saveDeviceProfile(deviceProfile, false, true);
         } catch (Exception e) {
             log.error("[{}] Failed to process device profile update msg [{}]", tenantId, deviceProfileUpdateMsg, e);
             throw e;
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/device/profile/DeviceProfileEdgeProcessorV1.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/device/profile/DeviceProfileEdgeProcessorV1.java
index cbec4169eb..a86afcfb73 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/device/profile/DeviceProfileEdgeProcessorV1.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/device/profile/DeviceProfileEdgeProcessorV1.java
@@ -16,34 +16,27 @@
 package org.thingsboard.server.service.edge.rpc.processor.device.profile;
 
 import com.datastax.oss.driver.api.core.uuid.Uuids;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 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.StringUtils;
-import org.thingsboard.server.common.data.device.profile.DeviceProfileData;
 import org.thingsboard.server.common.data.id.DashboardId;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
 import org.thingsboard.server.common.data.id.OtaPackageId;
 import org.thingsboard.server.common.data.id.RuleChainId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.gen.edge.v1.DeviceProfileUpdateMsg;
-import org.thingsboard.server.queue.util.DataDecodingEncodingService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 
 import java.nio.charset.StandardCharsets;
-import java.util.Optional;
 import java.util.UUID;
 
 @Component
 @TbCoreComponent
 public class DeviceProfileEdgeProcessorV1 extends DeviceProfileEdgeProcessor {
 
-    @Autowired
-    private DataDecodingEncodingService dataDecodingEncodingService;
-
     @Override
     protected DeviceProfile constructDeviceProfileFromUpdateMsg(TenantId tenantId, DeviceProfileId deviceProfileId, DeviceProfileUpdateMsg deviceProfileUpdateMsg) {
         DeviceProfile deviceProfile = new DeviceProfile();
@@ -63,9 +56,7 @@ public class DeviceProfileEdgeProcessorV1 extends DeviceProfileEdgeProcessor {
                 ? deviceProfileUpdateMsg.getProvisionDeviceKey() : null);
         deviceProfile.setDefaultQueueName(deviceProfileUpdateMsg.getDefaultQueueName());
 
-        Optional<DeviceProfileData> profileDataOpt =
-                dataDecodingEncodingService.decode(deviceProfileUpdateMsg.getProfileDataBytes().toByteArray());
-        deviceProfile.setProfileData(profileDataOpt.orElse(null));
+        deviceProfile.setProfileDataBytes(deviceProfileUpdateMsg.getProfileDataBytes().toByteArray());
 
         String defaultQueueName = StringUtils.isNotBlank(deviceProfileUpdateMsg.getDefaultQueueName())
                 ? deviceProfileUpdateMsg.getDefaultQueueName() : null;
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 ba1956b48b..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,14 @@ 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;
 import org.thingsboard.server.common.data.DeviceProfile;
@@ -52,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;
@@ -65,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 javax.annotation.Nullable;
-import javax.annotation.PostConstruct;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
@@ -137,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));
     }
@@ -251,7 +250,7 @@ public abstract class BaseTelemetryProcessor extends BaseEdgeProcessor {
         JsonObject json = JsonUtils.getJsonObject(msg.getKvList());
         List<AttributeKvEntry> attributes = new ArrayList<>(JsonConverter.convertToAttributes(json));
         String scope = metaData.getValue("scope");
-        tsSubService.saveAndNotify(tenantId, entityId, scope, attributes, new FutureCallback<Void>() {
+        tsSubService.saveAndNotify(tenantId, entityId, AttributeScope.valueOf(scope), attributes, new FutureCallback<Void>() {
             @Override
             public void onSuccess(@Nullable Void tmp) {
                 var defaultQueueAndRuleChain = getDefaultQueueNameAndRuleChainId(tenantId, entityId);
@@ -285,7 +284,7 @@ public abstract class BaseTelemetryProcessor extends BaseEdgeProcessor {
 
         String scope = attributeDeleteMsg.getScope();
         List<String> attributeKeys = attributeDeleteMsg.getAttributeNamesList();
-        ListenableFuture<List<String>> removeAllFuture = attributesService.removeAll(tenantId, entityId, scope, attributeKeys);
+        ListenableFuture<List<String>> removeAllFuture = attributesService.removeAll(tenantId, entityId, AttributeScope.valueOf(scope), attributeKeys);
         return Futures.transformAsync(removeAllFuture, removeAttributes -> {
             if (EntityType.DEVICE.name().equals(entityType)) {
                 SettableFuture<Void> futureToSet = SettableFuture.create();
@@ -316,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 ac3f7c3348..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,7 @@ 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;
 import org.thingsboard.server.common.data.EntityView;
@@ -109,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);
@@ -136,7 +133,7 @@ public class DefaultEdgeRequestsService implements EdgeRequestsService {
             return Futures.immediateFuture(null);
         }
         String scope = attributesRequestMsg.getScope();
-        ListenableFuture<List<AttributeKvEntry>> findAttrFuture = attributesService.findAll(tenantId, entityId, scope);
+        ListenableFuture<List<AttributeKvEntry>> findAttrFuture = attributesService.findAll(tenantId, entityId, AttributeScope.valueOf(scope));
         return Futures.transformAsync(findAttrFuture, ssAttributes
                         -> processEntityAttributesAndAddToEdgeQueue(tenantId, entityId, edge, entityType, scope, ssAttributes, attributesRequestMsg),
                 dbCallbackExecutorService);
@@ -291,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);
@@ -399,11 +395,7 @@ public class DefaultEdgeRequestsService implements EdgeRequestsService {
                 tenantId, edgeId, type, action, entityId, body);
 
         EdgeEvent edgeEvent = EdgeUtils.constructEdgeEvent(tenantId, edgeId, type, action, entityId, body);
-
-        return Futures.transform(edgeEventService.saveAsync(edgeEvent), unused -> {
-            tbClusterService.onEdgeEventUpdate(tenantId, edgeId);
-            return null;
-        }, dbCallbackExecutorService);
+        return edgeEventService.saveAsync(edgeEvent);
     }
 
 }
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 ff8dd52ec5..0c91d72ea5 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,15 +25,10 @@ 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.EntityId;
 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.TimePageLink;
 import org.thingsboard.server.dao.alarm.AlarmService;
 import org.thingsboard.server.dao.customer.CustomerService;
 import org.thingsboard.server.dao.edge.EdgeService;
@@ -56,7 +51,7 @@ public abstract class AbstractTbEntityService {
     @Autowired
     protected DbCallbackExecutorService dbExecutor;
     @Autowired(required = false)
-    protected TbNotificationEntityService notificationEntityService;
+    protected TbLogEntityActionService logEntityActionService;
     @Autowired(required = false)
     protected EdgeService edgeService;
     @Autowired
@@ -72,13 +67,6 @@ 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));
-
-        alarms.getData().stream().map(AlarmInfo::getId).forEach(alarmId -> alarmService.delAlarm(tenantId, alarmId));
-    }
-
     protected <T> T checkNotNull(T reference) throws ThingsboardException {
         return checkNotNull(reference, "Requested item wasn't found!");
     }
diff --git a/application/src/main/java/org/thingsboard/server/service/entitiy/DefaultTbLogEntityActionService.java b/application/src/main/java/org/thingsboard/server/service/entitiy/DefaultTbLogEntityActionService.java
new file mode 100644
index 0000000000..4f3242cfeb
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/entitiy/DefaultTbLogEntityActionService.java
@@ -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.
+ */
+package org.thingsboard.server.service.entitiy;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.thingsboard.server.common.data.HasName;
+import org.thingsboard.server.common.data.User;
+import org.thingsboard.server.common.data.audit.ActionType;
+import org.thingsboard.server.common.data.id.CustomerId;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.relation.EntityRelation;
+import org.thingsboard.server.service.action.EntityActionService;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class DefaultTbLogEntityActionService implements TbLogEntityActionService {
+
+    private final EntityActionService entityActionService;
+
+    @Override
+    public <I extends EntityId> void logEntityAction(TenantId tenantId, I entityId, ActionType actionType,
+                                                     User user, Exception e, Object... additionalInfo) {
+        logEntityAction(tenantId, entityId, null, null, actionType, user, e, additionalInfo);
+    }
+
+    @Override
+    public <E extends HasName, I extends EntityId> void logEntityAction(TenantId tenantId, I entityId, E entity,
+                                                                        ActionType actionType, User user, Object... additionalInfo) {
+        logEntityAction(tenantId, entityId, entity, null, actionType, user, null, additionalInfo);
+    }
+
+    @Override
+    public <E extends HasName, I extends EntityId> void logEntityAction(TenantId tenantId, I entityId, E entity,
+                                                                        ActionType actionType, User user, Exception e,
+                                                                        Object... additionalInfo) {
+        logEntityAction(tenantId, entityId, entity, null, actionType, user, e, additionalInfo);
+    }
+
+    @Override
+    public <E extends HasName, I extends EntityId> void logEntityAction(TenantId tenantId, I entityId, E entity, CustomerId customerId,
+                                                                        ActionType actionType, User user, Object... additionalInfo) {
+        logEntityAction(tenantId, entityId, entity, customerId, actionType, user, null, additionalInfo);
+    }
+
+    @Override
+    public <E extends HasName, I extends EntityId> void logEntityAction(TenantId tenantId, I entityId, E entity,
+                                                                        CustomerId customerId, ActionType actionType,
+                                                                        User user, Exception e, Object... additionalInfo) {
+        if (user != null) {
+            entityActionService.logEntityAction(user, entityId, entity, customerId, actionType, e, additionalInfo);
+        } else if (e == null) {
+            entityActionService.pushEntityActionToRuleEngine(entityId, entity, tenantId, customerId, actionType, null, additionalInfo);
+        }
+    }
+
+    @Override
+    public void logEntityRelationAction(TenantId tenantId, CustomerId customerId, EntityRelation relation, User user,
+                                        ActionType actionType, Exception e, Object... additionalInfo) {
+        logEntityAction(tenantId, relation.getFrom(), null, customerId, actionType, user, e, additionalInfo);
+        logEntityAction(tenantId, relation.getTo(), null, customerId, actionType, user, e, additionalInfo);
+    }
+}
diff --git a/application/src/main/java/org/thingsboard/server/service/entitiy/DefaultTbNotificationEntityService.java b/application/src/main/java/org/thingsboard/server/service/entitiy/DefaultTbNotificationEntityService.java
deleted file mode 100644
index 3a87fff506..0000000000
--- a/application/src/main/java/org/thingsboard/server/service/entitiy/DefaultTbNotificationEntityService.java
+++ /dev/null
@@ -1,176 +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.service.entitiy;
-
-import lombok.RequiredArgsConstructor;
-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.Device;
-import org.thingsboard.server.common.data.HasName;
-import org.thingsboard.server.common.data.Tenant;
-import org.thingsboard.server.common.data.User;
-import org.thingsboard.server.common.data.audit.ActionType;
-import org.thingsboard.server.common.data.edge.Edge;
-import org.thingsboard.server.common.data.id.CustomerId;
-import org.thingsboard.server.common.data.id.DeviceId;
-import org.thingsboard.server.common.data.id.EdgeId;
-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.plugin.ComponentLifecycleEvent;
-import org.thingsboard.server.common.data.relation.EntityRelation;
-import org.thingsboard.server.common.data.security.DeviceCredentials;
-import org.thingsboard.server.common.msg.TbMsg;
-import org.thingsboard.server.common.msg.TbMsgDataType;
-import org.thingsboard.server.common.msg.TbMsgMetaData;
-import org.thingsboard.server.common.msg.rule.engine.DeviceCredentialsUpdateNotificationMsg;
-import org.thingsboard.server.service.action.EntityActionService;
-import org.thingsboard.server.service.gateway_device.GatewayNotificationsService;
-
-@Slf4j
-@Service
-@RequiredArgsConstructor
-public class DefaultTbNotificationEntityService implements TbNotificationEntityService {
-
-    private final EntityActionService entityActionService;
-    private final TbClusterService tbClusterService;
-    private final GatewayNotificationsService gatewayNotificationsService;
-
-    @Override
-    public <I extends EntityId> void logEntityAction(TenantId tenantId, I entityId, ActionType actionType,
-                                                     User user, Exception e, Object... additionalInfo) {
-        logEntityAction(tenantId, entityId, null, null, actionType, user, e, additionalInfo);
-    }
-
-    @Override
-    public <E extends HasName, I extends EntityId> void logEntityAction(TenantId tenantId, I entityId, E entity,
-                                                                        ActionType actionType, User user, Object... additionalInfo) {
-        logEntityAction(tenantId, entityId, entity, null, actionType, user, null, additionalInfo);
-    }
-
-    @Override
-    public <E extends HasName, I extends EntityId> void logEntityAction(TenantId tenantId, I entityId, E entity,
-                                                                        ActionType actionType, User user, Exception e,
-                                                                        Object... additionalInfo) {
-        logEntityAction(tenantId, entityId, entity, null, actionType, user, e, additionalInfo);
-    }
-
-    @Override
-    public <E extends HasName, I extends EntityId> void logEntityAction(TenantId tenantId, I entityId, E entity, CustomerId customerId,
-                                                                        ActionType actionType, User user, Object... additionalInfo) {
-        logEntityAction(tenantId, entityId, entity, customerId, actionType, user, null, additionalInfo);
-    }
-
-    @Override
-    public <E extends HasName, I extends EntityId> void logEntityAction(TenantId tenantId, I entityId, E entity,
-                                                                        CustomerId customerId, ActionType actionType,
-                                                                        User user, Exception e, Object... additionalInfo) {
-        if (user != null) {
-            entityActionService.logEntityAction(user, entityId, entity, customerId, actionType, e, additionalInfo);
-        } else if (e == null) {
-            entityActionService.pushEntityActionToRuleEngine(entityId, entity, tenantId, customerId, actionType, null, additionalInfo);
-        }
-    }
-
-    @Override
-    public void notifyCreateOrUpdateTenant(Tenant tenant, ComponentLifecycleEvent event) {
-        tbClusterService.onTenantChange(tenant, null);
-        tbClusterService.broadcastEntityStateChangeEvent(tenant.getId(), tenant.getId(), event);
-    }
-
-    @Override
-    public void notifyDeleteTenant(Tenant tenant) {
-        tbClusterService.onTenantDelete(tenant, null);
-        tbClusterService.broadcastEntityStateChangeEvent(tenant.getId(), tenant.getId(), ComponentLifecycleEvent.DELETED);
-    }
-
-    @Override
-    public void notifyCreateOrUpdateDevice(TenantId tenantId, DeviceId deviceId, CustomerId customerId,
-                                           Device device, Device oldDevice, ActionType actionType,
-                                           User user, Object... additionalInfo) {
-        tbClusterService.onDeviceUpdated(device, oldDevice);
-        logEntityAction(tenantId, deviceId, device, customerId, actionType, user, additionalInfo);
-    }
-
-    @Override
-    public void notifyDeleteDevice(TenantId tenantId, DeviceId deviceId, CustomerId customerId, Device device,
-                                   User user, Object... additionalInfo) {
-        gatewayNotificationsService.onDeviceDeleted(device);
-        tbClusterService.onDeviceDeleted(tenantId, device, null);
-        logEntityAction(tenantId, deviceId, device, customerId, ActionType.DELETED, user, additionalInfo);
-    }
-
-    @Override
-    public void notifyUpdateDeviceCredentials(TenantId tenantId, DeviceId deviceId, CustomerId customerId, Device device,
-                                              DeviceCredentials deviceCredentials, User user) {
-        tbClusterService.pushMsgToCore(new DeviceCredentialsUpdateNotificationMsg(tenantId, deviceCredentials.getDeviceId(), deviceCredentials), null);
-        logEntityAction(tenantId, deviceId, device, customerId, ActionType.CREDENTIALS_UPDATED, user, deviceCredentials);
-    }
-
-    @Override
-    public void notifyAssignDeviceToTenant(TenantId tenantId, TenantId newTenantId, DeviceId deviceId, CustomerId customerId,
-                                           Device device, Tenant tenant, User user, Object... additionalInfo) {
-        tbClusterService.onDeviceAssignedToTenant(tenantId, device);
-        logEntityAction(tenantId, deviceId, device, customerId, ActionType.ASSIGNED_TO_TENANT, user, additionalInfo);
-        pushAssignedFromNotification(tenant, newTenantId, device);
-    }
-
-    @Override
-    public void notifyCreateOrUpdateOrDeleteEdge(TenantId tenantId, EdgeId edgeId, CustomerId customerId, Edge edge,
-                                                 ActionType actionType, User user, Object... additionalInfo) {
-        ComponentLifecycleEvent lifecycleEvent;
-        switch (actionType) {
-            case ADDED:
-                lifecycleEvent = ComponentLifecycleEvent.CREATED;
-                break;
-            case UPDATED:
-                lifecycleEvent = ComponentLifecycleEvent.UPDATED;
-                break;
-            case DELETED:
-                lifecycleEvent = ComponentLifecycleEvent.DELETED;
-                break;
-            default:
-                throw new IllegalArgumentException("Unknown actionType: " + actionType);
-        }
-        tbClusterService.broadcastEntityStateChangeEvent(tenantId, edgeId, lifecycleEvent);
-        logEntityAction(tenantId, edgeId, edge, customerId, actionType, user, additionalInfo);
-    }
-
-    @Override
-    public void logEntityRelationAction(TenantId tenantId, CustomerId customerId, EntityRelation relation, User user,
-                                        ActionType actionType, Exception e, Object... additionalInfo) {
-        logEntityAction(tenantId, relation.getFrom(), null, customerId, actionType, user, e, additionalInfo);
-        logEntityAction(tenantId, relation.getTo(), null, customerId, actionType, user, e, additionalInfo);
-    }
-
-    private void pushAssignedFromNotification(Tenant currentTenant, TenantId newTenantId, Device assignedDevice) {
-        String data = JacksonUtil.toString(JacksonUtil.valueToTree(assignedDevice));
-        if (data != null) {
-            TbMsg tbMsg = TbMsg.newMsg(TbMsgType.ENTITY_ASSIGNED_FROM_TENANT, assignedDevice.getId(),
-                    assignedDevice.getCustomerId(), getMetaDataForAssignedFrom(currentTenant), TbMsgDataType.JSON, data);
-            tbClusterService.pushMsgToRuleEngine(newTenantId, assignedDevice.getId(), tbMsg, null);
-        }
-    }
-
-    private TbMsgMetaData getMetaDataForAssignedFrom(Tenant tenant) {
-        TbMsgMetaData metaData = new TbMsgMetaData();
-        metaData.putValue("assignedFromTenantId", tenant.getId().getId().toString());
-        metaData.putValue("assignedFromTenantName", tenant.getName());
-        return metaData;
-    }
-}
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
new file mode 100644
index 0000000000..4a7c1e1e87
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/entitiy/EntityStateSourcingListener.java
@@ -0,0 +1,267 @@
+/**
+ * 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.entitiy;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.event.TransactionalEventListener;
+import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.server.cluster.TbClusterService;
+import org.thingsboard.server.common.data.ApiUsageState;
+import org.thingsboard.server.common.data.Device;
+import org.thingsboard.server.common.data.DeviceProfile;
+import org.thingsboard.server.common.data.EntityType;
+import org.thingsboard.server.common.data.TbResource;
+import org.thingsboard.server.common.data.TbResourceInfo;
+import org.thingsboard.server.common.data.Tenant;
+import org.thingsboard.server.common.data.TenantProfile;
+import org.thingsboard.server.common.data.audit.ActionType;
+import org.thingsboard.server.common.data.edge.Edge;
+import org.thingsboard.server.common.data.edge.EdgeEvent;
+import org.thingsboard.server.common.data.id.DeviceId;
+import org.thingsboard.server.common.data.id.EdgeId;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.id.RuleChainId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.msg.TbMsgType;
+import org.thingsboard.server.common.data.notification.NotificationRequest;
+import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent;
+import org.thingsboard.server.common.data.rule.RuleChain;
+import org.thingsboard.server.common.data.rule.RuleChainType;
+import org.thingsboard.server.common.data.security.DeviceCredentials;
+import org.thingsboard.server.common.msg.TbMsg;
+import org.thingsboard.server.common.msg.TbMsgDataType;
+import org.thingsboard.server.common.msg.TbMsgMetaData;
+import org.thingsboard.server.common.msg.rule.engine.DeviceCredentialsUpdateNotificationMsg;
+import org.thingsboard.server.dao.eventsourcing.ActionEntityEvent;
+import org.thingsboard.server.dao.eventsourcing.DeleteEntityEvent;
+import org.thingsboard.server.dao.eventsourcing.SaveEntityEvent;
+import org.thingsboard.server.dao.tenant.TenantService;
+
+import javax.annotation.PostConstruct;
+import java.util.Set;
+
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class EntityStateSourcingListener {
+
+    private final TbClusterService tbClusterService;
+    private final TenantService tenantService;
+
+    @PostConstruct
+    public void init() {
+        log.info("EntityStateSourcingListener initiated");
+    }
+
+    @TransactionalEventListener(fallbackExecution = true)
+    public void handleEvent(SaveEntityEvent<?> event) {
+        TenantId tenantId = event.getTenantId();
+        EntityId entityId = event.getEntityId();
+        if (entityId == null) {
+            return;
+        }
+        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, ASSET_PROFILE, ENTITY_VIEW, NOTIFICATION_RULE -> {
+                tbClusterService.broadcastEntityStateChangeEvent(tenantId, entityId, lifecycleEvent);
+            }
+            case RULE_CHAIN -> {
+                RuleChain ruleChain = (RuleChain) event.getEntity();
+                if (RuleChainType.CORE.equals(ruleChain.getType())) {
+                    tbClusterService.broadcastEntityStateChangeEvent(ruleChain.getTenantId(), ruleChain.getId(), lifecycleEvent);
+                }
+            }
+            case TENANT -> {
+                Tenant tenant = (Tenant) event.getEntity();
+                onTenantUpdate(tenant, lifecycleEvent);
+            }
+            case TENANT_PROFILE -> {
+                TenantProfile tenantProfile = (TenantProfile) event.getEntity();
+                onTenantProfileUpdate(tenantProfile, lifecycleEvent);
+            }
+            case DEVICE -> {
+                onDeviceUpdate(event.getEntity(), event.getOldEntity());
+            }
+            case DEVICE_PROFILE -> {
+                DeviceProfile deviceProfile = (DeviceProfile) event.getEntity();
+                onDeviceProfileUpdate(deviceProfile, event.getOldEntity(), isCreated);
+            }
+            case EDGE -> {
+                handleEdgeEvent(tenantId, entityId, event.getEntity(), lifecycleEvent);
+            }
+            case TB_RESOURCE -> {
+                TbResource tbResource = (TbResource) event.getEntity();
+                tbClusterService.onResourceChange(tbResource, null);
+            }
+            case API_USAGE_STATE -> {
+                ApiUsageState apiUsageState = (ApiUsageState) event.getEntity();
+                tbClusterService.onApiStateChange(apiUsageState, null);
+            }
+            default -> {}
+        }
+    }
+
+    @TransactionalEventListener(fallbackExecution = true)
+    public void handleEvent(DeleteEntityEvent<?> event) {
+        TenantId tenantId = event.getTenantId();
+        EntityId entityId = event.getEntityId();
+        if (entityId == null) {
+            return;
+        }
+        EntityType entityType = entityId.getEntityType();
+        if (!tenantId.isSysTenantId() && entityType != EntityType.TENANT  && !tenantService.tenantExists(tenantId)) {
+            log.debug("[{}] Ignoring DeleteEntityEvent because tenant does not exist: {}", tenantId, event);
+            return;
+        }
+        log.debug("[{}][{}][{}] Handling entity deletion event: {}", tenantId, entityType, entityId, event);
+
+        switch (entityType) {
+            case ASSET, ASSET_PROFILE, ENTITY_VIEW, CUSTOMER, EDGE, NOTIFICATION_RULE -> {
+                tbClusterService.broadcastEntityStateChangeEvent(tenantId, entityId, ComponentLifecycleEvent.DELETED);
+            }
+            case NOTIFICATION_REQUEST -> {
+                NotificationRequest request = (NotificationRequest) event.getEntity();
+                if (request.isScheduled()) {
+                    tbClusterService.broadcastEntityStateChangeEvent(tenantId, entityId, ComponentLifecycleEvent.DELETED);
+                }
+            }
+            case RULE_CHAIN -> {
+                RuleChain ruleChain = (RuleChain) event.getEntity();
+                if (RuleChainType.CORE.equals(ruleChain.getType())) {
+                    Set<RuleChainId> referencingRuleChainIds = JacksonUtil.fromString(event.getBody(), new TypeReference<>() {});
+                    if (referencingRuleChainIds != null) {
+                        referencingRuleChainIds.forEach(referencingRuleChainId ->
+                                tbClusterService.broadcastEntityStateChangeEvent(tenantId, referencingRuleChainId, ComponentLifecycleEvent.UPDATED));
+                    }
+                    tbClusterService.broadcastEntityStateChangeEvent(tenantId, ruleChain.getId(), ComponentLifecycleEvent.DELETED);
+                }
+            }
+            case TENANT -> {
+                Tenant tenant = (Tenant) event.getEntity();
+                onTenantDeleted(tenant);
+            }
+            case TENANT_PROFILE -> {
+                TenantProfile tenantProfile = (TenantProfile) event.getEntity();
+                tbClusterService.onTenantProfileDelete(tenantProfile, null);
+            }
+            case DEVICE -> {
+                Device device = (Device) event.getEntity();
+                tbClusterService.onDeviceDeleted(tenantId, device, null);
+            }
+            case DEVICE_PROFILE -> {
+                DeviceProfile deviceProfile = (DeviceProfile) event.getEntity();
+                onDeviceProfileDelete(event.getTenantId(), event.getEntityId(), deviceProfile);
+            }
+            case TB_RESOURCE -> {
+                TbResourceInfo tbResource = (TbResourceInfo) event.getEntity();
+                tbClusterService.onResourceDeleted(tbResource, null);
+            }
+            default -> {}
+        }
+    }
+
+    @TransactionalEventListener(fallbackExecution = true)
+    public void handleEvent(ActionEntityEvent<?> event) {
+        log.trace("[{}] ActionEntityEvent called: {}", event.getTenantId(), event);
+        if (ActionType.CREDENTIALS_UPDATED.equals(event.getActionType()) &&
+                EntityType.DEVICE.equals(event.getEntityId().getEntityType())
+                && 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) {
+            Tenant tenant = JacksonUtil.fromString(event.getBody(), Tenant.class);
+            if (tenant != null) {
+                tbClusterService.onDeviceAssignedToTenant(tenant.getId(), device);
+            }
+            pushAssignedFromNotification(tenant, event.getTenantId(), device);
+        }
+    }
+
+    private void onTenantUpdate(Tenant tenant, ComponentLifecycleEvent lifecycleEvent) {
+        tbClusterService.onTenantChange(tenant, null);
+        tbClusterService.broadcastEntityStateChangeEvent(tenant.getId(), tenant.getId(), lifecycleEvent);
+    }
+
+    private void onTenantDeleted(Tenant tenant) {
+        tbClusterService.onTenantDelete(tenant, null);
+        tbClusterService.broadcastEntityStateChangeEvent(tenant.getId(), tenant.getId(), ComponentLifecycleEvent.DELETED);
+    }
+
+    private void onTenantProfileUpdate(TenantProfile tenantProfile, ComponentLifecycleEvent lifecycleEvent) {
+        tbClusterService.onTenantProfileChange(tenantProfile, null);
+        tbClusterService.broadcastEntityStateChangeEvent(TenantId.SYS_TENANT_ID, tenantProfile.getId(), lifecycleEvent);
+    }
+
+    private void onDeviceProfileUpdate(DeviceProfile deviceProfile, Object oldEntity, boolean isCreated) {
+        DeviceProfile oldDeviceProfile = null;
+        if (!isCreated) {
+            oldDeviceProfile = getOldDeviceProfile(oldEntity);
+        }
+        tbClusterService.onDeviceProfileChange(deviceProfile, oldDeviceProfile, null);
+    }
+
+    private DeviceProfile getOldDeviceProfile(Object oldEntity) {
+        if (oldEntity instanceof DeviceProfile) {
+            return (DeviceProfile) oldEntity;
+        }
+        return null;
+    }
+
+    private void onDeviceProfileDelete(TenantId tenantId, EntityId entityId, DeviceProfile deviceProfile) {
+        tbClusterService.onDeviceProfileDelete(deviceProfile, null);
+        tbClusterService.broadcastEntityStateChangeEvent(tenantId, entityId, ComponentLifecycleEvent.DELETED);
+    }
+
+    private void onDeviceUpdate(Object entity, Object oldEntity) {
+        Device device = (Device) entity;
+        Device oldDevice = null;
+        if (oldEntity instanceof Device) {
+            oldDevice = (Device) oldEntity;
+        }
+        tbClusterService.onDeviceUpdated(device, oldDevice);
+    }
+
+    private void handleEdgeEvent(TenantId tenantId, EntityId entityId, Object entity, ComponentLifecycleEvent lifecycleEvent) {
+        if (entity instanceof Edge) {
+            tbClusterService.broadcastEntityStateChangeEvent(tenantId, entityId, lifecycleEvent);
+        } else if (entity instanceof EdgeEvent) {
+            tbClusterService.onEdgeEventUpdate(tenantId, (EdgeId) entityId);
+        }
+    }
+
+    private void pushAssignedFromNotification(Tenant currentTenant, TenantId newTenantId, Device assignedDevice) {
+        String data = JacksonUtil.toString(JacksonUtil.valueToTree(assignedDevice));
+        if (data != null) {
+            TbMsg tbMsg = TbMsg.newMsg(TbMsgType.ENTITY_ASSIGNED_FROM_TENANT, assignedDevice.getId(),
+                    assignedDevice.getCustomerId(), getMetaDataForAssignedFrom(currentTenant), TbMsgDataType.JSON, data);
+            tbClusterService.pushMsgToRuleEngine(newTenantId, assignedDevice.getId(), tbMsg, null);
+        }
+    }
+
+    private TbMsgMetaData getMetaDataForAssignedFrom(Tenant tenant) {
+        TbMsgMetaData metaData = new TbMsgMetaData();
+        metaData.putValue("assignedFromTenantId", tenant.getId().getId().toString());
+        metaData.putValue("assignedFromTenantName", tenant.getName());
+        return metaData;
+    }
+}
diff --git a/application/src/main/java/org/thingsboard/server/service/entitiy/TbNotificationEntityService.java b/application/src/main/java/org/thingsboard/server/service/entitiy/TbLogEntityActionService.java
similarity index 60%
rename from application/src/main/java/org/thingsboard/server/service/entitiy/TbNotificationEntityService.java
rename to application/src/main/java/org/thingsboard/server/service/entitiy/TbLogEntityActionService.java
index cf50b26823..9c4f3d71da 100644
--- a/application/src/main/java/org/thingsboard/server/service/entitiy/TbNotificationEntityService.java
+++ b/application/src/main/java/org/thingsboard/server/service/entitiy/TbLogEntityActionService.java
@@ -15,22 +15,15 @@
  */
 package org.thingsboard.server.service.entitiy;
 
-import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.HasName;
-import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.common.data.User;
 import org.thingsboard.server.common.data.audit.ActionType;
-import org.thingsboard.server.common.data.edge.Edge;
 import org.thingsboard.server.common.data.id.CustomerId;
-import org.thingsboard.server.common.data.id.DeviceId;
-import org.thingsboard.server.common.data.id.EdgeId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.TenantId;
-import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent;
 import org.thingsboard.server.common.data.relation.EntityRelation;
-import org.thingsboard.server.common.data.security.DeviceCredentials;
 
-public interface TbNotificationEntityService {
+public interface TbLogEntityActionService {
 
     <I extends EntityId> void logEntityAction(TenantId tenantId, I entityId, ActionType actionType, User user,
                                               Exception e, Object... additionalInfo);
@@ -48,25 +41,6 @@ public interface TbNotificationEntityService {
                                                                  ActionType actionType, User user, Exception e,
                                                                  Object... additionalInfo);
 
-    void notifyCreateOrUpdateTenant(Tenant tenant, ComponentLifecycleEvent event);
-
-    void notifyDeleteTenant(Tenant tenant);
-
-    void notifyCreateOrUpdateDevice(TenantId tenantId, DeviceId deviceId, CustomerId customerId, Device device,
-                                    Device oldDevice, ActionType actionType, User user, Object... additionalInfo);
-
-    void notifyDeleteDevice(TenantId tenantId, DeviceId deviceId, CustomerId customerId, Device device,
-                            User user, Object... additionalInfo);
-
-    void notifyUpdateDeviceCredentials(TenantId tenantId, DeviceId deviceId, CustomerId customerId, Device device,
-                                       DeviceCredentials deviceCredentials, User user);
-
-    void notifyAssignDeviceToTenant(TenantId tenantId, TenantId newTenantId, DeviceId deviceId, CustomerId customerId,
-                                    Device device, Tenant tenant, User user, Object... additionalInfo);
-
-    void notifyCreateOrUpdateOrDeleteEdge(TenantId tenantId, EdgeId edgeId, CustomerId customerId, Edge edge, ActionType actionType,
-                                          User user, Object... additionalInfo);
-
     void logEntityRelationAction(TenantId tenantId, CustomerId customerId, EntityRelation relation, User user,
                                  ActionType actionType, Exception e, Object... additionalInfo);
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/entitiy/alarm/DefaultTbAlarmCommentService.java b/application/src/main/java/org/thingsboard/server/service/entitiy/alarm/DefaultTbAlarmCommentService.java
index 8e9d739b31..7f89999eeb 100644
--- a/application/src/main/java/org/thingsboard/server/service/entitiy/alarm/DefaultTbAlarmCommentService.java
+++ b/application/src/main/java/org/thingsboard/server/service/entitiy/alarm/DefaultTbAlarmCommentService.java
@@ -45,11 +45,11 @@ public class DefaultTbAlarmCommentService extends AbstractTbEntityService implem
         }
         try {
             AlarmComment savedAlarmComment = checkNotNull(alarmCommentService.createOrUpdateAlarmComment(alarm.getTenantId(), alarmComment));
-            notificationEntityService.logEntityAction(alarm.getTenantId(), alarm.getId(), alarm, alarm.getCustomerId(), actionType, user, savedAlarmComment);
+            logEntityActionService.logEntityAction(alarm.getTenantId(), alarm.getId(), alarm, alarm.getCustomerId(), actionType, user, savedAlarmComment);
 
             return savedAlarmComment;
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(alarm.getTenantId(), emptyId(EntityType.ALARM), alarm, actionType, user, e, alarmComment);
+            logEntityActionService.logEntityAction(alarm.getTenantId(), emptyId(EntityType.ALARM), alarm, actionType, user, e, alarmComment);
             throw e;
         }
     }
@@ -63,7 +63,7 @@ public class DefaultTbAlarmCommentService extends AbstractTbEntityService implem
                     String.format("User %s deleted his comment",
                             (user.getFirstName() == null || user.getLastName() == null) ? user.getName() : user.getFirstName() + " " + user.getLastName())));
             AlarmComment savedAlarmComment = checkNotNull(alarmCommentService.saveAlarmComment(alarm.getTenantId(), alarmComment));
-            notificationEntityService.logEntityAction(alarm.getTenantId(), alarm.getId(), alarm, alarm.getCustomerId(), ActionType.DELETED_COMMENT, user, savedAlarmComment);
+            logEntityActionService.logEntityAction(alarm.getTenantId(), alarm.getId(), alarm, alarm.getCustomerId(), ActionType.DELETED_COMMENT, user, savedAlarmComment);
         } else {
             throw new ThingsboardException("System comment could not be deleted", ThingsboardErrorCode.BAD_REQUEST_PARAMS);
         }
diff --git a/application/src/main/java/org/thingsboard/server/service/entitiy/alarm/DefaultTbAlarmService.java b/application/src/main/java/org/thingsboard/server/service/entitiy/alarm/DefaultTbAlarmService.java
index 3876efbc06..89e0bc944f 100644
--- a/application/src/main/java/org/thingsboard/server/service/entitiy/alarm/DefaultTbAlarmService.java
+++ b/application/src/main/java/org/thingsboard/server/service/entitiy/alarm/DefaultTbAlarmService.java
@@ -82,12 +82,12 @@ public class DefaultTbAlarmService extends AbstractTbEntityService implements Tb
                 resultAlarm = unassign(alarm, alarm.getAssignTs(), user);
             }
             if (result.isModified()) {
-                notificationEntityService.logEntityAction(tenantId, alarm.getOriginator(), resultAlarm,
+                logEntityActionService.logEntityAction(tenantId, alarm.getOriginator(), resultAlarm,
                         resultAlarm.getCustomerId(), actionType, user);
             }
             return new Alarm(resultAlarm);
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.ALARM), alarm, actionType, user, e);
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.ALARM), alarm, actionType, user, e);
             throw e;
         }
     }
@@ -107,7 +107,7 @@ public class DefaultTbAlarmService extends AbstractTbEntityService implements Tb
         if (result.isModified()) {
             String systemComment = String.format("Alarm was acknowledged by user %s", user.getTitle());
             addSystemAlarmComment(alarmInfo, user, "ACK", systemComment);
-            notificationEntityService.logEntityAction(alarm.getTenantId(), alarm.getOriginator(), alarmInfo,
+            logEntityActionService.logEntityAction(alarm.getTenantId(), alarm.getOriginator(), alarmInfo,
                     alarmInfo.getCustomerId(), ActionType.ALARM_ACK, user);
         } else {
             throw new ThingsboardException("Alarm was already acknowledged!", ThingsboardErrorCode.BAD_REQUEST_PARAMS);
@@ -130,7 +130,7 @@ public class DefaultTbAlarmService extends AbstractTbEntityService implements Tb
         if (result.isCleared()) {
             String systemComment = String.format("Alarm was cleared by user %s", user.getTitle());
             addSystemAlarmComment(alarmInfo, user, "CLEAR", systemComment);
-            notificationEntityService.logEntityAction(alarm.getTenantId(), alarm.getOriginator(), alarmInfo,
+            logEntityActionService.logEntityAction(alarm.getTenantId(), alarm.getOriginator(), alarmInfo,
                     alarmInfo.getCustomerId(), ActionType.ALARM_CLEAR, user);
         } else {
             throw new ThingsboardException("Alarm was already cleared!", ThingsboardErrorCode.BAD_REQUEST_PARAMS);
@@ -149,7 +149,7 @@ public class DefaultTbAlarmService extends AbstractTbEntityService implements Tb
             AlarmAssignee assignee = alarmInfo.getAssignee();
             String systemComment = String.format("Alarm was assigned by user %s to user %s", user.getTitle(), assignee.getTitle());
             addSystemAlarmComment(alarmInfo, user, "ASSIGN", systemComment, assignee.getId());
-            notificationEntityService.logEntityAction(alarm.getTenantId(), alarm.getOriginator(), alarmInfo,
+            logEntityActionService.logEntityAction(alarm.getTenantId(), alarm.getOriginator(), alarmInfo,
                     alarmInfo.getCustomerId(), ActionType.ALARM_ASSIGNED, user);
         } else {
             throw new ThingsboardException("Alarm was already assigned to this user!", ThingsboardErrorCode.BAD_REQUEST_PARAMS);
@@ -167,7 +167,7 @@ public class DefaultTbAlarmService extends AbstractTbEntityService implements Tb
         if (result.isModified()) {
             String systemComment = String.format("Alarm was unassigned by user %s", user.getTitle());
             addSystemAlarmComment(alarmInfo, user, "ASSIGN", systemComment);
-            notificationEntityService.logEntityAction(alarm.getTenantId(), alarm.getOriginator(), alarmInfo,
+            logEntityActionService.logEntityAction(alarm.getTenantId(), alarm.getOriginator(), alarmInfo,
                     alarmInfo.getCustomerId(), ActionType.ALARM_UNASSIGNED, user);
         } else {
             throw new ThingsboardException("Alarm was already unassigned!", ThingsboardErrorCode.BAD_REQUEST_PARAMS);
@@ -176,16 +176,16 @@ public class DefaultTbAlarmService extends AbstractTbEntityService implements Tb
     }
 
     @Override
-    public List<AlarmId> unassignDeletedUserAlarms(TenantId tenantId, User user, long unassignTs) {
+    public List<AlarmId> unassignDeletedUserAlarms(TenantId tenantId, UserId userId, String userTitle, long unassignTs) {
         List<AlarmId> totalAlarmIds = new ArrayList<>();
         PageLink pageLink = new PageLink(100, 0, null, new SortOrder("id", SortOrder.Direction.ASC));
         while (true) {
-            PageData<AlarmId> pageData = alarmService.findAlarmIdsByAssigneeId(user.getTenantId(), user.getId(), pageLink);
+            PageData<AlarmId> pageData = alarmService.findAlarmIdsByAssigneeId(tenantId, userId, pageLink);
             List<AlarmId> alarmIds = pageData.getData();
             if (alarmIds.isEmpty()) {
                 break;
             }
-            processAlarmsUnassignment(tenantId, user, alarmIds, unassignTs);
+            processAlarmsUnassignment(tenantId, userId, userTitle, alarmIds, unassignTs);
             totalAlarmIds.addAll(alarmIds);
             pageLink = pageLink.nextPageLink();
         }
@@ -195,7 +195,7 @@ public class DefaultTbAlarmService extends AbstractTbEntityService implements Tb
     @Override
     public Boolean delete(Alarm alarm, User user) {
         TenantId tenantId = alarm.getTenantId();
-        notificationEntityService.logEntityAction(tenantId, alarm.getOriginator(), alarm, alarm.getCustomerId(),
+        logEntityActionService.logEntityAction(tenantId, alarm.getOriginator(), alarm, alarm.getCustomerId(),
                 ActionType.ALARM_DELETE, user);
         return alarmSubscriptionService.deleteAlarm(tenantId, alarm.getId());
     }
@@ -204,18 +204,18 @@ public class DefaultTbAlarmService extends AbstractTbEntityService implements Tb
         return ts > 0 ? ts : System.currentTimeMillis();
     }
 
-    private void processAlarmsUnassignment(TenantId tenantId, User user, List<AlarmId> alarmIds, long unassignTs) {
+    private void processAlarmsUnassignment(TenantId tenantId, UserId userId, String userTitle, List<AlarmId> alarmIds, long unassignTs) {
         for (AlarmId alarmId : alarmIds) {
-            log.trace("[{}] Unassigning alarm {} userId {}", tenantId, alarmId, user.getId());
-            AlarmApiCallResult result = alarmSubscriptionService.unassignAlarm(user.getTenantId(), alarmId, unassignTs);
+            log.trace("[{}] Unassigning alarm {} userId {}", tenantId, alarmId, userId);
+            AlarmApiCallResult result = alarmSubscriptionService.unassignAlarm(tenantId, alarmId, unassignTs);
             if (!result.isSuccessful()) {
-                log.error("[{}] Cannot unassign alarm {} userId {}", tenantId, alarmId, user.getId());
+                log.error("[{}] Cannot unassign alarm {} userId {}", tenantId, alarmId, userId);
                 continue;
             }
             if (result.isModified()) {
-                String comment = String.format("Alarm was unassigned because user %s - was deleted", user.getTitle());
+                String comment = String.format("Alarm was unassigned because user %s - was deleted", userTitle);
                 addSystemAlarmComment(result.getAlarm(), null, "ASSIGN", comment);
-                notificationEntityService.logEntityAction(result.getAlarm().getTenantId(), result.getAlarm().getOriginator(), result.getAlarm(), result.getAlarm().getCustomerId(), ActionType.ALARM_UNASSIGNED, null);
+                logEntityActionService.logEntityAction(result.getAlarm().getTenantId(), result.getAlarm().getOriginator(), result.getAlarm(), result.getAlarm().getCustomerId(), ActionType.ALARM_UNASSIGNED, null);
             }
         }
     }
diff --git a/application/src/main/java/org/thingsboard/server/service/entitiy/alarm/TbAlarmService.java b/application/src/main/java/org/thingsboard/server/service/entitiy/alarm/TbAlarmService.java
index 34dc3d11f2..c975291b58 100644
--- a/application/src/main/java/org/thingsboard/server/service/entitiy/alarm/TbAlarmService.java
+++ b/application/src/main/java/org/thingsboard/server/service/entitiy/alarm/TbAlarmService.java
@@ -41,7 +41,7 @@ public interface TbAlarmService {
 
     AlarmInfo unassign(Alarm alarm, long unassignTs, User user) throws ThingsboardException;
 
-    List<AlarmId> unassignDeletedUserAlarms(TenantId tenantId, User user, long unassignTs);
+    List<AlarmId> unassignDeletedUserAlarms(TenantId tenantId, UserId userId, String userTitle, long unassignTs);
 
     Boolean delete(Alarm alarm, User user);
 }
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 58940318be..671d58a789 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,51 +22,34 @@ 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;
 import org.thingsboard.server.common.data.id.EdgeId;
 import org.thingsboard.server.common.data.id.TenantId;
-import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent;
 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());
-            notificationEntityService.logEntityAction(tenantId, savedAsset.getId(), savedAsset, asset.getCustomerId(),
+            logEntityActionService.logEntityAction(tenantId, savedAsset.getId(), savedAsset, asset.getCustomerId(),
                     actionType, user);
-            tbClusterService.broadcastEntityStateChangeEvent(tenantId, savedAsset.getId(),
-                    asset.getId() == null ? ComponentLifecycleEvent.CREATED : ComponentLifecycleEvent.UPDATED);
             return savedAsset;
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.ASSET), asset, actionType, user, e);
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.ASSET), asset, actionType, user, e);
             throw e;
         }
     }
@@ -78,12 +61,10 @@ public class DefaultTbAssetService extends AbstractTbEntityService implements Tb
         TenantId tenantId = asset.getTenantId();
         AssetId assetId = asset.getId();
         try {
-            removeAlarmsByEntityId(tenantId, assetId);
             assetService.deleteAsset(tenantId, assetId);
-            notificationEntityService.logEntityAction(tenantId, assetId, asset, asset.getCustomerId(), actionType, user, assetId.toString());
-            tbClusterService.broadcastEntityStateChangeEvent(tenantId, assetId, ComponentLifecycleEvent.DELETED);
+            logEntityActionService.logEntityAction(tenantId, assetId, asset, asset.getCustomerId(), actionType, user, assetId.toString());
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.ASSET), actionType, user, e,
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.ASSET), actionType, user, e,
                     assetId.toString());
             throw e;
         }
@@ -95,12 +76,12 @@ public class DefaultTbAssetService extends AbstractTbEntityService implements Tb
         CustomerId customerId = customer.getId();
         try {
             Asset savedAsset = checkNotNull(assetService.assignAssetToCustomer(tenantId, assetId, customerId));
-            notificationEntityService.logEntityAction(tenantId, assetId, savedAsset, customerId, actionType, user,
+            logEntityActionService.logEntityAction(tenantId, assetId, savedAsset, customerId, actionType, user,
                     assetId.toString(), customerId.toString(), customer.getName());
 
             return savedAsset;
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.ASSET), actionType, user, e,
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.ASSET), actionType, user, e,
                     assetId.toString(), customerId.toString());
             throw e;
         }
@@ -112,12 +93,12 @@ public class DefaultTbAssetService extends AbstractTbEntityService implements Tb
         try {
             Asset savedAsset = checkNotNull(assetService.unassignAssetFromCustomer(tenantId, assetId));
             CustomerId customerId = customer.getId();
-            notificationEntityService.logEntityAction(tenantId, assetId, savedAsset, customerId, actionType, user,
+            logEntityActionService.logEntityAction(tenantId, assetId, savedAsset, customerId, actionType, user,
                     assetId.toString(), customerId.toString(), customer.getName());
 
             return savedAsset;
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.ASSET), actionType, user, e, assetId.toString());
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.ASSET), actionType, user, e, assetId.toString());
             throw e;
         }
     }
@@ -129,12 +110,12 @@ public class DefaultTbAssetService extends AbstractTbEntityService implements Tb
             Customer publicCustomer = customerService.findOrCreatePublicCustomer(tenantId);
             Asset savedAsset = checkNotNull(assetService.assignAssetToCustomer(tenantId, assetId, publicCustomer.getId()));
             CustomerId customerId = publicCustomer.getId();
-            notificationEntityService.logEntityAction(tenantId, assetId, savedAsset, customerId, actionType, user,
+            logEntityActionService.logEntityAction(tenantId, assetId, savedAsset, customerId, actionType, user,
                     assetId.toString(), customerId.toString(), publicCustomer.getName());
 
             return savedAsset;
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.ASSET), actionType, user, e, assetId.toString());
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.ASSET), actionType, user, e, assetId.toString());
             throw e;
         }
     }
@@ -145,11 +126,11 @@ public class DefaultTbAssetService extends AbstractTbEntityService implements Tb
         EdgeId edgeId = edge.getId();
         try {
             Asset savedAsset = checkNotNull(assetService.assignAssetToEdge(tenantId, assetId, edgeId));
-            notificationEntityService.logEntityAction(tenantId, assetId, savedAsset, savedAsset.getCustomerId(),
+            logEntityActionService.logEntityAction(tenantId, assetId, savedAsset, savedAsset.getCustomerId(),
                     actionType, user, assetId.toString(), edgeId.toString(), edge.getName());
             return savedAsset;
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.ASSET), actionType,
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.ASSET), actionType,
                     user, e, assetId.toString(), edgeId.toString());
             throw e;
         }
@@ -162,12 +143,12 @@ public class DefaultTbAssetService extends AbstractTbEntityService implements Tb
         EdgeId edgeId = edge.getId();
         try {
             Asset savedAsset = checkNotNull(assetService.unassignAssetFromEdge(tenantId, assetId, edgeId));
-            notificationEntityService.logEntityAction(tenantId, assetId, asset, asset.getCustomerId(),
+            logEntityActionService.logEntityAction(tenantId, assetId, asset, asset.getCustomerId(),
                     actionType, user, assetId.toString(), edgeId.toString(), edge.getName());
 
             return savedAsset;
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.ASSET), actionType,
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.ASSET), actionType,
                     user, e, assetId.toString(), edgeId.toString());
             throw 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 832a9a3003..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,17 +22,13 @@ 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;
-import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent;
 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
@@ -46,24 +42,13 @@ 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());
-            tbClusterService.broadcastEntityStateChangeEvent(tenantId, savedAssetProfile.getId(),
-                    actionType.equals(ActionType.ADDED) ? ComponentLifecycleEvent.CREATED : ComponentLifecycleEvent.UPDATED);
-
-            notificationEntityService.logEntityAction(tenantId, savedAssetProfile.getId(), savedAssetProfile,
+            logEntityActionService.logEntityAction(tenantId, savedAssetProfile.getId(), savedAssetProfile,
                     null, actionType, user);
             return savedAssetProfile;
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.ASSET_PROFILE), assetProfile, actionType, user, e);
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.ASSET_PROFILE), assetProfile, actionType, user, e);
             throw e;
         }
     }
@@ -75,12 +60,10 @@ public class DefaultTbAssetProfileService extends AbstractTbEntityService implem
         TenantId tenantId = assetProfile.getTenantId();
         try {
             assetProfileService.deleteAssetProfile(tenantId, assetProfileId);
-
-            tbClusterService.broadcastEntityStateChangeEvent(tenantId, assetProfileId, ComponentLifecycleEvent.DELETED);
-            notificationEntityService.logEntityAction(tenantId, assetProfileId, assetProfile, null,
+            logEntityActionService.logEntityAction(tenantId, assetProfileId, assetProfile, null,
                     actionType, user, assetProfileId.toString());
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.ASSET_PROFILE), actionType,
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.ASSET_PROFILE), actionType,
                     user, e, assetProfileId.toString());
             throw e;
         }
@@ -94,16 +77,15 @@ public class DefaultTbAssetProfileService extends AbstractTbEntityService implem
             if (assetProfileService.setDefaultAssetProfile(tenantId, assetProfileId)) {
                 if (previousDefaultAssetProfile != null) {
                     previousDefaultAssetProfile = assetProfileService.findAssetProfileById(tenantId, previousDefaultAssetProfile.getId());
-                    notificationEntityService.logEntityAction(tenantId, previousDefaultAssetProfile.getId(), previousDefaultAssetProfile,
+                    logEntityActionService.logEntityAction(tenantId, previousDefaultAssetProfile.getId(), previousDefaultAssetProfile,
                             ActionType.UPDATED, user);
                 }
                 assetProfile = assetProfileService.findAssetProfileById(tenantId, assetProfileId);
-
-                notificationEntityService.logEntityAction(tenantId, assetProfileId, assetProfile, ActionType.UPDATED, user);
+                logEntityActionService.logEntityAction(tenantId, assetProfileId, assetProfile, ActionType.UPDATED, user);
             }
             return assetProfile;
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.ASSET_PROFILE), ActionType.UPDATED,
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.ASSET_PROFILE), ActionType.UPDATED,
                     user, e, assetProfileId.toString());
             throw e;
         }
diff --git a/application/src/main/java/org/thingsboard/server/service/entitiy/customer/DefaultTbCustomerService.java b/application/src/main/java/org/thingsboard/server/service/entitiy/customer/DefaultTbCustomerService.java
index 2d4ce339a1..f7c19773ae 100644
--- a/application/src/main/java/org/thingsboard/server/service/entitiy/customer/DefaultTbCustomerService.java
+++ b/application/src/main/java/org/thingsboard/server/service/entitiy/customer/DefaultTbCustomerService.java
@@ -37,10 +37,10 @@ public class DefaultTbCustomerService extends AbstractTbEntityService implements
         try {
             Customer savedCustomer = checkNotNull(customerService.saveCustomer(customer));
             autoCommit(user, savedCustomer.getId());
-            notificationEntityService.logEntityAction(tenantId, savedCustomer.getId(), savedCustomer, null, actionType, user);
+            logEntityActionService.logEntityAction(tenantId, savedCustomer.getId(), savedCustomer, null, actionType, user);
             return savedCustomer;
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.CUSTOMER), customer, actionType, user, e);
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.CUSTOMER), customer, actionType, user, e);
             throw e;
         }
     }
@@ -52,11 +52,10 @@ public class DefaultTbCustomerService extends AbstractTbEntityService implements
         CustomerId customerId = customer.getId();
         try {
             customerService.deleteCustomer(tenantId, customerId);
-            notificationEntityService.logEntityAction(tenantId, customer.getId(), customer, customerId, actionType,
+            logEntityActionService.logEntityAction(tenantId, customer.getId(), customer, customerId, actionType,
                     user, customerId.toString());
-            tbClusterService.broadcastEntityStateChangeEvent(tenantId, customer.getId(), ComponentLifecycleEvent.DELETED);
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.CUSTOMER), actionType, user,
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.CUSTOMER), actionType, user,
                     e, customerId.toString());
             throw e;
         }
diff --git a/application/src/main/java/org/thingsboard/server/service/entitiy/dashboard/DefaultTbDashboardService.java b/application/src/main/java/org/thingsboard/server/service/entitiy/dashboard/DefaultTbDashboardService.java
index 56890450a2..685eda0858 100644
--- a/application/src/main/java/org/thingsboard/server/service/entitiy/dashboard/DefaultTbDashboardService.java
+++ b/application/src/main/java/org/thingsboard/server/service/entitiy/dashboard/DefaultTbDashboardService.java
@@ -51,11 +51,11 @@ public class DefaultTbDashboardService extends AbstractTbEntityService implement
         try {
             Dashboard savedDashboard = checkNotNull(dashboardService.saveDashboard(dashboard));
             autoCommit(user, savedDashboard.getId());
-            notificationEntityService.logEntityAction(tenantId, savedDashboard.getId(), savedDashboard, null,
+            logEntityActionService.logEntityAction(tenantId, savedDashboard.getId(), savedDashboard, null,
                     actionType, user);
             return savedDashboard;
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.DASHBOARD), dashboard, actionType, user, e);
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.DASHBOARD), dashboard, actionType, user, e);
             throw e;
         }
     }
@@ -67,9 +67,9 @@ public class DefaultTbDashboardService extends AbstractTbEntityService implement
         TenantId tenantId = dashboard.getTenantId();
         try {
             dashboardService.deleteDashboard(tenantId, dashboardId);
-            notificationEntityService.logEntityAction(tenantId, dashboardId, dashboard, null, actionType, user, dashboardId.toString());
+            logEntityActionService.logEntityAction(tenantId, dashboardId, dashboard, null, actionType, user, dashboardId.toString());
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.DASHBOARD), actionType, user, e, dashboardId.toString());
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.DASHBOARD), actionType, user, e, dashboardId.toString());
             throw e;
         }
     }
@@ -82,11 +82,11 @@ public class DefaultTbDashboardService extends AbstractTbEntityService implement
         DashboardId dashboardId = dashboard.getId();
         try {
             Dashboard savedDashboard = checkNotNull(dashboardService.assignDashboardToCustomer(tenantId, dashboardId, customerId));
-            notificationEntityService.logEntityAction(tenantId, dashboardId, savedDashboard, customerId, actionType,
+            logEntityActionService.logEntityAction(tenantId, dashboardId, savedDashboard, customerId, actionType,
                     user, dashboardId.toString(), customerId.toString(), customer.getName());
             return savedDashboard;
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.DASHBOARD), actionType,
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.DASHBOARD), actionType,
                     user, e, dashboardId.toString(), customerId.toString());
             throw e;
         }
@@ -100,11 +100,11 @@ public class DefaultTbDashboardService extends AbstractTbEntityService implement
         try {
             Customer publicCustomer = customerService.findOrCreatePublicCustomer(tenantId);
             Dashboard savedDashboard = checkNotNull(dashboardService.assignDashboardToCustomer(tenantId, dashboardId, publicCustomer.getId()));
-            notificationEntityService.logEntityAction(tenantId, dashboardId, savedDashboard, publicCustomer.getId(),
+            logEntityActionService.logEntityAction(tenantId, dashboardId, savedDashboard, publicCustomer.getId(),
                     actionType, user, dashboardId.toString(), publicCustomer.getId().toString(), publicCustomer.getName());
             return savedDashboard;
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.DASHBOARD), actionType, user, e, dashboardId.toString());
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.DASHBOARD), actionType, user, e, dashboardId.toString());
             throw e;
         }
     }
@@ -117,11 +117,11 @@ public class DefaultTbDashboardService extends AbstractTbEntityService implement
         try {
             Customer publicCustomer = customerService.findOrCreatePublicCustomer(tenantId);
             Dashboard savedDashboard = checkNotNull(dashboardService.unassignDashboardFromCustomer(tenantId, dashboardId, publicCustomer.getId()));
-            notificationEntityService.logEntityAction(tenantId, dashboardId, dashboard, publicCustomer.getId(), actionType,
+            logEntityActionService.logEntityAction(tenantId, dashboardId, dashboard, publicCustomer.getId(), actionType,
                     user, dashboardId.toString(), publicCustomer.getId().toString(), publicCustomer.getName());
             return savedDashboard;
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.DASHBOARD), actionType, user, e, dashboardId.toString());
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.DASHBOARD), actionType, user, e, dashboardId.toString());
             throw e;
         }
     }
@@ -156,20 +156,20 @@ public class DefaultTbDashboardService extends AbstractTbEntityService implement
                 for (CustomerId customerId : addedCustomerIds) {
                     savedDashboard = checkNotNull(dashboardService.assignDashboardToCustomer(tenantId, dashboardId, customerId));
                     ShortCustomerInfo customerInfo = savedDashboard.getAssignedCustomerInfo(customerId);
-                    notificationEntityService.logEntityAction(tenantId, savedDashboard.getId(), savedDashboard, customerId,
+                    logEntityActionService.logEntityAction(tenantId, savedDashboard.getId(), savedDashboard, customerId,
                             actionType, user, dashboardId.toString(), customerId.toString(), customerInfo.getTitle());
                 }
                 actionType = ActionType.UNASSIGNED_FROM_CUSTOMER;
                 for (CustomerId customerId : removedCustomerIds) {
                     ShortCustomerInfo customerInfo = dashboard.getAssignedCustomerInfo(customerId);
                     savedDashboard = checkNotNull(dashboardService.unassignDashboardFromCustomer(tenantId, dashboardId, customerId));
-                    notificationEntityService.logEntityAction(tenantId, savedDashboard.getId(), savedDashboard, customerId,
+                    logEntityActionService.logEntityAction(tenantId, savedDashboard.getId(), savedDashboard, customerId,
                             actionType, user, dashboardId.toString(), customerId.toString(), customerInfo.getTitle());
                 }
                 return savedDashboard;
             }
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.DASHBOARD), actionType, user, e, dashboardId.toString());
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.DASHBOARD), actionType, user, e, dashboardId.toString());
             throw e;
         }
     }
@@ -193,13 +193,13 @@ public class DefaultTbDashboardService extends AbstractTbEntityService implement
                 for (CustomerId customerId : addedCustomerIds) {
                     savedDashboard = checkNotNull(dashboardService.assignDashboardToCustomer(tenantId, dashboardId, customerId));
                     ShortCustomerInfo customerInfo = savedDashboard.getAssignedCustomerInfo(customerId);
-                    notificationEntityService.logEntityAction(tenantId, dashboardId, savedDashboard, customerId,
+                    logEntityActionService.logEntityAction(tenantId, dashboardId, savedDashboard, customerId,
                             actionType, user, dashboardId.toString(), customerId.toString(), customerInfo.getTitle());
                 }
                 return savedDashboard;
             }
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.DASHBOARD), actionType, user, e, dashboardId.toString());
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.DASHBOARD), actionType, user, e, dashboardId.toString());
             throw e;
         }
     }
@@ -223,13 +223,13 @@ public class DefaultTbDashboardService extends AbstractTbEntityService implement
                 for (CustomerId customerId : removedCustomerIds) {
                     ShortCustomerInfo customerInfo = dashboard.getAssignedCustomerInfo(customerId);
                     savedDashboard = checkNotNull(dashboardService.unassignDashboardFromCustomer(tenantId, dashboardId, customerId));
-                    notificationEntityService.logEntityAction(tenantId, dashboardId, savedDashboard, customerId,
+                    logEntityActionService.logEntityAction(tenantId, dashboardId, savedDashboard, customerId,
                             actionType, user, dashboardId.toString(), customerId.toString(), customerInfo.getTitle());
                 }
                 return savedDashboard;
             }
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.DASHBOARD), actionType, user, e, dashboardId.toString());
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.DASHBOARD), actionType, user, e, dashboardId.toString());
             throw e;
         }
     }
@@ -240,11 +240,11 @@ public class DefaultTbDashboardService extends AbstractTbEntityService implement
         EdgeId edgeId = edge.getId();
         try {
             Dashboard savedDashboard = checkNotNull(dashboardService.assignDashboardToEdge(tenantId, dashboardId, edgeId));
-            notificationEntityService.logEntityAction(tenantId, dashboardId, savedDashboard, null, actionType,
+            logEntityActionService.logEntityAction(tenantId, dashboardId, savedDashboard, null, actionType,
                     user, dashboardId.toString(), edgeId.toString(), edge.getName());
             return savedDashboard;
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.DEVICE),
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.DEVICE),
                     actionType, user, e, dashboardId.toString(), edgeId);
             throw e;
         }
@@ -258,11 +258,11 @@ public class DefaultTbDashboardService extends AbstractTbEntityService implement
         EdgeId edgeId = edge.getId();
         try {
             Dashboard savedDevice = checkNotNull(dashboardService.unassignDashboardFromEdge(tenantId, dashboardId, edgeId));
-            notificationEntityService.logEntityAction(tenantId, dashboardId, dashboard, null, actionType,
+            logEntityActionService.logEntityAction(tenantId, dashboardId, dashboard, null, actionType,
                     user, dashboardId.toString(), edgeId.toString(), edge.getName());
             return savedDevice;
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.DASHBOARD), actionType, user, e,
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.DASHBOARD), actionType, user, e,
                     dashboardId.toString(), edgeId.toString());
             throw e;
         }
@@ -275,11 +275,11 @@ public class DefaultTbDashboardService extends AbstractTbEntityService implement
         DashboardId dashboardId = dashboard.getId();
         try {
             Dashboard savedDashboard = checkNotNull(dashboardService.unassignDashboardFromCustomer(tenantId, dashboardId, customer.getId()));
-            notificationEntityService.logEntityAction(tenantId, dashboardId, savedDashboard, customer.getId(),
+            logEntityActionService.logEntityAction(tenantId, dashboardId, savedDashboard, customer.getId(),
                     actionType, user, dashboardId.toString(), customer.getId().toString(), customer.getName());
             return savedDashboard;
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.DASHBOARD), actionType, user, e, dashboardId.toString());
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.DASHBOARD), actionType, user, e, dashboardId.toString());
             throw e;
         }
     }
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 8d43a43cbc..b05ece9c61 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
@@ -41,7 +41,6 @@ import org.thingsboard.server.dao.device.DeviceService;
 import org.thingsboard.server.dao.device.claim.ClaimResponse;
 import org.thingsboard.server.dao.device.claim.ClaimResult;
 import org.thingsboard.server.dao.device.claim.ReclaimResult;
-import org.thingsboard.server.dao.tenant.TenantService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.entitiy.AbstractTbEntityService;
 
@@ -54,39 +53,36 @@ public class DefaultTbDeviceService extends AbstractTbEntityService implements T
     private final DeviceService deviceService;
     private final DeviceCredentialsService deviceCredentialsService;
     private final ClaimDevicesService claimDevicesService;
-    private final TenantService tenantService;
 
     @Override
-    public Device save(Device device, Device oldDevice, String accessToken, User user) throws Exception {
+    public Device save(Device device, String accessToken, User user) throws Exception {
         ActionType actionType = device.getId() == null ? ActionType.ADDED : ActionType.UPDATED;
         TenantId tenantId = device.getTenantId();
         try {
             Device savedDevice = checkNotNull(deviceService.saveDeviceWithAccessToken(device, accessToken));
             autoCommit(user, savedDevice.getId());
-            notificationEntityService.notifyCreateOrUpdateDevice(tenantId, savedDevice.getId(), savedDevice.getCustomerId(),
-                    savedDevice, oldDevice, actionType, user);
+            logEntityActionService.logEntityAction(tenantId, savedDevice.getId(), savedDevice, savedDevice.getCustomerId(),
+                    actionType, user);
 
             return savedDevice;
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.DEVICE), device, actionType, user, e);
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.DEVICE), device, actionType, user, e);
             throw e;
         }
     }
 
     @Override
     public Device saveDeviceWithCredentials(Device device, DeviceCredentials credentials, User user) throws ThingsboardException {
-        boolean isCreate = device.getId() == null;
-        ActionType actionType = isCreate ? ActionType.ADDED : ActionType.UPDATED;
+        ActionType actionType = device.getId() == null ? ActionType.ADDED : ActionType.UPDATED;
         TenantId tenantId = device.getTenantId();
         try {
-            Device oldDevice = isCreate ? null : deviceService.findDeviceById(tenantId, device.getId());
             Device savedDevice = checkNotNull(deviceService.saveDeviceWithCredentials(device, credentials));
-            notificationEntityService.notifyCreateOrUpdateDevice(tenantId, savedDevice.getId(), savedDevice.getCustomerId(),
-                    savedDevice, oldDevice, actionType, user);
+            logEntityActionService.logEntityAction(tenantId, savedDevice.getId(), savedDevice, savedDevice.getCustomerId(),
+                    actionType, user);
 
             return savedDevice;
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.DEVICE), device, actionType, user, e);
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.DEVICE), device, actionType, user, e);
             throw e;
         }
     }
@@ -94,15 +90,15 @@ public class DefaultTbDeviceService extends AbstractTbEntityService implements T
     @Override
     @Transactional
     public void delete(Device device, User user) {
+        ActionType actionType = ActionType.DELETED;
         TenantId tenantId = device.getTenantId();
         DeviceId deviceId = device.getId();
         try {
-            removeAlarmsByEntityId(tenantId, deviceId);
             deviceService.deleteDevice(tenantId, deviceId);
-            notificationEntityService.notifyDeleteDevice(tenantId, deviceId, device.getCustomerId(), device,
+            logEntityActionService.logEntityAction(tenantId, deviceId, device, device.getCustomerId(), actionType,
                     user, deviceId.toString());
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.DEVICE), ActionType.DELETED,
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.DEVICE), actionType,
                     user, e, deviceId.toString());
             throw e;
         }
@@ -114,12 +110,12 @@ public class DefaultTbDeviceService extends AbstractTbEntityService implements T
         CustomerId customerId = customer.getId();
         try {
             Device savedDevice = checkNotNull(deviceService.assignDeviceToCustomer(tenantId, deviceId, customerId));
-            notificationEntityService.logEntityAction(tenantId, deviceId, savedDevice, customerId, actionType, user,
+            logEntityActionService.logEntityAction(tenantId, deviceId, savedDevice, customerId, actionType, user,
                     deviceId.toString(), customerId.toString(), customer.getName());
 
             return savedDevice;
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.DEVICE), actionType, user,
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.DEVICE), actionType, user,
                     e, deviceId.toString(), customerId.toString());
             throw e;
         }
@@ -134,12 +130,12 @@ public class DefaultTbDeviceService extends AbstractTbEntityService implements T
             Device savedDevice = checkNotNull(deviceService.unassignDeviceFromCustomer(tenantId, deviceId));
             CustomerId customerId = customer.getId();
 
-            notificationEntityService.logEntityAction(tenantId, deviceId, savedDevice, customerId, actionType, user,
+            logEntityActionService.logEntityAction(tenantId, deviceId, savedDevice, customerId, actionType, user,
                     deviceId.toString(), customerId.toString(), customer.getName());
 
             return savedDevice;
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.DEVICE), actionType,
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.DEVICE), actionType,
                     user, e, deviceId.toString());
             throw e;
         }
@@ -152,12 +148,12 @@ public class DefaultTbDeviceService extends AbstractTbEntityService implements T
         try {
             Device savedDevice = checkNotNull(deviceService.assignDeviceToCustomer(tenantId, deviceId, publicCustomer.getId()));
 
-            notificationEntityService.logEntityAction(tenantId, deviceId, savedDevice, savedDevice.getCustomerId(),
+            logEntityActionService.logEntityAction(tenantId, deviceId, savedDevice, savedDevice.getCustomerId(),
                     actionType, user, deviceId.toString(), publicCustomer.getId().toString(), publicCustomer.getName());
 
             return savedDevice;
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.DEVICE), actionType,
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.DEVICE), actionType,
                     user, e, deviceId.toString());
             throw e;
         }
@@ -169,11 +165,11 @@ public class DefaultTbDeviceService extends AbstractTbEntityService implements T
         DeviceId deviceId = device.getId();
         try {
             DeviceCredentials deviceCredentials = checkNotNull(deviceCredentialsService.findDeviceCredentialsByDeviceId(tenantId, deviceId));
-            notificationEntityService.logEntityAction(tenantId, deviceId, device, device.getCustomerId(),
+            logEntityActionService.logEntityAction(tenantId, deviceId, device, device.getCustomerId(),
                     ActionType.CREDENTIALS_READ, user, deviceId.toString());
             return deviceCredentials;
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.DEVICE),
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.DEVICE),
                     ActionType.CREDENTIALS_READ, user, e, deviceId.toString());
             throw e;
         }
@@ -181,15 +177,17 @@ public class DefaultTbDeviceService extends AbstractTbEntityService implements T
 
     @Override
     public DeviceCredentials updateDeviceCredentials(Device device, DeviceCredentials deviceCredentials, User user) throws ThingsboardException {
+        ActionType actionType = ActionType.CREDENTIALS_UPDATED;
         TenantId tenantId = device.getTenantId();
         DeviceId deviceId = device.getId();
         try {
             DeviceCredentials result = checkNotNull(deviceCredentialsService.updateDeviceCredentials(tenantId, deviceCredentials));
-            notificationEntityService.notifyUpdateDeviceCredentials(tenantId, deviceId, device.getCustomerId(), device, result, user);
+            logEntityActionService.logEntityAction(tenantId, deviceId, device, device.getCustomerId(),
+                    actionType, user, deviceCredentials);
             return result;
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.DEVICE),
-                    ActionType.CREDENTIALS_UPDATED, user, e, deviceCredentials);
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.DEVICE),
+                    actionType, user, e, deviceCredentials);
             throw e;
         }
     }
@@ -200,7 +198,7 @@ public class DefaultTbDeviceService extends AbstractTbEntityService implements T
 
         return Futures.transform(future, result -> {
             if (result != null && result.getResponse().equals(ClaimResponse.SUCCESS)) {
-                notificationEntityService.logEntityAction(tenantId, device.getId(), result.getDevice(), customerId,
+                logEntityActionService.logEntityAction(tenantId, device.getId(), result.getDevice(), customerId,
                         ActionType.ASSIGNED_TO_CUSTOMER, user, device.getId().toString(), customerId.toString(),
                         customerService.findCustomerById(tenantId, customerId).getName());
             }
@@ -215,7 +213,7 @@ public class DefaultTbDeviceService extends AbstractTbEntityService implements T
         return Futures.transform(future, result -> {
             Customer unassignedCustomer = result.getUnassignedCustomer();
             if (unassignedCustomer != null) {
-                notificationEntityService.logEntityAction(tenantId, device.getId(), device, device.getCustomerId(),
+                logEntityActionService.logEntityAction(tenantId, device.getId(), device, device.getCustomerId(),
                         ActionType.UNASSIGNED_FROM_CUSTOMER, user, device.getId().toString(),
                         unassignedCustomer.getId().toString(), unassignedCustomer.getName());
             }
@@ -225,20 +223,20 @@ public class DefaultTbDeviceService extends AbstractTbEntityService implements T
 
     @Override
     public Device assignDeviceToTenant(Device device, Tenant newTenant, User user) {
+        ActionType actionType = ActionType.ASSIGNED_TO_TENANT;
         TenantId tenantId = device.getTenantId();
         TenantId newTenantId = newTenant.getId();
         DeviceId deviceId = device.getId();
         try {
-            Tenant tenant = tenantService.findTenantById(tenantId);
             Device assignedDevice = deviceService.assignDeviceToTenant(newTenantId, device);
 
-            notificationEntityService.notifyAssignDeviceToTenant(tenantId, newTenantId, deviceId,
-                    assignedDevice.getCustomerId(), assignedDevice, tenant, user, newTenantId.toString(), newTenant.getName());
+            logEntityActionService.logEntityAction(tenantId, deviceId, assignedDevice, assignedDevice.getCustomerId(),
+                    actionType, user, newTenantId.toString(), newTenant.getName());
 
             return assignedDevice;
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.DEVICE),
-                    ActionType.ASSIGNED_TO_TENANT, user, e, deviceId.toString());
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.DEVICE),
+                    actionType, user, e, deviceId.toString());
             throw e;
         }
     }
@@ -249,12 +247,12 @@ public class DefaultTbDeviceService extends AbstractTbEntityService implements T
         EdgeId edgeId = edge.getId();
         try {
             Device savedDevice = checkNotNull(deviceService.assignDeviceToEdge(tenantId, deviceId, edgeId));
-            notificationEntityService.logEntityAction(tenantId, deviceId, savedDevice, savedDevice.getCustomerId(),
+            logEntityActionService.logEntityAction(tenantId, deviceId, savedDevice, savedDevice.getCustomerId(),
                     actionType, user, deviceId.toString(), edgeId.toString(), edge.getName());
 
             return savedDevice;
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.DEVICE),
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.DEVICE),
                     actionType, user, e, deviceId.toString(), edgeId.toString());
             throw e;
         }
@@ -268,12 +266,12 @@ public class DefaultTbDeviceService extends AbstractTbEntityService implements T
         EdgeId edgeId = edge.getId();
         try {
             Device savedDevice = checkNotNull(deviceService.unassignDeviceFromEdge(tenantId, deviceId, edgeId));
-            notificationEntityService.logEntityAction(tenantId, deviceId, savedDevice, savedDevice.getCustomerId(),
+            logEntityActionService.logEntityAction(tenantId, deviceId, savedDevice, savedDevice.getCustomerId(),
                     actionType, user, deviceId.toString(), edgeId.toString(), edge.getName());
 
             return savedDevice;
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.DEVICE),
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.DEVICE),
                     actionType, user, e, deviceId.toString(), edgeId.toString());
             throw e;
         }
diff --git a/application/src/main/java/org/thingsboard/server/service/entitiy/device/TbDeviceService.java b/application/src/main/java/org/thingsboard/server/service/entitiy/device/TbDeviceService.java
index 1cd0581e2e..7d10502f7c 100644
--- a/application/src/main/java/org/thingsboard/server/service/entitiy/device/TbDeviceService.java
+++ b/application/src/main/java/org/thingsboard/server/service/entitiy/device/TbDeviceService.java
@@ -31,7 +31,7 @@ import org.thingsboard.server.dao.device.claim.ReclaimResult;
 
 public interface TbDeviceService {
 
-    Device save(Device device, Device oldDevice, String accessToken, User user) throws Exception;
+    Device save(Device device, String accessToken, User user) throws Exception;
 
     Device saveDeviceWithCredentials(Device device, DeviceCredentials deviceCredentials, User user) throws ThingsboardException;
 
diff --git a/application/src/main/java/org/thingsboard/server/service/entitiy/device/profile/DefaultTbDeviceProfileService.java b/application/src/main/java/org/thingsboard/server/service/entitiy/device/profile/DefaultTbDeviceProfileService.java
index 2135632b5c..35b12d721e 100644
--- a/application/src/main/java/org/thingsboard/server/service/entitiy/device/profile/DefaultTbDeviceProfileService.java
+++ b/application/src/main/java/org/thingsboard/server/service/entitiy/device/profile/DefaultTbDeviceProfileService.java
@@ -25,13 +25,9 @@ import org.thingsboard.server.common.data.audit.ActionType;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
 import org.thingsboard.server.common.data.id.TenantId;
-import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent;
 import org.thingsboard.server.dao.device.DeviceProfileService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.entitiy.AbstractTbEntityService;
-import org.thingsboard.server.service.ota.OtaPackageStateService;
-
-import java.util.Objects;
 
 @Service
 @TbCoreComponent
@@ -40,38 +36,20 @@ import java.util.Objects;
 public class DefaultTbDeviceProfileService extends AbstractTbEntityService implements TbDeviceProfileService {
 
     private final DeviceProfileService deviceProfileService;
-    private final OtaPackageStateService otaPackageStateService;
 
     @Override
     public DeviceProfile save(DeviceProfile deviceProfile, User user) throws Exception {
         ActionType actionType = deviceProfile.getId() == null ? ActionType.ADDED : ActionType.UPDATED;
         TenantId tenantId = deviceProfile.getTenantId();
         try {
-            boolean isFirmwareChanged = false;
-            boolean isSoftwareChanged = false;
-
-            if (actionType.equals(ActionType.UPDATED)) {
-                DeviceProfile oldDeviceProfile = deviceProfileService.findDeviceProfileById(tenantId, deviceProfile.getId());
-                if (!Objects.equals(deviceProfile.getFirmwareId(), oldDeviceProfile.getFirmwareId())) {
-                    isFirmwareChanged = true;
-                }
-                if (!Objects.equals(deviceProfile.getSoftwareId(), oldDeviceProfile.getSoftwareId())) {
-                    isSoftwareChanged = true;
-                }
-            }
             DeviceProfile savedDeviceProfile = checkNotNull(deviceProfileService.saveDeviceProfile(deviceProfile));
             autoCommit(user, savedDeviceProfile.getId());
-            tbClusterService.onDeviceProfileChange(savedDeviceProfile, null);
-            tbClusterService.broadcastEntityStateChangeEvent(tenantId, savedDeviceProfile.getId(),
-                    actionType.equals(ActionType.ADDED) ? ComponentLifecycleEvent.CREATED : ComponentLifecycleEvent.UPDATED);
-
-            otaPackageStateService.update(savedDeviceProfile, isFirmwareChanged, isSoftwareChanged);
 
-            notificationEntityService.logEntityAction(tenantId, savedDeviceProfile.getId(), savedDeviceProfile,
+            logEntityActionService.logEntityAction(tenantId, savedDeviceProfile.getId(), savedDeviceProfile,
                     null, actionType, user);
             return savedDeviceProfile;
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.DEVICE_PROFILE), deviceProfile, actionType, user, e);
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.DEVICE_PROFILE), deviceProfile, actionType, user, e);
             throw e;
         }
     }
@@ -84,12 +62,10 @@ public class DefaultTbDeviceProfileService extends AbstractTbEntityService imple
         try {
             deviceProfileService.deleteDeviceProfile(tenantId, deviceProfileId);
 
-            tbClusterService.onDeviceProfileDelete(deviceProfile, null);
-            tbClusterService.broadcastEntityStateChangeEvent(tenantId, deviceProfileId, ComponentLifecycleEvent.DELETED);
-            notificationEntityService.logEntityAction(tenantId, deviceProfileId, deviceProfile, null,
+            logEntityActionService.logEntityAction(tenantId, deviceProfileId, deviceProfile, null,
                     actionType, user, deviceProfileId.toString());
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.DEVICE_PROFILE), actionType,
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.DEVICE_PROFILE), actionType,
                     user, e, deviceProfileId.toString());
             throw e;
         }
@@ -103,16 +79,16 @@ public class DefaultTbDeviceProfileService extends AbstractTbEntityService imple
             if (deviceProfileService.setDefaultDeviceProfile(tenantId, deviceProfileId)) {
                 if (previousDefaultDeviceProfile != null) {
                     previousDefaultDeviceProfile = deviceProfileService.findDeviceProfileById(tenantId, previousDefaultDeviceProfile.getId());
-                    notificationEntityService.logEntityAction(tenantId, previousDefaultDeviceProfile.getId(), previousDefaultDeviceProfile,
+                    logEntityActionService.logEntityAction(tenantId, previousDefaultDeviceProfile.getId(), previousDefaultDeviceProfile,
                             ActionType.UPDATED, user);
                 }
                 deviceProfile = deviceProfileService.findDeviceProfileById(tenantId, deviceProfileId);
 
-                notificationEntityService.logEntityAction(tenantId, deviceProfileId, deviceProfile, ActionType.UPDATED, user);
+                logEntityActionService.logEntityAction(tenantId, deviceProfileId, deviceProfile, ActionType.UPDATED, user);
             }
             return deviceProfile;
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.DEVICE_PROFILE), ActionType.UPDATED,
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.DEVICE_PROFILE), ActionType.UPDATED,
                     user, e, deviceProfileId.toString());
             throw e;
         }
diff --git a/application/src/main/java/org/thingsboard/server/service/entitiy/edge/DefaultTbEdgeService.java b/application/src/main/java/org/thingsboard/server/service/entitiy/edge/DefaultTbEdgeService.java
index 770d1af3db..9fcd8e2187 100644
--- a/application/src/main/java/org/thingsboard/server/service/entitiy/edge/DefaultTbEdgeService.java
+++ b/application/src/main/java/org/thingsboard/server/service/entitiy/edge/DefaultTbEdgeService.java
@@ -48,36 +48,37 @@ public class DefaultTbEdgeService extends AbstractTbEntityService implements TbE
         ActionType actionType = edge.getId() == null ? ActionType.ADDED : ActionType.UPDATED;
         TenantId tenantId = edge.getTenantId();
         try {
-            if (actionType == ActionType.ADDED && edge.getRootRuleChainId() == null) {
+            if (ActionType.ADDED.equals(actionType) && edge.getRootRuleChainId() == null) {
                 edge.setRootRuleChainId(edgeTemplateRootRuleChain.getId());
             }
             Edge savedEdge = checkNotNull(edgeService.saveEdge(edge));
             EdgeId edgeId = savedEdge.getId();
 
-            if (actionType == ActionType.ADDED) {
+            if (ActionType.ADDED.equals(actionType)) {
                 ruleChainService.assignRuleChainToEdge(tenantId, edgeTemplateRootRuleChain.getId(), edgeId);
                 edgeNotificationService.setEdgeRootRuleChain(tenantId, savedEdge, edgeTemplateRootRuleChain.getId());
                 edgeService.assignDefaultRuleChainsToEdge(tenantId, edgeId);
             }
 
-            notificationEntityService.notifyCreateOrUpdateOrDeleteEdge(tenantId, edgeId, savedEdge.getCustomerId(), savedEdge, actionType, user);
+            logEntityActionService.logEntityAction(tenantId, edgeId, savedEdge, savedEdge.getCustomerId(), actionType, user);
 
             return savedEdge;
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.EDGE), edge, actionType, user, e);
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.EDGE), edge, actionType, user, e);
             throw e;
         }
     }
 
     @Override
     public void delete(Edge edge, User user) {
+        ActionType actionType = ActionType.DELETED;
         EdgeId edgeId = edge.getId();
         TenantId tenantId = edge.getTenantId();
         try {
             edgeService.deleteEdge(tenantId, edgeId);
-            notificationEntityService.notifyCreateOrUpdateOrDeleteEdge(tenantId, edgeId, edge.getCustomerId(), edge, ActionType.DELETED, user, edgeId.toString());
+            logEntityActionService.logEntityAction(tenantId, edgeId, edge, edge.getCustomerId(), actionType, user, edgeId.toString());
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.EDGE), ActionType.DELETED,
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.EDGE), actionType,
                     user, e, edgeId.toString());
             throw e;
         }
@@ -89,12 +90,12 @@ public class DefaultTbEdgeService extends AbstractTbEntityService implements TbE
         CustomerId customerId = customer.getId();
         try {
             Edge savedEdge = checkNotNull(edgeService.assignEdgeToCustomer(tenantId, edgeId, customerId));
-            notificationEntityService.logEntityAction(tenantId, edgeId, savedEdge, customerId, actionType,
+            logEntityActionService.logEntityAction(tenantId, edgeId, savedEdge, customerId, actionType,
                     user, edgeId.toString(), customerId.toString(), customer.getName());
 
             return savedEdge;
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.EDGE),
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.EDGE),
                     ActionType.ASSIGNED_TO_CUSTOMER, user, e, edgeId.toString(), customerId.toString());
             throw e;
         }
@@ -108,11 +109,11 @@ public class DefaultTbEdgeService extends AbstractTbEntityService implements TbE
         CustomerId customerId = customer.getId();
         try {
             Edge savedEdge = checkNotNull(edgeService.unassignEdgeFromCustomer(tenantId, edgeId));
-            notificationEntityService.logEntityAction(tenantId, edgeId, savedEdge, customerId, actionType,
+            logEntityActionService.logEntityAction(tenantId, edgeId, savedEdge, customerId, actionType,
                     user, edgeId.toString(), customerId.toString(), customer.getName());
             return savedEdge;
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.EDGE),
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.EDGE),
                     ActionType.UNASSIGNED_FROM_CUSTOMER, user, e, edgeId.toString());
             throw e;
         }
@@ -120,18 +121,19 @@ public class DefaultTbEdgeService extends AbstractTbEntityService implements TbE
 
     @Override
     public Edge assignEdgeToPublicCustomer(TenantId tenantId, EdgeId edgeId, User user) throws ThingsboardException {
+        ActionType actionType = ActionType.ASSIGNED_TO_CUSTOMER;
         Customer publicCustomer = customerService.findOrCreatePublicCustomer(tenantId);
         CustomerId customerId = publicCustomer.getId();
         try {
             Edge savedEdge = checkNotNull(edgeService.assignEdgeToCustomer(tenantId, edgeId, customerId));
 
-            notificationEntityService.notifyCreateOrUpdateOrDeleteEdge(tenantId, edgeId, customerId, savedEdge, ActionType.ASSIGNED_TO_CUSTOMER, user,
+            logEntityActionService.logEntityAction(tenantId, edgeId, savedEdge, customerId, actionType, user,
                     edgeId.toString(), customerId.toString(), publicCustomer.getName());
 
             return savedEdge;
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.EDGE),
-                    ActionType.ASSIGNED_TO_CUSTOMER, user, e, edgeId.toString());
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.EDGE),
+                    actionType, user, e, edgeId.toString());
             throw e;
         }
     }
@@ -142,10 +144,10 @@ public class DefaultTbEdgeService extends AbstractTbEntityService implements TbE
         EdgeId edgeId = edge.getId();
         try {
             Edge updatedEdge = edgeNotificationService.setEdgeRootRuleChain(tenantId, edge, ruleChainId);
-            notificationEntityService.logEntityAction(tenantId, edgeId, edge, null, ActionType.UPDATED, user);
+            logEntityActionService.logEntityAction(tenantId, edgeId, edge, null, ActionType.UPDATED, user);
             return updatedEdge;
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.EDGE),
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.EDGE),
                     ActionType.UPDATED, user, e, edgeId.toString());
             throw e;
         }
diff --git a/application/src/main/java/org/thingsboard/server/service/entitiy/entity/relation/DefaultTbEntityRelationService.java b/application/src/main/java/org/thingsboard/server/service/entitiy/entity/relation/DefaultTbEntityRelationService.java
index 9c829ef041..724c077e62 100644
--- a/application/src/main/java/org/thingsboard/server/service/entitiy/entity/relation/DefaultTbEntityRelationService.java
+++ b/application/src/main/java/org/thingsboard/server/service/entitiy/entity/relation/DefaultTbEntityRelationService.java
@@ -43,10 +43,10 @@ public class DefaultTbEntityRelationService extends AbstractTbEntityService impl
         ActionType actionType = ActionType.RELATION_ADD_OR_UPDATE;
         try {
             relationService.saveRelation(tenantId, relation);
-            notificationEntityService.logEntityRelationAction(tenantId, customerId,
+            logEntityActionService.logEntityRelationAction(tenantId, customerId,
                     relation, user, actionType, null, relation);
         } catch (Exception e) {
-            notificationEntityService.logEntityRelationAction(tenantId, customerId,
+            logEntityActionService.logEntityRelationAction(tenantId, customerId,
                     relation, user, actionType, e, relation);
             throw e;
         }
@@ -60,9 +60,9 @@ public class DefaultTbEntityRelationService extends AbstractTbEntityService impl
             if (!found) {
                 throw new ThingsboardException("Requested item wasn't found!", ThingsboardErrorCode.ITEM_NOT_FOUND);
             }
-            notificationEntityService.logEntityRelationAction(tenantId, customerId, relation, user, actionType, null, relation);
+            logEntityActionService.logEntityRelationAction(tenantId, customerId, relation, user, actionType, null, relation);
         } catch (Exception e) {
-            notificationEntityService.logEntityRelationAction(tenantId, customerId,
+            logEntityActionService.logEntityRelationAction(tenantId, customerId,
                     relation, user, actionType, e, relation);
             throw e;
         }
@@ -72,9 +72,9 @@ public class DefaultTbEntityRelationService extends AbstractTbEntityService impl
     public void deleteCommonRelations(TenantId tenantId, CustomerId customerId, EntityId entityId, User user) throws ThingsboardException {
         try {
             relationService.deleteEntityCommonRelations(tenantId, entityId);
-            notificationEntityService.logEntityAction(tenantId, entityId, null, customerId, ActionType.RELATIONS_DELETED, user);
+            logEntityActionService.logEntityAction(tenantId, entityId, null, customerId, ActionType.RELATIONS_DELETED, user);
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, entityId, null, customerId,
+            logEntityActionService.logEntityAction(tenantId, entityId, null, customerId,
                     ActionType.RELATIONS_DELETED, user, e);
             throw e;
         }
diff --git a/application/src/main/java/org/thingsboard/server/service/entitiy/entityview/DefaultTbEntityViewService.java b/application/src/main/java/org/thingsboard/server/service/entitiy/entityview/DefaultTbEntityViewService.java
index 8475dccf82..82877283cd 100644
--- a/application/src/main/java/org/thingsboard/server/service/entitiy/entityview/DefaultTbEntityViewService.java
+++ b/application/src/main/java/org/thingsboard/server/service/entitiy/entityview/DefaultTbEntityViewService.java
@@ -20,12 +20,13 @@ 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.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ConcurrentReferenceHashMap;
+import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.Customer;
-import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.EntityView;
 import org.thingsboard.server.common.data.User;
@@ -49,7 +50,6 @@ import org.thingsboard.server.dao.timeseries.TimeseriesService;
 import org.thingsboard.server.service.entitiy.AbstractTbEntityService;
 import org.thingsboard.server.service.telemetry.TelemetrySubscriptionService;
 
-import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -81,14 +81,12 @@ public class DefaultTbEntityViewService extends AbstractTbEntityService implemen
             EntityView savedEntityView = checkNotNull(entityViewService.saveEntityView(entityView));
             this.updateEntityViewAttributes(tenantId, savedEntityView, existingEntityView, user);
             autoCommit(user, savedEntityView.getId());
-            notificationEntityService.logEntityAction(savedEntityView.getTenantId(), savedEntityView.getId(), savedEntityView,
+            logEntityActionService.logEntityAction(savedEntityView.getTenantId(), savedEntityView.getId(), savedEntityView,
                     null, actionType, user);
             localCache.computeIfAbsent(savedEntityView.getTenantId(), (k) -> new ConcurrentReferenceHashMap<>()).clear();
-            tbClusterService.broadcastEntityStateChangeEvent(savedEntityView.getTenantId(), savedEntityView.getId(),
-                    entityView.getId() == null ? ComponentLifecycleEvent.CREATED : ComponentLifecycleEvent.UPDATED);
             return savedEntityView;
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(user.getTenantId(), emptyId(EntityType.ENTITY_VIEW), entityView, actionType, user, e);
+            logEntityActionService.logEntityAction(user.getTenantId(), emptyId(EntityType.ENTITY_VIEW), entityView, actionType, user, e);
             throw e;
         }
     }
@@ -99,9 +97,9 @@ public class DefaultTbEntityViewService extends AbstractTbEntityService implemen
 
         if (oldEntityView != null) {
             if (oldEntityView.getKeys() != null && oldEntityView.getKeys().getAttributes() != null) {
-                futures.add(deleteAttributesFromEntityView(oldEntityView, DataConstants.CLIENT_SCOPE, oldEntityView.getKeys().getAttributes().getCs(), user));
-                futures.add(deleteAttributesFromEntityView(oldEntityView, DataConstants.SERVER_SCOPE, oldEntityView.getKeys().getAttributes().getSs(), user));
-                futures.add(deleteAttributesFromEntityView(oldEntityView, DataConstants.SHARED_SCOPE, oldEntityView.getKeys().getAttributes().getSh(), user));
+                futures.add(deleteAttributesFromEntityView(oldEntityView, AttributeScope.CLIENT_SCOPE, oldEntityView.getKeys().getAttributes().getCs(), user));
+                futures.add(deleteAttributesFromEntityView(oldEntityView, AttributeScope.SERVER_SCOPE, oldEntityView.getKeys().getAttributes().getSs(), user));
+                futures.add(deleteAttributesFromEntityView(oldEntityView, AttributeScope.SHARED_SCOPE, oldEntityView.getKeys().getAttributes().getSh(), user));
             }
             List<String> tsKeys = oldEntityView.getKeys() != null && oldEntityView.getKeys().getTimeseries() != null ?
                     oldEntityView.getKeys().getTimeseries() : Collections.emptyList();
@@ -109,9 +107,9 @@ public class DefaultTbEntityViewService extends AbstractTbEntityService implemen
         }
         if (savedEntityView.getKeys() != null) {
             if (savedEntityView.getKeys().getAttributes() != null) {
-                futures.add(copyAttributesFromEntityToEntityView(savedEntityView, DataConstants.CLIENT_SCOPE, savedEntityView.getKeys().getAttributes().getCs(), user));
-                futures.add(copyAttributesFromEntityToEntityView(savedEntityView, DataConstants.SERVER_SCOPE, savedEntityView.getKeys().getAttributes().getSs(), user));
-                futures.add(copyAttributesFromEntityToEntityView(savedEntityView, DataConstants.SHARED_SCOPE, savedEntityView.getKeys().getAttributes().getSh(), user));
+                futures.add(copyAttributesFromEntityToEntityView(savedEntityView, AttributeScope.CLIENT_SCOPE, savedEntityView.getKeys().getAttributes().getCs(), user));
+                futures.add(copyAttributesFromEntityToEntityView(savedEntityView, AttributeScope.SERVER_SCOPE, savedEntityView.getKeys().getAttributes().getSs(), user));
+                futures.add(copyAttributesFromEntityToEntityView(savedEntityView, AttributeScope.SHARED_SCOPE, savedEntityView.getKeys().getAttributes().getSh(), user));
             }
             futures.add(copyLatestFromEntityToEntityView(tenantId, savedEntityView));
         }
@@ -130,13 +128,12 @@ public class DefaultTbEntityViewService extends AbstractTbEntityService implemen
         EntityViewId entityViewId = entityView.getId();
         try {
             entityViewService.deleteEntityView(tenantId, entityViewId);
-            notificationEntityService.logEntityAction(tenantId, entityViewId, entityView, entityView.getCustomerId(),
+            logEntityActionService.logEntityAction(tenantId, entityViewId, entityView, entityView.getCustomerId(),
                     ActionType.DELETED, user, entityViewId.toString());
 
             localCache.computeIfAbsent(tenantId, (k) -> new ConcurrentReferenceHashMap<>()).clear();
-            tbClusterService.broadcastEntityStateChangeEvent(tenantId, entityViewId, ComponentLifecycleEvent.DELETED);
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.ENTITY_VIEW),
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.ENTITY_VIEW),
                     ActionType.DELETED, user, e, entityViewId.toString());
             throw e;
         }
@@ -148,11 +145,11 @@ public class DefaultTbEntityViewService extends AbstractTbEntityService implemen
         CustomerId customerId = customer.getId();
         try {
             EntityView savedEntityView = checkNotNull(entityViewService.assignEntityViewToCustomer(tenantId, entityViewId, customerId));
-            notificationEntityService.logEntityAction(tenantId, entityViewId, savedEntityView, savedEntityView.getCustomerId(),
+            logEntityActionService.logEntityAction(tenantId, entityViewId, savedEntityView, savedEntityView.getCustomerId(),
                     actionType, user, entityViewId.toString(), customerId.toString(), customer.getName());
             return savedEntityView;
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.ENTITY_VIEW),
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.ENTITY_VIEW),
                     actionType, user, e, entityViewId.toString(), customerId.toString());
             throw e;
         }
@@ -163,11 +160,11 @@ public class DefaultTbEntityViewService extends AbstractTbEntityService implemen
         ActionType actionType = ActionType.UNASSIGNED_FROM_CUSTOMER;
         try {
             EntityView savedEntityView = checkNotNull(entityViewService.unassignEntityViewFromCustomer(tenantId, entityViewId));
-            notificationEntityService.logEntityAction(tenantId, entityViewId, savedEntityView, customer.getId(),
+            logEntityActionService.logEntityAction(tenantId, entityViewId, savedEntityView, customer.getId(),
                     actionType, user, savedEntityView.getId().toString(), customer.getId().toString(), customer.getName());
             return savedEntityView;
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.ENTITY_VIEW),
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.ENTITY_VIEW),
                     actionType, user, e, entityViewId.toString());
             throw e;
         }
@@ -180,11 +177,11 @@ public class DefaultTbEntityViewService extends AbstractTbEntityService implemen
         try {
             EntityView savedEntityView = checkNotNull(entityViewService.assignEntityViewToCustomer(tenantId,
                     entityViewId, publicCustomer.getId()));
-            notificationEntityService.logEntityAction(tenantId, entityViewId, savedEntityView, savedEntityView.getCustomerId(),
+            logEntityActionService.logEntityAction(tenantId, entityViewId, savedEntityView, savedEntityView.getCustomerId(),
                     actionType, user, savedEntityView.getId().toString(), publicCustomer.getId().toString(), publicCustomer.getName());
             return savedEntityView;
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.ENTITY_VIEW),
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.ENTITY_VIEW),
                     actionType, user, e, entityViewId.toString());
             throw e;
         }
@@ -196,11 +193,11 @@ public class DefaultTbEntityViewService extends AbstractTbEntityService implemen
         EdgeId edgeId = edge.getId();
         try {
             EntityView savedEntityView = checkNotNull(entityViewService.assignEntityViewToEdge(tenantId, entityViewId, edgeId));
-            notificationEntityService.logEntityAction(tenantId, entityViewId, savedEntityView, customerId, actionType,
+            logEntityActionService.logEntityAction(tenantId, entityViewId, savedEntityView, customerId, actionType,
                     user, savedEntityView.getEntityId().toString(), edgeId.toString(), edge.getName());
             return savedEntityView;
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.ENTITY_VIEW),
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.ENTITY_VIEW),
                     actionType, user, e, entityViewId.toString(), edgeId.toString());
             throw e;
         }
@@ -214,11 +211,11 @@ public class DefaultTbEntityViewService extends AbstractTbEntityService implemen
         EdgeId edgeId = edge.getId();
         try {
             EntityView savedEntityView = checkNotNull(entityViewService.unassignEntityViewFromEdge(tenantId, entityViewId, edgeId));
-            notificationEntityService.logEntityAction(tenantId, entityViewId, savedEntityView, customerId, actionType,
+            logEntityActionService.logEntityAction(tenantId, entityViewId, savedEntityView, customerId, actionType,
                     user, entityViewId.toString(), edgeId.toString(), edge.getName());
             return savedEntityView;
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.ENTITY_VIEW),
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.ENTITY_VIEW),
                     actionType, user, e, entityViewId.toString(), edgeId.toString());
             throw e;
         }
@@ -269,7 +266,7 @@ public class DefaultTbEntityViewService extends AbstractTbEntityService implemen
         }
     }
 
-    private ListenableFuture<List<Void>> copyAttributesFromEntityToEntityView(EntityView entityView, String scope, Collection<String> keys, User user) throws ThingsboardException {
+    private ListenableFuture<List<Void>> copyAttributesFromEntityToEntityView(EntityView entityView, AttributeScope scope, Collection<String> keys, User user) throws ThingsboardException {
         EntityViewId entityId = entityView.getId();
         if (keys != null && !keys.isEmpty()) {
             ListenableFuture<List<AttributeKvEntry>> getAttrFuture = attributesService.find(entityView.getTenantId(), entityView.getEntityId(), scope, keys);
@@ -351,7 +348,7 @@ public class DefaultTbEntityViewService extends AbstractTbEntityService implemen
         }, MoreExecutors.directExecutor());
     }
 
-    private ListenableFuture<Void> deleteAttributesFromEntityView(EntityView entityView, String scope, List<String> keys, User user) {
+    private ListenableFuture<Void> deleteAttributesFromEntityView(EntityView entityView, AttributeScope scope, List<String> keys, User user) {
         EntityViewId entityId = entityView.getId();
         SettableFuture<Void> resultFuture = SettableFuture.create();
         if (keys != null && !keys.isEmpty()) {
@@ -433,16 +430,16 @@ public class DefaultTbEntityViewService extends AbstractTbEntityService implemen
         return resultFuture;
     }
 
-    private void logAttributesUpdated(TenantId tenantId, User user, EntityId entityId, String scope, List<AttributeKvEntry> attributes, Throwable e) throws ThingsboardException {
-        notificationEntityService.logEntityAction(tenantId, entityId, ActionType.ATTRIBUTES_UPDATED, user, toException(e), scope, attributes);
+    private void logAttributesUpdated(TenantId tenantId, User user, EntityId entityId, AttributeScope scope, List<AttributeKvEntry> attributes, Throwable e) throws ThingsboardException {
+        logEntityActionService.logEntityAction(tenantId, entityId, ActionType.ATTRIBUTES_UPDATED, user, toException(e), scope, attributes);
     }
 
-    private void logAttributesDeleted(TenantId tenantId, User user, EntityId entityId, String scope, List<String> keys, Throwable e) throws ThingsboardException {
-        notificationEntityService.logEntityAction(tenantId, entityId, ActionType.ATTRIBUTES_DELETED, user, toException(e), scope, keys);
+    private void logAttributesDeleted(TenantId tenantId, User user, EntityId entityId, AttributeScope scope, List<String> keys, Throwable e) throws ThingsboardException {
+        logEntityActionService.logEntityAction(tenantId, entityId, ActionType.ATTRIBUTES_DELETED, user, toException(e), scope, keys);
     }
 
     private void logTimeseriesDeleted(TenantId tenantId, User user, EntityId entityId, List<String> keys, Throwable e) throws ThingsboardException {
-        notificationEntityService.logEntityAction(tenantId, entityId, ActionType.TIMESERIES_DELETED, user, toException(e), keys);
+        logEntityActionService.logEntityAction(tenantId, entityId, ActionType.TIMESERIES_DELETED, user, toException(e), keys);
     }
 
     public static Exception toException(Throwable error) {
diff --git a/application/src/main/java/org/thingsboard/server/service/entitiy/ota/DefaultTbOtaPackageService.java b/application/src/main/java/org/thingsboard/server/service/entitiy/ota/DefaultTbOtaPackageService.java
index d7bd49c17b..8c3aa163b8 100644
--- a/application/src/main/java/org/thingsboard/server/service/entitiy/ota/DefaultTbOtaPackageService.java
+++ b/application/src/main/java/org/thingsboard/server/service/entitiy/ota/DefaultTbOtaPackageService.java
@@ -50,12 +50,12 @@ public class DefaultTbOtaPackageService extends AbstractTbEntityService implemen
         try {
             OtaPackageInfo savedOtaPackageInfo = otaPackageService.saveOtaPackageInfo(new OtaPackageInfo(saveOtaPackageInfoRequest), saveOtaPackageInfoRequest.isUsesUrl());
 
-            notificationEntityService.logEntityAction(tenantId, savedOtaPackageInfo.getId(), savedOtaPackageInfo,
+            logEntityActionService.logEntityAction(tenantId, savedOtaPackageInfo.getId(), savedOtaPackageInfo,
                     null, actionType, user);
 
             return savedOtaPackageInfo;
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.OTA_PACKAGE), saveOtaPackageInfoRequest,
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.OTA_PACKAGE), saveOtaPackageInfoRequest,
                     actionType, user, e);
             throw e;
         }
@@ -87,10 +87,10 @@ public class DefaultTbOtaPackageService extends AbstractTbEntityService implemen
             otaPackage.setData(ByteBuffer.wrap(data));
             otaPackage.setDataSize((long) data.length);
             OtaPackageInfo savedOtaPackage = otaPackageService.saveOtaPackage(otaPackage);
-            notificationEntityService.logEntityAction(tenantId, savedOtaPackage.getId(), savedOtaPackage, null, actionType, user);
+            logEntityActionService.logEntityAction(tenantId, savedOtaPackage.getId(), savedOtaPackage, null, actionType, user);
             return savedOtaPackage;
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.OTA_PACKAGE), actionType, user, e, otaPackageId.toString());
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.OTA_PACKAGE), actionType, user, e, otaPackageId.toString());
             throw e;
         }
     }
@@ -102,10 +102,10 @@ public class DefaultTbOtaPackageService extends AbstractTbEntityService implemen
         OtaPackageId otaPackageId = otaPackageInfo.getId();
         try {
             otaPackageService.deleteOtaPackage(tenantId, otaPackageId);
-            notificationEntityService.logEntityAction(tenantId, otaPackageId, otaPackageInfo, null,
+            logEntityActionService.logEntityAction(tenantId, otaPackageId, otaPackageInfo, null,
                     actionType, user, otaPackageInfo.getId().toString());
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.OTA_PACKAGE),
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.OTA_PACKAGE),
                     actionType, user, e, otaPackageId.toString());
             throw e;
         }
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 99896ae2da..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
@@ -20,7 +20,6 @@ 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.common.data.plugin.ComponentLifecycleEvent;
 import org.thingsboard.server.dao.tenant.TbTenantProfileCache;
 import org.thingsboard.server.dao.tenant.TenantProfileService;
 import org.thingsboard.server.dao.tenant.TenantService;
@@ -50,15 +49,12 @@ public class DefaultTbTenantService extends AbstractTbEntityService implements T
         boolean created = tenant.getId() == null;
         Tenant oldTenant = !created ? tenantService.findTenantById(tenant.getId()) : null;
 
-        Tenant savedTenant = checkNotNull(tenantService.saveTenant(tenant));
-        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());
-        notificationEntityService.notifyCreateOrUpdateTenant(savedTenant, created ?
-                ComponentLifecycleEvent.CREATED : ComponentLifecycleEvent.UPDATED);
 
         TenantProfile oldTenantProfile = oldTenant != null ? tenantProfileService.findTenantProfileById(TenantId.SYS_TENANT_ID, oldTenant.getTenantProfileId()) : null;
         TenantProfile newTenantProfile = tenantProfileService.findTenantProfileById(TenantId.SYS_TENANT_ID, savedTenant.getTenantProfileId());
@@ -71,7 +67,6 @@ public class DefaultTbTenantService extends AbstractTbEntityService implements T
         TenantId tenantId = tenant.getId();
         tenantService.deleteTenant(tenantId);
         tenantProfileCache.evict(tenantId);
-        notificationEntityService.notifyDeleteTenant(tenant);
         versionControlService.deleteVersionControlSettings(tenantId).get(1, TimeUnit.MINUTES);
     }
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/entitiy/tenant/profile/DefaultTbTenantProfileService.java b/application/src/main/java/org/thingsboard/server/service/entitiy/tenant/profile/DefaultTbTenantProfileService.java
index 70096bcd01..99087c1b69 100644
--- a/application/src/main/java/org/thingsboard/server/service/entitiy/tenant/profile/DefaultTbTenantProfileService.java
+++ b/application/src/main/java/org/thingsboard/server/service/entitiy/tenant/profile/DefaultTbTenantProfileService.java
@@ -21,7 +21,6 @@ import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.TenantProfile;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.id.TenantId;
-import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent;
 import org.thingsboard.server.dao.tenant.TbTenantProfileCache;
 import org.thingsboard.server.dao.tenant.TenantProfileService;
 import org.thingsboard.server.dao.tenant.TenantService;
@@ -45,9 +44,6 @@ public class DefaultTbTenantProfileService extends AbstractTbEntityService imple
     public TenantProfile save(TenantId tenantId, TenantProfile tenantProfile, TenantProfile oldTenantProfile) throws ThingsboardException {
         TenantProfile savedTenantProfile = checkNotNull(tenantProfileService.saveTenantProfile(tenantId, tenantProfile));
         tenantProfileCache.put(savedTenantProfile);
-        tbClusterService.onTenantProfileChange(savedTenantProfile, null);
-        tbClusterService.broadcastEntityStateChangeEvent(TenantId.SYS_TENANT_ID, savedTenantProfile.getId(),
-                tenantProfile.getId() == null ? ComponentLifecycleEvent.CREATED : ComponentLifecycleEvent.UPDATED);
 
         List<TenantId> tenantIds = tenantService.findTenantIdsByTenantProfileId(savedTenantProfile.getId());
         tbQueueService.updateQueuesByTenants(tenantIds, savedTenantProfile, oldTenantProfile);
@@ -58,6 +54,5 @@ public class DefaultTbTenantProfileService extends AbstractTbEntityService imple
     @Override
     public void delete(TenantId tenantId, TenantProfile tenantProfile) throws ThingsboardException {
         tenantProfileService.deleteTenantProfile(tenantId, tenantProfile.getId());
-        tbClusterService.onTenantProfileDelete(tenantProfile, null);
     }
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/entitiy/user/DefaultUserService.java b/application/src/main/java/org/thingsboard/server/service/entitiy/user/DefaultUserService.java
index 7c144a528f..68595bed2e 100644
--- a/application/src/main/java/org/thingsboard/server/service/entitiy/user/DefaultUserService.java
+++ b/application/src/main/java/org/thingsboard/server/service/entitiy/user/DefaultUserService.java
@@ -32,7 +32,7 @@ import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.entitiy.AbstractTbEntityService;
 import org.thingsboard.server.service.security.system.SystemSecurityService;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import static org.thingsboard.server.controller.UserController.ACTIVATE_URL_PATTERN;
 
@@ -66,10 +66,10 @@ public class DefaultUserService extends AbstractTbEntityService implements TbUse
                     throw e;
                 }
             }
-            notificationEntityService.logEntityAction(tenantId, savedUser.getId(), savedUser, customerId, actionType, user);
+            logEntityActionService.logEntityAction(tenantId, savedUser.getId(), savedUser, customerId, actionType, user);
             return savedUser;
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.USER), tbUser, actionType, user, e);
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.USER), tbUser, actionType, user, e);
             throw e;
         }
     }
@@ -81,9 +81,9 @@ public class DefaultUserService extends AbstractTbEntityService implements TbUse
 
         try {
             userService.deleteUser(tenantId, user);
-            notificationEntityService.logEntityAction(tenantId, userId, user, customerId, actionType, responsibleUser, customerId.toString());
+            logEntityActionService.logEntityAction(tenantId, userId, user, customerId, actionType, responsibleUser, customerId.toString());
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.USER),
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.USER),
                     actionType, responsibleUser, e, userId.toString());
             throw e;
         }
diff --git a/application/src/main/java/org/thingsboard/server/service/entitiy/user/TbUserService.java b/application/src/main/java/org/thingsboard/server/service/entitiy/user/TbUserService.java
index 46468881a1..ae6b40e0fe 100644
--- a/application/src/main/java/org/thingsboard/server/service/entitiy/user/TbUserService.java
+++ b/application/src/main/java/org/thingsboard/server/service/entitiy/user/TbUserService.java
@@ -20,9 +20,10 @@ import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.TenantId;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 public interface TbUserService {
+
     User save(TenantId tenantId, CustomerId customerId, User tbUser, boolean sendActivationMail, HttpServletRequest request, User user) throws ThingsboardException;
 
     void delete(TenantId tenantId, CustomerId customerId, User user, User responsibleUser) throws ThingsboardException;
diff --git a/application/src/main/java/org/thingsboard/server/service/entitiy/widgets/bundle/DefaultWidgetsBundleService.java b/application/src/main/java/org/thingsboard/server/service/entitiy/widgets/bundle/DefaultWidgetsBundleService.java
index d75f319cb4..92896c068e 100644
--- a/application/src/main/java/org/thingsboard/server/service/entitiy/widgets/bundle/DefaultWidgetsBundleService.java
+++ b/application/src/main/java/org/thingsboard/server/service/entitiy/widgets/bundle/DefaultWidgetsBundleService.java
@@ -46,11 +46,11 @@ public class DefaultWidgetsBundleService extends AbstractTbEntityService impleme
         try {
             WidgetsBundle savedWidgetsBundle = checkNotNull(widgetsBundleService.saveWidgetsBundle(widgetsBundle));
             autoCommit(user, savedWidgetsBundle.getId());
-            notificationEntityService.logEntityAction(tenantId, savedWidgetsBundle.getId(), savedWidgetsBundle,
+            logEntityActionService.logEntityAction(tenantId, savedWidgetsBundle.getId(), savedWidgetsBundle,
                     null, actionType, user);
             return savedWidgetsBundle;
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.WIDGETS_BUNDLE), widgetsBundle, actionType, user, e);
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.WIDGETS_BUNDLE), widgetsBundle, actionType, user, e);
             throw e;
         }
     }
@@ -61,9 +61,9 @@ public class DefaultWidgetsBundleService extends AbstractTbEntityService impleme
         TenantId tenantId = widgetsBundle.getTenantId();
         try {
             widgetsBundleService.deleteWidgetsBundle(widgetsBundle.getTenantId(), widgetsBundle.getId());
-            notificationEntityService.logEntityAction(tenantId, widgetsBundle.getId(), widgetsBundle, null, actionType, user);
+            logEntityActionService.logEntityAction(tenantId, widgetsBundle.getId(), widgetsBundle, null, actionType, user);
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.WIDGETS_BUNDLE), actionType, user, e, widgetsBundle.getId());
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.WIDGETS_BUNDLE), actionType, user, e, widgetsBundle.getId());
             throw e;
         }
     }
diff --git a/application/src/main/java/org/thingsboard/server/service/entitiy/widgets/type/DefaultWidgetTypeService.java b/application/src/main/java/org/thingsboard/server/service/entitiy/widgets/type/DefaultWidgetTypeService.java
index d269cc0488..fab6029886 100644
--- a/application/src/main/java/org/thingsboard/server/service/entitiy/widgets/type/DefaultWidgetTypeService.java
+++ b/application/src/main/java/org/thingsboard/server/service/entitiy/widgets/type/DefaultWidgetTypeService.java
@@ -56,11 +56,11 @@ public class DefaultWidgetTypeService extends AbstractTbEntityService implements
         try {
             WidgetTypeDetails savedWidgetTypeDetails = checkNotNull(widgetTypeService.saveWidgetType(widgetTypeDetails));
             autoCommit(user, savedWidgetTypeDetails.getId());
-            notificationEntityService.logEntityAction(tenantId, savedWidgetTypeDetails.getId(), savedWidgetTypeDetails,
+            logEntityActionService.logEntityAction(tenantId, savedWidgetTypeDetails.getId(), savedWidgetTypeDetails,
                     null, actionType, user);
             return savedWidgetTypeDetails;
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.WIDGET_TYPE), widgetTypeDetails, actionType, user, e);
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.WIDGET_TYPE), widgetTypeDetails, actionType, user, e);
             throw e;
         }
     }
@@ -71,9 +71,9 @@ public class DefaultWidgetTypeService extends AbstractTbEntityService implements
         TenantId tenantId = widgetTypeDetails.getTenantId();
         try {
             widgetTypeService.deleteWidgetType(widgetTypeDetails.getTenantId(), widgetTypeDetails.getId());
-            notificationEntityService.logEntityAction(tenantId, widgetTypeDetails.getId(), widgetTypeDetails, null, actionType, user);
+            logEntityActionService.logEntityAction(tenantId, widgetTypeDetails.getId(), widgetTypeDetails, null, actionType, user);
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.WIDGET_TYPE), actionType, user, e, widgetTypeDetails.getId());
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.WIDGET_TYPE), actionType, user, e, widgetTypeDetails.getId());
             throw e;
         }
     }
diff --git a/application/src/main/java/org/thingsboard/server/service/executors/SharedEventLoopGroupService.java b/application/src/main/java/org/thingsboard/server/service/executors/SharedEventLoopGroupService.java
index bd03ac38d6..d6d4d8f626 100644
--- a/application/src/main/java/org/thingsboard/server/service/executors/SharedEventLoopGroupService.java
+++ b/application/src/main/java/org/thingsboard/server/service/executors/SharedEventLoopGroupService.java
@@ -20,8 +20,8 @@ import io.netty.channel.nio.NioEventLoopGroup;
 import lombok.Getter;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import java.util.concurrent.TimeUnit;
 
 @Component
diff --git a/application/src/main/java/org/thingsboard/server/service/housekeeper/HousekeeperReprocessingService.java b/application/src/main/java/org/thingsboard/server/service/housekeeper/HousekeeperReprocessingService.java
new file mode 100644
index 0000000000..ae16f925a0
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/housekeeper/HousekeeperReprocessingService.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.service.housekeeper;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.exception.ExceptionUtils;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+import org.thingsboard.common.util.ThingsBoardThreadFactory;
+import org.thingsboard.server.common.data.StringUtils;
+import org.thingsboard.server.common.msg.queue.TopicPartitionInfo;
+import org.thingsboard.server.gen.transport.TransportProtos.HousekeeperTaskProto;
+import org.thingsboard.server.gen.transport.TransportProtos.ToHousekeeperServiceMsg;
+import org.thingsboard.server.queue.TbQueueConsumer;
+import org.thingsboard.server.queue.TbQueueProducer;
+import org.thingsboard.server.queue.common.TbProtoQueueMsg;
+import org.thingsboard.server.queue.housekeeper.HousekeeperConfig;
+import org.thingsboard.server.queue.provider.TbCoreQueueFactory;
+import org.thingsboard.server.queue.util.AfterStartUp;
+import org.thingsboard.server.queue.util.TbCoreComponent;
+import org.thingsboard.server.service.queue.consumer.QueueConsumerManager;
+
+import javax.annotation.PreDestroy;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+@TbCoreComponent
+@Service
+@Slf4j
+public class HousekeeperReprocessingService {
+
+    private final HousekeeperConfig config;
+    private final HousekeeperService housekeeperService;
+    private final QueueConsumerManager<TbProtoQueueMsg<ToHousekeeperServiceMsg>> consumer;
+    private final TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> producer;
+    private final TopicPartitionInfo submitTpi;
+
+    private final ExecutorService consumerExecutor = Executors.newSingleThreadExecutor(ThingsBoardThreadFactory.forName("housekeeper-reprocessing-consumer"));
+
+    public HousekeeperReprocessingService(HousekeeperConfig config,
+                                          @Lazy HousekeeperService housekeeperService,
+                                          TbCoreQueueFactory queueFactory) {
+        this.config = config;
+        this.housekeeperService = housekeeperService;
+        this.consumer = QueueConsumerManager.<TbProtoQueueMsg<ToHousekeeperServiceMsg>>builder()
+                .name("Housekeeper reprocessing")
+                .msgPackProcessor(this::processMsgs)
+                .pollInterval(config.getPollInterval())
+                .consumerCreator(queueFactory::createHousekeeperReprocessingMsgConsumer)
+                .consumerExecutor(consumerExecutor)
+                .build();
+        this.producer = queueFactory.createHousekeeperReprocessingMsgProducer();
+        this.submitTpi = TopicPartitionInfo.builder().topic(producer.getDefaultTopic()).build();
+    }
+
+    @AfterStartUp(order = AfterStartUp.REGULAR_SERVICE)
+    public void afterStartUp() {
+        consumer.subscribe(); // Kafka topic for tasks reprocessing has only 1 partition, so only one TB Core will reprocess tasks
+        consumer.launch();
+    }
+
+    private void processMsgs(List<TbProtoQueueMsg<ToHousekeeperServiceMsg>> msgs, TbQueueConsumer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> consumer) throws Exception {
+        Thread.sleep(config.getTaskReprocessingDelay());
+
+        for (TbProtoQueueMsg<ToHousekeeperServiceMsg> msg : msgs) {
+            log.trace("Reprocessing task: {}", msg);
+            try {
+                housekeeperService.processTask(msg.getValue());
+            } catch (InterruptedException e) {
+                return;
+            } catch (Throwable e) {
+                log.error("Unexpected error during message reprocessing [{}]", msg, e);
+                submitForReprocessing(msg.getValue(), e);
+            }
+        }
+        consumer.commit();
+    }
+
+    public void submitForReprocessing(ToHousekeeperServiceMsg msg, Throwable error) {
+        HousekeeperTaskProto task = msg.getTask();
+        Set<String> errors = new LinkedHashSet<>(task.getErrorsList());
+        errors.add(StringUtils.truncate(ExceptionUtils.getStackTrace(error), 1024));
+        msg = msg.toBuilder()
+                .setTask(task.toBuilder()
+                        .setAttempt(task.getAttempt() + 1)
+                        .clearErrors().addAllErrors(errors)
+                        .build())
+                .build();
+
+        log.trace("Submitting for reprocessing: {}", msg);
+        producer.send(submitTpi, new TbProtoQueueMsg<>(UUID.randomUUID(), msg), null);
+    }
+
+    @PreDestroy
+    private void stop() {
+        consumer.stop();
+        consumerExecutor.shutdownNow();
+        log.info("Stopped Housekeeper reprocessing service");
+    }
+
+}
diff --git a/application/src/main/java/org/thingsboard/server/service/housekeeper/HousekeeperService.java b/application/src/main/java/org/thingsboard/server/service/housekeeper/HousekeeperService.java
new file mode 100644
index 0000000000..06e38d0160
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/housekeeper/HousekeeperService.java
@@ -0,0 +1,166 @@
+/**
+ * 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.housekeeper;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.common.util.ThingsBoardThreadFactory;
+import org.thingsboard.server.common.data.housekeeper.HousekeeperTask;
+import org.thingsboard.server.common.data.housekeeper.HousekeeperTaskType;
+import org.thingsboard.server.common.data.notification.rule.trigger.TaskProcessingFailureTrigger;
+import org.thingsboard.server.common.msg.notification.NotificationRuleProcessor;
+import org.thingsboard.server.gen.transport.TransportProtos.ToHousekeeperServiceMsg;
+import org.thingsboard.server.queue.TbQueueConsumer;
+import org.thingsboard.server.queue.common.TbProtoQueueMsg;
+import org.thingsboard.server.queue.housekeeper.HousekeeperConfig;
+import org.thingsboard.server.queue.provider.TbCoreQueueFactory;
+import org.thingsboard.server.queue.util.AfterStartUp;
+import org.thingsboard.server.queue.util.TbCoreComponent;
+import org.thingsboard.server.service.housekeeper.processor.HousekeeperTaskProcessor;
+import org.thingsboard.server.service.housekeeper.stats.HousekeeperStatsService;
+import org.thingsboard.server.service.queue.consumer.QueueConsumerManager;
+
+import javax.annotation.PreDestroy;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.stream.Collectors;
+
+@TbCoreComponent
+@Service
+@Slf4j
+public class HousekeeperService {
+
+    private final Map<HousekeeperTaskType, HousekeeperTaskProcessor<?>> taskProcessors;
+
+    private final HousekeeperConfig config;
+    private final HousekeeperReprocessingService reprocessingService;
+    private final Optional<HousekeeperStatsService> statsService;
+    private final NotificationRuleProcessor notificationRuleProcessor;
+    private final QueueConsumerManager<TbProtoQueueMsg<ToHousekeeperServiceMsg>> consumer;
+
+    private final ExecutorService consumerExecutor = Executors.newSingleThreadExecutor(ThingsBoardThreadFactory.forName("housekeeper-consumer"));
+    private final ExecutorService taskExecutor = Executors.newSingleThreadExecutor(ThingsBoardThreadFactory.forName("housekeeper-task-processor"));
+
+    public HousekeeperService(HousekeeperConfig config,
+                              HousekeeperReprocessingService reprocessingService,
+                              TbCoreQueueFactory queueFactory,
+                              Optional<HousekeeperStatsService> statsService,
+                              NotificationRuleProcessor notificationRuleProcessor,
+                              @Lazy List<HousekeeperTaskProcessor<?>> taskProcessors) {
+        this.config = config;
+        this.reprocessingService = reprocessingService;
+        this.statsService = statsService;
+        this.notificationRuleProcessor = notificationRuleProcessor;
+        this.consumer = QueueConsumerManager.<TbProtoQueueMsg<ToHousekeeperServiceMsg>>builder()
+                .name("Housekeeper")
+                .msgPackProcessor(this::processMsgs)
+                .pollInterval(config.getPollInterval())
+                .consumerCreator(queueFactory::createHousekeeperMsgConsumer)
+                .consumerExecutor(consumerExecutor)
+                .build();
+        this.taskProcessors = taskProcessors.stream().collect(Collectors.toMap(HousekeeperTaskProcessor::getTaskType, p -> p));
+    }
+
+    @AfterStartUp(order = AfterStartUp.REGULAR_SERVICE)
+    public void afterStartUp() {
+        consumer.subscribe();
+        consumer.launch();
+    }
+
+    private void processMsgs(List<TbProtoQueueMsg<ToHousekeeperServiceMsg>> msgs, TbQueueConsumer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> consumer) {
+        for (TbProtoQueueMsg<ToHousekeeperServiceMsg> msg : msgs) {
+            log.trace("Processing task: {}", msg);
+            try {
+                processTask(msg.getValue());
+            } catch (InterruptedException e) {
+                return;
+            } catch (Throwable e) {
+                log.error("Unexpected error during message processing [{}]", msg, e);
+                reprocessingService.submitForReprocessing(msg.getValue(), e);
+            }
+        }
+        consumer.commit();
+    }
+
+    @SuppressWarnings("unchecked")
+    protected <T extends HousekeeperTask> void processTask(ToHousekeeperServiceMsg msg) throws Exception {
+        HousekeeperTask task = JacksonUtil.fromString(msg.getTask().getValue(), HousekeeperTask.class);
+        HousekeeperTaskType taskType = task.getTaskType();
+        if (config.getDisabledTaskTypes().contains(taskType)) {
+            log.debug("Task type {} is disabled, ignoring {}", taskType, task);
+            return;
+        }
+        HousekeeperTaskProcessor<T> taskProcessor = (HousekeeperTaskProcessor<T>) taskProcessors.get(taskType);
+        if (taskProcessor == null) {
+            throw new IllegalArgumentException("Unsupported task type " + taskType);
+        }
+
+        try {
+            long startTs = System.currentTimeMillis();
+            Future<Object> future = taskExecutor.submit(() -> {
+                taskProcessor.process((T) task);
+                return null;
+            });
+            future.get(config.getTaskProcessingTimeout(), TimeUnit.MILLISECONDS);
+
+            long timing = System.currentTimeMillis() - startTs;
+            if (log.isDebugEnabled()) {
+                log.debug("[{}] Processed {} in {} ms (attempt {})", task.getTenantId(), task.getDescription(), timing, msg.getTask().getAttempt());
+            }
+            statsService.ifPresent(statsService -> statsService.reportProcessed(taskType, msg, timing));
+        } catch (InterruptedException e) {
+            throw e;
+        } catch (Throwable e) {
+            Throwable error = e;
+            if (e instanceof ExecutionException) {
+                error = e.getCause();
+            } else if (e instanceof TimeoutException) {
+                error = new TimeoutException("Timeout after " + config.getTaskProcessingTimeout() + " seconds");
+            }
+
+            if (msg.getTask().getAttempt() < config.getMaxReprocessingAttempts()) {
+                log.warn("[{}] Failed to process {} (attempt {}), submitting for reprocessing",
+                        task.getTenantId(), task.getDescription(), msg.getTask().getAttempt(), error);
+                reprocessingService.submitForReprocessing(msg, error);
+            } else {
+                log.error("[{}] Failed to process task in {} attempts: {}", task.getTenantId(), msg.getTask().getAttempt(), msg, e);
+                notificationRuleProcessor.process(TaskProcessingFailureTrigger.builder()
+                        .task(task)
+                        .error(error)
+                        .attempt(msg.getTask().getAttempt())
+                        .build());
+            }
+            statsService.ifPresent(statsService -> statsService.reportFailure(taskType, msg));
+        }
+    }
+
+    @PreDestroy
+    private void stop() {
+        consumer.stop();
+        consumerExecutor.shutdownNow();
+        log.info("Stopped Housekeeper service");
+    }
+
+}
diff --git a/application/src/main/java/org/thingsboard/server/service/housekeeper/InMemoryHouseKeeperServiceService.java b/application/src/main/java/org/thingsboard/server/service/housekeeper/InMemoryHouseKeeperServiceService.java
deleted file mode 100644
index 4870990606..0000000000
--- a/application/src/main/java/org/thingsboard/server/service/housekeeper/InMemoryHouseKeeperServiceService.java
+++ /dev/null
@@ -1,103 +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.service.housekeeper;
-
-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.ListeningExecutorService;
-import com.google.common.util.concurrent.MoreExecutors;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.event.TransactionalEventListener;
-import org.thingsboard.common.util.ThingsBoardThreadFactory;
-import org.thingsboard.server.common.data.EntityType;
-import org.thingsboard.server.common.data.User;
-import org.thingsboard.server.common.data.id.AlarmId;
-import org.thingsboard.server.common.data.id.EntityId;
-import org.thingsboard.server.common.data.id.TenantId;
-import org.thingsboard.server.dao.eventsourcing.DeleteEntityEvent;
-import org.thingsboard.server.dao.housekeeper.HouseKeeperService;
-import org.thingsboard.server.service.entitiy.alarm.TbAlarmService;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import java.util.List;
-import java.util.concurrent.Executors;
-import java.util.concurrent.atomic.AtomicInteger;
-
-@Component
-@RequiredArgsConstructor
-@Slf4j
-public class InMemoryHouseKeeperServiceService implements HouseKeeperService {
-
-    final TbAlarmService alarmService;
-
-    ListeningExecutorService executor;
-
-    AtomicInteger queueSize = new AtomicInteger();
-    AtomicInteger totalProcessedCounter = new AtomicInteger();
-
-    @PostConstruct
-    public void init() {
-        log.debug("Starting HouseKeeper service");
-        executor = MoreExecutors.listeningDecorator(Executors.newSingleThreadExecutor(ThingsBoardThreadFactory.forName("housekeeper")));
-    }
-
-    @PreDestroy
-    public void destroy() {
-        if (executor != null) {
-            log.debug("Stopping HouseKeeper service");
-            executor.shutdown();
-        }
-    }
-
-    @TransactionalEventListener(fallbackExecution = true)
-    public void handleEvent(DeleteEntityEvent<?> event) {
-        log.trace("[{}] DeleteEntityEvent handler: {}", event.getTenantId(), event);
-        EntityId entityId = event.getEntityId();
-        if (EntityType.USER.equals(entityId.getEntityType())) {
-            unassignDeletedUserAlarms(event.getTenantId(), (User) event.getEntity(), event.getTs());
-        }
-    }
-
-    @Override
-    public ListenableFuture<List<AlarmId>> unassignDeletedUserAlarms(TenantId tenantId, User user, long unassignTs) {
-        log.debug("[{}][{}] unassignDeletedUserAlarms submitting, pending queue size: {} ", tenantId, user.getId().getId(), queueSize.get());
-        queueSize.incrementAndGet();
-        ListenableFuture<List<AlarmId>> future = executor.submit(() -> alarmService.unassignDeletedUserAlarms(tenantId, user, unassignTs));
-        Futures.addCallback(future, new FutureCallback<>() {
-            @Override
-            public void onSuccess(List<AlarmId> alarmIds) {
-                queueSize.decrementAndGet();
-                totalProcessedCounter.incrementAndGet();
-                log.debug("[{}][{}] unassignDeletedUserAlarms finished, pending queue size: {}, total processed count: {} ",
-                        tenantId, user.getId().getId(), queueSize.get(), totalProcessedCounter.get());
-            }
-
-            @Override
-            public void onFailure(Throwable throwable) {
-                queueSize.decrementAndGet();
-                totalProcessedCounter.incrementAndGet();
-                log.error("[{}][{}] unassignDeletedUserAlarms failed, pending queue size: {}, total processed count: {}",
-                        tenantId, user.getId().getId(), queueSize.get(), totalProcessedCounter.get(), throwable);
-            }
-        }, MoreExecutors.directExecutor());
-        return future;
-    }
-
-}
diff --git a/application/src/main/java/org/thingsboard/server/service/housekeeper/processor/AlarmsDeletionTaskProcessor.java b/application/src/main/java/org/thingsboard/server/service/housekeeper/processor/AlarmsDeletionTaskProcessor.java
new file mode 100644
index 0000000000..cc6cb9bbab
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/housekeeper/processor/AlarmsDeletionTaskProcessor.java
@@ -0,0 +1,80 @@
+/**
+ * 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.housekeeper.processor;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.thingsboard.server.common.data.EntityType;
+import org.thingsboard.server.common.data.housekeeper.AlarmsDeletionHousekeeperTask;
+import org.thingsboard.server.common.data.housekeeper.HousekeeperTaskType;
+import org.thingsboard.server.common.data.id.AlarmId;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.util.TbPair;
+import org.thingsboard.server.dao.alarm.AlarmService;
+
+import java.util.List;
+import java.util.UUID;
+
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class AlarmsDeletionTaskProcessor extends HousekeeperTaskProcessor<AlarmsDeletionHousekeeperTask> {
+
+    private final AlarmService alarmService;
+
+    @Override
+    public void process(AlarmsDeletionHousekeeperTask task) throws Exception {
+        EntityId entityId = task.getEntityId();
+        EntityType entityType = entityId.getEntityType();
+        TenantId tenantId = task.getTenantId();
+
+        if (entityType == EntityType.DEVICE || entityType == EntityType.ASSET) {
+            if (task.getAlarms() == null) {
+                AlarmId lastId = null;
+                long lastCreatedTime = 0;
+                while (true) {
+                    List<TbPair<UUID, Long>> alarms = alarmService.findAlarmIdsByOriginatorId(tenantId, entityId, lastCreatedTime, lastId, 128);
+                    if (alarms.isEmpty()) {
+                        break;
+                    }
+
+                    housekeeperClient.submitTask(new AlarmsDeletionHousekeeperTask(tenantId, entityId, alarms.stream().map(TbPair::getFirst).toList()));
+
+                    TbPair<UUID, Long> last = alarms.get(alarms.size() - 1);
+                    lastId = new AlarmId(last.getFirst());
+                    lastCreatedTime = last.getSecond();
+                    log.debug("[{}][{}][{}] Submitted task for deleting {} alarms", tenantId, entityType, entityId, alarms.size());
+                }
+            } else {
+                for (UUID alarmId : task.getAlarms()) {
+                    alarmService.delAlarm(tenantId, new AlarmId(alarmId));
+                }
+                log.debug("[{}][{}][{}] Deleted {} alarms", tenantId, entityType, entityId, task.getAlarms().size());
+            }
+        }
+
+        int count = alarmService.deleteEntityAlarmRecords(tenantId, entityId);
+        log.debug("[{}][{}][{}] Deleted {} entity alarms", tenantId, entityType, entityId, count);
+    }
+
+    @Override
+    public HousekeeperTaskType getTaskType() {
+        return HousekeeperTaskType.DELETE_ALARMS;
+    }
+
+}
diff --git a/application/src/main/java/org/thingsboard/server/service/housekeeper/processor/AlarmsUnassignTaskProcessor.java b/application/src/main/java/org/thingsboard/server/service/housekeeper/processor/AlarmsUnassignTaskProcessor.java
new file mode 100644
index 0000000000..3ba6ecde52
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/housekeeper/processor/AlarmsUnassignTaskProcessor.java
@@ -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.
+ */
+package org.thingsboard.server.service.housekeeper.processor;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.thingsboard.server.common.data.id.AlarmId;
+import org.thingsboard.server.common.data.id.UserId;
+import org.thingsboard.server.common.data.housekeeper.HousekeeperTaskType;
+import org.thingsboard.server.common.data.housekeeper.AlarmsUnassignHousekeeperTask;
+import org.thingsboard.server.service.entitiy.alarm.TbAlarmService;
+
+import java.util.List;
+
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class AlarmsUnassignTaskProcessor extends HousekeeperTaskProcessor<AlarmsUnassignHousekeeperTask> {
+
+    private final TbAlarmService alarmService;
+
+    @Override
+    public void process(AlarmsUnassignHousekeeperTask task) throws Exception {
+        List<AlarmId> alarms = alarmService.unassignDeletedUserAlarms(task.getTenantId(), (UserId) task.getEntityId(), task.getUserTitle(), task.getTs());
+        log.debug("[{}][{}] Unassigned {} alarms", task.getTenantId(), task.getEntityId(), alarms.size());
+    }
+
+    @Override
+    public HousekeeperTaskType getTaskType() {
+        return HousekeeperTaskType.UNASSIGN_ALARMS;
+    }
+
+}
diff --git a/application/src/main/java/org/thingsboard/server/service/housekeeper/processor/AttributesDeletionTaskProcessor.java b/application/src/main/java/org/thingsboard/server/service/housekeeper/processor/AttributesDeletionTaskProcessor.java
new file mode 100644
index 0000000000..5514921e2e
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/housekeeper/processor/AttributesDeletionTaskProcessor.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.housekeeper.processor;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.thingsboard.server.dao.attributes.AttributesService;
+import org.thingsboard.server.common.data.housekeeper.HousekeeperTask;
+import org.thingsboard.server.common.data.housekeeper.HousekeeperTaskType;
+
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class AttributesDeletionTaskProcessor extends HousekeeperTaskProcessor<HousekeeperTask> {
+
+    private final AttributesService attributesService;
+
+    @Override
+    public void process(HousekeeperTask task) throws Exception {
+        int deletedCount = attributesService.removeAllByEntityId(task.getTenantId(), task.getEntityId());
+        log.debug("[{}][{}][{}] Deleted {} attributes", task.getTenantId(), task.getEntityId().getEntityType(), task.getEntityId(), deletedCount);
+    }
+
+    @Override
+    public HousekeeperTaskType getTaskType() {
+        return HousekeeperTaskType.DELETE_ATTRIBUTES;
+    }
+
+}
diff --git a/application/src/main/java/org/thingsboard/server/service/housekeeper/processor/EntitiesDeletionTaskProcessor.java b/application/src/main/java/org/thingsboard/server/service/housekeeper/processor/EntitiesDeletionTaskProcessor.java
new file mode 100644
index 0000000000..186a290528
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/housekeeper/processor/EntitiesDeletionTaskProcessor.java
@@ -0,0 +1,57 @@
+/**
+ * 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.housekeeper.processor;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.thingsboard.server.common.data.EntityType;
+import org.thingsboard.server.common.data.housekeeper.EntitiesDeletionHousekeeperTask;
+import org.thingsboard.server.common.data.housekeeper.HousekeeperTaskType;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.id.EntityIdFactory;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.dao.entity.EntityDaoService;
+import org.thingsboard.server.dao.entity.EntityServiceRegistry;
+
+import java.util.UUID;
+
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class EntitiesDeletionTaskProcessor extends HousekeeperTaskProcessor<EntitiesDeletionHousekeeperTask> {
+
+    private final EntityServiceRegistry entityServiceRegistry;
+
+    @Override
+    public void process(EntitiesDeletionHousekeeperTask task) throws Exception {
+        EntityType entityType = task.getEntityType();
+        TenantId tenantId = task.getTenantId();
+        EntityDaoService entityService = entityServiceRegistry.getServiceByEntityType(entityType);
+
+        for (UUID entityUuid : task.getEntities()) {
+            EntityId entityId = EntityIdFactory.getByTypeAndUuid(entityType, entityUuid);
+            entityService.deleteEntity(tenantId, entityId, true);
+        }
+        log.debug("[{}] Deleted {} {}s", tenantId, task.getEntities().size(), entityType.getNormalName().toLowerCase());
+    }
+
+    @Override
+    public HousekeeperTaskType getTaskType() {
+        return HousekeeperTaskType.DELETE_ENTITIES;
+    }
+
+}
diff --git a/application/src/main/java/org/thingsboard/server/service/housekeeper/processor/EventsDeletionTaskProcessor.java b/application/src/main/java/org/thingsboard/server/service/housekeeper/processor/EventsDeletionTaskProcessor.java
new file mode 100644
index 0000000000..bf9c528eb7
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/housekeeper/processor/EventsDeletionTaskProcessor.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.service.housekeeper.processor;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+import org.thingsboard.server.dao.event.EventService;
+import org.thingsboard.server.common.data.housekeeper.HousekeeperTask;
+import org.thingsboard.server.common.data.housekeeper.HousekeeperTaskType;
+
+@Component
+@RequiredArgsConstructor
+public class EventsDeletionTaskProcessor extends HousekeeperTaskProcessor<HousekeeperTask> {
+
+    private final EventService eventService;
+
+    @Override
+    public void process(HousekeeperTask task) throws Exception {
+        eventService.removeEvents(task.getTenantId(), task.getEntityId(), null, 0L, System.currentTimeMillis());
+    }
+
+    @Override
+    public HousekeeperTaskType getTaskType() {
+        return HousekeeperTaskType.DELETE_EVENTS;
+    }
+
+}
diff --git a/application/src/main/java/org/thingsboard/server/service/housekeeper/processor/HousekeeperTaskProcessor.java b/application/src/main/java/org/thingsboard/server/service/housekeeper/processor/HousekeeperTaskProcessor.java
new file mode 100644
index 0000000000..f193b154db
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/housekeeper/processor/HousekeeperTaskProcessor.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.housekeeper.processor;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.thingsboard.server.common.data.housekeeper.HousekeeperTask;
+import org.thingsboard.server.common.data.housekeeper.HousekeeperTaskType;
+import org.thingsboard.server.common.msg.housekeeper.HousekeeperClient;
+
+public abstract class HousekeeperTaskProcessor<T extends HousekeeperTask> {
+
+    @Autowired
+    protected HousekeeperClient housekeeperClient;
+
+    public abstract void process(T task) throws Exception;
+
+    public abstract HousekeeperTaskType getTaskType();
+
+}
diff --git a/application/src/main/java/org/thingsboard/server/service/housekeeper/processor/LatestTsDeletionTaskProcessor.java b/application/src/main/java/org/thingsboard/server/service/housekeeper/processor/LatestTsDeletionTaskProcessor.java
new file mode 100644
index 0000000000..1f4b6b57ae
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/housekeeper/processor/LatestTsDeletionTaskProcessor.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.service.housekeeper.processor;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.thingsboard.server.common.data.housekeeper.HousekeeperTaskType;
+import org.thingsboard.server.common.data.housekeeper.LatestTsDeletionHousekeeperTask;
+import org.thingsboard.server.dao.timeseries.TimeseriesService;
+
+import java.util.List;
+
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class LatestTsDeletionTaskProcessor extends HousekeeperTaskProcessor<LatestTsDeletionHousekeeperTask> {
+
+    private final TimeseriesService timeseriesService;
+
+    @Override
+    public void process(LatestTsDeletionHousekeeperTask task) throws Exception {
+        timeseriesService.removeLatest(task.getTenantId(), task.getEntityId(), List.of(task.getKey())).get();
+        log.debug("[{}][{}][{}] Deleted latest telemetry for key '{}'", task.getTenantId(), task.getEntityId().getEntityType(), task.getEntityId(), task.getKey());
+    }
+
+    @Override
+    public HousekeeperTaskType getTaskType() {
+        return HousekeeperTaskType.DELETE_LATEST_TS;
+    }
+
+}
diff --git a/application/src/main/java/org/thingsboard/server/service/housekeeper/processor/TelemetryDeletionTaskProcessor.java b/application/src/main/java/org/thingsboard/server/service/housekeeper/processor/TelemetryDeletionTaskProcessor.java
new file mode 100644
index 0000000000..5271e77c87
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/housekeeper/processor/TelemetryDeletionTaskProcessor.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.server.service.housekeeper.processor;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.thingsboard.server.common.data.housekeeper.HousekeeperTask;
+import org.thingsboard.server.common.data.housekeeper.HousekeeperTaskType;
+import org.thingsboard.server.common.data.housekeeper.LatestTsDeletionHousekeeperTask;
+import org.thingsboard.server.common.data.housekeeper.TsHistoryDeletionHousekeeperTask;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.dao.timeseries.TimeseriesService;
+
+import java.util.List;
+
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class TelemetryDeletionTaskProcessor extends HousekeeperTaskProcessor<HousekeeperTask> {
+
+    private final TimeseriesService timeseriesService;
+
+    @Override
+    public void process(HousekeeperTask task) throws Exception {
+        TenantId tenantId = task.getTenantId();
+        EntityId entityId = task.getEntityId();
+        List<String> keys = timeseriesService.findAllKeysByEntityIds(tenantId, List.of(entityId));
+
+        for (String key : keys) {
+            var latestTsDeletionTask = new LatestTsDeletionHousekeeperTask(tenantId, entityId, key);
+            housekeeperClient.submitTask(latestTsDeletionTask);
+
+            var tsHistoryDeletionTask = new TsHistoryDeletionHousekeeperTask(tenantId, entityId, key);
+            housekeeperClient.submitTask(tsHistoryDeletionTask);
+        }
+
+        log.trace("[{}][{}][{}] Submitted latest and ts history deletion tasks for {} keys", tenantId, entityId.getEntityType(), entityId, keys.size());
+    }
+
+    @Override
+    public HousekeeperTaskType getTaskType() {
+        return HousekeeperTaskType.DELETE_TELEMETRY;
+    }
+
+}
diff --git a/application/src/main/java/org/thingsboard/server/service/housekeeper/processor/TenantEntitiesDeletionTaskProcessor.java b/application/src/main/java/org/thingsboard/server/service/housekeeper/processor/TenantEntitiesDeletionTaskProcessor.java
new file mode 100644
index 0000000000..386afb1517
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/housekeeper/processor/TenantEntitiesDeletionTaskProcessor.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.housekeeper.processor;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.thingsboard.server.common.data.EntityType;
+import org.thingsboard.server.common.data.housekeeper.EntitiesDeletionHousekeeperTask;
+import org.thingsboard.server.common.data.housekeeper.HousekeeperTaskType;
+import org.thingsboard.server.common.data.housekeeper.TenantEntitiesDeletionHousekeeperTask;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.dao.Dao;
+import org.thingsboard.server.dao.entity.EntityDaoRegistry;
+
+import java.util.List;
+import java.util.UUID;
+
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class TenantEntitiesDeletionTaskProcessor extends HousekeeperTaskProcessor<TenantEntitiesDeletionHousekeeperTask> {
+
+    private final EntityDaoRegistry entityDaoRegistry;
+
+    @Override
+    public void process(TenantEntitiesDeletionHousekeeperTask task) throws Exception {
+        EntityType entityType = task.getEntityType();
+        TenantId tenantId = task.getTenantId();
+        Dao<?> entityDao = entityDaoRegistry.getDao(entityType);
+
+        UUID last = null;
+        while (true) {
+            List<UUID> entities = entityDao.findIdsByTenantIdAndIdOffset(tenantId, last, 128);
+            if (entities.isEmpty()) {
+                break;
+            }
+
+            housekeeperClient.submitTask(new EntitiesDeletionHousekeeperTask(tenantId, entityType, entities));
+            last = entities.get(entities.size() - 1);
+            log.debug("[{}] Submitted task for deleting {} {}s", tenantId, entities.size(), entityType.getNormalName().toLowerCase());
+        }
+    }
+
+    @Override
+    public HousekeeperTaskType getTaskType() {
+        return HousekeeperTaskType.DELETE_TENANT_ENTITIES;
+    }
+
+}
diff --git a/application/src/main/java/org/thingsboard/server/service/housekeeper/processor/TsHistoryDeletionTaskProcessor.java b/application/src/main/java/org/thingsboard/server/service/housekeeper/processor/TsHistoryDeletionTaskProcessor.java
new file mode 100644
index 0000000000..cee99ae93e
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/housekeeper/processor/TsHistoryDeletionTaskProcessor.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.housekeeper.processor;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.thingsboard.server.common.data.housekeeper.HousekeeperTaskType;
+import org.thingsboard.server.common.data.housekeeper.TsHistoryDeletionHousekeeperTask;
+import org.thingsboard.server.common.data.kv.BaseDeleteTsKvQuery;
+import org.thingsboard.server.common.data.kv.DeleteTsKvQuery;
+import org.thingsboard.server.dao.timeseries.TimeseriesService;
+
+import java.util.List;
+
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class TsHistoryDeletionTaskProcessor extends HousekeeperTaskProcessor<TsHistoryDeletionHousekeeperTask> {
+
+    private final TimeseriesService timeseriesService;
+
+    @Override
+    public void process(TsHistoryDeletionHousekeeperTask task) throws Exception {
+        DeleteTsKvQuery deleteQuery = new BaseDeleteTsKvQuery(task.getKey(), 0, System.currentTimeMillis(), false, false);
+        timeseriesService.remove(task.getTenantId(), task.getEntityId(), List.of(deleteQuery)).get();
+        log.debug("[{}][{}][{}] Deleted timeseries history for key '{}'", task.getTenantId(), task.getEntityId().getEntityType(), task.getEntityId(), task.getKey());
+    }
+
+    @Override
+    public HousekeeperTaskType getTaskType() {
+        return HousekeeperTaskType.DELETE_TS_HISTORY;
+    }
+
+}
diff --git a/application/src/main/java/org/thingsboard/server/service/housekeeper/stats/HousekeeperStatsService.java b/application/src/main/java/org/thingsboard/server/service/housekeeper/stats/HousekeeperStatsService.java
new file mode 100644
index 0000000000..6723d51625
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/housekeeper/stats/HousekeeperStatsService.java
@@ -0,0 +1,125 @@
+/**
+ * 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.housekeeper.stats;
+
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Service;
+import org.thingsboard.server.common.data.housekeeper.HousekeeperTaskType;
+import org.thingsboard.server.common.stats.DefaultCounter;
+import org.thingsboard.server.common.stats.StatsCounter;
+import org.thingsboard.server.common.stats.StatsFactory;
+import org.thingsboard.server.common.stats.StatsTimer;
+import org.thingsboard.server.common.stats.StatsType;
+import org.thingsboard.server.gen.transport.TransportProtos.ToHousekeeperServiceMsg;
+
+import java.util.ArrayList;
+import java.util.EnumMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+@Service
+@Slf4j
+@ConditionalOnProperty(name = "queue.core.housekeeper.stats.enabled", havingValue = "true", matchIfMissing = true)
+public class HousekeeperStatsService {
+
+    private final Map<HousekeeperTaskType, HousekeeperStats> stats = new EnumMap<>(HousekeeperTaskType.class);
+
+    public HousekeeperStatsService(StatsFactory statsFactory) {
+        for (HousekeeperTaskType taskType : HousekeeperTaskType.values()) {
+            stats.put(taskType, new HousekeeperStats(taskType, statsFactory));
+        }
+    }
+
+    @Scheduled(initialDelayString = "${queue.core.housekeeper.stats.print-interval-ms:60000}",
+            fixedDelayString = "${queue.core.housekeeper.stats.print-interval-ms:60000}")
+    private void reportStats() {
+        String statsStr = stats.values().stream().map(stats -> {
+            String countersStr = stats.getCounters().stream()
+                    .filter(counter -> counter.get() > 0)
+                    .map(counter -> counter.getName() + " = [" + counter.get() + "]")
+                    .collect(Collectors.joining(" "));
+            if (countersStr.isEmpty()) {
+                return null;
+            } else {
+                return stats.getTaskType() + " " + countersStr + " avgProcessingTime [" + stats.getProcessingTimer().getAvg() + " ms]";
+            }
+        }).filter(Objects::nonNull).collect(Collectors.joining(", "));
+
+        if (!statsStr.isEmpty()) {
+            stats.values().forEach(HousekeeperStats::reset);
+            log.info("Housekeeper stats: {}", statsStr);
+        }
+    }
+
+    public void reportProcessed(HousekeeperTaskType taskType, ToHousekeeperServiceMsg msg, long timing) {
+        HousekeeperStats stats = this.stats.get(taskType);
+        if (msg.getTask().getErrorsCount() == 0) {
+            stats.getProcessedCounter().increment();
+        } else {
+            stats.getReprocessedCounter().increment();
+        }
+        stats.getProcessingTimer().record(timing);
+    }
+
+    public void reportFailure(HousekeeperTaskType taskType, ToHousekeeperServiceMsg msg) {
+        HousekeeperStats stats = this.stats.get(taskType);
+        if (msg.getTask().getErrorsCount() == 0) {
+            stats.getFailedProcessingCounter().increment();
+        } else {
+            stats.getFailedReprocessingCounter().increment();
+        }
+    }
+
+    @Getter
+    static class HousekeeperStats {
+        private final HousekeeperTaskType taskType;
+        private final List<StatsCounter> counters = new ArrayList<>();
+
+        private final StatsCounter processedCounter;
+        private final StatsCounter failedProcessingCounter;
+        private final StatsCounter reprocessedCounter;
+        private final StatsCounter failedReprocessingCounter;
+
+        private final StatsTimer processingTimer;
+
+        public HousekeeperStats(HousekeeperTaskType taskType, StatsFactory statsFactory) {
+            this.taskType = taskType;
+            this.processedCounter = register("processed", statsFactory);
+            this.failedProcessingCounter = register("failedProcessing", statsFactory);
+            this.reprocessedCounter = register("reprocessed", statsFactory);
+            this.failedReprocessingCounter = register("failedReprocessing", statsFactory);
+            this.processingTimer = statsFactory.createTimer(StatsType.HOUSEKEEPER, "processingTime", "taskType", taskType.name());
+        }
+
+        private StatsCounter register(String statsName, StatsFactory statsFactory) {
+            StatsCounter counter = statsFactory.createStatsCounter(StatsType.HOUSEKEEPER.getName(), statsName, "taskType", taskType.name());
+            counters.add(counter);
+            return counter;
+        }
+
+        public void reset() {
+            counters.forEach(DefaultCounter::clear);
+            processingTimer.reset();
+        }
+
+    }
+
+}
diff --git a/application/src/main/java/org/thingsboard/server/service/install/DefaultSystemDataLoaderService.java b/application/src/main/java/org/thingsboard/server/service/install/DefaultSystemDataLoaderService.java
index b20a548d90..8c86c16edb 100644
--- a/application/src/main/java/org/thingsboard/server/service/install/DefaultSystemDataLoaderService.java
+++ b/application/src/main/java/org/thingsboard/server/service/install/DefaultSystemDataLoaderService.java
@@ -32,6 +32,7 @@ import org.springframework.stereotype.Service;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.common.util.ThingsBoardThreadFactory;
 import org.thingsboard.server.common.data.AdminSettings;
+import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.Customer;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.Device;
@@ -103,9 +104,9 @@ import org.thingsboard.server.dao.widget.WidgetTypeService;
 import org.thingsboard.server.dao.widget.WidgetsBundleService;
 import org.thingsboard.server.service.security.auth.jwt.settings.JwtSettingsService;
 
-import javax.annotation.Nullable;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.Nullable;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -470,7 +471,7 @@ public class DefaultSystemDataLoaderService implements SystemDataLoaderService {
         DeviceId t1Id = createDevice(demoTenant.getId(), null, savedThermostatDeviceProfile.getId(), "Thermostat T1", "T1_TEST_TOKEN", "Demo device for Thermostats dashboard").getId();
         DeviceId t2Id = createDevice(demoTenant.getId(), null, savedThermostatDeviceProfile.getId(), "Thermostat T2", "T2_TEST_TOKEN", "Demo device for Thermostats dashboard").getId();
 
-        attributesService.save(demoTenant.getId(), t1Id, DataConstants.SERVER_SCOPE,
+        attributesService.save(demoTenant.getId(), t1Id, AttributeScope.SERVER_SCOPE,
                 Arrays.asList(new BaseAttributeKvEntry(System.currentTimeMillis(), new DoubleDataEntry("latitude", 37.3948)),
                         new BaseAttributeKvEntry(System.currentTimeMillis(), new DoubleDataEntry("longitude", -122.1503)),
                         new BaseAttributeKvEntry(System.currentTimeMillis(), new BooleanDataEntry("temperatureAlarmFlag", true)),
@@ -478,7 +479,7 @@ public class DefaultSystemDataLoaderService implements SystemDataLoaderService {
                         new BaseAttributeKvEntry(System.currentTimeMillis(), new LongDataEntry("temperatureAlarmThreshold", (long) 20)),
                         new BaseAttributeKvEntry(System.currentTimeMillis(), new LongDataEntry("humidityAlarmThreshold", (long) 50))));
 
-        attributesService.save(demoTenant.getId(), t2Id, DataConstants.SERVER_SCOPE,
+        attributesService.save(demoTenant.getId(), t2Id, AttributeScope.SERVER_SCOPE,
                 Arrays.asList(new BaseAttributeKvEntry(System.currentTimeMillis(), new DoubleDataEntry("latitude", 37.493801)),
                         new BaseAttributeKvEntry(System.currentTimeMillis(), new DoubleDataEntry("longitude", -121.948769)),
                         new BaseAttributeKvEntry(System.currentTimeMillis(), new BooleanDataEntry("temperatureAlarmFlag", true)),
@@ -546,9 +547,9 @@ public class DefaultSystemDataLoaderService implements SystemDataLoaderService {
                     Collections.singletonList(new BasicTsKvEntry(System.currentTimeMillis(), new BooleanDataEntry(key, value))), 0L);
             addTsCallback(saveFuture, new TelemetrySaveCallback<>(deviceId, key, value));
         } else {
-            ListenableFuture<List<String>> saveFuture = attributesService.save(TenantId.SYS_TENANT_ID, deviceId, DataConstants.SERVER_SCOPE,
+            ListenableFuture<List<String>> saveFuture = attributesService.save(TenantId.SYS_TENANT_ID, deviceId, AttributeScope.SERVER_SCOPE,
                     Collections.singletonList(new BaseAttributeKvEntry(new BooleanDataEntry(key, value)
-                    , System.currentTimeMillis())));
+                            , System.currentTimeMillis())));
             addTsCallback(saveFuture, new TelemetrySaveCallback<>(deviceId, key, value));
         }
     }
@@ -692,23 +693,26 @@ public class DefaultSystemDataLoaderService implements SystemDataLoaderService {
 
     @Override
     @SneakyThrows
-    public void updateDefaultNotificationConfigs() {
-        PageDataIterable<TenantId> tenants = new PageDataIterable<>(tenantService::findTenantsIds, 500);
-        ExecutorService executor = Executors.newFixedThreadPool(Math.max(Runtime.getRuntime().availableProcessors(), 4));
-        log.info("Updating default edge failure notification configs for all tenants");
-        AtomicInteger count = new AtomicInteger();
-        for (TenantId tenantId : tenants) {
-            executor.submit(() -> {
-                notificationSettingsService.updateDefaultNotificationConfigs(tenantId);
-                int n = count.incrementAndGet();
-                if (n % 500 == 0) {
-                    log.info("{} tenants processed", n);
-                }
-            });
-        }
-        executor.shutdown();
-        executor.awaitTermination(Integer.MAX_VALUE, TimeUnit.SECONDS);
+    public void updateDefaultNotificationConfigs(boolean updateTenants) {
+        log.info("Updating notification configs...");
         notificationSettingsService.updateDefaultNotificationConfigs(TenantId.SYS_TENANT_ID);
+
+        if (updateTenants) {
+            PageDataIterable<TenantId> tenants = new PageDataIterable<>(tenantService::findTenantsIds, 500);
+            ExecutorService executor = Executors.newFixedThreadPool(Math.max(Runtime.getRuntime().availableProcessors(), 4));
+            AtomicInteger count = new AtomicInteger();
+            for (TenantId tenantId : tenants) {
+                executor.submit(() -> {
+                    notificationSettingsService.updateDefaultNotificationConfigs(tenantId);
+                    int n = count.incrementAndGet();
+                    if (n % 500 == 0) {
+                        log.info("{} tenants processed", n);
+                    }
+                });
+            }
+            executor.shutdown();
+            executor.awaitTermination(Integer.MAX_VALUE, TimeUnit.SECONDS);
+        }
     }
 
 }
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 f1dd3b2ebb..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);
@@ -180,11 +181,11 @@ public class InstallScripts {
         return paths;
     }
 
-    public RuleChain createDefaultRuleChain(TenantId tenantId, String ruleChainName) throws IOException {
+    public RuleChain createDefaultRuleChain(TenantId tenantId, String ruleChainName) {
         return createRuleChainFromFile(tenantId, getDeviceProfileDefaultRuleChainTemplateFilePath(), ruleChainName);
     }
 
-    public RuleChain createRuleChainFromFile(TenantId tenantId, Path templateFilePath, String newRuleChainName) throws IOException {
+    public RuleChain createRuleChainFromFile(TenantId tenantId, Path templateFilePath, String newRuleChainName) {
         JsonNode ruleChainJson = JacksonUtil.toJsonNode(templateFilePath.toFile());
         RuleChain ruleChain = JacksonUtil.treeToValue(ruleChainJson.get("ruleChain"), RuleChain.class);
         RuleChainMetaData ruleChainMetaData = JacksonUtil.treeToValue(ruleChainJson.get("metadata"), RuleChainMetaData.class);
@@ -193,10 +194,10 @@ public class InstallScripts {
         if (!StringUtils.isEmpty(newRuleChainName)) {
             ruleChain.setName(newRuleChainName);
         }
-        ruleChain = ruleChainService.saveRuleChain(ruleChain);
+        ruleChain = ruleChainService.saveRuleChain(ruleChain, false);
 
         ruleChainMetaData.setRuleChainId(ruleChain.getId());
-        ruleChainService.saveRuleChainMetaData(TenantId.SYS_TENANT_ID, ruleChainMetaData, Function.identity());
+        ruleChainService.saveRuleChainMetaData(TenantId.SYS_TENANT_ID, ruleChainMetaData, Function.identity(), false);
 
         return ruleChain;
     }
@@ -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 436c2fcc84..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
@@ -115,6 +115,12 @@ public class SqlDatabaseUpgradeService implements DatabaseEntitiesUpgradeService
             case "3.6.2":
                 updateSchema("3.6.2", 3006002, "3.6.3", 3006003, null);
                 break;
+            case "3.6.3":
+                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/install/SystemDataLoaderService.java b/application/src/main/java/org/thingsboard/server/service/install/SystemDataLoaderService.java
index eeac1b6aa4..7c05ff620f 100644
--- a/application/src/main/java/org/thingsboard/server/service/install/SystemDataLoaderService.java
+++ b/application/src/main/java/org/thingsboard/server/service/install/SystemDataLoaderService.java
@@ -35,6 +35,6 @@ public interface SystemDataLoaderService {
 
     void createDefaultNotificationConfigs();
 
-    void updateDefaultNotificationConfigs();
+    void updateDefaultNotificationConfigs(boolean updateTenants);
 
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/install/migrate/CassandraTsLatestToSqlMigrateService.java b/application/src/main/java/org/thingsboard/server/service/install/migrate/CassandraTsLatestToSqlMigrateService.java
index 3cc4001624..9cad1d614f 100644
--- a/application/src/main/java/org/thingsboard/server/service/install/migrate/CassandraTsLatestToSqlMigrateService.java
+++ b/application/src/main/java/org/thingsboard/server/service/install/migrate/CassandraTsLatestToSqlMigrateService.java
@@ -24,10 +24,10 @@ import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.UUIDConverter;
 import org.thingsboard.server.dao.cassandra.CassandraCluster;
-import org.thingsboard.server.dao.model.sqlts.dictionary.TsKvDictionary;
-import org.thingsboard.server.dao.model.sqlts.dictionary.TsKvDictionaryCompositeKey;
+import org.thingsboard.server.dao.model.sqlts.dictionary.KeyDictionaryEntry;
+import org.thingsboard.server.dao.model.sqlts.dictionary.KeyDictionaryCompositeKey;
 import org.thingsboard.server.dao.model.sqlts.latest.TsKvLatestEntity;
-import org.thingsboard.server.dao.sqlts.dictionary.TsKvDictionaryRepository;
+import org.thingsboard.server.dao.sqlts.dictionary.KeyDictionaryRepository;
 import org.thingsboard.server.dao.sqlts.insert.latest.InsertLatestTsRepository;
 import org.thingsboard.server.dao.util.NoSqlTsDao;
 import org.thingsboard.server.dao.util.SqlTsLatestDao;
@@ -73,7 +73,7 @@ public class CassandraTsLatestToSqlMigrateService implements TsLatestMigrateServ
     protected CassandraCluster cluster;
 
     @Autowired
-    protected TsKvDictionaryRepository dictionaryRepository;
+    protected KeyDictionaryRepository keyDictionaryRepository;
 
     @Autowired
     private InstallScripts installScripts;
@@ -194,22 +194,22 @@ public class CassandraTsLatestToSqlMigrateService implements TsLatestMigrateServ
 
         Integer keyId = tsKvDictionaryMap.get(strKey);
         if (keyId == null) {
-            Optional<TsKvDictionary> tsKvDictionaryOptional;
-            tsKvDictionaryOptional = dictionaryRepository.findById(new TsKvDictionaryCompositeKey(strKey));
+            Optional<KeyDictionaryEntry> tsKvDictionaryOptional;
+            tsKvDictionaryOptional = keyDictionaryRepository.findById(new KeyDictionaryCompositeKey(strKey));
             if (!tsKvDictionaryOptional.isPresent()) {
                 tsCreationLock.lock();
                 try {
-                    tsKvDictionaryOptional = dictionaryRepository.findById(new TsKvDictionaryCompositeKey(strKey));
+                    tsKvDictionaryOptional = keyDictionaryRepository.findById(new KeyDictionaryCompositeKey(strKey));
                     if (!tsKvDictionaryOptional.isPresent()) {
-                        TsKvDictionary tsKvDictionary = new TsKvDictionary();
-                        tsKvDictionary.setKey(strKey);
+                        KeyDictionaryEntry keyDictionaryEntry = new KeyDictionaryEntry();
+                        keyDictionaryEntry.setKey(strKey);
                         try {
-                            TsKvDictionary saved = dictionaryRepository.save(tsKvDictionary);
+                            KeyDictionaryEntry saved = keyDictionaryRepository.save(keyDictionaryEntry);
                             tsKvDictionaryMap.put(saved.getKey(), saved.getKeyId());
                             keyId = saved.getKeyId();
                         } catch (ConstraintViolationException e) {
-                            tsKvDictionaryOptional = dictionaryRepository.findById(new TsKvDictionaryCompositeKey(strKey));
-                            TsKvDictionary dictionary = tsKvDictionaryOptional.orElseThrow(() -> new RuntimeException("Failed to get TsKvDictionary entity from DB!"));
+                            tsKvDictionaryOptional = keyDictionaryRepository.findById(new KeyDictionaryCompositeKey(strKey));
+                            KeyDictionaryEntry dictionary = tsKvDictionaryOptional.orElseThrow(() -> new RuntimeException("Failed to get TsKvDictionary entity from DB!"));
                             tsKvDictionaryMap.put(dictionary.getKey(), dictionary.getKeyId());
                             keyId = dictionary.getKeyId();
                         }
diff --git a/application/src/main/java/org/thingsboard/server/service/install/update/DefaultCacheCleanupService.java b/application/src/main/java/org/thingsboard/server/service/install/update/DefaultCacheCleanupService.java
index 90e3d4bb04..5a1d2fe38d 100644
--- a/application/src/main/java/org/thingsboard/server/service/install/update/DefaultCacheCleanupService.java
+++ b/application/src/main/java/org/thingsboard/server/service/install/update/DefaultCacheCleanupService.java
@@ -27,6 +27,7 @@ import org.springframework.stereotype.Service;
 import java.util.Objects;
 import java.util.Optional;
 
+import static org.thingsboard.server.common.data.CacheConstants.ATTRIBUTES_CACHE;
 import static org.thingsboard.server.common.data.CacheConstants.RESOURCE_INFO_CACHE;
 import static org.thingsboard.server.common.data.CacheConstants.SECURITY_SETTINGS_CACHE;
 
@@ -53,6 +54,14 @@ public class DefaultCacheCleanupService implements CacheCleanupService {
                 clearCacheByName(SECURITY_SETTINGS_CACHE);
                 clearCacheByName(RESOURCE_INFO_CACHE);
                 break;
+            case "3.6.3":
+                log.info("Clearing cache to upgrade from version 3.6.3 to 3.6.4");
+                clearAll();
+                break;
+            case "3.6.4":
+                log.info("Clearing cache to upgrade from version 3.6.4 to 3.7.0");
+                clearAll();
+                break;
             default:
                 //Do nothing, since cache cleanup is optional.
         }
diff --git a/application/src/main/java/org/thingsboard/server/service/mail/DefaultMailService.java b/application/src/main/java/org/thingsboard/server/service/mail/DefaultMailService.java
index 969e310e5b..29db1d7d76 100644
--- a/application/src/main/java/org/thingsboard/server/service/mail/DefaultMailService.java
+++ b/application/src/main/java/org/thingsboard/server/service/mail/DefaultMailService.java
@@ -18,6 +18,7 @@ package org.thingsboard.server.service.mail;
 import com.fasterxml.jackson.databind.JsonNode;
 import freemarker.template.Configuration;
 import freemarker.template.Template;
+import jakarta.xml.bind.DatatypeConverter;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -47,8 +48,8 @@ import org.thingsboard.server.dao.exception.IncorrectParameterException;
 import org.thingsboard.server.dao.settings.AdminSettingsService;
 import org.thingsboard.server.service.apiusage.TbApiUsageStateService;
 
-import javax.annotation.PostConstruct;
-import javax.mail.internet.MimeMessage;
+import jakarta.annotation.PostConstruct;
+import jakarta.mail.internet.MimeMessage;
 import java.io.ByteArrayInputStream;
 import java.util.HashMap;
 import java.util.Locale;
diff --git a/application/src/main/java/org/thingsboard/server/service/mail/DefaultTbMailConfigTemplateService.java b/application/src/main/java/org/thingsboard/server/service/mail/DefaultTbMailConfigTemplateService.java
index f45f949fca..a7726c3824 100644
--- a/application/src/main/java/org/thingsboard/server/service/mail/DefaultTbMailConfigTemplateService.java
+++ b/application/src/main/java/org/thingsboard/server/service/mail/DefaultTbMailConfigTemplateService.java
@@ -21,7 +21,7 @@ import org.springframework.core.io.ClassPathResource;
 import org.springframework.stereotype.Service;
 import org.thingsboard.common.util.JacksonUtil;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import java.io.IOException;
 
 @Service
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 9dfa673d58..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
@@ -35,6 +35,7 @@ import org.thingsboard.server.queue.util.TbCoreComponent;
 import java.io.IOException;
 import java.time.Duration;
 import java.time.Instant;
+import java.util.concurrent.TimeUnit;
 
 import static org.thingsboard.server.common.data.mail.MailOauth2Provider.OFFICE_365;
 
@@ -46,28 +47,42 @@ public class RefreshTokenExpCheckService {
     public static final int AZURE_DEFAULT_REFRESH_TOKEN_LIFETIME_IN_DAYS = 90;
     private final AdminSettingsService adminSettingsService;
 
-    @Scheduled(initialDelayString = "#{T(org.apache.commons.lang3.RandomUtils).nextLong(0, ${mail.oauth2.refreshTokenCheckingInterval})}", fixedDelayString = "${mail.oauth2.refreshTokenCheckingInterval}")
+    @Scheduled(initialDelayString = "#{T(org.apache.commons.lang3.RandomUtils).nextLong(0, ${mail.oauth2.refreshTokenCheckingInterval})}",
+            fixedDelayString = "${mail.oauth2.refreshTokenCheckingInterval}",
+            timeUnit = TimeUnit.SECONDS)
     public void check() throws IOException {
         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/mail/TbMailSender.java b/application/src/main/java/org/thingsboard/server/service/mail/TbMailSender.java
index c89f009cac..63f2b9e9e4 100644
--- a/application/src/main/java/org/thingsboard/server/service/mail/TbMailSender.java
+++ b/application/src/main/java/org/thingsboard/server/service/mail/TbMailSender.java
@@ -34,8 +34,8 @@ import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.mail.MailOauth2Provider;
 import org.thingsboard.server.dao.exception.IncorrectParameterException;
 
-import javax.mail.MessagingException;
-import javax.mail.internet.MimeMessage;
+import jakarta.mail.MessagingException;
+import jakarta.mail.internet.MimeMessage;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.Properties;
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 5a9e3fc3e1..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
@@ -21,6 +21,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.thingsboard.rule.engine.api.NotificationCenter;
+import org.thingsboard.server.cache.limits.RateLimitService;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.User;
 import org.thingsboard.server.common.data.id.EntityId;
@@ -52,7 +53,6 @@ import org.thingsboard.server.common.data.notification.template.DeliveryMethodNo
 import org.thingsboard.server.common.data.notification.template.NotificationTemplate;
 import org.thingsboard.server.common.data.notification.template.WebDeliveryMethodNotificationTemplate;
 import org.thingsboard.server.common.data.page.PageDataIterable;
-import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent;
 import org.thingsboard.server.common.msg.queue.ServiceType;
 import org.thingsboard.server.common.msg.queue.TbCallback;
 import org.thingsboard.server.common.msg.queue.TopicPartitionInfo;
@@ -62,7 +62,6 @@ import org.thingsboard.server.dao.notification.NotificationService;
 import org.thingsboard.server.dao.notification.NotificationSettingsService;
 import org.thingsboard.server.dao.notification.NotificationTargetService;
 import org.thingsboard.server.dao.notification.NotificationTemplateService;
-import org.thingsboard.server.cache.limits.RateLimitService;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.queue.common.TbProtoQueueMsg;
 import org.thingsboard.server.queue.discovery.TopicService;
@@ -82,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
@@ -192,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();
 
@@ -204,6 +205,7 @@ public class DefaultNotificationCenter extends AbstractSubscriptionService imple
 
     private void processNotificationRequestAsync(NotificationProcessingContext ctx, List<NotificationTarget> targets, FutureCallback<NotificationRequestStats> callback) {
         notificationExecutor.submit(() -> {
+            long startTs = System.currentTimeMillis();
             NotificationRequestId requestId = ctx.getRequest().getId();
             for (NotificationTarget target : targets) {
                 try {
@@ -219,9 +221,16 @@ public class DefaultNotificationCenter extends AbstractSubscriptionService imple
                     return;
                 }
             }
-            log.debug("[{}] Notification request processing is finished", requestId);
 
             NotificationRequestStats stats = ctx.getStats();
+            long time = System.currentTimeMillis() - startTs;
+            int sent = stats.getTotalSent().get();
+            int errors = stats.getTotalErrors().get();
+            if (errors > 0) {
+                log.info("[{}][{}] Notification request processing finished in {} ms (sent: {}, errors: {})", ctx.getTenantId(), requestId, time, sent, errors);
+            } else {
+                log.info("[{}][{}] Notification request processing finished in {} ms (sent: {})", ctx.getTenantId(), requestId, time, sent);
+            }
             updateRequestStats(ctx, requestId, stats);
             if (callback != null) {
                 callback.onSuccess(stats);
@@ -240,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 -> {
@@ -251,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());
@@ -315,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())
@@ -340,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)
@@ -367,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)
@@ -399,7 +407,7 @@ public class DefaultNotificationCenter extends AbstractSubscriptionService imple
     public void deleteNotificationRequest(TenantId tenantId, NotificationRequestId notificationRequestId) {
         log.debug("Deleting notification request {}", notificationRequestId);
         NotificationRequest notificationRequest = notificationRequestService.findNotificationRequestById(tenantId, notificationRequestId);
-        notificationRequestService.deleteNotificationRequest(tenantId, notificationRequestId);
+        notificationRequestService.deleteNotificationRequest(tenantId, notificationRequest);
 
         if (notificationRequest.isSent()) {
             // TODO: no need to send request update for other than PLATFORM_USERS target type
@@ -407,9 +415,6 @@ public class DefaultNotificationCenter extends AbstractSubscriptionService imple
                     .notificationRequestId(notificationRequestId)
                     .deleted(true)
                     .build());
-        } else if (notificationRequest.isScheduled()) {
-            // TODO: just forward to scheduler service
-            clusterService.broadcastEntityStateChangeEvent(tenantId, notificationRequestId, ComponentLifecycleEvent.DELETED);
         }
     }
 
@@ -447,7 +452,7 @@ public class DefaultNotificationCenter extends AbstractSubscriptionService imple
 
     @Override
     public NotificationDeliveryMethod getDeliveryMethod() {
-        return NotificationDeliveryMethod.WEB;
+        return WEB;
     }
 
     @Override
@@ -458,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/DefaultNotificationSchedulerService.java b/application/src/main/java/org/thingsboard/server/service/notification/DefaultNotificationSchedulerService.java
index 8a23ffa2f1..916fe6da6c 100644
--- a/application/src/main/java/org/thingsboard/server/service/notification/DefaultNotificationSchedulerService.java
+++ b/application/src/main/java/org/thingsboard/server/service/notification/DefaultNotificationSchedulerService.java
@@ -40,7 +40,7 @@ import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.executors.NotificationExecutorService;
 import org.thingsboard.server.service.partition.AbstractPartitionBasedService;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import java.util.Collections;
 import java.util.HashSet;
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 3f2fcd40f5..795f59b79c 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
@@ -15,6 +15,9 @@
  */
 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;
 import lombok.RequiredArgsConstructor;
@@ -24,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;
@@ -39,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
@@ -46,37 +55,60 @@ 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 = Optional.ofNullable(processedTemplate.getAdditionalConfig())
-                .map(JacksonUtil::toFlatMap).orElseGet(HashMap::new);
-        Optional.ofNullable(ctx.getRequest().getInfo())
-                .map(NotificationInfo::getStateEntityId)
-                .ifPresent(stateEntityId -> {
-                    data.put("stateEntityId", stateEntityId.getId().toString());
-                    data.put("stateEntityType", stateEntityId.getEntityType().name());
-                });
+        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) {
+                if (errorCode == MessagingErrorCode.UNREGISTERED || errorCode == MessagingErrorCode.INVALID_ARGUMENT || errorCode == MessagingErrorCode.SENDER_ID_MISMATCH) {
                     validTokens.remove(token);
                     userService.removeMobileSession(recipient.getTenantId(), token);
+                    log.debug("[{}][{}] Removed invalid FCM token due to {} {} ({})", recipient.getTenantId(), recipient.getId(), errorCode, e.getMessage(), token);
                     continue;
                 }
                 throw new RuntimeException("Failed to send message via FCM: " + e.getMessage(), e);
@@ -87,17 +119,42 @@ public class MobileAppNotificationChannel implements NotificationChannel<User, M
         }
     }
 
+    private Map<String, String> getNotificationData(MobileAppDeliveryMethodNotificationTemplate processedTemplate, NotificationProcessingContext ctx) {
+        Map<String, String> data = Optional.ofNullable(processedTemplate.getAdditionalConfig())
+                .filter(JsonNode::isObject).map(JacksonUtil::toFlatMap).orElseGet(HashMap::new);
+        NotificationInfo info = ctx.getRequest().getInfo();
+        if (info == null) {
+            return data;
+        }
+        Optional.ofNullable(info.getStateEntityId()).ifPresent(stateEntityId -> {
+            data.put("stateEntityId", stateEntityId.getId().toString());
+            data.put("stateEntityType", stateEntityId.getEntityType().name());
+        });
+        data.put("notificationType", ctx.getNotificationType().name());
+        switch (ctx.getNotificationType()) {
+            case ALARM:
+            case ALARM_ASSIGNMENT:
+            case ALARM_COMMENT:
+                info.getTemplateData().forEach((key, value) -> {
+                    data.put("info." + key, value);
+                });
+                break;
+        }
+        data.replaceAll((key, value) -> Strings.nullToEmpty(value));
+        return data;
+    }
+
     @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 a1a02d52f1..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
@@ -22,6 +22,8 @@ import com.google.auth.oauth2.GoogleCredentials;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.FirebaseOptions;
 import com.google.firebase.messaging.AndroidConfig;
+import com.google.firebase.messaging.ApnsConfig;
+import com.google.firebase.messaging.Aps;
 import com.google.firebase.messaging.FirebaseMessaging;
 import com.google.firebase.messaging.FirebaseMessagingException;
 import com.google.firebase.messaging.Message;
@@ -52,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);
@@ -62,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()
@@ -71,10 +80,18 @@ public class DefaultFirebaseService implements FirebaseService {
                 .setAndroidConfig(AndroidConfig.builder()
                         .setPriority(AndroidConfig.Priority.HIGH)
                         .build())
+                .setApnsConfig(ApnsConfig.builder()
+                        .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/notification/rule/cache/DefaultNotificationRulesCache.java b/application/src/main/java/org/thingsboard/server/service/notification/rule/cache/DefaultNotificationRulesCache.java
index aa6d6770f7..bf2946313d 100644
--- a/application/src/main/java/org/thingsboard/server/service/notification/rule/cache/DefaultNotificationRulesCache.java
+++ b/application/src/main/java/org/thingsboard/server/service/notification/rule/cache/DefaultNotificationRulesCache.java
@@ -29,7 +29,7 @@ import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent;
 import org.thingsboard.server.common.msg.plugin.ComponentLifecycleMsg;
 import org.thingsboard.server.dao.notification.NotificationRuleService;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
diff --git a/application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/AlarmAssignmentTriggerProcessor.java b/application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/AlarmAssignmentTriggerProcessor.java
index 98981d0bc0..36c2d91b8e 100644
--- a/application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/AlarmAssignmentTriggerProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/AlarmAssignmentTriggerProcessor.java
@@ -27,7 +27,7 @@ import org.thingsboard.server.common.data.notification.rule.trigger.config.Alarm
 import org.thingsboard.server.common.data.notification.rule.trigger.config.NotificationRuleTriggerType;
 import org.thingsboard.server.common.data.notification.rule.trigger.AlarmAssignmentTrigger;
 
-import static org.apache.commons.collections.CollectionUtils.isEmpty;
+import static org.apache.commons.collections4.CollectionUtils.isEmpty;
 import static org.thingsboard.server.common.data.util.CollectionsUtil.emptyOrContains;
 
 @Service
@@ -65,6 +65,7 @@ public class AlarmAssignmentTriggerProcessor implements NotificationRuleTriggerP
                 .alarmSeverity(alarmInfo.getSeverity())
                 .alarmStatus(alarmInfo.getStatus())
                 .alarmCustomerId(alarmInfo.getCustomerId())
+                .dashboardId(alarmInfo.getDashboardId())
                 .build();
     }
 
diff --git a/application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/AlarmCommentTriggerProcessor.java b/application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/AlarmCommentTriggerProcessor.java
index a1199214ae..bd2bccecb2 100644
--- a/application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/AlarmCommentTriggerProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/AlarmCommentTriggerProcessor.java
@@ -29,7 +29,7 @@ import org.thingsboard.server.common.data.notification.rule.trigger.config.Notif
 import org.thingsboard.server.common.data.notification.rule.trigger.AlarmCommentTrigger;
 import org.thingsboard.server.dao.entity.EntityService;
 
-import static org.apache.commons.collections.CollectionUtils.isEmpty;
+import static org.apache.commons.collections4.CollectionUtils.isEmpty;
 import static org.thingsboard.server.common.data.util.CollectionsUtil.emptyOrContains;
 
 @Service
@@ -76,6 +76,7 @@ public class AlarmCommentTriggerProcessor implements NotificationRuleTriggerProc
                 .alarmSeverity(alarm.getSeverity())
                 .alarmStatus(alarm.getStatus())
                 .alarmCustomerId(alarm.getCustomerId())
+                .dashboardId(alarm.getDashboardId())
                 .build();
     }
 
diff --git a/application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/AlarmTriggerProcessor.java b/application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/AlarmTriggerProcessor.java
index 8022f6cbb3..b9047cac6b 100644
--- a/application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/AlarmTriggerProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/AlarmTriggerProcessor.java
@@ -22,13 +22,13 @@ import org.thingsboard.server.common.data.alarm.AlarmInfo;
 import org.thingsboard.server.common.data.alarm.AlarmStatusFilter;
 import org.thingsboard.server.common.data.notification.info.AlarmNotificationInfo;
 import org.thingsboard.server.common.data.notification.info.RuleOriginatedNotificationInfo;
+import org.thingsboard.server.common.data.notification.rule.trigger.AlarmTrigger;
 import org.thingsboard.server.common.data.notification.rule.trigger.config.AlarmNotificationRuleTriggerConfig;
 import org.thingsboard.server.common.data.notification.rule.trigger.config.AlarmNotificationRuleTriggerConfig.AlarmAction;
 import org.thingsboard.server.common.data.notification.rule.trigger.config.AlarmNotificationRuleTriggerConfig.ClearRule;
 import org.thingsboard.server.common.data.notification.rule.trigger.config.NotificationRuleTriggerType;
-import org.thingsboard.server.common.data.notification.rule.trigger.AlarmTrigger;
 
-import static org.apache.commons.collections.CollectionUtils.isNotEmpty;
+import static org.apache.commons.collections4.CollectionUtils.isNotEmpty;
 import static org.thingsboard.server.common.data.util.CollectionsUtil.emptyOrContains;
 
 @Service
@@ -111,6 +111,7 @@ public class AlarmTriggerProcessor implements NotificationRuleTriggerProcessor<A
                 .acknowledged(alarmInfo.isAcknowledged())
                 .cleared(alarmInfo.isCleared())
                 .alarmCustomerId(alarmInfo.getCustomerId())
+                .dashboardId(alarmInfo.getDashboardId())
                 .build();
     }
 
diff --git a/application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/DeviceActivityTriggerProcessor.java b/application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/DeviceActivityTriggerProcessor.java
index 7380b8857a..e2d5484f59 100644
--- a/application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/DeviceActivityTriggerProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/DeviceActivityTriggerProcessor.java
@@ -16,7 +16,7 @@
 package org.thingsboard.server.service.notification.rule.trigger;
 
 import lombok.RequiredArgsConstructor;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.id.DeviceId;
diff --git a/application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/EdgeCommunicationFailureTriggerProcessor.java b/application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/EdgeCommunicationFailureTriggerProcessor.java
index 38d8ae9805..2bc9a65cb2 100644
--- a/application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/EdgeCommunicationFailureTriggerProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/EdgeCommunicationFailureTriggerProcessor.java
@@ -16,7 +16,7 @@
 package org.thingsboard.server.service.notification.rule.trigger;
 
 import lombok.RequiredArgsConstructor;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.notification.info.EdgeCommunicationFailureNotificationInfo;
 import org.thingsboard.server.common.data.notification.info.RuleOriginatedNotificationInfo;
diff --git a/application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/EdgeConnectionTriggerProcessor.java b/application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/EdgeConnectionTriggerProcessor.java
index ed1ee74622..61b5c8ed56 100644
--- a/application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/EdgeConnectionTriggerProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/EdgeConnectionTriggerProcessor.java
@@ -16,7 +16,7 @@
 package org.thingsboard.server.service.notification.rule.trigger;
 
 import lombok.RequiredArgsConstructor;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.notification.info.EdgeConnectionNotificationInfo;
 import org.thingsboard.server.common.data.notification.info.RuleOriginatedNotificationInfo;
diff --git a/application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/EntitiesLimitTriggerProcessor.java b/application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/EntitiesLimitTriggerProcessor.java
index e1db043188..24000760b5 100644
--- a/application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/EntitiesLimitTriggerProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/EntitiesLimitTriggerProcessor.java
@@ -27,7 +27,7 @@ import org.thingsboard.server.dao.entity.EntityCountService;
 import org.thingsboard.server.dao.tenant.TbTenantProfileCache;
 import org.thingsboard.server.dao.tenant.TenantService;
 
-import static org.apache.commons.collections.CollectionUtils.isNotEmpty;
+import static org.apache.commons.collections4.CollectionUtils.isNotEmpty;
 
 @Service
 @RequiredArgsConstructor
diff --git a/application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/RuleEngineComponentLifecycleEventTriggerProcessor.java b/application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/RuleEngineComponentLifecycleEventTriggerProcessor.java
index 4c92e9b92b..a009841897 100644
--- a/application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/RuleEngineComponentLifecycleEventTriggerProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/RuleEngineComponentLifecycleEventTriggerProcessor.java
@@ -16,7 +16,7 @@
 package org.thingsboard.server.service.notification.rule.trigger;
 
 import lombok.RequiredArgsConstructor;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.springframework.stereotype.Service;
@@ -47,7 +47,7 @@ public class RuleEngineComponentLifecycleEventTriggerProcessor implements Notifi
                 return false;
             }
         }
-        if (!partitionService.resolve(ServiceType.TB_RULE_ENGINE, trigger.getTenantId(), trigger.getComponentId()).isMyPartition()) {
+        if (!partitionService.isMyPartition(ServiceType.TB_RULE_ENGINE, trigger.getTenantId(), trigger.getComponentId())) {
             return false;
         }
 
diff --git a/application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/TaskProcessingFailureTriggerProcessor.java b/application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/TaskProcessingFailureTriggerProcessor.java
new file mode 100644
index 0000000000..7754690215
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/TaskProcessingFailureTriggerProcessor.java
@@ -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.
+ */
+package org.thingsboard.server.service.notification.rule.trigger;
+
+import org.apache.commons.lang3.exception.ExceptionUtils;
+import org.springframework.stereotype.Service;
+import org.thingsboard.server.common.data.StringUtils;
+import org.thingsboard.server.common.data.housekeeper.HousekeeperTask;
+import org.thingsboard.server.common.data.notification.info.TaskProcessingFailureNotificationInfo;
+import org.thingsboard.server.common.data.notification.rule.trigger.TaskProcessingFailureTrigger;
+import org.thingsboard.server.common.data.notification.rule.trigger.config.NotificationRuleTriggerType;
+import org.thingsboard.server.common.data.notification.rule.trigger.config.TaskProcessingFailureNotificationRuleTriggerConfig;
+
+@Service
+public class TaskProcessingFailureTriggerProcessor implements NotificationRuleTriggerProcessor<TaskProcessingFailureTrigger, TaskProcessingFailureNotificationRuleTriggerConfig> {
+
+    @Override
+    public boolean matchesFilter(TaskProcessingFailureTrigger trigger, TaskProcessingFailureNotificationRuleTriggerConfig triggerConfig) {
+        return true;
+    }
+
+    @Override
+    public TaskProcessingFailureNotificationInfo constructNotificationInfo(TaskProcessingFailureTrigger trigger) {
+        HousekeeperTask task = trigger.getTask();
+        return TaskProcessingFailureNotificationInfo.builder()
+                .tenantId(task.getTenantId())
+                .entityId(task.getEntityId())
+                .taskType(task.getTaskType())
+                .taskDescription(task.getDescription())
+                .error(StringUtils.truncate(ExceptionUtils.getStackTrace(trigger.getError()), 1024))
+                .attempt(trigger.getAttempt())
+                .build();
+    }
+
+    @Override
+    public NotificationRuleTriggerType getTriggerType() {
+        return NotificationRuleTriggerType.TASK_PROCESSING_FAILURE;
+    }
+
+}
diff --git a/application/src/main/java/org/thingsboard/server/service/ota/DefaultOtaPackageStateService.java b/application/src/main/java/org/thingsboard/server/service/ota/DefaultOtaPackageStateService.java
index 84acb86500..7cb9a0fc0d 100644
--- a/application/src/main/java/org/thingsboard/server/service/ota/DefaultOtaPackageStateService.java
+++ b/application/src/main/java/org/thingsboard/server/service/ota/DefaultOtaPackageStateService.java
@@ -20,6 +20,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.thingsboard.rule.engine.api.RuleEngineTelemetryService;
+import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.msg.rule.engine.DeviceAttributesEventNotificationMsg;
 import org.thingsboard.server.cluster.TbClusterService;
 import org.thingsboard.server.common.data.DataConstants;
@@ -51,7 +52,7 @@ import org.thingsboard.server.queue.common.TbProtoQueueMsg;
 import org.thingsboard.server.queue.provider.TbCoreQueueFactory;
 import org.thingsboard.server.queue.provider.TbRuleEngineQueueFactory;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -335,7 +336,7 @@ public class DefaultOtaPackageStateService implements OtaPackageStateService {
 
         remove(device, otaPackageType, attrToRemove);
 
-        telemetryService.saveAndNotify(tenantId, deviceId, DataConstants.SHARED_SCOPE, attributes, new FutureCallback<>() {
+        telemetryService.saveAndNotify(tenantId, deviceId, AttributeScope.SHARED_SCOPE, attributes, new FutureCallback<>() {
             @Override
             public void onSuccess(@Nullable Void tmp) {
                 log.trace("[{}] Success save attributes with target firmware!", deviceId);
@@ -353,7 +354,7 @@ public class DefaultOtaPackageStateService implements OtaPackageStateService {
     }
 
     private void remove(Device device, OtaPackageType otaPackageType, List<String> attributesKeys) {
-        telemetryService.deleteAndNotify(device.getTenantId(), device.getId(), DataConstants.SHARED_SCOPE, attributesKeys,
+        telemetryService.deleteAndNotify(device.getTenantId(), device.getId(), AttributeScope.SHARED_SCOPE, attributesKeys,
                 new FutureCallback<>() {
                     @Override
                     public void onSuccess(@Nullable Void tmp) {
diff --git a/application/src/main/java/org/thingsboard/server/service/query/DefaultEntityQueryService.java b/application/src/main/java/org/thingsboard/server/service/query/DefaultEntityQueryService.java
index 2865e4a01a..2759ab7774 100644
--- a/application/src/main/java/org/thingsboard/server/service/query/DefaultEntityQueryService.java
+++ b/application/src/main/java/org/thingsboard/server/service/query/DefaultEntityQueryService.java
@@ -31,6 +31,7 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.web.context.request.async.DeferredResult;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.common.util.KvUtil;
+import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.TenantId;
@@ -154,7 +155,7 @@ public class DefaultEntityQueryService implements EntityQueryService {
 
         try {
             Optional<AttributeKvEntry> valueOpt = attributesService.find(user.getTenantId(), entityId,
-                    TbAttributeSubscriptionScope.SERVER_SCOPE.name(), dynamicValue.getSourceAttribute()).get();
+                    AttributeScope.SERVER_SCOPE, dynamicValue.getSourceAttribute()).get();
 
             if (valueOpt.isPresent()) {
                 AttributeKvEntry entry = valueOpt.get();
@@ -253,7 +254,7 @@ public class DefaultEntityQueryService implements EntityQueryService {
         if (isAttributes) {
             Map<EntityType, List<EntityId>> typesMap = ids.stream().collect(Collectors.groupingBy(EntityId::getEntityType));
             List<ListenableFuture<List<String>>> futures = new ArrayList<>(typesMap.size());
-            typesMap.forEach((type, entityIds) -> futures.add(dbCallbackExecutor.submit(() -> attributesService.findAllKeysByEntityIds(tenantId, type, entityIds, attributesScope))));
+            typesMap.forEach((type, entityIds) -> futures.add(dbCallbackExecutor.submit(() -> attributesService.findAllKeysByEntityIds(tenantId, entityIds, attributesScope))));
             attributesKeysFuture = Futures.transform(Futures.allAsList(futures), lists -> {
                 if (CollectionUtils.isEmpty(lists)) {
                     return Collections.emptyList();
diff --git a/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbClusterService.java b/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbClusterService.java
index 75e9e0ae2b..7af2579b89 100644
--- a/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbClusterService.java
+++ b/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbClusterService.java
@@ -15,7 +15,6 @@
  */
 package org.thingsboard.server.service.queue;
 
-import com.google.protobuf.ByteString;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,6 +31,7 @@ import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.HasName;
 import org.thingsboard.server.common.data.HasRuleEngineProfile;
 import org.thingsboard.server.common.data.TbResource;
+import org.thingsboard.server.common.data.TbResourceInfo;
 import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.common.data.TenantProfile;
 import org.thingsboard.server.common.data.edge.EdgeEventActionType;
@@ -60,6 +60,7 @@ import org.thingsboard.server.common.msg.rpc.FromDeviceRpcResponse;
 import org.thingsboard.server.common.msg.rule.engine.DeviceEdgeUpdateMsg;
 import org.thingsboard.server.common.msg.rule.engine.DeviceNameOrTypeUpdateMsg;
 import org.thingsboard.server.dao.edge.EdgeService;
+import org.thingsboard.server.common.util.ProtoUtils;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.gen.transport.TransportProtos.FromDeviceRPCResponseProto;
 import org.thingsboard.server.gen.transport.TransportProtos.QueueDeleteMsg;
@@ -76,14 +77,14 @@ import org.thingsboard.server.queue.common.TbProtoQueueMsg;
 import org.thingsboard.server.queue.discovery.PartitionService;
 import org.thingsboard.server.queue.discovery.TopicService;
 import org.thingsboard.server.queue.provider.TbQueueProducerProvider;
-import org.thingsboard.server.queue.util.DataDecodingEncodingService;
 import org.thingsboard.server.service.gateway_device.GatewayNotificationsService;
 import org.thingsboard.server.service.ota.OtaPackageStateService;
 import org.thingsboard.server.service.profile.TbAssetProfileCache;
 import org.thingsboard.server.service.profile.TbDeviceProfileCache;
 
-import java.util.Optional;
 import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -120,7 +121,6 @@ public class DefaultTbClusterService implements TbClusterService {
     private OtaPackageStateService otaPackageStateService;
 
     private final TopicService topicService;
-    private final DataDecodingEncodingService encodingService;
     private final TbDeviceProfileCache deviceProfileCache;
     private final TbAssetProfileCache assetProfileCache;
     private final GatewayNotificationsService gatewayNotificationsService;
@@ -281,8 +281,17 @@ public class DefaultTbClusterService implements TbClusterService {
     }
 
     @Override
-    public void onDeviceProfileChange(DeviceProfile deviceProfile, TbQueueCallback callback) {
+    public void onDeviceProfileChange(DeviceProfile deviceProfile, DeviceProfile oldDeviceProfile, TbQueueCallback callback) {
+        boolean isFirmwareChanged = false;
+        boolean isSoftwareChanged = false;
+        if (oldDeviceProfile != null) {
+            isFirmwareChanged = !Objects.equals(deviceProfile.getFirmwareId(), oldDeviceProfile.getFirmwareId());
+            isSoftwareChanged = !Objects.equals(deviceProfile.getSoftwareId(), oldDeviceProfile.getSoftwareId());
+        }
         broadcastEntityChangeToTransport(deviceProfile.getTenantId(), deviceProfile.getId(), deviceProfile, callback);
+        broadcastEntityStateChangeEvent(deviceProfile.getTenantId(), deviceProfile.getId(),
+                oldDeviceProfile == null ? ComponentLifecycleEvent.CREATED : ComponentLifecycleEvent.UPDATED);
+        otaPackageStateService.update(deviceProfile, isFirmwareChanged, isSoftwareChanged);
     }
 
     @Override
@@ -319,6 +328,7 @@ public class DefaultTbClusterService implements TbClusterService {
     @Override
     public void onDeviceDeleted(TenantId tenantId, Device device, TbQueueCallback callback) {
         DeviceId deviceId = device.getId();
+        gatewayNotificationsService.onDeviceDeleted(device);
         broadcastEntityDeleteToTransport(tenantId, deviceId, device.getName(), callback);
         sendDeviceStateServiceEvent(tenantId, deviceId, false, false, true);
         broadcastEntityStateChangeEvent(tenantId, deviceId, ComponentLifecycleEvent.DELETED);
@@ -331,7 +341,7 @@ public class DefaultTbClusterService implements TbClusterService {
     }
 
     @Override
-    public void onResourceChange(TbResource resource, TbQueueCallback callback) {
+    public void onResourceChange(TbResourceInfo resource, TbQueueCallback callback) {
         TenantId tenantId = resource.getTenantId();
         log.trace("[{}][{}][{}] Processing change resource", tenantId, resource.getResourceType(), resource.getResourceKey());
         TransportProtos.ResourceUpdateMsg resourceUpdateMsg = TransportProtos.ResourceUpdateMsg.newBuilder()
@@ -345,7 +355,7 @@ public class DefaultTbClusterService implements TbClusterService {
     }
 
     @Override
-    public void onResourceDeleted(TbResource resource, TbQueueCallback callback) {
+    public void onResourceDeleted(TbResourceInfo resource, TbQueueCallback callback) {
         log.trace("[{}] Processing delete resource", resource);
         TransportProtos.ResourceDeleteMsg resourceUpdateMsg = TransportProtos.ResourceDeleteMsg.newBuilder()
                 .setTenantIdMSB(resource.getTenantId().getId().getMostSignificantBits())
@@ -357,13 +367,10 @@ public class DefaultTbClusterService implements TbClusterService {
         broadcast(transportMsg, callback);
     }
 
-    public <T> void broadcastEntityChangeToTransport(TenantId tenantId, EntityId entityid, T entity, TbQueueCallback callback) {
+    private <T> void broadcastEntityChangeToTransport(TenantId tenantId, EntityId entityid, T entity, TbQueueCallback callback) {
         String entityName = (entity instanceof HasName) ? ((HasName) entity).getName() : entity.getClass().getName();
         log.trace("[{}][{}][{}] Processing [{}] change event", tenantId, entityid.getEntityType(), entityid.getId(), entityName);
-        TransportProtos.EntityUpdateMsg entityUpdateMsg = TransportProtos.EntityUpdateMsg.newBuilder()
-                .setEntityType(entityid.getEntityType().name())
-                .setData(ByteString.copyFrom(encodingService.encode(entity))).build();
-        ToTransportMsg transportMsg = ToTransportMsg.newBuilder().setEntityUpdateMsg(entityUpdateMsg).build();
+        ToTransportMsg transportMsg = ToTransportMsg.newBuilder().setEntityUpdateMsg(ProtoUtils.toEntityUpdateProto(entity)).build();
         broadcast(transportMsg, callback);
     }
 
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 f878209753..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;
@@ -31,6 +33,7 @@ import org.thingsboard.common.util.DonAsynchron;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.common.util.ThingsBoardThreadFactory;
 import org.thingsboard.server.actors.ActorSystemContext;
+import org.thingsboard.server.common.data.JavaSerDesUtil;
 import org.thingsboard.server.common.data.alarm.AlarmInfo;
 import org.thingsboard.server.common.data.event.ErrorEvent;
 import org.thingsboard.server.common.data.event.Event;
@@ -49,6 +52,7 @@ 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.dao.tenant.TbTenantProfileCache;
@@ -78,7 +82,6 @@ import org.thingsboard.server.queue.discovery.PartitionService;
 import org.thingsboard.server.queue.discovery.event.PartitionChangeEvent;
 import org.thingsboard.server.queue.provider.TbCoreQueueFactory;
 import org.thingsboard.server.queue.util.AfterStartUp;
-import org.thingsboard.server.queue.util.DataDecodingEncodingService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.apiusage.TbApiUsageStateService;
 import org.thingsboard.server.service.edge.EdgeNotificationService;
@@ -100,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 javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
@@ -158,7 +159,6 @@ public class DefaultTbCoreConsumerService extends AbstractConsumerService<ToCore
                                         DeviceStateService stateService,
                                         TbLocalSubscriptionService localSubscriptionService,
                                         SubscriptionManagerService subscriptionManagerService,
-                                        DataDecodingEncodingService encodingService,
                                         TbCoreDeviceRpcService tbCoreDeviceRpcService,
                                         StatsFactory statsFactory,
                                         TbDeviceProfileCache deviceProfileCache,
@@ -171,11 +171,11 @@ public class DefaultTbCoreConsumerService extends AbstractConsumerService<ToCore
                                         GitVersionControlQueueService vcQueueService,
                                         PartitionService partitionService,
                                         ApplicationEventPublisher eventPublisher,
-                                        Optional<JwtSettingsService> jwtSettingsService,
+                                        JwtSettingsService jwtSettingsService,
                                         NotificationSchedulerService notificationSchedulerService,
                                         NotificationRuleProcessor notificationRuleProcessor,
                                         TbImageService imageService) {
-        super(actorContext, encodingService, tenantProfileCache, deviceProfileCache, assetProfileCache, apiUsageStateService, partitionService, eventPublisher, tbCoreQueueFactory.createToCoreNotificationsMsgConsumer(), jwtSettingsService);
+        super(actorContext, tenantProfileCache, deviceProfileCache, assetProfileCache, apiUsageStateService, partitionService, eventPublisher, tbCoreQueueFactory.createToCoreNotificationsMsgConsumer(), jwtSettingsService);
         this.mainConsumer = tbCoreQueueFactory.createToCoreMsgConsumer();
         this.usageStatsConsumer = tbCoreQueueFactory.createToUsageStatsServiceMsgConsumer();
         this.firmwareStatesConsumer = tbCoreQueueFactory.createToOtaPackageStateServiceMsgConsumer();
@@ -299,19 +299,6 @@ public class DefaultTbCoreConsumerService extends AbstractConsumerService<ToCore
                                         }
                                     }
                                     callback.onSuccess();
-                                } else if (!toCoreMsg.getToDeviceActorNotificationMsg().isEmpty()) {
-                                    // will be removed in 3.6.1 in favour of hasToDeviceActorNotification()
-                                    Optional<TbActorMsg> actorMsg = encodingService.decode(toCoreMsg.getToDeviceActorNotificationMsg().toByteArray());
-                                    if (actorMsg.isPresent()) {
-                                        TbActorMsg tbActorMsg = actorMsg.get();
-                                        if (tbActorMsg.getMsgType().equals(MsgType.DEVICE_RPC_REQUEST_TO_DEVICE_ACTOR_MSG)) {
-                                            tbCoreDeviceRpcService.forwardRpcRequestToDeviceActor((ToDeviceRpcRequestActorMsg) tbActorMsg);
-                                        } else {
-                                            log.trace("[{}] Forwarding message to App Actor {}", id, actorMsg.get());
-                                            actorContext.tell(actorMsg.get());
-                                        }
-                                    }
-                                    callback.onSuccess();
                                 } else if (toCoreMsg.hasNotificationSchedulerServiceMsg()) {
                                     TransportProtos.NotificationSchedulerServiceMsg notificationSchedulerServiceMsg = toCoreMsg.getNotificationSchedulerServiceMsg();
                                     log.trace("[{}] Forwarding message to notification scheduler service {}", id, toCoreMsg.getNotificationSchedulerServiceMsg());
@@ -391,21 +378,12 @@ public class DefaultTbCoreConsumerService extends AbstractConsumerService<ToCore
         } else if (toCoreNotification.hasEdgeEventUpdate()) {
             forwardToAppActor(id, ProtoUtils.fromProto(toCoreNotification.getEdgeEventUpdate()));
             callback.onSuccess();
-        } else if (!toCoreNotification.getEdgeEventUpdateMsg().isEmpty()) {
-            //will be removed in 3.6.1 in favour of hasEdgeEventUpdate()
-            forwardToAppActor(id, encodingService.decode(toCoreNotification.getEdgeEventUpdateMsg().toByteArray()), callback);
         } else if (toCoreNotification.hasToEdgeSyncRequest()) {
             forwardToAppActor(id, ProtoUtils.fromProto(toCoreNotification.getToEdgeSyncRequest()));
             callback.onSuccess();
-        } else if (!toCoreNotification.getToEdgeSyncRequestMsg().isEmpty()) {
-            //will be removed in 3.6.1 in favour of hasToEdgeSyncRequest()
-            forwardToAppActor(id, encodingService.decode(toCoreNotification.getToEdgeSyncRequestMsg().toByteArray()), callback);
         } else if (toCoreNotification.hasFromEdgeSyncResponse()) {
             forwardToAppActor(id, ProtoUtils.fromProto(toCoreNotification.getFromEdgeSyncResponse()));
             callback.onSuccess();
-        } else if (!toCoreNotification.getFromEdgeSyncResponseMsg().isEmpty()) {
-            //will be removed in 3.6.1 in favour of hasFromEdgeSyncResponse()
-            forwardToAppActor(id, encodingService.decode(toCoreNotification.getFromEdgeSyncResponseMsg().toByteArray()), callback);
         } else if (toCoreNotification.getQueueUpdateMsgsCount() > 0) {
             partitionService.updateQueues(toCoreNotification.getQueueUpdateMsgsList());
             callback.onSuccess();
@@ -418,9 +396,9 @@ public class DefaultTbCoreConsumerService extends AbstractConsumerService<ToCore
         } else if (toCoreNotification.hasToSubscriptionMgrMsg()) {
             forwardToSubMgrService(toCoreNotification.getToSubscriptionMgrMsg(), callback);
         } else if (toCoreNotification.hasNotificationRuleProcessorMsg()) {
-            Optional<NotificationRuleTrigger> notificationRuleTrigger = encodingService.decode(toCoreNotification
-                    .getNotificationRuleProcessorMsg().getTrigger().toByteArray());
-            notificationRuleTrigger.ifPresent(notificationRuleProcessor::process);
+            NotificationRuleTrigger notificationRuleTrigger =
+                    JavaSerDesUtil.decode(toCoreNotification.getNotificationRuleProcessorMsg().getTrigger().toByteArray());
+            notificationRuleProcessor.process(notificationRuleTrigger);
             callback.onSuccess();
         } else if (toCoreNotification.hasResourceCacheInvalidateMsg()) {
             forwardToResourceService(toCoreNotification.getResourceCacheInvalidateMsg(), callback);
@@ -605,13 +583,13 @@ public class DefaultTbCoreConsumerService extends AbstractConsumerService<ToCore
             subscriptionManagerService.onTimeSeriesUpdate(
                     toTenantId(tenantIdMSB, tenantIdLSB),
                     TbSubscriptionUtils.toEntityId(proto.getEntityType(), proto.getEntityIdMSB(), proto.getEntityIdLSB()),
-                    TbSubscriptionUtils.toTsKvEntityList(proto.getDataList()), callback);
+                    KvProtoUtil.fromTsKvProtoList(proto.getDataList()), callback);
         } else if (msg.hasAttrUpdate()) {
             TbAttributeUpdateProto proto = msg.getAttrUpdate();
             subscriptionManagerService.onAttributesUpdate(
                     toTenantId(proto.getTenantIdMSB(), proto.getTenantIdLSB()),
                     TbSubscriptionUtils.toEntityId(proto.getEntityType(), proto.getEntityIdMSB(), proto.getEntityIdLSB()),
-                    proto.getScope(), TbSubscriptionUtils.toAttributeKvList(proto.getDataList()), callback);
+                    proto.getScope(), KvProtoUtil.toAttributeKvList(proto.getDataList()), callback);
         } else if (msg.hasAttrDelete()) {
             TbAttributeDeleteProto proto = msg.getAttrDelete();
             subscriptionManagerService.onAttributesDelete(
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 afdd150a59..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
@@ -45,7 +45,6 @@ import org.thingsboard.server.queue.discovery.QueueKey;
 import org.thingsboard.server.queue.discovery.event.PartitionChangeEvent;
 import org.thingsboard.server.queue.provider.TbRuleEngineQueueFactory;
 import org.thingsboard.server.queue.util.AfterStartUp;
-import org.thingsboard.server.queue.util.DataDecodingEncodingService;
 import org.thingsboard.server.queue.util.TbRuleEngineComponent;
 import org.thingsboard.server.service.apiusage.TbApiUsageStateService;
 import org.thingsboard.server.service.profile.TbAssetProfileCache;
@@ -54,8 +53,9 @@ import org.thingsboard.server.service.queue.processing.AbstractConsumerService;
 import org.thingsboard.server.service.queue.ruleengine.TbRuleEngineConsumerContext;
 import org.thingsboard.server.service.queue.ruleengine.TbRuleEngineQueueConsumerManager;
 import org.thingsboard.server.service.rpc.TbRuleEngineDeviceRpcService;
+import org.thingsboard.server.service.security.auth.jwt.settings.JwtSettingsService;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
@@ -78,16 +78,17 @@ public class DefaultTbRuleEngineConsumerService extends AbstractConsumerService<
     public DefaultTbRuleEngineConsumerService(TbRuleEngineConsumerContext ctx,
                                               TbRuleEngineQueueFactory tbRuleEngineQueueFactory,
                                               ActorSystemContext actorContext,
-                                              DataDecodingEncodingService encodingService,
                                               TbRuleEngineDeviceRpcService tbDeviceRpcService,
                                               QueueService queueService,
                                               TbDeviceProfileCache deviceProfileCache,
                                               TbAssetProfileCache assetProfileCache,
                                               TbTenantProfileCache tenantProfileCache,
                                               TbApiUsageStateService apiUsageStateService,
-                                              PartitionService partitionService, ApplicationEventPublisher eventPublisher) {
-        super(actorContext, encodingService, tenantProfileCache, deviceProfileCache, assetProfileCache, apiUsageStateService, partitionService,
-                eventPublisher, tbRuleEngineQueueFactory.createToRuleEngineNotificationsMsgConsumer(), Optional.empty());
+                                              PartitionService partitionService,
+                                              ApplicationEventPublisher eventPublisher,
+                                              JwtSettingsService jwtSettingsService) {
+        super(actorContext, tenantProfileCache, deviceProfileCache, assetProfileCache, apiUsageStateService, partitionService,
+                eventPublisher, tbRuleEngineQueueFactory.createToRuleEngineNotificationsMsgConsumer(), jwtSettingsService);
         this.ctx = ctx;
         this.tbDeviceRpcService = tbDeviceRpcService;
         this.queueService = queueService;
@@ -111,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/TbCoreConsumerStats.java b/application/src/main/java/org/thingsboard/server/service/queue/TbCoreConsumerStats.java
index 76175d86b1..1bd1cb2d5e 100644
--- a/application/src/main/java/org/thingsboard/server/service/queue/TbCoreConsumerStats.java
+++ b/application/src/main/java/org/thingsboard/server/service/queue/TbCoreConsumerStats.java
@@ -118,10 +118,9 @@ public class TbCoreConsumerStats {
         this.toCoreNfSubscriptionServiceCounter = register(statsFactory.createStatsCounter(statsKey, TO_CORE_NF_SUBSCRIPTION_SERVICE));
         this.toCoreNfSubscriptionManagerCounter = register(statsFactory.createStatsCounter(statsKey, TO_CORE_NF_SUBSCRIPTION_MANAGER));
         this.toCoreNfVersionControlResponseCounter = register(statsFactory.createStatsCounter(statsKey, TO_CORE_NF_VC_RESPONSE));
-
     }
 
-    private StatsCounter register(StatsCounter counter){
+    private StatsCounter register(StatsCounter counter) {
         counters.add(counter);
         return counter;
     }
@@ -194,20 +193,12 @@ public class TbCoreConsumerStats {
             toCoreNfDeviceRpcResponseCounter.increment();
         } else if (msg.hasComponentLifecycle()) {
             toCoreNfComponentLifecycleCounter.increment();
-        } else if (!msg.getComponentLifecycleMsg().isEmpty()) {
-            toCoreNfComponentLifecycleCounter.increment();
         } else if (msg.hasEdgeEventUpdate()) {
             toCoreNfEdgeEventUpdateCounter.increment();
-        } else if (!msg.getEdgeEventUpdateMsg().isEmpty()) {
-            toCoreNfEdgeEventUpdateCounter.increment();
         } else if (msg.hasToEdgeSyncRequest()) {
             toCoreNfEdgeSyncRequestCounter.increment();
-        } else if (!msg.getToEdgeSyncRequestMsg().isEmpty()) {
-            toCoreNfEdgeSyncRequestCounter.increment();
         } else if (msg.hasFromEdgeSyncResponse()) {
             toCoreNfEdgeSyncResponseCounter.increment();
-        } else if (!msg.getFromEdgeSyncResponseMsg().isEmpty()) {
-            toCoreNfEdgeSyncResponseCounter.increment();
         } else if (msg.getQueueUpdateMsgsCount() > 0) {
             toCoreNfQueueUpdateCounter.increment();
         } else if (msg.getQueueDeleteMsgsCount() > 0) {
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/queue/consumer/QueueConsumerManager.java b/application/src/main/java/org/thingsboard/server/service/queue/consumer/QueueConsumerManager.java
new file mode 100644
index 0000000000..e7b3a2f2b7
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/queue/consumer/QueueConsumerManager.java
@@ -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.
+ */
+package org.thingsboard.server.service.queue.consumer;
+
+import lombok.Builder;
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+import org.thingsboard.common.util.ThingsBoardThreadFactory;
+import org.thingsboard.server.common.msg.queue.TopicPartitionInfo;
+import org.thingsboard.server.queue.TbQueueConsumer;
+import org.thingsboard.server.queue.TbQueueMsg;
+
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.ExecutorService;
+import java.util.function.Supplier;
+
+@Slf4j
+public class QueueConsumerManager<M extends TbQueueMsg> {
+
+    private final String name;
+    private final MsgPackProcessor<M> msgPackProcessor;
+    private final long pollInterval;
+    private final ExecutorService consumerExecutor;
+    private final String threadPrefix;
+
+    @Getter
+    private final TbQueueConsumer<M> consumer;
+    private volatile boolean stopped;
+
+    @Builder
+    public QueueConsumerManager(String name, MsgPackProcessor<M> msgPackProcessor,
+                                long pollInterval, Supplier<TbQueueConsumer<M>> consumerCreator,
+                                ExecutorService consumerExecutor, String threadPrefix) {
+        this.name = name;
+        this.pollInterval = pollInterval;
+        this.msgPackProcessor = msgPackProcessor;
+        this.consumerExecutor = consumerExecutor;
+        this.threadPrefix = threadPrefix;
+        this.consumer = consumerCreator.get();
+    }
+
+    public void subscribe() {
+        consumer.subscribe();
+    }
+
+    public void subscribe(Set<TopicPartitionInfo> partitions) {
+        consumer.subscribe(partitions);
+    }
+
+    public void launch() {
+        log.info("[{}] Launching consumer", name);
+        consumerExecutor.submit(() -> {
+            if (threadPrefix != null) {
+                ThingsBoardThreadFactory.addThreadNamePrefix(threadPrefix);
+            }
+            try {
+                consumerLoop(consumer);
+            } catch (Throwable e) {
+                log.error("Failure in consumer loop", e);
+            }
+            log.info("[{}] Consumer stopped", name);
+        });
+    }
+
+    private void consumerLoop(TbQueueConsumer<M> consumer) {
+        while (!stopped && !consumer.isStopped()) {
+            try {
+                List<M> msgs = consumer.poll(pollInterval);
+                if (msgs.isEmpty()) {
+                    continue;
+                }
+                msgPackProcessor.process(msgs, consumer);
+            } catch (Exception e) {
+                if (!consumer.isStopped()) {
+                    log.warn("Failed to process messages from queue", e);
+                    try {
+                        Thread.sleep(pollInterval);
+                    } catch (InterruptedException interruptedException) {
+                        log.trace("Failed to wait until the server has capacity to handle new requests", interruptedException);
+                    }
+                }
+            }
+        }
+    }
+
+    public void stop() {
+        log.debug("[{}] Stopping consumer", name);
+        stopped = true;
+        consumer.unsubscribe();
+    }
+
+    public interface MsgPackProcessor<M extends TbQueueMsg> {
+        void process(List<M> msgs, TbQueueConsumer<M> consumer) throws Exception;
+    }
+}
\ No newline at end of file
diff --git a/application/src/main/java/org/thingsboard/server/service/queue/processing/AbstractConsumerService.java b/application/src/main/java/org/thingsboard/server/service/queue/processing/AbstractConsumerService.java
index 4a348167d0..e5233c812e 100644
--- a/application/src/main/java/org/thingsboard/server/service/queue/processing/AbstractConsumerService.java
+++ b/application/src/main/java/org/thingsboard/server/service/queue/processing/AbstractConsumerService.java
@@ -15,6 +15,7 @@
  */
 package org.thingsboard.server.service.queue.processing;
 
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.context.event.ApplicationReadyEvent;
 import org.springframework.context.ApplicationEventPublisher;
@@ -39,7 +40,6 @@ import org.thingsboard.server.queue.discovery.PartitionService;
 import org.thingsboard.server.queue.discovery.TbApplicationEventListener;
 import org.thingsboard.server.queue.discovery.event.PartitionChangeEvent;
 import org.thingsboard.server.queue.util.AfterStartUp;
-import org.thingsboard.server.queue.util.DataDecodingEncodingService;
 import org.thingsboard.server.service.apiusage.TbApiUsageStateService;
 import org.thingsboard.server.service.profile.TbAssetProfileCache;
 import org.thingsboard.server.service.profile.TbDeviceProfileCache;
@@ -47,9 +47,8 @@ import org.thingsboard.server.service.queue.TbPackCallback;
 import org.thingsboard.server.service.queue.TbPackProcessingContext;
 import org.thingsboard.server.service.security.auth.jwt.settings.JwtSettingsService;
 
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PreDestroy;
 import java.util.List;
-import java.util.Optional;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
@@ -60,13 +59,13 @@ import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 @Slf4j
+@RequiredArgsConstructor
 public abstract class AbstractConsumerService<N extends com.google.protobuf.GeneratedMessageV3> extends TbApplicationEventListener<PartitionChangeEvent> {
 
     protected volatile ExecutorService notificationsConsumerExecutor;
     protected volatile boolean stopped = false;
     protected volatile boolean isReady = false;
     protected final ActorSystemContext actorContext;
-    protected final DataDecodingEncodingService encodingService;
     protected final TbTenantProfileCache tenantProfileCache;
     protected final TbDeviceProfileCache deviceProfileCache;
     protected final TbAssetProfileCache assetProfileCache;
@@ -75,25 +74,7 @@ public abstract class AbstractConsumerService<N extends com.google.protobuf.Gene
     protected final ApplicationEventPublisher eventPublisher;
 
     protected final TbQueueConsumer<TbProtoQueueMsg<N>> nfConsumer;
-    protected final Optional<JwtSettingsService> jwtSettingsService;
-
-
-    public AbstractConsumerService(ActorSystemContext actorContext, DataDecodingEncodingService encodingService,
-                                   TbTenantProfileCache tenantProfileCache, TbDeviceProfileCache deviceProfileCache,
-                                   TbAssetProfileCache assetProfileCache, TbApiUsageStateService apiUsageStateService,
-                                   PartitionService partitionService, ApplicationEventPublisher eventPublisher,
-                                   TbQueueConsumer<TbProtoQueueMsg<N>> nfConsumer, Optional<JwtSettingsService> jwtSettingsService) {
-        this.actorContext = actorContext;
-        this.encodingService = encodingService;
-        this.tenantProfileCache = tenantProfileCache;
-        this.deviceProfileCache = deviceProfileCache;
-        this.assetProfileCache = assetProfileCache;
-        this.apiUsageStateService = apiUsageStateService;
-        this.partitionService = partitionService;
-        this.eventPublisher = eventPublisher;
-        this.nfConsumer = nfConsumer;
-        this.jwtSettingsService = jwtSettingsService;
-    }
+    protected final JwtSettingsService jwtSettingsService;
 
     public void init(String nfConsumerThreadName) {
         this.notificationsConsumerExecutor = Executors.newSingleThreadExecutor(ThingsBoardThreadFactory.forName(nfConsumerThreadName));
@@ -181,7 +162,7 @@ public abstract class AbstractConsumerService<N extends com.google.protobuf.Gene
             }
         } else if (EntityType.TENANT.equals(componentLifecycleMsg.getEntityId().getEntityType())) {
             if (TenantId.SYS_TENANT_ID.equals(tenantId)) {
-                jwtSettingsService.ifPresent(JwtSettingsService::reloadJwtSettings);
+                jwtSettingsService.reloadJwtSettings();
                 return;
             } else {
                 tenantProfileCache.evict(tenantId);
diff --git a/application/src/main/java/org/thingsboard/server/service/resource/DefaultTbImageService.java b/application/src/main/java/org/thingsboard/server/service/resource/DefaultTbImageService.java
index f0f2e9b9dc..78f446af4d 100644
--- a/application/src/main/java/org/thingsboard/server/service/resource/DefaultTbImageService.java
+++ b/application/src/main/java/org/thingsboard/server/service/resource/DefaultTbImageService.java
@@ -96,7 +96,7 @@ public class DefaultTbImageService extends AbstractTbEntityService implements Tb
                 }
             }
             TbResourceInfo savedImage = imageService.saveImage(image);
-            notificationEntityService.logEntityAction(tenantId, savedImage.getId(), savedImage, actionType, user);
+            logEntityActionService.logEntityAction(tenantId, savedImage.getId(), savedImage, actionType, user);
 
             List<ImageCacheKey> toEvict = new ArrayList<>();
             if (oldEtag.isPresent()) {
@@ -117,7 +117,7 @@ public class DefaultTbImageService extends AbstractTbEntityService implements Tb
             return savedImage;
         } catch (Exception e) {
             image.setData(null);
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.TB_RESOURCE), image, actionType, user, e);
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.TB_RESOURCE), image, actionType, user, e);
             throw e;
         }
     }
@@ -139,14 +139,14 @@ public class DefaultTbImageService extends AbstractTbEntityService implements Tb
         TbResourceId imageId = imageInfo.getId();
         try {
             imageInfo = imageService.saveImageInfo(imageInfo);
-            notificationEntityService.logEntityAction(tenantId, imageId, imageInfo, ActionType.UPDATED, user);
+            logEntityActionService.logEntityAction(tenantId, imageId, imageInfo, ActionType.UPDATED, user);
 
             if (imageInfo.isPublic() != oldImageInfo.isPublic()) {
                 evictFromCache(tenantId, List.of(ImageCacheKey.forPublicImage(imageInfo.getPublicResourceKey())));
             }
             return imageInfo;
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, imageId, imageInfo, ActionType.UPDATED, user, e);
+            logEntityActionService.logEntityAction(tenantId, imageId, imageInfo, ActionType.UPDATED, user, e);
             throw e;
         }
     }
@@ -158,7 +158,7 @@ public class DefaultTbImageService extends AbstractTbEntityService implements Tb
         try {
             TbImageDeleteResult result = imageService.deleteImage(imageInfo, force);
             if (result.isSuccess()) {
-                notificationEntityService.logEntityAction(tenantId, imageId, imageInfo, ActionType.DELETED, user, imageId.toString());
+                logEntityActionService.logEntityAction(tenantId, imageId, imageInfo, ActionType.DELETED, user, imageId.toString());
 
                 List<ImageCacheKey> toEvict = new ArrayList<>();
                 toEvict.add(ImageCacheKey.forImage(tenantId, imageInfo.getResourceKey()));
@@ -169,7 +169,7 @@ public class DefaultTbImageService extends AbstractTbEntityService implements Tb
             }
             return result;
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, imageId, ActionType.DELETED, user, e, imageId.toString());
+            logEntityActionService.logEntityAction(tenantId, imageId, ActionType.DELETED, user, e, imageId.toString());
             throw e;
         }
     }
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 4b5edd1338..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
@@ -65,11 +65,10 @@ public class DefaultTbResourceService extends AbstractTbEntityService implements
                 resource.setResourceKey(resource.getFileName());
             }
             TbResource savedResource = resourceService.saveResource(resource);
-            tbClusterService.onResourceChange(savedResource, null);
-            notificationEntityService.logEntityAction(tenantId, savedResource.getId(), savedResource, actionType, user);
+            logEntityActionService.logEntityAction(tenantId, savedResource.getId(), savedResource, actionType, user);
             return savedResource;
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.TB_RESOURCE),
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.TB_RESOURCE),
                     resource, actionType, user, e);
             throw e;
         }
@@ -80,15 +79,15 @@ public class DefaultTbResourceService extends AbstractTbEntityService implements
         if (tbResource.getResourceType() == ResourceType.IMAGE) {
             throw new IllegalArgumentException("Image resource type is not supported");
         }
+        ActionType actionType = ActionType.DELETED;
         TbResourceId resourceId = tbResource.getId();
         TenantId tenantId = tbResource.getTenantId();
         try {
             resourceService.deleteResource(tenantId, resourceId);
-            tbClusterService.onResourceDeleted(tbResource, null);
-            notificationEntityService.logEntityAction(tenantId, resourceId, tbResource, ActionType.DELETED, user, resourceId.toString());
+            logEntityActionService.logEntityAction(tenantId, resourceId, tbResource, actionType, user, resourceId.toString());
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.TB_RESOURCE),
-                    ActionType.DELETED, user, e, resourceId.toString());
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.TB_RESOURCE),
+                    actionType, user, e, resourceId.toString());
             throw e;
         }
     }
@@ -96,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()
@@ -108,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/rpc/DefaultTbCoreDeviceRpcService.java b/application/src/main/java/org/thingsboard/server/service/rpc/DefaultTbCoreDeviceRpcService.java
index a64b4f2c87..3e517654cd 100644
--- a/application/src/main/java/org/thingsboard/server/service/rpc/DefaultTbCoreDeviceRpcService.java
+++ b/application/src/main/java/org/thingsboard/server/service/rpc/DefaultTbCoreDeviceRpcService.java
@@ -40,8 +40,8 @@ import org.thingsboard.server.queue.discovery.TbServiceInfoProvider;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.security.model.SecurityUser;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import java.util.Optional;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
diff --git a/application/src/main/java/org/thingsboard/server/service/rpc/DefaultTbRuleEngineRpcService.java b/application/src/main/java/org/thingsboard/server/service/rpc/DefaultTbRuleEngineRpcService.java
index 245d604078..e56496ff61 100644
--- a/application/src/main/java/org/thingsboard/server/service/rpc/DefaultTbRuleEngineRpcService.java
+++ b/application/src/main/java/org/thingsboard/server/service/rpc/DefaultTbRuleEngineRpcService.java
@@ -38,8 +38,8 @@ import org.thingsboard.server.queue.discovery.PartitionService;
 import org.thingsboard.server.queue.discovery.TbServiceInfoProvider;
 import org.thingsboard.server.queue.util.TbRuleEngineComponent;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import java.util.Optional;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
diff --git a/application/src/main/java/org/thingsboard/server/service/rule/DefaultTbRuleChainService.java b/application/src/main/java/org/thingsboard/server/service/rule/DefaultTbRuleChainService.java
index 96d92e28fe..36841ebe41 100644
--- a/application/src/main/java/org/thingsboard/server/service/rule/DefaultTbRuleChainService.java
+++ b/application/src/main/java/org/thingsboard/server/service/rule/DefaultTbRuleChainService.java
@@ -171,20 +171,15 @@ public class DefaultTbRuleChainService extends AbstractTbEntityService implement
 
     @Override
     public RuleChain save(RuleChain ruleChain, User user) throws Exception {
-        TenantId tenantId = ruleChain.getTenantId();
         ActionType actionType = ruleChain.getId() == null ? ActionType.ADDED : ActionType.UPDATED;
+        TenantId tenantId = ruleChain.getTenantId();
         try {
             RuleChain savedRuleChain = checkNotNull(ruleChainService.saveRuleChain(ruleChain));
             autoCommit(user, savedRuleChain.getId());
-
-            if (RuleChainType.CORE.equals(savedRuleChain.getType())) {
-                tbClusterService.broadcastEntityStateChangeEvent(tenantId, savedRuleChain.getId(),
-                        actionType.equals(ActionType.ADDED) ? ComponentLifecycleEvent.CREATED : ComponentLifecycleEvent.UPDATED);
-            }
-            notificationEntityService.logEntityAction(tenantId, savedRuleChain.getId(), savedRuleChain, null, actionType, user);
+            logEntityActionService.logEntityAction(tenantId, savedRuleChain.getId(), savedRuleChain, null, actionType, user);
             return savedRuleChain;
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.RULE_CHAIN), ruleChain, actionType, user, e);
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.RULE_CHAIN), ruleChain, actionType, user, e);
             throw e;
         }
     }
@@ -194,24 +189,10 @@ public class DefaultTbRuleChainService extends AbstractTbEntityService implement
         TenantId tenantId = ruleChain.getTenantId();
         RuleChainId ruleChainId = ruleChain.getId();
         try {
-            List<RuleNode> referencingRuleNodes = ruleChainService.getReferencingRuleChainNodes(tenantId, ruleChainId);
-
-            Set<RuleChainId> referencingRuleChainIds = referencingRuleNodes.stream().map(RuleNode::getRuleChainId).collect(Collectors.toSet());
-
             ruleChainService.deleteRuleChainById(tenantId, ruleChainId);
-
-            referencingRuleChainIds.remove(ruleChain.getId());
-
-            if (RuleChainType.CORE.equals(ruleChain.getType())) {
-                referencingRuleChainIds.forEach(referencingRuleChainId ->
-                        tbClusterService.broadcastEntityStateChangeEvent(tenantId, referencingRuleChainId, ComponentLifecycleEvent.UPDATED));
-
-                tbClusterService.broadcastEntityStateChangeEvent(tenantId, ruleChain.getId(), ComponentLifecycleEvent.DELETED);
-            }
-
-            notificationEntityService.logEntityAction(tenantId, ruleChainId, ruleChain, null, ActionType.DELETED, user, ruleChainId.toString());
+            logEntityActionService.logEntityAction(tenantId, ruleChainId, ruleChain, null, ActionType.DELETED, user, ruleChainId.toString());
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.RULE_CHAIN), ActionType.DELETED,
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.RULE_CHAIN), ActionType.DELETED,
                     user, e, ruleChainId.toString());
             throw e;
         }
@@ -222,42 +203,34 @@ public class DefaultTbRuleChainService extends AbstractTbEntityService implement
         try {
             RuleChain savedRuleChain = installScripts.createDefaultRuleChain(tenantId, request.getName());
             autoCommit(user, savedRuleChain.getId());
-            tbClusterService.broadcastEntityStateChangeEvent(tenantId, savedRuleChain.getId(), ComponentLifecycleEvent.CREATED);
-            notificationEntityService.logEntityAction(tenantId, savedRuleChain.getId(), savedRuleChain, ActionType.ADDED, user);
+            logEntityActionService.logEntityAction(tenantId, savedRuleChain.getId(), savedRuleChain, ActionType.ADDED, user);
             return savedRuleChain;
         } catch (Exception e) {
             RuleChain ruleChain = new RuleChain();
             ruleChain.setName(request.getName());
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.RULE_CHAIN), ruleChain,
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.RULE_CHAIN), ruleChain,
                     ActionType.ADDED, user, e);
             throw e;
         }
     }
 
     @Override
-    public RuleChain setRootRuleChain(TenantId tenantId, RuleChain ruleChain, User user) throws ThingsboardException {
+    public RuleChain setRootRuleChain(TenantId tenantId, RuleChain ruleChain, User user) {
         RuleChainId ruleChainId = ruleChain.getId();
         try {
             RuleChain previousRootRuleChain = ruleChainService.getRootTenantRuleChain(tenantId);
             if (ruleChainService.setRootRuleChain(tenantId, ruleChainId)) {
                 if (previousRootRuleChain != null) {
-                    RuleChainId previousRootRuleChainId = previousRootRuleChain.getId();
-                    previousRootRuleChain = ruleChainService.findRuleChainById(tenantId, previousRootRuleChainId);
-
-                    tbClusterService.broadcastEntityStateChangeEvent(tenantId, previousRootRuleChainId,
-                            ComponentLifecycleEvent.UPDATED);
-                    notificationEntityService.logEntityAction(tenantId, previousRootRuleChainId, previousRootRuleChain,
+                    previousRootRuleChain = ruleChainService.findRuleChainById(tenantId, previousRootRuleChain.getId());
+                    logEntityActionService.logEntityAction(tenantId, previousRootRuleChain.getId(), previousRootRuleChain,
                             ActionType.UPDATED, user);
                 }
                 ruleChain = ruleChainService.findRuleChainById(tenantId, ruleChainId);
-
-                tbClusterService.broadcastEntityStateChangeEvent(tenantId, ruleChainId,
-                        ComponentLifecycleEvent.UPDATED);
-                notificationEntityService.logEntityAction(tenantId, ruleChainId, ruleChain, ActionType.UPDATED, user);
+                logEntityActionService.logEntityAction(tenantId, ruleChainId, ruleChain, ActionType.UPDATED, user);
             }
             return ruleChain;
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.RULE_CHAIN), ActionType.UPDATED,
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.RULE_CHAIN), ActionType.UPDATED,
                     user, e, ruleChainId.toString());
             throw e;
         }
@@ -291,24 +264,22 @@ public class DefaultTbRuleChainService extends AbstractTbEntityService implement
             RuleChainMetaData savedRuleChainMetaData = checkNotNull(ruleChainService.loadRuleChainMetaData(tenantId, ruleChainMetaDataId));
 
             if (RuleChainType.CORE.equals(ruleChain.getType())) {
-                tbClusterService.broadcastEntityStateChangeEvent(tenantId, ruleChainId, ComponentLifecycleEvent.UPDATED);
-                updatedRuleChains.forEach(updatedRuleChain -> {
-                    tbClusterService.broadcastEntityStateChangeEvent(tenantId, updatedRuleChain.getId(), ComponentLifecycleEvent.UPDATED);
-                });
+                updatedRuleChains.forEach(updatedRuleChain ->
+                        tbClusterService.broadcastEntityStateChangeEvent(tenantId, updatedRuleChain.getId(), ComponentLifecycleEvent.UPDATED));
             }
 
-            notificationEntityService.logEntityAction(tenantId, ruleChainId, ruleChain, ActionType.UPDATED, user, ruleChainMetaData);
+            logEntityActionService.logEntityAction(tenantId, ruleChainId, ruleChain, ActionType.UPDATED, user, ruleChainMetaData);
 
             for (RuleChain updatedRuleChain : updatedRuleChains) {
                 if (RuleChainType.CORE.equals(ruleChain.getType())) {
                     RuleChainMetaData updatedRuleChainMetaData = checkNotNull(ruleChainService.loadRuleChainMetaData(tenantId, updatedRuleChain.getId()));
-                    notificationEntityService.logEntityAction(tenantId, updatedRuleChain.getId(), updatedRuleChain,
+                    logEntityActionService.logEntityAction(tenantId, updatedRuleChain.getId(), updatedRuleChain,
                             ActionType.UPDATED, user, updatedRuleChainMetaData);
                 }
             }
             return savedRuleChainMetaData;
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.RULE_CHAIN), ActionType.ADDED,
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.RULE_CHAIN), ActionType.ADDED,
                     user, e, ruleChainMetaData);
             throw e;
         }
@@ -321,11 +292,11 @@ public class DefaultTbRuleChainService extends AbstractTbEntityService implement
         EdgeId edgeId = edge.getId();
         try {
             RuleChain savedRuleChain = checkNotNull(ruleChainService.assignRuleChainToEdge(tenantId, ruleChainId, edgeId));
-            notificationEntityService.logEntityAction(tenantId, ruleChainId, savedRuleChain, null, actionType,
+            logEntityActionService.logEntityAction(tenantId, ruleChainId, savedRuleChain, null, actionType,
                     user, ruleChainId.toString(), edgeId.toString(), edge.getName());
             return savedRuleChain;
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.RULE_CHAIN),
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.RULE_CHAIN),
                     actionType, user, e, ruleChainId.toString(), edgeId.toString());
             throw e;
         }
@@ -338,11 +309,11 @@ public class DefaultTbRuleChainService extends AbstractTbEntityService implement
         EdgeId edgeId = edge.getId();
         try {
             RuleChain savedRuleChain = checkNotNull(ruleChainService.unassignRuleChainFromEdge(tenantId, ruleChainId, edgeId, false));
-            notificationEntityService.logEntityAction(tenantId, ruleChainId, savedRuleChain, null, actionType,
+            logEntityActionService.logEntityAction(tenantId, ruleChainId, savedRuleChain, null, actionType,
                     user, ruleChainId.toString(), edgeId.toString(), edge.getName());
             return savedRuleChain;
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.RULE_CHAIN),
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.RULE_CHAIN),
                     actionType, user, e, ruleChainId, edgeId);
             throw e;
         }
@@ -353,10 +324,10 @@ public class DefaultTbRuleChainService extends AbstractTbEntityService implement
         RuleChainId ruleChainId = ruleChain.getId();
         try {
             ruleChainService.setEdgeTemplateRootRuleChain(tenantId, ruleChainId);
-            notificationEntityService.logEntityAction(tenantId, ruleChainId, ruleChain, ActionType.UPDATED, user);
+            logEntityActionService.logEntityAction(tenantId, ruleChainId, ruleChain, ActionType.UPDATED, user);
             return ruleChain;
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.RULE_CHAIN), ActionType.UPDATED,
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.RULE_CHAIN), ActionType.UPDATED,
                     user, e, ruleChainId.toString());
             throw e;
         }
@@ -367,10 +338,10 @@ public class DefaultTbRuleChainService extends AbstractTbEntityService implement
         RuleChainId ruleChainId = ruleChain.getId();
         try {
             ruleChainService.setAutoAssignToEdgeRuleChain(tenantId, ruleChainId);
-            notificationEntityService.logEntityAction(tenantId, ruleChainId, ruleChain, ActionType.UPDATED, user);
+            logEntityActionService.logEntityAction(tenantId, ruleChainId, ruleChain, ActionType.UPDATED, user);
             return ruleChain;
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.RULE_CHAIN), ActionType.UPDATED,
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.RULE_CHAIN), ActionType.UPDATED,
                     user, e, ruleChainId.toString());
             throw e;
         }
@@ -381,10 +352,10 @@ public class DefaultTbRuleChainService extends AbstractTbEntityService implement
         RuleChainId ruleChainId = ruleChain.getId();
         try {
             ruleChainService.unsetAutoAssignToEdgeRuleChain(tenantId, ruleChainId);
-            notificationEntityService.logEntityAction(tenantId, ruleChainId, ruleChain, ActionType.UPDATED, user);
+            logEntityActionService.logEntityAction(tenantId, ruleChainId, ruleChain, ActionType.UPDATED, user);
             return ruleChain;
         } catch (Exception e) {
-            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.RULE_CHAIN), ActionType.UPDATED,
+            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.RULE_CHAIN), ActionType.UPDATED,
                     user, e, ruleChainId.toString());
             throw e;
         }
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 a7294cfd3c..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
@@ -81,9 +81,9 @@ import org.thingsboard.server.service.security.permission.AccessControlService;
 import org.thingsboard.server.service.security.permission.Operation;
 import org.thingsboard.server.service.security.permission.Resource;
 
-import javax.annotation.Nullable;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.Nullable;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.function.BiConsumer;
@@ -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/jwt/JwtTokenAuthenticationProcessingFilter.java b/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/JwtTokenAuthenticationProcessingFilter.java
index ea3e2c8b3b..bc80eb404a 100644
--- a/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/JwtTokenAuthenticationProcessingFilter.java
+++ b/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/JwtTokenAuthenticationProcessingFilter.java
@@ -27,10 +27,10 @@ import org.thingsboard.server.service.security.auth.JwtAuthenticationToken;
 import org.thingsboard.server.service.security.auth.jwt.extractor.TokenExtractor;
 import org.thingsboard.server.service.security.model.token.RawAccessJwtToken;
 
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 public class JwtTokenAuthenticationProcessingFilter extends AbstractAuthenticationProcessingFilter {
diff --git a/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/RefreshTokenProcessingFilter.java b/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/RefreshTokenProcessingFilter.java
index 7a9872f979..9b6f1805c0 100644
--- a/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/RefreshTokenProcessingFilter.java
+++ b/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/RefreshTokenProcessingFilter.java
@@ -30,10 +30,10 @@ import org.thingsboard.server.service.security.auth.RefreshAuthenticationToken;
 import org.thingsboard.server.service.security.exception.AuthMethodNotSupportedException;
 import org.thingsboard.server.service.security.model.token.RawAccessJwtToken;
 
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 @Slf4j
diff --git a/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/SkipPathRequestMatcher.java b/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/SkipPathRequestMatcher.java
index 4dd3760864..eeb94e3a6f 100644
--- a/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/SkipPathRequestMatcher.java
+++ b/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/SkipPathRequestMatcher.java
@@ -20,7 +20,7 @@ import org.springframework.security.web.util.matcher.OrRequestMatcher;
 import org.springframework.security.web.util.matcher.RequestMatcher;
 import org.springframework.util.Assert;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.stream.Collectors;
 
diff --git a/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/extractor/JwtHeaderTokenExtractor.java b/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/extractor/JwtHeaderTokenExtractor.java
index 5baf17632d..51024dfd60 100644
--- a/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/extractor/JwtHeaderTokenExtractor.java
+++ b/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/extractor/JwtHeaderTokenExtractor.java
@@ -20,7 +20,7 @@ import org.springframework.stereotype.Component;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.config.ThingsboardSecurityConfiguration;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 @Component(value="jwtHeaderTokenExtractor")
 public class JwtHeaderTokenExtractor implements TokenExtractor {
diff --git a/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/extractor/JwtQueryTokenExtractor.java b/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/extractor/JwtQueryTokenExtractor.java
index 61d4679b72..f611e94b12 100644
--- a/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/extractor/JwtQueryTokenExtractor.java
+++ b/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/extractor/JwtQueryTokenExtractor.java
@@ -20,7 +20,7 @@ import org.springframework.stereotype.Component;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.config.ThingsboardSecurityConfiguration;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 @Component(value="jwtQueryTokenExtractor")
 public class JwtQueryTokenExtractor implements TokenExtractor {
diff --git a/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/extractor/TokenExtractor.java b/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/extractor/TokenExtractor.java
index 8948577a81..d7920cb63c 100644
--- a/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/extractor/TokenExtractor.java
+++ b/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/extractor/TokenExtractor.java
@@ -15,8 +15,8 @@
  */
 package org.thingsboard.server.service.security.auth.jwt.extractor;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 public interface TokenExtractor {
-    public String extract(HttpServletRequest request);
+    String extract(HttpServletRequest request);
 }
\ No newline at end of file
diff --git a/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/settings/DefaultJwtSettingsService.java b/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/settings/DefaultJwtSettingsService.java
index 3748d11348..e5143a6023 100644
--- a/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/settings/DefaultJwtSettingsService.java
+++ b/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/settings/DefaultJwtSettingsService.java
@@ -19,7 +19,6 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.rule.engine.api.NotificationCenter;
@@ -42,9 +41,7 @@ import java.util.Optional;
 @Slf4j
 public class DefaultJwtSettingsService implements JwtSettingsService {
 
-    @Lazy
     private final AdminSettingsService adminSettingsService;
-    @Lazy
     private final Optional<TbClusterService> tbClusterService;
     private final Optional<NotificationCenter> notificationCenter;
     private final JwtSettingsValidator jwtSettingsValidator;
@@ -107,11 +104,13 @@ public class DefaultJwtSettingsService implements JwtSettingsService {
 
     @Override
     public JwtSettings reloadJwtSettings() {
+        log.trace("Executing reloadJwtSettings");
         return getJwtSettings(true);
     }
 
     @Override
     public JwtSettings getJwtSettings() {
+        log.trace("Executing getJwtSettings");
         return getJwtSettings(false);
     }
 
diff --git a/application/src/main/java/org/thingsboard/server/service/security/auth/oauth2/AbstractOAuth2ClientMapper.java b/application/src/main/java/org/thingsboard/server/service/security/auth/oauth2/AbstractOAuth2ClientMapper.java
index d0e3444d0f..22d3b9b5ea 100644
--- a/application/src/main/java/org/thingsboard/server/service/security/auth/oauth2/AbstractOAuth2ClientMapper.java
+++ b/application/src/main/java/org/thingsboard/server/service/security/auth/oauth2/AbstractOAuth2ClientMapper.java
@@ -20,11 +20,11 @@ import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.thingsboard.common.util.JacksonUtil;
-import org.thingsboard.server.cluster.TbClusterService;
 import org.thingsboard.server.common.data.Customer;
 import org.thingsboard.server.common.data.DashboardInfo;
 import org.thingsboard.server.common.data.StringUtils;
@@ -42,6 +42,7 @@ import org.thingsboard.server.common.data.security.Authority;
 import org.thingsboard.server.common.data.security.UserCredentials;
 import org.thingsboard.server.dao.customer.CustomerService;
 import org.thingsboard.server.dao.dashboard.DashboardService;
+import org.thingsboard.server.dao.eventsourcing.SaveEntityEvent;
 import org.thingsboard.server.dao.oauth2.OAuth2User;
 import org.thingsboard.server.dao.tenant.TbTenantProfileCache;
 import org.thingsboard.server.dao.tenant.TenantService;
@@ -89,7 +90,7 @@ public abstract class AbstractOAuth2ClientMapper {
     protected TbTenantProfileCache tenantProfileCache;
 
     @Autowired
-    protected TbClusterService tbClusterService;
+    private ApplicationEventPublisher eventPublisher;
 
     @Value("${edges.enabled}")
     @Getter
diff --git a/application/src/main/java/org/thingsboard/server/service/security/auth/oauth2/AppleOAuth2ClientMapper.java b/application/src/main/java/org/thingsboard/server/service/security/auth/oauth2/AppleOAuth2ClientMapper.java
index db03c6c92c..26935ad0ee 100644
--- a/application/src/main/java/org/thingsboard/server/service/security/auth/oauth2/AppleOAuth2ClientMapper.java
+++ b/application/src/main/java/org/thingsboard/server/service/security/auth/oauth2/AppleOAuth2ClientMapper.java
@@ -29,7 +29,7 @@ import org.thingsboard.server.dao.oauth2.OAuth2User;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.security.model.SecurityUser;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.HashMap;
 import java.util.Map;
 
diff --git a/application/src/main/java/org/thingsboard/server/service/security/auth/oauth2/BasicOAuth2ClientMapper.java b/application/src/main/java/org/thingsboard/server/service/security/auth/oauth2/BasicOAuth2ClientMapper.java
index 2271ba785a..693dfa5434 100644
--- a/application/src/main/java/org/thingsboard/server/service/security/auth/oauth2/BasicOAuth2ClientMapper.java
+++ b/application/src/main/java/org/thingsboard/server/service/security/auth/oauth2/BasicOAuth2ClientMapper.java
@@ -24,7 +24,7 @@ import org.thingsboard.server.dao.oauth2.OAuth2User;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.security.model.SecurityUser;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.Map;
 
 @Service(value = "basicOAuth2ClientMapper")
diff --git a/application/src/main/java/org/thingsboard/server/service/security/auth/oauth2/CookieUtils.java b/application/src/main/java/org/thingsboard/server/service/security/auth/oauth2/CookieUtils.java
index d37a2415c5..a974c562be 100644
--- a/application/src/main/java/org/thingsboard/server/service/security/auth/oauth2/CookieUtils.java
+++ b/application/src/main/java/org/thingsboard/server/service/security/auth/oauth2/CookieUtils.java
@@ -20,9 +20,9 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.jackson2.SecurityJackson2Modules;
 
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Base64;
diff --git a/application/src/main/java/org/thingsboard/server/service/security/auth/oauth2/CustomOAuth2ClientMapper.java b/application/src/main/java/org/thingsboard/server/service/security/auth/oauth2/CustomOAuth2ClientMapper.java
index eb3d021ea8..ed1d5cfd6d 100644
--- a/application/src/main/java/org/thingsboard/server/service/security/auth/oauth2/CustomOAuth2ClientMapper.java
+++ b/application/src/main/java/org/thingsboard/server/service/security/auth/oauth2/CustomOAuth2ClientMapper.java
@@ -30,7 +30,7 @@ import org.thingsboard.server.dao.oauth2.OAuth2User;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.security.model.SecurityUser;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 @Service(value = "customOAuth2ClientMapper")
 @Slf4j
diff --git a/application/src/main/java/org/thingsboard/server/service/security/auth/oauth2/GithubOAuth2ClientMapper.java b/application/src/main/java/org/thingsboard/server/service/security/auth/oauth2/GithubOAuth2ClientMapper.java
index 7744fbf261..1b42946ad6 100644
--- a/application/src/main/java/org/thingsboard/server/service/security/auth/oauth2/GithubOAuth2ClientMapper.java
+++ b/application/src/main/java/org/thingsboard/server/service/security/auth/oauth2/GithubOAuth2ClientMapper.java
@@ -30,7 +30,7 @@ import org.thingsboard.server.dao.oauth2.OAuth2User;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.security.model.SecurityUser;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.Map;
 import java.util.Optional;
diff --git a/application/src/main/java/org/thingsboard/server/service/security/auth/oauth2/HttpCookieOAuth2AuthorizationRequestRepository.java b/application/src/main/java/org/thingsboard/server/service/security/auth/oauth2/HttpCookieOAuth2AuthorizationRequestRepository.java
index 14632cf51f..7d697d5687 100644
--- a/application/src/main/java/org/thingsboard/server/service/security/auth/oauth2/HttpCookieOAuth2AuthorizationRequestRepository.java
+++ b/application/src/main/java/org/thingsboard/server/service/security/auth/oauth2/HttpCookieOAuth2AuthorizationRequestRepository.java
@@ -20,8 +20,8 @@ import org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationRequ
 import org.springframework.stereotype.Component;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 @Component
 @TbCoreComponent
@@ -50,9 +50,8 @@ public class HttpCookieOAuth2AuthorizationRequestRepository implements Authoriza
         CookieUtils.addCookie(response, OAUTH2_AUTHORIZATION_REQUEST_COOKIE_NAME, CookieUtils.serialize(authorizationRequest), cookieExpireSeconds);
     }
 
-    @SuppressWarnings("deprecation")
     @Override
-    public OAuth2AuthorizationRequest removeAuthorizationRequest(HttpServletRequest request) {
+    public OAuth2AuthorizationRequest removeAuthorizationRequest(HttpServletRequest request, HttpServletResponse response) {
         return this.loadAuthorizationRequest(request);
     }
 
diff --git a/application/src/main/java/org/thingsboard/server/service/security/auth/oauth2/OAuth2ClientMapper.java b/application/src/main/java/org/thingsboard/server/service/security/auth/oauth2/OAuth2ClientMapper.java
index 4f0aac2f85..cc877f36d4 100644
--- a/application/src/main/java/org/thingsboard/server/service/security/auth/oauth2/OAuth2ClientMapper.java
+++ b/application/src/main/java/org/thingsboard/server/service/security/auth/oauth2/OAuth2ClientMapper.java
@@ -19,7 +19,7 @@ import org.springframework.security.oauth2.client.authentication.OAuth2Authentic
 import org.thingsboard.server.common.data.oauth2.OAuth2Registration;
 import org.thingsboard.server.service.security.model.SecurityUser;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 public interface OAuth2ClientMapper {
     SecurityUser getOrCreateUserByClientPrincipal(HttpServletRequest request, OAuth2AuthenticationToken token, String providerAccessToken, OAuth2Registration registration);
diff --git a/application/src/main/java/org/thingsboard/server/service/security/auth/oauth2/Oauth2AuthenticationFailureHandler.java b/application/src/main/java/org/thingsboard/server/service/security/auth/oauth2/Oauth2AuthenticationFailureHandler.java
index 6234c7710f..be4555a36f 100644
--- a/application/src/main/java/org/thingsboard/server/service/security/auth/oauth2/Oauth2AuthenticationFailureHandler.java
+++ b/application/src/main/java/org/thingsboard/server/service/security/auth/oauth2/Oauth2AuthenticationFailureHandler.java
@@ -27,9 +27,9 @@ import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.security.system.SystemSecurityService;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
diff --git a/application/src/main/java/org/thingsboard/server/service/security/auth/oauth2/Oauth2AuthenticationSuccessHandler.java b/application/src/main/java/org/thingsboard/server/service/security/auth/oauth2/Oauth2AuthenticationSuccessHandler.java
index 3c91e86424..09ebb75e29 100644
--- a/application/src/main/java/org/thingsboard/server/service/security/auth/oauth2/Oauth2AuthenticationSuccessHandler.java
+++ b/application/src/main/java/org/thingsboard/server/service/security/auth/oauth2/Oauth2AuthenticationSuccessHandler.java
@@ -38,9 +38,9 @@ import org.thingsboard.server.service.security.model.SecurityUser;
 import org.thingsboard.server.service.security.model.token.JwtTokenFactory;
 import org.thingsboard.server.service.security.system.SystemSecurityService;
 
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
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 91ccbfbf8d..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
@@ -17,10 +17,9 @@ package org.thingsboard.server.service.security.auth.rest;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 
-@ApiModel
+@Schema
 public class LoginRequest {
 
     private String username;
@@ -33,12 +32,12 @@ public class LoginRequest {
         this.password = password;
     }
 
-    @ApiModelProperty(position = 1, required = true, value = "User email", example = "tenant@thingsboard.org")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "User email", example = "tenant@thingsboard.org")
     public String getUsername() {
         return username;
     }
 
-    @ApiModelProperty(position = 2, required = true, value = "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 05dbf4d4f3..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
@@ -15,19 +15,18 @@
  */
 package org.thingsboard.server.service.security.auth.rest;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-@ApiModel
+@Schema
 @Data
 public class LoginResponse {
 
-    @ApiModelProperty(position = 1, required = true, value = "JWT token",
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "JWT token",
             example = "eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJ0ZW5hbnRAdGhpbmdzYm9hcmQub3JnIi...")
     private String token;
 
-    @ApiModelProperty(position = 2, required = true, value = "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/security/auth/rest/RestAuthenticationDetails.java b/application/src/main/java/org/thingsboard/server/service/security/auth/rest/RestAuthenticationDetails.java
index e55f455b74..f570718a03 100644
--- a/application/src/main/java/org/thingsboard/server/service/security/auth/rest/RestAuthenticationDetails.java
+++ b/application/src/main/java/org/thingsboard/server/service/security/auth/rest/RestAuthenticationDetails.java
@@ -19,7 +19,7 @@ import lombok.Data;
 import ua_parser.Client;
 import ua_parser.Parser;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.io.Serializable;
 
 @Data
diff --git a/application/src/main/java/org/thingsboard/server/service/security/auth/rest/RestAuthenticationDetailsSource.java b/application/src/main/java/org/thingsboard/server/service/security/auth/rest/RestAuthenticationDetailsSource.java
index 3581f8f632..077dea18df 100644
--- a/application/src/main/java/org/thingsboard/server/service/security/auth/rest/RestAuthenticationDetailsSource.java
+++ b/application/src/main/java/org/thingsboard/server/service/security/auth/rest/RestAuthenticationDetailsSource.java
@@ -17,7 +17,7 @@ package org.thingsboard.server.service.security.auth.rest;
 
 import org.springframework.security.authentication.AuthenticationDetailsSource;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 public class RestAuthenticationDetailsSource implements
         AuthenticationDetailsSource<HttpServletRequest, RestAuthenticationDetails> {
diff --git a/application/src/main/java/org/thingsboard/server/service/security/auth/rest/RestAwareAuthenticationFailureHandler.java b/application/src/main/java/org/thingsboard/server/service/security/auth/rest/RestAwareAuthenticationFailureHandler.java
index a28b263cd1..045ae44015 100644
--- a/application/src/main/java/org/thingsboard/server/service/security/auth/rest/RestAwareAuthenticationFailureHandler.java
+++ b/application/src/main/java/org/thingsboard/server/service/security/auth/rest/RestAwareAuthenticationFailureHandler.java
@@ -21,9 +21,9 @@ import org.springframework.security.web.authentication.AuthenticationFailureHand
 import org.springframework.stereotype.Component;
 import org.thingsboard.server.exception.ThingsboardErrorResponseHandler;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 @Component(value = "defaultAuthenticationFailureHandler")
diff --git a/application/src/main/java/org/thingsboard/server/service/security/auth/rest/RestAwareAuthenticationSuccessHandler.java b/application/src/main/java/org/thingsboard/server/service/security/auth/rest/RestAwareAuthenticationSuccessHandler.java
index 3a51fdbf67..b05c3d7292 100644
--- a/application/src/main/java/org/thingsboard/server/service/security/auth/rest/RestAwareAuthenticationSuccessHandler.java
+++ b/application/src/main/java/org/thingsboard/server/service/security/auth/rest/RestAwareAuthenticationSuccessHandler.java
@@ -30,10 +30,10 @@ import org.thingsboard.server.service.security.auth.mfa.config.TwoFaConfigManage
 import org.thingsboard.server.service.security.model.SecurityUser;
 import org.thingsboard.server.service.security.model.token.JwtTokenFactory;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
 import java.io.IOException;
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
diff --git a/application/src/main/java/org/thingsboard/server/service/security/auth/rest/RestLoginProcessingFilter.java b/application/src/main/java/org/thingsboard/server/service/security/auth/rest/RestLoginProcessingFilter.java
index cab5aa6863..e97fb02b1d 100644
--- a/application/src/main/java/org/thingsboard/server/service/security/auth/rest/RestLoginProcessingFilter.java
+++ b/application/src/main/java/org/thingsboard/server/service/security/auth/rest/RestLoginProcessingFilter.java
@@ -31,10 +31,10 @@ import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.service.security.exception.AuthMethodNotSupportedException;
 import org.thingsboard.server.service.security.model.UserPrincipal;
 
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 @Slf4j
diff --git a/application/src/main/java/org/thingsboard/server/service/security/auth/rest/RestPublicLoginProcessingFilter.java b/application/src/main/java/org/thingsboard/server/service/security/auth/rest/RestPublicLoginProcessingFilter.java
index 74421385a6..ffe17a1372 100644
--- a/application/src/main/java/org/thingsboard/server/service/security/auth/rest/RestPublicLoginProcessingFilter.java
+++ b/application/src/main/java/org/thingsboard/server/service/security/auth/rest/RestPublicLoginProcessingFilter.java
@@ -30,10 +30,10 @@ import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.service.security.exception.AuthMethodNotSupportedException;
 import org.thingsboard.server.service.security.model.UserPrincipal;
 
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 @Slf4j
diff --git a/application/src/main/java/org/thingsboard/server/service/security/model/ActivateUserRequest.java b/application/src/main/java/org/thingsboard/server/service/security/model/ActivateUserRequest.java
index 73e55c28f7..fc56257a91 100644
--- a/application/src/main/java/org/thingsboard/server/service/security/model/ActivateUserRequest.java
+++ b/application/src/main/java/org/thingsboard/server/service/security/model/ActivateUserRequest.java
@@ -15,16 +15,15 @@
  */
 package org.thingsboard.server.service.security.model;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-@ApiModel
+@Schema
 @Data
 public class ActivateUserRequest {
 
-    @ApiModelProperty(position = 1, value = "The activate token to verify", example = "AAB254FF67D..")
+    @Schema(description = "The activate token to verify", example = "AAB254FF67D..")
     private String activateToken;
-    @ApiModelProperty(position = 2, value = "The new password to set", example = "secret")
+    @Schema(description = "The new password to set", example = "secret")
     private String password;
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/security/model/ChangePasswordRequest.java b/application/src/main/java/org/thingsboard/server/service/security/model/ChangePasswordRequest.java
index 3bf3d12c8e..fb326e0873 100644
--- a/application/src/main/java/org/thingsboard/server/service/security/model/ChangePasswordRequest.java
+++ b/application/src/main/java/org/thingsboard/server/service/security/model/ChangePasswordRequest.java
@@ -15,17 +15,16 @@
  */
 package org.thingsboard.server.service.security.model;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-@ApiModel
+@Schema
 @Data
 public class ChangePasswordRequest {
 
-    @ApiModelProperty(position = 1, value = "The old password", example = "OldPassword")
+    @Schema(description = "The old password", example = "OldPassword")
     private String currentPassword;
-    @ApiModelProperty(position = 1, value = "The new password", example = "NewPassword")
+    @Schema(description = "The new password", example = "NewPassword")
     private String newPassword;
 
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/security/model/ResetPasswordEmailRequest.java b/application/src/main/java/org/thingsboard/server/service/security/model/ResetPasswordEmailRequest.java
index f73ba4a14c..0193a7edfa 100644
--- a/application/src/main/java/org/thingsboard/server/service/security/model/ResetPasswordEmailRequest.java
+++ b/application/src/main/java/org/thingsboard/server/service/security/model/ResetPasswordEmailRequest.java
@@ -15,14 +15,13 @@
  */
 package org.thingsboard.server.service.security.model;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-@ApiModel
+@Schema
 @Data
 public class ResetPasswordEmailRequest {
 
-    @ApiModelProperty(position = 1, value = "The email of the user", example = "user@example.com")
+    @Schema(description = "The email of the user", example = "user@example.com")
     private String email;
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/security/model/ResetPasswordRequest.java b/application/src/main/java/org/thingsboard/server/service/security/model/ResetPasswordRequest.java
index 0786bd3299..e86803f143 100644
--- a/application/src/main/java/org/thingsboard/server/service/security/model/ResetPasswordRequest.java
+++ b/application/src/main/java/org/thingsboard/server/service/security/model/ResetPasswordRequest.java
@@ -15,16 +15,15 @@
  */
 package org.thingsboard.server.service.security.model;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-@ApiModel
+@Schema
 @Data
 public class ResetPasswordRequest {
 
-    @ApiModelProperty(position = 1, value = "The reset token to verify", example = "AAB254FF67D..")
+    @Schema(description = "The reset token to verify", example = "AAB254FF67D..")
     private String resetToken;
-    @ApiModelProperty(position = 2, value = "The new password to set", example = "secret")
+    @Schema(description = "The new password to set", example = "secret")
     private String password;
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/security/system/DefaultSystemSecurityService.java b/application/src/main/java/org/thingsboard/server/service/security/system/DefaultSystemSecurityService.java
index 1669f0784c..d3f945cda1 100644
--- a/application/src/main/java/org/thingsboard/server/service/security/system/DefaultSystemSecurityService.java
+++ b/application/src/main/java/org/thingsboard/server/service/security/system/DefaultSystemSecurityService.java
@@ -62,8 +62,8 @@ import org.thingsboard.server.service.security.model.SecurityUser;
 import org.thingsboard.server.utils.MiscUtils;
 import ua_parser.Client;
 
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
diff --git a/application/src/main/java/org/thingsboard/server/service/security/system/SystemSecurityService.java b/application/src/main/java/org/thingsboard/server/service/security/system/SystemSecurityService.java
index 42f2face07..06e5cece81 100644
--- a/application/src/main/java/org/thingsboard/server/service/security/system/SystemSecurityService.java
+++ b/application/src/main/java/org/thingsboard/server/service/security/system/SystemSecurityService.java
@@ -27,7 +27,7 @@ import org.thingsboard.server.common.data.security.model.mfa.PlatformTwoFaSettin
 import org.thingsboard.server.dao.exception.DataValidationException;
 import org.thingsboard.server.service.security.model.SecurityUser;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 public interface SystemSecurityService {
 
diff --git a/application/src/main/java/org/thingsboard/server/service/sms/DefaultSmsService.java b/application/src/main/java/org/thingsboard/server/service/sms/DefaultSmsService.java
index 82eef23c52..aaac542a76 100644
--- a/application/src/main/java/org/thingsboard/server/service/sms/DefaultSmsService.java
+++ b/application/src/main/java/org/thingsboard/server/service/sms/DefaultSmsService.java
@@ -34,10 +34,9 @@ import org.thingsboard.server.common.data.sms.config.TestSmsRequest;
 import org.thingsboard.server.common.stats.TbApiUsageReportClient;
 import org.thingsboard.server.dao.settings.AdminSettingsService;
 import org.thingsboard.server.service.apiusage.TbApiUsageStateService;
-import org.thingsboard.server.service.transport.DefaultTransportApiService;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 
 @Service
 @Slf4j
diff --git a/application/src/main/java/org/thingsboard/server/service/state/DefaultDeviceStateService.java b/application/src/main/java/org/thingsboard/server/service/state/DefaultDeviceStateService.java
index 30c59b3da8..be370ec562 100644
--- a/application/src/main/java/org/thingsboard/server/service/state/DefaultDeviceStateService.java
+++ b/application/src/main/java/org/thingsboard/server/service/state/DefaultDeviceStateService.java
@@ -36,6 +36,7 @@ import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.common.util.ThingsBoardExecutors;
 import org.thingsboard.server.cluster.TbClusterService;
 import org.thingsboard.server.common.data.ApiUsageRecordKey;
+import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.DeviceIdInfo;
 import org.thingsboard.server.common.data.EntityType;
@@ -80,10 +81,10 @@ import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.partition.AbstractPartitionBasedService;
 import org.thingsboard.server.service.telemetry.TelemetrySubscriptionService;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -191,6 +192,7 @@ public class DefaultDeviceStateService extends AbstractPartitionBasedService<Dev
     private int telemetryTtl;
 
     private ListeningExecutorService deviceStateExecutor;
+    private ListeningExecutorService deviceStateCallbackExecutor;
 
     final ConcurrentMap<DeviceId, DeviceStateData> deviceStates = new ConcurrentHashMap<>();
 
@@ -199,6 +201,8 @@ public class DefaultDeviceStateService extends AbstractPartitionBasedService<Dev
         super.init();
         deviceStateExecutor = MoreExecutors.listeningDecorator(ThingsBoardExecutors.newWorkStealingPool(
                 Math.max(4, Runtime.getRuntime().availableProcessors()), "device-state"));
+        deviceStateCallbackExecutor = MoreExecutors.listeningDecorator(ThingsBoardExecutors.newWorkStealingPool(
+                Math.max(4, Runtime.getRuntime().availableProcessors()), "device-state-callback"));
         scheduledExecutor.scheduleWithFixedDelay(this::checkStates, new Random().nextInt(defaultStateCheckIntervalInSec), defaultStateCheckIntervalInSec, TimeUnit.SECONDS);
         scheduledExecutor.scheduleWithFixedDelay(this::reportActivityStats, defaultActivityStatsIntervalInSec, defaultActivityStatsIntervalInSec, TimeUnit.SECONDS);
     }
@@ -209,6 +213,9 @@ public class DefaultDeviceStateService extends AbstractPartitionBasedService<Dev
         if (deviceStateExecutor != null) {
             deviceStateExecutor.shutdownNow();
         }
+        if (deviceStateCallbackExecutor != null) {
+            deviceStateCallbackExecutor.shutdownNow();
+        }
     }
 
     @Override
@@ -372,7 +379,7 @@ public class DefaultDeviceStateService extends AbstractPartitionBasedService<Dev
                                 log.warn("Failed to register device to the state service", t);
                                 callback.onFailure(t);
                             }
-                        }, deviceStateExecutor);
+                        }, deviceStateCallbackExecutor);
                     } else if (proto.getUpdated()) {
                         DeviceStateData stateData = getOrFetchDeviceStateData(device.getId());
                         TbMsgMetaData md = new TbMsgMetaData();
@@ -635,10 +642,10 @@ public class DefaultDeviceStateService extends AbstractPartitionBasedService<Dev
         ListenableFuture<DeviceStateData> future;
         if (persistToTelemetry) {
             ListenableFuture<List<TsKvEntry>> tsData = tsService.findLatest(TenantId.SYS_TENANT_ID, device.getId(), PERSISTENT_ATTRIBUTES);
-            future = Futures.transform(tsData, extractDeviceStateData(device), deviceStateExecutor);
+            future = Futures.transform(tsData, extractDeviceStateData(device), MoreExecutors.directExecutor());
         } else {
-            ListenableFuture<List<AttributeKvEntry>> attrData = attributesService.find(TenantId.SYS_TENANT_ID, device.getId(), SERVER_SCOPE, PERSISTENT_ATTRIBUTES);
-            future = Futures.transform(attrData, extractDeviceStateData(device), deviceStateExecutor);
+            ListenableFuture<List<AttributeKvEntry>> attrData = attributesService.find(TenantId.SYS_TENANT_ID, device.getId(), AttributeScope.SERVER_SCOPE, PERSISTENT_ATTRIBUTES);
+            future = Futures.transform(attrData, extractDeviceStateData(device), MoreExecutors.directExecutor());
         }
         return transformInactivityTimeout(future);
     }
@@ -648,7 +655,7 @@ public class DefaultDeviceStateService extends AbstractPartitionBasedService<Dev
             if (!persistToTelemetry || deviceStateData.getState().getInactivityTimeout() != defaultInactivityTimeoutMs) {
                 return future; //fail fast
             }
-            var attributesFuture = attributesService.find(TenantId.SYS_TENANT_ID, deviceStateData.getDeviceId(), SERVER_SCOPE, INACTIVITY_TIMEOUT);
+            var attributesFuture = attributesService.find(TenantId.SYS_TENANT_ID, deviceStateData.getDeviceId(), AttributeScope.SERVER_SCOPE, INACTIVITY_TIMEOUT);
             return Futures.transform(attributesFuture, attributes -> {
                 attributes.flatMap(KvEntry::getLongValue).ifPresent((inactivityTimeout) -> {
                     if (inactivityTimeout > 0) {
@@ -656,8 +663,8 @@ public class DefaultDeviceStateService extends AbstractPartitionBasedService<Dev
                     }
                 });
                 return deviceStateData;
-            }, deviceStateExecutor);
-        }, deviceStateExecutor);
+            }, MoreExecutors.directExecutor());
+        }, deviceStateCallbackExecutor);
     }
 
     private <T extends KvEntry> Function<List<T>, DeviceStateData> extractDeviceStateData(Device device) {
@@ -861,7 +868,7 @@ public class DefaultDeviceStateService extends AbstractPartitionBasedService<Dev
                     Collections.singletonList(new BasicTsKvEntry(getCurrentTimeMillis(), new LongDataEntry(key, value))),
                     telemetryTtl, new TelemetrySaveCallback<>(deviceId, key, value));
         } else {
-            tsSubService.saveAttrAndNotify(TenantId.SYS_TENANT_ID, deviceId, SERVER_SCOPE, key, value, new TelemetrySaveCallback<>(deviceId, key, value));
+            tsSubService.saveAttrAndNotify(TenantId.SYS_TENANT_ID, deviceId, AttributeScope.SERVER_SCOPE, key, value, new TelemetrySaveCallback<>(deviceId, key, value));
         }
     }
 
@@ -872,7 +879,7 @@ public class DefaultDeviceStateService extends AbstractPartitionBasedService<Dev
                     Collections.singletonList(new BasicTsKvEntry(getCurrentTimeMillis(), new BooleanDataEntry(key, value))),
                     telemetryTtl, new TelemetrySaveCallback<>(deviceId, key, value));
         } else {
-            tsSubService.saveAttrAndNotify(TenantId.SYS_TENANT_ID, deviceId, SERVER_SCOPE, key, value, new TelemetrySaveCallback<>(deviceId, key, value));
+            tsSubService.saveAttrAndNotify(TenantId.SYS_TENANT_ID, deviceId, AttributeScope.SERVER_SCOPE, key, value, new TelemetrySaveCallback<>(deviceId, key, value));
         }
     }
 
diff --git a/application/src/main/java/org/thingsboard/server/service/stats/DefaultJsInvokeStats.java b/application/src/main/java/org/thingsboard/server/service/stats/DefaultJsInvokeStats.java
index 905210cf63..3799dfda3d 100644
--- a/application/src/main/java/org/thingsboard/server/service/stats/DefaultJsInvokeStats.java
+++ b/application/src/main/java/org/thingsboard/server/service/stats/DefaultJsInvokeStats.java
@@ -22,7 +22,7 @@ import org.thingsboard.server.common.stats.StatsCounter;
 import org.thingsboard.server.common.stats.StatsFactory;
 import org.thingsboard.server.common.stats.StatsType;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 @Service
 public class DefaultJsInvokeStats implements JsInvokeStats {
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 ff69746bcc..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,22 +21,22 @@ 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;
 import org.thingsboard.server.service.queue.TbRuleEngineConsumerStats;
 import org.thingsboard.server.service.telemetry.TelemetrySubscriptionService;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
@@ -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/DefaultSubscriptionManagerService.java b/application/src/main/java/org/thingsboard/server/service/subscription/DefaultSubscriptionManagerService.java
index 5dc6b0e636..66b73781a0 100644
--- a/application/src/main/java/org/thingsboard/server/service/subscription/DefaultSubscriptionManagerService.java
+++ b/application/src/main/java/org/thingsboard/server/service/subscription/DefaultSubscriptionManagerService.java
@@ -20,6 +20,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Service;
 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.alarm.AlarmInfo;
@@ -53,7 +54,7 @@ import org.thingsboard.server.service.state.DeviceStateService;
 import org.thingsboard.server.service.ws.notification.sub.NotificationUpdate;
 import org.thingsboard.server.service.ws.notification.sub.NotificationsSubscriptionUpdate;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
diff --git a/application/src/main/java/org/thingsboard/server/service/subscription/DefaultTbEntityDataSubscriptionService.java b/application/src/main/java/org/thingsboard/server/service/subscription/DefaultTbEntityDataSubscriptionService.java
index 6e31a24275..10e342b1e8 100644
--- a/application/src/main/java/org/thingsboard/server/service/subscription/DefaultTbEntityDataSubscriptionService.java
+++ b/application/src/main/java/org/thingsboard/server/service/subscription/DefaultTbEntityDataSubscriptionService.java
@@ -66,8 +66,8 @@ import org.thingsboard.server.service.ws.telemetry.cmd.v2.LatestValueCmd;
 import org.thingsboard.server.service.ws.telemetry.cmd.v2.TimeSeriesCmd;
 import org.thingsboard.server.service.ws.telemetry.cmd.v2.UnsubscribeCmd;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
diff --git a/application/src/main/java/org/thingsboard/server/service/subscription/DefaultTbLocalSubscriptionService.java b/application/src/main/java/org/thingsboard/server/service/subscription/DefaultTbLocalSubscriptionService.java
index 10a9cb494f..bcb900c3f0 100644
--- a/application/src/main/java/org/thingsboard/server/service/subscription/DefaultTbLocalSubscriptionService.java
+++ b/application/src/main/java/org/thingsboard/server/service/subscription/DefaultTbLocalSubscriptionService.java
@@ -23,6 +23,7 @@ import org.thingsboard.common.util.DonAsynchron;
 import org.thingsboard.common.util.ThingsBoardExecutors;
 import org.thingsboard.common.util.ThingsBoardThreadFactory;
 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.alarm.AlarmInfo;
@@ -49,8 +50,8 @@ import org.thingsboard.server.service.ws.notification.sub.NotificationsSubscript
 import org.thingsboard.server.service.ws.telemetry.sub.AlarmSubscriptionUpdate;
 import org.thingsboard.server.service.ws.telemetry.sub.TelemetrySubscriptionUpdate;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -447,11 +448,11 @@ public class DefaultTbLocalSubscriptionService implements TbLocalSubscriptionSer
             return;
         }
         final Map<String, Long> keyStates = subscription.getKeyStates();
-        String scope;
-        if (subscription.getScope() != null && !TbAttributeSubscriptionScope.ANY_SCOPE.equals(subscription.getScope())) {
-            scope = subscription.getScope().name();
+        AttributeScope scope;
+        if (subscription.getScope() != null && subscription.getScope().getAttributeScope() != null) {
+            scope = subscription.getScope().getAttributeScope();
         } else {
-            scope = DataConstants.CLIENT_SCOPE;
+            scope = AttributeScope.CLIENT_SCOPE;
         }
         DonAsynchron.withCallback(attrService.find(subscription.getTenantId(), subscription.getEntityId(), scope, keyStates.keySet()), values -> {
                     List<TsKvEntry> updates = new ArrayList<>();
@@ -462,7 +463,7 @@ public class DefaultTbLocalSubscriptionService implements TbLocalSubscriptionSer
                     });
                     var missedUpdates = updates.stream().filter(u -> u.getValue() != null).collect(Collectors.toList());
                     if (!missedUpdates.isEmpty()) {
-                        onAttributesUpdate(subscription.getEntityId(), scope, missedUpdates, TbCallback.EMPTY);
+                        onAttributesUpdate(subscription.getEntityId(), scope.name(), missedUpdates, TbCallback.EMPTY);
                     }
                 },
                 e -> log.error("Failed to fetch missed updates.", e), tsCallBackExecutor);
diff --git a/application/src/main/java/org/thingsboard/server/service/subscription/TbAbstractSubCtx.java b/application/src/main/java/org/thingsboard/server/service/subscription/TbAbstractSubCtx.java
index cd3a8ca742..f50822e79a 100644
--- a/application/src/main/java/org/thingsboard/server/service/subscription/TbAbstractSubCtx.java
+++ b/application/src/main/java/org/thingsboard/server/service/subscription/TbAbstractSubCtx.java
@@ -22,6 +22,7 @@ import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
+import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.TenantId;
@@ -219,7 +220,7 @@ public abstract class TbAbstractSubCtx<T extends EntityCountQuery> {
 
     private ListenableFuture<DynamicValueKeySub> resolveEntityValue(TenantId tenantId, EntityId entityId, DynamicValueKey key) {
         ListenableFuture<Optional<AttributeKvEntry>> entry = attributesService.find(tenantId, entityId,
-                TbAttributeSubscriptionScope.SERVER_SCOPE.name(), key.getSourceAttribute());
+                AttributeScope.SERVER_SCOPE, key.getSourceAttribute());
         return Futures.transform(entry, attributeOpt -> {
             DynamicValueKeySub sub = new DynamicValueKeySub(key, entityId);
             if (attributeOpt.isPresent()) {
diff --git a/application/src/main/java/org/thingsboard/server/service/subscription/TbAttributeSubscriptionScope.java b/application/src/main/java/org/thingsboard/server/service/subscription/TbAttributeSubscriptionScope.java
index fe3ddb1356..bb9da95235 100644
--- a/application/src/main/java/org/thingsboard/server/service/subscription/TbAttributeSubscriptionScope.java
+++ b/application/src/main/java/org/thingsboard/server/service/subscription/TbAttributeSubscriptionScope.java
@@ -15,8 +15,37 @@
  */
 package org.thingsboard.server.service.subscription;
 
+import org.thingsboard.server.common.data.AttributeScope;
+
 public enum TbAttributeSubscriptionScope {
 
-    ANY_SCOPE, CLIENT_SCOPE, SHARED_SCOPE, SERVER_SCOPE
+    ANY_SCOPE(),
+    CLIENT_SCOPE(AttributeScope.CLIENT_SCOPE),
+    SHARED_SCOPE(AttributeScope.SHARED_SCOPE),
+    SERVER_SCOPE(AttributeScope.SERVER_SCOPE);
+
+    private final AttributeScope attributeScope;
+
+    TbAttributeSubscriptionScope() {
+        this.attributeScope = null;
+    }
+
+    TbAttributeSubscriptionScope(AttributeScope attributeScope) {
+        this.attributeScope = attributeScope;
+    }
+
+    public AttributeScope getAttributeScope() {
+        return attributeScope;
+    }
+
+    public static TbAttributeSubscriptionScope of(AttributeScope attributeScope) {
+        for (TbAttributeSubscriptionScope scope : TbAttributeSubscriptionScope.values()) {
+            if (attributeScope == scope.getAttributeScope()) {
+                return scope;
+            }
+        }
+        throw new IllegalArgumentException("Unknown AttributeScope: " + attributeScope.name());
+    }
+
 
 }
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 24d54109be..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,124 +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());
@@ -406,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 4e3d034207..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
@@ -34,7 +34,7 @@ import org.thingsboard.server.dao.exception.DataValidationException;
 import org.thingsboard.server.dao.relation.RelationService;
 import org.thingsboard.server.cache.limits.RateLimitService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
-import org.thingsboard.server.service.entitiy.TbNotificationEntityService;
+import org.thingsboard.server.service.entitiy.TbLogEntityActionService;
 import org.thingsboard.server.service.sync.ie.exporting.EntityExportService;
 import org.thingsboard.server.service.sync.ie.exporting.impl.BaseEntityExportService;
 import org.thingsboard.server.service.sync.ie.exporting.impl.DefaultEntityExportService;
@@ -62,7 +62,7 @@ public class DefaultEntitiesExportImportService implements EntitiesExportImportS
 
     private final RelationService relationService;
     private final RateLimitService rateLimitService;
-    private final TbNotificationEntityService entityNotificationService;
+    private final TbLogEntityActionService logEntityActionService;
 
     protected static final List<EntityType> SUPPORTED_ENTITY_TYPES = List.of(
             EntityType.CUSTOMER, EntityType.RULE_CHAIN, EntityType.TB_RESOURCE,
@@ -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;
     }
 
@@ -120,7 +124,7 @@ public class DefaultEntitiesExportImportService implements EntitiesExportImportS
         relationService.saveRelations(ctx.getTenantId(), new ArrayList<>(ctx.getRelations()));
 
         for (EntityRelation relation : ctx.getRelations()) {
-            entityNotificationService.logEntityRelationAction(ctx.getTenantId(), null,
+            logEntityActionService.logEntityRelationAction(ctx.getTenantId(), null,
                     relation, ctx.getUser(), ActionType.RELATION_ADD_OR_UPDATE, null, relation);
         }
     }
diff --git a/application/src/main/java/org/thingsboard/server/service/sync/ie/exporting/DefaultExportableEntitiesService.java b/application/src/main/java/org/thingsboard/server/service/sync/ie/exporting/DefaultExportableEntitiesService.java
index 95cbc06b27..49314e62fd 100644
--- a/application/src/main/java/org/thingsboard/server/service/sync/ie/exporting/DefaultExportableEntitiesService.java
+++ b/application/src/main/java/org/thingsboard/server/service/sync/ie/exporting/DefaultExportableEntitiesService.java
@@ -147,10 +147,7 @@ public class DefaultExportableEntitiesService implements ExportableEntitiesServi
     public <I extends EntityId> void removeById(TenantId tenantId, I id) {
         EntityType entityType = id.getEntityType();
         EntityDaoService entityService = entityServiceRegistry.getServiceByEntityType(entityType);
-        if (entityService == null) {
-            throw new IllegalArgumentException("Unsupported entity type " + entityType);
-        }
-        entityService.deleteEntity(tenantId, id);
+        entityService.deleteEntity(tenantId, id, false);
     }
 
     private <I extends EntityId, E extends ExportableEntity<I>> ExportableEntityDao<I, E> getExportableEntityDao(EntityType entityType) {
diff --git a/application/src/main/java/org/thingsboard/server/service/sync/ie/exporting/impl/DashboardExportService.java b/application/src/main/java/org/thingsboard/server/service/sync/ie/exporting/impl/DashboardExportService.java
index 8acb8990b8..3b2cb626ac 100644
--- a/application/src/main/java/org/thingsboard/server/service/sync/ie/exporting/impl/DashboardExportService.java
+++ b/application/src/main/java/org/thingsboard/server/service/sync/ie/exporting/impl/DashboardExportService.java
@@ -16,7 +16,7 @@
 package org.thingsboard.server.service.sync.ie.exporting.impl;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.Dashboard;
diff --git a/application/src/main/java/org/thingsboard/server/service/sync/ie/exporting/impl/DefaultEntityExportService.java b/application/src/main/java/org/thingsboard/server/service/sync/ie/exporting/impl/DefaultEntityExportService.java
index ebb1a7b552..77996a8b7f 100644
--- a/application/src/main/java/org/thingsboard/server/service/sync/ie/exporting/impl/DefaultEntityExportService.java
+++ b/application/src/main/java/org/thingsboard/server/service/sync/ie/exporting/impl/DefaultEntityExportService.java
@@ -19,7 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Service;
-import org.thingsboard.server.common.data.DataConstants;
+import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.ExportableEntity;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
@@ -111,16 +111,16 @@ public class DefaultEntityExportService<I extends EntityId, E extends Exportable
     }
 
     private Map<String, List<AttributeExportData>> exportAttributes(EntitiesExportCtx<?> ctx, E entity) throws ThingsboardException {
-        List<String> scopes;
+        List<AttributeScope> scopes;
         if (entity.getId().getEntityType() == EntityType.DEVICE) {
-            scopes = List.of(DataConstants.SERVER_SCOPE, DataConstants.SHARED_SCOPE);
+            scopes = List.of(AttributeScope.SERVER_SCOPE, AttributeScope.SHARED_SCOPE);
         } else {
-            scopes = Collections.singletonList(DataConstants.SERVER_SCOPE);
+            scopes = Collections.singletonList(AttributeScope.SERVER_SCOPE);
         }
         Map<String, List<AttributeExportData>> attributes = new LinkedHashMap<>();
         scopes.forEach(scope -> {
             try {
-                attributes.put(scope, attributesService.findAll(ctx.getTenantId(), entity.getId(), scope).get().stream()
+                attributes.put(scope.name(), attributesService.findAll(ctx.getTenantId(), entity.getId(), scope).get().stream()
                         .map(attribute -> {
                             AttributeExportData attributeExportData = new AttributeExportData();
                             attributeExportData.setKey(attribute.getKey());
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 351615f70c..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
@@ -29,6 +29,7 @@ import org.springframework.security.core.context.SecurityContextHolder;
 import org.thingsboard.common.util.DonAsynchron;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.common.util.ThingsBoardThreadFactory;
+import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.HasAdditionalInfo;
 import org.thingsboard.server.common.data.HasTenantId;
@@ -60,9 +61,9 @@ import org.thingsboard.server.service.telemetry.TelemetrySubscriptionService;
 import org.thingsboard.server.utils.CsvUtils;
 import org.thingsboard.server.common.data.util.TypeCastUtil;
 
-import javax.annotation.Nullable;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.Nullable;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.LinkedHashMap;
@@ -230,19 +231,19 @@ public abstract class AbstractBulkImportService<E extends HasId<? extends Entity
         List<AttributeKvEntry> attributes = new ArrayList<>(JsonConverter.convertToAttributes(kvsEntry.getValue()));
 
         accessValidator.validateEntityAndCallback(user, Operation.WRITE_ATTRIBUTES, entity.getId(), (result, tenantId, entityId) -> {
-            tsSubscriptionService.saveAndNotify(tenantId, entityId, scope, attributes, new FutureCallback<>() {
+            tsSubscriptionService.saveAndNotify(tenantId, entityId, AttributeScope.valueOf(scope), attributes, new FutureCallback<>() {
 
                 @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);
                 }
 
@@ -300,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/ie/importing/impl/AssetProfileImportService.java b/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/AssetProfileImportService.java
index a968f6d35b..68c9c81239 100644
--- a/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/AssetProfileImportService.java
+++ b/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/AssetProfileImportService.java
@@ -56,10 +56,8 @@ public class AssetProfileImportService extends BaseEntityImportService<AssetProf
     }
 
     @Override
-    protected void onEntitySaved(User user, AssetProfile savedAssetProfile, AssetProfile oldAssetProfile) throws ThingsboardException {
-        clusterService.broadcastEntityStateChangeEvent(user.getTenantId(), savedAssetProfile.getId(),
-                oldAssetProfile == null ? ComponentLifecycleEvent.CREATED : ComponentLifecycleEvent.UPDATED);
-        entityNotificationService.logEntityAction(savedAssetProfile.getTenantId(), savedAssetProfile.getId(),
+    protected void onEntitySaved(User user, AssetProfile savedAssetProfile, AssetProfile oldAssetProfile) {
+        logEntityActionService.logEntityAction(savedAssetProfile.getTenantId(), savedAssetProfile.getId(),
                 savedAssetProfile, null, oldAssetProfile == null ? ActionType.ADDED : ActionType.UPDATED, user);
     }
 
diff --git a/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/BaseEntityImportService.java b/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/BaseEntityImportService.java
index 5ee1ab8a33..cf05a35f33 100644
--- a/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/BaseEntityImportService.java
+++ b/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/BaseEntityImportService.java
@@ -50,7 +50,7 @@ import org.thingsboard.server.common.data.sync.ie.EntityImportResult;
 import org.thingsboard.server.dao.relation.RelationDao;
 import org.thingsboard.server.dao.relation.RelationService;
 import org.thingsboard.server.service.action.EntityActionService;
-import org.thingsboard.server.service.entitiy.TbNotificationEntityService;
+import org.thingsboard.server.service.entitiy.TbLogEntityActionService;
 import org.thingsboard.server.service.sync.ie.exporting.ExportableEntitiesService;
 import org.thingsboard.server.service.sync.ie.importing.EntityImportService;
 import org.thingsboard.server.service.sync.vc.data.EntitiesImportCtx;
@@ -85,7 +85,7 @@ public abstract class BaseEntityImportService<I extends EntityId, E extends Expo
     @Autowired
     protected TbClusterService clusterService;
     @Autowired
-    protected TbNotificationEntityService entityNotificationService;
+    protected TbLogEntityActionService logEntityActionService;
 
     @Override
     public EntityImportResult<E> importEntity(EntitiesImportCtx ctx, D exportData) throws ThingsboardException {
@@ -212,7 +212,7 @@ public abstract class BaseEntityImportService<I extends EntityId, E extends Expo
                         importResult.setUpdatedRelatedEntities(true);
                         relationService.deleteRelation(ctx.getTenantId(), existingRelation.getFrom(), existingRelation.getTo(), existingRelation.getType(), existingRelation.getTypeGroup());
                         importResult.addSendEventsCallback(() -> {
-                            entityNotificationService.logEntityRelationAction(tenantId, null,
+                            logEntityActionService.logEntityRelationAction(tenantId, null,
                                     existingRelation, ctx.getUser(), ActionType.RELATION_DELETED, null, existingRelation);
                         });
                     } else if (Objects.equal(relation.getAdditionalInfo(), existingRelation.getAdditionalInfo())) {
@@ -267,7 +267,7 @@ public abstract class BaseEntityImportService<I extends EntityId, E extends Expo
     }
 
     protected void onEntitySaved(User user, E savedEntity, E oldEntity) throws ThingsboardException {
-        entityNotificationService.logEntityAction(user.getTenantId(), savedEntity.getId(), savedEntity, null,
+        logEntityActionService.logEntityAction(user.getTenantId(), savedEntity.getId(), savedEntity, null,
                 oldEntity == null ? ActionType.ADDED : ActionType.UPDATED, user);
     }
 
diff --git a/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/DeviceImportService.java b/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/DeviceImportService.java
index 4bb50c3107..539f2045a5 100644
--- a/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/DeviceImportService.java
+++ b/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/DeviceImportService.java
@@ -19,9 +19,6 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.EntityType;
-import org.thingsboard.server.common.data.User;
-import org.thingsboard.server.common.data.audit.ActionType;
-import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.sync.ie.DeviceExportData;
@@ -92,12 +89,6 @@ public class DeviceImportService extends BaseEntityImportService<DeviceId, Devic
         return updated;
     }
 
-    @Override
-    protected void onEntitySaved(User user, Device savedDevice, Device oldDevice) throws ThingsboardException {
-        entityNotificationService.notifyCreateOrUpdateDevice(user.getTenantId(), savedDevice.getId(), savedDevice.getCustomerId(),
-                savedDevice, oldDevice, oldDevice == null ? ActionType.ADDED : ActionType.UPDATED, user);
-    }
-
     @Override
     public EntityType getEntityType() {
         return EntityType.DEVICE;
diff --git a/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/DeviceProfileImportService.java b/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/DeviceProfileImportService.java
index 96b3fb4a0b..df10f6e1b5 100644
--- a/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/DeviceProfileImportService.java
+++ b/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/DeviceProfileImportService.java
@@ -21,25 +21,19 @@ import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.User;
 import org.thingsboard.server.common.data.audit.ActionType;
-import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
 import org.thingsboard.server.common.data.id.TenantId;
-import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent;
 import org.thingsboard.server.common.data.sync.ie.EntityExportData;
 import org.thingsboard.server.dao.device.DeviceProfileService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
-import org.thingsboard.server.service.ota.OtaPackageStateService;
 import org.thingsboard.server.service.sync.vc.data.EntitiesImportCtx;
 
-import java.util.Objects;
-
 @Service
 @TbCoreComponent
 @RequiredArgsConstructor
 public class DeviceProfileImportService extends BaseEntityImportService<DeviceProfileId, DeviceProfile, EntityExportData<DeviceProfile>> {
 
     private final DeviceProfileService deviceProfileService;
-    private final OtaPackageStateService otaPackageStateService;
 
     @Override
     protected void setOwner(TenantId tenantId, DeviceProfile deviceProfile, IdProvider idProvider) {
@@ -62,14 +56,8 @@ public class DeviceProfileImportService extends BaseEntityImportService<DevicePr
     }
 
     @Override
-    protected void onEntitySaved(User user, DeviceProfile savedDeviceProfile, DeviceProfile oldDeviceProfile) throws ThingsboardException {
-        clusterService.onDeviceProfileChange(savedDeviceProfile, null);
-        clusterService.broadcastEntityStateChangeEvent(user.getTenantId(), savedDeviceProfile.getId(),
-                oldDeviceProfile == null ? ComponentLifecycleEvent.CREATED : ComponentLifecycleEvent.UPDATED);
-        otaPackageStateService.update(savedDeviceProfile,
-                oldDeviceProfile != null && !Objects.equals(oldDeviceProfile.getFirmwareId(), savedDeviceProfile.getFirmwareId()),
-                oldDeviceProfile != null && !Objects.equals(oldDeviceProfile.getSoftwareId(), savedDeviceProfile.getSoftwareId()));
-        entityNotificationService.logEntityAction(savedDeviceProfile.getTenantId(), savedDeviceProfile.getId(), savedDeviceProfile,
+    protected void onEntitySaved(User user, DeviceProfile savedDeviceProfile, DeviceProfile oldDeviceProfile) {
+        logEntityActionService.logEntityAction(savedDeviceProfile.getTenantId(), savedDeviceProfile.getId(), savedDeviceProfile,
                 null, oldDeviceProfile == null ? ActionType.ADDED : ActionType.UPDATED, user);
     }
 
diff --git a/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/EntityViewImportService.java b/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/EntityViewImportService.java
index a4fe22dc74..6fd956e0db 100644
--- a/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/EntityViewImportService.java
+++ b/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/EntityViewImportService.java
@@ -64,8 +64,6 @@ public class EntityViewImportService extends BaseEntityImportService<EntityViewI
     protected void onEntitySaved(User user, EntityView savedEntityView, EntityView oldEntityView) throws ThingsboardException {
         tbEntityViewService.updateEntityViewAttributes(user.getTenantId(), savedEntityView, oldEntityView, user);
         super.onEntitySaved(user, savedEntityView, oldEntityView);
-        clusterService.broadcastEntityStateChangeEvent(savedEntityView.getTenantId(), savedEntityView.getId(),
-                oldEntityView == null ? ComponentLifecycleEvent.CREATED : ComponentLifecycleEvent.UPDATED);
     }
 
     @Override
diff --git a/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/NotificationRuleImportService.java b/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/NotificationRuleImportService.java
index dd53e5b5bc..73b31ff02a 100644
--- a/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/NotificationRuleImportService.java
+++ b/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/NotificationRuleImportService.java
@@ -20,7 +20,6 @@ import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.User;
 import org.thingsboard.server.common.data.audit.ActionType;
-import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
 import org.thingsboard.server.common.data.id.NotificationRuleId;
@@ -38,7 +37,6 @@ import org.thingsboard.server.common.data.notification.rule.trigger.config.EdgeC
 import org.thingsboard.server.common.data.notification.rule.trigger.config.NotificationRuleTriggerConfig;
 import org.thingsboard.server.common.data.notification.rule.trigger.config.NotificationRuleTriggerType;
 import org.thingsboard.server.common.data.notification.rule.trigger.config.RuleEngineComponentLifecycleEventNotificationRuleTriggerConfig;
-import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent;
 import org.thingsboard.server.common.data.sync.ie.EntityExportData;
 import org.thingsboard.server.dao.notification.NotificationRuleService;
 import org.thingsboard.server.dao.service.ConstraintValidator;
@@ -143,11 +141,9 @@ public class NotificationRuleImportService extends BaseEntityImportService<Notif
     }
 
     @Override
-    protected void onEntitySaved(User user, NotificationRule savedEntity, NotificationRule oldEntity) throws ThingsboardException {
+    protected void onEntitySaved(User user, NotificationRule savedEntity, NotificationRule oldEntity) {
         entityActionService.logEntityAction(user, savedEntity.getId(), savedEntity, null,
                 oldEntity == null ? ActionType.ADDED : ActionType.UPDATED, null);
-        clusterService.broadcastEntityStateChangeEvent(user.getTenantId(), savedEntity.getId(),
-                oldEntity == null ? ComponentLifecycleEvent.CREATED : ComponentLifecycleEvent.UPDATED);
     }
 
     @Override
diff --git a/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/NotificationTargetImportService.java b/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/NotificationTargetImportService.java
index 22ab41dd8a..4e0fdc33b8 100644
--- a/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/NotificationTargetImportService.java
+++ b/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/NotificationTargetImportService.java
@@ -16,7 +16,7 @@
 package org.thingsboard.server.service.sync.ie.importing.impl;
 
 import lombok.RequiredArgsConstructor;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.EntityType;
diff --git a/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/RuleChainImportService.java b/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/RuleChainImportService.java
index bdeb93c329..f0a0f0b8d6 100644
--- a/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/RuleChainImportService.java
+++ b/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/RuleChainImportService.java
@@ -132,10 +132,6 @@ public class RuleChainImportService extends BaseEntityImportService<RuleChainId,
     protected void onEntitySaved(User user, RuleChain savedRuleChain, RuleChain oldRuleChain) {
         entityActionService.logEntityAction(user, savedRuleChain.getId(), savedRuleChain, null,
                 oldRuleChain == null ? ActionType.ADDED : ActionType.UPDATED, null);
-        if (savedRuleChain.getType() == RuleChainType.CORE) {
-            clusterService.broadcastEntityStateChangeEvent(user.getTenantId(), savedRuleChain.getId(),
-                    oldRuleChain == null ? ComponentLifecycleEvent.CREATED : ComponentLifecycleEvent.UPDATED);
-        }
     }
 
     @Override
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 5c0dcc930d..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;
@@ -68,7 +69,7 @@ import org.thingsboard.server.common.data.util.ThrowingRunnable;
 import org.thingsboard.server.dao.DaoUtil;
 import org.thingsboard.server.dao.exception.DeviceCredentialsValidationException;
 import org.thingsboard.server.queue.util.TbCoreComponent;
-import org.thingsboard.server.service.entitiy.TbNotificationEntityService;
+import org.thingsboard.server.service.entitiy.TbLogEntityActionService;
 import org.thingsboard.server.service.executors.VersionControlExecutor;
 import org.thingsboard.server.service.sync.ie.EntitiesExportImportService;
 import org.thingsboard.server.service.sync.ie.exporting.ExportableEntitiesService;
@@ -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;
@@ -108,7 +110,7 @@ public class DefaultEntitiesVersionControlService implements EntitiesVersionCont
     private final GitVersionControlQueueService gitServiceQueue;
     private final EntitiesExportImportService exportImportService;
     private final ExportableEntitiesService exportableEntitiesService;
-    private final TbNotificationEntityService entityNotificationService;
+    private final TbLogEntityActionService logEntityActionService;
     private final TransactionTemplate transactionTemplate;
     private final TbTransactionalCache<UUID, VersionControlTaskCacheEntry> taskCache;
     private final VersionControlExecutor executor;
@@ -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,25 +269,30 @@ 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);
         } catch (LoadEntityException e) {
             return cachePut(ctx.getRequestId(), onError(e.getExternalId(), e.getCause()));
-        } catch (Exception e) {
+        } catch (Throwable e) {
             log.info("[{}] Failed to process request [{}] due to: ", ctx.getTenantId(), request, e);
             return cachePut(ctx.getRequestId(), VersionLoadResult.error(EntityLoadError.runtimeError(e)));
         }
@@ -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,19 +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(() -> {
-                    entityNotificationService.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/DefaultGitVersionControlQueueService.java b/application/src/main/java/org/thingsboard/server/service/sync/vc/DefaultGitVersionControlQueueService.java
index 6b844630d8..f08d7ddd3b 100644
--- a/application/src/main/java/org/thingsboard/server/service/sync/vc/DefaultGitVersionControlQueueService.java
+++ b/application/src/main/java/org/thingsboard/server/service/sync/vc/DefaultGitVersionControlQueueService.java
@@ -19,7 +19,6 @@ import com.google.common.collect.Iterables;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
-import com.google.protobuf.ByteString;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
@@ -45,6 +44,7 @@ import org.thingsboard.server.common.data.sync.vc.VersionCreationResult;
 import org.thingsboard.server.common.data.sync.vc.VersionedEntityInfo;
 import org.thingsboard.server.common.data.sync.vc.request.create.VersionCreateRequest;
 import org.thingsboard.server.common.data.util.CollectionsUtil;
+import org.thingsboard.server.common.util.ProtoUtils;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.gen.transport.TransportProtos.CommitRequestMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.EntitiesContentRequestMsg;
@@ -59,7 +59,6 @@ import org.thingsboard.server.queue.TbQueueCallback;
 import org.thingsboard.server.queue.TbQueueMsgMetadata;
 import org.thingsboard.server.queue.discovery.TbServiceInfoProvider;
 import org.thingsboard.server.queue.scheduler.SchedulerComponent;
-import org.thingsboard.server.queue.util.DataDecodingEncodingService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.executors.VersionControlExecutor;
 import org.thingsboard.server.service.sync.vc.data.ClearRepositoryGitRequest;
@@ -97,7 +96,6 @@ public class DefaultGitVersionControlQueueService implements GitVersionControlQu
 
     private final TbServiceInfoProvider serviceInfoProvider;
     private final TbClusterService clusterService;
-    private final DataDecodingEncodingService encodingService;
     private final DefaultEntitiesVersionControlService entitiesVersionControlService;
     private final SchedulerComponent scheduler;
     private final VersionControlExecutor executor;
@@ -111,12 +109,10 @@ public class DefaultGitVersionControlQueueService implements GitVersionControlQu
     private int msgChunkSize;
 
     public DefaultGitVersionControlQueueService(TbServiceInfoProvider serviceInfoProvider, TbClusterService clusterService,
-                                                DataDecodingEncodingService encodingService,
                                                 @Lazy DefaultEntitiesVersionControlService entitiesVersionControlService,
                                                 SchedulerComponent scheduler, VersionControlExecutor executor) {
         this.serviceInfoProvider = serviceInfoProvider;
         this.clusterService = clusterService;
-        this.encodingService = encodingService;
         this.entitiesVersionControlService = entitiesVersionControlService;
         this.scheduler = scheduler;
         this.executor = executor;
@@ -556,7 +552,7 @@ public class DefaultGitVersionControlQueueService implements GitVersionControlQu
             vcSettings = entitiesVersionControlService.getVersionControlSettings(tenantId);
         }
         if (vcSettings != null) {
-            builder.setVcSettings(ByteString.copyFrom(encodingService.encode(vcSettings)));
+            builder.setVcSettings(ProtoUtils.toProto(vcSettings));
         } else if (request.requiresSettings()) {
             throw new RuntimeException("No entity version control settings provisioned!");
         }
diff --git a/application/src/main/java/org/thingsboard/server/service/sync/vc/VersionControlTaskRedisCache.java b/application/src/main/java/org/thingsboard/server/service/sync/vc/VersionControlTaskRedisCache.java
index 2165e535a2..29043dc92e 100644
--- a/application/src/main/java/org/thingsboard/server/service/sync/vc/VersionControlTaskRedisCache.java
+++ b/application/src/main/java/org/thingsboard/server/service/sync/vc/VersionControlTaskRedisCache.java
@@ -21,7 +21,7 @@ import org.springframework.stereotype.Service;
 import org.thingsboard.server.cache.CacheSpecsMap;
 import org.thingsboard.server.cache.RedisTbTransactionalCache;
 import org.thingsboard.server.cache.TBRedisCacheConfiguration;
-import org.thingsboard.server.cache.TbFSTRedisSerializer;
+import org.thingsboard.server.cache.TbJsonRedisSerializer;
 import org.thingsboard.server.common.data.CacheConstants;
 
 import java.util.UUID;
@@ -31,6 +31,6 @@ import java.util.UUID;
 public class VersionControlTaskRedisCache extends RedisTbTransactionalCache<UUID, VersionControlTaskCacheEntry> {
 
     public VersionControlTaskRedisCache(TBRedisCacheConfiguration configuration, CacheSpecsMap cacheSpecsMap, RedisConnectionFactory connectionFactory) {
-        super(CacheConstants.VERSION_CONTROL_TASK_CACHE, cacheSpecsMap, connectionFactory, configuration, new TbFSTRedisSerializer<>());
+        super(CacheConstants.VERSION_CONTROL_TASK_CACHE, cacheSpecsMap, connectionFactory, configuration, new TbJsonRedisSerializer<>(VersionControlTaskCacheEntry.class));
     }
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/sync/vc/autocommit/AutoCommitSettingsRedisCache.java b/application/src/main/java/org/thingsboard/server/service/sync/vc/autocommit/AutoCommitSettingsRedisCache.java
index 8de0e32cec..e8fe2ff9c3 100644
--- a/application/src/main/java/org/thingsboard/server/service/sync/vc/autocommit/AutoCommitSettingsRedisCache.java
+++ b/application/src/main/java/org/thingsboard/server/service/sync/vc/autocommit/AutoCommitSettingsRedisCache.java
@@ -21,7 +21,7 @@ import org.springframework.stereotype.Service;
 import org.thingsboard.server.cache.CacheSpecsMap;
 import org.thingsboard.server.cache.RedisTbTransactionalCache;
 import org.thingsboard.server.cache.TBRedisCacheConfiguration;
-import org.thingsboard.server.cache.TbFSTRedisSerializer;
+import org.thingsboard.server.cache.TbJsonRedisSerializer;
 import org.thingsboard.server.common.data.CacheConstants;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.sync.vc.AutoCommitSettings;
@@ -31,6 +31,6 @@ import org.thingsboard.server.common.data.sync.vc.AutoCommitSettings;
 public class AutoCommitSettingsRedisCache extends RedisTbTransactionalCache<TenantId, AutoCommitSettings> {
 
     public AutoCommitSettingsRedisCache(TBRedisCacheConfiguration configuration, CacheSpecsMap cacheSpecsMap, RedisConnectionFactory connectionFactory) {
-        super(CacheConstants.AUTO_COMMIT_SETTINGS_CACHE, cacheSpecsMap, connectionFactory, configuration, new TbFSTRedisSerializer<>());
+        super(CacheConstants.AUTO_COMMIT_SETTINGS_CACHE, cacheSpecsMap, connectionFactory, configuration, new TbJsonRedisSerializer<>(AutoCommitSettings.class));
     }
 }
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/sync/vc/repository/RepositorySettingsRedisCache.java b/application/src/main/java/org/thingsboard/server/service/sync/vc/repository/RepositorySettingsRedisCache.java
index ea9674df9b..47506a7ac1 100644
--- a/application/src/main/java/org/thingsboard/server/service/sync/vc/repository/RepositorySettingsRedisCache.java
+++ b/application/src/main/java/org/thingsboard/server/service/sync/vc/repository/RepositorySettingsRedisCache.java
@@ -21,7 +21,7 @@ import org.springframework.stereotype.Service;
 import org.thingsboard.server.cache.CacheSpecsMap;
 import org.thingsboard.server.cache.RedisTbTransactionalCache;
 import org.thingsboard.server.cache.TBRedisCacheConfiguration;
-import org.thingsboard.server.cache.TbFSTRedisSerializer;
+import org.thingsboard.server.cache.TbJsonRedisSerializer;
 import org.thingsboard.server.common.data.CacheConstants;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.sync.vc.RepositorySettings;
@@ -31,6 +31,6 @@ import org.thingsboard.server.common.data.sync.vc.RepositorySettings;
 public class RepositorySettingsRedisCache extends RedisTbTransactionalCache<TenantId, RepositorySettings> {
 
     public RepositorySettingsRedisCache(TBRedisCacheConfiguration configuration, CacheSpecsMap cacheSpecsMap, RedisConnectionFactory connectionFactory) {
-        super(CacheConstants.REPOSITORY_SETTINGS_CACHE, cacheSpecsMap, connectionFactory, configuration, new TbFSTRedisSerializer<>());
+        super(CacheConstants.REPOSITORY_SETTINGS_CACHE, cacheSpecsMap, connectionFactory, configuration, new TbJsonRedisSerializer<>(RepositorySettings.class));
     }
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/system/DefaultSystemInfoService.java b/application/src/main/java/org/thingsboard/server/service/system/DefaultSystemInfoService.java
index f54ef798d4..cd95e9504d 100644
--- a/application/src/main/java/org/thingsboard/server/service/system/DefaultSystemInfoService.java
+++ b/application/src/main/java/org/thingsboard/server/service/system/DefaultSystemInfoService.java
@@ -49,8 +49,8 @@ import org.thingsboard.server.queue.discovery.event.PartitionChangeEvent;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.telemetry.TelemetrySubscriptionService;
 
-import javax.annotation.Nullable;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.Nullable;
+import jakarta.annotation.PreDestroy;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
diff --git a/application/src/main/java/org/thingsboard/server/service/telemetry/AbstractSubscriptionService.java b/application/src/main/java/org/thingsboard/server/service/telemetry/AbstractSubscriptionService.java
index dfcaf97868..6624f43095 100644
--- a/application/src/main/java/org/thingsboard/server/service/telemetry/AbstractSubscriptionService.java
+++ b/application/src/main/java/org/thingsboard/server/service/telemetry/AbstractSubscriptionService.java
@@ -32,9 +32,9 @@ import org.thingsboard.server.queue.discovery.TbApplicationEventListener;
 import org.thingsboard.server.queue.discovery.event.PartitionChangeEvent;
 import org.thingsboard.server.service.subscription.SubscriptionManagerService;
 
-import javax.annotation.Nullable;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.Nullable;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
diff --git a/application/src/main/java/org/thingsboard/server/service/telemetry/AttributeData.java b/application/src/main/java/org/thingsboard/server/service/telemetry/AttributeData.java
index 6ed0037186..f45b8345a8 100644
--- a/application/src/main/java/org/thingsboard/server/service/telemetry/AttributeData.java
+++ b/application/src/main/java/org/thingsboard/server/service/telemetry/AttributeData.java
@@ -15,10 +15,9 @@
  */
 package org.thingsboard.server.service.telemetry;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 
-@ApiModel
+@Schema
 public class AttributeData implements Comparable<AttributeData>{
 
     private final long lastUpdateTs;
@@ -32,17 +31,17 @@ public class AttributeData implements Comparable<AttributeData>{
         this.value = value;
     }
 
-    @ApiModelProperty(position = 1, value = "Timestamp last updated attribute, in milliseconds", example = "1609459200000", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Timestamp last updated attribute, in milliseconds", example = "1609459200000", accessMode = Schema.AccessMode.READ_ONLY)
     public long getLastUpdateTs() {
         return lastUpdateTs;
     }
 
-    @ApiModelProperty(position = 2, value = "String representing attribute key", example = "active", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "String representing attribute key", example = "active", accessMode = Schema.AccessMode.READ_ONLY)
     public String getKey() {
         return key;
     }
 
-    @ApiModelProperty(position = 3, value = "Object representing value of attribute key", example = "false", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Object representing value of attribute key", example = "false", accessMode = Schema.AccessMode.READ_ONLY)
     public Object getValue() {
         return value;
     }
diff --git a/application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetrySubscriptionService.java b/application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetrySubscriptionService.java
index c57b8a7764..b19fde2983 100644
--- a/application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetrySubscriptionService.java
+++ b/application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetrySubscriptionService.java
@@ -26,6 +26,7 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.thingsboard.common.util.ThingsBoardThreadFactory;
 import org.thingsboard.server.common.data.ApiUsageRecordKey;
+import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.EntityView;
 import org.thingsboard.server.common.data.id.CustomerId;
@@ -49,9 +50,9 @@ import org.thingsboard.server.service.apiusage.TbApiUsageStateService;
 import org.thingsboard.server.service.entitiy.entityview.TbEntityViewService;
 import org.thingsboard.server.service.subscription.TbSubscriptionUtils;
 
-import javax.annotation.Nullable;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.Nullable;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -236,17 +237,27 @@ public class DefaultTelemetrySubscriptionService extends AbstractSubscriptionSer
     }
 
     @Override
-
     public void saveAndNotify(TenantId tenantId, EntityId entityId, String scope, List<AttributeKvEntry> attributes, FutureCallback<Void> callback) {
         saveAndNotify(tenantId, entityId, scope, attributes, true, callback);
     }
 
+    @Override
+    public void saveAndNotify(TenantId tenantId, EntityId entityId, AttributeScope scope, List<AttributeKvEntry> attributes, FutureCallback<Void> callback) {
+        saveAndNotify(tenantId, entityId, scope, attributes, true, callback);
+    }
+
     @Override
     public void saveAndNotify(TenantId tenantId, EntityId entityId, String scope, List<AttributeKvEntry> attributes, boolean notifyDevice, FutureCallback<Void> callback) {
         checkInternalEntity(entityId);
         saveAndNotifyInternal(tenantId, entityId, scope, attributes, notifyDevice, callback);
     }
 
+    @Override
+    public void saveAndNotify(TenantId tenantId, EntityId entityId, AttributeScope scope, List<AttributeKvEntry> attributes, boolean notifyDevice, FutureCallback<Void> callback) {
+        checkInternalEntity(entityId);
+        saveAndNotifyInternal(tenantId, entityId, scope, attributes, notifyDevice, callback);
+    }
+
     @Override
     public void saveAndNotifyInternal(TenantId tenantId, EntityId entityId, String scope, List<AttributeKvEntry> attributes, boolean notifyDevice, FutureCallback<Void> callback) {
         ListenableFuture<List<String>> saveFuture = attrService.save(tenantId, entityId, scope, attributes);
@@ -254,6 +265,13 @@ public class DefaultTelemetrySubscriptionService extends AbstractSubscriptionSer
         addWsCallback(saveFuture, success -> onAttributesUpdate(tenantId, entityId, scope, attributes, notifyDevice));
     }
 
+    @Override
+    public void saveAndNotifyInternal(TenantId tenantId, EntityId entityId, AttributeScope scope, List<AttributeKvEntry> attributes, boolean notifyDevice, FutureCallback<Void> callback) {
+        ListenableFuture<List<String>> saveFuture = attrService.save(tenantId, entityId, scope, attributes);
+        addVoidCallback(saveFuture, callback);
+        addWsCallback(saveFuture, success -> onAttributesUpdate(tenantId, entityId, scope.name(), attributes, notifyDevice));
+    }
+
     @Override
     public void saveLatestAndNotify(TenantId tenantId, EntityId entityId, List<TsKvEntry> ts, FutureCallback<Void> callback) {
         checkInternalEntity(entityId);
@@ -273,12 +291,24 @@ public class DefaultTelemetrySubscriptionService extends AbstractSubscriptionSer
         deleteAndNotifyInternal(tenantId, entityId, scope, keys, false, callback);
     }
 
+    @Override
+    public void deleteAndNotify(TenantId tenantId, EntityId entityId, AttributeScope scope, List<String> keys, FutureCallback<Void> callback) {
+        checkInternalEntity(entityId);
+        deleteAndNotifyInternal(tenantId, entityId, scope, keys, false, callback);
+    }
+
     @Override
     public void deleteAndNotify(TenantId tenantId, EntityId entityId, String scope, List<String> keys, boolean notifyDevice, FutureCallback<Void> callback) {
         checkInternalEntity(entityId);
         deleteAndNotifyInternal(tenantId, entityId, scope, keys, notifyDevice, callback);
     }
 
+    @Override
+    public void deleteAndNotify(TenantId tenantId, EntityId entityId, AttributeScope scope, List<String> keys, boolean notifyDevice, FutureCallback<Void> callback) {
+        checkInternalEntity(entityId);
+        deleteAndNotifyInternal(tenantId, entityId, scope, keys, notifyDevice, callback);
+    }
+
     @Override
     public void deleteAndNotifyInternal(TenantId tenantId, EntityId entityId, String scope, List<String> keys, boolean notifyDevice, FutureCallback<Void> callback) {
         ListenableFuture<List<String>> deleteFuture = attrService.removeAll(tenantId, entityId, scope, keys);
@@ -286,6 +316,13 @@ public class DefaultTelemetrySubscriptionService extends AbstractSubscriptionSer
         addWsCallback(deleteFuture, success -> onAttributesDelete(tenantId, entityId, scope, keys, notifyDevice));
     }
 
+    @Override
+    public void deleteAndNotifyInternal(TenantId tenantId, EntityId entityId, AttributeScope scope, List<String> keys, boolean notifyDevice, FutureCallback<Void> callback) {
+        ListenableFuture<List<String>> deleteFuture = attrService.removeAll(tenantId, entityId, scope, keys);
+        addVoidCallback(deleteFuture, callback);
+        addWsCallback(deleteFuture, success -> onAttributesDelete(tenantId, entityId, scope.name(), keys, notifyDevice));
+    }
+
     @Override
     public void deleteLatest(TenantId tenantId, EntityId entityId, List<String> keys, FutureCallback<Void> callback) {
         checkInternalEntity(entityId);
@@ -327,24 +364,49 @@ public class DefaultTelemetrySubscriptionService extends AbstractSubscriptionSer
                 , System.currentTimeMillis())), callback);
     }
 
+
+    @Override
+    public void saveAttrAndNotify(TenantId tenantId, EntityId entityId, AttributeScope scope, String key, long value, FutureCallback<Void> callback) {
+        saveAndNotify(tenantId, entityId, scope, Collections.singletonList(new BaseAttributeKvEntry(new LongDataEntry(key, value)
+                , System.currentTimeMillis())), callback);
+    }
+
     @Override
     public void saveAttrAndNotify(TenantId tenantId, EntityId entityId, String scope, String key, String value, FutureCallback<Void> callback) {
         saveAndNotify(tenantId, entityId, scope, Collections.singletonList(new BaseAttributeKvEntry(new StringDataEntry(key, value)
                 , System.currentTimeMillis())), callback);
     }
 
+    @Override
+    public void saveAttrAndNotify(TenantId tenantId, EntityId entityId, AttributeScope scope, String key, String value, FutureCallback<Void> callback) {
+        saveAndNotify(tenantId, entityId, scope, Collections.singletonList(new BaseAttributeKvEntry(new StringDataEntry(key, value)
+                , System.currentTimeMillis())), callback);
+    }
+
     @Override
     public void saveAttrAndNotify(TenantId tenantId, EntityId entityId, String scope, String key, double value, FutureCallback<Void> callback) {
         saveAndNotify(tenantId, entityId, scope, Collections.singletonList(new BaseAttributeKvEntry(new DoubleDataEntry(key, value)
                 , System.currentTimeMillis())), callback);
     }
 
+    @Override
+    public void saveAttrAndNotify(TenantId tenantId, EntityId entityId, AttributeScope scope, String key, double value, FutureCallback<Void> callback) {
+        saveAndNotify(tenantId, entityId, scope, Collections.singletonList(new BaseAttributeKvEntry(new DoubleDataEntry(key, value)
+                , System.currentTimeMillis())), callback);
+    }
+
     @Override
     public void saveAttrAndNotify(TenantId tenantId, EntityId entityId, String scope, String key, boolean value, FutureCallback<Void> callback) {
         saveAndNotify(tenantId, entityId, scope, Collections.singletonList(new BaseAttributeKvEntry(new BooleanDataEntry(key, value)
                 , System.currentTimeMillis())), callback);
     }
 
+    @Override
+    public void saveAttrAndNotify(TenantId tenantId, EntityId entityId, AttributeScope scope, String key, boolean value, FutureCallback<Void> callback) {
+        saveAndNotify(tenantId, entityId, scope, Collections.singletonList(new BaseAttributeKvEntry(new BooleanDataEntry(key, value)
+                , System.currentTimeMillis())), callback);
+    }
+
     @Override
     public ListenableFuture<Void> saveAttrAndNotify(TenantId tenantId, EntityId entityId, String scope, String key, long value) {
         SettableFuture<Void> future = SettableFuture.create();
@@ -352,6 +414,13 @@ public class DefaultTelemetrySubscriptionService extends AbstractSubscriptionSer
         return future;
     }
 
+    @Override
+    public ListenableFuture<Void> saveAttrAndNotify(TenantId tenantId, EntityId entityId, AttributeScope scope, String key, long value) {
+        SettableFuture<Void> future = SettableFuture.create();
+        saveAttrAndNotify(tenantId, entityId, scope, key, value, new VoidFutureCallback(future));
+        return future;
+    }
+
     @Override
     public ListenableFuture<Void> saveAttrAndNotify(TenantId tenantId, EntityId entityId, String scope, String key, String value) {
         SettableFuture<Void> future = SettableFuture.create();
@@ -359,6 +428,13 @@ public class DefaultTelemetrySubscriptionService extends AbstractSubscriptionSer
         return future;
     }
 
+    @Override
+    public ListenableFuture<Void> saveAttrAndNotify(TenantId tenantId, EntityId entityId, AttributeScope scope, String key, String value) {
+        SettableFuture<Void> future = SettableFuture.create();
+        saveAttrAndNotify(tenantId, entityId, scope, key, value, new VoidFutureCallback(future));
+        return future;
+    }
+
     @Override
     public ListenableFuture<Void> saveAttrAndNotify(TenantId tenantId, EntityId entityId, String scope, String key, double value) {
         SettableFuture<Void> future = SettableFuture.create();
@@ -366,6 +442,13 @@ public class DefaultTelemetrySubscriptionService extends AbstractSubscriptionSer
         return future;
     }
 
+    @Override
+    public ListenableFuture<Void> saveAttrAndNotify(TenantId tenantId, EntityId entityId, AttributeScope scope, String key, double value) {
+        SettableFuture<Void> future = SettableFuture.create();
+        saveAttrAndNotify(tenantId, entityId, scope, key, value, new VoidFutureCallback(future));
+        return future;
+    }
+
     @Override
     public ListenableFuture<Void> saveAttrAndNotify(TenantId tenantId, EntityId entityId, String scope, String key, boolean value) {
         SettableFuture<Void> future = SettableFuture.create();
@@ -373,6 +456,13 @@ public class DefaultTelemetrySubscriptionService extends AbstractSubscriptionSer
         return future;
     }
 
+    @Override
+    public ListenableFuture<Void> saveAttrAndNotify(TenantId tenantId, EntityId entityId, AttributeScope scope, String key, boolean value) {
+        SettableFuture<Void> future = SettableFuture.create();
+        saveAttrAndNotify(tenantId, entityId, scope, key, value, new VoidFutureCallback(future));
+        return future;
+    }
+
     private void onAttributesUpdate(TenantId tenantId, EntityId entityId, String scope, List<AttributeKvEntry> attributes, boolean notifyDevice) {
         forwardToSubscriptionManagerService(tenantId, entityId, subscriptionManagerService -> {
             subscriptionManagerService.onAttributesUpdate(tenantId, entityId, scope, attributes, notifyDevice, TbCallback.EMPTY);
diff --git a/application/src/main/java/org/thingsboard/server/service/telemetry/InternalTelemetryService.java b/application/src/main/java/org/thingsboard/server/service/telemetry/InternalTelemetryService.java
index db66abd072..a6dc6d1aae 100644
--- a/application/src/main/java/org/thingsboard/server/service/telemetry/InternalTelemetryService.java
+++ b/application/src/main/java/org/thingsboard/server/service/telemetry/InternalTelemetryService.java
@@ -17,6 +17,7 @@ package org.thingsboard.server.service.telemetry;
 
 import com.google.common.util.concurrent.FutureCallback;
 import org.thingsboard.rule.engine.api.RuleEngineTelemetryService;
+import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.kv.AttributeKvEntry;
@@ -33,12 +34,18 @@ public interface InternalTelemetryService extends RuleEngineTelemetryService {
 
     void saveAndNotifyInternal(TenantId tenantId, EntityId entityId, List<TsKvEntry> ts, long ttl, FutureCallback<Integer> callback);
 
+    @Deprecated(since = "3.7.0")
     void saveAndNotifyInternal(TenantId tenantId, EntityId entityId, String scope, List<AttributeKvEntry> attributes, boolean notifyDevice, FutureCallback<Void> callback);
 
+    void saveAndNotifyInternal(TenantId tenantId, EntityId entityId, AttributeScope scope, List<AttributeKvEntry> attributes, boolean notifyDevice, FutureCallback<Void> callback);
+
     void saveLatestAndNotifyInternal(TenantId tenantId, EntityId entityId, List<TsKvEntry> ts, FutureCallback<Void> callback);
 
+    @Deprecated(since = "3.7.0")
     void deleteAndNotifyInternal(TenantId tenantId, EntityId entityId, String scope, List<String> keys, boolean notifyDevice, FutureCallback<Void> callback);
 
+    void deleteAndNotifyInternal(TenantId tenantId, EntityId entityId, AttributeScope scope, List<String> keys, boolean notifyDevice, FutureCallback<Void> callback);
+
     void deleteLatestInternal(TenantId tenantId, EntityId entityId, List<String> keys, FutureCallback<Void> callback);
 
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/telemetry/TsData.java b/application/src/main/java/org/thingsboard/server/service/telemetry/TsData.java
index 4d9bec4cc2..0c890c5350 100644
--- a/application/src/main/java/org/thingsboard/server/service/telemetry/TsData.java
+++ b/application/src/main/java/org/thingsboard/server/service/telemetry/TsData.java
@@ -15,10 +15,9 @@
  */
 package org.thingsboard.server.service.telemetry;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 
-@ApiModel
+@Schema
 public class TsData implements Comparable<TsData>{
 
     private final long ts;
@@ -30,12 +29,12 @@ public class TsData implements Comparable<TsData>{
         this.value = value;
     }
 
-    @ApiModelProperty(position = 1, value = "Timestamp last updated timeseries, in milliseconds", example = "1609459200000", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Timestamp last updated timeseries, in milliseconds", example = "1609459200000", accessMode = Schema.AccessMode.READ_ONLY)
     public long getTs() {
         return ts;
     }
 
-    @ApiModelProperty(position = 2, value = "Object representing value of timeseries key", example = "20", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Object representing value of timeseries key", example = "20", accessMode = Schema.AccessMode.READ_ONLY)
     public Object getValue() {
         return value;
     }
diff --git a/application/src/main/java/org/thingsboard/server/service/transport/DefaultTransportApiService.java b/application/src/main/java/org/thingsboard/server/service/transport/DefaultTransportApiService.java
index bce241d9b1..6dcf84e721 100644
--- a/application/src/main/java/org/thingsboard/server/service/transport/DefaultTransportApiService.java
+++ b/application/src/main/java/org/thingsboard/server/service/transport/DefaultTransportApiService.java
@@ -47,10 +47,6 @@ import org.thingsboard.server.common.data.TbResource;
 import org.thingsboard.server.common.data.TenantProfile;
 import org.thingsboard.server.common.data.device.credentials.BasicMqttCredentials;
 import org.thingsboard.server.common.data.device.credentials.ProvisionDeviceCredentialsData;
-import org.thingsboard.server.common.data.device.data.CoapDeviceTransportConfiguration;
-import org.thingsboard.server.common.data.device.data.Lwm2mDeviceTransportConfiguration;
-import org.thingsboard.server.common.data.device.data.PowerMode;
-import org.thingsboard.server.common.data.device.data.PowerSavingConfiguration;
 import org.thingsboard.server.common.data.device.profile.ProvisionDeviceProfileCredentials;
 import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.DeviceId;
@@ -70,6 +66,7 @@ import org.thingsboard.server.common.msg.EncryptionUtil;
 import org.thingsboard.server.common.msg.TbMsg;
 import org.thingsboard.server.common.msg.TbMsgDataType;
 import org.thingsboard.server.common.msg.TbMsgMetaData;
+import org.thingsboard.server.common.util.ProtoUtils;
 import org.thingsboard.server.dao.device.DeviceCredentialsService;
 import org.thingsboard.server.dao.device.DeviceProfileService;
 import org.thingsboard.server.dao.device.DeviceProvisionService;
@@ -85,7 +82,6 @@ import org.thingsboard.server.dao.relation.RelationService;
 import org.thingsboard.server.dao.resource.ResourceService;
 import org.thingsboard.server.dao.tenant.TbTenantProfileCache;
 import org.thingsboard.server.gen.transport.TransportProtos;
-import org.thingsboard.server.gen.transport.TransportProtos.DeviceInfoProto;
 import org.thingsboard.server.gen.transport.TransportProtos.GetDeviceCredentialsRequestMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.GetDeviceRequestMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.GetEntityProfileRequestMsg;
@@ -103,12 +99,10 @@ import org.thingsboard.server.gen.transport.TransportProtos.ValidateDeviceLwM2MC
 import org.thingsboard.server.gen.transport.TransportProtos.ValidateDeviceTokenRequestMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ValidateDeviceX509CertRequestMsg;
 import org.thingsboard.server.queue.common.TbProtoQueueMsg;
-import org.thingsboard.server.queue.util.DataDecodingEncodingService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.apiusage.TbApiUsageStateService;
 import org.thingsboard.server.service.executors.DbCallbackExecutorService;
 import org.thingsboard.server.service.profile.TbDeviceProfileCache;
-import org.thingsboard.server.service.resource.TbResourceService;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
@@ -144,7 +138,6 @@ public class DefaultTransportApiService implements TransportApiService {
     private final DeviceCredentialsService deviceCredentialsService;
     private final DbCallbackExecutorService dbCallbackExecutorService;
     private final TbClusterService tbClusterService;
-    private final DataDecodingEncodingService dataDecodingEncodingService;
     private final DeviceProvisionService deviceProvisionService;
     private final ResourceService resourceService;
     private final OtaPackageService otaPackageService;
@@ -358,9 +351,7 @@ public class DefaultTransportApiService implements TransportApiService {
                 ObjectNode additionalInfo = JacksonUtil.newObjectNode();
                 additionalInfo.put(DataConstants.LAST_CONNECTED_GATEWAY, gatewayId.toString());
                 device.setAdditionalInfo(additionalInfo);
-                Device savedDevice = deviceService.saveDevice(device);
-                tbClusterService.onDeviceUpdated(savedDevice, null);
-                device = savedDevice;
+                device = deviceService.saveDevice(device);
 
                 relationService.saveRelation(TenantId.SYS_TENANT_ID, new EntityRelation(gateway.getId(), device.getId(), "Created"));
 
@@ -385,15 +376,14 @@ public class DefaultTransportApiService implements TransportApiService {
                                 || !gatewayId.toString().equals(deviceAdditionalInfo.get(DataConstants.LAST_CONNECTED_GATEWAY).asText()))) {
                     ObjectNode newDeviceAdditionalInfo = (ObjectNode) deviceAdditionalInfo;
                     newDeviceAdditionalInfo.put(DataConstants.LAST_CONNECTED_GATEWAY, gatewayId.toString());
-                    Device savedDevice = deviceService.saveDevice(device);
-                    tbClusterService.onDeviceUpdated(savedDevice, device);
+                    deviceService.saveDevice(device);
                 }
             }
             GetOrCreateDeviceFromGatewayResponseMsg.Builder builder = GetOrCreateDeviceFromGatewayResponseMsg.newBuilder()
-                    .setDeviceInfo(getDeviceInfoProto(device));
+                    .setDeviceInfo(ProtoUtils.toDeviceInfoProto(device));
             DeviceProfile deviceProfile = deviceProfileCache.get(device.getTenantId(), device.getDeviceProfileId());
             if (deviceProfile != null) {
-                builder.setProfileBody(ByteString.copyFrom(dataDecodingEncodingService.encode(deviceProfile)));
+                builder.setDeviceProfile(ProtoUtils.toProto(deviceProfile));
             } else {
                 log.warn("[{}] Failed to find device profile [{}] for device. ", device.getId(), device.getDeviceProfileId());
             }
@@ -416,7 +406,7 @@ public class DefaultTransportApiService implements TransportApiService {
     }
 
     private ListenableFuture<TransportApiResponseMsg> handle(ProvisionDeviceRequestMsg requestMsg) {
-        ListenableFuture<ProvisionResponse> provisionResponseFuture = null;
+        ListenableFuture<ProvisionResponse> provisionResponseFuture;
         try {
             provisionResponseFuture = Futures.immediateFuture(deviceProvisionService.provisionDevice(
                     new ProvisionRequest(
@@ -470,13 +460,13 @@ public class DefaultTransportApiService implements TransportApiService {
         if (entityType.equals(EntityType.DEVICE_PROFILE)) {
             DeviceProfileId deviceProfileId = new DeviceProfileId(entityUuid);
             DeviceProfile deviceProfile = deviceProfileCache.find(deviceProfileId);
-            builder.setData(ByteString.copyFrom(dataDecodingEncodingService.encode(deviceProfile)));
+            builder.setDeviceProfile(ProtoUtils.toProto(deviceProfile));
         } else if (entityType.equals(EntityType.TENANT)) {
             TenantId tenantId = TenantId.fromUUID(entityUuid);
             TenantProfile tenantProfile = tenantProfileCache.get(tenantId);
             ApiUsageState state = apiUsageStateService.getApiUsageState(tenantId);
-            builder.setData(ByteString.copyFrom(dataDecodingEncodingService.encode(tenantProfile)));
-            builder.setApiState(ByteString.copyFrom(dataDecodingEncodingService.encode(state)));
+            builder.setTenantProfile(ProtoUtils.toProto(tenantProfile));
+            builder.setApiState(ProtoUtils.toProto(state));
         } else {
             throw new RuntimeException("Invalid entity profile request: " + entityType);
         }
@@ -495,7 +485,7 @@ public class DefaultTransportApiService implements TransportApiService {
                             .setDeviceProfileIdMSB(deviceProfileId.getMostSignificantBits())
                             .setDeviceProfileIdLSB(deviceProfileId.getLeastSignificantBits())
                             .setDeviceTransportConfiguration(ByteString.copyFrom(
-                                    dataDecodingEncodingService.encode(device.getDeviceData().getTransportConfiguration())
+                                    JacksonUtil.writeValueAsBytes(device.getDeviceData().getTransportConfiguration())
                             )))
                     .build();
         } else {
@@ -511,11 +501,10 @@ public class DefaultTransportApiService implements TransportApiService {
 
         return Futures.immediateFuture(TransportApiResponseMsg.newBuilder()
                 .setDeviceCredentialsResponseMsg(TransportProtos.GetDeviceCredentialsResponseMsg.newBuilder()
-                        .setDeviceCredentialsData(ByteString.copyFrom(dataDecodingEncodingService.encode(deviceCredentials))))
+                        .setDeviceCredentialsData(ProtoUtils.toProto(deviceCredentials)))
                 .build());
     }
 
-
     private ListenableFuture<TransportApiResponseMsg> handle(GetResourceRequestMsg requestMsg) {
         TenantId tenantId = TenantId.fromUUID(new UUID(requestMsg.getTenantIdMSB(), requestMsg.getTenantIdLSB()));
         ResourceType resourceType = ResourceType.valueOf(requestMsg.getResourceType());
@@ -528,7 +517,7 @@ public class DefaultTransportApiService implements TransportApiService {
         }
 
         if (resource != null) {
-            builder.setResource(ByteString.copyFrom(dataDecodingEncodingService.encode(resource)));
+            builder.setResource(ProtoUtils.toProto(resource));
         }
 
         return Futures.immediateFuture(TransportApiResponseMsg.newBuilder().setResourceResponseMsg(builder).build());
@@ -558,10 +547,10 @@ public class DefaultTransportApiService implements TransportApiService {
         }
         try {
             ValidateDeviceCredentialsResponseMsg.Builder builder = ValidateDeviceCredentialsResponseMsg.newBuilder();
-            builder.setDeviceInfo(getDeviceInfoProto(device));
+            builder.setDeviceInfo(ProtoUtils.toDeviceInfoProto(device));
             DeviceProfile deviceProfile = deviceProfileCache.get(device.getTenantId(), device.getDeviceProfileId());
             if (deviceProfile != null) {
-                builder.setProfileBody(ByteString.copyFrom(dataDecodingEncodingService.encode(deviceProfile)));
+                builder.setDeviceProfile(ProtoUtils.toProto(deviceProfile));
             } else {
                 log.warn("[{}] Failed to find device profile [{}] for device. ", device.getId(), device.getDeviceProfileId());
             }
@@ -576,45 +565,6 @@ public class DefaultTransportApiService implements TransportApiService {
         }
     }
 
-    private DeviceInfoProto getDeviceInfoProto(Device device) throws JsonProcessingException {
-        DeviceInfoProto.Builder builder = DeviceInfoProto.newBuilder()
-                .setTenantIdMSB(device.getTenantId().getId().getMostSignificantBits())
-                .setTenantIdLSB(device.getTenantId().getId().getLeastSignificantBits())
-                .setCustomerIdMSB(Optional.ofNullable(device.getCustomerId()).map(customerId -> customerId.getId().getMostSignificantBits()).orElse(0L))
-                .setCustomerIdLSB(Optional.ofNullable(device.getCustomerId()).map(customerId -> customerId.getId().getLeastSignificantBits()).orElse(0L))
-                .setDeviceIdMSB(device.getId().getId().getMostSignificantBits())
-                .setDeviceIdLSB(device.getId().getId().getLeastSignificantBits())
-                .setDeviceName(device.getName())
-                .setDeviceType(device.getType())
-                .setDeviceProfileIdMSB(device.getDeviceProfileId().getId().getMostSignificantBits())
-                .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;
-        }
-
-        if (psmConfiguration != null) {
-            PowerMode powerMode = psmConfiguration.getPowerMode();
-            if (powerMode != null) {
-                builder.setPowerMode(powerMode.name());
-                if (powerMode.equals(PowerMode.PSM)) {
-                    builder.setPsmActivityTimer(checkLong(psmConfiguration.getPsmActivityTimer()));
-                } else if (powerMode.equals(PowerMode.E_DRX)) {
-                    builder.setEdrxCycle(checkLong(psmConfiguration.getEdrxCycle()));
-                    builder.setPagingTransmissionWindow(checkLong(psmConfiguration.getPagingTransmissionWindow()));
-                }
-            }
-        }
-        return builder.build();
-    }
-
     private ListenableFuture<TransportApiResponseMsg> getEmptyTransportApiResponseFuture() {
         return Futures.immediateFuture(getEmptyTransportApiResponse());
     }
@@ -696,11 +646,10 @@ public class DefaultTransportApiService implements TransportApiService {
                 device.setName(deviceName);
                 device.setType("LwM2M");
                 device = deviceService.saveDevice(device);
-                tbClusterService.onDeviceUpdated(device, null);
             }
             TransportProtos.LwM2MRegistrationResponseMsg registrationResponseMsg =
                     TransportProtos.LwM2MRegistrationResponseMsg.newBuilder()
-                            .setDeviceInfo(getDeviceInfoProto(device)).build();
+                            .setDeviceInfo(ProtoUtils.toDeviceInfoProto(device)).build();
             TransportProtos.LwM2MResponseMsg responseMsg = TransportProtos.LwM2MResponseMsg.newBuilder().setRegistrationMsg(registrationResponseMsg).build();
             return Futures.immediateFuture(TransportApiResponseMsg.newBuilder().setLwM2MResponseMsg(responseMsg).build());
         } catch (JsonProcessingException e) {
@@ -729,11 +678,6 @@ public class DefaultTransportApiService implements TransportApiService {
                                 .build()).collect(Collectors.toList())).build());
     }
 
-
-    private Long checkLong(Long l) {
-        return l != null ? l : 0;
-    }
-
     private ProvisionRequest createProvisionRequest(String certificateValue) {
         return new ProvisionRequest(null, DeviceCredentialsType.X509_CERTIFICATE,
                 new ProvisionDeviceCredentialsData(null, null, null, null, certificateValue),
diff --git a/application/src/main/java/org/thingsboard/server/service/transport/TbCoreTransportApiService.java b/application/src/main/java/org/thingsboard/server/service/transport/TbCoreTransportApiService.java
index e084a19780..15679986e6 100644
--- a/application/src/main/java/org/thingsboard/server/service/transport/TbCoreTransportApiService.java
+++ b/application/src/main/java/org/thingsboard/server/service/transport/TbCoreTransportApiService.java
@@ -34,8 +34,8 @@ import org.thingsboard.server.queue.provider.TbCoreQueueFactory;
 import org.thingsboard.server.queue.util.AfterStartUp;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import java.util.concurrent.ExecutorService;
 
 /**
diff --git a/application/src/main/java/org/thingsboard/server/service/ttl/AlarmsCleanUpService.java b/application/src/main/java/org/thingsboard/server/service/ttl/AlarmsCleanUpService.java
index 76de56cf13..c0f3158c61 100644
--- a/application/src/main/java/org/thingsboard/server/service/ttl/AlarmsCleanUpService.java
+++ b/application/src/main/java/org/thingsboard/server/service/ttl/AlarmsCleanUpService.java
@@ -56,7 +56,6 @@ public class AlarmsCleanUpService {
     private final TenantService tenantService;
     private final AlarmDao alarmDao;
     private final AlarmService alarmService;
-    private final RelationService relationService;
     private final EntityActionService entityActionService;
     private final PartitionService partitionService;
     private final TbTenantProfileCache tenantProfileCache;
diff --git a/application/src/main/java/org/thingsboard/server/service/ttl/AuditLogsCleanUpService.java b/application/src/main/java/org/thingsboard/server/service/ttl/AuditLogsCleanUpService.java
index 41dff4c4cf..34cc28270e 100644
--- a/application/src/main/java/org/thingsboard/server/service/ttl/AuditLogsCleanUpService.java
+++ b/application/src/main/java/org/thingsboard/server/service/ttl/AuditLogsCleanUpService.java
@@ -50,7 +50,8 @@ public class AuditLogsCleanUpService extends AbstractCleanUpService {
     @Scheduled(initialDelayString = "#{T(org.apache.commons.lang3.RandomUtils).nextLong(0, ${sql.ttl.audit_logs.checking_interval_ms})}",
             fixedDelayString = "${sql.ttl.audit_logs.checking_interval_ms}")
     public void cleanUp() {
-        long auditLogsExpTime = System.currentTimeMillis() - TimeUnit.SECONDS.toMillis(ttlInSec);
+        long auditLogsExpTime = getCurrentTimeMillis() - TimeUnit.SECONDS.toMillis(ttlInSec);
+        log.debug("cleanup {}", auditLogsExpTime);
         if (isSystemTenantPartitionMine()) {
             auditLogDao.cleanUpAuditLogs(auditLogsExpTime);
         } else {
@@ -58,4 +59,8 @@ public class AuditLogsCleanUpService extends AbstractCleanUpService {
         }
     }
 
+    public long getCurrentTimeMillis() {
+        return System.currentTimeMillis();
+    }
+
 }
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/update/DefaultUpdateService.java b/application/src/main/java/org/thingsboard/server/service/update/DefaultUpdateService.java
index 33ec9504a6..a0695c226f 100644
--- a/application/src/main/java/org/thingsboard/server/service/update/DefaultUpdateService.java
+++ b/application/src/main/java/org/thingsboard/server/service/update/DefaultUpdateService.java
@@ -36,7 +36,7 @@ import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.edge.instructions.EdgeInstallInstructionsService;
 import org.thingsboard.server.service.edge.instructions.EdgeUpgradeInstructionsService;
 
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PreDestroy;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
diff --git a/application/src/main/java/org/thingsboard/server/service/ws/DefaultWebSocketService.java b/application/src/main/java/org/thingsboard/server/service/ws/DefaultWebSocketService.java
index 0af50ff859..e41d1821c1 100644
--- a/application/src/main/java/org/thingsboard/server/service/ws/DefaultWebSocketService.java
+++ b/application/src/main/java/org/thingsboard/server/service/ws/DefaultWebSocketService.java
@@ -24,14 +24,14 @@ import com.google.common.util.concurrent.MoreExecutors;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.web.socket.CloseStatus;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.common.util.ThingsBoardExecutors;
 import org.thingsboard.common.util.ThingsBoardThreadFactory;
-import org.thingsboard.server.common.data.DataConstants;
+import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.TenantProfile;
 import org.thingsboard.server.common.data.id.CustomerId;
@@ -80,9 +80,9 @@ import org.thingsboard.server.service.ws.telemetry.cmd.v2.EntityDataUpdate;
 import org.thingsboard.server.service.ws.telemetry.cmd.v2.UnsubscribeCmd;
 import org.thingsboard.server.service.ws.telemetry.sub.TelemetrySubscriptionUpdate;
 
-import javax.annotation.Nullable;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.Nullable;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -868,7 +868,7 @@ public class DefaultWebSocketService implements WebSocketService {
             @Override
             public void onSuccess(@Nullable ValidationResult result) {
                 List<ListenableFuture<List<AttributeKvEntry>>> futures = new ArrayList<>();
-                for (String scope : DataConstants.allScopes()) {
+                for (AttributeScope scope : AttributeScope.values()) {
                     futures.add(attributesService.find(tenantId, entityId, scope, keys));
                 }
 
@@ -887,7 +887,7 @@ public class DefaultWebSocketService implements WebSocketService {
         return new FutureCallback<ValidationResult>() {
             @Override
             public void onSuccess(@Nullable ValidationResult result) {
-                Futures.addCallback(attributesService.find(tenantId, entityId, scope, keys), callback, MoreExecutors.directExecutor());
+                Futures.addCallback(attributesService.find(tenantId, entityId, AttributeScope.valueOf(scope), keys), callback, MoreExecutors.directExecutor());
             }
 
             @Override
@@ -902,7 +902,7 @@ public class DefaultWebSocketService implements WebSocketService {
             @Override
             public void onSuccess(@Nullable ValidationResult result) {
                 List<ListenableFuture<List<AttributeKvEntry>>> futures = new ArrayList<>();
-                for (String scope : DataConstants.allScopes()) {
+                for (AttributeScope scope : AttributeScope.values()) {
                     futures.add(attributesService.findAll(tenantId, entityId, scope));
                 }
 
@@ -921,7 +921,7 @@ public class DefaultWebSocketService implements WebSocketService {
         return new FutureCallback<ValidationResult>() {
             @Override
             public void onSuccess(@Nullable ValidationResult result) {
-                Futures.addCallback(attributesService.findAll(tenantId, entityId, scope), callback, MoreExecutors.directExecutor());
+                Futures.addCallback(attributesService.findAll(tenantId, entityId, AttributeScope.valueOf(scope)), callback, MoreExecutors.directExecutor());
             }
 
             @Override
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/java/org/thingsboard/server/springfox/SpringfoxHandlerProviderBeanPostProcessor.java b/application/src/main/java/org/thingsboard/server/springfox/SpringfoxHandlerProviderBeanPostProcessor.java
deleted file mode 100644
index 4de72a8965..0000000000
--- a/application/src/main/java/org/thingsboard/server/springfox/SpringfoxHandlerProviderBeanPostProcessor.java
+++ /dev/null
@@ -1,59 +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.springfox;
-
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.config.BeanPostProcessor;
-import org.springframework.stereotype.Component;
-import org.springframework.util.ReflectionUtils;
-import org.springframework.web.servlet.mvc.method.RequestMappingInfoHandlerMapping;
-import springfox.documentation.spring.web.plugins.WebMvcRequestHandlerProvider;
-
-import java.lang.reflect.Field;
-import java.util.List;
-import java.util.stream.Collectors;
-
-@Component
-//TODO: remove after fixing issue https://github.com/springfox/springfox/issues/3462 or after migration from springfox to springdoc
-public class SpringfoxHandlerProviderBeanPostProcessor implements BeanPostProcessor {
-
-    @Override
-    public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
-        if (bean instanceof WebMvcRequestHandlerProvider) {
-            customizeSpringfoxHandlerMappings(getHandlerMappings(bean));
-        }
-        return bean;
-    }
-
-    private <T extends RequestMappingInfoHandlerMapping> void customizeSpringfoxHandlerMappings(List<T> mappings) {
-        List<T> copy = mappings.stream()
-                .filter(mapping -> mapping.getPatternParser() == null)
-                .collect(Collectors.toList());
-        mappings.clear();
-        mappings.addAll(copy);
-    }
-
-    @SuppressWarnings("unchecked")
-    private List<RequestMappingInfoHandlerMapping> getHandlerMappings(Object bean) {
-        try {
-            Field field = ReflectionUtils.findField(bean.getClass(), "handlerMappings");
-            field.setAccessible(true);
-            return (List<RequestMappingInfoHandlerMapping>) field.get(bean);
-        } catch (IllegalArgumentException | IllegalAccessException e) {
-            throw new IllegalStateException(e);
-        }
-    }
-}
diff --git a/application/src/main/java/org/thingsboard/server/utils/MiscUtils.java b/application/src/main/java/org/thingsboard/server/utils/MiscUtils.java
index c0346bf132..9d324bc206 100644
--- a/application/src/main/java/org/thingsboard/server/utils/MiscUtils.java
+++ b/application/src/main/java/org/thingsboard/server/utils/MiscUtils.java
@@ -18,7 +18,7 @@ package org.thingsboard.server.utils;
 import com.google.common.hash.HashFunction;
 import com.google.common.hash.Hashing;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.nio.charset.Charset;
 
 
diff --git a/application/src/main/resources/thingsboard.yml b/application/src/main/resources/thingsboard.yml
index fd006fe801..6047bbfb16 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.2}"
+    base-url: "${UI_HELP_BASE_URL:https://raw.githubusercontent.com/thingsboard/thingsboard-ui-help/release-3.7}"
 
 # Database telemetry parameters
 database:
@@ -641,6 +641,18 @@ redis:
   db: "${REDIS_DB:0}"
   # db password
   password: "${REDIS_PASSWORD:}"
+  # ssl config
+  ssl:
+    # Enable/disable secure connection
+    enabled: "${TB_REDIS_SSL_ENABLED:false}"
+    # Server SSL credentials (only PEM format is supported)
+    credentials:
+      # Path redis server (CA) certificate
+      cert_file: "${TB_REDIS_SSL_PEM_CERT:}"
+      # Path to user certificate file. This is optional for the client and can be used for two-way authentication for the client
+      user_cert_file: "${TB_REDIS_SSL_PEM_KEY:}"
+      # Path to user private key file. This is optional for the client and only needed if ‘user_cert_file’ is configured.
+      user_key_file: "${TB_REDIS_SSL_PEM_KEY_PASSWORD:}"
   # pool config
   pool_config:
     # Maximum number of connections that can be allocated by the connection pool
@@ -716,7 +728,7 @@ spring:
         enabled: "true" # Enable/Disable the Spring Data JPA repositories support
   jpa:
     properties:
-      javax.persistence.query.timeout: "${JAVAX_PERSISTENCE_QUERY_TIMEOUT:30000}" # General timeout for JDBC queries
+      jakarta.persistence.query.timeout: "${JAVAX_PERSISTENCE_QUERY_TIMEOUT:30000}" # General timeout for JDBC queries
     open-in-view: "false" # Enabled by default. Therefore, database queries may be performed during view rendering. Explicitly configure spring.jpa.open-in-view to disable this warning
     hibernate:
       # You can set a Hibernate feature that controls the DDL behavior in a more fine-grained way. The standard Hibernate property values are none, validate, update, create-drop. Spring Boot chooses a default value for you based on whether it thinks your database is embedded (default create-drop) or not (default none)
@@ -854,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
@@ -1018,6 +1032,16 @@ transport:
       # CoAP DTLS bind port
       bind_port: "${COAP_DTLS_BIND_PORT:5684}"
       # Server DTLS credentials
+      # CoAP DTLS connection ID length. RFC 9146, Connection Identifier for DTLS 1.2
+      # Default: off
+      # Control usage of DTLS connection ID length (CID).
+      # - 'off' to deactivate it.
+      # - 'on' to activate Connection ID support (same as CID 0 or more 0).
+      # - A positive value defines generated CID size in bytes.
+      # - A value of 0 means we accept using CID but will not generate one for foreign peer (enables support but not for incoming traffic).
+      # - A value between 0 and <= 4: SingleNodeConnectionIdGenerator is used
+      # - A value that are > 4: MultiNodeConnectionIdGenerator is used
+      connection_id_length: "${COAP_DTLS_CONNECTION_ID_LENGTH:}"
       credentials:
         # Server credentials type (PEM - pem certificate file; KEYSTORE - java keystore)
         type: "${COAP_DTLS_CREDENTIALS_TYPE:PEM}"
@@ -1055,8 +1079,16 @@ transport:
     dtls:
       # RFC7925_RETRANSMISSION_TIMEOUT_IN_MILLISECONDS = 9000
       retransmission_timeout: "${LWM2M_DTLS_RETRANSMISSION_TIMEOUT_MS:9000}"
-      # "" disables connection id support, 0 enables support but not for incoming traffic, any value greater than 0 set the connection id size in bytes
-      connection_id_length: "${LWM2M_DTLS_CONNECTION_ID_LENGTH:6}"
+      # CoAP DTLS connection ID length for LWM2M. RFC 9146, Connection Identifier for DTLS 1.2
+      # Default: off
+      # Control usage of DTLS connection ID length (CID).
+      # - 'off' to deactivate it.
+      # - 'on' to activate Connection ID support (same as CID 0 or more 0).
+      # - A positive value defines generated CID size in bytes.
+      # - A value of 0 means we accept using CID but will not generate one for foreign peer (enables support but not for incoming traffic).
+      # - A value between 0 and <= 4: SingleNodeConnectionIdGenerator is used
+      # - A value that are > 4: MultiNodeConnectionIdGenerator is used
+      connection_id_length: "${LWM2M_DTLS_CONNECTION_ID_LENGTH:}"
     server:
       # LwM2M Server ID
       id: "${LWM2M_SERVER_ID:123}"
@@ -1259,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
@@ -1274,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}"
@@ -1291,12 +1331,17 @@ edges:
     # Persist state of edge (active, last connect, last disconnect) into timeseries or attributes tables. 'false' means to store edge state into attributes table
     persistToTelemetry: "${EDGES_PERSIST_STATE_TO_TELEMETRY:false}"
 
+# Spring doc common parameters
+springdoc:
+  # If false swagger API docs will be unavailable
+  api-docs.enabled: "${SWAGGER_ENABLED:true}"
+  # Swagger default produces media-type
+  default-produces-media-type: "${SWAGGER_DEFAULT_PRODUCES_MEDIA_TYPE:application/json}"
+
 # Swagger common parameters
 swagger:
-  # If false swagger API docs will be unavailable
-  enabled: "${SWAGGER_ENABLED:true}"
   # General swagger match pattern of swagger UI links
-  api_path_regex: "${SWAGGER_API_PATH_REGEX:/api/.*}"
+  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
@@ -1400,6 +1445,16 @@ queue:
     #      tb_rule_engine.sq:
     #        - key: max.poll.records
     #          value: "${TB_QUEUE_KAFKA_SQ_MAX_POLL_RECORDS:1024}"
+      tb_housekeeper:
+        # Consumer properties for Housekeeper tasks topic
+        - key: max.poll.records
+          # Amount of records to be returned in a single poll. For Housekeeper tasks topic, we should consume messages (tasks) one by one
+          value: "${TB_QUEUE_KAFKA_HOUSEKEEPER_MAX_POLL_RECORDS:1}"
+      tb_housekeeper.reprocessing:
+        # Consumer properties for Housekeeper reprocessing topic
+        - key: max.poll.records
+          # Amount of records to be returned in a single poll. For Housekeeper reprocessing topic, we should consume messages (tasks) one by one
+          value: "${TB_QUEUE_KAFKA_HOUSEKEEPER_REPROCESSING_MAX_POLL_RECORDS:1}"
     other-inline: "${TB_QUEUE_KAFKA_OTHER_PROPERTIES:}" # In this section you can specify custom parameters (semicolon separated) for Kafka consumer/producer/admin # Example "metrics.recording.level:INFO;metrics.sample.window.ms:30000"
     other: # DEPRECATED. In this section, you can specify custom parameters for Kafka consumer/producer and expose the env variables to configure outside
     #  - key: "request.timeout.ms" # refer to https://docs.confluent.io/platform/current/installation/configuration/producer-configs.html#producerconfigs_request.timeout.ms
@@ -1421,6 +1476,10 @@ queue:
       ota-updates: "${TB_QUEUE_KAFKA_OTA_TOPIC_PROPERTIES:retention.ms:604800000;segment.bytes:26214400;retention.bytes:1048576000;partitions:10;min.insync.replicas:1}"
       # Kafka properties for Version Control topic
       version-control: "${TB_QUEUE_KAFKA_VC_TOPIC_PROPERTIES:retention.ms:604800000;segment.bytes:26214400;retention.bytes:1048576000;partitions:1;min.insync.replicas:1}"
+      # Kafka properties for Housekeeper tasks topic
+      housekeeper: "${TB_QUEUE_KAFKA_HOUSEKEEPER_TOPIC_PROPERTIES:retention.ms:604800000;segment.bytes:26214400;retention.bytes:1048576000;partitions:10;min.insync.replicas:1}"
+      # Kafka properties for Housekeeper reprocessing topic; retention.ms is set to 90 days; partitions is set to 1 since only one reprocessing service is running at a time
+      housekeeper-reprocessing: "${TB_QUEUE_KAFKA_HOUSEKEEPER_REPROCESSING_TOPIC_PROPERTIES:retention.ms:7776000000;segment.bytes:26214400;retention.bytes:1048576000;partitions:1;min.insync.replicas:1}"
     consumer-stats:
       # Prints lag between consumer group offset and last messages offset in Kafka topics
       enabled: "${TB_QUEUE_KAFKA_CONSUMER_STATS_ENABLED:true}"
@@ -1576,6 +1635,29 @@ queue:
       enabled: "${TB_QUEUE_CORE_STATS_ENABLED:true}"
       # Statistics printing interval for Core microservices
       print-interval-ms: "${TB_QUEUE_CORE_STATS_PRINT_INTERVAL_MS:60000}"
+    housekeeper:
+      # Topic name for Housekeeper tasks
+      topic: "${TB_HOUSEKEEPER_TOPIC:tb_housekeeper}"
+      # Topic name for Housekeeper tasks to be reprocessed
+      reprocessing-topic: "${TB_HOUSEKEEPER_REPROCESSING_TOPIC:tb_housekeeper.reprocessing}"
+      # Poll interval for topics related to Housekeeper
+      poll-interval-ms: "${TB_HOUSEKEEPER_POLL_INTERVAL_MS:500}"
+      # Timeout in milliseconds for task processing. Tasks that fail to finish on time will be submitted for reprocessing
+      task-processing-timeout-ms: "${TB_HOUSEKEEPER_TASK_PROCESSING_TIMEOUT_MS:120000}"
+      # Comma-separated list of task types that shouldn't be processed. Available task types:
+      # DELETE_ATTRIBUTES, DELETE_TELEMETRY (both DELETE_LATEST_TS and DELETE_TS_HISTORY will be disabled),
+      # DELETE_LATEST_TS, DELETE_TS_HISTORY, DELETE_EVENTS, DELETE_ALARMS, UNASSIGN_ALARMS
+      disabled-task-types: "${TB_HOUSEKEEPER_DISABLED_TASK_TYPES:}"
+      # Delay in milliseconds between tasks reprocessing
+      task-reprocessing-delay-ms: "${TB_HOUSEKEEPER_TASK_REPROCESSING_DELAY_MS:3000}"
+      # Maximum amount of task reprocessing attempts. After exceeding, the task will be dropped
+      max-reprocessing-attempts: "${TB_HOUSEKEEPER_MAX_REPROCESSING_ATTEMPTS:10}"
+      stats:
+        # Enable/disable statistics for Housekeeper
+        enabled: "${TB_HOUSEKEEPER_STATS_ENABLED:true}"
+        # Statistics printing interval for Housekeeper
+        print-interval-ms: "${TB_HOUSEKEEPER_STATS_PRINT_INTERVAL_MS:60000}"
+
   vc:
     # Default topic name for Kafka, RabbitMQ, etc.
     topic: "${TB_QUEUE_VC_TOPIC:tb_version_control}"
@@ -1685,3 +1767,7 @@ management:
       exposure:
         # Expose metrics endpoint (use value 'prometheus' to enable prometheus metrics).
         include: '${METRICS_ENDPOINTS_EXPOSE:info}'
+  health:
+    elasticsearch:
+      # Enable the org.springframework.boot.actuate.elasticsearch.ElasticsearchRestClientHealthIndicator.doHealthCheck
+      enabled: "false"
diff --git a/application/src/test/java/org/thingsboard/server/controller/AbstractControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/AbstractControllerTest.java
index a583353c7e..a53c9ad1d0 100644
--- a/application/src/test/java/org/thingsboard/server/controller/AbstractControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/AbstractControllerTest.java
@@ -21,7 +21,7 @@ import org.junit.Before;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootContextLoader;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.boot.test.web.server.LocalServerPort;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.test.annotation.DirtiesContext;
diff --git a/application/src/test/java/org/thingsboard/server/controller/AbstractNotifyEntityTest.java b/application/src/test/java/org/thingsboard/server/controller/AbstractNotifyEntityTest.java
index 314fe4c28c..35c2ea65fa 100644
--- a/application/src/test/java/org/thingsboard/server/controller/AbstractNotifyEntityTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/AbstractNotifyEntityTest.java
@@ -218,15 +218,15 @@ public abstract class AbstractNotifyEntityTest extends AbstractWebTest {
         Mockito.reset(tbClusterService, auditLogService);
     }
 
-    protected void testNotifyEntityBroadcastEntityStateChangeEventOneTimeMsgToEdgeServiceNever(HasName entity, EntityId entityId, EntityId originatorId,
-                                                                                               TenantId tenantId, CustomerId customerId, UserId userId, String userName,
-                                                                                               ActionType actionType, Object... additionalInfo) {
+    protected void testNotifyEntityBroadcastEntityStateChangeEventManyTimeMsgToEdgeServiceNever(HasName entity, EntityId entityId, EntityId originatorId,
+                                                                                                TenantId tenantId, CustomerId customerId, UserId userId, String userName,
+                                                                                                ActionType actionType, int cntTimeBroadcast, Object... additionalInfo) {
         int cntTime = 1;
         testNotificationMsgToEdgeServiceNeverWithActionType(entityId, actionType);
         testLogEntityAction(entity, originatorId, tenantId, customerId, userId, userName, actionType, cntTime, additionalInfo);
         ArgumentMatcher<EntityId> matcherOriginatorId = argument -> argument.equals(originatorId);
         testPushMsgToRuleEngineTime(matcherOriginatorId, tenantId, entity, cntTime);
-        testBroadcastEntityStateChangeEventTime(entityId, tenantId, cntTime);
+        testBroadcastEntityStateChangeEventTime(entityId, tenantId, cntTimeBroadcast);
         Mockito.reset(tbClusterService, auditLogService);
     }
 
@@ -248,7 +248,7 @@ public abstract class AbstractNotifyEntityTest extends AbstractWebTest {
         testLogEntityActionAdditionalInfoAny(matcherEntityClassEquals, matcherOriginatorId, tenantId, matcherCustomerId, matcherUserId, userName, actionType, cntTime,
                 cntAdditionalInfo);
         testPushMsgToRuleEngineTime(matcherOriginatorId, tenantId, entity, cntTimeRuleEngine);
-        testBroadcastEntityStateChangeEventTime(entityId, tenantId, cntTime);
+        testBroadcastEntityStateChangeEventTime(entityId, tenantId, cntTime * 2);
     }
 
     protected void testNotifyEntityMsgToEdgePushMsgToCoreOneTime(HasName entity, EntityId entityId, EntityId originatorId,
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 63c974fa96..96e52d6c12 100644
--- a/application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java
@@ -25,7 +25,6 @@ import io.jsonwebtoken.Header;
 import io.jsonwebtoken.Jwt;
 import io.jsonwebtoken.Jwts;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.http.HttpStatus;
 import org.awaitility.Awaitility;
 import org.hamcrest.Matcher;
 import org.hibernate.exception.ConstraintViolationException;
@@ -41,6 +40,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,13 +113,18 @@ 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.attributes.AttributesService;
+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.queue.memory.InMemoryStorage;
 import org.thingsboard.server.service.entitiy.tenant.profile.TbTenantProfileService;
 import org.thingsboard.server.service.security.auth.jwt.RefreshTokenRequest;
 import org.thingsboard.server.service.security.auth.rest.LoginRequest;
 
 import java.io.IOException;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import java.sql.SQLException;
@@ -147,6 +153,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 {
@@ -223,14 +230,23 @@ public abstract class AbstractWebTest extends AbstractInMemoryStorageTest {
     private TbTenantProfileService tbTenantProfileService;
 
     @Autowired
-    public TimeseriesService tsService;
+    protected TimeseriesService tsService;
+
+    @Autowired
+    protected AttributesService attributesService;
 
     @Autowired
     protected DefaultActorService actorService;
 
+    @Autowired
+    protected ClaimDevicesService claimDevicesService;
+
     @SpyBean
     protected MailService mailService;
 
+    @Autowired
+    protected InMemoryStorage storage;
+
     @Rule
     public TestRule watcher = new TestWatcher() {
         protected void starting(Description description) {
@@ -273,7 +289,7 @@ public abstract class AbstractWebTest extends AbstractInMemoryStorageTest {
 
         Tenant tenant = new Tenant();
         tenant.setTitle(TEST_TENANT_NAME);
-        Tenant savedTenant = doPost("/api/tenant", tenant, Tenant.class);
+        Tenant savedTenant = saveTenant(tenant);
         Assert.assertNotNull(savedTenant);
         tenantId = savedTenant.getId();
         tenantProfileId = savedTenant.getTenantProfileId();
@@ -351,22 +367,14 @@ public abstract class AbstractWebTest extends AbstractInMemoryStorageTest {
         assertThat(loadedTenants).as("All tenants expected to be deleted, but some tenants left in the database").isEmpty();
     }
 
-    private void deleteTenant(TenantId tenantId) {
-        int status = 0;
-        int retries = 0;
-        while (status != HttpStatus.SC_OK && retries < CLEANUP_TENANT_RETRIES_COUNT) {
-            retries++;
-            try {
-                status = doDelete("/api/tenant/" + tenantId.getId().toString())
-                        .andReturn().getResponse().getStatus();
-                if (status != HttpStatus.SC_OK) {
-                    log.warn("Tenant deletion failed, tenantId: {}", tenantId.getId().toString());
-                    Thread.sleep(1000L);
-                }
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
+    protected void deleteTenant(TenantId tenantId) {
+        try {
+            doDelete("/api/tenant/" + tenantId.getId()).andExpect(status().isOk());
+        } catch (Exception e) {
+            throw new RuntimeException(e);
         }
+        Awaitility.await("all tasks processed").atMost(60, TimeUnit.SECONDS).during(300, TimeUnit.MILLISECONDS)
+                .until(() -> storage.getLag("tb_housekeeper") == 0);
     }
 
     private List<Tenant> getAllTenants() throws Exception {
@@ -419,7 +427,7 @@ public abstract class AbstractWebTest extends AbstractInMemoryStorageTest {
         loginSysAdmin();
         Tenant tenant = new Tenant();
         tenant.setTitle(TEST_DIFFERENT_TENANT_NAME);
-        savedDifferentTenant = doPost("/api/tenant", tenant, Tenant.class);
+        savedDifferentTenant = saveTenant(tenant);
         differentTenantId = savedDifferentTenant.getId();
         Assert.assertNotNull(savedDifferentTenant);
         User differentTenantAdmin = new User();
@@ -429,6 +437,10 @@ public abstract class AbstractWebTest extends AbstractInMemoryStorageTest {
         savedDifferentTenantUser = createUserAndLogin(differentTenantAdmin, DIFFERENT_TENANT_ADMIN_PASSWORD);
     }
 
+    protected Tenant saveTenant(Tenant tenant) throws Exception {
+        return doPost("/api/tenant", tenant, Tenant.class);
+    }
+
     protected void loginDifferentCustomer() throws Exception {
         if (savedDifferentCustomer != null) {
             login(savedDifferentCustomer.getEmail(), CUSTOMER_USER_PASSWORD);
@@ -1017,9 +1029,15 @@ public abstract class AbstractWebTest extends AbstractInMemoryStorageTest {
     protected static void setStaticFinalFieldValue(Class<?> targetCls, String fieldName, Object value) throws Exception {
         Field field = targetCls.getDeclaredField(fieldName);
         field.setAccessible(true);
-        Field modifiers = Field.class.getDeclaredField("modifiers");
-        modifiers.setAccessible(true);
-        modifiers.setInt(field, field.getModifiers() & ~Modifier.FINAL);
+        // Get the VarHandle for the 'modifiers' field in the Field class
+        MethodHandles.Lookup lookup = MethodHandles.privateLookupIn(Field.class, MethodHandles.lookup());
+        VarHandle modifiersHandle = lookup.findVarHandle(Field.class, "modifiers", int.class);
+
+        // Remove the final modifier from the field
+        int currentModifiers = field.getModifiers();
+        modifiersHandle.set(field, currentModifiers & ~Modifier.FINAL);
+
+        // Set the new value
         field.set(null, value);
     }
 
@@ -1047,6 +1065,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/AlarmControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/AlarmControllerTest.java
index 5290b429c0..7ae283cd46 100644
--- a/application/src/test/java/org/thingsboard/server/controller/AlarmControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/AlarmControllerTest.java
@@ -53,9 +53,8 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.stream.Collectors;
-import java.util.Objects;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 import static org.hamcrest.Matchers.containsString;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
@@ -584,7 +583,7 @@ public class AlarmControllerTest extends AbstractControllerTest {
         Assert.assertEquals(savedUser.getId(), foundAlarm.getAssigneeId());
         Assert.assertTrue(foundAlarm.getAssignTs() >= beforeAssignmentTs);
 
-        beforeAssignmentTs = System.currentTimeMillis();
+        long afterAssignmentTs = System.currentTimeMillis();
 
         loginSysAdmin();
 
@@ -592,12 +591,12 @@ public class AlarmControllerTest extends AbstractControllerTest {
 
         loginDifferentTenant();
 
-        foundAlarm = Awaitility.await().atMost(TIMEOUT, TimeUnit.SECONDS)
-                .until(() -> doGet("/api/alarm/info/" + alarmId.getId(), AlarmInfo.class), Objects::nonNull);
-
-        Assert.assertNotNull(foundAlarm);
-        Assert.assertNull(foundAlarm.getAssigneeId());
-        Assert.assertTrue(foundAlarm.getAssignTs() >= beforeAssignmentTs);
+        Awaitility.await().atMost(TIMEOUT, TimeUnit.SECONDS).untilAsserted(() -> {
+            AlarmInfo alarmInfo = doGet("/api/alarm/info/" + alarmId.getId(), AlarmInfo.class);
+            Assert.assertNotNull(alarmInfo);
+            Assert.assertNull(alarmInfo.getAssigneeId());
+            Assert.assertTrue(alarmInfo.getAssignTs() >= afterAssignmentTs);
+        });
     }
 
     @Test
@@ -631,71 +630,16 @@ public class AlarmControllerTest extends AbstractControllerTest {
         Assert.assertEquals(savedUser.getId(), foundAlarm.getAssigneeId());
         Assert.assertTrue(foundAlarm.getAssignTs() >= beforeAssignmentTs);
 
-        beforeAssignmentTs = System.currentTimeMillis();
+        long afterAssignmentTs = System.currentTimeMillis();
 
         doDelete("/api/user/" + savedUser.getId().getId()).andExpect(status().isOk());
 
-        foundAlarm = Awaitility.await().atMost(TIMEOUT, TimeUnit.SECONDS)
-                .until(() -> doGet("/api/alarm/info/" + alarmId.getId(), AlarmInfo.class), Objects::nonNull);
-
-        Assert.assertNotNull(foundAlarm);
-        Assert.assertNull(foundAlarm.getAssigneeId());
-        Assert.assertTrue(foundAlarm.getAssignTs() >= beforeAssignmentTs);
-    }
-
-    @Test
-    public void testUnassignAlarmOnCustomerRemoving() throws Exception {
-        createDifferentTenantCustomer();
-        loginDifferentTenant();
-
-        User user = new User();
-        user.setAuthority(Authority.CUSTOMER_USER);
-        user.setTenantId(tenantId);
-        user.setCustomerId(differentTenantCustomerId);
-        user.setEmail("customerForAssign@thingsboard.org");
-        User savedUser = createUser(user, "password");
-
-        Device device = createDevice("Different customer device", "default", "differentTenantTest");
-
-        Device assignedDevice = doPost("/api/customer/" + differentTenantCustomerId.getId()
-                + "/device/" + device.getId().getId(), Device.class);
-        Assert.assertEquals(differentTenantCustomerId, assignedDevice.getCustomerId());
-
-        Alarm alarm = Alarm.builder()
-                .type(TEST_ALARM_TYPE)
-                .tenantId(savedDifferentTenant.getId())
-                .customerId(differentTenantCustomerId)
-                .originator(device.getId())
-                .severity(AlarmSeverity.MAJOR)
-                .build();
-        alarm = doPost("/api/alarm", alarm, Alarm.class);
-        Assert.assertNotNull(alarm);
-        AlarmId alarmId = alarm.getId();
-
-        alarm = doGet("/api/alarm/info/" + alarmId.getId(), AlarmInfo.class);
-        Assert.assertNotNull(alarm);
-
-        Mockito.reset(tbClusterService, auditLogService);
-        long beforeAssignmentTs = System.currentTimeMillis();
-
-        doPost("/api/alarm/" + alarmId.getId() + "/assign/" + savedUser.getId().getId()).andExpect(status().isOk());
-        AlarmInfo foundAlarm = doGet("/api/alarm/info/" + alarmId.getId(), AlarmInfo.class);
-        Assert.assertNotNull(foundAlarm);
-        Assert.assertEquals(savedUser.getId(), foundAlarm.getAssigneeId());
-        Assert.assertTrue(foundAlarm.getAssignTs() >= beforeAssignmentTs);
-
-        beforeAssignmentTs = System.currentTimeMillis();
-
-        Mockito.reset(tbClusterService, auditLogService);
-
-        doDelete("/api/customer/" + differentTenantCustomerId.getId()).andExpect(status().isOk());
-
-        foundAlarm = Awaitility.await().atMost(TIMEOUT, TimeUnit.SECONDS)
-                .until(() -> doGet("/api/alarm/info/" + alarmId.getId(), AlarmInfo.class), Objects::nonNull);
-
-        Assert.assertNotNull(foundAlarm);
-        Assert.assertNull(foundAlarm.getAssigneeId());
-        Assert.assertTrue(foundAlarm.getAssignTs() >= beforeAssignmentTs);
+         Awaitility.await().atMost(TIMEOUT, TimeUnit.SECONDS).untilAsserted(() -> {
+             AlarmInfo alarmInfo = doGet("/api/alarm/info/" + alarmId.getId(), AlarmInfo.class);
+             Assert.assertNotNull(alarmInfo);
+             Assert.assertNull(alarmInfo.getAssigneeId());
+             Assert.assertTrue(alarmInfo.getAssignTs() >= afterAssignmentTs);
+         });
     }
 
     @Test
@@ -1003,27 +947,20 @@ public class AlarmControllerTest extends AbstractControllerTest {
             types.remove(0);
         }
 
-        foundTypes = doGetTyped("/api/alarm/types?pageSize=1024&page=0", new TypeReference<PageData<EntitySubtype>>() {
-        })
-                .getData()
-                .stream()
-                .map(EntitySubtype::getType)
-                .collect(Collectors.toList());
-
-        Assert.assertEquals(types.size(), foundTypes.size());
-        Assert.assertEquals(types, foundTypes);
+        Awaitility.await().atMost(TIMEOUT, TimeUnit.SECONDS).untilAsserted(() -> {
+            List<String> actualTypes = doGetTyped("/api/alarm/types?pageSize=1024&page=0", new TypeReference<PageData<EntitySubtype>>() {})
+                    .getData().stream().map(EntitySubtype::getType).toList();
+            Assert.assertEquals(types.size(), actualTypes.size());
+            Assert.assertEquals(types, actualTypes);
+        });
 
         doDelete("/api/device/" + devices.get(0).getId()).andExpect(status().isOk());
 
-        foundTypes = doGetTyped("/api/alarm/types?pageSize=1024&page=0", new TypeReference<PageData<EntitySubtype>>() {
-        })
-                .getData()
-                .stream()
-                .map(EntitySubtype::getType)
-                .sorted()
-                .collect(Collectors.toList());
-
-        Assert.assertTrue(foundTypes.isEmpty());
+        Awaitility.await().atMost(TIMEOUT, TimeUnit.SECONDS).untilAsserted(() -> {
+            List<String> actualTypes = doGetTyped("/api/alarm/types?pageSize=1024&page=0", new TypeReference<PageData<EntitySubtype>>() {})
+                    .getData().stream().map(EntitySubtype::getType).sorted().toList();
+            Assert.assertTrue(actualTypes.isEmpty());
+        });
     }
 
 }
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..123696ce3d 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;
@@ -41,20 +42,24 @@ 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.id.AlarmId;
 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 java.util.concurrent.TimeUnit;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
 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;
@@ -85,7 +90,7 @@ public class AssetControllerTest extends AbstractControllerTest {
 
         Tenant tenant = new Tenant();
         tenant.setTitle("My tenant");
-        savedTenant = doPost("/api/tenant", tenant, Tenant.class);
+        savedTenant = saveTenant(tenant);
         Assert.assertNotNull(savedTenant);
 
         tenantAdmin = new User();
@@ -102,8 +107,7 @@ public class AssetControllerTest extends AbstractControllerTest {
     public void afterTest() throws Exception {
         loginSysAdmin();
 
-        doDelete("/api/tenant/" + savedTenant.getId().getId().toString())
-                .andExpect(status().isOk());
+        deleteTenant(savedTenant.getId());
     }
 
     @Test
@@ -310,8 +314,9 @@ public class AssetControllerTest extends AbstractControllerTest {
 
         alarm = doPost("/api/alarm", alarm, Alarm.class);
         Assert.assertNotNull(alarm);
+        AlarmId alarmId = alarm.getId();
 
-        AlarmInfo foundAlarm = doGet("/api/alarm/info/" + alarm.getId(), AlarmInfo.class);
+        AlarmInfo foundAlarm = doGet("/api/alarm/info/" + alarmId, AlarmInfo.class);
         Assert.assertNotNull(foundAlarm);
 
         doDelete("/api/asset/" + savedAsset.getId().getId().toString())
@@ -322,9 +327,58 @@ public class AssetControllerTest extends AbstractControllerTest {
                 .andExpect(status().isNotFound())
                 .andExpect(statusReason(containsString(msgErrorNoFound("Asset", assetIdStr))));
 
-        doGet("/api/alarm/info/" + alarm.getId())
-                .andExpect(status().isNotFound())
-                .andExpect(statusReason(containsString(msgErrorNoFound("Alarm", alarm.getId().getId().toString()))));
+        await().atMost(30, TimeUnit.SECONDS).untilAsserted(() -> {
+            doGet("/api/alarm/info/" + alarmId)
+                    .andExpect(status().isNotFound())
+                    .andExpect(statusReason(containsString(msgErrorNoFound("Alarm", alarmId.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
@@ -499,7 +553,7 @@ public class AssetControllerTest extends AbstractControllerTest {
 
         Tenant tenant2 = new Tenant();
         tenant2.setTitle("Different tenant");
-        Tenant savedTenant2 = doPost("/api/tenant", tenant2, Tenant.class);
+        Tenant savedTenant2 = saveTenant(tenant2);
         Assert.assertNotNull(savedTenant2);
 
         User tenantAdmin2 = new User();
@@ -533,8 +587,7 @@ public class AssetControllerTest extends AbstractControllerTest {
 
         loginSysAdmin();
 
-        doDelete("/api/tenant/" + savedTenant2.getId().getId().toString())
-                .andExpect(status().isOk());
+        deleteTenant(savedTenant2.getId());
     }
 
     @Test
@@ -567,8 +620,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/AssetProfileControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/AssetProfileControllerTest.java
index 432c309a4e..c408daaab3 100644
--- a/application/src/test/java/org/thingsboard/server/controller/AssetProfileControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/AssetProfileControllerTest.java
@@ -82,7 +82,7 @@ public class AssetProfileControllerTest extends AbstractControllerTest {
 
         Tenant tenant = new Tenant();
         tenant.setTitle("My tenant");
-        savedTenant = doPost("/api/tenant", tenant, Tenant.class);
+        savedTenant = saveTenant(tenant);
         Assert.assertNotNull(savedTenant);
 
         tenantAdmin = new User();
@@ -99,8 +99,7 @@ public class AssetProfileControllerTest extends AbstractControllerTest {
     public void afterTest() throws Exception {
         loginSysAdmin();
 
-        doDelete("/api/tenant/" + savedTenant.getId().getId().toString())
-                .andExpect(status().isOk());
+        deleteTenant(savedTenant.getId());
     }
 
     @Test
diff --git a/application/src/test/java/org/thingsboard/server/controller/AuditLogControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/AuditLogControllerTest.java
index bd2fe2e3f4..31f398dc03 100644
--- a/application/src/test/java/org/thingsboard/server/controller/AuditLogControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/AuditLogControllerTest.java
@@ -15,7 +15,9 @@
  */
 package org.thingsboard.server.controller;
 
+import com.datastax.oss.driver.api.core.uuid.Uuids;
 import com.fasterxml.jackson.core.type.TypeReference;
+import lombok.extern.slf4j.Slf4j;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -28,6 +30,7 @@ import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.common.data.User;
 import org.thingsboard.server.common.data.audit.ActionType;
 import org.thingsboard.server.common.data.audit.AuditLog;
+import org.thingsboard.server.common.data.id.AuditLogId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.TimePageLink;
@@ -38,19 +41,21 @@ import org.thingsboard.server.dao.service.DaoSqlTest;
 import org.thingsboard.server.dao.sqlts.insert.sql.SqlPartitioningRepository;
 import org.thingsboard.server.service.ttl.AuditLogsCleanUpService;
 
-import java.time.LocalDate;
-import java.time.ZoneOffset;
+import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
+import static org.apache.commons.lang3.time.DateFormatUtils.ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.BDDMockito.willReturn;
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.verify;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
+@Slf4j
 @DaoSqlTest
 public class AuditLogControllerTest extends AbstractControllerTest {
 
@@ -61,7 +66,7 @@ public class AuditLogControllerTest extends AbstractControllerTest {
     private AuditLogDao auditLogDao;
     @SpyBean
     private SqlPartitioningRepository partitioningRepository;
-    @Autowired
+    @SpyBean
     private AuditLogsCleanUpService auditLogsCleanUpService;
 
     @Value("#{${sql.audit_logs.partition_size} * 60 * 60 * 1000}")
@@ -75,7 +80,7 @@ public class AuditLogControllerTest extends AbstractControllerTest {
 
         Tenant tenant = new Tenant();
         tenant.setTitle("My tenant");
-        savedTenant = doPost("/api/tenant", tenant, Tenant.class);
+        savedTenant = saveTenant(tenant);
         Assert.assertNotNull(savedTenant);
 
         tenantAdmin = new User();
@@ -92,13 +97,12 @@ public class AuditLogControllerTest extends AbstractControllerTest {
     public void afterTest() throws Exception {
         loginSysAdmin();
 
-        doDelete("/api/tenant/" + savedTenant.getId().getId().toString())
-                .andExpect(status().isOk());
+        deleteTenant(savedTenant.getId());
     }
 
     @Test
     public void testAuditLogs() throws Exception {
-        for (int i = 0; i < 178; i++) {
+        for (int i = 0; i < 11; i++) {
             Device device = new Device();
             device.setName("Device" + i);
             device.setType("default");
@@ -106,7 +110,7 @@ public class AuditLogControllerTest extends AbstractControllerTest {
         }
 
         List<AuditLog> loadedAuditLogs = new ArrayList<>();
-        TimePageLink pageLink = new TimePageLink(23);
+        TimePageLink pageLink = new TimePageLink(5);
         PageData<AuditLog> pageData;
         do {
             pageData = doGetTypedWithTimePageLink("/api/audit/logs?",
@@ -118,10 +122,10 @@ public class AuditLogControllerTest extends AbstractControllerTest {
             }
         } while (pageData.hasNext());
 
-        Assert.assertEquals(178, loadedAuditLogs.size());
+        Assert.assertEquals(11, loadedAuditLogs.size());
 
         loadedAuditLogs = new ArrayList<>();
-        pageLink = new TimePageLink(23);
+        pageLink = new TimePageLink(5);
         do {
             pageData = doGetTypedWithTimePageLink("/api/audit/logs/customer/" + ModelConstants.NULL_UUID + "?",
                     new TypeReference<PageData<AuditLog>>() {
@@ -132,10 +136,10 @@ public class AuditLogControllerTest extends AbstractControllerTest {
             }
         } while (pageData.hasNext());
 
-        Assert.assertEquals(178, loadedAuditLogs.size());
+        Assert.assertEquals(11, loadedAuditLogs.size());
 
         loadedAuditLogs = new ArrayList<>();
-        pageLink = new TimePageLink(23);
+        pageLink = new TimePageLink(5);
         do {
             pageData = doGetTypedWithTimePageLink("/api/audit/logs/user/" + tenantAdmin.getId().getId().toString() + "?",
                     new TypeReference<PageData<AuditLog>>() {
@@ -146,7 +150,7 @@ public class AuditLogControllerTest extends AbstractControllerTest {
             }
         } while (pageData.hasNext());
 
-        Assert.assertEquals(178, loadedAuditLogs.size());
+        Assert.assertEquals(11, loadedAuditLogs.size());
     }
 
     @Test
@@ -155,13 +159,13 @@ public class AuditLogControllerTest extends AbstractControllerTest {
         device.setName("Device name");
         device.setType("default");
         Device savedDevice = doPost("/api/device", device, Device.class);
-        for (int i = 0; i < 178; i++) {
+        for (int i = 0; i < 11; i++) {
             savedDevice.setName("Device name" + i);
             doPost("/api/device", savedDevice, Device.class);
         }
 
         List<AuditLog> loadedAuditLogs = new ArrayList<>();
-        TimePageLink pageLink = new TimePageLink(23);
+        TimePageLink pageLink = new TimePageLink(5);
         PageData<AuditLog> pageData;
         do {
             pageData = doGetTypedWithTimePageLink("/api/audit/logs/entity/DEVICE/" + savedDevice.getId().getId() + "?",
@@ -173,54 +177,62 @@ public class AuditLogControllerTest extends AbstractControllerTest {
             }
         } while (pageData.hasNext());
 
-        Assert.assertEquals(179, loadedAuditLogs.size());
+        Assert.assertEquals(11 + 1, loadedAuditLogs.size());
     }
 
     @Test
-    public void whenSavingNewAuditLog_thenCheckAndCreatePartitionIfNotExists() {
+    public void whenSavingNewAuditLog_thenCheckAndCreatePartitionIfNotExists() throws ParseException {
+        long entityTs = ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2024-01-01T01:43:11Z").getTime();
         reset(partitioningRepository);
-        AuditLog auditLog = createAuditLog(ActionType.LOGIN, tenantAdminUserId);
+        AuditLog auditLog = createAuditLog(ActionType.LOGIN, tenantAdminUserId, entityTs);
         verify(partitioningRepository).createPartitionIfNotExists(eq("audit_log"), eq(auditLog.getCreatedTime()), eq(partitionDurationInMs));
 
         List<Long> partitions = partitioningRepository.fetchPartitions("audit_log");
-        assertThat(partitions).singleElement().satisfies(partitionStartTs -> {
-            assertThat(partitionStartTs).isEqualTo(partitioningRepository.calculatePartitionStartTime(auditLog.getCreatedTime(), partitionDurationInMs));
-        });
+        assertThat(partitions).contains(partitioningRepository.calculatePartitionStartTime(auditLog.getCreatedTime(), partitionDurationInMs));
     }
 
     @Test
-    public void whenCleaningUpAuditLogsByTtl_thenDropOldPartitions() {
-        long oldAuditLogTs = LocalDate.of(2020, 10, 1).atStartOfDay().toInstant(ZoneOffset.UTC).toEpochMilli();
-        long partitionStartTs = partitioningRepository.calculatePartitionStartTime(oldAuditLogTs, partitionDurationInMs);
+    public void whenCleaningUpAuditLogsByTtl_thenDropOldPartitions() throws ParseException {
+
+        final long oldAuditLogTs = ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2020-10-01T00:00:00Z").getTime();
+        final long currentTimeMillis = oldAuditLogTs + TimeUnit.SECONDS.toMillis(auditLogsTtlInSec) * 2;
+
+        final long partitionStartTs = partitioningRepository.calculatePartitionStartTime(oldAuditLogTs, partitionDurationInMs);
         partitioningRepository.createPartitionIfNotExists("audit_log", oldAuditLogTs, partitionDurationInMs);
         List<Long> partitions = partitioningRepository.fetchPartitions("audit_log");
         assertThat(partitions).contains(partitionStartTs);
 
+        willReturn(currentTimeMillis).given(auditLogsCleanUpService).getCurrentTimeMillis();
         auditLogsCleanUpService.cleanUp();
+
         partitions = partitioningRepository.fetchPartitions("audit_log");
-        assertThat(partitions).doesNotContain(partitionStartTs);
-        assertThat(partitions).allSatisfy(partitionsStart -> {
+        assertThat(partitions).as("partitions cleared").doesNotContain(partitionStartTs);
+        assertThat(partitions).as("only newer partitions left").allSatisfy(partitionsStart -> {
             long partitionEndTs = partitionsStart + partitionDurationInMs;
-            assertThat(partitionEndTs).isGreaterThan(System.currentTimeMillis() - TimeUnit.SECONDS.toMillis(auditLogsTtlInSec));
+            assertThat(partitionEndTs).isGreaterThan(currentTimeMillis - TimeUnit.SECONDS.toMillis(auditLogsTtlInSec));
         });
     }
 
     @Test
     public void whenSavingAuditLogAndPartitionSaveErrorOccurred_thenSaveAuditLogAnyway() throws Exception {
         // creating partition bigger than sql.audit_logs.partition_size
-        partitioningRepository.createPartitionIfNotExists("audit_log", System.currentTimeMillis(), TimeUnit.DAYS.toMillis(7));
+        long entityTs = ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-04-29T07:43:11Z").getTime();
+        //the partition 7 days is overlapping default partition size 1 day, use in the far past to not affect other tests
+        partitioningRepository.createPartitionIfNotExists("audit_log", entityTs, TimeUnit.DAYS.toMillis(7));
         List<Long> partitions = partitioningRepository.fetchPartitions("audit_log");
-        assertThat(partitions).size().isOne();
-        partitioningRepository.cleanupPartitionsCache("audit_log", System.currentTimeMillis(), 0);
+        log.warn("entityTs [{}], fetched partitions {}", entityTs, partitions);
+        assertThat(partitions).contains(ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-04-28T00:00:00Z").getTime());
+        partitioningRepository.cleanupPartitionsCache("audit_log", entityTs, 0);
 
         assertDoesNotThrow(() -> {
             // expecting partition overlap error on partition save
-            createAuditLog(ActionType.LOGIN, tenantAdminUserId);
+            createAuditLog(ActionType.LOGIN, tenantAdminUserId, entityTs);
         });
-        assertThat(partitioningRepository.fetchPartitions("audit_log")).isEqualTo(partitions);
+        assertThat(partitioningRepository.fetchPartitions("audit_log"))
+                .contains(ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-04-28T00:00:00Z").getTime());;
     }
 
-    private AuditLog createAuditLog(ActionType actionType, EntityId entityId) {
+    private AuditLog createAuditLog(ActionType actionType, EntityId entityId, long entityTs) {
         AuditLog auditLog = new AuditLog();
         auditLog.setTenantId(tenantId);
         auditLog.setCustomerId(null);
@@ -228,6 +240,13 @@ public class AuditLogControllerTest extends AbstractControllerTest {
         auditLog.setEntityId(entityId);
         auditLog.setUserName(tenantAdmin.getEmail());
         auditLog.setActionType(actionType);
+
+        if (entityTs > 0) {
+            UUID uuid = Uuids.startOf(entityTs);
+            auditLog.setId(new AuditLogId(uuid));
+            auditLog.setCreatedTime(Uuids.unixTimestamp(uuid));
+        }
+
         return auditLogDao.save(tenantId, auditLog);
     }
 
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/ComponentDescriptorControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/ComponentDescriptorControllerTest.java
index dd9eea7ea3..bfaecc803e 100644
--- a/application/src/test/java/org/thingsboard/server/controller/ComponentDescriptorControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/ComponentDescriptorControllerTest.java
@@ -47,7 +47,7 @@ public class ComponentDescriptorControllerTest extends AbstractControllerTest {
 
         Tenant tenant = new Tenant();
         tenant.setTitle("My tenant");
-        savedTenant = doPost("/api/tenant", tenant, Tenant.class);
+        savedTenant = saveTenant(tenant);
         Assert.assertNotNull(savedTenant);
 
         tenantAdmin = new User();
@@ -64,8 +64,7 @@ public class ComponentDescriptorControllerTest extends AbstractControllerTest {
     public void afterTest() throws Exception {
         loginSysAdmin();
 
-        doDelete("/api/tenant/" + savedTenant.getId().getId().toString())
-                .andExpect(status().isOk());
+        deleteTenant(savedTenant.getId());
     }
 
     @Test
diff --git a/application/src/test/java/org/thingsboard/server/controller/CustomerControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/CustomerControllerTest.java
index 370ba41422..f431f9ac57 100644
--- a/application/src/test/java/org/thingsboard/server/controller/CustomerControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/CustomerControllerTest.java
@@ -85,7 +85,7 @@ public class CustomerControllerTest extends AbstractControllerTest {
 
         Tenant tenant = new Tenant();
         tenant.setTitle("My tenant");
-        savedTenant = doPost("/api/tenant", tenant, Tenant.class);
+        savedTenant = saveTenant(tenant);
         Assert.assertNotNull(savedTenant);
 
         tenantAdmin = new User();
@@ -104,8 +104,7 @@ public class CustomerControllerTest extends AbstractControllerTest {
 
         loginSysAdmin();
 
-        doDelete("/api/tenant/" + savedTenant.getId().getId().toString())
-                .andExpect(status().isOk());
+        deleteTenant(savedTenant.getId());
     }
 
     @Test
@@ -154,7 +153,7 @@ public class CustomerControllerTest extends AbstractControllerTest {
                 .andExpect(statusReason(containsString(msgError)));
 
         customer.setTenantId(savedTenant.getId());
-        testNotifyEntityEqualsOneTimeServiceNeverError(customer,savedTenant.getId(),
+        testNotifyEntityEqualsOneTimeServiceNeverError(customer, savedTenant.getId(),
                 tenantAdmin.getId(), tenantAdmin.getEmail(), ActionType.ADDED, new DataValidationException(msgError));
         Mockito.reset(tbClusterService, auditLogService);
 
@@ -165,7 +164,7 @@ public class CustomerControllerTest extends AbstractControllerTest {
                 .andExpect(status().isBadRequest())
                 .andExpect(statusReason(containsString(msgError)));
 
-        testNotifyEntityEqualsOneTimeServiceNeverError(customer,savedTenant.getId(),
+        testNotifyEntityEqualsOneTimeServiceNeverError(customer, savedTenant.getId(),
                 tenantAdmin.getId(), tenantAdmin.getEmail(), ActionType.ADDED, new DataValidationException(msgError));
         Mockito.reset(tbClusterService, auditLogService);
 
@@ -176,7 +175,7 @@ public class CustomerControllerTest extends AbstractControllerTest {
                 .andExpect(status().isBadRequest())
                 .andExpect(statusReason(containsString(msgError)));
 
-        testNotifyEntityEqualsOneTimeServiceNeverError(customer,savedTenant.getId(),
+        testNotifyEntityEqualsOneTimeServiceNeverError(customer, savedTenant.getId(),
                 tenantAdmin.getId(), tenantAdmin.getEmail(), ActionType.ADDED, new DataValidationException(msgError));
         Mockito.reset(tbClusterService, auditLogService);
 
@@ -187,7 +186,7 @@ public class CustomerControllerTest extends AbstractControllerTest {
                 .andExpect(status().isBadRequest())
                 .andExpect(statusReason(containsString(msgError)));
 
-        testNotifyEntityEqualsOneTimeServiceNeverError(customer,savedTenant.getId(),
+        testNotifyEntityEqualsOneTimeServiceNeverError(customer, savedTenant.getId(),
                 tenantAdmin.getId(), tenantAdmin.getEmail(), ActionType.ADDED, new DataValidationException(msgError));
         Mockito.reset(tbClusterService, auditLogService);
 
@@ -198,7 +197,7 @@ public class CustomerControllerTest extends AbstractControllerTest {
                 .andExpect(status().isBadRequest())
                 .andExpect(statusReason(containsString(msgError)));
 
-        testNotifyEntityEqualsOneTimeServiceNeverError(customer,savedTenant.getId(),
+        testNotifyEntityEqualsOneTimeServiceNeverError(customer, savedTenant.getId(),
                 tenantAdmin.getId(), tenantAdmin.getEmail(), ActionType.ADDED, new DataValidationException(msgError));
         Mockito.reset(tbClusterService, auditLogService);
 
@@ -209,7 +208,7 @@ public class CustomerControllerTest extends AbstractControllerTest {
                 .andExpect(status().isBadRequest())
                 .andExpect(statusReason(containsString(msgError)));
 
-        testNotifyEntityEqualsOneTimeServiceNeverError(customer,savedTenant.getId(),
+        testNotifyEntityEqualsOneTimeServiceNeverError(customer, savedTenant.getId(),
                 tenantAdmin.getId(), tenantAdmin.getEmail(), ActionType.ADDED, new DataValidationException(msgError));
     }
 
@@ -293,7 +292,7 @@ public class CustomerControllerTest extends AbstractControllerTest {
                 .andExpect(status().isBadRequest())
                 .andExpect(statusReason(containsString(msgError)));
 
-        testNotifyEntityEqualsOneTimeServiceNeverError(customer,savedTenant.getId(),
+        testNotifyEntityEqualsOneTimeServiceNeverError(customer, savedTenant.getId(),
                 tenantAdmin.getId(), tenantAdmin.getEmail(), ActionType.ADDED, new DataValidationException(msgError));
     }
 
diff --git a/application/src/test/java/org/thingsboard/server/controller/DashboardControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/DashboardControllerTest.java
index 71c758c1e1..7e1b9b30c9 100644
--- a/application/src/test/java/org/thingsboard/server/controller/DashboardControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/DashboardControllerTest.java
@@ -77,7 +77,7 @@ public class DashboardControllerTest extends AbstractControllerTest {
 
         Tenant tenant = new Tenant();
         tenant.setTitle("My tenant");
-        savedTenant = doPost("/api/tenant", tenant, Tenant.class);
+        savedTenant = saveTenant(tenant);
         Assert.assertNotNull(savedTenant);
 
         tenantAdmin = new User();
@@ -94,8 +94,7 @@ public class DashboardControllerTest extends AbstractControllerTest {
     public void afterTest() throws Exception {
         loginSysAdmin();
 
-        doDelete("/api/tenant/" + savedTenant.getId().getId().toString())
-                .andExpect(status().isOk());
+        deleteTenant(savedTenant.getId());
     }
 
     @Test
@@ -166,7 +165,7 @@ public class DashboardControllerTest extends AbstractControllerTest {
     @Test
     public void testSaveDashboardWithEmptyTitle() throws Exception {
         Dashboard dashboard = new Dashboard();
-        String msgError = "Dashboard title " + msgErrorShouldBeSpecified;;
+        String msgError = "Dashboard title " + msgErrorShouldBeSpecified;
 
         Mockito.reset(tbClusterService, auditLogService);
 
@@ -196,7 +195,7 @@ public class DashboardControllerTest extends AbstractControllerTest {
         Assert.assertTrue(assignedDashboard.getAssignedCustomers().contains(savedCustomer.toShortCustomerInfo()));
 
         testNotifyEntityAllOneTimeLogEntityActionEntityEqClass(assignedDashboard, assignedDashboard.getId(), assignedDashboard.getId(),
-                savedTenant.getId(),  savedCustomer.getId(), tenantAdmin.getId(), tenantAdmin.getEmail(), ActionType.ASSIGNED_TO_CUSTOMER,
+                savedTenant.getId(), savedCustomer.getId(), tenantAdmin.getId(), tenantAdmin.getEmail(), ActionType.ASSIGNED_TO_CUSTOMER,
                 ActionType.UPDATED, assignedDashboard.getId().getId().toString(), savedCustomer.getId().getId().toString(), savedCustomer.getTitle());
 
         Dashboard foundDashboard = doGet("/api/dashboard/" + savedDashboard.getId().getId().toString(), Dashboard.class);
@@ -239,8 +238,8 @@ public class DashboardControllerTest extends AbstractControllerTest {
         Assert.assertTrue(publicCustomer.isPublic());
 
         testNotifyEntityAllOneTimeLogEntityActionEntityEqClass(assignedDashboard, assignedDashboard.getId(), assignedDashboard.getId(),
-                savedTenant.getId(),  publicCustomer.getId(), tenantAdmin.getId(), tenantAdmin.getEmail(), ActionType.ASSIGNED_TO_CUSTOMER,
-                ActionType.UPDATED, assignedDashboard .getId().getId().toString(), publicCustomer.getId().getId().toString(), publicCustomer.getTitle());
+                savedTenant.getId(), publicCustomer.getId(), tenantAdmin.getId(), tenantAdmin.getEmail(), ActionType.ASSIGNED_TO_CUSTOMER,
+                ActionType.UPDATED, assignedDashboard.getId().getId().toString(), publicCustomer.getId().getId().toString(), publicCustomer.getTitle());
 
         Dashboard foundDashboard = doGet("/api/dashboard/" + savedDashboard.getId().getId().toString(), Dashboard.class);
         Assert.assertTrue(foundDashboard.getAssignedCustomers().contains(publicCustomer.toShortCustomerInfo()));
@@ -283,7 +282,7 @@ public class DashboardControllerTest extends AbstractControllerTest {
 
         Tenant tenant2 = new Tenant();
         tenant2.setTitle("Different tenant");
-        Tenant savedTenant2 = doPost("/api/tenant", tenant2, Tenant.class);
+        Tenant savedTenant2 = saveTenant(tenant2);
         Assert.assertNotNull(savedTenant2);
 
         User tenantAdmin2 = new User();
@@ -321,8 +320,7 @@ public class DashboardControllerTest extends AbstractControllerTest {
 
         loginSysAdmin();
 
-        doDelete("/api/tenant/" + savedTenant2.getId().getId().toString())
-                .andExpect(status().isOk());
+        deleteTenant(savedTenant2.getId());
     }
 
     @Test
@@ -482,7 +480,7 @@ public class DashboardControllerTest extends AbstractControllerTest {
 
         testNotifyManyEntityManyTimeMsgToEdgeServiceEntityEqAny(new Dashboard(), new Dashboard(),
                 savedTenant.getId(), tenantAdmin.getCustomerId(), tenantAdmin.getId(), tenantAdmin.getEmail(),
-                ActionType.ADDED, cntEntity, cntEntity, cntEntity*2);
+                ActionType.ADDED, cntEntity, cntEntity, cntEntity * 2);
 
         List<DashboardInfo> loadedDashboards = new ArrayList<>();
         PageLink pageLink = new PageLink(21);
diff --git a/application/src/test/java/org/thingsboard/server/controller/DeviceConnectivityControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/DeviceConnectivityControllerTest.java
index 8a67fcf396..38e537340f 100644
--- a/application/src/test/java/org/thingsboard/server/controller/DeviceConnectivityControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/DeviceConnectivityControllerTest.java
@@ -142,7 +142,7 @@ public class DeviceConnectivityControllerTest extends AbstractControllerTest {
 
         Tenant tenant = new Tenant();
         tenant.setTitle("My tenant");
-        savedTenant = doPost("/api/tenant", tenant, Tenant.class);
+        savedTenant = saveTenant(tenant);
         Assert.assertNotNull(savedTenant);
 
         tenantAdmin = new User();
@@ -187,8 +187,7 @@ public class DeviceConnectivityControllerTest extends AbstractControllerTest {
     public void afterTest() throws Exception {
         loginSysAdmin();
 
-        doDelete("/api/tenant/" + savedTenant.getId().getId())
-                .andExpect(status().isOk());
+        deleteTenant(savedTenant.getId());
     }
 
     @Test
diff --git a/application/src/test/java/org/thingsboard/server/controller/DeviceControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/DeviceControllerTest.java
index e59595e9c7..512dd434dc 100644
--- a/application/src/test/java/org/thingsboard/server/controller/DeviceControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/DeviceControllerTest.java
@@ -84,6 +84,7 @@ import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
 import static org.hamcrest.Matchers.containsString;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.never;
@@ -132,7 +133,7 @@ public class DeviceControllerTest extends AbstractControllerTest {
 
         Tenant tenant = new Tenant();
         tenant.setTitle("My tenant");
-        savedTenant = doPost("/api/tenant", tenant, Tenant.class);
+        savedTenant = saveTenant(tenant);
         Assert.assertNotNull(savedTenant);
 
         tenantAdmin = new User();
@@ -151,8 +152,7 @@ public class DeviceControllerTest extends AbstractControllerTest {
 
         loginSysAdmin();
 
-        doDelete("/api/tenant/" + savedTenant.getId().getId())
-                .andExpect(status().isOk());
+        deleteTenant(savedTenant.getId());
     }
 
     @Test
@@ -687,7 +687,7 @@ public class DeviceControllerTest extends AbstractControllerTest {
 
         Tenant tenant2 = new Tenant();
         tenant2.setTitle("Different tenant");
-        Tenant savedTenant2 = doPost("/api/tenant", tenant2, Tenant.class);
+        Tenant savedTenant2 = saveTenant(tenant2);
         Assert.assertNotNull(savedTenant2);
 
         User tenantAdmin2 = new User();
@@ -721,9 +721,7 @@ public class DeviceControllerTest extends AbstractControllerTest {
         testNotificationUpdateGatewayNever();
 
         loginSysAdmin();
-
-        doDelete("/api/tenant/" + savedTenant2.getId().getId())
-                .andExpect(status().isOk());
+        deleteTenant(savedTenant2.getId());
     }
 
     @Test
@@ -914,7 +912,7 @@ public class DeviceControllerTest extends AbstractControllerTest {
 
         testNotifyManyEntityManyTimeMsgToEdgeServiceEntityEqAnyAdditionalInfoAny(new Device(), new Device(),
                 savedTenant.getId(), tenantAdmin.getCustomerId(), tenantAdmin.getId(), tenantAdmin.getEmail(),
-                ActionType.DELETED, ActionType.DELETED, cntEntity, cntEntity,1);
+                ActionType.DELETED, ActionType.DELETED, cntEntity, cntEntity, 1);
         testNotificationUpdateGatewayNever();
     }
 
@@ -1319,7 +1317,7 @@ public class DeviceControllerTest extends AbstractControllerTest {
         loginSysAdmin();
         Tenant tenant = new Tenant();
         tenant.setTitle("Different tenant");
-        Tenant savedDifferentTenant = doPost("/api/tenant", tenant, Tenant.class);
+        Tenant savedDifferentTenant = saveTenant(tenant);
         Assert.assertNotNull(savedDifferentTenant);
 
         User user = new User();
@@ -1380,8 +1378,7 @@ public class DeviceControllerTest extends AbstractControllerTest {
                 .andExpect(statusReason(containsString(msgErrorNoFound("Device", savedAnotherDevice.getId().getId().toString()))));
 
         loginSysAdmin();
-        doDelete("/api/tenant/" + savedDifferentTenant.getId().getId())
-                .andExpect(status().isOk());
+        deleteTenant(savedDifferentTenant.getId());
     }
 
     @Test
@@ -1545,17 +1542,24 @@ public class DeviceControllerTest extends AbstractControllerTest {
         Device savedDevice = doGet("/api/tenant/devices?deviceName=" + deviceName, Device.class);
 
         //check server attribute value
-        List<Map<String, Object>> values = doGetAsyncTyped("/api/plugins/telemetry/DEVICE/" + savedDevice.getId() +
-                "/values/attributes/SERVER_SCOPE", new TypeReference<>() {
+        await().atMost(TIMEOUT, TimeUnit.SECONDS).untilAsserted(() -> {
+            Map<String, Object> actualAttribute = doGetAsyncTyped("/api/plugins/telemetry/DEVICE/" + savedDevice.getId() +
+                    "/values/attributes/SERVER_SCOPE", new TypeReference<List<Map<String, Object>>>() {}).stream()
+                    .filter(att -> att.get("key").equals("DATA")).findFirst().get();
+            Assert.assertEquals(attributeValue, actualAttribute.get("value"));
         });
-        Map<String, Object> serverAttribute = values.stream().filter(att -> att.get("key").equals("DATA")).findFirst().get();
-        Assert.assertEquals(attributeValue, serverAttribute.get("value"));
 
         //update server attribute value
         String newAttributeValue = "testValue2";
         JsonNode content = JacksonUtil.toJsonNode("{\"DATA\": \"" + newAttributeValue + "\"}");
         doPost("/api/plugins/telemetry/" + EntityType.DEVICE.name() + "/" + savedDevice.getUuidId() + "/SERVER_SCOPE", content)
                 .andExpect(status().isOk());
+        await().atMost(TIMEOUT, TimeUnit.SECONDS).untilAsserted(() -> {
+            Map<String, Object> actualAttribute = doGetAsyncTyped("/api/plugins/telemetry/DEVICE/" + savedDevice.getId() +
+                    "/values/attributes/SERVER_SCOPE", new TypeReference<List<Map<String, Object>>>() {}).stream()
+                    .filter(att -> att.get("key").equals("DATA")).findFirst().get();
+            Assert.assertEquals(newAttributeValue, actualAttribute.get("value"));
+        });
 
         //reimport devices
         String deviceName2 = "secondDevice";
@@ -1567,19 +1571,19 @@ public class DeviceControllerTest extends AbstractControllerTest {
         doPostWithTypedResponse("/api/device/bulk_import", request, new TypeReference<>() {});
         Device savedDevice2 = doGet("/api/tenant/devices?deviceName=" + deviceName2, Device.class);
 
-        //check attribute value was not changed after reimport
-        List<Map<String, Object>> values2 = doGetAsyncTyped("/api/plugins/telemetry/DEVICE/" + savedDevice.getId() +
-                "/values/attributes/SERVER_SCOPE", new TypeReference<>() {
-        });
-        Map<String, Object> retrievedServerAttribute2 = values2.stream().filter(att -> att.get("key").equals("DATA")).findFirst().get();
-        Assert.assertEquals(newAttributeValue, retrievedServerAttribute2.get("value"));
-
         //check attribute for second device
-        List<Map<String, Object>> values3 = doGetAsyncTyped("/api/plugins/telemetry/DEVICE/" + savedDevice2.getId() +
-                "/values/attributes/SERVER_SCOPE", new TypeReference<>() {
+        await().atMost(TIMEOUT, TimeUnit.SECONDS).untilAsserted(() -> {
+            Map<String, Object> actualAttribute = doGetAsyncTyped("/api/plugins/telemetry/DEVICE/" + savedDevice2.getId() +
+                    "/values/attributes/SERVER_SCOPE", new TypeReference<List<Map<String, Object>>>() {}).stream()
+                    .filter(att -> att.get("key").equals("DATA")).findFirst().get();
+            Assert.assertEquals(attributeValue2, actualAttribute.get("value"));
         });
-        Map<String, Object> retrievedServerAttribute3 = values3.stream().filter(att -> att.get("key").equals("DATA")).findFirst().get();
-        Assert.assertEquals(attributeValue2, retrievedServerAttribute3.get("value"));
+
+        //check attribute value was not changed after reimport
+        Map<String, Object> actualAttribute = doGetAsyncTyped("/api/plugins/telemetry/DEVICE/" + savedDevice.getId() +
+                "/values/attributes/SERVER_SCOPE", new TypeReference<List<Map<String, Object>>>() {}).stream()
+                .filter(att -> att.get("key").equals("DATA")).findFirst().get();
+        Assert.assertEquals(newAttributeValue, actualAttribute.get("value"));
     }
 
     private Device createDevice(String name) {
diff --git a/application/src/test/java/org/thingsboard/server/controller/DeviceProfileControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/DeviceProfileControllerTest.java
index 4a93e9c0ac..b549d2af2a 100644
--- a/application/src/test/java/org/thingsboard/server/controller/DeviceProfileControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/DeviceProfileControllerTest.java
@@ -93,7 +93,7 @@ public class DeviceProfileControllerTest extends AbstractControllerTest {
 
         Tenant tenant = new Tenant();
         tenant.setTitle("My tenant");
-        savedTenant = doPost("/api/tenant", tenant, Tenant.class);
+        savedTenant = saveTenant(tenant);
         Assert.assertNotNull(savedTenant);
 
         tenantAdmin = new User();
@@ -110,8 +110,7 @@ public class DeviceProfileControllerTest extends AbstractControllerTest {
     public void afterTest() throws Exception {
         loginSysAdmin();
 
-        doDelete("/api/tenant/" + savedTenant.getId().getId().toString())
-                .andExpect(status().isOk());
+        deleteTenant(savedTenant.getId());
     }
 
     @Test
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 9b4fa3b239..49dfa71223 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;
@@ -157,9 +158,9 @@ public class EdgeControllerTest extends AbstractControllerTest {
         Assert.assertEquals(NULL_UUID, savedEdge.getCustomerId().getId());
         Assert.assertEquals(edge.getName(), savedEdge.getName());
 
-        testNotifyEntityBroadcastEntityStateChangeEventOneTimeMsgToEdgeServiceNever(savedEdge, savedEdge.getId(), savedEdge.getId(),
+        testNotifyEntityBroadcastEntityStateChangeEventManyTimeMsgToEdgeServiceNever(savedEdge, savedEdge.getId(), savedEdge.getId(),
                 tenantId, tenantAdminUser.getCustomerId(), tenantAdminUser.getId(), tenantAdminUser.getEmail(),
-                ActionType.ADDED);
+                ActionType.ADDED, 2);
 
         savedEdge.setName("My new edge");
         doPost("/api/edge", savedEdge, Edge.class);
@@ -167,9 +168,9 @@ public class EdgeControllerTest extends AbstractControllerTest {
         Edge foundEdge = doGet("/api/edge/" + savedEdge.getId().getId().toString(), Edge.class);
         Assert.assertEquals(foundEdge.getName(), savedEdge.getName());
 
-        testNotifyEntityBroadcastEntityStateChangeEventOneTimeMsgToEdgeServiceNever(foundEdge, foundEdge.getId(), foundEdge.getId(),
+        testNotifyEntityBroadcastEntityStateChangeEventManyTimeMsgToEdgeServiceNever(foundEdge, foundEdge.getId(), foundEdge.getId(),
                 tenantId, tenantAdminUser.getCustomerId(), tenantAdminUser.getId(), tenantAdminUser.getEmail(),
-                ActionType.UPDATED);
+                ActionType.UPDATED, 1);
     }
 
     @Test
@@ -262,9 +263,9 @@ public class EdgeControllerTest extends AbstractControllerTest {
         doDelete("/api/edge/" + savedEdge.getId().getId().toString())
                 .andExpect(status().isOk());
 
-        testNotifyEntityBroadcastEntityStateChangeEventOneTimeMsgToEdgeServiceNever(savedEdge, savedEdge.getId(), savedEdge.getId(),
+        testNotifyEntityBroadcastEntityStateChangeEventManyTimeMsgToEdgeServiceNever(savedEdge, savedEdge.getId(), savedEdge.getId(),
                 tenantId, tenantAdminUser.getCustomerId(), tenantAdminUser.getId(), tenantAdminUser.getEmail(),
-                ActionType.DELETED, savedEdge.getId().getId().toString());
+                ActionType.DELETED, 1, savedEdge.getId().getId().toString());
 
         doGet("/api/edge/" + savedEdge.getId().getId().toString())
                 .andExpect(status().isNotFound())
@@ -360,7 +361,7 @@ public class EdgeControllerTest extends AbstractControllerTest {
 
         Tenant tenant2 = new Tenant();
         tenant2.setTitle("Different tenant");
-        Tenant savedTenant2 = doPost("/api/tenant", tenant2, Tenant.class);
+        Tenant savedTenant2 = saveTenant(tenant2);
         Assert.assertNotNull(savedTenant2);
 
         User tenantAdmin2 = new User();
@@ -393,8 +394,7 @@ public class EdgeControllerTest extends AbstractControllerTest {
 
         loginSysAdmin();
 
-        doDelete("/api/tenant/" + savedTenant2.getId().getId().toString())
-                .andExpect(status().isOk());
+        deleteTenant(savedTenant2.getId());
     }
 
     @Test
@@ -631,7 +631,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 +885,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 +974,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 +988,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 +1004,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 +1018,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 +1033,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 +1048,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 +1063,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 +1078,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 +1094,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 +1109,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 +1124,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 +1226,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/EdgeEventControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/EdgeEventControllerTest.java
index cc5e5d5057..a87ab737e8 100644
--- a/application/src/test/java/org/thingsboard/server/controller/EdgeEventControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/EdgeEventControllerTest.java
@@ -28,7 +28,7 @@ import org.springframework.beans.factory.annotation.Value;
 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.DataConstants;
+import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.asset.Asset;
 import org.thingsboard.server.common.data.edge.Edge;
@@ -39,6 +39,7 @@ import org.thingsboard.server.common.data.id.EdgeId;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.TimePageLink;
 import org.thingsboard.server.common.data.relation.EntityRelation;
+import org.thingsboard.server.common.data.rule.RuleChain;
 import org.thingsboard.server.dao.edge.EdgeEventDao;
 import org.thingsboard.server.dao.service.DaoSqlTest;
 import org.thingsboard.server.dao.sqlts.insert.sql.SqlPartitioningRepository;
@@ -89,21 +90,22 @@ public class EdgeEventControllerTest extends AbstractControllerTest {
         Edge edge = constructEdge("TestEdge", "default");
         edge = doPost("/api/edge", edge, Edge.class);
 
+        final EdgeId edgeId = edge.getId();
+
+        awaitForEdgeTemplateRootRuleChainToAssignToEdge(edgeId);
+
         // simulate edge activation
         ObjectNode attributes = JacksonUtil.newObjectNode();
         attributes.put("active", true);
-        doPost("/api/plugins/telemetry/EDGE/" + edge.getId() + "/attributes/" + DataConstants.SERVER_SCOPE, attributes);
+        doPost("/api/plugins/telemetry/EDGE/" + edge.getId() + "/attributes/" + AttributeScope.SERVER_SCOPE, attributes);
 
         Device device = constructDevice("TestDevice", "default");
         Device savedDevice = doPost("/api/device", device, Device.class);
-
-        final EdgeId edgeId = edge.getId();
-        doPost("/api/edge/" + edgeId.toString() + "/device/" + savedDevice.getId().toString(), Device.class);
+        doPost("/api/edge/" + edgeId + "/device/" + savedDevice.getId(), Device.class);
 
         Asset asset = constructAsset("TestAsset", "default");
         Asset savedAsset = doPost("/api/asset", asset, Asset.class);
-
-        doPost("/api/edge/" + edgeId.toString() + "/asset/" + savedAsset.getId().toString(), Asset.class);
+        doPost("/api/edge/" + edgeId + "/asset/" + savedAsset.getId(), Asset.class);
 
         EntityRelation relation = new EntityRelation(savedAsset.getId(), savedDevice.getId(), EntityRelation.CONTAINS_TYPE);
 
@@ -114,31 +116,12 @@ public class EdgeEventControllerTest extends AbstractControllerTest {
         awaitForNumberOfEdgeEvents(edgeId, 3);
 
         List<EdgeEvent> edgeEvents = findEdgeEvents(edgeId);
-        Assert.assertTrue(popEdgeEvent(edgeEvents, EdgeEventType.DEVICE)); // TestDevice
-        Assert.assertTrue(popEdgeEvent(edgeEvents, EdgeEventType.ASSET)); // TestAsset
+        Assert.assertTrue(popEdgeEvent(edgeEvents, EdgeEventType.DEVICE));
+        Assert.assertTrue(popEdgeEvent(edgeEvents, EdgeEventType.ASSET));
         Assert.assertTrue(popEdgeEvent(edgeEvents, EdgeEventType.RELATION));
         Assert.assertTrue(edgeEvents.isEmpty());
     }
 
-    private boolean popEdgeEvent(List<EdgeEvent> edgeEvents, EdgeEventType edgeEventType) {
-        for (EdgeEvent edgeEvent : edgeEvents) {
-            if (edgeEventType.equals(edgeEvent.getType())) {
-                edgeEvents.remove(edgeEvent);
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private void awaitForNumberOfEdgeEvents(EdgeId edgeId, int expectedNumber) {
-        Awaitility.await()
-                .atMost(30, TimeUnit.SECONDS)
-                .until(() -> {
-                    List<EdgeEvent> edgeEvents = findEdgeEvents(edgeId);
-                    return edgeEvents.size() == expectedNumber;
-                });
-    }
-
     @Test
     public void saveEdgeEvent_thenCreatePartitionIfNotExist() {
         reset(partitioningRepository);
@@ -167,12 +150,46 @@ public class EdgeEventControllerTest extends AbstractControllerTest {
         });
     }
 
+    private boolean popEdgeEvent(List<EdgeEvent> edgeEvents, EdgeEventType edgeEventType) {
+        for (EdgeEvent edgeEvent : edgeEvents) {
+            if (edgeEventType.equals(edgeEvent.getType())) {
+                edgeEvents.remove(edgeEvent);
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private void awaitForNumberOfEdgeEvents(EdgeId edgeId, int expectedNumber) {
+        Awaitility.await()
+                .atMost(TIMEOUT, TimeUnit.SECONDS)
+                .until(() -> {
+                    List<EdgeEvent> edgeEvents = findEdgeEvents(edgeId);
+                    return edgeEvents.size() == expectedNumber;
+                });
+    }
+
     private List<EdgeEvent> findEdgeEvents(EdgeId edgeId) throws Exception {
-        return doGetTypedWithTimePageLink("/api/edge/" + edgeId.toString() + "/events?",
+        return doGetTypedWithTimePageLink("/api/edge/" + edgeId + "/events?",
                 new TypeReference<PageData<EdgeEvent>>() {
                 }, new TimePageLink(10)).getData();
     }
 
+    private void awaitForEdgeTemplateRootRuleChainToAssignToEdge(EdgeId edgeId) {
+        Awaitility.await()
+                .atMost(TIMEOUT, TimeUnit.SECONDS)
+                .until(() -> {
+                    List<RuleChain> ruleChains = getEdgeRuleChains(edgeId);
+                    return ruleChains.size() == 1;
+                });
+    }
+
+    private List<RuleChain> getEdgeRuleChains(EdgeId edgeId) throws Exception {
+        return doGetTypedWithTimePageLink("/api/edge/" + edgeId + "/ruleChains?",
+                new TypeReference<PageData<RuleChain>>() {
+                }, new TimePageLink(10)).getData();
+    }
+
     private Device constructDevice(String name, String type) {
         Device device = new Device();
         device.setName(name);
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..8303d8b9fb 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;
@@ -50,11 +52,15 @@ import org.thingsboard.server.common.data.query.EntityTypeFilter;
 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.StringFilterPredicate;
 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,13 +75,16 @@ public class EntityQueryControllerTest extends AbstractControllerTest {
     private Tenant savedTenant;
     private User tenantAdmin;
 
+    @Autowired
+    private QueueStatsService queueStatsService;
+
     @Before
     public void beforeTest() throws Exception {
         loginSysAdmin();
 
         Tenant tenant = new Tenant();
         tenant.setTitle("My tenant");
-        savedTenant = doPost("/api/tenant", tenant, Tenant.class);
+        savedTenant = saveTenant(tenant);
         Assert.assertNotNull(savedTenant);
 
         tenantAdmin = new User();
@@ -91,9 +100,7 @@ public class EntityQueryControllerTest extends AbstractControllerTest {
     @After
     public void afterTest() throws Exception {
         loginSysAdmin();
-
-        doDelete("/api/tenant/" + savedTenant.getId().getId().toString())
-                .andExpect(status().isOk());
+        deleteTenant(savedTenant.getId());
     }
 
     @Test
@@ -593,4 +600,209 @@ 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());
+    }
+
+    @Test
+    public void testFindDevicesCountByOwnerNameAndOwnerType() throws Exception {
+        loginTenantAdmin();
+        int numOfDevices = 8;
+
+        for (int i = 0; i < numOfDevices; i++) {
+            Device device = new Device();
+            String name = "Device" + i;
+            device.setName(name);
+            device.setType("default");
+
+            Device savedDevice = doPost("/api/device?accessToken=" + name, device, Device.class);
+            JsonNode content = JacksonUtil.toJsonNode("{\"alarmActiveTime\": 1" + i + "}");
+            doPost("/api/plugins/telemetry/" + EntityType.DEVICE.name() + "/" + savedDevice.getUuidId() + "/SERVER_SCOPE", content)
+                    .andExpect(status().isOk());
+        }
+
+        DeviceTypeFilter filter = new DeviceTypeFilter();
+        filter.setDeviceTypes(List.of("default"));
+        filter.setDeviceNameFilter("");
+
+        KeyFilter activeAlarmTimeFilter = getServerAttributeNumericGreaterThanKeyFilter("alarmActiveTime", 5);
+        KeyFilter activeAlarmTimeToLongFilter = getServerAttributeNumericGreaterThanKeyFilter("alarmActiveTime", 30);
+        KeyFilter tenantOwnerNameFilter = getEntityFieldStringEqualToKeyFilter("ownerName", TEST_TENANT_NAME);
+        KeyFilter wrongOwnerNameFilter = getEntityFieldStringEqualToKeyFilter("ownerName", "wrongName");
+        KeyFilter tenantOwnerTypeFilter =  getEntityFieldStringEqualToKeyFilter("ownerType", "TENANT");
+        KeyFilter customerOwnerTypeFilter = getEntityFieldStringEqualToKeyFilter("ownerType", "CUSTOMER");
+
+        // all devices with ownerName = TEST TENANT
+        EntityCountQuery query = new EntityCountQuery(filter,  List.of(activeAlarmTimeFilter, tenantOwnerNameFilter));
+        checkEntitiesCount(query, numOfDevices);
+
+        // all devices with ownerName = TEST TENANT
+        EntityCountQuery activeAlarmTimeToLongQuery = new EntityCountQuery(filter,  List.of(activeAlarmTimeToLongFilter, tenantOwnerNameFilter));
+        checkEntitiesCount(activeAlarmTimeToLongQuery, 0);
+
+        // all devices with wrong ownerName
+        EntityCountQuery wrongTenantNameQuery = new EntityCountQuery(filter, List.of(activeAlarmTimeFilter, wrongOwnerNameFilter));
+        checkEntitiesCount(wrongTenantNameQuery, 0);
+
+        // all devices with owner type = TENANT
+        EntityCountQuery tenantEntitiesQuery = new EntityCountQuery(filter, List.of(activeAlarmTimeFilter, tenantOwnerTypeFilter));
+        checkEntitiesCount(tenantEntitiesQuery, numOfDevices);
+
+        // all devices with owner type = CUSTOMER
+        EntityCountQuery customerEntitiesQuery = new EntityCountQuery(filter, List.of(activeAlarmTimeFilter, customerOwnerTypeFilter));
+        checkEntitiesCount(customerEntitiesQuery, 0);
+    }
+
+    @Test
+    public void testFindDevicesByOwnerNameAndOwnerType() throws Exception {
+        loginTenantAdmin();
+        int numOfDevices = 3;
+
+        for (int i = 0; i < numOfDevices; i++) {
+            Device device = new Device();
+            String name = "Device" + i;
+            device.setName(name);
+            device.setType("default");
+
+            Device savedDevice = doPost("/api/device?accessToken=" + name, device, Device.class);
+            JsonNode content = JacksonUtil.toJsonNode("{\"alarmActiveTime\": 1" + i + "}");
+            doPost("/api/plugins/telemetry/" + EntityType.DEVICE.name() + "/" + savedDevice.getUuidId() + "/SERVER_SCOPE", content)
+                    .andExpect(status().isOk());
+        }
+
+        DeviceTypeFilter filter = new DeviceTypeFilter();
+        filter.setDeviceTypes(List.of("default"));
+        filter.setDeviceNameFilter("");
+
+        KeyFilter activeAlarmTimeFilter = getServerAttributeNumericGreaterThanKeyFilter("alarmActiveTime", 5);
+        KeyFilter tenantOwnerNameFilter = getEntityFieldStringEqualToKeyFilter("ownerName", TEST_TENANT_NAME);
+        KeyFilter wrongOwnerNameFilter = getEntityFieldStringEqualToKeyFilter("ownerName", "wrongName");
+        KeyFilter tenantOwnerTypeFilter =  getEntityFieldStringEqualToKeyFilter("ownerType", "TENANT");
+        KeyFilter customerOwnerTypeFilter = getEntityFieldStringEqualToKeyFilter("ownerType", "CUSTOMER");
+
+        EntityDataSortOrder sortOrder = new EntityDataSortOrder(
+                new EntityKey(EntityKeyType.ENTITY_FIELD, "createdTime"), EntityDataSortOrder.Direction.ASC
+        );
+        EntityDataPageLink pageLink = new EntityDataPageLink(10, 0, null, sortOrder);
+        List<EntityKey> entityFields = List.of(new EntityKey(EntityKeyType.ENTITY_FIELD, "name"), new EntityKey(EntityKeyType.ENTITY_FIELD, "ownerName"),
+                new EntityKey(EntityKeyType.ENTITY_FIELD, "ownerType"));
+        List<EntityKey> latestValues = Collections.singletonList(new EntityKey(EntityKeyType.ATTRIBUTE, "alarmActiveTime"));
+
+        // all devices with ownerName = TEST TENANT
+        EntityDataQuery query = new EntityDataQuery(filter, pageLink, entityFields, latestValues, List.of(activeAlarmTimeFilter, tenantOwnerNameFilter));
+        checkEntitiesByQuery(query, numOfDevices, TEST_TENANT_NAME, "TENANT");
+
+        // all devices with wrong ownerName
+        EntityDataQuery wrongTenantNameQuery = new EntityDataQuery(filter, pageLink, entityFields, latestValues, List.of(activeAlarmTimeFilter, wrongOwnerNameFilter));
+        checkEntitiesByQuery(wrongTenantNameQuery, 0, null, null);
+
+        // all devices with owner type = TENANT
+        EntityDataQuery tenantEntitiesQuery = new EntityDataQuery(filter, pageLink, entityFields, latestValues, List.of(activeAlarmTimeFilter, tenantOwnerTypeFilter));
+        checkEntitiesByQuery(tenantEntitiesQuery, numOfDevices, TEST_TENANT_NAME, "TENANT");
+
+        // all devices with owner type = CUSTOMER
+        EntityDataQuery customerEntitiesQuery = new EntityDataQuery(filter, pageLink, entityFields, latestValues, List.of(activeAlarmTimeFilter, customerOwnerTypeFilter));
+        checkEntitiesByQuery(customerEntitiesQuery, 0, null, null);
+    }
+
+    private void checkEntitiesByQuery(EntityDataQuery query, int expectedNumOfDevices, String expectedOwnerName, String expectedOwnerType) throws Exception {
+        Awaitility.await()
+                .alias("data by query")
+                .atMost(30, TimeUnit.SECONDS)
+                .until(() -> {
+                    var data = doPostWithTypedResponse("/api/entitiesQuery/find", query, new TypeReference<PageData<EntityData>>() {});
+                    var loadedEntities = new ArrayList<>(data.getData());
+                    return loadedEntities.size() == expectedNumOfDevices;
+                });
+         if (expectedNumOfDevices == 0) {
+             return;
+         }
+        var data = doPostWithTypedResponse("/api/entitiesQuery/find", query, new TypeReference<PageData<EntityData>>() {});
+        var loadedEntities = new ArrayList<>(data.getData());
+
+        Assert.assertEquals(expectedNumOfDevices, loadedEntities.size());
+
+        for (int i = 0; i < expectedNumOfDevices; i++) {
+            var entity = loadedEntities.get(i);
+            String name = entity.getLatest().get(EntityKeyType.ENTITY_FIELD).getOrDefault("name", new TsValue(0, "Invalid")).getValue();
+            String ownerName = entity.getLatest().get(EntityKeyType.ENTITY_FIELD).getOrDefault("ownerName", new TsValue(0, "Invalid")).getValue();
+            String ownerType = entity.getLatest().get(EntityKeyType.ENTITY_FIELD).getOrDefault("ownerType", new TsValue(0, "Invalid")).getValue();
+            String alarmActiveTime = entity.getLatest().get(EntityKeyType.ATTRIBUTE).getOrDefault("alarmActiveTime", new TsValue(0, "-1")).getValue();
+
+            Assert.assertEquals("Device" + i, name);
+            Assert.assertEquals( expectedOwnerName, ownerName);
+            Assert.assertEquals( expectedOwnerType, ownerType);
+            Assert.assertEquals("1" + i, alarmActiveTime);
+        }
+    }
+
+    private void checkEntitiesCount(EntityCountQuery query, int expectedNumOfDevices) {
+        Awaitility.await()
+                .alias("count by query")
+                .atMost(30, TimeUnit.SECONDS)
+                .until(() -> {
+                    var count = doPost("/api/entitiesQuery/count", query, Integer.class);
+                    return count == expectedNumOfDevices;
+                });
+   }
+
+    private KeyFilter getEntityFieldStringEqualToKeyFilter(String keyName, String value) {
+        KeyFilter tenantOwnerNameFilter = new KeyFilter();
+        tenantOwnerNameFilter.setKey(new EntityKey(EntityKeyType.ENTITY_FIELD, keyName));
+        StringFilterPredicate ownerNamePredicate = new StringFilterPredicate();
+        ownerNamePredicate.setValue(FilterPredicateValue.fromString(value));
+        ownerNamePredicate.setOperation(StringFilterPredicate.StringOperation.EQUAL);
+        tenantOwnerNameFilter.setPredicate(ownerNamePredicate);
+        return tenantOwnerNameFilter;
+    }
+
+    private KeyFilter getServerAttributeNumericGreaterThanKeyFilter(String attribute, int value) {
+        KeyFilter numericFilter = new KeyFilter();
+        numericFilter.setKey(new EntityKey(EntityKeyType.SERVER_ATTRIBUTE, attribute));
+        NumericFilterPredicate predicate = new NumericFilterPredicate();
+        predicate.setValue(FilterPredicateValue.fromDouble(value));
+        predicate.setOperation(NumericFilterPredicate.NumericOperation.GREATER);
+        numericFilter.setPredicate(predicate);
+        return numericFilter;
+    }
+
 }
diff --git a/application/src/test/java/org/thingsboard/server/controller/EntityRelationControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/EntityRelationControllerTest.java
index 6c613ada60..48e0fb6196 100644
--- a/application/src/test/java/org/thingsboard/server/controller/EntityRelationControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/EntityRelationControllerTest.java
@@ -72,7 +72,7 @@ public class EntityRelationControllerTest extends AbstractControllerTest {
         Tenant tenant = new Tenant();
         tenant.setTitle("Test tenant");
 
-        savedTenant = doPost("/api/tenant", tenant, Tenant.class);
+        savedTenant = saveTenant(tenant);
         Assert.assertNotNull(savedTenant);
 
         tenantAdmin = new User();
@@ -93,8 +93,7 @@ public class EntityRelationControllerTest extends AbstractControllerTest {
     public void afterTest() throws Exception {
         loginSysAdmin();
 
-        doDelete("/api/tenant/" + savedTenant.getId().getId().toString())
-                .andExpect(status().isOk());
+        deleteTenant(savedTenant.getId());
     }
 
     @Test
diff --git a/application/src/test/java/org/thingsboard/server/controller/EntityViewControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/EntityViewControllerTest.java
index 76dca80d3b..e525f0efd5 100644
--- a/application/src/test/java/org/thingsboard/server/controller/EntityViewControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/EntityViewControllerTest.java
@@ -298,7 +298,7 @@ public class EntityViewControllerTest extends AbstractControllerTest {
         EntityView foundView = doGet("/api/entityView/" + savedView.getId().getId().toString(), EntityView.class);
         assertEquals(savedCustomer.getId(), foundView.getCustomerId());
 
-        testBroadcastEntityStateChangeEventNever(foundView.getId());
+        testBroadcastEntityStateChangeEventTime(foundView.getId(), foundView.getTenantId(), 1);
         testNotifyAssignUnassignEntityAllOneTime(foundView, foundView.getId(), foundView.getId(),
                 tenantId, foundView.getCustomerId(), tenantAdminUserId, TENANT_ADMIN_EMAIL,
                 ActionType.ASSIGNED_TO_CUSTOMER, ActionType.UPDATED,
@@ -310,7 +310,7 @@ public class EntityViewControllerTest extends AbstractControllerTest {
         foundView = doGet("/api/entityView/" + savedView.getId().getId().toString(), EntityView.class);
         assertEquals(ModelConstants.NULL_UUID, foundView.getCustomerId().getId());
 
-        testBroadcastEntityStateChangeEventNever(foundView.getId());
+        testBroadcastEntityStateChangeEventTime(foundView.getId(), foundView.getTenantId(), 1);
         testNotifyAssignUnassignEntityAllOneTime(unAssignedView, savedView.getId(), savedView.getId(),
                 tenantId, savedView.getCustomerId(), tenantAdminUserId, TENANT_ADMIN_EMAIL,
                 ActionType.UNASSIGNED_FROM_CUSTOMER, ActionType.UPDATED,
@@ -328,7 +328,7 @@ public class EntityViewControllerTest extends AbstractControllerTest {
         Customer publicCustomer = doGet("/api/customer/" + assignedView.getCustomerId(), Customer.class);
         Assert.assertTrue(publicCustomer.isPublic());
 
-        testBroadcastEntityStateChangeEventNever(assignedView.getId());
+        testBroadcastEntityStateChangeEventTime(assignedView.getId(), assignedView.getTenantId(), 1);
         testNotifyAssignUnassignEntityAllOneTime(assignedView, assignedView.getId(), assignedView.getId(),
                 tenantId, assignedView.getCustomerId(), tenantAdminUserId, TENANT_ADMIN_EMAIL,
                 ActionType.ASSIGNED_TO_CUSTOMER, ActionType.UPDATED,
@@ -343,7 +343,7 @@ public class EntityViewControllerTest extends AbstractControllerTest {
         foundView = doGet("/api/entityView/" + savedView.getId().getId().toString(), EntityView.class);
         assertEquals(ModelConstants.NULL_UUID, foundView.getCustomerId().getId());
 
-        testBroadcastEntityStateChangeEventNever(foundView.getId());
+        testBroadcastEntityStateChangeEventTime(assignedView.getId(), assignedView.getTenantId(), 1);
         testNotifyAssignUnassignEntityAllOneTime(unAssignedView, unAssignedView.getId(), unAssignedView.getId(),
                 tenantId, publicCustomer.getId(), tenantAdminUserId, TENANT_ADMIN_EMAIL,
                 ActionType.UNASSIGNED_FROM_CUSTOMER, ActionType.UPDATED,
@@ -370,7 +370,7 @@ public class EntityViewControllerTest extends AbstractControllerTest {
         loginSysAdmin();
 
         Tenant tenant2 = getNewTenant("Different tenant");
-        Tenant savedTenant2 = doPost("/api/tenant", tenant2, Tenant.class);
+        Tenant savedTenant2 = saveTenant(tenant2);
         Assert.assertNotNull(savedTenant2);
 
         User tenantAdmin2 = new User();
@@ -398,8 +398,7 @@ public class EntityViewControllerTest extends AbstractControllerTest {
 
         loginSysAdmin();
 
-        doDelete("/api/tenant/" + savedTenant2.getId().getId().toString())
-                .andExpect(status().isOk());
+        deleteTenant(savedTenant2.getId());
     }
 
     @Test
@@ -431,7 +430,7 @@ public class EntityViewControllerTest extends AbstractControllerTest {
         testNotifyEntityBroadcastEntityStateChangeEventMany(new EntityView(), new EntityView(),
                 tenantId, customerId, tenantAdminUserId, TENANT_ADMIN_EMAIL,
                 ActionType.ASSIGNED_TO_CUSTOMER, ActionType.UPDATED, cntEntity, cntEntity,
-                cntEntity*2, 3);
+                cntEntity * 2, 3);
     }
 
     @Test
@@ -462,7 +461,7 @@ public class EntityViewControllerTest extends AbstractControllerTest {
         }
         Futures.allAsList(deleteFutures).get(TIMEOUT, SECONDS);
 
-        testBroadcastEntityStateChangeEventNever(loadedNamesOfView1.get(0).getId());
+        testBroadcastEntityStateChangeEventTime(loadedNamesOfView1.get(0).getId(), loadedNamesOfView1.get(0).getTenantId(), cntEntity);
         testNotifyManyEntityManyTimeMsgToEdgeServiceEntityEqAnyAdditionalInfoAny(new EntityView(), new EntityView(),
                 tenantId, customerId, tenantAdminUserId, TENANT_ADMIN_EMAIL,
                 ActionType.UNASSIGNED_FROM_CUSTOMER, ActionType.UPDATED, cntEntity, cntEntity, 3);
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..31c82408c1 100644
--- a/application/src/test/java/org/thingsboard/server/controller/HomePageApiTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/HomePageApiTest.java
@@ -103,7 +103,7 @@ public class HomePageApiTest extends AbstractControllerTest {
         for (int i = 0; i < 100; i++) {
             Tenant tenant = new Tenant();
             tenant.setTitle("tenant" + i);
-            tenants.add(doPost("/api/tenant", tenant, Tenant.class));
+            tenants.add(saveTenant(tenant));
         }
 
         EntityTypeFilter ef = new EntityTypeFilter();
@@ -115,7 +115,7 @@ public class HomePageApiTest extends AbstractControllerTest {
         Assert.assertEquals(initialCount + 100, update.getCount());
 
         for (Tenant tenant : tenants) {
-            doDelete("/api/tenant/" + tenant.getId().toString());
+            deleteTenant(tenant.getId());
         }
     }
 
@@ -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/OtaPackageControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/OtaPackageControllerTest.java
index 9b5e0a65f8..4031045095 100644
--- a/application/src/test/java/org/thingsboard/server/controller/OtaPackageControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/OtaPackageControllerTest.java
@@ -72,7 +72,7 @@ public class OtaPackageControllerTest extends AbstractControllerTest {
 
         Tenant tenant = new Tenant();
         tenant.setTitle("My tenant");
-        savedTenant = doPost("/api/tenant", tenant, Tenant.class);
+        savedTenant = saveTenant(tenant);
         Assert.assertNotNull(savedTenant);
 
         tenantAdmin = new User();
@@ -94,8 +94,7 @@ public class OtaPackageControllerTest extends AbstractControllerTest {
     public void afterTest() throws Exception {
         loginSysAdmin();
 
-        doDelete("/api/tenant/" + savedTenant.getId().getId().toString())
-                .andExpect(status().isOk());
+        deleteTenant(savedTenant.getId());
     }
 
     @Test
@@ -339,7 +338,7 @@ public class OtaPackageControllerTest extends AbstractControllerTest {
 
         testNotifyManyEntityManyTimeMsgToEdgeServiceEntityEqAny(new OtaPackageInfo(), new OtaPackageInfo(),
                 savedTenant.getId(), tenantAdmin.getCustomerId(), tenantAdmin.getId(), tenantAdmin.getEmail(),
-                ActionType.ADDED, cntEntity, 0, (cntEntity*2 - startIndexSaveData));
+                ActionType.ADDED, cntEntity, 0, (cntEntity * 2 - startIndexSaveData));
 
         List<OtaPackageInfo> loadedFirmwares = new ArrayList<>();
         PageLink pageLink = new PageLink(24);
diff --git a/application/src/test/java/org/thingsboard/server/controller/RpcControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/RpcControllerTest.java
index 4d1f3d6407..d0f6426ab1 100644
--- a/application/src/test/java/org/thingsboard/server/controller/RpcControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/RpcControllerTest.java
@@ -49,7 +49,7 @@ public class RpcControllerTest extends AbstractControllerTest {
 
         Tenant tenant = new Tenant();
         tenant.setTitle("My tenant");
-        savedTenant = doPost("/api/tenant", tenant, Tenant.class);
+        savedTenant = saveTenant(tenant);
         Assert.assertNotNull(savedTenant);
 
         tenantAdmin = new User();
@@ -66,8 +66,7 @@ public class RpcControllerTest extends AbstractControllerTest {
     public void afterTest() throws Exception {
         loginSysAdmin();
 
-        doDelete("/api/tenant/" + savedTenant.getId().getId().toString())
-                .andExpect(status().isOk());
+        deleteTenant(savedTenant.getId());
     }
 
     private Device createDefaultDevice() {
diff --git a/application/src/test/java/org/thingsboard/server/controller/RuleChainControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/RuleChainControllerTest.java
index 7595a69931..a990f55224 100644
--- a/application/src/test/java/org/thingsboard/server/controller/RuleChainControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/RuleChainControllerTest.java
@@ -82,7 +82,7 @@ public class RuleChainControllerTest extends AbstractControllerTest {
 
         Tenant tenant = new Tenant();
         tenant.setTitle("My tenant");
-        savedTenant = doPost("/api/tenant", tenant, Tenant.class);
+        savedTenant = saveTenant(tenant);
         Assert.assertNotNull(savedTenant);
 
         tenantAdmin = new User();
@@ -99,8 +99,7 @@ public class RuleChainControllerTest extends AbstractControllerTest {
     public void afterTest() throws Exception {
         loginSysAdmin();
 
-        doDelete("/api/tenant/" + savedTenant.getId().getId().toString())
-                .andExpect(status().isOk());
+        deleteTenant(savedTenant.getId());
     }
 
     @Test
@@ -147,9 +146,9 @@ public class RuleChainControllerTest extends AbstractControllerTest {
         int currentVersion = annotation.version();
 
         String oldConfig = "{\"attrMapping\":{\"serialNumber\":\"sn\"}," +
-                        "\"relationsQuery\":{\"direction\":\"FROM\",\"maxLevel\":1," +
-                        "\"filters\":[{\"relationType\":\"Contains\",\"entityTypes\":[]}]," +
-                        "\"fetchLastLevelOnly\":false},\"telemetry\":false}";
+                "\"relationsQuery\":{\"direction\":\"FROM\",\"maxLevel\":1," +
+                "\"filters\":[{\"relationType\":\"Contains\",\"entityTypes\":[]}]," +
+                "\"fetchLastLevelOnly\":false},\"telemetry\":false}";
 
         TbGetRelatedDataNodeConfiguration defaultConfiguration = new TbGetRelatedDataNodeConfiguration().defaultConfiguration();
         String newConfig = JacksonUtil.toString(defaultConfiguration);
diff --git a/application/src/test/java/org/thingsboard/server/controller/TbResourceControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/TbResourceControllerTest.java
index 83da76344c..0745761c25 100644
--- a/application/src/test/java/org/thingsboard/server/controller/TbResourceControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/TbResourceControllerTest.java
@@ -73,7 +73,7 @@ public class TbResourceControllerTest extends AbstractControllerTest {
 
         Tenant tenant = new Tenant();
         tenant.setTitle("My tenant");
-        savedTenant = doPost("/api/tenant", tenant, Tenant.class);
+        savedTenant = saveTenant(tenant);
         Assert.assertNotNull(savedTenant);
 
         tenantAdmin = new User();
@@ -90,8 +90,7 @@ public class TbResourceControllerTest extends AbstractControllerTest {
     public void afterTest() throws Exception {
         loginSysAdmin();
 
-        doDelete("/api/tenant/" + savedTenant.getId().getId().toString())
-                .andExpect(status().isOk());
+        deleteTenant(savedTenant.getId());
     }
 
     @Test
@@ -687,7 +686,7 @@ public class TbResourceControllerTest extends AbstractControllerTest {
         List<TbResource> resources = loadLwm2mResources();
 
         List<LwM2mObject> objects =
-                doGetTyped("/api/resource/lwm2m?sortProperty=id&sortOrder=ASC&objectIds=3_1.0,5_1.0,19_1.1", new TypeReference<>() {});
+                doGetTyped("/api/resource/lwm2m?sortProperty=id&sortOrder=ASC&objectIds=3_1.2,5_1.2,19_1.1", new TypeReference<>() {});
         Assert.assertNotNull(objects);
         Assert.assertEquals(3, objects.size());
 
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..3160d542f1 100644
--- a/application/src/test/java/org/thingsboard/server/controller/TenantControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/TenantControllerTest.java
@@ -140,7 +140,7 @@ public class TenantControllerTest extends AbstractControllerTest {
 
         Mockito.reset(tbClusterService);
 
-        Tenant savedTenant = doPost("/api/tenant", tenant, Tenant.class);
+        Tenant savedTenant = saveTenant(tenant);
         Assert.assertNotNull(savedTenant);
         Assert.assertNotNull(savedTenant.getId());
         Assert.assertTrue(savedTenant.getCreatedTime() > 0);
@@ -149,14 +149,13 @@ public class TenantControllerTest extends AbstractControllerTest {
         testBroadcastEntityStateChangeEventTimeManyTimeTenant(savedTenant, ComponentLifecycleEvent.CREATED, 1);
 
         savedTenant.setTitle("My new tenant");
-        doPost("/api/tenant", savedTenant, Tenant.class);
+        saveTenant(savedTenant);
         Tenant foundTenant = doGet("/api/tenant/" + savedTenant.getId().getId().toString(), Tenant.class);
         Assert.assertEquals(foundTenant.getTitle(), savedTenant.getTitle());
 
         testBroadcastEntityStateChangeEventTimeManyTimeTenant(savedTenant, ComponentLifecycleEvent.UPDATED, 1);
 
-        doDelete("/api/tenant/" + savedTenant.getId().getId().toString())
-                .andExpect(status().isOk());
+        deleteTenant(savedTenant.getId());
 
         testBroadcastEntityStateChangeEventTimeManyTimeTenant(savedTenant, ComponentLifecycleEvent.DELETED, 1);
     }
@@ -181,12 +180,11 @@ public class TenantControllerTest extends AbstractControllerTest {
         loginSysAdmin();
         Tenant tenant = new Tenant();
         tenant.setTitle("My tenant");
-        Tenant savedTenant = doPost("/api/tenant", tenant, Tenant.class);
+        Tenant savedTenant = saveTenant(tenant);
         Tenant foundTenant = doGet("/api/tenant/" + savedTenant.getId().getId().toString(), Tenant.class);
         Assert.assertNotNull(foundTenant);
         Assert.assertEquals(savedTenant, foundTenant);
-        doDelete("/api/tenant/" + savedTenant.getId().getId().toString())
-                .andExpect(status().isOk());
+        deleteTenant(savedTenant.getId());
     }
 
     @Test
@@ -194,12 +192,11 @@ public class TenantControllerTest extends AbstractControllerTest {
         loginSysAdmin();
         Tenant tenant = new Tenant();
         tenant.setTitle("My tenant");
-        Tenant savedTenant = doPost("/api/tenant", tenant, Tenant.class);
+        Tenant savedTenant = saveTenant(tenant);
         TenantInfo foundTenant = doGet("/api/tenant/info/" + savedTenant.getId().getId().toString(), TenantInfo.class);
         Assert.assertNotNull(foundTenant);
         Assert.assertEquals(new TenantInfo(savedTenant, "Default"), foundTenant);
-        doDelete("/api/tenant/" + savedTenant.getId().getId().toString())
-                .andExpect(status().isOk());
+        deleteTenant(savedTenant.getId());
     }
 
     @Test
@@ -237,11 +234,10 @@ public class TenantControllerTest extends AbstractControllerTest {
         loginSysAdmin();
         Tenant tenant = new Tenant();
         tenant.setTitle("My tenant");
-        Tenant savedTenant = doPost("/api/tenant", tenant, Tenant.class);
+        Tenant savedTenant = saveTenant(tenant);
 
         String tenantIdStr = savedTenant.getId().getId().toString();
-        doDelete("/api/tenant/" + tenantIdStr)
-                .andExpect(status().isOk());
+        deleteTenant(savedTenant.getId());
         doGet("/api/tenant/" + tenantIdStr)
                 .andExpect(status().isNotFound())
                 .andExpect(statusReason(containsString(msgErrorNoFound("Tenant", tenantIdStr))));
@@ -264,8 +260,7 @@ public class TenantControllerTest extends AbstractControllerTest {
         for (int i = 0; i < cntEntity; i++) {
             Tenant tenant = new Tenant();
             tenant.setTitle("Tenant" + i);
-            createFutures.add(executor.submit(() ->
-                    doPost("/api/tenant", tenant, Tenant.class)));
+            createFutures.add(executor.submit(() -> saveTenant(tenant)));
         }
         tenants.addAll(Futures.allAsList(createFutures).get(TIMEOUT, TimeUnit.SECONDS));
 
@@ -308,8 +303,7 @@ public class TenantControllerTest extends AbstractControllerTest {
             String title = title1 + suffix;
             title = i % 2 == 0 ? title.toLowerCase() : title.toUpperCase();
             tenant.setTitle(title);
-            createFutures.add(executor.submit(() ->
-                    doPost("/api/tenant", tenant, Tenant.class)));
+            createFutures.add(executor.submit(() -> saveTenant(tenant)));
         }
 
         List<Tenant> tenantsTitle1 = Futures.allAsList(createFutures).get(TIMEOUT, TimeUnit.SECONDS);
@@ -323,8 +317,7 @@ public class TenantControllerTest extends AbstractControllerTest {
             String title = title2 + suffix;
             title = i % 2 == 0 ? title.toLowerCase() : title.toUpperCase();
             tenant.setTitle(title);
-            createFutures.add(executor.submit(() ->
-                    doPost("/api/tenant", tenant, Tenant.class)));
+            createFutures.add(executor.submit(() -> saveTenant(tenant)));
         }
 
         List<Tenant> tenantsTitle2 = Futures.allAsList(createFutures).get(TIMEOUT, TimeUnit.SECONDS);
@@ -396,7 +389,7 @@ public class TenantControllerTest extends AbstractControllerTest {
             Tenant tenant = new Tenant();
             tenant.setTitle("Tenant" + i);
             createFutures.add(executor.submit(() ->
-                    new TenantInfo(doPost("/api/tenant", tenant, Tenant.class), "Default")));
+                    new TenantInfo(saveTenant(tenant), "Default")));
         }
         tenants.addAll(Futures.allAsList(createFutures).get(TIMEOUT, TimeUnit.SECONDS));
 
@@ -448,7 +441,7 @@ public class TenantControllerTest extends AbstractControllerTest {
 
         Tenant tenant = new Tenant();
         tenant.setTitle("Isolated tenant");
-        tenant = doPost("/api/tenant", tenant, Tenant.class);
+        tenant = saveTenant(tenant);
 
         User tenantUser = new User();
         tenantUser.setAuthority(Authority.TENANT_ADMIN);
@@ -477,7 +470,7 @@ public class TenantControllerTest extends AbstractControllerTest {
         tenantProfile = doPost("/api/tenantProfile", tenantProfile, TenantProfile.class);
 
         tenant.setTenantProfileId(tenantProfile.getId());
-        doPost("/api/tenant", tenant, Tenant.class);
+        saveTenant(tenant);
 
         login(username, password);
 
@@ -507,7 +500,7 @@ public class TenantControllerTest extends AbstractControllerTest {
         tenantProfile2 = doPost("/api/tenantProfile", tenantProfile2, TenantProfile.class);
 
         tenant.setTenantProfileId(tenantProfile2.getId());
-        doPost("/api/tenant", tenant, Tenant.class);
+        saveTenant(tenant);
 
         login(username, password);
 
@@ -549,7 +542,7 @@ public class TenantControllerTest extends AbstractControllerTest {
         loginSysAdmin();
 
         tenant.setTenantProfileId(null);
-        doPost("/api/tenant", tenant, Tenant.class);
+        saveTenant(tenant);
 
         login(username, password);
         for (Queue queue : foundTenantQueues) {
@@ -559,7 +552,7 @@ public class TenantControllerTest extends AbstractControllerTest {
         }
 
         loginSysAdmin();
-        doDelete("/api/tenant/" + tenant.getId().getId().toString()).andExpect(status().isOk());
+        deleteTenant(tenant.getId());
     }
 
     @Test
@@ -576,7 +569,7 @@ public class TenantControllerTest extends AbstractControllerTest {
         createDifferentTenant();
         loginSysAdmin();
         savedDifferentTenant.setTenantProfileId(tenantProfile.getId());
-        savedDifferentTenant = doPost("/api/tenant", savedDifferentTenant, Tenant.class);
+        savedDifferentTenant = saveTenant(savedDifferentTenant);
         TenantId tenantId = differentTenantId;
 
         loginDifferentTenant();
@@ -661,9 +654,9 @@ public class TenantControllerTest extends AbstractControllerTest {
         createDifferentTenant();
         loginSysAdmin();
         savedDifferentTenant.setTenantProfileId(tenantProfile.getId());
-        savedDifferentTenant = doPost("/api/tenant", savedDifferentTenant, Tenant.class);
+        savedDifferentTenant = saveTenant(savedDifferentTenant);
         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 +670,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 +682,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);
@@ -716,15 +709,15 @@ public class TenantControllerTest extends AbstractControllerTest {
         createDifferentTenant();
         loginSysAdmin();
         savedDifferentTenant.setTenantProfileId(tenantProfile.getId());
-        savedDifferentTenant = doPost("/api/tenant", savedDifferentTenant, Tenant.class);
+        savedDifferentTenant = saveTenant(savedDifferentTenant);
         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 +725,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 +745,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/TenantProfileControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/TenantProfileControllerTest.java
index f25cfe2228..989e80e6e5 100644
--- a/application/src/test/java/org/thingsboard/server/controller/TenantProfileControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/TenantProfileControllerTest.java
@@ -75,7 +75,7 @@ public class TenantProfileControllerTest extends AbstractControllerTest {
 
         savedTenantProfile.setName("New tenant profile");
         doPost("/api/tenantProfile", savedTenantProfile, TenantProfile.class);
-        TenantProfile foundTenantProfile = doGet("/api/tenantProfile/"+savedTenantProfile.getId().getId().toString(), TenantProfile.class);
+        TenantProfile foundTenantProfile = doGet("/api/tenantProfile/" + savedTenantProfile.getId().getId().toString(), TenantProfile.class);
         Assert.assertEquals(foundTenantProfile.getName(), savedTenantProfile.getName());
 
         testBroadcastEntityStateChangeEventTimeManyTimeTenantProfile(savedTenantProfile, ComponentLifecycleEvent.UPDATED, 1);
@@ -100,7 +100,7 @@ public class TenantProfileControllerTest extends AbstractControllerTest {
         loginSysAdmin();
         TenantProfile tenantProfile = this.createTenantProfile("Tenant Profile");
         TenantProfile savedTenantProfile = doPost("/api/tenantProfile", tenantProfile, TenantProfile.class);
-        TenantProfile foundTenantProfile = doGet("/api/tenantProfile/"+savedTenantProfile.getId().getId().toString(), TenantProfile.class);
+        TenantProfile foundTenantProfile = doGet("/api/tenantProfile/" + savedTenantProfile.getId().getId().toString(), TenantProfile.class);
         Assert.assertNotNull(foundTenantProfile);
         Assert.assertEquals(savedTenantProfile, foundTenantProfile);
     }
@@ -110,7 +110,7 @@ public class TenantProfileControllerTest extends AbstractControllerTest {
         loginSysAdmin();
         TenantProfile tenantProfile = this.createTenantProfile("Tenant Profile");
         TenantProfile savedTenantProfile = doPost("/api/tenantProfile", tenantProfile, TenantProfile.class);
-        EntityInfo foundTenantProfileInfo = doGet("/api/tenantProfileInfo/"+savedTenantProfile.getId().getId().toString(), EntityInfo.class);
+        EntityInfo foundTenantProfileInfo = doGet("/api/tenantProfileInfo/" + savedTenantProfile.getId().getId().toString(), EntityInfo.class);
         Assert.assertNotNull(foundTenantProfileInfo);
         Assert.assertEquals(savedTenantProfile.getId(), foundTenantProfileInfo.getId());
         Assert.assertEquals(savedTenantProfile.getName(), foundTenantProfileInfo.getName());
@@ -129,7 +129,7 @@ public class TenantProfileControllerTest extends AbstractControllerTest {
         loginSysAdmin();
         TenantProfile tenantProfile = this.createTenantProfile("Tenant Profile 1");
         TenantProfile savedTenantProfile = doPost("/api/tenantProfile", tenantProfile, TenantProfile.class);
-        TenantProfile defaultTenantProfile = doPost("/api/tenantProfile/"+savedTenantProfile.getId().getId().toString()+"/default", TenantProfile.class);
+        TenantProfile defaultTenantProfile = doPost("/api/tenantProfile/" + savedTenantProfile.getId().getId().toString() + "/default", TenantProfile.class);
         Assert.assertNotNull(defaultTenantProfile);
         EntityInfo foundDefaultTenantProfile = doGet("/api/tenantProfileInfo/default", EntityInfo.class);
         Assert.assertNotNull(foundDefaultTenantProfile);
@@ -176,7 +176,7 @@ public class TenantProfileControllerTest extends AbstractControllerTest {
         Tenant tenant = new Tenant();
         tenant.setTitle("My tenant with tenant profile");
         tenant.setTenantProfileId(savedTenantProfile.getId());
-        Tenant savedTenant = doPost("/api/tenant", tenant, Tenant.class);
+        Tenant savedTenant = saveTenant(tenant);
 
         Mockito.reset(tbClusterService);
 
@@ -186,8 +186,7 @@ public class TenantProfileControllerTest extends AbstractControllerTest {
 
         testBroadcastEntityStateChangeEventNeverTenantProfile();
 
-        doDelete("/api/tenant/"+savedTenant.getId().getId().toString())
-                .andExpect(status().isOk());
+        deleteTenant(savedTenant.getId());
     }
 
     @Test
@@ -214,7 +213,7 @@ public class TenantProfileControllerTest extends AbstractControllerTest {
         List<TenantProfile> tenantProfiles = new ArrayList<>();
         PageLink pageLink = new PageLink(17);
         PageData<TenantProfile> pageData = doGetTypedWithPageLink("/api/tenantProfiles?",
-                new TypeReference<>(){}, pageLink);
+                new TypeReference<>() {}, pageLink);
         Assert.assertFalse(pageData.hasNext());
         Assert.assertEquals(1, pageData.getTotalElements());
         tenantProfiles.addAll(pageData.getData());
@@ -222,8 +221,8 @@ public class TenantProfileControllerTest extends AbstractControllerTest {
         Mockito.reset(tbClusterService);
 
         int cntEntity = 28;
-        for (int i=0;i<28;i++) {
-            TenantProfile tenantProfile = this.createTenantProfile("Tenant Profile"+i);
+        for (int i = 0; i < 28; i++) {
+            TenantProfile tenantProfile = this.createTenantProfile("Tenant Profile" + i);
             tenantProfiles.add(doPost("/api/tenantProfile", tenantProfile, TenantProfile.class));
         }
 
@@ -233,7 +232,7 @@ public class TenantProfileControllerTest extends AbstractControllerTest {
         pageLink = new PageLink(17);
         do {
             pageData = doGetTypedWithPageLink("/api/tenantProfiles?",
-                    new TypeReference<>(){}, pageLink);
+                    new TypeReference<>() {}, pageLink);
             loadedTenantProfiles.addAll(pageData.getData());
             if (pageData.hasNext()) {
                 pageLink = pageLink.nextPageLink();
@@ -256,7 +255,7 @@ public class TenantProfileControllerTest extends AbstractControllerTest {
 
         pageLink = new PageLink(17);
         pageData = doGetTypedWithPageLink("/api/tenantProfiles?",
-                new TypeReference<PageData<TenantProfile>>(){}, pageLink);
+                new TypeReference<PageData<TenantProfile>>() {}, pageLink);
         Assert.assertFalse(pageData.hasNext());
         Assert.assertEquals(1, pageData.getTotalElements());
 
@@ -269,13 +268,13 @@ public class TenantProfileControllerTest extends AbstractControllerTest {
         List<TenantProfile> tenantProfiles = new ArrayList<>();
         PageLink pageLink = new PageLink(17);
         PageData<TenantProfile> tenantProfilePageData = doGetTypedWithPageLink("/api/tenantProfiles?",
-                new TypeReference<>(){}, pageLink);
+                new TypeReference<>() {}, pageLink);
         Assert.assertFalse(tenantProfilePageData.hasNext());
         Assert.assertEquals(1, tenantProfilePageData.getTotalElements());
         tenantProfiles.addAll(tenantProfilePageData.getData());
 
-        for (int i=0;i<28;i++) {
-            TenantProfile tenantProfile = this.createTenantProfile("Tenant Profile"+i);
+        for (int i = 0; i < 28; i++) {
+            TenantProfile tenantProfile = this.createTenantProfile("Tenant Profile" + i);
             tenantProfiles.add(doPost("/api/tenantProfile", tenantProfile, TenantProfile.class));
         }
 
@@ -284,7 +283,7 @@ public class TenantProfileControllerTest extends AbstractControllerTest {
         PageData<EntityInfo> pageData;
         do {
             pageData = doGetTypedWithPageLink("/api/tenantProfileInfos?",
-                    new TypeReference<PageData<EntityInfo>>(){}, pageLink);
+                    new TypeReference<PageData<EntityInfo>>() {}, pageLink);
             loadedTenantProfileInfos.addAll(pageData.getData());
             if (pageData.hasNext()) {
                 pageLink = pageLink.nextPageLink();
@@ -308,7 +307,7 @@ public class TenantProfileControllerTest extends AbstractControllerTest {
 
         pageLink = new PageLink(17);
         pageData = doGetTypedWithPageLink("/api/tenantProfileInfos?",
-                new TypeReference<PageData<EntityInfo>>(){}, pageLink);
+                new TypeReference<PageData<EntityInfo>>() {}, pageLink);
         Assert.assertFalse(pageData.hasNext());
         Assert.assertEquals(1, pageData.getTotalElements());
     }
@@ -354,14 +353,14 @@ public class TenantProfileControllerTest extends AbstractControllerTest {
         ArgumentMatcher<TenantProfile> matcherTenantProfile = cntTime == 1 ? argument -> argument.equals(tenantProfile) :
                 argument -> argument.getClass().equals(TenantProfile.class);
         if (ComponentLifecycleEvent.DELETED.equals(event)) {
-            Mockito.verify(tbClusterService, times( cntTime)).onTenantProfileDelete(Mockito.argThat( matcherTenantProfile),
+            Mockito.verify(tbClusterService, times(cntTime)).onTenantProfileDelete(Mockito.argThat(matcherTenantProfile),
                     Mockito.isNull());
             testBroadcastEntityStateChangeEventNever(createEntityId_NULL_UUID(new Tenant()));
         } else {
-            Mockito.verify(tbClusterService, times( cntTime)).onTenantProfileChange(Mockito.argThat(matcherTenantProfile),
+            Mockito.verify(tbClusterService, times(cntTime)).onTenantProfileChange(Mockito.argThat(matcherTenantProfile),
                     Mockito.isNull());
             TenantProfileId tenantProfileIdId = cntTime == 1 ? tenantProfile.getId() : (TenantProfileId) createEntityId_NULL_UUID(tenantProfile);
-            testBroadcastEntityStateChangeEventTime(tenantProfileIdId, null,  cntTime);
+            testBroadcastEntityStateChangeEventTime(tenantProfileIdId, null, cntTime);
         }
         Mockito.reset(tbClusterService);
     }
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..c1f3a90529 100644
--- a/application/src/test/java/org/thingsboard/server/controller/UserControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/UserControllerTest.java
@@ -380,7 +380,7 @@ public class UserControllerTest extends AbstractControllerTest {
         //here created a new tenant despite already created on AbstractWebTest and then delete the tenant properly on the last line
         Tenant tenant = new Tenant();
         tenant.setTitle("My tenant with many admins");
-        Tenant savedTenant = doPost("/api/tenant", tenant, Tenant.class);
+        Tenant savedTenant = saveTenant(tenant);
         Assert.assertNotNull(savedTenant);
 
         TenantId tenantId = savedTenant.getId();
@@ -422,8 +422,7 @@ public class UserControllerTest extends AbstractControllerTest {
         assertThat(tenantAdmins).as("admins list size").hasSameSizeAs(loadedTenantAdmins);
         assertThat(tenantAdmins).as("admins list content").isEqualTo(loadedTenantAdmins);
 
-        doDelete("/api/tenant/" + tenantId.getId().toString())
-                .andExpect(status().isOk());
+        deleteTenant(tenantId);
 
         pageLink = new PageLink(33);
         pageData = doGetTypedWithPageLink("/api/tenant/" + tenantId.getId().toString() + "/users?",
@@ -669,7 +668,7 @@ public class UserControllerTest extends AbstractControllerTest {
         List<UserId> expectedCustomerUserIds = new ArrayList<>();
         expectedCustomerUserIds.add(customerUserId);
         for (int i = 0; i < 45; i++) {
-            User customerUser = createCustomerUser( customerId);
+            User customerUser = createCustomerUser(customerId);
             customerUser.setEmail(email + StringUtils.randomAlphanumeric((int) (5 + Math.random() * 10)) + "@thingsboard.org");
             User user = doPost("/api/user", customerUser, User.class);
             expectedCustomerUserIds.add(user.getId());
@@ -750,7 +749,7 @@ public class UserControllerTest extends AbstractControllerTest {
 
         String email = "testEmail1";
         for (int i = 0; i < 45; i++) {
-            User customerUser = createCustomerUser( customerId);
+            User customerUser = createCustomerUser(customerId);
             customerUser.setEmail(email + StringUtils.randomAlphanumeric((int) (5 + Math.random() * 10)) + "@thingsboard.org");
             doPost("/api/user", customerUser, User.class);
         }
@@ -993,8 +992,8 @@ public class UserControllerTest extends AbstractControllerTest {
         List<UserEmailInfo> usersInfo = getUsersInfo(pageLink);
 
         List<UserEmailInfo> expectedUserInfos = customerUsersContainingWord.stream().map(customerUser -> new UserEmailInfo(customerUser.getId(),
-                customerUser.getEmail(), customerUser.getFirstName() == null ? "" : customerUser.getFirstName(),
-                customerUser.getLastName() == null ? "" : customerUser.getLastName()))
+                        customerUser.getEmail(), customerUser.getFirstName() == null ? "" : customerUser.getFirstName(),
+                        customerUser.getLastName() == null ? "" : customerUser.getLastName()))
                 .sorted(userDataIdComparator).collect(Collectors.toList());
         usersInfo.sort(userDataIdComparator);
 
@@ -1046,8 +1045,8 @@ public class UserControllerTest extends AbstractControllerTest {
         List<UserEmailInfo> usersInfo = getUsersInfo(pageLink);
 
         List<UserEmailInfo> expectedUserInfos = usersContainingWord.stream().map(customerUser -> new UserEmailInfo(customerUser.getId(),
-                customerUser.getEmail(), customerUser.getFirstName() == null ? "" : customerUser.getFirstName(),
-                customerUser.getLastName() == null ? "" : customerUser.getLastName()))
+                        customerUser.getEmail(), customerUser.getFirstName() == null ? "" : customerUser.getFirstName(),
+                        customerUser.getLastName() == null ? "" : customerUser.getLastName()))
                 .sorted(userDataIdComparator).collect(Collectors.toList());
         usersInfo.sort(userDataIdComparator);
 
@@ -1109,13 +1108,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/controller/WebsocketApiTest.java b/application/src/test/java/org/thingsboard/server/controller/WebsocketApiTest.java
index 532d85664a..be01ee4fe8 100644
--- a/application/src/test/java/org/thingsboard/server/controller/WebsocketApiTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/WebsocketApiTest.java
@@ -700,7 +700,7 @@ public class WebsocketApiTest extends AbstractControllerTest {
 
     private void sendAttributes(TenantId tenantId, EntityId entityId, TbAttributeSubscriptionScope scope, List<AttributeKvEntry> attrData) throws InterruptedException {
         CountDownLatch latch = new CountDownLatch(1);
-        tsService.saveAndNotify(tenantId, entityId, scope.name(), attrData, new FutureCallback<Void>() {
+        tsService.saveAndNotify(tenantId, entityId, scope.getAttributeScope(), attrData, new FutureCallback<Void>() {
             @Override
             public void onSuccess(@Nullable Void result) {
                 log.debug("sendAttributes callback onSuccess");
diff --git a/application/src/test/java/org/thingsboard/server/controller/WidgetTypeControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/WidgetTypeControllerTest.java
index c689b12b43..5c4e2afde5 100644
--- a/application/src/test/java/org/thingsboard/server/controller/WidgetTypeControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/WidgetTypeControllerTest.java
@@ -24,7 +24,6 @@ import org.junit.Test;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.common.data.User;
-import org.thingsboard.server.common.data.id.WidgetTypeId;
 import org.thingsboard.server.common.data.security.Authority;
 import org.thingsboard.server.common.data.widget.WidgetType;
 import org.thingsboard.server.common.data.widget.WidgetTypeDetails;
@@ -53,7 +52,7 @@ public class WidgetTypeControllerTest extends AbstractControllerTest {
 
         Tenant tenant = new Tenant();
         tenant.setTitle("My tenant");
-        savedTenant = doPost("/api/tenant", tenant, Tenant.class);
+        savedTenant = saveTenant(tenant);
         Assert.assertNotNull(savedTenant);
 
         tenantAdmin = new User();
@@ -70,8 +69,7 @@ public class WidgetTypeControllerTest extends AbstractControllerTest {
     public void afterTest() throws Exception {
         loginSysAdmin();
 
-        doDelete("/api/tenant/"+savedTenant.getId().getId().toString())
-                .andExpect(status().isOk());
+        deleteTenant(savedTenant.getId());
     }
 
     @Test
@@ -127,10 +125,10 @@ public class WidgetTypeControllerTest extends AbstractControllerTest {
         widgetType.setDescriptor(JacksonUtil.fromString("{ \"someKey\": \"someValue\" }", JsonNode.class));
         WidgetTypeDetails savedWidgetType = doPost("/api/widgetType", widgetType, WidgetTypeDetails.class);
 
-        doDelete("/api/widgetType/"+savedWidgetType.getId().getId().toString())
+        doDelete("/api/widgetType/" + savedWidgetType.getId().getId().toString())
                 .andExpect(status().isOk());
 
-        doGet("/api/widgetType/"+savedWidgetType.getId().getId().toString())
+        doGet("/api/widgetType/" + savedWidgetType.getId().getId().toString())
                 .andExpect(status().isNotFound());
     }
 
@@ -173,7 +171,7 @@ public class WidgetTypeControllerTest extends AbstractControllerTest {
         widgetsBundle = doPost("/api/widgetsBundle", widgetsBundle, WidgetsBundle.class);
 
         List<WidgetType> widgetTypes = new ArrayList<>();
-        for (int i=0;i<89;i++) {
+        for (int i = 0; i < 89; i++) {
             WidgetTypeDetails widgetType = new WidgetTypeDetails();
             widgetType.setName("Widget Type " + i);
             widgetType.setDescriptor(JacksonUtil.fromString("{ \"someKey\": \"someValue\" }", JsonNode.class));
@@ -184,7 +182,7 @@ public class WidgetTypeControllerTest extends AbstractControllerTest {
         doPost("/api/widgetsBundle/" + widgetsBundle.getId().getId().toString() + "/widgetTypes", widgetTypeIds);
 
         List<WidgetType> loadedWidgetTypes = doGetTyped("/api/widgetTypes?widgetsBundleId={widgetsBundleId}",
-                new TypeReference<>(){}, widgetsBundle.getId().getId().toString());
+                new TypeReference<>() {}, widgetsBundle.getId().getId().toString());
 
         Collections.sort(widgetTypes, idComparator);
         Collections.sort(loadedWidgetTypes, idComparator);
@@ -194,12 +192,12 @@ public class WidgetTypeControllerTest extends AbstractControllerTest {
         loginCustomerUser();
 
         List<WidgetType> loadedWidgetTypesCustomer = doGetTyped("/api/widgetTypes?widgetsBundleId={widgetsBundleId}",
-                new TypeReference<>(){}, widgetsBundle.getId().getId().toString());
+                new TypeReference<>() {}, widgetsBundle.getId().getId().toString());
         Collections.sort(loadedWidgetTypesCustomer, idComparator);
         Assert.assertEquals(widgetTypes, loadedWidgetTypesCustomer);
 
         List<WidgetTypeDetails> customerLoadedWidgetTypesDetails = doGetTyped("/api/widgetTypesDetails?widgetsBundleId={widgetsBundleId}",
-                new TypeReference<>(){}, widgetsBundle.getId().getId().toString());
+                new TypeReference<>() {}, widgetsBundle.getId().getId().toString());
         List<WidgetType> widgetTypesFromDetailsListCustomer = customerLoadedWidgetTypesDetails.stream().map(WidgetType::new).collect(Collectors.toList());
         Collections.sort(widgetTypesFromDetailsListCustomer, idComparator);
         Assert.assertEquals(widgetTypesFromDetailsListCustomer, loadedWidgetTypes);
@@ -207,12 +205,12 @@ public class WidgetTypeControllerTest extends AbstractControllerTest {
         loginSysAdmin();
 
         List<WidgetType> sysAdminLoadedWidgetTypes = doGetTyped("/api/widgetTypes?widgetsBundleId={widgetsBundleId}",
-                new TypeReference<>(){}, widgetsBundle.getId().getId().toString());
+                new TypeReference<>() {}, widgetsBundle.getId().getId().toString());
         Collections.sort(sysAdminLoadedWidgetTypes, idComparator);
         Assert.assertEquals(widgetTypes, sysAdminLoadedWidgetTypes);
 
         List<WidgetTypeDetails> sysAdminLoadedWidgetTypesDetails = doGetTyped("/api/widgetTypesDetails?widgetsBundleId={widgetsBundleId}",
-                new TypeReference<>(){}, widgetsBundle.getId().getId().toString());
+                new TypeReference<>() {}, widgetsBundle.getId().getId().toString());
         List<WidgetType> widgetTypesFromDetailsListSysAdmin = sysAdminLoadedWidgetTypesDetails.stream().map(WidgetType::new).collect(Collectors.toList());
         Collections.sort(widgetTypesFromDetailsListSysAdmin, idComparator);
         Assert.assertEquals(widgetTypesFromDetailsListSysAdmin, loadedWidgetTypes);
@@ -225,7 +223,7 @@ public class WidgetTypeControllerTest extends AbstractControllerTest {
         widgetType.setDescriptor(JacksonUtil.fromString("{ \"someKey\": \"someValue\" }", JsonNode.class));
         WidgetTypeDetails savedWidgetType = doPost("/api/widgetType", widgetType, WidgetTypeDetails.class);
         WidgetType foundWidgetType = doGet("/api/widgetType?fqn={fqn}",
-                WidgetType.class, "tenant."+savedWidgetType.getFqn());
+                WidgetType.class, "tenant." + savedWidgetType.getFqn());
         Assert.assertNotNull(foundWidgetType);
         Assert.assertEquals(new WidgetType(savedWidgetType), foundWidgetType);
     }
diff --git a/application/src/test/java/org/thingsboard/server/controller/WidgetsBundleControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/WidgetsBundleControllerTest.java
index bb7bab22f3..03506af95c 100644
--- a/application/src/test/java/org/thingsboard/server/controller/WidgetsBundleControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/WidgetsBundleControllerTest.java
@@ -53,7 +53,7 @@ public class WidgetsBundleControllerTest extends AbstractControllerTest {
 
         Tenant tenant = new Tenant();
         tenant.setTitle("My tenant");
-        savedTenant = doPost("/api/tenant", tenant, Tenant.class);
+        savedTenant = saveTenant(tenant);
         Assert.assertNotNull(savedTenant);
 
         tenantAdmin = new User();
@@ -70,8 +70,7 @@ public class WidgetsBundleControllerTest extends AbstractControllerTest {
     public void afterTest() throws Exception {
         loginSysAdmin();
 
-        doDelete("/api/tenant/" + savedTenant.getId().getId().toString())
-                .andExpect(status().isOk());
+        deleteTenant(savedTenant.getId());
     }
 
     @Test
diff --git a/application/src/test/java/org/thingsboard/server/controller/plugin/TbWebSocketHandlerTest.java b/application/src/test/java/org/thingsboard/server/controller/plugin/TbWebSocketHandlerTest.java
index b6891953a9..6e1198758d 100644
--- a/application/src/test/java/org/thingsboard/server/controller/plugin/TbWebSocketHandlerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/plugin/TbWebSocketHandlerTest.java
@@ -26,10 +26,10 @@ import org.springframework.web.socket.adapter.NativeWebSocketSession;
 import org.thingsboard.common.util.ThingsBoardThreadFactory;
 import org.thingsboard.server.service.ws.WebSocketSessionRef;
 
-import javax.websocket.RemoteEndpoint;
-import javax.websocket.SendHandler;
-import javax.websocket.SendResult;
-import javax.websocket.Session;
+import jakarta.websocket.RemoteEndpoint;
+import jakarta.websocket.SendHandler;
+import jakarta.websocket.SendResult;
+import jakarta.websocket.Session;
 import java.io.IOException;
 import java.util.Collection;
 import java.util.Deque;
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 7f55f9735c..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;
@@ -95,7 +97,6 @@ import org.thingsboard.server.gen.edge.v1.TenantUpdateMsg;
 import org.thingsboard.server.gen.edge.v1.UpdateMsgType;
 import org.thingsboard.server.gen.edge.v1.UplinkMsg;
 import org.thingsboard.server.gen.edge.v1.UserUpdateMsg;
-import org.thingsboard.server.queue.util.DataDecodingEncodingService;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -124,9 +125,6 @@ abstract public class AbstractEdgeTest extends AbstractControllerTest {
     @Autowired
     protected EdgeEventService edgeEventService;
 
-    @Autowired
-    protected DataDecodingEncodingService dataDecodingEncodingService;
-
     @Autowired
     protected TbClusterService clusterService;
 
@@ -144,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();
 
@@ -165,7 +164,8 @@ abstract public class AbstractEdgeTest extends AbstractControllerTest {
 
     private RuleChainId getEdgeRootRuleChainId() throws Exception {
         List<RuleChain> edgeRuleChains = doGetTypedWithPageLink("/api/edge/" + edge.getUuidId() + "/ruleChains?",
-                new TypeReference<PageData<RuleChain>>() {}, new PageLink(100)).getData();
+                new TypeReference<PageData<RuleChain>>() {
+                }, new PageLink(100)).getData();
         for (RuleChain edgeRuleChain : edgeRuleChains) {
             if (edgeRuleChain.isRoot()) {
                 return edgeRuleChain.getId();
@@ -182,7 +182,8 @@ abstract public class AbstractEdgeTest extends AbstractControllerTest {
             doDelete("/api/edge/" + edge.getId().toString())
                     .andExpect(status().isOk());
             edgeImitator.disconnect();
-        } catch (Exception ignored) {}
+        } catch (Exception ignored) {
+        }
     }
 
     private void installation() throws Exception {
@@ -379,7 +380,8 @@ abstract public class AbstractEdgeTest extends AbstractControllerTest {
         Device device = doGet("/api/device/" + deviceUUID, Device.class);
         Assert.assertNotNull(device);
         List<DeviceInfo> edgeDevices = doGetTypedWithPageLink("/api/edge/" + edge.getUuidId() + "/devices?",
-                new TypeReference<PageData<DeviceInfo>>() {}, new PageLink(100)).getData();
+                new TypeReference<PageData<DeviceInfo>>() {
+                }, new PageLink(100)).getData();
         Assert.assertTrue(edgeDevices.stream().map(DeviceInfo::getId).anyMatch(id -> id.equals(device.getId())));
 
         testAutoGeneratedCodeByProtobuf(deviceUpdateMsg);
@@ -398,7 +400,8 @@ abstract public class AbstractEdgeTest extends AbstractControllerTest {
         Asset asset = doGet("/api/asset/" + assetUUID, Asset.class);
         Assert.assertNotNull(asset);
         List<Asset> edgeAssets = doGetTypedWithPageLink("/api/edge/" + edge.getUuidId() + "/assets?",
-                new TypeReference<PageData<Asset>>() {}, new PageLink(100)).getData();
+                new TypeReference<PageData<Asset>>() {
+                }, new PageLink(100)).getData();
         Assert.assertTrue(edgeAssets.contains(asset));
 
         testAutoGeneratedCodeByProtobuf(assetUpdateMsg);
@@ -418,7 +421,8 @@ abstract public class AbstractEdgeTest extends AbstractControllerTest {
         RuleChain ruleChain = doGet("/api/ruleChain/" + ruleChainUUID, RuleChain.class);
         Assert.assertNotNull(ruleChain);
         List<RuleChain> edgeRuleChains = doGetTypedWithPageLink("/api/edge/" + edge.getUuidId() + "/ruleChains?",
-                new TypeReference<PageData<RuleChain>>() {}, new PageLink(100)).getData();
+                new TypeReference<PageData<RuleChain>>() {
+                }, new PageLink(100)).getData();
         Assert.assertTrue(edgeRuleChains.contains(ruleChain));
         testAutoGeneratedCodeByProtobuf(ruleChainUpdateMsg);
     }
@@ -537,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/DeviceEdgeTest.java b/application/src/test/java/org/thingsboard/server/edge/DeviceEdgeTest.java
index 458bb3240e..9e09a16fd9 100644
--- a/application/src/test/java/org/thingsboard/server/edge/DeviceEdgeTest.java
+++ b/application/src/test/java/org/thingsboard/server/edge/DeviceEdgeTest.java
@@ -281,7 +281,7 @@ public class DeviceEdgeTest extends AbstractEdgeTest {
                 (DefaultTenantProfileConfiguration) tenantProfile.getProfileData().getConfiguration();
         profileConfiguration.setMaxDevices(1);
         tenantProfile.getProfileData().setConfiguration(profileConfiguration);
-        doPost("/api/tenantProfile/", tenantProfile, TenantProfile.class);
+        doPost("/api/tenantProfile", tenantProfile, TenantProfile.class);
 
         loginTenantAdmin();
 
@@ -591,7 +591,6 @@ public class DeviceEdgeTest extends AbstractEdgeTest {
                 device.getId().getId(), EdgeEventType.DEVICE, body);
         edgeImitator.expectMessageAmount(1);
         edgeEventService.saveAsync(edgeEvent).get();
-        clusterService.onEdgeEventUpdate(tenantId, edge.getId());
         Assert.assertTrue(edgeImitator.waitForMessages());
 
         AbstractMessage latestMessage = edgeImitator.getLatestMessage();
diff --git a/application/src/test/java/org/thingsboard/server/edge/DeviceProfileEdgeTest.java b/application/src/test/java/org/thingsboard/server/edge/DeviceProfileEdgeTest.java
index 3a3fd15c0a..a085f3a821 100644
--- a/application/src/test/java/org/thingsboard/server/edge/DeviceProfileEdgeTest.java
+++ b/application/src/test/java/org/thingsboard/server/edge/DeviceProfileEdgeTest.java
@@ -198,16 +198,16 @@ public class DeviceProfileEdgeTest extends AbstractEdgeTest {
 
         Assert.assertEquals("PUBLIC_KEY", noSecLwM2MBootstrapServerCredential.getServerPublicKey());
         Assert.assertEquals(Integer.valueOf(123), noSecLwM2MBootstrapServerCredential.getShortServerId());
-        Assert.assertTrue(noSecLwM2MBootstrapServerCredential.isBootstrapServerIs());
+        Assert.assertFalse(noSecLwM2MBootstrapServerCredential.isBootstrapServerIs());
         Assert.assertEquals("localhost", noSecLwM2MBootstrapServerCredential.getHost());
-        Assert.assertEquals(Integer.valueOf(5687), noSecLwM2MBootstrapServerCredential.getPort());
+        Assert.assertEquals(Integer.valueOf(5685), noSecLwM2MBootstrapServerCredential.getPort());
 
         TelemetryMappingConfiguration observeAttr = transportConfiguration.getObserveAttr();
-        Assert.assertEquals("batteryLevel", observeAttr.getKeyName().get("/3_1.0/0/9"));
+        Assert.assertEquals("batteryLevel", observeAttr.getKeyName().get("/3_1.2/0/9"));
         Assert.assertTrue(observeAttr.getObserve().isEmpty());
         Assert.assertTrue(observeAttr.getAttribute().isEmpty());
         Assert.assertFalse(observeAttr.getTelemetry().isEmpty());
-        Assert.assertTrue(observeAttr.getTelemetry().contains("/3_1.0/0/9"));
+        Assert.assertTrue(observeAttr.getTelemetry().contains("/3_1.2/0/9"));
         Assert.assertTrue(observeAttr.getAttributeLwm2m().isEmpty());
 
         removeDeviceProfileAndDoBasicAssert(deviceProfile);
@@ -366,9 +366,9 @@ public class DeviceProfileEdgeTest extends AbstractEdgeTest {
         AbstractLwM2MBootstrapServerCredential bootstrapServerCredential = new NoSecLwM2MBootstrapServerCredential();
         bootstrapServerCredential.setServerPublicKey("PUBLIC_KEY");
         bootstrapServerCredential.setShortServerId(123);
-        bootstrapServerCredential.setBootstrapServerIs(true);
+        bootstrapServerCredential.setBootstrapServerIs(false);
         bootstrapServerCredential.setHost("localhost");
-        bootstrapServerCredential.setPort(5687);
+        bootstrapServerCredential.setPort(5685);
         bootstrap.add(bootstrapServerCredential);
         transportConfiguration.setBootstrap(bootstrap);
 
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/TelemetryEdgeTest.java b/application/src/test/java/org/thingsboard/server/edge/TelemetryEdgeTest.java
index d37cb02e3e..00b8cc4b74 100644
--- a/application/src/test/java/org/thingsboard/server/edge/TelemetryEdgeTest.java
+++ b/application/src/test/java/org/thingsboard/server/edge/TelemetryEdgeTest.java
@@ -59,7 +59,6 @@ public class TelemetryEdgeTest extends AbstractEdgeTest {
             EdgeEvent edgeEvent = constructEdgeEvent(tenantId, edge.getId(), EdgeEventActionType.TIMESERIES_UPDATED,
                     device.getId().getId(), EdgeEventType.DEVICE, timeseriesEntityData);
             edgeEventService.saveAsync(edgeEvent).get();
-            clusterService.onEdgeEventUpdate(tenantId, edge.getId());
         }
 
         Assert.assertTrue(edgeImitator.waitForMessages(120));
@@ -89,7 +88,6 @@ public class TelemetryEdgeTest extends AbstractEdgeTest {
         EdgeEvent edgeEvent = constructEdgeEvent(tenantId, edge.getId(), EdgeEventActionType.POST_ATTRIBUTES, device.getId().getId(), EdgeEventType.DEVICE, postAttributesEntityData);
         edgeImitator.expectMessageAmount(1);
         edgeEventService.saveAsync(edgeEvent).get();
-        clusterService.onEdgeEventUpdate(tenantId, edge.getId());
         Assert.assertTrue(edgeImitator.waitForMessages());
 
         AbstractMessage latestMessage = edgeImitator.getLatestMessage();
@@ -114,7 +112,6 @@ public class TelemetryEdgeTest extends AbstractEdgeTest {
         EdgeEvent edgeEvent = constructEdgeEvent(tenantId, edge.getId(), EdgeEventActionType.ATTRIBUTES_DELETED, device.getId().getId(), EdgeEventType.DEVICE, deleteAttributesEntityData);
         edgeImitator.expectMessageAmount(1);
         edgeEventService.saveAsync(edgeEvent).get();
-        clusterService.onEdgeEventUpdate(tenantId, edge.getId());
         Assert.assertTrue(edgeImitator.waitForMessages());
 
         AbstractMessage latestMessage = edgeImitator.getLatestMessage();
@@ -142,7 +139,6 @@ public class TelemetryEdgeTest extends AbstractEdgeTest {
         edgeImitator.expectMessageAmount(1);
         EdgeEvent edgeEvent = constructEdgeEvent(tenantId, edge.getId(), EdgeEventActionType.TIMESERIES_UPDATED, device.getId().getId(), EdgeEventType.DEVICE, timeseriesEntityData);
         edgeEventService.saveAsync(edgeEvent).get();
-        clusterService.onEdgeEventUpdate(tenantId, edge.getId());
         Assert.assertTrue(edgeImitator.waitForMessages());
 
         AbstractMessage latestMessage = edgeImitator.getLatestMessage();
@@ -198,8 +194,6 @@ public class TelemetryEdgeTest extends AbstractEdgeTest {
             EdgeEvent successEdgeEvent = constructEdgeEvent(tenantId, edge.getId(), EdgeEventActionType.UPDATED,
                     device.getId().getId(), EdgeEventType.DEVICE, null);
             edgeEventService.saveAsync(successEdgeEvent).get();
-
-            clusterService.onEdgeEventUpdate(tenantId, edge.getId());
         }
 
         Assert.assertTrue(edgeImitator.waitForMessages(120));
@@ -224,7 +218,6 @@ public class TelemetryEdgeTest extends AbstractEdgeTest {
         EdgeEvent edgeEvent1 = constructEdgeEvent(tenantId, edge.getId(), EdgeEventActionType.ATTRIBUTES_UPDATED, entityId.getId(), EdgeEventType.valueOf(entityId.getEntityType().name()), attributesEntityData);
         edgeImitator.expectMessageAmount(1);
         edgeEventService.saveAsync(edgeEvent1).get();
-        clusterService.onEdgeEventUpdate(tenantId, edge.getId());
         Assert.assertTrue(edgeImitator.waitForMessages());
 
         AbstractMessage latestMessage = edgeImitator.getLatestMessage();
diff --git a/application/src/test/java/org/thingsboard/server/edge/TenantEdgeTest.java b/application/src/test/java/org/thingsboard/server/edge/TenantEdgeTest.java
index 7d740ca472..2611aa433c 100644
--- a/application/src/test/java/org/thingsboard/server/edge/TenantEdgeTest.java
+++ b/application/src/test/java/org/thingsboard/server/edge/TenantEdgeTest.java
@@ -40,7 +40,7 @@ public class TenantEdgeTest extends AbstractEdgeTest {
         // updated edge tenant
         savedTenant.setTitle("Updated Title for Tenant Edge Test");
         edgeImitator.expectMessageAmount(2); // expect tenant and tenant profile update msg
-        savedTenant = doPost("/api/tenant", savedTenant, Tenant.class);
+        savedTenant = saveTenant(savedTenant);
         Assert.assertTrue(edgeImitator.waitForMessages());
         Optional<TenantUpdateMsg> tenantUpdateMsgOpt = edgeImitator.findMessageByType(TenantUpdateMsg.class);
         Assert.assertTrue(tenantUpdateMsgOpt.isPresent());
@@ -61,7 +61,7 @@ public class TenantEdgeTest extends AbstractEdgeTest {
         TenantProfile tenantProfile = createTenantProfile();
         savedTenant.setTenantProfileId(tenantProfile.getId());
         edgeImitator.expectMessageAmount(2); // expect tenant and tenant profile update msg
-        savedTenant = doPost("/api/tenant", savedTenant, Tenant.class);
+        savedTenant = saveTenant(savedTenant);
         Assert.assertTrue(edgeImitator.waitForMessages());
         tenantUpdateMsgOpt = edgeImitator.findMessageByType(TenantUpdateMsg.class);
         Assert.assertTrue(tenantUpdateMsgOpt.isPresent());
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/rules/flow/AbstractRuleEngineFlowIntegrationTest.java b/application/src/test/java/org/thingsboard/server/rules/flow/AbstractRuleEngineFlowIntegrationTest.java
index 4ce6c1df36..9e36fed677 100644
--- a/application/src/test/java/org/thingsboard/server/rules/flow/AbstractRuleEngineFlowIntegrationTest.java
+++ b/application/src/test/java/org/thingsboard/server/rules/flow/AbstractRuleEngineFlowIntegrationTest.java
@@ -27,10 +27,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.util.ReflectionTestUtils;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.rule.engine.flow.TbRuleChainInputNodeConfiguration;
-import org.thingsboard.rule.engine.util.TbMsgSource;
 import org.thingsboard.rule.engine.metadata.TbGetAttributesNode;
 import org.thingsboard.rule.engine.metadata.TbGetAttributesNodeConfiguration;
+import org.thingsboard.rule.engine.util.TbMsgSource;
 import org.thingsboard.server.actors.ActorSystemContext;
+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.EventInfo;
@@ -61,7 +62,6 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 import static org.mockito.Mockito.spy;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 /**
  * @author Valerii Sosliuk
@@ -102,7 +102,7 @@ public abstract class AbstractRuleEngineFlowIntegrationTest extends AbstractRule
 
         Tenant tenant = new Tenant();
         tenant.setTitle("My tenant");
-        savedTenant = doPost("/api/tenant", tenant, Tenant.class);
+        savedTenant = saveTenant(tenant);
         Assert.assertNotNull(savedTenant);
         ruleChainService.deleteRuleChainsByTenantId(savedTenant.getId());
 
@@ -120,7 +120,7 @@ public abstract class AbstractRuleEngineFlowIntegrationTest extends AbstractRule
     public void afterTest() throws Exception {
         loginSysAdmin();
         if (savedTenant != null) {
-            doDelete("/api/tenant/" + savedTenant.getId().getId().toString()).andExpect(status().isOk());
+            deleteTenant(savedTenant.getId());
         }
     }
 
@@ -174,9 +174,9 @@ public abstract class AbstractRuleEngineFlowIntegrationTest extends AbstractRule
         device.setType("default");
         device = doPost("/api/device", device, Device.class);
 
-        attributesService.save(device.getTenantId(), device.getId(), DataConstants.SERVER_SCOPE,
+        attributesService.save(device.getTenantId(), device.getId(), AttributeScope.SERVER_SCOPE,
                 Collections.singletonList(new BaseAttributeKvEntry(new StringDataEntry("serverAttributeKey1", "serverAttributeValue1"), System.currentTimeMillis()))).get();
-        attributesService.save(device.getTenantId(), device.getId(), DataConstants.SERVER_SCOPE,
+        attributesService.save(device.getTenantId(), device.getId(), AttributeScope.SERVER_SCOPE,
                 Collections.singletonList(new BaseAttributeKvEntry(new StringDataEntry("serverAttributeKey2", "serverAttributeValue2"), System.currentTimeMillis()))).get();
 
         TbMsgCallback tbMsgCallback = Mockito.mock(TbMsgCallback.class);
@@ -299,9 +299,9 @@ public abstract class AbstractRuleEngineFlowIntegrationTest extends AbstractRule
         device.setType("default");
         device = doPost("/api/device", device, Device.class);
 
-        attributesService.save(device.getTenantId(), device.getId(), DataConstants.SERVER_SCOPE,
+        attributesService.save(device.getTenantId(), device.getId(), AttributeScope.SERVER_SCOPE,
                 Collections.singletonList(new BaseAttributeKvEntry(new StringDataEntry("serverAttributeKey1", "serverAttributeValue1"), System.currentTimeMillis()))).get();
-        attributesService.save(device.getTenantId(), device.getId(), DataConstants.SERVER_SCOPE,
+        attributesService.save(device.getTenantId(), device.getId(), AttributeScope.SERVER_SCOPE,
                 Collections.singletonList(new BaseAttributeKvEntry(new StringDataEntry("serverAttributeKey2", "serverAttributeValue2"), System.currentTimeMillis()))).get();
 
         TbMsgCallback tbMsgCallback = Mockito.mock(TbMsgCallback.class);
diff --git a/application/src/test/java/org/thingsboard/server/rules/lifecycle/AbstractRuleEngineLifecycleIntegrationTest.java b/application/src/test/java/org/thingsboard/server/rules/lifecycle/AbstractRuleEngineLifecycleIntegrationTest.java
index e7dd58d5ba..2f3ec5315f 100644
--- a/application/src/test/java/org/thingsboard/server/rules/lifecycle/AbstractRuleEngineLifecycleIntegrationTest.java
+++ b/application/src/test/java/org/thingsboard/server/rules/lifecycle/AbstractRuleEngineLifecycleIntegrationTest.java
@@ -28,6 +28,7 @@ import org.thingsboard.rule.engine.util.TbMsgSource;
 import org.thingsboard.rule.engine.metadata.TbGetAttributesNode;
 import org.thingsboard.rule.engine.metadata.TbGetAttributesNodeConfiguration;
 import org.thingsboard.server.actors.ActorSystemContext;
+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.EventInfo;
@@ -134,7 +135,7 @@ public abstract class AbstractRuleEngineLifecycleIntegrationTest extends Abstrac
         device = doPost("/api/device", device, Device.class);
 
         log.warn("before update attr");
-        attributesService.save(device.getTenantId(), device.getId(), DataConstants.SERVER_SCOPE,
+        attributesService.save(device.getTenantId(), device.getId(), AttributeScope.SERVER_SCOPE,
                 Collections.singletonList(new BaseAttributeKvEntry(new StringDataEntry("serverAttributeKey", "serverAttributeValue"), System.currentTimeMillis())))
                 .get(TIMEOUT, TimeUnit.SECONDS);
         log.warn("attr updated");
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 835b39caf9..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;
@@ -62,7 +66,6 @@ import org.thingsboard.server.dao.widget.WidgetsBundleService;
 import org.thingsboard.server.gen.edge.v1.EdgeVersion;
 import org.thingsboard.server.queue.discovery.PartitionService;
 import org.thingsboard.server.queue.provider.TbQueueProducerProvider;
-import org.thingsboard.server.queue.util.DataDecodingEncodingService;
 import org.thingsboard.server.service.edge.rpc.constructor.alarm.AlarmMsgConstructorFactory;
 import org.thingsboard.server.service.edge.rpc.constructor.alarm.AlarmMsgConstructorV1;
 import org.thingsboard.server.service.edge.rpc.constructor.alarm.AlarmMsgConstructorV2;
@@ -82,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;
@@ -129,13 +134,15 @@ 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;
 import org.thingsboard.server.service.edge.rpc.processor.resource.ResourceEdgeProcessorFactory;
 import org.thingsboard.server.service.edge.rpc.processor.resource.ResourceEdgeProcessorV1;
 import org.thingsboard.server.service.edge.rpc.processor.resource.ResourceEdgeProcessorV2;
-import org.thingsboard.server.service.entitiy.TbNotificationEntityService;
+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;
@@ -151,7 +158,7 @@ public abstract class BaseEdgeProcessorTest {
     protected TelemetrySubscriptionService tsSubService;
 
     @MockBean
-    protected TbNotificationEntityService notificationEntityService;
+    protected TbLogEntityActionService logEntityActionService;
 
     @MockBean
     protected RuleChainService ruleChainService;
@@ -195,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;
 
@@ -240,6 +256,9 @@ public abstract class BaseEdgeProcessorTest {
     @MockBean
     protected ResourceService resourceService;
 
+    @MockBean
+    protected OAuth2Service oAuth2Service;
+
     @MockBean
     @Lazy
     protected TbQueueProducerProvider producerProvider;
@@ -361,6 +380,12 @@ public abstract class BaseEdgeProcessorTest {
     @MockBean
     protected WidgetMsgConstructorV2 widgetMsgConstructorV2;
 
+    @MockBean
+    protected NotificationMsgConstructor notificationMsgConstructor;
+
+    @MockBean
+    protected OAuth2MsgConstructor oAuth2MsgConstructor;
+
     @MockBean
     protected AlarmEdgeProcessorV1 alarmProcessorV1;
 
@@ -418,6 +443,12 @@ public abstract class BaseEdgeProcessorTest {
     @MockBean
     protected RelationEdgeProcessorV2 relationEdgeProcessorV2;
 
+    @MockBean
+    protected OAuth2EdgeProcessor oAuth2EdgeProcessor;
+
+    @MockBean
+    protected NotificationEdgeProcessor notificationEdgeProcessor;
+
     @SpyBean
     protected RuleChainMsgConstructorFactory ruleChainMsgConstructorFactory;
 
@@ -489,9 +520,6 @@ public abstract class BaseEdgeProcessorTest {
 
     @MockBean
     protected DbCallbackExecutorService dbCallbackExecutorService;
-    
-    @MockBean
-    protected DataDecodingEncodingService dataDecodingEncodingService;
 
     protected EdgeId edgeId;
     protected TenantId tenantId;
@@ -518,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/device/AbstractDeviceProcessorTest.java b/application/src/test/java/org/thingsboard/server/service/edge/rpc/processor/device/AbstractDeviceProcessorTest.java
index 0e864e230f..0ec40fb908 100644
--- a/application/src/test/java/org/thingsboard/server/service/edge/rpc/processor/device/AbstractDeviceProcessorTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/edge/rpc/processor/device/AbstractDeviceProcessorTest.java
@@ -74,8 +74,6 @@ public abstract class AbstractDeviceProcessorTest extends BaseEdgeProcessorTest
 
         willReturn(device).given(deviceService).findDeviceById(tenantId, deviceId);
         willReturn(deviceProfile).given(deviceProfileService).findDeviceProfileById(tenantId, deviceProfileId);
-        willReturn(new byte[]{0x00}).given(dataDecodingEncodingService).encode(deviceProfileData);
-
     }
 
     protected void updateDeviceProfileDefaultFields(long expectedDashboardIdMSB, long expectedDashboardIdLSB,
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/entitiy/alarm/DefaultTbAlarmServiceTest.java b/application/src/test/java/org/thingsboard/server/service/entitiy/alarm/DefaultTbAlarmServiceTest.java
index c9cec6fb1a..eb20210938 100644
--- a/application/src/test/java/org/thingsboard/server/service/entitiy/alarm/DefaultTbAlarmServiceTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/entitiy/alarm/DefaultTbAlarmServiceTest.java
@@ -41,7 +41,7 @@ import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.dao.alarm.AlarmService;
 import org.thingsboard.server.dao.customer.CustomerService;
 import org.thingsboard.server.dao.edge.EdgeService;
-import org.thingsboard.server.service.entitiy.TbNotificationEntityService;
+import org.thingsboard.server.service.entitiy.TbLogEntityActionService;
 import org.thingsboard.server.service.executors.DbCallbackExecutorService;
 import org.thingsboard.server.service.sync.vc.EntitiesVersionControlService;
 import org.thingsboard.server.service.telemetry.AlarmSubscriptionService;
@@ -68,7 +68,7 @@ public class DefaultTbAlarmServiceTest {
     @MockBean
     protected DbCallbackExecutorService dbExecutor;
     @MockBean
-    protected TbNotificationEntityService notificationEntityService;
+    protected TbLogEntityActionService logEntityActionService;
     @MockBean
     protected EdgeService edgeService;
     @MockBean
@@ -96,7 +96,7 @@ public class DefaultTbAlarmServiceTest {
                 .build());
         service.save(alarm, new User());
 
-        verify(notificationEntityService, times(1)).logEntityAction(any(), any(), any(), any(), eq(ActionType.ADDED), any());
+        verify(logEntityActionService, times(1)).logEntityAction(any(), any(), any(), any(), eq(ActionType.ADDED), any());
         verify(alarmSubscriptionService, times(1)).createAlarm(any());
     }
 
@@ -108,7 +108,7 @@ public class DefaultTbAlarmServiceTest {
         service.ack(alarm, new User(new UserId(UUID.randomUUID())));
 
         verify(alarmCommentService, times(1)).saveAlarmComment(any(), any(), any());
-        verify(notificationEntityService, times(1)).logEntityAction(any(), any(), any(), any(), eq(ActionType.ALARM_ACK), any());
+        verify(logEntityActionService, times(1)).logEntityAction(any(), any(), any(), any(), eq(ActionType.ALARM_ACK), any());
         verify(alarmSubscriptionService, times(1)).acknowledgeAlarm(any(), any(), anyLong());
     }
 
@@ -121,7 +121,7 @@ public class DefaultTbAlarmServiceTest {
         service.clear(alarm, new User(new UserId(UUID.randomUUID())));
 
         verify(alarmCommentService, times(1)).saveAlarmComment(any(), any(), any());
-        verify(notificationEntityService, times(1)).logEntityAction(any(), any(), any(), any(), eq(ActionType.ALARM_CLEAR), any());
+        verify(logEntityActionService, times(1)).logEntityAction(any(), any(), any(), any(), eq(ActionType.ALARM_CLEAR), any());
         verify(alarmSubscriptionService, times(1)).clearAlarm(any(), any(), anyLong(), any());
     }
 
@@ -129,7 +129,7 @@ public class DefaultTbAlarmServiceTest {
     public void testDelete() {
         service.delete(new Alarm(), new User());
 
-        verify(notificationEntityService, times(1)).logEntityAction(any(), any(), any(), any(), eq(ActionType.ALARM_DELETE), any());
+        verify(logEntityActionService, times(1)).logEntityAction(any(), any(), any(), any(), eq(ActionType.ALARM_DELETE), any());
         verify(alarmSubscriptionService, times(1)).deleteAlarm(any(), any());
     }
 
@@ -173,7 +173,7 @@ public class DefaultTbAlarmServiceTest {
         User user = new User();
         user.setEmail("testEmail@gmail.com");
         user.setId(new UserId(UUID.randomUUID()));
-        service.unassignDeletedUserAlarms(new TenantId(UUID.randomUUID()), user, System.currentTimeMillis());
+        service.unassignDeletedUserAlarms(new TenantId(UUID.randomUUID()), user.getId(), user.getTitle(), System.currentTimeMillis());
 
         ObjectNode commentNode = JacksonUtil.newObjectNode();
         commentNode.put("subtype", "ASSIGN");
diff --git a/application/src/test/java/org/thingsboard/server/service/entitiy/alarmComment/DefaultTbAlarmCommentServiceTest.java b/application/src/test/java/org/thingsboard/server/service/entitiy/alarmComment/DefaultTbAlarmCommentServiceTest.java
index 111f6f72d0..b36ca51416 100644
--- a/application/src/test/java/org/thingsboard/server/service/entitiy/alarmComment/DefaultTbAlarmCommentServiceTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/entitiy/alarmComment/DefaultTbAlarmCommentServiceTest.java
@@ -36,7 +36,7 @@ import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.dao.alarm.AlarmCommentService;
 import org.thingsboard.server.dao.alarm.AlarmService;
 import org.thingsboard.server.dao.customer.CustomerService;
-import org.thingsboard.server.service.entitiy.TbNotificationEntityService;
+import org.thingsboard.server.service.entitiy.TbLogEntityActionService;
 import org.thingsboard.server.service.entitiy.alarm.DefaultTbAlarmCommentService;
 import org.thingsboard.server.service.executors.DbCallbackExecutorService;
 import org.thingsboard.server.service.telemetry.AlarmSubscriptionService;
@@ -61,7 +61,7 @@ public class DefaultTbAlarmCommentServiceTest {
     @MockBean
     protected DbCallbackExecutorService dbExecutor;
     @MockBean
-    protected TbNotificationEntityService notificationEntityService;
+    protected TbLogEntityActionService logEntityActionService;
     @MockBean
     protected AlarmService alarmService;
     @MockBean
@@ -82,7 +82,7 @@ public class DefaultTbAlarmCommentServiceTest {
         when(alarmCommentService.createOrUpdateAlarmComment(Mockito.any(), eq(alarmComment))).thenReturn(alarmComment);
         service.saveAlarmComment(alarm, alarmComment, new User());
 
-        verify(notificationEntityService, times(1)).logEntityAction(any(), any(), any(), any(), eq(ActionType.ADDED_COMMENT), any(), any());
+        verify(logEntityActionService, times(1)).logEntityAction(any(), any(), any(), any(), eq(ActionType.ADDED_COMMENT), any(), any());
     }
 
     @Test
@@ -96,7 +96,7 @@ public class DefaultTbAlarmCommentServiceTest {
         when(alarmCommentService.saveAlarmComment(Mockito.any(), eq(alarmComment))).thenReturn(alarmComment);
         service.deleteAlarmComment(new Alarm(alarmId), alarmComment, new User());
 
-        verify(notificationEntityService, times(1)).logEntityAction(any(), any(), any(), any(), eq(ActionType.DELETED_COMMENT), any(), any());
+        verify(logEntityActionService, times(1)).logEntityAction(any(), any(), any(), any(), eq(ActionType.DELETED_COMMENT), any(), any());
     }
 
     @Test
diff --git a/application/src/test/java/org/thingsboard/server/service/housekeeper/HousekeeperServiceTest.java b/application/src/test/java/org/thingsboard/server/service/housekeeper/HousekeeperServiceTest.java
new file mode 100644
index 0000000000..e8f1a43ad1
--- /dev/null
+++ b/application/src/test/java/org/thingsboard/server/service/housekeeper/HousekeeperServiceTest.java
@@ -0,0 +1,478 @@
+/**
+ * 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.housekeeper;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.TextNode;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.ArgumentMatcher;
+import org.mockito.Mockito;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.TestPropertySource;
+import org.testcontainers.shaded.org.apache.commons.lang3.RandomStringUtils;
+import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.rule.engine.metadata.TbGetAttributesNode;
+import org.thingsboard.rule.engine.metadata.TbGetAttributesNodeConfiguration;
+import org.thingsboard.server.common.data.ApiUsageState;
+import org.thingsboard.server.common.data.AttributeScope;
+import org.thingsboard.server.common.data.Device;
+import org.thingsboard.server.common.data.EventInfo;
+import org.thingsboard.server.common.data.alarm.Alarm;
+import org.thingsboard.server.common.data.alarm.AlarmSeverity;
+import org.thingsboard.server.common.data.alarm.EntityAlarm;
+import org.thingsboard.server.common.data.asset.Asset;
+import org.thingsboard.server.common.data.event.EventType;
+import org.thingsboard.server.common.data.event.LifecycleEvent;
+import org.thingsboard.server.common.data.housekeeper.HousekeeperTask;
+import org.thingsboard.server.common.data.housekeeper.HousekeeperTaskType;
+import org.thingsboard.server.common.data.id.AlarmId;
+import org.thingsboard.server.common.data.id.AssetId;
+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.id.UserId;
+import org.thingsboard.server.common.data.kv.BaseAttributeKvEntry;
+import org.thingsboard.server.common.data.kv.BaseReadTsKvQuery;
+import org.thingsboard.server.common.data.kv.BasicTsKvEntry;
+import org.thingsboard.server.common.data.kv.StringDataEntry;
+import org.thingsboard.server.common.data.kv.TsKvEntry;
+import org.thingsboard.server.common.data.msg.TbNodeConnectionType;
+import org.thingsboard.server.common.data.page.PageLink;
+import org.thingsboard.server.common.data.page.TimePageLink;
+import org.thingsboard.server.common.data.relation.EntityRelation;
+import org.thingsboard.server.common.data.relation.RelationTypeGroup;
+import org.thingsboard.server.common.data.rule.RuleChain;
+import org.thingsboard.server.common.data.rule.RuleChainMetaData;
+import org.thingsboard.server.common.data.rule.RuleChainType;
+import org.thingsboard.server.common.data.rule.RuleNode;
+import org.thingsboard.server.controller.AbstractControllerTest;
+import org.thingsboard.server.dao.alarm.AlarmDao;
+import org.thingsboard.server.dao.alarm.AlarmService;
+import org.thingsboard.server.dao.attributes.AttributesService;
+import org.thingsboard.server.dao.entity.EntityServiceRegistry;
+import org.thingsboard.server.dao.event.EventService;
+import org.thingsboard.server.dao.relation.RelationService;
+import org.thingsboard.server.dao.rule.RuleChainService;
+import org.thingsboard.server.dao.service.DaoSqlTest;
+import org.thingsboard.server.dao.timeseries.TimeseriesService;
+import org.thingsboard.server.dao.usagerecord.ApiUsageStateDao;
+import org.thingsboard.server.gen.transport.TransportProtos.HousekeeperTaskProto;
+import org.thingsboard.server.gen.transport.TransportProtos.ToHousekeeperServiceMsg;
+import org.thingsboard.server.service.housekeeper.processor.TsHistoryDeletionTaskProcessor;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.Mockito.doCallRealMethod;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+@DaoSqlTest
+@TestPropertySource(properties = {
+        "transport.http.enabled=true",
+        "queue.core.housekeeper.task-reprocessing-delay-ms=2000",
+        "queue.core.housekeeper.poll-interval-ms=1000",
+        "queue.core.housekeeper.max-reprocessing-attempts=5"
+})
+public class HousekeeperServiceTest extends AbstractControllerTest {
+
+    @SpyBean
+    private HousekeeperService housekeeperService;
+    @SpyBean
+    private HousekeeperReprocessingService housekeeperReprocessingService;
+    @Autowired
+    private EventService eventService;
+    @Autowired
+    private TimeseriesService timeseriesService;
+    @Autowired
+    private AttributesService attributesService;
+    @Autowired
+    private RuleChainService ruleChainService;
+    @Autowired
+    private AlarmService alarmService;
+    @Autowired
+    private AlarmDao alarmDao;
+    @Autowired
+    private RelationService relationService;
+    @Autowired
+    private ApiUsageStateDao apiUsageStateDao;
+    @Autowired
+    private EntityServiceRegistry entityServiceRegistry;
+    @SpyBean
+    private TsHistoryDeletionTaskProcessor tsHistoryDeletionTaskProcessor;
+
+    private TenantId tenantId;
+
+    private static final String TELEMETRY_KEY = "telemetry1";
+    private static final String ATTRIBUTE_KEY = "_attribute1";
+    private static final String KV_VALUE = "ewfewfwef";
+
+    @Before
+    public void setUp() throws Exception {
+        loginTenantAdmin();
+        this.tenantId = super.tenantId;
+    }
+
+    @After
+    public void tearDown() throws Exception {
+    }
+
+    @Test
+    public void whenDeviceIsDeleted_thenCleanUpRelatedData() throws Exception {
+        Device device = createDevice("test", "test");
+        createRelatedData(device.getId());
+
+        doDelete("/api/device/" + device.getId()).andExpect(status().isOk());
+
+        await().atMost(10, TimeUnit.SECONDS).untilAsserted(() -> {
+            verifyNoRelatedData(device.getId());
+        });
+    }
+
+    @Test
+    public void whenRuleChainIsDeleted_thenCleanUpRelatedData() throws Exception {
+        RuleChainMetaData ruleChainMetaData = createRuleChain();
+        RuleChainId ruleChainId = ruleChainMetaData.getRuleChainId();
+        RuleNodeId ruleNode1Id = ruleChainMetaData.getNodes().get(0).getId();
+        RuleNodeId ruleNode2Id = ruleChainMetaData.getNodes().get(1).getId();
+        createRelatedData(ruleChainId);
+        createRelatedData(ruleNode1Id);
+        createRelatedData(ruleNode2Id);
+
+        doDelete("/api/ruleChain/" + ruleChainId).andExpect(status().isOk());
+
+        await().atMost(10, TimeUnit.SECONDS).untilAsserted(() -> {
+            verifyNoRelatedData(ruleNode1Id);
+            verifyNoRelatedData(ruleNode2Id);
+            verifyNoRelatedData(ruleChainId);
+        });
+    }
+
+    @Test
+    public void whenUserIsDeleted_thenCleanUpRelatedData() throws Exception {
+        Device device = createDevice("test", "test");
+        UserId userId = customerUserId;
+        createRelatedData(userId);
+        Alarm alarm = Alarm.builder()
+                .type("test")
+                .tenantId(tenantId)
+                .originator(device.getId())
+                .severity(AlarmSeverity.MAJOR)
+                .build();
+        alarm = doPost("/api/alarm", alarm, Alarm.class);
+        AlarmId alarmId = alarm.getId();
+        alarm = doPost("/api/alarm/" + alarmId + "/assign/" + userId, "", Alarm.class);
+        assertThat(alarm.getAssigneeId()).isEqualTo(userId);
+        assertThat(alarmService.findAlarmIdsByAssigneeId(tenantId, userId, new PageLink(100)).getData()).isNotEmpty();
+
+        doDelete("/api/user/" + userId).andExpect(status().isOk());
+
+        await().atMost(10, TimeUnit.SECONDS).untilAsserted(() -> {
+            verifyNoRelatedData(userId);
+            assertThat(alarmService.findAlarmById(tenantId, alarmId).getAssigneeId()).isNull();
+        });
+    }
+
+    @Test
+    public void whenDeviceIsDeleted_thenDeleteAllAlarms() throws Exception {
+        Device device = createDevice("test", "test");
+        for (int i = 1; i <= 1000; i++) {
+            createAlarm(device.getId());
+        }
+
+        doDelete("/api/device/" + device.getId()).andExpect(status().isOk());
+
+        await().atMost(30, TimeUnit.SECONDS).untilAsserted(() -> {
+            verifyNoAlarms(device.getId());
+        });
+    }
+
+    @Test
+    public void whenTenantIsDeleted_thenDeleteAllEntitiesAndCleanUpRelatedData() throws Exception {
+        loginDifferentTenant();
+        tenantId = differentTenantId;
+
+        createRelatedData(tenantId);
+        createDifferentTenantCustomer();
+        createRelatedData(differentTenantCustomerId);
+        loginDifferentTenant();
+
+        List<DeviceId> devices = new ArrayList<>();
+        for (int i = 1; i <= 300; i++) {
+            Device device = createDevice("test" + i, "test" + i);
+            devices.add(device.getId());
+        }
+        DeviceId firstDevice = devices.get(0);
+        createRelatedData(firstDevice);
+        DeviceId lastDevice = devices.get(devices.size() - 1);
+        createRelatedData(lastDevice);
+
+        Asset asset = createAsset();
+        createRelatedData(asset.getId());
+        createRelation(firstDevice, asset.getId());
+        createAlarm(firstDevice, asset.getId());
+
+        RuleChainMetaData ruleChainMetaData = createRuleChain();
+        RuleChainId ruleChainId = ruleChainMetaData.getRuleChainId();
+        RuleNodeId ruleNode1Id = ruleChainMetaData.getNodes().get(0).getId();
+        RuleNodeId ruleNode2Id = ruleChainMetaData.getNodes().get(1).getId();
+        createRelatedData(ruleChainId);
+        createRelatedData(ruleNode1Id);
+        createRelatedData(ruleNode2Id);
+
+        UserId userId = savedDifferentTenantUser.getId();
+        createRelatedData(userId);
+
+        ApiUsageState tenantApiUsageState = apiUsageStateDao.findApiUsageStateByEntityId(differentTenantId);
+
+        loginSysAdmin();
+        deleteDifferentTenant();
+
+        await().atMost(60, TimeUnit.SECONDS).pollInterval(1, TimeUnit.SECONDS).untilAsserted(() -> {
+            for (DeviceId deviceId : devices) {
+                verifyNoRelatedData(deviceId);
+            }
+            verifyNoRelatedData(asset.getId());
+            verifyNoRelatedData(ruleNode1Id);
+            verifyNoRelatedData(ruleNode2Id);
+            verifyNoRelatedData(ruleChainId);
+            verifyNoRelatedData(userId);
+            verifyNoRelatedData(differentTenantCustomerId);
+            verifyNoRelatedData(tenantApiUsageState.getId());
+            verifyNoRelatedData(tenantId);
+        });
+    }
+
+    @Test
+    public void whenTaskProcessingFails_thenReprocess() throws Exception {
+        TimeoutException error = new TimeoutException("Test timeout");
+        doThrow(error).when(tsHistoryDeletionTaskProcessor).process(any());
+
+        Device device = createDevice("test", "test");
+        createRelatedData(device.getId());
+
+        doDelete("/api/device/" + device.getId()).andExpect(status().isOk());
+
+        int attempts = 2;
+        await().atMost(30, TimeUnit.SECONDS).pollInterval(1, TimeUnit.SECONDS).untilAsserted(() -> {
+            for (int i = 0; i <= attempts; i++) {
+                int attempt = i;
+                verify(housekeeperReprocessingService).submitForReprocessing(argThat(getTaskMatcher(device.getId(), HousekeeperTaskType.DELETE_TS_HISTORY,
+                        task -> task.getAttempt() == attempt)), argThat(e -> e.getMessage().equals(error.getMessage())));
+            }
+        });
+
+        assertThat(getTimeseriesHistory(device.getId())).isNotEmpty();
+        doCallRealMethod().when(tsHistoryDeletionTaskProcessor).process(any());
+        await().atMost(30, TimeUnit.SECONDS).untilAsserted(() -> {
+            assertThat(getTimeseriesHistory(device.getId())).isEmpty();
+        });
+    }
+
+    @Test
+    public void whenReprocessingAttemptsExceeded_thenDropTheTask() throws Exception {
+        TimeoutException error = new TimeoutException("Test timeout");
+        doThrow(error).when(tsHistoryDeletionTaskProcessor).process(any());
+
+        Device device = createDevice("test", "test");
+        createRelatedData(device.getId());
+
+        doDelete("/api/device/" + device.getId()).andExpect(status().isOk());
+
+        int maxAttempts = 5;
+        await().atMost(30, TimeUnit.SECONDS).untilAsserted(() -> {
+            for (int i = 1; i <= maxAttempts; i++) {
+                verifyTaskProcessing(device.getId(), HousekeeperTaskType.DELETE_TS_HISTORY, i);
+            }
+        });
+
+        Mockito.clearInvocations(housekeeperService);
+        doCallRealMethod().when(tsHistoryDeletionTaskProcessor).process(any());
+        TimeUnit.SECONDS.sleep(2);
+        verify(housekeeperService, never()).processTask(argThat(getTaskMatcher(device.getId(), HousekeeperTaskType.DELETE_TS_HISTORY, null)));
+    }
+
+    private void verifyTaskProcessing(EntityId entityId, HousekeeperTaskType taskType, int expectedAttempt) throws Exception {
+        verify(housekeeperService).processTask(argThat(getTaskMatcher(entityId, taskType, task -> task.getAttempt() == expectedAttempt)));
+    }
+
+    private ArgumentMatcher<ToHousekeeperServiceMsg> getTaskMatcher(EntityId entityId, HousekeeperTaskType taskType,
+                                                                    Predicate<HousekeeperTaskProto> additionalCheck) {
+        return msg -> {
+            HousekeeperTask task = JacksonUtil.fromString(msg.getTask().getValue(), HousekeeperTask.class);
+            return task.getEntityId().equals(entityId) && task.getTaskType() == taskType && (additionalCheck == null || additionalCheck.test(msg.getTask()));
+        };
+    }
+
+    private void createRelatedData(EntityId entityId) throws Exception {
+        createTelemetry(entityId);
+        for (AttributeScope scope : AttributeScope.values()) {
+            createAttribute(entityId, scope, scope + ATTRIBUTE_KEY);
+        }
+        createEvent(entityId);
+    }
+
+    private void verifyNoRelatedData(EntityId entityId) throws Exception {
+        assertThat(entityServiceRegistry.getServiceByEntityType(entityId.getEntityType()).findEntity(tenantId, entityId)).isEmpty();
+
+        assertThat(getLatestTelemetry(entityId)).isNull();
+        assertThat(getTimeseriesHistory(entityId)).isEmpty();
+        for (AttributeScope scope : AttributeScope.values()) {
+            assertThat(attributesService.findAll(tenantId, entityId, scope).get()).isEmpty();
+        }
+        assertThat(getEvents(entityId)).isEmpty();
+        assertThat(alarmDao.findEntityAlarmRecordsByEntityId(tenantId, entityId)).isEmpty();
+        verifyNoAlarms(entityId);
+        assertThat(relationService.findByTo(tenantId, entityId, RelationTypeGroup.COMMON)).isEmpty();
+        assertThat(relationService.findByFrom(tenantId, entityId, RelationTypeGroup.COMMON)).isEmpty();
+    }
+
+    private void verifyNoAlarms(EntityId entityId) {
+        assertThat(alarmService.findAlarmIdsByOriginatorId(tenantId, entityId, 0, null, 10)).isEmpty();
+    }
+
+    private void createAttribute(EntityId entityId, AttributeScope scope, String key) throws Exception {
+        attributesService.save(tenantId, entityId, scope, new BaseAttributeKvEntry(System.currentTimeMillis(), new StringDataEntry(key, KV_VALUE))).get();
+    }
+
+    private void createTelemetry(EntityId entityId) throws Exception {
+        timeseriesService.save(tenantId, entityId, new BasicTsKvEntry(System.currentTimeMillis(), new StringDataEntry(TELEMETRY_KEY, KV_VALUE))).get();
+    }
+
+    private void createEvent(EntityId entityId) {
+        LifecycleEvent event = LifecycleEvent.builder()
+                .tenantId(tenantId)
+                .entityId(entityId.getId())
+                .serviceId("test")
+                .lcEventType("test")
+                .success(true)
+                .build();
+        eventService.saveAsync(event);
+        await().atMost(10, TimeUnit.SECONDS)
+                .until(() -> !getEvents(entityId).isEmpty());
+
+    }
+
+    private void createRelation(DeviceId to, AssetId from) {
+        EntityRelation relation = new EntityRelation(from, to, EntityRelation.CONTAINS_TYPE, RelationTypeGroup.COMMON);
+        relationService.saveRelation(tenantId, relation);
+    }
+
+    private void createAlarm(DeviceId deviceId, EntityId propagatedEntityId) {
+        Alarm alarm = doPost("/api/alarm", Alarm.builder()
+                .tenantId(tenantId)
+                .originator(deviceId)
+                .severity(AlarmSeverity.CRITICAL)
+                .type("test alarm for " + deviceId)
+                .propagate(true)
+                .build(), Alarm.class);
+
+        List<EntityAlarm> entityAlarms = alarmDao.findEntityAlarmRecords(tenantId, alarm.getId());
+        assertThat(entityAlarms).anyMatch(entityAlarm -> entityAlarm.getEntityId().equals(deviceId) && entityAlarm.getAlarmType().equals(alarm.getType()));
+        assertThat(entityAlarms).anyMatch(entityAlarm -> entityAlarm.getEntityId().equals(propagatedEntityId) && entityAlarm.getAlarmType().equals(alarm.getType()));
+        assertThat(alarmService.findAlarmIdsByOriginatorId(tenantId, deviceId, 0, null, 10)).isNotEmpty();
+    }
+
+    private void createAlarm(DeviceId deviceId) {
+        Alarm alarm = doPost("/api/alarm", Alarm.builder()
+                .tenantId(tenantId)
+                .originator(deviceId)
+                .severity(AlarmSeverity.CRITICAL)
+                .type("test alarm for " + deviceId + " " + RandomStringUtils.randomAlphabetic(10))
+                .build(), Alarm.class);
+        assertThat(alarmService.findAlarmIdsByOriginatorId(tenantId, deviceId, 0, null, 10)).isNotEmpty();
+    }
+
+    private TsKvEntry getLatestTelemetry(EntityId entityId) throws Exception {
+        return timeseriesService.findLatest(tenantId, entityId, HousekeeperServiceTest.TELEMETRY_KEY).get().orElse(null);
+    }
+
+    private List<TsKvEntry> getTimeseriesHistory(EntityId entityId) throws Exception {
+        return timeseriesService.findAll(tenantId, entityId, List.of(new BaseReadTsKvQuery(HousekeeperServiceTest.TELEMETRY_KEY, 0, System.currentTimeMillis(), 10, "DESC"))).get();
+    }
+
+    private List<EventInfo> getEvents(EntityId entityId) {
+        return eventService.findEvents(tenantId, entityId, EventType.LC_EVENT, new TimePageLink(100)).getData()
+                .stream().filter(event -> Optional.ofNullable(event.getBody()).map(body -> body.get("event"))
+                        .map(JsonNode::asText).orElse("").equals("test"))
+                .collect(Collectors.toList());
+    }
+
+    private Asset createAsset() {
+        Asset asset = new Asset();
+        asset.setName("test");
+        asset.setType("test");
+        return doPost("/api/asset", asset, Asset.class);
+    }
+
+    private RuleChainMetaData createRuleChain() {
+        RuleChain ruleChain = new RuleChain();
+        ruleChain.setTenantId(tenantId);
+        ruleChain.setName("Test");
+        ruleChain.setType(RuleChainType.CORE);
+        ruleChain.setDebugMode(true);
+        ruleChain.setConfiguration(JacksonUtil.newObjectNode().set("a", new TextNode("b")));
+        ruleChain = ruleChainService.saveRuleChain(ruleChain);
+        RuleChainId ruleChainId = ruleChain.getId();
+
+        RuleChainMetaData metaData = new RuleChainMetaData();
+        metaData.setRuleChainId(ruleChainId);
+
+        RuleNode ruleNode1 = new RuleNode();
+        ruleNode1.setName("Simple Rule Node 1");
+        ruleNode1.setType(org.thingsboard.rule.engine.metadata.TbGetAttributesNode.class.getName());
+        ruleNode1.setConfigurationVersion(TbGetAttributesNode.class.getAnnotation(org.thingsboard.rule.engine.api.RuleNode.class).version());
+        ruleNode1.setDebugMode(true);
+        TbGetAttributesNodeConfiguration configuration1 = new TbGetAttributesNodeConfiguration();
+        configuration1.setServerAttributeNames(Collections.singletonList("serverAttributeKey1"));
+        ruleNode1.setConfiguration(JacksonUtil.valueToTree(configuration1));
+
+        RuleNode ruleNode2 = new RuleNode();
+        ruleNode2.setName("Simple Rule Node 2");
+        ruleNode2.setType(org.thingsboard.rule.engine.metadata.TbGetAttributesNode.class.getName());
+        ruleNode2.setConfigurationVersion(TbGetAttributesNode.class.getAnnotation(org.thingsboard.rule.engine.api.RuleNode.class).version());
+        ruleNode2.setDebugMode(true);
+        TbGetAttributesNodeConfiguration configuration2 = new TbGetAttributesNodeConfiguration();
+        configuration2.setServerAttributeNames(Collections.singletonList("serverAttributeKey2"));
+        ruleNode2.setConfiguration(JacksonUtil.valueToTree(configuration2));
+
+        metaData.setNodes(Arrays.asList(ruleNode1, ruleNode2));
+        metaData.setFirstNodeIndex(0);
+        metaData.addConnectionInfo(0, 1, TbNodeConnectionType.SUCCESS);
+        ruleChainService.saveRuleChainMetaData(tenantId, metaData, Function.identity());
+        return ruleChainService.loadRuleChainMetaData(tenantId, ruleChainId);
+    }
+
+}
diff --git a/application/src/test/java/org/thingsboard/server/service/limits/RateLimitServiceTest.java b/application/src/test/java/org/thingsboard/server/service/limits/RateLimitServiceTest.java
index 2570b80f9f..95a2c63f52 100644
--- a/application/src/test/java/org/thingsboard/server/service/limits/RateLimitServiceTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/limits/RateLimitServiceTest.java
@@ -71,6 +71,8 @@ public class RateLimitServiceTest {
         profileConfiguration.setCassandraQueryTenantRateLimitsConfiguration(rateLimit);
         profileConfiguration.setEdgeEventRateLimits(rateLimit);
         profileConfiguration.setEdgeEventRateLimitsPerEdge(rateLimit);
+        profileConfiguration.setEdgeUplinkMessagesRateLimits(rateLimit);
+        profileConfiguration.setEdgeUplinkMessagesRateLimitsPerEdge(rateLimit);
         updateTenantProfileConfiguration(profileConfiguration);
 
         for (LimitedApi limitedApi : List.of(
@@ -80,7 +82,9 @@ public class RateLimitServiceTest {
                 LimitedApi.REST_REQUESTS_PER_CUSTOMER,
                 LimitedApi.CASSANDRA_QUERIES,
                 LimitedApi.EDGE_EVENTS,
-                LimitedApi.EDGE_EVENTS_PER_EDGE
+                LimitedApi.EDGE_EVENTS_PER_EDGE,
+                LimitedApi.EDGE_UPLINK_MESSAGES,
+                LimitedApi.EDGE_UPLINK_MESSAGES_PER_EDGE
         )) {
             testRateLimits(limitedApi, max, tenantId);
         }
diff --git a/application/src/test/java/org/thingsboard/server/service/mail/TbMailSenderTest.java b/application/src/test/java/org/thingsboard/server/service/mail/TbMailSenderTest.java
index 6c38bd896e..a299b56dbe 100644
--- a/application/src/test/java/org/thingsboard/server/service/mail/TbMailSenderTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/mail/TbMailSenderTest.java
@@ -21,9 +21,9 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
-import javax.mail.MessagingException;
-import javax.mail.Session;
-import javax.mail.internet.MimeMessage;
+import jakarta.mail.MessagingException;
+import jakarta.mail.Session;
+import jakarta.mail.internet.MimeMessage;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
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 f54b5d9b7b..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
@@ -60,6 +60,7 @@ import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.common.data.security.Authority;
 import org.thingsboard.server.controller.AbstractControllerTest;
 import org.thingsboard.server.dao.DaoUtil;
+import org.thingsboard.server.dao.notification.DefaultNotifications;
 import org.thingsboard.server.dao.notification.NotificationRequestService;
 import org.thingsboard.server.dao.notification.NotificationRuleService;
 import org.thingsboard.server.dao.notification.NotificationSettingsService;
@@ -99,6 +100,8 @@ public abstract class AbstractNotificationApiTest extends AbstractControllerTest
     protected NotificationSettingsService notificationSettingsService;
     @Autowired
     protected SqlPartitioningRepository partitioningRepository;
+    @Autowired
+    protected DefaultNotifications defaultNotifications;
 
     public static final String DEFAULT_NOTIFICATION_SUBJECT = "Just a test";
     public static final NotificationType DEFAULT_NOTIFICATION_TYPE = NotificationType.GENERAL;
@@ -142,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);
@@ -244,15 +247,23 @@ 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) {
-        NotificationTemplate template = createNotificationTemplate(NotificationType.valueOf(triggerConfig.getTriggerType().toString()), subject, text, NotificationDeliveryMethod.WEB);
+        return createNotificationRule(triggerConfig, subject, text, List.of(targets), NotificationDeliveryMethod.WEB);
+    }
+
+    protected NotificationRule createNotificationRule(NotificationRuleTriggerConfig triggerConfig, String subject, String text, List<NotificationTargetId> targets, NotificationDeliveryMethod... deliveryMethods) {
+        NotificationTemplate template = createNotificationTemplate(NotificationType.valueOf(triggerConfig.getTriggerType().toString()), subject, text, deliveryMethods);
 
         NotificationRule rule = new NotificationRule();
-        rule.setName(triggerConfig.getTriggerType() + " " + Arrays.toString(targets));
+        rule.setName(triggerConfig.getTriggerType() + " " + targets);
         rule.setEnabled(true);
         rule.setTemplateId(template.getId());
         rule.setTriggerType(triggerConfig.getTriggerType());
@@ -260,7 +271,7 @@ public abstract class AbstractNotificationApiTest extends AbstractControllerTest
 
         DefaultNotificationRuleRecipientsConfig recipientsConfig = new DefaultNotificationRuleRecipientsConfig();
         recipientsConfig.setTriggerType(triggerConfig.getTriggerType());
-        recipientsConfig.setTargets(DaoUtil.toUUIDs(List.of(targets)));
+        recipientsConfig.setTargets(DaoUtil.toUUIDs(targets));
         rule.setRecipientsConfig(recipientsConfig);
 
         return saveNotificationRule(rule);
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 2d93573a25..1a788d437b 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
@@ -30,9 +30,14 @@ import org.springframework.web.client.RestTemplate;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.rule.engine.api.NotificationCenter;
 import org.thingsboard.rule.engine.api.notification.FirebaseService;
+import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.User;
+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;
@@ -48,7 +53,9 @@ 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;
 import org.thingsboard.server.common.data.notification.settings.NotificationSettings;
 import org.thingsboard.server.common.data.notification.settings.SlackNotificationDeliveryMethodConfig;
@@ -76,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;
@@ -111,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
@@ -237,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);
@@ -301,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();
@@ -309,8 +323,10 @@ public class NotificationApiTest extends AbstractNotificationApiTest {
 
         deleteDifferentTenant();
 
-        assertThat(notificationRequestService.findNotificationRequestsByTenantIdAndOriginatorType(tenantId, EntityType.USER, new PageLink(1)).getTotalElements())
-                .isZero();
+        await().atMost(TIMEOUT, TimeUnit.SECONDS).untilAsserted(() -> {
+            assertThat(notificationRequestService.findNotificationRequestsByTenantIdAndOriginatorType(tenantId, EntityType.USER, new PageLink(1)).getTotalElements())
+                    .isZero();
+        });
     }
 
     @Test
@@ -495,7 +511,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);
@@ -509,19 +525,17 @@ public class NotificationApiTest extends AbstractNotificationApiTest {
 
     @Test
     public void testNotificationRequestStats() throws Exception {
-        wsClient.subscribeForUnreadNotifications(10);
-        wsClient.waitForReply(true);
-
-        wsClient.registerWaitForUpdate();
         NotificationTarget notificationTarget = createNotificationTarget(customerUserId);
-        NotificationRequest notificationRequest = submitNotificationRequest(notificationTarget.getId(), "Test :)", NotificationDeliveryMethod.WEB);
-        wsClient.waitForUpdate();
-
-        await().atMost(2, TimeUnit.SECONDS)
-                .until(() -> findNotificationRequest(notificationRequest.getId()).isSent());
-        NotificationRequestStats stats = getStats(notificationRequest.getId());
 
+        NotificationRequest notificationRequest = submitNotificationRequest(notificationTarget.getId(), "Test :)", NotificationDeliveryMethod.WEB);
+        NotificationRequestStats stats = awaitNotificationRequest(notificationRequest.getId());
         assertThat(stats.getSent().get(NotificationDeliveryMethod.WEB)).hasValue(1);
+
+        doDelete("/api/user/mobile/session").andExpect(status().isOk());
+        notificationRequest = submitNotificationRequest(notificationTarget.getId(), "Test", NotificationDeliveryMethod.MOBILE_APP);
+        stats = awaitNotificationRequest(notificationRequest.getId());
+        assertThat(stats.getErrors().get(NotificationDeliveryMethod.MOBILE_APP)).hasSize(1);
+        assertThat(stats.getTotalErrors()).hasValue(1);
     }
 
     @Test
@@ -722,17 +736,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());
@@ -741,7 +750,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);
@@ -753,11 +762,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);
 
@@ -765,10 +782,68 @@ 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 {
+        loginTenantAdmin();
+        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, NotificationDeliveryMethod.WEB);
+
+        Device device = createDevice("test", "test");
+        UUID alarmDashboardId = UUID.randomUUID();
+        Alarm alarm = Alarm.builder()
+                .type("test")
+                .tenantId(tenantId)
+                .originator(device.getId())
+                .severity(AlarmSeverity.MAJOR)
+                .details(JacksonUtil.newObjectNode()
+                        .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/" + 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(TEST_MOBILE_TOKEN), eq(expectedSubject),
+                    eq(expectedBody),
+                    msgCaptor.capture(), eq(1));
+        });
+        Map<String, String> firebaseMessageData = msgCaptor.getValue();
+        assertThat(firebaseMessageData.keySet()).doesNotContainNull().doesNotContain("");
+        assertThat(firebaseMessageData.values()).doesNotContainNull();
+        assertThat(firebaseMessageData.get("info.userEmail")).isEqualTo(TENANT_ADMIN_EMAIL);
+        assertThat(firebaseMessageData.get("info.alarmType")).isEqualTo("test");
+        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/notification/NotificationApiWsClient.java b/application/src/test/java/org/thingsboard/server/service/notification/NotificationApiWsClient.java
index 96e3e4732e..1ecae638a6 100644
--- a/application/src/test/java/org/thingsboard/server/service/notification/NotificationApiWsClient.java
+++ b/application/src/test/java/org/thingsboard/server/service/notification/NotificationApiWsClient.java
@@ -106,8 +106,11 @@ public class NotificationApiWsClient extends TbTestWebSocketClient {
                 }
             }
         } else if (updateType == CmdUpdateType.NOTIFICATIONS_COUNT) {
-            lastCountUpdate = JacksonUtil.treeToValue(update, UnreadNotificationsCountUpdate.class);
-            unreadCount = lastCountUpdate.getTotalUnreadCount();
+            UnreadNotificationsCountUpdate countUpdate = JacksonUtil.treeToValue(update, UnreadNotificationsCountUpdate.class);
+            if (lastCountUpdate == null || countUpdate.getSequenceNumber() > lastCountUpdate.getSequenceNumber()) {
+                lastCountUpdate = countUpdate;
+                unreadCount = lastCountUpdate.getTotalUnreadCount();
+            }
         }
         super.onMessage(s);
     }
diff --git a/application/src/test/java/org/thingsboard/server/service/notification/NotificationRuleApiTest.java b/application/src/test/java/org/thingsboard/server/service/notification/NotificationRuleApiTest.java
index 1e95f9add3..9cf73894c2 100644
--- a/application/src/test/java/org/thingsboard/server/service/notification/NotificationRuleApiTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/notification/NotificationRuleApiTest.java
@@ -26,6 +26,7 @@ import org.springframework.boot.test.mock.mockito.SpyBean;
 import org.springframework.data.util.Pair;
 import org.springframework.test.context.TestPropertySource;
 import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.server.cache.limits.RateLimitService;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.DeviceProfile;
@@ -93,7 +94,6 @@ import org.thingsboard.server.dao.notification.DefaultNotifications;
 import org.thingsboard.server.dao.notification.NotificationRequestService;
 import org.thingsboard.server.dao.rule.RuleChainService;
 import org.thingsboard.server.dao.service.DaoSqlTest;
-import org.thingsboard.server.cache.limits.RateLimitService;
 import org.thingsboard.server.queue.notification.DefaultNotificationDeduplicationService;
 import org.thingsboard.server.service.notification.rule.cache.DefaultNotificationRulesCache;
 import org.thingsboard.server.service.state.DeviceStateService;
@@ -140,8 +140,6 @@ public class NotificationRuleApiTest extends AbstractNotificationApiTest {
     @Autowired
     private NotificationRuleProcessor notificationRuleProcessor;
     @Autowired
-    private DefaultNotifications defaultNotifications;
-    @Autowired
     private DefaultNotificationRulesCache notificationRulesCache;
     @Autowired
     private DeviceStateService deviceStateService;
diff --git a/application/src/test/java/org/thingsboard/server/service/notification/NotificationTargetApiTest.java b/application/src/test/java/org/thingsboard/server/service/notification/NotificationTargetApiTest.java
index c7ef9a5836..a5bdc6c2e4 100644
--- a/application/src/test/java/org/thingsboard/server/service/notification/NotificationTargetApiTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/notification/NotificationTargetApiTest.java
@@ -38,8 +38,10 @@ import org.thingsboard.server.dao.service.DaoSqlTest;
 
 import java.util.Collections;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 @DaoSqlTest
@@ -148,7 +150,9 @@ public class NotificationTargetApiTest extends AbstractNotificationApiTest {
         assertThat(notificationTargetDao.findByTenantIdAndSupportedNotificationTypeAndPageLink(differentTenantId, NotificationType.GENERAL, new PageLink(10)).getData()).isNotEmpty();
 
         deleteDifferentTenant();
-        assertThat(notificationTargetDao.findByTenantIdAndPageLink(differentTenantId, new PageLink(10)).getData()).isEmpty();
+        await().atMost(TIMEOUT, TimeUnit.SECONDS).untilAsserted(() -> {
+            assertThat(notificationTargetDao.findByTenantIdAndPageLink(differentTenantId, new PageLink(10)).getData()).isEmpty();
+        });
     }
 
     @Test
diff --git a/application/src/test/java/org/thingsboard/server/service/queue/DefaultTbClusterServiceTest.java b/application/src/test/java/org/thingsboard/server/service/queue/DefaultTbClusterServiceTest.java
index 91d4f3ef53..33b0fc7801 100644
--- a/application/src/test/java/org/thingsboard/server/service/queue/DefaultTbClusterServiceTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/queue/DefaultTbClusterServiceTest.java
@@ -36,7 +36,6 @@ import org.thingsboard.server.queue.common.TbProtoQueueMsg;
 import org.thingsboard.server.queue.discovery.PartitionService;
 import org.thingsboard.server.queue.discovery.TopicService;
 import org.thingsboard.server.queue.provider.TbQueueProducerProvider;
-import org.thingsboard.server.queue.util.DataDecodingEncodingService;
 import org.thingsboard.server.service.gateway_device.GatewayNotificationsService;
 import org.thingsboard.server.service.profile.TbAssetProfileCache;
 import org.thingsboard.server.service.profile.TbDeviceProfileCache;
@@ -66,8 +65,6 @@ public class DefaultTbClusterServiceTest {
 
     public static final String TRANSPORT = "transport";
 
-    @MockBean
-    protected DataDecodingEncodingService encodingService;
     @MockBean
     protected TbDeviceProfileCache deviceProfileCache;
     @MockBean
diff --git a/application/src/test/java/org/thingsboard/server/service/resource/sql/BaseTbResourceServiceTest.java b/application/src/test/java/org/thingsboard/server/service/resource/sql/BaseTbResourceServiceTest.java
index d9b33edba2..566d272a2f 100644
--- a/application/src/test/java/org/thingsboard/server/service/resource/sql/BaseTbResourceServiceTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/resource/sql/BaseTbResourceServiceTest.java
@@ -51,7 +51,6 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThrows;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 @DaoSqlTest
 public class BaseTbResourceServiceTest extends AbstractControllerTest {
@@ -129,7 +128,7 @@ public class BaseTbResourceServiceTest extends AbstractControllerTest {
 
         Tenant tenant = new Tenant();
         tenant.setTitle("My tenant");
-        savedTenant = doPost("/api/tenant", tenant, Tenant.class);
+        savedTenant = saveTenant(tenant);
         tenantId = savedTenant.getId();
         Assert.assertNotNull(savedTenant);
 
@@ -147,8 +146,7 @@ public class BaseTbResourceServiceTest extends AbstractControllerTest {
     public void afterTest() throws Exception {
         loginSysAdmin();
 
-        doDelete("/api/tenant/" + savedTenant.getId().getId().toString())
-                .andExpect(status().isOk());
+        deleteTenant(savedTenant.getId());
     }
 
     @Test
@@ -397,7 +395,7 @@ public class BaseTbResourceServiceTest extends AbstractControllerTest {
         loginSysAdmin();
         Tenant tenant = new Tenant();
         tenant.setTitle("Test tenant");
-        tenant = doPost("/api/tenant", tenant, Tenant.class);
+        tenant = saveTenant(tenant);
 
         TenantId tenantId = tenant.getId();
 
@@ -441,8 +439,7 @@ public class BaseTbResourceServiceTest extends AbstractControllerTest {
         Assert.assertFalse(pageData.hasNext());
         Assert.assertTrue(pageData.getData().isEmpty());
 
-        doDelete("/api/tenant/" + tenantId.getId().toString())
-                .andExpect(status().isOk());
+        deleteTenant(tenantId);
     }
 
     @Test
@@ -451,7 +448,7 @@ public class BaseTbResourceServiceTest extends AbstractControllerTest {
 
         Tenant tenant = new Tenant();
         tenant.setTitle("Test tenant");
-        tenant = doPost("/api/tenant", tenant, Tenant.class);
+        tenant = saveTenant(tenant);
 
         TenantId tenantId = tenant.getId();
 
@@ -518,8 +515,7 @@ public class BaseTbResourceServiceTest extends AbstractControllerTest {
         Assert.assertFalse(pageData.hasNext());
         Assert.assertTrue(pageData.getData().isEmpty());
 
-        doDelete("/api/tenant/" + tenantId.getId().toString())
-                .andExpect(status().isOk());
+        deleteTenant(tenantId);
     }
 
 }
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/security/auth/JwtTokenFactoryTest.java b/application/src/test/java/org/thingsboard/server/service/security/auth/JwtTokenFactoryTest.java
index d412fb2f84..2d39dd9905 100644
--- a/application/src/test/java/org/thingsboard/server/service/security/auth/JwtTokenFactoryTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/security/auth/JwtTokenFactoryTest.java
@@ -37,7 +37,6 @@ import org.thingsboard.server.service.security.model.SecurityUser;
 import org.thingsboard.server.service.security.model.UserPrincipal;
 import org.thingsboard.server.service.security.model.token.AccessJwtToken;
 import org.thingsboard.server.service.security.model.token.JwtTokenFactory;
-import org.thingsboard.server.service.security.model.token.RawAccessJwtToken;
 
 import java.util.Calendar;
 import java.util.Date;
diff --git a/application/src/test/java/org/thingsboard/server/service/security/auth/oauth2/CookieUtilsTest.java b/application/src/test/java/org/thingsboard/server/service/security/auth/oauth2/CookieUtilsTest.java
index c1ee0825a9..7a2a97c169 100644
--- a/application/src/test/java/org/thingsboard/server/service/security/auth/oauth2/CookieUtilsTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/security/auth/oauth2/CookieUtilsTest.java
@@ -19,8 +19,8 @@ import org.junit.Test;
 import org.mockito.Mockito;
 import org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationRequest;
 
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
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..02281abac3 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
@@ -50,8 +50,6 @@ import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-
 @DaoSqlTest
 public class SequentialTimeseriesPersistenceTest extends AbstractControllerTest {
 
@@ -77,7 +75,7 @@ public class SequentialTimeseriesPersistenceTest extends AbstractControllerTest
 
         Tenant tenant = new Tenant();
         tenant.setTitle("My tenant");
-        savedTenant = doPost("/api/tenant", tenant, Tenant.class);
+        savedTenant = saveTenant(tenant);
         Assert.assertNotNull(savedTenant);
 
         tenantAdmin = new User();
@@ -93,7 +91,7 @@ public class SequentialTimeseriesPersistenceTest extends AbstractControllerTest
     @After
     public void afterTest() throws Exception {
         loginSysAdmin();
-        doDelete("/api/tenant/" + savedTenant.getId().getId().toString()).andExpect(status().isOk());
+        deleteTenant(savedTenant.getId());
     }
 
     @Test
@@ -147,7 +145,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 +180,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/service/state/DefaultDeviceStateServiceTest.java b/application/src/test/java/org/thingsboard/server/service/state/DefaultDeviceStateServiceTest.java
index 8db79a8553..f80c8c4c82 100644
--- a/application/src/test/java/org/thingsboard/server/service/state/DefaultDeviceStateServiceTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/state/DefaultDeviceStateServiceTest.java
@@ -28,6 +28,7 @@ import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.test.util.ReflectionTestUtils;
 import org.thingsboard.server.cluster.TbClusterService;
 import org.thingsboard.server.common.data.DataConstants;
+import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.DeviceIdInfo;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.TenantId;
@@ -204,7 +205,7 @@ public class DefaultDeviceStateServiceTest {
 
         // THEN
         then(telemetrySubscriptionService).should().saveAttrAndNotify(
-                eq(TenantId.SYS_TENANT_ID), eq(deviceId), eq(DataConstants.SERVER_SCOPE), eq(LAST_CONNECT_TIME), eq(lastConnectTime), any()
+                eq(TenantId.SYS_TENANT_ID), eq(deviceId), eq(AttributeScope.SERVER_SCOPE), eq(LAST_CONNECT_TIME), eq(lastConnectTime), any()
         );
 
         var msgCaptor = ArgumentCaptor.forClass(TbMsg.class);
@@ -288,7 +289,7 @@ public class DefaultDeviceStateServiceTest {
 
         // THEN
         then(telemetrySubscriptionService).should().saveAttrAndNotify(
-                eq(TenantId.SYS_TENANT_ID), eq(deviceId), eq(DataConstants.SERVER_SCOPE),
+                eq(TenantId.SYS_TENANT_ID), eq(deviceId), eq(AttributeScope.SERVER_SCOPE),
                 eq(LAST_DISCONNECT_TIME), eq(lastDisconnectTime), any()
         );
 
@@ -409,11 +410,11 @@ public class DefaultDeviceStateServiceTest {
 
         // THEN
         then(telemetrySubscriptionService).should().saveAttrAndNotify(
-                eq(TenantId.SYS_TENANT_ID), eq(deviceId), eq(DataConstants.SERVER_SCOPE),
+                eq(TenantId.SYS_TENANT_ID), eq(deviceId), eq(AttributeScope.SERVER_SCOPE),
                 eq(INACTIVITY_ALARM_TIME), eq(lastInactivityTime), any()
         );
         then(telemetrySubscriptionService).should().saveAttrAndNotify(
-                eq(TenantId.SYS_TENANT_ID), eq(deviceId), eq(DataConstants.SERVER_SCOPE),
+                eq(TenantId.SYS_TENANT_ID), eq(deviceId), eq(AttributeScope.SERVER_SCOPE),
                 eq(ACTIVITY_STATE), eq(false), any()
         );
 
@@ -449,11 +450,11 @@ public class DefaultDeviceStateServiceTest {
 
         // THEN
         then(telemetrySubscriptionService).should().saveAttrAndNotify(
-                eq(TenantId.SYS_TENANT_ID), eq(deviceId), eq(DataConstants.SERVER_SCOPE),
+                eq(TenantId.SYS_TENANT_ID), eq(deviceId), eq(AttributeScope.SERVER_SCOPE),
                 eq(INACTIVITY_ALARM_TIME), anyLong(), any()
         );
         then(telemetrySubscriptionService).should().saveAttrAndNotify(
-                eq(TenantId.SYS_TENANT_ID), eq(deviceId), eq(DataConstants.SERVER_SCOPE),
+                eq(TenantId.SYS_TENANT_ID), eq(deviceId), eq(AttributeScope.SERVER_SCOPE),
                 eq(ACTIVITY_STATE), eq(false), any()
         );
 
@@ -607,7 +608,7 @@ public class DefaultDeviceStateServiceTest {
         long newTimeout = System.currentTimeMillis() - deviceState.getLastActivityTime() + increase;
 
         service.onDeviceInactivityTimeoutUpdate(tenantId, deviceId, newTimeout);
-        verify(telemetrySubscriptionService, never()).saveAttrAndNotify(any(), eq(deviceId), any(), eq(ACTIVITY_STATE), any(), any());
+        verify(telemetrySubscriptionService, never()).saveAttrAndNotify(any(), eq(deviceId), any(AttributeScope.class), eq(ACTIVITY_STATE), any(), any());
         Thread.sleep(defaultTimeout + increase);
         service.checkStates();
         activityVerify(false);
@@ -646,7 +647,7 @@ public class DefaultDeviceStateServiceTest {
 
         long newTimeout = 1;
         Thread.sleep(newTimeout);
-        verify(telemetrySubscriptionService, never()).saveAttrAndNotify(any(), eq(deviceId), any(), eq(ACTIVITY_STATE), any(), any());
+        verify(telemetrySubscriptionService, never()).saveAttrAndNotify(any(), eq(deviceId), any(AttributeScope.class), eq(ACTIVITY_STATE), any(), any());
     }
 
     @Test
@@ -667,7 +668,7 @@ public class DefaultDeviceStateServiceTest {
         service.onDeviceActivity(tenantId, deviceId, System.currentTimeMillis());
         activityVerify(true);
 
-        verify(telemetrySubscriptionService, never()).saveAttrAndNotify(any(), eq(deviceId), any(), eq(ACTIVITY_STATE), any(), any());
+        verify(telemetrySubscriptionService, never()).saveAttrAndNotify(any(), eq(deviceId), any(AttributeScope.class), eq(ACTIVITY_STATE), any(), any());
 
         long newTimeout = 1;
         Thread.sleep(newTimeout);
@@ -708,11 +709,11 @@ public class DefaultDeviceStateServiceTest {
         long newTimeout = 1;
 
         service.onDeviceInactivityTimeoutUpdate(tenantId, deviceId, newTimeout);
-        verify(telemetrySubscriptionService, never()).saveAttrAndNotify(any(), eq(deviceId), any(), eq(ACTIVITY_STATE), any(), any());
+        verify(telemetrySubscriptionService, never()).saveAttrAndNotify(any(), eq(deviceId), any(AttributeScope.class), eq(ACTIVITY_STATE), any(), any());
     }
 
     private void activityVerify(boolean isActive) {
-        verify(telemetrySubscriptionService).saveAttrAndNotify(any(), eq(deviceId), any(), eq(ACTIVITY_STATE), eq(isActive), any());
+        verify(telemetrySubscriptionService).saveAttrAndNotify(any(), eq(deviceId), any(AttributeScope.class), eq(ACTIVITY_STATE), eq(isActive), any());
     }
 
     @Test
@@ -759,19 +760,19 @@ public class DefaultDeviceStateServiceTest {
         assertThat(deviceState.isActive()).isEqualTo(true);
         assertThat(deviceState.getLastActivityTime()).isEqualTo(lastReportedActivity);
         then(telemetrySubscriptionService).should().saveAttrAndNotify(
-                any(), eq(deviceId), any(), eq(LAST_ACTIVITY_TIME), eq(lastReportedActivity), any()
+                any(), eq(deviceId), any(AttributeScope.class), eq(LAST_ACTIVITY_TIME), eq(lastReportedActivity), any()
         );
 
         assertThat(deviceState.getLastInactivityAlarmTime()).isEqualTo(expectedInactivityAlarmTime);
         if (shouldSetInactivityAlarmTimeToZero) {
             then(telemetrySubscriptionService).should().saveAttrAndNotify(
-                    any(), eq(deviceId), any(), eq(INACTIVITY_ALARM_TIME), eq(0L), any()
+                    any(), eq(deviceId), any(AttributeScope.class), eq(INACTIVITY_ALARM_TIME), eq(0L), any()
             );
         }
 
         if (shouldUpdateActivityStateToActive) {
             then(telemetrySubscriptionService).should().saveAttrAndNotify(
-                    eq(TenantId.SYS_TENANT_ID), eq(deviceId), eq(SERVER_SCOPE), eq(ACTIVITY_STATE), eq(true), any()
+                    eq(TenantId.SYS_TENANT_ID), eq(deviceId), eq(AttributeScope.SERVER_SCOPE), eq(ACTIVITY_STATE), eq(true), any()
             );
 
             var msgCaptor = ArgumentCaptor.forClass(TbMsg.class);
@@ -853,7 +854,7 @@ public class DefaultDeviceStateServiceTest {
         assertThat(deviceState.isActive()).isEqualTo(expectedActivityState);
         if (activityState && !expectedActivityState) {
             then(telemetrySubscriptionService).should().saveAttrAndNotify(
-                    any(), eq(deviceId), any(), eq(ACTIVITY_STATE), eq(false), any()
+                    any(), eq(deviceId), any(AttributeScope.class), eq(ACTIVITY_STATE), eq(false), any()
             );
         }
     }
@@ -950,7 +951,7 @@ public class DefaultDeviceStateServiceTest {
 
         if (shouldUpdateActivityStateToInactive) {
             then(telemetrySubscriptionService).should().saveAttrAndNotify(
-                    eq(TenantId.SYS_TENANT_ID), eq(deviceId), eq(SERVER_SCOPE), eq(ACTIVITY_STATE), eq(false), any()
+                    eq(TenantId.SYS_TENANT_ID), eq(deviceId), eq(AttributeScope.SERVER_SCOPE), eq(ACTIVITY_STATE), eq(false), any()
             );
 
             var msgCaptor = ArgumentCaptor.forClass(TbMsg.class);
@@ -967,7 +968,7 @@ public class DefaultDeviceStateServiceTest {
             assertThat(actualNotification.isActive()).isFalse();
 
             then(telemetrySubscriptionService).should().saveAttrAndNotify(
-                    eq(TenantId.SYS_TENANT_ID), eq(deviceId), eq(SERVER_SCOPE),
+                    eq(TenantId.SYS_TENANT_ID), eq(deviceId), eq(AttributeScope.SERVER_SCOPE),
                     eq(INACTIVITY_ALARM_TIME), eq(expectedLastInactivityAlarmTime), any()
             );
         }
diff --git a/application/src/test/java/org/thingsboard/server/service/state/DefaultRuleEngineDeviceStateManagerTest.java b/application/src/test/java/org/thingsboard/server/service/state/DefaultRuleEngineDeviceStateManagerTest.java
index c97305c170..1fae187a15 100644
--- a/application/src/test/java/org/thingsboard/server/service/state/DefaultRuleEngineDeviceStateManagerTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/state/DefaultRuleEngineDeviceStateManagerTest.java
@@ -40,6 +40,8 @@ import org.thingsboard.server.queue.discovery.TbServiceInfoProvider;
 
 import java.util.Optional;
 import java.util.UUID;
+import java.util.function.BiConsumer;
+import java.util.function.Consumer;
 import java.util.stream.Stream;
 
 import static org.mockito.ArgumentMatchers.any;
@@ -53,13 +55,13 @@ import static org.mockito.Mockito.never;
 public class DefaultRuleEngineDeviceStateManagerTest {
 
     @Mock
-    private static DeviceStateService deviceStateServiceMock;
+    private DeviceStateService deviceStateServiceMock;
     @Mock
-    private static TbCallback tbCallbackMock;
+    private TbCallback tbCallbackMock;
     @Mock
-    private static TbClusterService clusterServiceMock;
+    private TbClusterService clusterServiceMock;
     @Mock
-    private static TbQueueMsgMetadata metadataMock;
+    private TbQueueMsgMetadata metadataMock;
 
     @Mock
     private TbServiceInfoProvider serviceInfoProviderMock;
@@ -67,9 +69,9 @@ public class DefaultRuleEngineDeviceStateManagerTest {
     private PartitionService partitionServiceMock;
 
     @Captor
-    private static ArgumentCaptor<TbQueueCallback> queueCallbackCaptor;
+    private ArgumentCaptor<TbQueueCallback> queueCallbackCaptor;
 
-    private static DefaultRuleEngineDeviceStateManager deviceStateManager;
+    private DefaultRuleEngineDeviceStateManager deviceStateManager;
 
     private static final TenantId TENANT_ID = TenantId.fromUUID(UUID.fromString("57ab2e6c-bc4c-11ee-a506-0242ac120002"));
     private static final DeviceId DEVICE_ID = DeviceId.fromString("74a9053e-bc4c-11ee-a506-0242ac120002");
@@ -87,15 +89,17 @@ public class DefaultRuleEngineDeviceStateManagerTest {
     @DisplayName("Given event should be routed to local service and event processed has succeeded, " +
             "when onDeviceX() is called, then should route event to local service and call onSuccess() callback.")
     @MethodSource
-    public void givenRoutedToLocalAndProcessingSuccess_whenOnDeviceAction_thenShouldCallLocalServiceAndSuccessCallback(Runnable onDeviceAction, Runnable actionVerification) {
+    public void givenRoutedToLocalAndProcessingSuccess_whenOnDeviceAction_thenShouldCallLocalServiceAndSuccessCallback(
+            BiConsumer<DefaultRuleEngineDeviceStateManager, TbCallback> onDeviceAction, Consumer<DeviceStateService> actionVerification
+    ) {
         // GIVEN
         given(serviceInfoProviderMock.isService(ServiceType.TB_CORE)).willReturn(true);
         given(partitionServiceMock.resolve(ServiceType.TB_CORE, TENANT_ID, DEVICE_ID)).willReturn(MY_TPI);
 
-        onDeviceAction.run();
+        onDeviceAction.accept(deviceStateManager, tbCallbackMock);
 
         // THEN
-        actionVerification.run();
+        actionVerification.accept(deviceStateServiceMock);
 
         then(clusterServiceMock).shouldHaveNoInteractions();
         then(tbCallbackMock).should().onSuccess();
@@ -105,20 +109,20 @@ public class DefaultRuleEngineDeviceStateManagerTest {
     private static Stream<Arguments> givenRoutedToLocalAndProcessingSuccess_whenOnDeviceAction_thenShouldCallLocalServiceAndSuccessCallback() {
         return Stream.of(
                 Arguments.of(
-                        (Runnable) () -> deviceStateManager.onDeviceConnect(TENANT_ID, DEVICE_ID, EVENT_TS, tbCallbackMock),
-                        (Runnable) () -> then(deviceStateServiceMock).should().onDeviceConnect(TENANT_ID, DEVICE_ID, EVENT_TS)
+                        (BiConsumer<DefaultRuleEngineDeviceStateManager, TbCallback>) (deviceStateManager, tbCallbackMock) -> deviceStateManager.onDeviceConnect(TENANT_ID, DEVICE_ID, EVENT_TS, tbCallbackMock),
+                        (Consumer<DeviceStateService>) deviceStateServiceMock -> then(deviceStateServiceMock).should().onDeviceConnect(TENANT_ID, DEVICE_ID, EVENT_TS)
                 ),
                 Arguments.of(
-                        (Runnable) () -> deviceStateManager.onDeviceActivity(TENANT_ID, DEVICE_ID, EVENT_TS, tbCallbackMock),
-                        (Runnable) () -> then(deviceStateServiceMock).should().onDeviceActivity(TENANT_ID, DEVICE_ID, EVENT_TS)
+                        (BiConsumer<DefaultRuleEngineDeviceStateManager, TbCallback>) (deviceStateManager, tbCallbackMock) -> deviceStateManager.onDeviceActivity(TENANT_ID, DEVICE_ID, EVENT_TS, tbCallbackMock),
+                        (Consumer<DeviceStateService>) deviceStateServiceMock -> then(deviceStateServiceMock).should().onDeviceActivity(TENANT_ID, DEVICE_ID, EVENT_TS)
                 ),
                 Arguments.of(
-                        (Runnable) () -> deviceStateManager.onDeviceDisconnect(TENANT_ID, DEVICE_ID, EVENT_TS, tbCallbackMock),
-                        (Runnable) () -> then(deviceStateServiceMock).should().onDeviceDisconnect(TENANT_ID, DEVICE_ID, EVENT_TS)
+                        (BiConsumer<DefaultRuleEngineDeviceStateManager, TbCallback>) (deviceStateManager, tbCallbackMock) -> deviceStateManager.onDeviceDisconnect(TENANT_ID, DEVICE_ID, EVENT_TS, tbCallbackMock),
+                        (Consumer<DeviceStateService>) deviceStateServiceMock -> then(deviceStateServiceMock).should().onDeviceDisconnect(TENANT_ID, DEVICE_ID, EVENT_TS)
                 ),
                 Arguments.of(
-                        (Runnable) () -> deviceStateManager.onDeviceInactivity(TENANT_ID, DEVICE_ID, EVENT_TS, tbCallbackMock),
-                        (Runnable) () -> then(deviceStateServiceMock).should().onDeviceInactivity(TENANT_ID, DEVICE_ID, EVENT_TS)
+                        (BiConsumer<DefaultRuleEngineDeviceStateManager, TbCallback>) (deviceStateManager, tbCallbackMock) -> deviceStateManager.onDeviceInactivity(TENANT_ID, DEVICE_ID, EVENT_TS, tbCallbackMock),
+                        (Consumer<DeviceStateService>) deviceStateServiceMock -> then(deviceStateServiceMock).should().onDeviceInactivity(TENANT_ID, DEVICE_ID, EVENT_TS)
                 )
         );
     }
@@ -128,19 +132,19 @@ public class DefaultRuleEngineDeviceStateManagerTest {
             "when onDeviceX() is called, then should route event to local service and call onFailure() callback.")
     @MethodSource
     public void givenRoutedToLocalAndProcessingFailure_whenOnDeviceAction_thenShouldCallLocalServiceAndFailureCallback(
-            Runnable exceptionThrowSetup, Runnable onDeviceAction, Runnable actionVerification
+            Consumer<DeviceStateService> exceptionThrowSetup, BiConsumer<DefaultRuleEngineDeviceStateManager, TbCallback> onDeviceAction, Consumer<DeviceStateService> actionVerification
     ) {
         // GIVEN
         given(serviceInfoProviderMock.isService(ServiceType.TB_CORE)).willReturn(true);
         given(partitionServiceMock.resolve(ServiceType.TB_CORE, TENANT_ID, DEVICE_ID)).willReturn(MY_TPI);
 
-        exceptionThrowSetup.run();
+        exceptionThrowSetup.accept(deviceStateServiceMock);
 
         // WHEN
-        onDeviceAction.run();
+        onDeviceAction.accept(deviceStateManager, tbCallbackMock);
 
         // THEN
-        actionVerification.run();
+        actionVerification.accept(deviceStateServiceMock);
 
         then(clusterServiceMock).shouldHaveNoInteractions();
         then(tbCallbackMock).should(never()).onSuccess();
@@ -150,24 +154,24 @@ public class DefaultRuleEngineDeviceStateManagerTest {
     private static Stream<Arguments> givenRoutedToLocalAndProcessingFailure_whenOnDeviceAction_thenShouldCallLocalServiceAndFailureCallback() {
         return Stream.of(
                 Arguments.of(
-                        (Runnable) () -> doThrow(RUNTIME_EXCEPTION).when(deviceStateServiceMock).onDeviceConnect(TENANT_ID, DEVICE_ID, EVENT_TS),
-                        (Runnable) () -> deviceStateManager.onDeviceConnect(TENANT_ID, DEVICE_ID, EVENT_TS, tbCallbackMock),
-                        (Runnable) () -> then(deviceStateServiceMock).should().onDeviceConnect(TENANT_ID, DEVICE_ID, EVENT_TS)
+                        (Consumer<DeviceStateService>) deviceStateServiceMock -> doThrow(RUNTIME_EXCEPTION).when(deviceStateServiceMock).onDeviceConnect(TENANT_ID, DEVICE_ID, EVENT_TS),
+                        (BiConsumer<DefaultRuleEngineDeviceStateManager, TbCallback>) (deviceStateManager, tbCallbackMock) -> deviceStateManager.onDeviceConnect(TENANT_ID, DEVICE_ID, EVENT_TS, tbCallbackMock),
+                        (Consumer<DeviceStateService>) deviceStateServiceMock -> then(deviceStateServiceMock).should().onDeviceConnect(TENANT_ID, DEVICE_ID, EVENT_TS)
                 ),
                 Arguments.of(
-                        (Runnable) () -> doThrow(RUNTIME_EXCEPTION).when(deviceStateServiceMock).onDeviceActivity(TENANT_ID, DEVICE_ID, EVENT_TS),
-                        (Runnable) () -> deviceStateManager.onDeviceActivity(TENANT_ID, DEVICE_ID, EVENT_TS, tbCallbackMock),
-                        (Runnable) () -> then(deviceStateServiceMock).should().onDeviceActivity(TENANT_ID, DEVICE_ID, EVENT_TS)
+                        (Consumer<DeviceStateService>) deviceStateServiceMock -> doThrow(RUNTIME_EXCEPTION).when(deviceStateServiceMock).onDeviceActivity(TENANT_ID, DEVICE_ID, EVENT_TS),
+                        (BiConsumer<DefaultRuleEngineDeviceStateManager, TbCallback>) (deviceStateManager, tbCallbackMock) -> deviceStateManager.onDeviceActivity(TENANT_ID, DEVICE_ID, EVENT_TS, tbCallbackMock),
+                        (Consumer<DeviceStateService>) deviceStateServiceMock -> then(deviceStateServiceMock).should().onDeviceActivity(TENANT_ID, DEVICE_ID, EVENT_TS)
                 ),
                 Arguments.of(
-                        (Runnable) () -> doThrow(RUNTIME_EXCEPTION).when(deviceStateServiceMock).onDeviceDisconnect(TENANT_ID, DEVICE_ID, EVENT_TS),
-                        (Runnable) () -> deviceStateManager.onDeviceDisconnect(TENANT_ID, DEVICE_ID, EVENT_TS, tbCallbackMock),
-                        (Runnable) () -> then(deviceStateServiceMock).should().onDeviceDisconnect(TENANT_ID, DEVICE_ID, EVENT_TS)
+                        (Consumer<DeviceStateService>) deviceStateServiceMock -> doThrow(RUNTIME_EXCEPTION).when(deviceStateServiceMock).onDeviceDisconnect(TENANT_ID, DEVICE_ID, EVENT_TS),
+                        (BiConsumer<DefaultRuleEngineDeviceStateManager, TbCallback>) (deviceStateManager, tbCallbackMock) -> deviceStateManager.onDeviceDisconnect(TENANT_ID, DEVICE_ID, EVENT_TS, tbCallbackMock),
+                        (Consumer<DeviceStateService>) deviceStateServiceMock -> then(deviceStateServiceMock).should().onDeviceDisconnect(TENANT_ID, DEVICE_ID, EVENT_TS)
                 ),
                 Arguments.of(
-                        (Runnable) () -> doThrow(RUNTIME_EXCEPTION).when(deviceStateServiceMock).onDeviceInactivity(TENANT_ID, DEVICE_ID, EVENT_TS),
-                        (Runnable) () -> deviceStateManager.onDeviceInactivity(TENANT_ID, DEVICE_ID, EVENT_TS, tbCallbackMock),
-                        (Runnable) () -> then(deviceStateServiceMock).should().onDeviceInactivity(TENANT_ID, DEVICE_ID, EVENT_TS)
+                        (Consumer<DeviceStateService>) deviceStateServiceMock -> doThrow(RUNTIME_EXCEPTION).when(deviceStateServiceMock).onDeviceInactivity(TENANT_ID, DEVICE_ID, EVENT_TS),
+                        (BiConsumer<DefaultRuleEngineDeviceStateManager, TbCallback>) (deviceStateManager, tbCallbackMock) -> deviceStateManager.onDeviceInactivity(TENANT_ID, DEVICE_ID, EVENT_TS, tbCallbackMock),
+                        (Consumer<DeviceStateService>) deviceStateServiceMock -> then(deviceStateServiceMock).should().onDeviceInactivity(TENANT_ID, DEVICE_ID, EVENT_TS)
                 )
         );
     }
@@ -176,16 +180,18 @@ public class DefaultRuleEngineDeviceStateManagerTest {
     @DisplayName("Given event should be routed to external service, " +
             "when onDeviceX() is called, then should send correct queue message to external service with correct callback object.")
     @MethodSource
-    public void givenRoutedToExternal_whenOnDeviceAction_thenShouldSendQueueMsgToExternalServiceWithCorrectCallback(Runnable onDeviceAction, Runnable actionVerification) {
+    public void givenRoutedToExternal_whenOnDeviceAction_thenShouldSendQueueMsgToExternalServiceWithCorrectCallback(
+            BiConsumer<DefaultRuleEngineDeviceStateManager, TbCallback> onDeviceAction, BiConsumer<TbClusterService, ArgumentCaptor<TbQueueCallback>> actionVerification
+    ) {
         // WHEN
         ReflectionTestUtils.setField(deviceStateManager, "deviceStateService", Optional.empty());
         given(serviceInfoProviderMock.isService(ServiceType.TB_CORE)).willReturn(false);
         given(partitionServiceMock.resolve(ServiceType.TB_CORE, TENANT_ID, DEVICE_ID)).willReturn(EXTERNAL_TPI);
 
-        onDeviceAction.run();
+        onDeviceAction.accept(deviceStateManager, tbCallbackMock);
 
         // THEN
-        actionVerification.run();
+        actionVerification.accept(clusterServiceMock, queueCallbackCaptor);
 
         TbQueueCallback callback = queueCallbackCaptor.getValue();
         callback.onSuccess(metadataMock);
@@ -197,8 +203,8 @@ public class DefaultRuleEngineDeviceStateManagerTest {
     private static Stream<Arguments> givenRoutedToExternal_whenOnDeviceAction_thenShouldSendQueueMsgToExternalServiceWithCorrectCallback() {
         return Stream.of(
                 Arguments.of(
-                        (Runnable) () -> deviceStateManager.onDeviceConnect(TENANT_ID, DEVICE_ID, EVENT_TS, tbCallbackMock),
-                        (Runnable) () -> {
+                        (BiConsumer<DefaultRuleEngineDeviceStateManager, TbCallback>) (deviceStateManager, tbCallbackMock) -> deviceStateManager.onDeviceConnect(TENANT_ID, DEVICE_ID, EVENT_TS, tbCallbackMock),
+                        (BiConsumer<TbClusterService, ArgumentCaptor<TbQueueCallback>>) (clusterServiceMock, queueCallbackCaptor) -> {
                             var deviceConnectMsg = TransportProtos.DeviceConnectProto.newBuilder()
                                     .setTenantIdMSB(TENANT_ID.getId().getMostSignificantBits())
                                     .setTenantIdLSB(TENANT_ID.getId().getLeastSignificantBits())
@@ -213,8 +219,8 @@ public class DefaultRuleEngineDeviceStateManagerTest {
                         }
                 ),
                 Arguments.of(
-                        (Runnable) () -> deviceStateManager.onDeviceActivity(TENANT_ID, DEVICE_ID, EVENT_TS, tbCallbackMock),
-                        (Runnable) () -> {
+                        (BiConsumer<DefaultRuleEngineDeviceStateManager, TbCallback>) (deviceStateManager, tbCallbackMock) -> deviceStateManager.onDeviceActivity(TENANT_ID, DEVICE_ID, EVENT_TS, tbCallbackMock),
+                        (BiConsumer<TbClusterService, ArgumentCaptor<TbQueueCallback>>) (clusterServiceMock, queueCallbackCaptor) -> {
                             var deviceActivityMsg = TransportProtos.DeviceActivityProto.newBuilder()
                                     .setTenantIdMSB(TENANT_ID.getId().getMostSignificantBits())
                                     .setTenantIdLSB(TENANT_ID.getId().getLeastSignificantBits())
@@ -229,8 +235,8 @@ public class DefaultRuleEngineDeviceStateManagerTest {
                         }
                 ),
                 Arguments.of(
-                        (Runnable) () -> deviceStateManager.onDeviceDisconnect(TENANT_ID, DEVICE_ID, EVENT_TS, tbCallbackMock),
-                        (Runnable) () -> {
+                        (BiConsumer<DefaultRuleEngineDeviceStateManager, TbCallback>) (deviceStateManager, tbCallbackMock) -> deviceStateManager.onDeviceDisconnect(TENANT_ID, DEVICE_ID, EVENT_TS, tbCallbackMock),
+                        (BiConsumer<TbClusterService, ArgumentCaptor<TbQueueCallback>>) (clusterServiceMock, queueCallbackCaptor) -> {
                             var deviceDisconnectMsg = TransportProtos.DeviceDisconnectProto.newBuilder()
                                     .setTenantIdMSB(TENANT_ID.getId().getMostSignificantBits())
                                     .setTenantIdLSB(TENANT_ID.getId().getLeastSignificantBits())
@@ -245,8 +251,8 @@ public class DefaultRuleEngineDeviceStateManagerTest {
                         }
                 ),
                 Arguments.of(
-                        (Runnable) () -> deviceStateManager.onDeviceInactivity(TENANT_ID, DEVICE_ID, EVENT_TS, tbCallbackMock),
-                        (Runnable) () -> {
+                        (BiConsumer<DefaultRuleEngineDeviceStateManager, TbCallback>) (deviceStateManager, tbCallbackMock) -> deviceStateManager.onDeviceInactivity(TENANT_ID, DEVICE_ID, EVENT_TS, tbCallbackMock),
+                        (BiConsumer<TbClusterService, ArgumentCaptor<TbQueueCallback>>) (clusterServiceMock, queueCallbackCaptor) -> {
                             var deviceInactivityMsg = TransportProtos.DeviceInactivityProto.newBuilder()
                                     .setTenantIdMSB(TENANT_ID.getId().getMostSignificantBits())
                                     .setTenantIdLSB(TENANT_ID.getId().getLeastSignificantBits())
diff --git a/application/src/test/java/org/thingsboard/server/service/sync/ie/ExportImportServiceSqlTest.java b/application/src/test/java/org/thingsboard/server/service/sync/ie/ExportImportServiceSqlTest.java
index f1996d3695..b07fe34089 100644
--- a/application/src/test/java/org/thingsboard/server/service/sync/ie/ExportImportServiceSqlTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/sync/ie/ExportImportServiceSqlTest.java
@@ -630,8 +630,7 @@ public class ExportImportServiceSqlTest extends BaseExportImportServiceTest {
         DeviceProfile importedDeviceProfile = (DeviceProfile) importEntity(tenantAdmin2, getAndClone(entitiesExportData, EntityType.DEVICE_PROFILE)).getSavedEntity();
         verify(entityActionService).logEntityAction(any(), eq(importedDeviceProfile.getId()), eq(importedDeviceProfile),
                 any(), eq(ActionType.ADDED), isNull());
-        verify(tbClusterService).onDeviceProfileChange(eq(importedDeviceProfile), any());
-        verify(tbClusterService).broadcastEntityStateChangeEvent(any(), eq(importedDeviceProfile.getId()), eq(ComponentLifecycleEvent.CREATED));
+        verify(tbClusterService).onDeviceProfileChange(eq(importedDeviceProfile), any(), any());
         verify(tbClusterService).sendNotificationMsgToEdge(any(), any(), eq(importedDeviceProfile.getId()), any(), any(), eq(EdgeEventActionType.ADDED), any());
         verify(otaPackageStateService).update(eq(importedDeviceProfile), eq(false), eq(false));
 
diff --git a/application/src/test/java/org/thingsboard/server/service/transport/DefaultTransportApiServiceTest.java b/application/src/test/java/org/thingsboard/server/service/transport/DefaultTransportApiServiceTest.java
index 33a689152e..1fb4ff66d0 100644
--- a/application/src/test/java/org/thingsboard/server/service/transport/DefaultTransportApiServiceTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/transport/DefaultTransportApiServiceTest.java
@@ -47,7 +47,6 @@ import org.thingsboard.server.dao.relation.RelationService;
 import org.thingsboard.server.dao.resource.ResourceService;
 import org.thingsboard.server.dao.tenant.TbTenantProfileCache;
 import org.thingsboard.server.gen.transport.TransportProtos;
-import org.thingsboard.server.queue.util.DataDecodingEncodingService;
 import org.thingsboard.server.service.apiusage.TbApiUsageStateService;
 import org.thingsboard.server.service.executors.DbCallbackExecutorService;
 import org.thingsboard.server.service.profile.TbDeviceProfileCache;
@@ -92,8 +91,6 @@ public class DefaultTransportApiServiceTest {
     @MockBean
     protected TbClusterService tbClusterService;
     @MockBean
-    protected DataDecodingEncodingService dataDecodingEncodingService;
-    @MockBean
     protected DeviceProvisionService deviceProvisionService;
     @MockBean
     protected ResourceService resourceService;
diff --git a/application/src/test/java/org/thingsboard/server/transport/coap/attributes/AbstractCoapAttributesIntegrationTest.java b/application/src/test/java/org/thingsboard/server/transport/coap/attributes/AbstractCoapAttributesIntegrationTest.java
index 081e0ce1b2..92554b3067 100644
--- a/application/src/test/java/org/thingsboard/server/transport/coap/attributes/AbstractCoapAttributesIntegrationTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/coap/attributes/AbstractCoapAttributesIntegrationTest.java
@@ -25,6 +25,7 @@ import org.awaitility.Awaitility;
 import org.eclipse.californium.core.CoapObserveRelation;
 import org.eclipse.californium.core.CoapResponse;
 import org.eclipse.californium.core.coap.CoAP;
+import org.eclipse.californium.core.coap.CoAP.ResponseCode;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.DynamicProtoUtils;
@@ -238,7 +239,7 @@ public abstract class AbstractCoapAttributesIntegrationTest extends AbstractCoap
         String awaitAlias = "await Json Test Subscribe To AttributesUpdates (client.getObserveRelation)";
         await(awaitAlias)
                 .atMost(DEFAULT_WAIT_TIMEOUT_SECONDS, TimeUnit.SECONDS)
-                .until(() -> CoAP.ResponseCode.CONTENT.equals(callbackCoap.getResponseCode()) &&
+                .until(() -> ResponseCode.CONTENT.equals(callbackCoap.getResponseCode()) &&
                         callbackCoap.getObserve() != null &&
                         0 == callbackCoap.getObserve().intValue());
         if (emptyCurrentStateNotification) {
@@ -285,7 +286,7 @@ public abstract class AbstractCoapAttributesIntegrationTest extends AbstractCoap
         CoapObserveRelation observeRelation = client.getObserveRelation(callbackCoap);
         await(awaitAlias)
                 .atMost(DEFAULT_WAIT_TIMEOUT_SECONDS, TimeUnit.SECONDS)
-                .until(() -> CoAP.ResponseCode.CONTENT.equals(callbackCoap.getResponseCode()) &&
+                .until(() -> ResponseCode.CONTENT.equals(callbackCoap.getResponseCode()) &&
                         callbackCoap.getObserve() != null &&
                         0 == callbackCoap.getObserve().intValue());
 
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 9ac2d5fc11..a1bf7932e9 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
@@ -34,8 +34,6 @@ import static org.mockito.Mockito.spy;
 @DaoSqlTest
 public class CoapAttributesUpdatesIntegrationTest extends AbstractCoapAttributesIntegrationTest {
 
-    CoapTransportResource coapTransportResource;
-
     @Autowired
     DefaultCoapServerService defaultCoapServerService;
 
@@ -44,10 +42,6 @@ public class CoapAttributesUpdatesIntegrationTest extends AbstractCoapAttributes
 
     @Before
     public void beforeTest() throws Exception {
-        Resource api = defaultCoapServerService.getCoapServer().getRoot().getChild("api");
-        coapTransportResource = spy( (CoapTransportResource) api.getChild("v1") );
-        api.delete(api.getChild("v1") );
-        api.add(coapTransportResource);
         CoapTestConfigProperties configProperties = CoapTestConfigProperties.builder()
                 .deviceName("Test Subscribe to attribute updates")
                 .build();
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 1ddeabb56d..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
@@ -43,12 +43,10 @@ public class CoapAttributesUpdatesProtoIntegrationTest extends AbstractCoapAttri
     public void afterTest() throws Exception {
         processAfterTest();
     }
-
     @Test
     public void testSubscribeToAttributesUpdatesFromTheServer() throws Exception {
         processProtoTestSubscribeToAttributesUpdates(false);
     }
-
     @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 5be03683f7..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
@@ -68,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()
diff --git a/application/src/test/java/org/thingsboard/server/transport/coap/rpc/AbstractCoapServerSideRpcIntegrationTest.java b/application/src/test/java/org/thingsboard/server/transport/coap/rpc/AbstractCoapServerSideRpcIntegrationTest.java
index 4a21495a96..384bfe4772 100644
--- a/application/src/test/java/org/thingsboard/server/transport/coap/rpc/AbstractCoapServerSideRpcIntegrationTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/coap/rpc/AbstractCoapServerSideRpcIntegrationTest.java
@@ -82,15 +82,27 @@ public abstract class AbstractCoapServerSideRpcIntegrationTest extends AbstractC
                 .until(() -> CoAP.ResponseCode.VALID.equals(callbackCoap.getResponseCode()) &&
                         callbackCoap.getObserve() != null && 0 == callbackCoap.getObserve());
         validateCurrentStateNotification(callbackCoap);
-        int expectedObserveAfterRpcProcessed = callbackCoap.getObserve() + 1;
-        String setGpioRequest = "{\"method\":\"setGpio\",\"params\":{\"pin\": \"23\",\"value\": 1}}";
+
+        int expectedObserveAfterRpcProcessed1 = callbackCoap.getObserve() + 1;
+        String setGpioRequest = "{\"method\":\"setGpio1\",\"params\":{\"pin\": \"21\",\"value\": 1}}";
         String deviceId = savedDevice.getId().getId().toString();
         String result = doPostAsync("/api/rpc/oneway/" + deviceId, setGpioRequest, String.class, status().isOk());
         awaitAlias = "await One Way Rpc setGpio(method, params, value)";
         await(awaitAlias)
                 .atMost(DEFAULT_WAIT_TIMEOUT_SECONDS, TimeUnit.SECONDS)
                 .until(() -> CoAP.ResponseCode.CONTENT.equals(callbackCoap.getResponseCode()) &&
-                        callbackCoap.getObserve() != null && expectedObserveAfterRpcProcessed == callbackCoap.getObserve());
+                        callbackCoap.getObserve() != null && expectedObserveAfterRpcProcessed1 == callbackCoap.getObserve());
+        validateOneWayStateChangedNotification(callbackCoap, result);
+
+        int expectedObserveAfterRpcProcessed2 = callbackCoap.getObserve() + 1;
+        setGpioRequest = "{\"method\":\"setGpio2\",\"params\":{\"pin\": \"22\",\"value\": 2}}";
+        deviceId = savedDevice.getId().getId().toString();
+        result = doPostAsync("/api/rpc/oneway/" + deviceId, setGpioRequest, String.class, status().isOk());
+        awaitAlias = "await One Way Rpc setGpio(method, params, value)";
+        await(awaitAlias)
+                .atMost(DEFAULT_WAIT_TIMEOUT_SECONDS, TimeUnit.SECONDS)
+                .until(() -> CoAP.ResponseCode.CONTENT.equals(callbackCoap.getResponseCode()) &&
+                        callbackCoap.getObserve() != null && expectedObserveAfterRpcProcessed2 == callbackCoap.getObserve());
         validateOneWayStateChangedNotification(callbackCoap, result);
 
         observeRelation.proactiveCancel();
diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/AbstractLwM2MIntegrationTest.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/AbstractLwM2MIntegrationTest.java
index d33eeb56c6..a44d2b6a62 100644
--- a/application/src/test/java/org/thingsboard/server/transport/lwm2m/AbstractLwM2MIntegrationTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/AbstractLwM2MIntegrationTest.java
@@ -17,10 +17,11 @@ package org.thingsboard.server.transport.lwm2m;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.IOUtils;
-import org.eclipse.californium.elements.config.Configuration;
-import org.eclipse.leshan.client.californium.LeshanClient;
+import org.eclipse.leshan.client.LeshanClient;
 import org.eclipse.leshan.client.object.Security;
 import org.eclipse.leshan.core.ResponseCode;
 import org.junit.After;
@@ -30,7 +31,6 @@ import org.junit.Before;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.mock.mockito.SpyBean;
 import org.springframework.test.context.TestPropertySource;
-import org.springframework.util.SocketUtils;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.common.util.ThingsBoardThreadFactory;
 import org.thingsboard.server.common.data.Device;
@@ -62,8 +62,8 @@ import org.thingsboard.server.common.data.query.EntityKeyType;
 import org.thingsboard.server.common.data.query.SingleEntityFilter;
 import org.thingsboard.server.common.data.security.DeviceCredentials;
 import org.thingsboard.server.common.data.security.DeviceCredentialsType;
+import org.thingsboard.server.common.transport.util.JsonUtils;
 import org.thingsboard.server.dao.service.DaoSqlTest;
-import org.thingsboard.server.service.ws.telemetry.cmd.TelemetryCmdsWrapper;
 import org.thingsboard.server.service.ws.telemetry.cmd.v2.EntityDataCmd;
 import org.thingsboard.server.service.ws.telemetry.cmd.v2.EntityDataUpdate;
 import org.thingsboard.server.service.ws.telemetry.cmd.v2.LatestValueCmd;
@@ -76,7 +76,6 @@ import java.io.IOException;
 import java.net.ServerSocket;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Base64;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
@@ -86,17 +85,17 @@ import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
 import static org.awaitility.Awaitility.await;
-import static org.eclipse.californium.core.config.CoapConfig.COAP_PORT;
-import static org.eclipse.californium.core.config.CoapConfig.COAP_SECURE_PORT;
 import static org.eclipse.leshan.client.object.Security.noSec;
-import static org.eclipse.leshan.client.object.Security.noSecBootstap;
 import static org.hamcrest.core.IsInstanceOf.instanceOf;
+import static org.junit.Assert.assertEquals;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.LwM2MClientState.ON_BOOTSTRAP_STARTED;
 import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.LwM2MClientState.ON_BOOTSTRAP_SUCCESS;
 import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.LwM2MClientState.ON_INIT;
 import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.LwM2MClientState.ON_REGISTRATION_STARTED;
 import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.LwM2MClientState.ON_REGISTRATION_SUCCESS;
+import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.LwM2MClientState.ON_UPDATE_STARTED;
+import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.LwM2MClientState.ON_UPDATE_SUCCESS;
 import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.LwM2MProfileBootstrapConfigType;
 import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.LwM2MProfileBootstrapConfigType.NONE;
 
@@ -122,18 +121,18 @@ public abstract class AbstractLwM2MIntegrationTest extends AbstractTransportInte
 
     public static final String host = "localhost";
     public static final String hostBs = "localhost";
-    public static final int shortServerId = 123;
-    public static final int shortServerIdBs = 111;
+    public static final Integer shortServerId = 123;
+    public static final Integer shortServerIdBs0 = 0;
+    public static final int serverId = 1;
+    public static final int serverIdBs = 0;
+
     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 URI_BS = COAP + hostBs + ":" + portBs;
     public static final String SECURE_URI_BS = COAPS + hostBs + ":" + securityPortBs;
-    public static final Configuration COAP_CONFIG = new Configuration().set(COAP_PORT, port).set(COAP_SECURE_PORT, securityPort);
-    public static Configuration COAP_CONFIG_BS = new Configuration().set(COAP_PORT, portBs).set(COAP_SECURE_PORT, securityPortBs);
     public static final Security SECURITY_NO_SEC = noSec(URI, shortServerId);
-    public static final Security SECURITY_NO_SEC_BS = noSecBootstap(URI_BS);
 
     protected final String OBSERVE_ATTRIBUTES_WITHOUT_PARAMS =
             "    {\n" +
@@ -143,18 +142,17 @@ public abstract class AbstractLwM2MIntegrationTest extends AbstractTransportInte
                     "    \"telemetry\": [],\n" +
                     "    \"attributeLwm2m\": {}\n" +
                     "  }";
-
-    public static final String OBSERVE_ATTRIBUTES_WITH_PARAMS =
+    public static  String OBSERVE_ATTRIBUTES_WITH_PARAMS =
 
             "    {\n" +
                     "    \"keyName\": {\n" +
-                    "      \"/3_1.0/0/9\": \"batteryLevel\"\n" +
+                    "      \"/3_1.2/0/9\": \"batteryLevel\"\n" +
                     "    },\n" +
                     "    \"observe\": [],\n" +
                     "    \"attribute\": [\n" +
                     "    ],\n" +
                     "    \"telemetry\": [\n" +
-                    "      \"/3_1.0/0/9\"\n" +
+                    "      \"/3_1.2/0/9\"\n" +
                     "    ],\n" +
                     "    \"attributeLwm2m\": {}\n" +
                     "  }";
@@ -171,14 +169,15 @@ public abstract class AbstractLwM2MIntegrationTest extends AbstractTransportInte
                     "    \"pagingTransmissionWindow\": null,\n" +
                     "    \"clientOnlyObserveAfterConnect\": 1\n" +
                     "  }";
-
-    protected final Set<Lwm2mTestHelper.LwM2MClientState> expectedStatusesBsSuccess = new HashSet<>(Arrays.asList(ON_INIT, ON_BOOTSTRAP_STARTED, ON_BOOTSTRAP_SUCCESS));
     protected final Set<Lwm2mTestHelper.LwM2MClientState> expectedStatusesRegistrationLwm2mSuccess = new HashSet<>(Arrays.asList(ON_INIT, ON_REGISTRATION_STARTED, ON_REGISTRATION_SUCCESS));
+    protected final Set<Lwm2mTestHelper.LwM2MClientState> expectedStatusesRegistrationLwm2mSuccessUpdate = new HashSet<>(Arrays.asList(ON_INIT, ON_REGISTRATION_STARTED, ON_REGISTRATION_SUCCESS, ON_UPDATE_STARTED, ON_UPDATE_SUCCESS));
     protected final Set<Lwm2mTestHelper.LwM2MClientState> expectedStatusesRegistrationBsSuccess = new HashSet<>(Arrays.asList(ON_BOOTSTRAP_STARTED, ON_BOOTSTRAP_SUCCESS, ON_REGISTRATION_STARTED, ON_REGISTRATION_SUCCESS));
     protected DeviceProfile deviceProfile;
     protected ScheduledExecutorService executor;
     protected LwM2MTestClient lwM2MTestClient;
     private String[] resources;
+    protected String deviceId;
+    protected boolean isWriteAttribute = false;
 
     @Before
     public void startInit() throws Exception {
@@ -215,8 +214,8 @@ public abstract class AbstractLwM2MIntegrationTest extends AbstractTransportInte
 
     public void basicTestConnectionObserveTelemetry(Security security,
                                                     LwM2MDeviceCredentials deviceCredentials,
-                                                    Configuration coapConfig,
-                                                    String endpoint) throws Exception {
+                                                    String endpoint,
+                                                    boolean queueMode) throws Exception {
         Lwm2mDeviceProfileTransportConfiguration transportConfiguration = getTransportConfiguration(OBSERVE_ATTRIBUTES_WITH_PARAMS, getBootstrapServerCredentialsNoSec(NONE));
         createDeviceProfile(transportConfiguration);
         Device device = createDevice(deviceCredentials, endpoint);
@@ -233,8 +232,9 @@ public abstract class AbstractLwM2MIntegrationTest extends AbstractTransportInte
         getWsClient().waitForReply();
 
         getWsClient().registerWaitForUpdate();
-        createNewClient(security, coapConfig, false, endpoint, false, null);
-        awaitObserveReadAll(0, false, device.getId().getId().toString());
+        createNewClient(security, null, false, endpoint, null, queueMode);
+        deviceId = device.getId().getId().toString();
+        awaitObserveReadAll(0, deviceId);
         String msg = getWsClient().waitForUpdate();
 
         EntityDataUpdate update = JacksonUtil.fromString(msg, EntityDataUpdate.class);
@@ -250,6 +250,8 @@ public abstract class AbstractLwM2MIntegrationTest extends AbstractTransportInte
         int expectedMin = 5;
         Assert.assertTrue(expectedMax >= Long.parseLong(tsValue.getValue()));
         Assert.assertTrue(expectedMin <= Long.parseLong(tsValue.getValue()));
+
+
     }
 
     protected void createDeviceProfile(Lwm2mDeviceProfileTransportConfiguration transportConfiguration) throws Exception {
@@ -298,12 +300,27 @@ public abstract class AbstractLwM2MIntegrationTest extends AbstractTransportInte
         this.resources = resources;
     }
 
-    public void createNewClient(Security security, Configuration coapConfig, boolean isRpc, String endpoint, boolean isBootstrap, Security securityBs) throws Exception {
+    public void createNewClient(Security security, Security securityBs, boolean isRpc,
+                                String endpoint) throws Exception {
+        this.createNewClient(security, securityBs, isRpc, endpoint, null, false);
+    }
+
+    public void createNewClient(Security security, Security securityBs, boolean isRpc,
+                                String endpoint, Integer clientDtlsCidLength) throws Exception {
+        this.createNewClient(security, securityBs, isRpc, endpoint, clientDtlsCidLength, false);
+    }
+
+    public void createNewClient(Security security, Security securityBs, boolean isRpc,
+                                String endpoint, Integer clientDtlsCidLength, boolean queueMode) throws Exception {
         this.clientDestroy();
         lwM2MTestClient = new LwM2MTestClient(this.executor, endpoint);
-        int clientPort = SocketUtils.findAvailableUdpPort();
-        lwM2MTestClient.init(security, coapConfig, clientPort, isRpc, isBootstrap, this.shortServerId, this.shortServerIdBs,
-                securityBs, this.defaultLwM2mUplinkMsgHandlerTest, this.clientContextTest);
+
+        try (ServerSocket socket = new ServerSocket(0)) {
+            int clientPort = socket.getLocalPort();
+            lwM2MTestClient.init(security, securityBs, clientPort, isRpc,
+                    this.defaultLwM2mUplinkMsgHandlerTest, this.clientContextTest, isWriteAttribute
+                    , clientDtlsCidLength, queueMode);
+        }
     }
 
     private void clientDestroy() {
@@ -349,7 +366,7 @@ public abstract class AbstractLwM2MIntegrationTest extends AbstractTransportInte
     private AbstractLwM2MBootstrapServerCredential getBootstrapServerCredentialNoSec(boolean isBootstrap) {
         AbstractLwM2MBootstrapServerCredential bootstrapServerCredential = new NoSecLwM2MBootstrapServerCredential();
         bootstrapServerCredential.setServerPublicKey("");
-        bootstrapServerCredential.setShortServerId(isBootstrap ? shortServerIdBs : shortServerId);
+        bootstrapServerCredential.setShortServerId(isBootstrap ? shortServerIdBs0 : shortServerId);
         bootstrapServerCredential.setBootstrapServerIs(isBootstrap);
         bootstrapServerCredential.setHost(isBootstrap ? hostBs : host);
         bootstrapServerCredential.setPort(isBootstrap ? portBs : port);
@@ -392,20 +409,25 @@ public abstract class AbstractLwM2MIntegrationTest extends AbstractTransportInte
                 .until(() -> leshanClient.getRegisteredServers().size() == 0);
     }
 
-    protected  void awaitObserveReadAll(int cntObserve, boolean isBootstrap, String deviceIdStr) throws Exception {
-        if (!isBootstrap) {
-            await("ObserveReadAll after start client: countObserve " + cntObserve)
-                    .atMost(40, TimeUnit.SECONDS)
-                    .until(() -> {
-                        String actualResultReadAll = sendObserve("ObserveReadAll", null, deviceIdStr);
-                        ObjectNode rpcActualResultReadAll = JacksonUtil.fromString(actualResultReadAll, ObjectNode.class);
-                        Assert.assertEquals(ResponseCode.CONTENT.getName(), rpcActualResultReadAll.get("result").asText());
-                        String actualValuesReadAll = rpcActualResultReadAll.get("value").asText();
-                        log.warn("ObserveReadAll:  [{}]", actualValuesReadAll);
-                        int actualCntObserve = "[]".equals(actualValuesReadAll) ? 0 : actualValuesReadAll.split(",").length;
-                        return cntObserve == actualCntObserve;
-                    });
-        }
+    protected  void awaitObserveReadAll(int cntObserve, String deviceIdStr) throws Exception {
+        await("ObserveReadAll after start client/test: countObserve " + cntObserve)
+                .atMost(40, TimeUnit.SECONDS)
+                .until(() -> cntObserve == getCntObserveAll(deviceIdStr));
+    }
+
+    protected Integer getCntObserveAll(String deviceIdStr) throws Exception {
+        String actualResultBefore = sendObserve("ObserveReadAll", null, deviceIdStr);
+        ObjectNode rpcActualResultBefore = JacksonUtil.fromString(actualResultBefore, ObjectNode.class);
+        assertEquals(ResponseCode.CONTENT.getName(), rpcActualResultBefore.get("result").asText());
+        JsonElement element = JsonUtils.parse(rpcActualResultBefore.get("value").asText());
+        return element.isJsonArray() ? ((JsonArray)element).size() : null;
+    }
+
+    protected void sendCancelObserveAllWithAwait(String deviceIdStr) throws Exception {
+        String actualResultCancelAll = sendObserve("ObserveCancelAll", null, deviceIdStr);
+        ObjectNode rpcActualResultCancelAll = JacksonUtil.fromString(actualResultCancelAll, ObjectNode.class);
+        assertEquals(ResponseCode.CONTENT.getName(), rpcActualResultCancelAll.get("result").asText());
+        awaitObserveReadAll(0, deviceId);
     }
 
     protected String sendObserve(String method, String params, String deviceIdStr) throws Exception {
diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/Lwm2mTestHelper.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/Lwm2mTestHelper.java
index ac980c14b9..b2ed3cc297 100644
--- a/application/src/test/java/org/thingsboard/server/transport/lwm2m/Lwm2mTestHelper.java
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/Lwm2mTestHelper.java
@@ -34,12 +34,15 @@ public class Lwm2mTestHelper {
     public static final int RESOURCE_ID_2 = 2;
     public static final int RESOURCE_ID_3 = 3;
     public static final int RESOURCE_ID_4 = 4;
+    public static final int RESOURCE_ID_5 = 5;
+    public static final int RESOURCE_ID_6 = 6;
     public static final int RESOURCE_ID_7 = 7;
     public static final int RESOURCE_ID_8 = 8;
     public static final int RESOURCE_ID_9 = 9;
     public static final int RESOURCE_ID_11 = 11;
     public static final int RESOURCE_ID_14 = 14;
     public static final int RESOURCE_ID_15 = 15;
+    public static final int RESOURCE_INSTANCE_ID_0 = 0;
     public static final int RESOURCE_INSTANCE_ID_2 = 2;
 
     public static final String RESOURCE_ID_NAME_3_9 = "batteryLevel";
@@ -50,7 +53,7 @@ public class Lwm2mTestHelper {
 
     public enum LwM2MClientState {
 
-        ON_INIT(1, "onInit"),
+        ON_INIT(0, "onInit"),
         ON_BOOTSTRAP_STARTED(1, "onBootstrapStarted"),
         ON_BOOTSTRAP_SUCCESS(2, "onBootstrapSuccess"),
         ON_BOOTSTRAP_FAILURE(3, "onBootstrapFailure"),
@@ -67,7 +70,9 @@ public class Lwm2mTestHelper {
         ON_DEREGISTRATION_SUCCESS(13, "onDeregistrationSuccess"),
         ON_DEREGISTRATION_FAILURE(14, "onDeregistrationFailure"),
         ON_DEREGISTRATION_TIMEOUT(15, "onDeregistrationTimeout"),
-        ON_EXPECTED_ERROR(16, "onUnexpectedError");
+        ON_EXPECTED_ERROR(16, "onUnexpectedError"),
+        ON_READ_CONNECTION_ID (17, "onReadConnection"),
+        ON_WRITE_CONNECTION_ID (18, "onWriteConnection");
 
         public int code;
         public String type;
diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/attributes/DefaultLwM2mAttributeParserTest.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/attributes/DefaultLwM2mAttributeParserTest.java
new file mode 100644
index 0000000000..ede47667f5
--- /dev/null
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/attributes/DefaultLwM2mAttributeParserTest.java
@@ -0,0 +1,147 @@
+/**
+ * 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.attributes;
+
+import org.eclipse.leshan.core.link.LinkParseException;
+import org.eclipse.leshan.core.link.attributes.InvalidAttributeException;
+import org.eclipse.leshan.core.link.lwm2m.attributes.DefaultLwM2mAttributeParser;
+import org.eclipse.leshan.core.link.lwm2m.attributes.LwM2mAttribute;
+import org.eclipse.leshan.core.link.lwm2m.attributes.LwM2mAttributeSet;
+import org.eclipse.leshan.core.link.lwm2m.attributes.LwM2mAttributes;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.stream.Stream;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+public class DefaultLwM2mAttributeParserTest {
+
+    private final DefaultLwM2mAttributeParser parser = new DefaultLwM2mAttributeParser();
+
+    private static Stream<Arguments> validAttributes() throws InvalidAttributeException {
+        return Stream.of(//
+                Arguments.of("pmin", LwM2mAttributes.create(LwM2mAttributes.MINIMUM_PERIOD)), //
+                Arguments.of("pmin=30", LwM2mAttributes.create(LwM2mAttributes.MINIMUM_PERIOD, 30l)), //
+                Arguments.of("pmax", LwM2mAttributes.create(LwM2mAttributes.MAXIMUM_PERIOD)), //
+                Arguments.of("pmax=60", LwM2mAttributes.create(LwM2mAttributes.MAXIMUM_PERIOD, 60l)), //
+                Arguments.of("dim=2", LwM2mAttributes.create(LwM2mAttributes.DIMENSION, 2l)), //
+                Arguments.of("epmin", LwM2mAttributes.create(LwM2mAttributes.EVALUATE_MINIMUM_PERIOD)), //
+                Arguments.of("epmin=30", LwM2mAttributes.create(LwM2mAttributes.EVALUATE_MINIMUM_PERIOD, 30l)), //
+                Arguments.of("epmax", LwM2mAttributes.create(LwM2mAttributes.EVALUATE_MAXIMUM_PERIOD)), //
+                Arguments.of("epmax=60", LwM2mAttributes.create(LwM2mAttributes.EVALUATE_MAXIMUM_PERIOD, 60l)), //
+                Arguments.of("lt", LwM2mAttributes.create(LwM2mAttributes.LESSER_THAN)), //
+                Arguments.of("lt=30", LwM2mAttributes.create(LwM2mAttributes.LESSER_THAN, 30d)), //
+                Arguments.of("lt=-30", LwM2mAttributes.create(LwM2mAttributes.LESSER_THAN, -30d)), //
+                Arguments.of("lt=30.55", LwM2mAttributes.create(LwM2mAttributes.LESSER_THAN, 30.55)), //
+                Arguments.of("lt=-30.55", LwM2mAttributes.create(LwM2mAttributes.LESSER_THAN, -30.55)), //
+                Arguments.of("gt", LwM2mAttributes.create(LwM2mAttributes.GREATER_THAN)), //
+                Arguments.of("gt=60", LwM2mAttributes.create(LwM2mAttributes.GREATER_THAN, 60d)), //
+                Arguments.of("gt=-60", LwM2mAttributes.create(LwM2mAttributes.GREATER_THAN, -60d)), //
+                Arguments.of("gt=60.55", LwM2mAttributes.create(LwM2mAttributes.GREATER_THAN, 60.55)), //
+                Arguments.of("gt=-60.55", LwM2mAttributes.create(LwM2mAttributes.GREATER_THAN, -60.55)), //
+                Arguments.of("st", LwM2mAttributes.create(LwM2mAttributes.STEP)), //
+                Arguments.of("st=60", LwM2mAttributes.create(LwM2mAttributes.STEP, 60d)), //
+                Arguments.of("st=60.55", LwM2mAttributes.create(LwM2mAttributes.STEP, 60.55)) //
+        );
+    }
+
+    @ParameterizedTest(name = "Tests {index} : {0}")
+    @MethodSource("validAttributes")
+    public void check_one_valid_attribute(String attributeAsString, LwM2mAttribute<?> expectedValue)
+            throws LinkParseException, InvalidAttributeException {
+        LwM2mAttributeSet parsed = new LwM2mAttributeSet(parser.parseUriQuery(attributeAsString));
+        LwM2mAttributeSet attResult = new LwM2mAttributeSet(expectedValue);
+        assertEquals(parsed, attResult);
+    }
+
+    private static String[] invalidAttributes() {
+        return new String[] { //
+                // MINIMUM_PERIOD
+                "pmin=", //
+                "pmin=1.9", //
+                "pmin=-1.8", //
+                "pmin=a", //
+                // MAXIMUM_PERIOD
+                "pmax=", //
+                "pmax=-2", //
+                "pmax=2.7", //
+                "pmax=-2.6", //
+                "pmax=bc", //
+                // DIMENSION
+                "dim", //
+                "dim=", //
+                "dim=-3", //
+                "dim=3.5", //
+                "dim=-3.4", //
+                "dim=def", //
+                // EVALUATE_MINIMUM_PERIOD
+                "epmin=", //
+                "epmin=-4", //
+                "epmin=4.3", //
+                "epmin=-4.2", //
+                "epmin=ghij", //
+                // EVALUATE_MAXIMUM_PERIOD
+                "epmax=", //
+                "epmax=-5", //
+                "epmax=5.1", //
+                "epmax=-5.9", //
+                "epmax=klmno", //
+                // LESSER_THAN
+                "lt=", //
+                "lt=pqrts", //
+                "lt=0abc", //
+                // GREATER_THAN
+                "gt=", //
+                "gt=uvwxyz", //
+                "gt=0.xyz", //
+                // STEP
+                "st=", //
+                "st=-6", //
+                "st=-6.8", //
+                // Multi-attributes
+                "&pmin&pmax=60&gt=2&", //
+                "&pmin&pmax=60&gt=2", //
+                "pmin&pmax=60&gt=2&", //
+                "pmin&pmax=60&&gt=2", //
+                "pmin&pmax=60&&gt=2&&&", //
+                "&&&pmin&pmax=60&&gt=2", //
+        };
+    }
+
+    @ParameterizedTest(name = "Test {index} : {0}")
+    @MethodSource("invalidAttributes")
+    public void check_invalid_attributes(String invalidAttributesAsString) {
+        assertThrows(InvalidAttributeException.class,
+                () -> new LwM2mAttributeSet(parser.parseUriQuery(invalidAttributesAsString)));
+
+    }
+
+    @Test
+    public void check_multiple_valid_attributes() throws LinkParseException, InvalidAttributeException {
+
+        LwM2mAttributeSet parsed = new LwM2mAttributeSet(parser.parseUriQuery("pmin&pmax=60&gt=2"));
+        LwM2mAttributeSet attResult = new LwM2mAttributeSet( //
+                LwM2mAttributes.create(LwM2mAttributes.MINIMUM_PERIOD), //
+                LwM2mAttributes.create(LwM2mAttributes.MAXIMUM_PERIOD, 60l), //
+                LwM2mAttributes.create(LwM2mAttributes.GREATER_THAN, 2d));
+
+        assertEquals(attResult, parsed);
+    }
+}
diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/attributes/DefaultLwM2mLinkParserTest.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/attributes/DefaultLwM2mLinkParserTest.java
new file mode 100644
index 0000000000..cb293b5cdd
--- /dev/null
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/attributes/DefaultLwM2mLinkParserTest.java
@@ -0,0 +1,76 @@
+/**
+ * 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.attributes;
+
+import org.eclipse.leshan.core.link.LinkParseException;
+import org.eclipse.leshan.core.link.attributes.AttributeSet;
+import org.eclipse.leshan.core.link.lwm2m.DefaultLwM2mLinkParser;
+import org.eclipse.leshan.core.link.lwm2m.LwM2mLink;
+import org.eclipse.leshan.core.link.lwm2m.LwM2mLinkParser;
+import org.eclipse.leshan.core.link.lwm2m.attributes.LwM2mAttributeSet;
+import org.eclipse.leshan.core.link.lwm2m.attributes.LwM2mAttributes;
+import org.eclipse.leshan.core.node.LwM2mPath;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrowsExactly;
+
+public class DefaultLwM2mLinkParserTest {
+
+    private final LwM2mLinkParser parser = new DefaultLwM2mLinkParser();
+
+    @Test
+    public void check_invalid_values() throws LinkParseException {
+        // first check it's OK with valid value (3/0/11 - "errorCodes")
+        LwM2mLink[] parsed = parser.parseLwM2mLinkFromCoreLinkFormat("</3/0/11>;dim=255".getBytes(), null);
+        assertEquals(new LwM2mPath(3, 0, 11), parsed[0].getPath());
+        AttributeSet attResult = new LwM2mAttributeSet(LwM2mAttributes.create(LwM2mAttributes.DIMENSION, 255l));
+        assertEquals(attResult, parsed[0].getAttributes());
+
+        // then check an invalid one
+        assertThrowsExactly(LinkParseException.class, () -> {
+            // dim should be between 0-255
+            parser.parseLwM2mLinkFromCoreLinkFormat("</3/0/11>;dim=256".getBytes(), null);
+        });
+
+        // first check it's OK with valid value
+        parsed = parser.parseLwM2mLinkFromCoreLinkFormat("</0/1>;ssid=1".getBytes(), null);
+        assertEquals(new LwM2mPath(0, 1), parsed[0].getPath());
+        attResult = new LwM2mAttributeSet(LwM2mAttributes.create(LwM2mAttributes.SHORT_SERVER_ID, 1l));
+        assertEquals(attResult, parsed[0].getAttributes());
+
+        // then check an invalid one
+        assertThrowsExactly(LinkParseException.class, () -> {
+            // ssid should be between 1-65534
+            parser.parseLwM2mLinkFromCoreLinkFormat("</0/1>;ssid=0".getBytes(), null);
+        });
+    }
+
+    @Test
+    public void check_attribute_with_no_value_failed() throws LinkParseException {
+        // first check it's OK with value
+        LwM2mLink[] parsed = parser.parseLwM2mLinkFromCoreLinkFormat("</3/0/11>;pmin=200".getBytes(), null);
+        assertEquals(new LwM2mPath(3, 0, 11), parsed[0].getPath());
+        AttributeSet attResult = new LwM2mAttributeSet(LwM2mAttributes.create(LwM2mAttributes.MINIMUM_PERIOD, 200l));
+        assertEquals(attResult, parsed[0].getAttributes());
+
+        // then check an invalid one
+        assertThrowsExactly(LinkParseException.class, () -> {
+            // pmin should be with value
+            parser.parseLwM2mLinkFromCoreLinkFormat("</3/0/11>;pmin".getBytes(), null);
+        });
+    }
+}
diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/attributes/LwM2mAttributesTest.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/attributes/LwM2mAttributesTest.java
new file mode 100644
index 0000000000..73f8346566
--- /dev/null
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/attributes/LwM2mAttributesTest.java
@@ -0,0 +1,87 @@
+/**
+ * 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.attributes;
+
+import org.eclipse.leshan.core.link.attributes.InvalidAttributeException;
+import org.eclipse.leshan.core.link.lwm2m.attributes.LwM2mAttribute;
+import org.eclipse.leshan.core.link.lwm2m.attributes.LwM2mAttributeModel;
+import org.eclipse.leshan.core.link.lwm2m.attributes.LwM2mAttributes;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.stream.Stream;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+public class LwM2mAttributesTest {
+
+    @ParameterizedTest(name = "Tests {index} : {0}")
+    @MethodSource("supportNullAttributes")
+    public void check_attribute_can_be_created_with_null_value(LwM2mAttributeModel<?> model)
+            throws InvalidAttributeException {
+        LwM2mAttribute<?> attribute = LwM2mAttributes.create(model);
+        assertNotNull(attribute);
+        assertFalse(attribute.hasValue());
+        assertNull(attribute.getValue());
+        attribute = LwM2mAttributes.create(model, null);
+        assertNotNull(attribute);
+        assertFalse(attribute.hasValue());
+        assertNull(attribute.getValue());
+    }
+
+    @ParameterizedTest(name = "Tests {index} : {0}")
+    @MethodSource("doesntSupportAttributesWithoutValue")
+    public void check_attribute_can_not_be_created_without_value(LwM2mAttributeModel<?> model) {
+        assertThrows(UnsupportedOperationException.class, () -> LwM2mAttributes.create(model));
+    }
+
+    @ParameterizedTest(name = "Tests {index} : {0}")
+    @MethodSource("doesntSupportAttributesWithValueNull")
+    public void check_attribute_can_not_be_created_with_null(LwM2mAttributeModel<?> model) {
+        assertThrows(NullPointerException.class, () -> LwM2mAttributes.create(model, null));
+    }
+
+   private static Stream<Arguments> supportNullAttributes() throws InvalidAttributeException {
+        return Stream.of(//
+                Arguments.of(LwM2mAttributes.MINIMUM_PERIOD), //
+                Arguments.of(LwM2mAttributes.MAXIMUM_PERIOD), //
+                Arguments.of(LwM2mAttributes.EVALUATE_MINIMUM_PERIOD), //
+                Arguments.of(LwM2mAttributes.EVALUATE_MAXIMUM_PERIOD), //
+                Arguments.of(LwM2mAttributes.LESSER_THAN), //
+                Arguments.of(LwM2mAttributes.GREATER_THAN), //
+                Arguments.of(LwM2mAttributes.STEP) //
+        );
+    }
+
+    private static Stream<Arguments> doesntSupportAttributesWithoutValue() throws InvalidAttributeException {
+        return Stream.of(//
+                Arguments.of(LwM2mAttributes.ENABLER_VERSION), //
+                Arguments.of(LwM2mAttributes.OBJECT_VERSION)//
+        );
+    }
+
+    private static Stream<Arguments> doesntSupportAttributesWithValueNull() throws InvalidAttributeException {
+        return Stream.of(//
+                Arguments.of(LwM2mAttributes.DIMENSION), //
+                Arguments.of(LwM2mAttributes.SHORT_SERVER_ID) //
+        );
+    }
+}
+
diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/client/DtlsSessionLogger.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/client/DtlsSessionLogger.java
new file mode 100644
index 0000000000..d798dbc0d4
--- /dev/null
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/client/DtlsSessionLogger.java
@@ -0,0 +1,81 @@
+/**
+ * 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.client;
+
+import lombok.extern.slf4j.Slf4j;
+import org.eclipse.californium.scandium.dtls.ClientHandshaker;
+import org.eclipse.californium.scandium.dtls.DTLSContext;
+import org.eclipse.californium.scandium.dtls.HandshakeException;
+import org.eclipse.californium.scandium.dtls.Handshaker;
+import org.eclipse.californium.scandium.dtls.SessionAdapter;
+import org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.LwM2MClientState;
+
+import java.util.Map;
+import java.util.Set;
+
+import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.LwM2MClientState.ON_READ_CONNECTION_ID;
+import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.LwM2MClientState.ON_WRITE_CONNECTION_ID;
+
+@Slf4j
+public class DtlsSessionLogger extends SessionAdapter {
+
+    private final Set<LwM2MClientState> clientStates;
+    private final Map<LwM2MClientState, Integer> clientDtlsCid;
+
+    public DtlsSessionLogger(Set<LwM2MClientState> clientStates, Map<LwM2MClientState, Integer> clientDtlsCid) {
+        this.clientStates = clientStates;
+        this.clientDtlsCid = clientDtlsCid;
+    }
+
+    @Override
+    public void handshakeStarted(Handshaker handshaker) throws HandshakeException {
+        if (handshaker instanceof ClientHandshaker) {
+            log.info("DTLS Full Handshake initiated by client : STARTED ...");
+        }
+    }
+
+    @Override
+    public void contextEstablished(Handshaker handshaker, DTLSContext establishedContext) throws HandshakeException {
+        if (handshaker instanceof ClientHandshaker) {
+            log.warn("DTLS initiated by client: SUCCEED, WriteConnectionId: [{}], ReadConnectionId: [{}]", establishedContext.getWriteConnectionId(), establishedContext.getReadConnectionId());
+            clientStates.add(ON_WRITE_CONNECTION_ID);
+            clientStates.add(ON_READ_CONNECTION_ID);
+            Integer lenWrite = establishedContext.getWriteConnectionId() == null ? null : establishedContext.getWriteConnectionId().getBytes().length;
+            Integer lenRead = establishedContext.getReadConnectionId() == null ? null : establishedContext.getReadConnectionId().getBytes().length;
+            clientDtlsCid.put(ON_WRITE_CONNECTION_ID, lenWrite);
+            clientDtlsCid.put(ON_READ_CONNECTION_ID, lenRead);
+        }
+    }
+
+    @Override
+    public void handshakeFailed(Handshaker handshaker, Throwable error) {
+        // get cause
+        String cause;
+        if (error != null) {
+            if (error.getMessage() != null) {
+                cause = error.getMessage();
+            } else {
+                cause = error.getClass().getName();
+            }
+        } else {
+            cause = "unknown cause";
+        }
+
+        if (handshaker instanceof ClientHandshaker) {
+            log.info("DTLS Full Handshake initiated by client : FAILED ({})", cause);
+        }
+    }
+}
diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/client/FwLwM2MDevice.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/client/FwLwM2MDevice.java
index 9b7be32444..f42a7c938a 100644
--- a/application/src/test/java/org/thingsboard/server/transport/lwm2m/client/FwLwM2MDevice.java
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/client/FwLwM2MDevice.java
@@ -17,9 +17,10 @@ package org.thingsboard.server.transport.lwm2m.client;
 
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.leshan.client.resource.BaseInstanceEnabler;
-import org.eclipse.leshan.client.servers.ServerIdentity;
+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;
@@ -45,7 +46,7 @@ public class FwLwM2MDevice extends BaseInstanceEnabler implements Destroyable {
     private final AtomicInteger updateResult = new AtomicInteger(0);
 
     @Override
-    public ReadResponse read(ServerIdentity identity, int resourceId) {
+    public ReadResponse read(LwM2mServer identity, int resourceId) {
         if (!identity.isSystem())
             log.info("Read on Device resource /{}/{}/{}", getModel().id, getId(), resourceId);
         switch (resourceId) {
@@ -65,24 +66,24 @@ public class FwLwM2MDevice extends BaseInstanceEnabler implements Destroyable {
     }
 
     @Override
-    public ExecuteResponse execute(ServerIdentity identity, int resourceId, String params) {
-        String withParams = null;
-        if (params != null && params.length() != 0) {
-            withParams = " with params " + params;
-        }
-        log.info("Execute on Device resource /{}/{}/{} {}", getModel().id, getId(), resourceId, withParams != null ? withParams : "");
+    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, params);
+                return super.execute(identity, resourceId, arguments);
         }
     }
 
     @Override
-    public WriteResponse write(ServerIdentity identity, boolean replace, int resourceId, LwM2mResource value) {
+    public WriteResponse write(LwM2mServer identity, boolean replace, int resourceId, LwM2mResource value) {
         log.info("Write on Device resource /{}/{}/{}", getModel().id, getId(), resourceId);
 
         switch (resourceId) {
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 4ba30ab228..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
@@ -19,16 +19,26 @@ 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.californium.LeshanClient;
-import org.eclipse.leshan.client.californium.LeshanClientBuilder;
+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.LwM2mInstanceEnabler;
+import org.eclipse.leshan.client.resource.LwM2mObjectEnabler;
 import org.eclipse.leshan.client.resource.ObjectsInitializer;
-import org.eclipse.leshan.client.servers.ServerIdentity;
+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;
@@ -49,12 +59,17 @@ import org.thingsboard.server.transport.lwm2m.server.uplink.LwM2mUplinkMsgHandle
 import org.thingsboard.server.transport.lwm2m.utils.LwM2mValueConverterImpl;
 
 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.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;
 import static org.eclipse.leshan.core.LwM2mId.ACCESS_CONTROL;
 import static org.eclipse.leshan.core.LwM2mId.DEVICE;
@@ -63,6 +78,10 @@ import static org.eclipse.leshan.core.LwM2mId.LOCATION;
 import static org.eclipse.leshan.core.LwM2mId.SECURITY;
 import static org.eclipse.leshan.core.LwM2mId.SERVER;
 import static org.eclipse.leshan.core.LwM2mId.SOFTWARE_MANAGEMENT;
+import static org.thingsboard.server.transport.lwm2m.AbstractLwM2MIntegrationTest.serverId;
+import static org.thingsboard.server.transport.lwm2m.AbstractLwM2MIntegrationTest.serverIdBs;
+import static org.thingsboard.server.transport.lwm2m.AbstractLwM2MIntegrationTest.shortServerId;
+import static org.thingsboard.server.transport.lwm2m.AbstractLwM2MIntegrationTest.shortServerIdBs0;
 import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.BINARY_APP_DATA_CONTAINER;
 import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.LwM2MClientState;
 import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.LwM2MClientState.ON_BOOTSTRAP_FAILURE;
@@ -88,6 +107,7 @@ import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.OBJECT_INST
 import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.OBJECT_INSTANCE_ID_12;
 import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.TEMPERATURE_SENSOR;
 import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.resources;
+import static org.thingsboard.server.transport.lwm2m.utils.LwM2MTransportUtil.setDtlsConnectorConfigCidLength;
 
 
 @Slf4j
@@ -97,11 +117,6 @@ public class LwM2MTestClient {
     private final ScheduledExecutorService executor;
     private final String endpoint;
     private LeshanClient leshanClient;
-
-    private Security lwm2mSecurity;
-    private Security lwm2mSecurityBs;
-    private Lwm2mServer lwm2mServer;
-    private Lwm2mServer lwm2mServerBs;
     private SimpleLwM2MDevice lwM2MDevice;
     private FwLwM2MDevice fwLwM2MDevice;
     private SwLwM2MDevice swLwM2MDevice;
@@ -109,13 +124,13 @@ public class LwM2MTestClient {
     private LwM2MLocationParams locationParams;
     private LwM2mTemperatureSensor lwM2MTemperatureSensor;
     private Set<LwM2MClientState> clientStates;
+    private Map<LwM2MClientState, Integer> clientDtlsCid;
     private LwM2mUplinkMsgHandler defaultLwM2mUplinkMsgHandlerTest;
     private LwM2mClientContext clientContext;
 
-    public void init(Security security, Configuration coapConfig, int port, boolean isRpc, boolean isBootstrap,
-                     int shortServerId, int shortServerIdBs, Security securityBs,
+    public void init(Security security, Security securityBs, int port, boolean isRpc,
                      LwM2mUplinkMsgHandler defaultLwM2mUplinkMsgHandler,
-                     LwM2mClientContext clientContext) throws InvalidDDFFileException, IOException {
+                     LwM2mClientContext clientContext, boolean isWriteAttribute, Integer cIdLength, boolean queueMode) throws InvalidDDFFileException, IOException {
         Assert.assertNull("client already initialized", leshanClient);
         this.defaultLwM2mUplinkMsgHandlerTest = defaultLwM2mUplinkMsgHandler;
         this.clientContext = clientContext;
@@ -124,31 +139,36 @@ public class LwM2MTestClient {
             models.addAll(ObjectLoader.loadDdfFile(LwM2MTestClient.class.getClassLoader().getResourceAsStream("lwm2m/" + resourceName), resourceName));
         }
         LwM2mModel model = new StaticModel(models);
-        ObjectsInitializer initializer = new ObjectsInitializer(model);
-        if (securityBs == null) {
-            initializer.setInstancesForObject(SECURITY, this.lwm2mSecurity = security);
-        } else {
-            securityBs.setId(0);
-            security.setId(1);
-            LwM2mInstanceEnabler[] instances = new LwM2mInstanceEnabler[]{this.lwm2mSecurityBs = securityBs, this.lwm2mSecurity = security};
+        ObjectsInitializer initializer = isWriteAttribute ? new TbObjectsInitializer(model) : new ObjectsInitializer(model);
+        if (securityBs != null && security != null) {
+            // SECURITY
+            security.setId(serverId);
+            securityBs.setId(serverIdBs);
+            LwM2mInstanceEnabler[] instances = new LwM2mInstanceEnabler[]{securityBs, security};
             initializer.setClassForObject(SECURITY, Security.class);
             initializer.setInstancesForObject(SECURITY, instances);
-        }
-        if (isBootstrap) {
-            initializer.setInstancesForObject(SERVER, lwm2mServerBs = new Lwm2mServer(shortServerIdBs, 300));
+            // SERVER
+           Server lwm2mServer = new Server(shortServerId, TimeUnit.MINUTES.toSeconds(60));
+            lwm2mServer.setId(serverId);
+            Server  serverBs = new Server(shortServerIdBs0, TimeUnit.MINUTES.toSeconds(60));
+            serverBs.setId(serverIdBs);
+             instances = new LwM2mInstanceEnabler[]{serverBs, lwm2mServer};
+            initializer.setClassForObject(SERVER, Server.class);
+            initializer.setInstancesForObject(SERVER, instances);
+        } else if (securityBs != null) {
+            // SECURITY
+            initializer.setInstancesForObject(SECURITY, securityBs);
+            // SERVER
+            initializer.setClassForObject(SERVER, Server.class);
         } else {
-            if (securityBs == null) {
-                initializer.setInstancesForObject(SERVER, lwm2mServer = new Lwm2mServer(shortServerId, 300));
-            } else {
-                lwm2mServerBs = new Lwm2mServer(shortServerIdBs, 300);
-                lwm2mServerBs.setId(0);
-                lwm2mServer = new Lwm2mServer(shortServerId, 300);
-                lwm2mServer.setId(1);
-                LwM2mInstanceEnabler[] instances = new LwM2mInstanceEnabler[]{lwm2mServerBs, lwm2mServer};
-                initializer.setClassForObject(SERVER, Server.class);
-                initializer.setInstancesForObject(SERVER, instances);
-            }
+            // 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(executor));
         initializer.setInstancesForObject(FIRMWARE, fwLwM2MDevice = new FwLwM2MDevice());
         initializer.setInstancesForObject(SOFTWARE_MANAGEMENT, swLwM2MDevice = new SwLwM2MDevice());
@@ -160,106 +180,192 @@ public class LwM2MTestClient {
         initializer.setInstancesForObject(LOCATION, new LwM2mLocation(locationParams.getLatitude(), locationParams.getLongitude(), locationParams.getScaleFactor(), executor, OBJECT_INSTANCE_ID_0));
         initializer.setInstancesForObject(TEMPERATURE_SENSOR, lwM2MTemperatureSensor = new LwM2mTemperatureSensor(executor, OBJECT_INSTANCE_ID_0), new LwM2mTemperatureSensor(executor, OBJECT_INSTANCE_ID_12));
 
-        DtlsConnectorConfig.Builder dtlsConfig = new DtlsConnectorConfig.Builder(coapConfig);
-        dtlsConfig.set(DTLS_RECOMMENDED_CIPHER_SUITES_ONLY, true);
+        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);
+
+                        // Add DTLS Session lifecycle logger
+                        builder.setSessionListener(new DtlsSessionLogger(clientStates, clientDtlsCid));
+
+                        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);
+
+        if (cIdLength!= null) {
+            setDtlsConnectorConfigCidLength(clientCoapConfig, cIdLength);
+        }
+
+        if (cIdLength!= null) {
+            setDtlsConnectorConfigCidLength(clientCoapConfig, cIdLength);
+        }
+
+        // Set Californium Configuration
+        endpointsBuilder.setConfiguration(clientCoapConfig);
+        endpointsBuilder.setClientAddress(new InetSocketAddress(port).getAddress());
+
 
+        // creates EndpointsProvider
+        List<LwM2mClientEndpointsProvider> endpointsProvider = new ArrayList<>();
+        endpointsProvider.add(endpointsBuilder.build());
+        /**
+         * dependency -> org.eclipse.leshan.transport.javacoap.client.endpoint;
+         */
+//        if (useJavaCoap) {endpointsProvider.add(new JavaCoapClientEndpointsProvider());
+
+        // Configure Registration Engine
         DefaultRegistrationEngineFactory engineFactory = new DefaultRegistrationEngineFactory();
-        engineFactory.setReconnectOnUpdate(false);
+            // old
+        /**
+         * Force reconnection/rehandshake on registration update.
+         */
+        int comPeriodInSec = 5;
+        if (comPeriodInSec > 0)   engineFactory.setCommunicationPeriod(comPeriodInSec * 1000);
+//        engineFactory.setCommunicationPeriod(5000); // old
+        /**
+         * 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);
-        engineFactory.setCommunicationPeriod(5000);
 
+        /**
+         * Client use queue mode.
+         */
+        engineFactory.setQueueMode(queueMode);
+
+        // Create client
         LeshanClientBuilder builder = new LeshanClientBuilder(endpoint);
-        builder.setLocalAddress("0.0.0.0", port);
-        builder.setObjects(initializer.createAll());
-        builder.setCoapConfig(coapConfig);
-        builder.setDtlsConfig(dtlsConfig);
+        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);
-        builder.setDecoder(new DefaultLwM2mDecoder(false));
 
-        builder.setEncoder(new DefaultLwM2mEncoder(new LwM2mValueConverterImpl(), false));
         clientStates = new HashSet<>();
+        clientDtlsCid = new HashMap<>();
         clientStates.add(ON_INIT);
         leshanClient = builder.build();
 
         LwM2mClientObserver observer = new LwM2mClientObserver() {
             @Override
-            public void onBootstrapStarted(ServerIdentity bsserver, BootstrapRequest request) {
+            public void onBootstrapStarted(LwM2mServer bsserver, BootstrapRequest request) {
                 clientStates.add(ON_BOOTSTRAP_STARTED);
             }
 
             @Override
-            public void onBootstrapSuccess(ServerIdentity bsserver, BootstrapRequest request) {
+            public void onBootstrapSuccess(LwM2mServer bsserver, BootstrapRequest request) {
                 clientStates.add(ON_BOOTSTRAP_SUCCESS);
             }
 
             @Override
-            public void onBootstrapFailure(ServerIdentity bsserver, BootstrapRequest request, ResponseCode responseCode, String errorMessage, Exception cause) {
+            public void onBootstrapFailure(LwM2mServer bsserver, BootstrapRequest request, ResponseCode responseCode, String errorMessage, Exception cause) {
                 clientStates.add(ON_BOOTSTRAP_FAILURE);
             }
 
             @Override
-            public void onBootstrapTimeout(ServerIdentity bsserver, BootstrapRequest request) {
+            public void onBootstrapTimeout(LwM2mServer bsserver, BootstrapRequest request) {
                 clientStates.add(ON_BOOTSTRAP_TIMEOUT);
             }
 
             @Override
-            public void onRegistrationStarted(ServerIdentity server, RegisterRequest request) {
+            public void onRegistrationStarted(LwM2mServer server, RegisterRequest request) {
                 clientStates.add(ON_REGISTRATION_STARTED);
             }
 
             @Override
-            public void onRegistrationSuccess(ServerIdentity server, RegisterRequest request, String registrationID) {
+            public void onRegistrationSuccess(LwM2mServer server, RegisterRequest request, String registrationID) {
                 clientStates.add(ON_REGISTRATION_SUCCESS);
             }
 
             @Override
-            public void onRegistrationFailure(ServerIdentity server, RegisterRequest request, ResponseCode responseCode, String errorMessage, Exception cause) {
+            public void onRegistrationFailure(LwM2mServer server, RegisterRequest request, ResponseCode responseCode, String errorMessage, Exception cause) {
                 clientStates.add(ON_REGISTRATION_FAILURE);
             }
 
             @Override
-            public void onRegistrationTimeout(ServerIdentity server, RegisterRequest request) {
+            public void onRegistrationTimeout(LwM2mServer server, RegisterRequest request) {
                 clientStates.add(ON_REGISTRATION_TIMEOUT);
             }
 
             @Override
-            public void onUpdateStarted(ServerIdentity server, UpdateRequest request) {
+            public void onUpdateStarted(LwM2mServer server, UpdateRequest request) {
                 clientStates.add(ON_UPDATE_STARTED);
             }
 
             @Override
-            public void onUpdateSuccess(ServerIdentity server, UpdateRequest request) {
+            public void onUpdateSuccess(LwM2mServer server, UpdateRequest request) {
                 clientStates.add(ON_UPDATE_SUCCESS);
             }
 
             @Override
-            public void onUpdateFailure(ServerIdentity server, UpdateRequest request, ResponseCode responseCode, String errorMessage, Exception cause) {
+            public void onUpdateFailure(LwM2mServer server, UpdateRequest request, ResponseCode responseCode, String errorMessage, Exception cause) {
                 clientStates.add(ON_UPDATE_FAILURE);
             }
 
             @Override
-            public void onUpdateTimeout(ServerIdentity server, UpdateRequest request) {
+            public void onUpdateTimeout(LwM2mServer server, UpdateRequest request) {
                 clientStates.add(ON_UPDATE_TIMEOUT);
             }
 
             @Override
-            public void onDeregistrationStarted(ServerIdentity server, DeregisterRequest request) {
+            public void onDeregistrationStarted(LwM2mServer server, DeregisterRequest request) {
                 clientStates.add(ON_DEREGISTRATION_STARTED);
             }
 
             @Override
-            public void onDeregistrationSuccess(ServerIdentity server, DeregisterRequest request) {
+            public void onDeregistrationSuccess(LwM2mServer server, DeregisterRequest request) {
                 clientStates.add(ON_DEREGISTRATION_SUCCESS);
             }
 
             @Override
-            public void onDeregistrationFailure(ServerIdentity server, DeregisterRequest request, ResponseCode responseCode, String errorMessage, Exception cause) {
+            public void onDeregistrationFailure(LwM2mServer server, DeregisterRequest request, ResponseCode responseCode, String errorMessage, Exception cause) {
                 clientStates.add(ON_DEREGISTRATION_FAILURE);
             }
 
             @Override
-            public void onDeregistrationTimeout(ServerIdentity server, DeregisterRequest request) {
+            public void onDeregistrationTimeout(LwM2mServer server, DeregisterRequest request) {
                 clientStates.add(ON_DEREGISTRATION_TIMEOUT);
             }
 
@@ -270,6 +376,21 @@ public class LwM2MTestClient {
         };
         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);
+            }
+        });
+
+
         if (!isRpc) {
             this.start(true);
         }
@@ -279,18 +400,6 @@ public class LwM2MTestClient {
         if (leshanClient != null) {
             leshanClient.destroy(true);
         }
-        if (lwm2mSecurityBs != null) {
-            lwm2mSecurityBs = null;
-        }
-        if (lwm2mSecurity != null) {
-            lwm2mSecurity = null;
-        }
-        if (lwm2mServerBs != null) {
-            lwm2mServerBs = null;
-        }
-        if (lwm2mServer != null) {
-            lwm2mServer = null;
-        }
         if (lwM2MDevice != null) {
             lwM2MDevice.destroy();
         }
diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/client/LwM2mBinaryAppDataContainer.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/client/LwM2mBinaryAppDataContainer.java
index 97319364c6..88385a067e 100644
--- a/application/src/test/java/org/thingsboard/server/transport/lwm2m/client/LwM2mBinaryAppDataContainer.java
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/client/LwM2mBinaryAppDataContainer.java
@@ -17,7 +17,7 @@ package org.thingsboard.server.transport.lwm2m.client;
 
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.leshan.client.resource.BaseInstanceEnabler;
-import org.eclipse.leshan.client.servers.ServerIdentity;
+import org.eclipse.leshan.client.servers.LwM2mServer;
 import org.eclipse.leshan.core.model.ObjectModel;
 import org.eclipse.leshan.core.model.ResourceModel;
 import org.eclipse.leshan.core.node.LwM2mMultipleResource;
@@ -93,7 +93,7 @@ public class LwM2mBinaryAppDataContainer extends BaseInstanceEnabler implements
     }
 
     @Override
-    public ReadResponse read(ServerIdentity identity, int resourceId) {
+    public ReadResponse read(LwM2mServer identity, int resourceId) {
         try {
             switch (resourceId) {
                 case 0:
@@ -118,7 +118,7 @@ public class LwM2mBinaryAppDataContainer extends BaseInstanceEnabler implements
     }
 
     @Override
-    public WriteResponse write(ServerIdentity identity, boolean replace, int resourceId, LwM2mResource value) {
+    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:
diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/client/LwM2mLocation.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/client/LwM2mLocation.java
index 4d8c56be89..2940a17c6d 100644
--- a/application/src/test/java/org/thingsboard/server/transport/lwm2m/client/LwM2mLocation.java
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/client/LwM2mLocation.java
@@ -17,7 +17,7 @@ package org.thingsboard.server.transport.lwm2m.client;
 
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.leshan.client.resource.BaseInstanceEnabler;
-import org.eclipse.leshan.client.servers.ServerIdentity;
+import org.eclipse.leshan.client.servers.LwM2mServer;
 import org.eclipse.leshan.core.model.ObjectModel;
 import org.eclipse.leshan.core.response.ReadResponse;
 
@@ -85,7 +85,7 @@ public class LwM2mLocation extends BaseInstanceEnabler implements Destroyable {
     }
 
     @Override
-    public ReadResponse read(ServerIdentity identity, int resourceId) {
+    public ReadResponse read(LwM2mServer identity, int resourceId) {
         log.info("Read on Location resource /[{}]/[{}]/[{}]", getModel().id, getId(), resourceId);
         switch (resourceId) {
             case 0:
diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/client/LwM2mTemperatureSensor.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/client/LwM2mTemperatureSensor.java
index d3a7da1a5c..fc75342ff8 100644
--- a/application/src/test/java/org/thingsboard/server/transport/lwm2m/client/LwM2mTemperatureSensor.java
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/client/LwM2mTemperatureSensor.java
@@ -17,8 +17,9 @@ package org.thingsboard.server.transport.lwm2m.client;
 
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.leshan.client.resource.BaseInstanceEnabler;
-import org.eclipse.leshan.client.servers.ServerIdentity;
+import org.eclipse.leshan.client.servers.LwM2mServer;
 import org.eclipse.leshan.core.model.ObjectModel;
+import org.eclipse.leshan.core.request.argument.Arguments;
 import org.eclipse.leshan.core.response.ExecuteResponse;
 import org.eclipse.leshan.core.response.ReadResponse;
 
@@ -56,7 +57,7 @@ public class LwM2mTemperatureSensor extends BaseInstanceEnabler implements Destr
     }
 
     @Override
-    public synchronized ReadResponse read(ServerIdentity identity, int resourceId) {
+    public synchronized ReadResponse read(LwM2mServer identity, int resourceId) {
         log.info("Read on Temperature resource /[{}]/[{}]/[{}]", getModel().id, getId(), resourceId);
         switch (resourceId) {
             case 5601:
@@ -73,14 +74,14 @@ public class LwM2mTemperatureSensor extends BaseInstanceEnabler implements Destr
     }
 
     @Override
-    public synchronized ExecuteResponse execute(ServerIdentity identity, int resourceId, String params) {
+    public synchronized ExecuteResponse execute(LwM2mServer identity, int resourceId, Arguments arguments) {
         log.info("Execute on Temperature resource /[{}]/[{}]/[{}]", getModel().id, getId(), resourceId);
         switch (resourceId) {
             case 5605:
                 resetMinMaxMeasuredValues();
                 return ExecuteResponse.success();
             default:
-                return super.execute(identity, resourceId, params);
+                return super.execute(identity, resourceId, arguments);
         }
     }
 
diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/client/Lwm2mServer.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/client/Lwm2mServer.java
index 901ec85f93..67f8066688 100644
--- a/application/src/test/java/org/thingsboard/server/transport/lwm2m/client/Lwm2mServer.java
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/client/Lwm2mServer.java
@@ -18,11 +18,12 @@ package org.thingsboard.server.transport.lwm2m.client;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.leshan.client.resource.BaseInstanceEnabler;
 import org.eclipse.leshan.client.resource.LwM2mInstanceEnabler;
-import org.eclipse.leshan.client.servers.ServerIdentity;
+import org.eclipse.leshan.client.servers.LwM2mServer;
 import org.eclipse.leshan.core.model.ObjectModel;
 import org.eclipse.leshan.core.model.ResourceModel.Type;
 import org.eclipse.leshan.core.node.LwM2mResource;
 import org.eclipse.leshan.core.request.BindingMode;
+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;
@@ -70,7 +71,7 @@ public class Lwm2mServer extends BaseInstanceEnabler {
     }
 
     @Override
-    public ReadResponse read(ServerIdentity identity, int resourceid) {
+    public ReadResponse read(LwM2mServer identity, int resourceid) {
         if (!identity.isSystem())
             LOG.debug("Read on Server resource /{}/{}/{}", getModel().id, getId(), resourceid);
 
@@ -108,7 +109,7 @@ public class Lwm2mServer extends BaseInstanceEnabler {
     }
 
     @Override
-    public WriteResponse write(ServerIdentity identity, boolean replace, int resourceid, LwM2mResource value) {
+    public WriteResponse write(LwM2mServer identity, boolean replace, int resourceid, LwM2mResource value) {
         if (!identity.isSystem())
             log.debug("Write on Server resource /{}/{}/{}", getModel().id, getId(), resourceid);
 
@@ -195,8 +196,7 @@ public class Lwm2mServer extends BaseInstanceEnabler {
         }
     }
 
-    @Override
-    public ExecuteResponse execute(ServerIdentity identity, int resourceid, String params) {
+    public ExecuteResponse execute(LwM2mServer identity, int resourceid, Arguments arguments) {
         log.info("Execute on Server resource /{}/{}/{}", getModel().id, getId(), resourceid);
         if (resourceid == 8) {
             getLwM2mClient().triggerRegistrationUpdate(identity);
@@ -210,7 +210,7 @@ public class Lwm2mServer extends BaseInstanceEnabler {
                 return ExecuteResponse.badRequest("probably no bootstrap server configured");
             }
         } else {
-            return super.execute(identity, resourceid, params);
+            return super.execute(identity, resourceid, arguments);
         }
     }
 
diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/client/SimpleLwM2MDevice.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/client/SimpleLwM2MDevice.java
index dfa00a0a7f..1c0aa2b637 100644
--- a/application/src/test/java/org/thingsboard/server/transport/lwm2m/client/SimpleLwM2MDevice.java
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/client/SimpleLwM2MDevice.java
@@ -17,11 +17,12 @@ package org.thingsboard.server.transport.lwm2m.client;
 
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.leshan.client.resource.BaseInstanceEnabler;
-import org.eclipse.leshan.client.servers.ServerIdentity;
+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;
@@ -46,7 +47,7 @@ public class SimpleLwM2MDevice extends BaseInstanceEnabler implements Destroyabl
     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, 9, 10, 11, 13, 14, 15, 16, 17, 18, 19, 20, 21);
+    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() {
@@ -57,7 +58,8 @@ public class SimpleLwM2MDevice extends BaseInstanceEnabler implements Destroyabl
             executorService.scheduleWithFixedDelay(() -> {
                         fireResourceChange(9);
                     }
-                    , 1800000, 1800000, TimeUnit.MILLISECONDS); // 30 MIN
+                    , 1, 1, TimeUnit.SECONDS); // 30 MIN
+//                    , 1800000, 1800000, TimeUnit.MILLISECONDS); // 30 MIN
         } catch (Throwable e) {
             log.error("[{}]Throwable", e.toString());
             e.printStackTrace();
@@ -66,7 +68,7 @@ public class SimpleLwM2MDevice extends BaseInstanceEnabler implements Destroyabl
 
 
     @Override
-    public ReadResponse read(ServerIdentity identity, int resourceId) {
+    public ReadResponse read(LwM2mServer identity, int resourceId) {
         if (!identity.isSystem())
             log.info("Read on Device resource /{}/{}/{}", getModel().id, getId(), resourceId);
         switch (resourceId) {
@@ -78,6 +80,8 @@ public class SimpleLwM2MDevice extends BaseInstanceEnabler implements Destroyabl
                 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:
@@ -108,17 +112,16 @@ public class SimpleLwM2MDevice extends BaseInstanceEnabler implements Destroyabl
     }
 
     @Override
-    public ExecuteResponse execute(ServerIdentity identity, int resourceId, String params) {
-        String withParams = null;
-        if (params != null && params.length() != 0) {
-            withParams = " with params " + params;
-        }
-        log.info("Execute on Device resource /{}/{}/{} {}", getModel().id, getId(), resourceId, withParams != null ? withParams : "");
+    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(ServerIdentity identity, boolean replace, int resourceId, LwM2mResource value) {
+    public WriteResponse write(LwM2mServer identity, boolean replace, int resourceId, LwM2mResource value) {
         log.info("Write on Device resource /{}/{}/{}", getModel().id, getId(), resourceId);
 
         switch (resourceId) {
@@ -157,6 +160,14 @@ public class SimpleLwM2MDevice extends BaseInstanceEnabler implements Destroyabl
         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;
diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/client/SwLwM2MDevice.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/client/SwLwM2MDevice.java
index 6d863d0775..284afc3f51 100644
--- a/application/src/test/java/org/thingsboard/server/transport/lwm2m/client/SwLwM2MDevice.java
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/client/SwLwM2MDevice.java
@@ -17,9 +17,10 @@ package org.thingsboard.server.transport.lwm2m.client;
 
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.leshan.client.resource.BaseInstanceEnabler;
-import org.eclipse.leshan.client.servers.ServerIdentity;
+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;
@@ -45,7 +46,7 @@ public class SwLwM2MDevice extends BaseInstanceEnabler implements Destroyable {
     private final AtomicInteger updateResult = new AtomicInteger(0);
 
     @Override
-    public ReadResponse read(ServerIdentity identity, int resourceId) {
+    public ReadResponse read(LwM2mServer identity, int resourceId) {
         if (!identity.isSystem())
             log.info("Read on Device resource /{}/{}/{}", getModel().id, getId(), resourceId);
         switch (resourceId) {
@@ -63,12 +64,11 @@ public class SwLwM2MDevice extends BaseInstanceEnabler implements Destroyable {
     }
 
     @Override
-    public ExecuteResponse execute(ServerIdentity identity, int resourceId, String params) {
-        String withParams = null;
-        if (params != null && params.length() != 0) {
-            withParams = " with params " + params;
-        }
-        log.info("Execute on Device resource /{}/{}/{} {}", getModel().id, getId(), resourceId, withParams != null ? withParams : "");
+    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 4:
@@ -77,12 +77,12 @@ public class SwLwM2MDevice extends BaseInstanceEnabler implements Destroyable {
             case 6:
                 return ExecuteResponse.success();
             default:
-                return super.execute(identity, resourceId, params);
+                return super.execute(identity, resourceId, arguments);
         }
     }
 
     @Override
-    public WriteResponse write(ServerIdentity identity, boolean replace, int resourceId, LwM2mResource value) {
+    public WriteResponse write(LwM2mServer identity, boolean replace, int resourceId, LwM2mResource value) {
         log.info("Write on Device resource /{}/{}/{}", getModel().id, getId(), resourceId);
 
         switch (resourceId) {
diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/client/TbLwm2mObjectEnabler.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/client/TbLwm2mObjectEnabler.java
new file mode 100644
index 0000000000..f548cc30e2
--- /dev/null
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/client/TbLwm2mObjectEnabler.java
@@ -0,0 +1,732 @@
+/**
+ * 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.client;
+
+import org.eclipse.leshan.client.LwM2mClient;
+import org.eclipse.leshan.client.resource.BaseObjectEnabler;
+import org.eclipse.leshan.client.resource.DummyInstanceEnabler;
+import org.eclipse.leshan.client.resource.LwM2mInstanceEnabler;
+import org.eclipse.leshan.client.resource.LwM2mInstanceEnablerFactory;
+import org.eclipse.leshan.client.resource.listener.ResourceListener;
+import org.eclipse.leshan.client.servers.LwM2mServer;
+import org.eclipse.leshan.client.servers.ServersInfoExtractor;
+import org.eclipse.leshan.client.util.LinkFormatHelper;
+import org.eclipse.leshan.core.Destroyable;
+import org.eclipse.leshan.core.LwM2mId;
+import org.eclipse.leshan.core.Startable;
+import org.eclipse.leshan.core.Stoppable;
+import org.eclipse.leshan.core.link.lwm2m.LwM2mLink;
+import org.eclipse.leshan.core.link.lwm2m.attributes.LwM2mAttribute;
+import org.eclipse.leshan.core.link.lwm2m.attributes.LwM2mAttributeSet;
+import org.eclipse.leshan.core.link.lwm2m.attributes.LwM2mAttributes;
+import org.eclipse.leshan.core.model.ObjectModel;
+import org.eclipse.leshan.core.model.ResourceModel;
+import org.eclipse.leshan.core.node.LwM2mMultipleResource;
+import org.eclipse.leshan.core.node.LwM2mObject;
+import org.eclipse.leshan.core.node.LwM2mObjectInstance;
+import org.eclipse.leshan.core.node.LwM2mPath;
+import org.eclipse.leshan.core.node.LwM2mResource;
+import org.eclipse.leshan.core.node.LwM2mResourceInstance;
+import org.eclipse.leshan.core.request.BootstrapDeleteRequest;
+import org.eclipse.leshan.core.request.BootstrapReadRequest;
+import org.eclipse.leshan.core.request.BootstrapWriteRequest;
+import org.eclipse.leshan.core.request.ContentFormat;
+import org.eclipse.leshan.core.request.CreateRequest;
+import org.eclipse.leshan.core.request.DeleteRequest;
+import org.eclipse.leshan.core.request.DiscoverRequest;
+import org.eclipse.leshan.core.request.DownlinkRequest;
+import org.eclipse.leshan.core.request.ExecuteRequest;
+import org.eclipse.leshan.core.request.ObserveRequest;
+import org.eclipse.leshan.core.request.ReadRequest;
+import org.eclipse.leshan.core.request.WriteAttributesRequest;
+import org.eclipse.leshan.core.request.WriteRequest;
+import org.eclipse.leshan.core.request.WriteRequest.Mode;
+import org.eclipse.leshan.core.response.BootstrapDeleteResponse;
+import org.eclipse.leshan.core.response.BootstrapReadResponse;
+import org.eclipse.leshan.core.response.BootstrapWriteResponse;
+import org.eclipse.leshan.core.response.CreateResponse;
+import org.eclipse.leshan.core.response.DeleteResponse;
+import org.eclipse.leshan.core.response.DiscoverResponse;
+import org.eclipse.leshan.core.response.ExecuteResponse;
+import org.eclipse.leshan.core.response.ObserveResponse;
+import org.eclipse.leshan.core.response.ReadResponse;
+import org.eclipse.leshan.core.response.WriteAttributesResponse;
+import org.eclipse.leshan.core.response.WriteResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+public class TbLwm2mObjectEnabler extends BaseObjectEnabler implements Destroyable, Startable, Stoppable {
+
+    private static Logger LOG = LoggerFactory.getLogger(DummyInstanceEnabler.class);
+
+    protected Map<Integer, LwM2mInstanceEnabler> instances;
+
+    protected LwM2mInstanceEnablerFactory instanceFactory;
+    protected ContentFormat defaultContentFormat;
+
+    private LinkFormatHelper tbLinkFormatHelper;
+    protected Map<LwM2mPath, LwM2mAttributeSet> lwM2mAttributes;
+    public TbLwm2mObjectEnabler(int id, ObjectModel objectModel, Map<Integer, LwM2mInstanceEnabler> instances,
+                                LwM2mInstanceEnablerFactory instanceFactory, ContentFormat defaultContentFormat) {
+        super(id, objectModel);
+        this.instances = new HashMap<>(instances);
+        ;
+        this.instanceFactory = instanceFactory;
+        this.defaultContentFormat = defaultContentFormat;
+        for (Entry<Integer, LwM2mInstanceEnabler> entry : this.instances.entrySet()) {
+            instances.put(entry.getKey(), entry.getValue());
+            listenInstance(entry.getValue(), entry.getKey());
+        }
+        this.lwM2mAttributes = new HashMap<>();
+    }
+
+    public TbLwm2mObjectEnabler(int id, ObjectModel objectModel) {
+        super(id, objectModel);
+    }
+
+    @Override
+    public synchronized List<Integer> getAvailableInstanceIds() {
+        List<Integer> ids = new ArrayList<>(instances.keySet());
+        Collections.sort(ids);
+        return ids;
+    }
+
+    @Override
+    public synchronized List<Integer> getAvailableResourceIds(int instanceId) {
+        LwM2mInstanceEnabler instanceEnabler = instances.get(instanceId);
+        if (instanceEnabler != null) {
+            return instanceEnabler.getAvailableResourceIds(getObjectModel());
+        } else {
+            return Collections.emptyList();
+        }
+    }
+
+    public synchronized void addInstance(int instanceId, LwM2mInstanceEnabler newInstance) {
+        instances.put(instanceId, newInstance);
+        listenInstance(newInstance, instanceId);
+        fireInstancesAdded(instanceId);
+    }
+
+    public synchronized LwM2mInstanceEnabler getInstance(int instanceId) {
+        return instances.get(instanceId);
+    }
+
+    public synchronized LwM2mInstanceEnabler removeInstance(int instanceId) {
+        LwM2mInstanceEnabler removedInstance = instances.remove(instanceId);
+        if (removedInstance != null) {
+            fireInstancesRemoved(removedInstance.getId());
+        }
+        return removedInstance;
+    }
+
+    @Override
+    protected CreateResponse doCreate(LwM2mServer server, CreateRequest request) {
+        if (!getObjectModel().multiple && instances.size() > 0) {
+            return CreateResponse.badRequest("an instance already exist for this single instance object");
+        }
+
+        if (request.unknownObjectInstanceId()) {
+            // create instance
+            LwM2mInstanceEnabler newInstance = createInstance(server, getObjectModel().multiple ? null : 0,
+                    request.getResources());
+
+            // add new instance to this object
+            instances.put(newInstance.getId(), newInstance);
+            listenInstance(newInstance, newInstance.getId());
+            fireInstancesAdded(newInstance.getId());
+
+            return CreateResponse
+                    .success(new LwM2mPath(request.getPath().getObjectId(), newInstance.getId()).toString());
+        } else {
+            List<LwM2mObjectInstance> instanceNodes = request.getObjectInstances();
+
+            // checks single object instances
+            if (!getObjectModel().multiple) {
+                if (request.getObjectInstances().size() > 1) {
+                    return CreateResponse.badRequest("can not create several instances on this single instance object");
+                }
+                if (request.getObjectInstances().get(0).getId() != 0) {
+                    return CreateResponse.badRequest("single instance object must use 0 as ID");
+                }
+            }
+            // ensure instance does not already exists
+            for (LwM2mObjectInstance instance : instanceNodes) {
+                if (instances.containsKey(instance.getId())) {
+                    return CreateResponse.badRequest(String.format("instance %d already exists", instance.getId()));
+                }
+            }
+
+            // create the new instances
+            int[] instanceIds = new int[request.getObjectInstances().size()];
+            int i = 0;
+            for (LwM2mObjectInstance instance : request.getObjectInstances()) {
+                // create instance
+                LwM2mInstanceEnabler newInstance = createInstance(server, instance.getId(),
+                        instance.getResources().values());
+
+                // add new instance to this object
+                instances.put(newInstance.getId(), newInstance);
+                listenInstance(newInstance, newInstance.getId());
+
+                // store instance ids
+                instanceIds[i] = newInstance.getId();
+                i++;
+            }
+            fireInstancesAdded(instanceIds);
+            return CreateResponse.success();
+        }
+    }
+
+    protected LwM2mInstanceEnabler createInstance(LwM2mServer server, Integer instanceId,
+                                                  Collection<LwM2mResource> resources) {
+        // create the new instance
+        LwM2mInstanceEnabler newInstance = instanceFactory.create(getObjectModel(), instanceId, instances.keySet());
+        newInstance.setLwM2mClient(getLwm2mClient());
+
+        // add/write resource
+        for (LwM2mResource resource : resources) {
+            newInstance.write(server, true, resource.getId(), resource);
+        }
+
+        return newInstance;
+    }
+
+    @Override
+    protected ReadResponse doRead(LwM2mServer server, ReadRequest request) {
+        LwM2mPath path = request.getPath();
+
+        // Manage Object case
+        if (path.isObject()) {
+            List<LwM2mObjectInstance> lwM2mObjectInstances = new ArrayList<>();
+            for (LwM2mInstanceEnabler instance : instances.values()) {
+                ReadResponse response = instance.read(server);
+                if (response.isSuccess()) {
+                    lwM2mObjectInstances.add((LwM2mObjectInstance) response.getContent());
+                }
+            }
+            return ReadResponse.success(new LwM2mObject(getId(), lwM2mObjectInstances));
+        }
+
+        // Manage Instance case
+        LwM2mInstanceEnabler instance = instances.get(path.getObjectInstanceId());
+        if (instance == null)
+            return ReadResponse.notFound();
+
+        if (path.getResourceId() == null) {
+            return instance.read(server);
+        }
+
+        // Manage Resource case
+        if (path.getResourceInstanceId() == null) {
+            return instance.read(server, path.getResourceId());
+        }
+
+        // Manage Resource Instance case
+        return instance.read(server, path.getResourceId(), path.getResourceInstanceId());
+    }
+
+    @Override
+    protected BootstrapReadResponse doRead(LwM2mServer server, BootstrapReadRequest request) {
+        // Basic implementation we delegate to classic Read Request
+        ReadResponse response = doRead(server,
+                new ReadRequest(request.getContentFormat(), request.getPath(), request.getCoapRequest()));
+        return new BootstrapReadResponse(response.getCode(), response.getContent(), response.getErrorMessage());
+    }
+
+    @Override
+    protected ObserveResponse doObserve(final LwM2mServer server, final ObserveRequest request) {
+        final LwM2mPath path = request.getPath();
+
+        // Manage Object case
+        if (path.isObject()) {
+            List<LwM2mObjectInstance> lwM2mObjectInstances = new ArrayList<>();
+            for (LwM2mInstanceEnabler instance : instances.values()) {
+                ReadResponse response = instance.observe(server);
+                if (response.isSuccess()) {
+                    lwM2mObjectInstances.add((LwM2mObjectInstance) response.getContent());
+                }
+            }
+            return ObserveResponse.success(new LwM2mObject(getId(), lwM2mObjectInstances));
+        }
+
+        // Manage Instance case
+        final LwM2mInstanceEnabler instance = instances.get(path.getObjectInstanceId());
+        if (instance == null)
+            return ObserveResponse.notFound();
+
+        if (path.getResourceId() == null) {
+            return instance.observe(server);
+        }
+
+        // Manage Resource case
+        if (path.getResourceInstanceId() == null) {
+            return instance.observe(server, path.getResourceId());
+        }
+
+        // Manage Resource Instance case
+        return instance.observe(server, path.getResourceId(), path.getResourceInstanceId());
+    }
+
+    @Override
+    protected WriteResponse doWrite(LwM2mServer server, WriteRequest request) {
+        LwM2mPath path = request.getPath();
+
+        // Manage Instance case
+        LwM2mInstanceEnabler instance = instances.get(path.getObjectInstanceId());
+        if (instance == null)
+            return WriteResponse.notFound();
+
+        if (path.isObjectInstance()) {
+            return instance.write(server, request.isReplaceRequest(), (LwM2mObjectInstance) request.getNode());
+        }
+
+        // Manage Resource case
+        if (path.getResourceInstanceId() == null) {
+            return instance.write(server, request.isReplaceRequest(), path.getResourceId(),
+                    (LwM2mResource) request.getNode());
+        }
+
+        // Manage Resource Instance case
+        return instance.write(server, false, path.getResourceId(), path.getResourceInstanceId(),
+                ((LwM2mResourceInstance) request.getNode()));
+    }
+
+    @Override
+    protected BootstrapWriteResponse doWrite(LwM2mServer server, BootstrapWriteRequest request) {
+        LwM2mPath path = request.getPath();
+
+        // Manage Object case
+        if (path.isObject()) {
+            for (LwM2mObjectInstance instanceNode : ((LwM2mObject) request.getNode()).getInstances().values()) {
+                LwM2mInstanceEnabler instanceEnabler = instances.get(instanceNode.getId());
+                if (instanceEnabler == null) {
+                    doCreate(server, new CreateRequest(path.getObjectId(), instanceNode));
+                } else {
+                    doWrite(server, new WriteRequest(Mode.REPLACE, path.getObjectId(), instanceEnabler.getId(),
+                            instanceNode.getResources().values()));
+                }
+            }
+            return BootstrapWriteResponse.success();
+        }
+
+        // Manage Instance case
+        if (path.isObjectInstance()) {
+            LwM2mObjectInstance instanceNode = (LwM2mObjectInstance) request.getNode();
+            LwM2mInstanceEnabler instanceEnabler = instances.get(path.getObjectInstanceId());
+            if (instanceEnabler == null) {
+                doCreate(server, new CreateRequest(path.getObjectId(), instanceNode));
+            } else {
+                doWrite(server, new WriteRequest(Mode.REPLACE, request.getContentFormat(), path.getObjectId(),
+                        path.getObjectInstanceId(), instanceNode.getResources().values()));
+            }
+            return BootstrapWriteResponse.success();
+        }
+
+        // Manage resource case
+        LwM2mResource resource = (LwM2mResource) request.getNode();
+        LwM2mInstanceEnabler instanceEnabler = instances.get(path.getObjectInstanceId());
+        if (instanceEnabler == null) {
+            doCreate(server, new CreateRequest(path.getObjectId(),
+                    new LwM2mObjectInstance(path.getObjectInstanceId(), resource)));
+        } else {
+            instanceEnabler.write(server, true, path.getResourceId(), resource);
+        }
+        return BootstrapWriteResponse.success();
+    }
+
+    @Override
+    protected ExecuteResponse doExecute(LwM2mServer server, ExecuteRequest request) {
+        LwM2mPath path = request.getPath();
+        LwM2mInstanceEnabler instance = instances.get(path.getObjectInstanceId());
+        if (instance == null) {
+            return ExecuteResponse.notFound();
+        }
+        return instance.execute(server, path.getResourceId(), request.getArguments());
+    }
+
+    @Override
+    protected DeleteResponse doDelete(LwM2mServer server, DeleteRequest request) {
+        LwM2mInstanceEnabler deletedInstance = instances.remove(request.getPath().getObjectInstanceId());
+        if (deletedInstance != null) {
+            deletedInstance.onDelete(server);
+            fireInstancesRemoved(deletedInstance.getId());
+            return DeleteResponse.success();
+        }
+        return DeleteResponse.notFound();
+    }
+
+    @Override
+    public BootstrapDeleteResponse doDelete(LwM2mServer server, BootstrapDeleteRequest request) {
+        if (request.getPath().isRoot() || request.getPath().isObject()) {
+            if (id == LwM2mId.SECURITY) {
+                // For security object, we clean everything except bootstrap Server account.
+
+                // Get bootstrap account and store removed instances ids
+                Entry<Integer, LwM2mInstanceEnabler> bootstrapServerAccount = null;
+                int[] instanceIds = new int[instances.size()];
+                int i = 0;
+                for (Entry<Integer, LwM2mInstanceEnabler> instance : instances.entrySet()) {
+                    if (ServersInfoExtractor.isBootstrapServer(instance.getValue())) {
+                        bootstrapServerAccount = instance;
+                    } else {
+                        // Store instance ids
+                        instanceIds[i] = instance.getKey();
+                        i++;
+                    }
+                }
+                // Clear everything
+                instances.clear();
+
+                // Put bootstrap account again
+                if (bootstrapServerAccount != null) {
+                    instances.put(bootstrapServerAccount.getKey(), bootstrapServerAccount.getValue());
+                }
+
+                fireInstancesRemoved(instanceIds);
+                return BootstrapDeleteResponse.success();
+            } else if (id == LwM2mId.OSCORE) {
+                // For OSCORE object, we clean everything except OSCORE object link to bootstrap Server account.
+
+                // Get bootstrap account
+                LwM2mObjectInstance bootstrapInstance = ServersInfoExtractor.getBootstrapSecurityInstance(
+                        getLwm2mClient().getObjectTree().getObjectEnabler(LwM2mId.SECURITY));
+                // Get OSCORE instance ID associated to it
+                Integer bootstrapOscoreInstanceId = bootstrapInstance != null
+                        ? ServersInfoExtractor.getOscoreSecurityMode(bootstrapInstance)
+                        : null;
+
+                // if bootstrap server use OSCORE,
+                // search the OSCORE instance for this ID and store removed instances ids
+                if (bootstrapOscoreInstanceId != null) {
+                    Entry<Integer, LwM2mInstanceEnabler> bootstrapServerOscore = null;
+                    int[] instanceIds = new int[instances.size()];
+                    int i = 0;
+                    for (Entry<Integer, LwM2mInstanceEnabler> instance : instances.entrySet()) {
+                        if (bootstrapOscoreInstanceId.equals(instance.getKey())) {
+                            bootstrapServerOscore = instance;
+                        } else {
+                            // Store instance ids
+                            instanceIds[i] = instance.getKey();
+                            i++;
+                        }
+                    }
+
+                    // Clear everything
+                    instances.clear();
+
+                    // Put bootstrap OSCORE instance again
+                    if (bootstrapServerOscore != null) {
+                        instances.put(bootstrapServerOscore.getKey(), bootstrapServerOscore.getValue());
+                    }
+                    fireInstancesRemoved(instanceIds);
+                    return BootstrapDeleteResponse.success();
+                }
+                // else delete everything.
+            }
+
+            // In all other cases, just delete everything
+            instances.clear();
+            // fired instances removed
+            int[] instanceIds = new int[instances.size()];
+            int i = 0;
+            for (Entry<Integer, LwM2mInstanceEnabler> instance : instances.entrySet()) {
+                instanceIds[i] = instance.getKey();
+                i++;
+            }
+            fireInstancesRemoved(instanceIds);
+
+            return BootstrapDeleteResponse.success();
+        } else if (request.getPath().isObjectInstance()) {
+            if (id == LwM2mId.SECURITY) {
+                // For security object, deleting bootstrap Server account is not allowed
+                LwM2mInstanceEnabler instance = instances.get(request.getPath().getObjectInstanceId());
+                if (instance == null) {
+                    return BootstrapDeleteResponse
+                            .badRequest(String.format("Instance %s not found", request.getPath()));
+                } else if (ServersInfoExtractor.isBootstrapServer(instance)) {
+                    return BootstrapDeleteResponse.badRequest("bootstrap server can not be deleted");
+                }
+            } else if (id == LwM2mId.OSCORE) {
+                // For OSCORE object, deleting instance linked to Bootstrap account is not allowed
+
+                // Get bootstrap instance
+                LwM2mObjectInstance bootstrapInstance = ServersInfoExtractor.getBootstrapSecurityInstance(
+                        getLwm2mClient().getObjectTree().getObjectEnabler(LwM2mId.SECURITY));
+                // Get OSCORE instance ID associated to it
+                Integer bootstrapOscoreInstanceId = bootstrapInstance != null
+                        ? ServersInfoExtractor.getOscoreSecurityMode(bootstrapInstance)
+                        : null;
+
+                if (bootstrapOscoreInstanceId != null
+                        && bootstrapOscoreInstanceId.equals(request.getPath().getObjectInstanceId())) {
+                    return BootstrapDeleteResponse
+                            .badRequest("OSCORE instance linked to bootstrap server can not be deleted");
+                }
+            }
+            if (null != instances.remove(request.getPath().getObjectInstanceId())) {
+                fireInstancesRemoved(request.getPath().getObjectInstanceId());
+                return BootstrapDeleteResponse.success();
+            } else {
+                return BootstrapDeleteResponse.badRequest(String.format("Instance %s not found", request.getPath()));
+            }
+        }
+        return BootstrapDeleteResponse.badRequest(String.format("unexcepted path %s", request.getPath()));
+    }
+
+    protected void listenInstance(LwM2mInstanceEnabler instance, final int instanceId) {
+        instance.addResourceListener(new ResourceListener() {
+            @Override
+            public void resourceChanged(LwM2mPath... paths) {
+                for (LwM2mPath path : paths) {
+                    if (!isValid(instanceId, path)) {
+                        LOG.warn("InstanceEnabler ({}) of object ({}) try to raise a change of {} which seems invalid.",
+                                instanceId, getId(), path);
+                    }
+                }
+                fireResourcesChanged(paths);
+            }
+        });
+    }
+
+    protected boolean isValid(int instanceId, LwM2mPath pathToValidate) {
+        if (!(pathToValidate.isResource() || pathToValidate.isResourceInstance()))
+            return false;
+
+        if (pathToValidate.getObjectId() != getId()) {
+            return false;
+        }
+
+        if (pathToValidate.getObjectInstanceId() != instanceId) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public ContentFormat getDefaultEncodingFormat(DownlinkRequest<?> request) {
+        return defaultContentFormat;
+    }
+
+    @Override
+    public void init(LwM2mClient client, LinkFormatHelper linkFormatHelper) {
+        super.init(client, linkFormatHelper);
+        this.tbLinkFormatHelper = linkFormatHelper;
+        for (LwM2mInstanceEnabler instanceEnabler : instances.values()) {
+            instanceEnabler.setLwM2mClient(client);
+        }
+    }
+
+    @Override
+    public void destroy() {
+        for (LwM2mInstanceEnabler instanceEnabler : instances.values()) {
+            if (instanceEnabler instanceof Destroyable) {
+                ((Destroyable) instanceEnabler).destroy();
+            } else if (instanceEnabler instanceof Stoppable) {
+                ((Stoppable) instanceEnabler).stop();
+            }
+        }
+    }
+
+    @Override
+    public void start() {
+        for (LwM2mInstanceEnabler instanceEnabler : instances.values()) {
+            if (instanceEnabler instanceof Startable) {
+                ((Startable) instanceEnabler).start();
+            }
+        }
+    }
+
+    @Override
+    public void stop() {
+        for (LwM2mInstanceEnabler instanceEnabler : instances.values()) {
+            if (instanceEnabler instanceof Stoppable) {
+                ((Stoppable) instanceEnabler).stop();
+            }
+        }
+    }
+
+    @Override
+    public synchronized WriteAttributesResponse writeAttributes(LwM2mServer server, WriteAttributesRequest request) {
+        // execute is not supported for bootstrap
+        if (server.isLwm2mBootstrapServer()) {
+            return WriteAttributesResponse.methodNotAllowed();
+        }
+//        return WriteAttributesResponse.internalServerError("not implemented");
+        return doWriteAttributes(server, request);
+    }
+
+    /**
+     *  <NOTIFICATION> Class Attributes
+     * - pmin             (def = 0(sec)) Integer Resource/Object Instance/Object Readable Resource
+     * - pmax             (def = -- )    Integer Resource/Object Instance/Object Readable Resource
+     * - Greater Than  gt (def = -- )    Float   Resource                        Numerical&Readable Resource
+     * - Less Than     lt (def = -- )    Float   Resource                        Numerical&Readable Resource
+     * - Step          st (def = -- )    Float   Resource                        Numerical&Readable Resource
+     */
+    public  WriteAttributesResponse doWriteAttributes(LwM2mServer server, WriteAttributesRequest request) {
+        LwM2mPath lwM2mPath = request.getPath();
+        LwM2mAttributeSet attributeSet = lwM2mAttributes.get(lwM2mPath);
+        Map <String, LwM2mAttribute<?>> attributes = new HashMap<>();
+
+        for (LwM2mAttribute attr : request.getAttributes().getLwM2mAttributes()) {
+            if (attr.getName().equals("pmax") || attr.getName().equals("pmin")) {
+                if (lwM2mPath.isObject() || lwM2mPath.isObjectInstance() || lwM2mPath.isResource()) {
+                    attributes.put(attr.getName(), attr);
+                } else {
+                    return WriteAttributesResponse.badRequest("Attribute " + attr.getName() + " can be used for only Resource/Object Instance/Object.");
+                }
+            } else if (attr.getName().equals("gt") || attr.getName().equals("lt") || attr.getName().equals("st")) {
+                if (lwM2mPath.isResource()) {
+                    attributes.put(attr.getName(), attr);
+                } else {
+                    return WriteAttributesResponse.badRequest("Attribute " + attr.getName() + " can be used for only Resource.");
+                }
+            }
+        }
+        if (attributes.size()>0){
+            if (attributeSet == null) {
+                attributeSet = new LwM2mAttributeSet(attributes.values());
+            } else {
+                Iterable<LwM2mAttribute<?>> lwM2mAttributeIterable = attributeSet.getLwM2mAttributes();
+              Map <String, LwM2mAttribute<?>> attributesOld = new HashMap<>();
+                for (LwM2mAttribute<?> attr : lwM2mAttributeIterable) {
+                    attributesOld.put(attr.getName(), attr);
+                }
+                attributesOld.putAll(attributes);
+                attributeSet = new LwM2mAttributeSet(attributesOld.values());
+            }
+            lwM2mAttributes.put(lwM2mPath, attributeSet);
+            return WriteAttributesResponse.success();
+        }
+        return WriteAttributesResponse.internalServerError("not implemented");
+    }
+
+    @Override
+    public synchronized DiscoverResponse discover(LwM2mServer server, DiscoverRequest request) {
+
+        if (server.isLwm2mBootstrapServer()) {
+            // discover is not supported for bootstrap
+            return DiscoverResponse.methodNotAllowed();
+        }
+
+        if (id == LwM2mId.SECURITY || id == LwM2mId.OSCORE) {
+            return DiscoverResponse.notFound();
+        }
+        return doDiscover(server, request);
+
+    }
+
+    protected DiscoverResponse doDiscover(LwM2mServer server, DiscoverRequest request) {
+
+        LwM2mPath path = request.getPath();
+        if (path.isObject()) {
+            LwM2mLink[] ObjectLinks = linkUpdateAttributes(this.tbLinkFormatHelper.getObjectDescription(this, null), server);
+            return DiscoverResponse.success(ObjectLinks);
+
+        } else if (path.isObjectInstance()) {
+            // Manage discover on instance
+            if (!getAvailableInstanceIds().contains(path.getObjectInstanceId()))
+                return DiscoverResponse.notFound();
+
+            LwM2mLink[] instanceLink =  linkUpdateAttributes(this.tbLinkFormatHelper.getInstanceDescription(this, path.getObjectInstanceId(), null), server);
+            return DiscoverResponse.success(instanceLink);
+
+        } else if (path.isResource()) {
+            // Manage discover on resource
+            if (!getAvailableInstanceIds().contains(path.getObjectInstanceId()))
+                return DiscoverResponse.notFound();
+
+            ResourceModel resourceModel = getObjectModel().resources.get(path.getResourceId());
+            if (resourceModel == null)
+                return DiscoverResponse.notFound();
+
+            if (!getAvailableResourceIds(path.getObjectInstanceId()).contains(path.getResourceId()))
+                return DiscoverResponse.notFound();
+
+            LwM2mLink resourceLink  = linkAddAttribute(
+                    this.tbLinkFormatHelper.getResourceDescription(this, path.getObjectInstanceId(), path.getResourceId(), null),
+                    server);
+            return DiscoverResponse.success(new LwM2mLink[] { resourceLink });
+        }
+        return DiscoverResponse.badRequest(null);
+    }
+
+    private LwM2mLink[] linkUpdateAttributes(LwM2mLink[] links, LwM2mServer server) {
+        return  Arrays.stream(links)
+                .map(link -> linkAddAttribute(link, server))
+                .toArray(LwM2mLink[]::new);
+    }
+
+    private LwM2mLink linkAddAttribute(LwM2mLink link, LwM2mServer server) {
+
+        LwM2mAttributeSet lwM2mAttributeSetDop = null;
+        if (this.lwM2mAttributes.get(link.getPath())!= null){
+            lwM2mAttributeSetDop = this.lwM2mAttributes.get(link.getPath());
+        }
+        LwM2mAttribute resourceAttributeDim = getResourceAttributes (server, link.getPath());
+
+        Map <String, LwM2mAttribute<?>> attributes = new HashMap<>();
+        if (link.getAttributes() != null) {
+            for (LwM2mAttribute attr : link.getAttributes().getLwM2mAttributes()) {
+                attributes.put(attr.getName(), attr);
+            }
+        }
+        if (lwM2mAttributeSetDop != null) {
+            for (LwM2mAttribute attr : lwM2mAttributeSetDop.getLwM2mAttributes()) {
+                attributes.put(attr.getName(), attr);
+            }
+        }
+        if (resourceAttributeDim != null) {
+            attributes.put(resourceAttributeDim.getName(), resourceAttributeDim);
+        }
+        return new LwM2mLink(link.getRootPath(), link.getPath(), attributes.values());
+    }
+
+    protected LwM2mAttribute getResourceAttributes (LwM2mServer server, LwM2mPath path)    {
+        ResourceModel resourceModel = getObjectModel().resources.get(path.getResourceId());
+        if (path.isResource() && resourceModel.multiple) {
+            return getResourceAttributeDim(path, server);
+        }
+        return null;
+    }
+
+    protected LwM2mAttribute getResourceAttributeDim(LwM2mPath path, LwM2mServer server) {
+        LwM2mInstanceEnabler instance = instances.get(path.getObjectInstanceId());
+        try {
+            ReadResponse readResponse = instance.read(server, path.getResourceId());
+            if (readResponse.getCode().getCode()==205 && readResponse.getContent() instanceof LwM2mMultipleResource) {
+                long valueDim = ((LwM2mMultipleResource)readResponse.getContent()).getInstances().size();
+                return LwM2mAttributes.create(LwM2mAttributes.DIMENSION, valueDim);
+            } else {
+                return null;
+            }
+        } catch (Exception e ){
+            return null;
+        }
+    }
+
+}
+
diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/client/TbObjectsInitializer.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/client/TbObjectsInitializer.java
new file mode 100644
index 0000000000..eff5ac962e
--- /dev/null
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/client/TbObjectsInitializer.java
@@ -0,0 +1,71 @@
+/**
+ * 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.client;
+
+import org.eclipse.leshan.client.resource.BaseInstanceEnablerFactory;
+import org.eclipse.leshan.client.resource.LwM2mInstanceEnabler;
+import org.eclipse.leshan.client.resource.LwM2mObjectEnabler;
+import org.eclipse.leshan.client.resource.ObjectsInitializer;
+import org.eclipse.leshan.core.model.LwM2mModel;
+import org.eclipse.leshan.core.model.ObjectModel;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class TbObjectsInitializer extends ObjectsInitializer {
+
+
+    public TbObjectsInitializer(LwM2mModel model) {
+        super(model);
+    }
+
+    public List<LwM2mObjectEnabler> create(int... objectId) {
+        List<LwM2mObjectEnabler> enablers = new ArrayList<>();
+        for (int anObjectId : objectId) {
+            LwM2mObjectEnabler objectEnabler = create(anObjectId);
+            if (objectEnabler != null)
+                enablers.add(objectEnabler);
+        }
+        return enablers;
+    }
+
+    public LwM2mObjectEnabler create(int objectId) {
+        ObjectModel objectModel = model.getObjectModel(objectId);
+        if (objectModel == null) {
+            throw new IllegalArgumentException(
+                    "Cannot create object for id " + objectId + " because no model is defined for this id.");
+        }
+        return createNodeEnabler(objectModel);
+    }
+
+    protected LwM2mObjectEnabler createNodeEnabler(ObjectModel objectModel) {
+        Map<Integer, LwM2mInstanceEnabler> instances = new HashMap<>();
+        LwM2mInstanceEnabler[] newInstances = createInstances(objectModel);
+        for (LwM2mInstanceEnabler instance : newInstances) {
+            // set id if not already set
+            if (instance.getId() == null) {
+                int id = BaseInstanceEnablerFactory.generateNewInstanceId(instances.keySet());
+                instance.setId(id);
+            }
+            instance.setModel(objectModel);
+            instances.put(instance.getId(), instance);
+        }
+        return new TbLwm2mObjectEnabler(objectModel.id, objectModel, instances, getFactoryFor(objectModel),
+                getContentFormat(objectModel.id));
+    }
+}
diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/ota/AbstractOtaLwM2MIntegrationTest.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/ota/AbstractOtaLwM2MIntegrationTest.java
index 5fdf0289f0..60e335e32a 100644
--- a/application/src/test/java/org/thingsboard/server/transport/lwm2m/ota/AbstractOtaLwM2MIntegrationTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/ota/AbstractOtaLwM2MIntegrationTest.java
@@ -34,6 +34,47 @@ public abstract class AbstractOtaLwM2MIntegrationTest extends AbstractLwM2MInteg
     protected static final String CLIENT_ENDPOINT_OTA5 = "Ota5_Device";
     protected static final String CLIENT_ENDPOINT_OTA9 = "Ota9_Device";
 
+
+    protected final String OBSERVE_ATTRIBUTES_WITH_PARAMS_OTA =
+
+            "    {\n" +
+                    "    \"keyName\": {\n" +
+                    "      \"/5_1.2/0/3\": \"state\",\n" +
+                    "      \"/5_1.2/0/5\": \"updateResult\",\n" +
+                    "      \"/5_1.2/0/6\": \"pkgname\",\n" +
+                    "      \"/5_1.2/0/7\": \"pkgversion\",\n" +
+                    "      \"/5_1.2/0/9\": \"firmwareUpdateDeliveryMethod\",\n" +
+                    "      \"/9_1.1/0/0\": \"pkgname\",\n" +
+                    "      \"/9_1.1/0/1\": \"pkgversion\",\n" +
+                    "      \"/9_1.1/0/7\": \"updateState\",\n" +
+                    "      \"/9_1.1/0/9\": \"updateResult\"\n" +
+                    "    },\n" +
+                    "    \"observe\": [\n" +
+                    "      \"/5_1.2/0/3\",\n" +
+                    "      \"/5_1.2/0/5\",\n" +
+                    "      \"/5_1.2/0/6\",\n" +
+                    "      \"/5_1.2/0/7\",\n" +
+                    "      \"/5_1.2/0/9\",\n" +
+                    "      \"/9_1.1/0/0\",\n" +
+                    "      \"/9_1.1/0/1\",\n" +
+                    "      \"/9_1.1/0/7\",\n" +
+                    "      \"/9_1.1/0/9\"\n" +
+                    "    ],\n" +
+                    "    \"attribute\": [],\n" +
+                    "    \"telemetry\": [\n" +
+                    "      \"/5_1.2/0/3\",\n" +
+                    "      \"/5_1.2/0/5\",\n" +
+                    "      \"/5_1.2/0/6\",\n" +
+                    "      \"/5_1.2/0/7\",\n" +
+                    "      \"/5_1.2/0/9\",\n" +
+                    "      \"/9_1.1/0/0\",\n" +
+                    "      \"/9_1.1/0/1\",\n" +
+                    "      \"/9_1.1/0/7\",\n" +
+                    "      \"/9_1.1/0/9\"\n" +
+                    "    ],\n" +
+                    "    \"attributeLwm2m\": {}\n" +
+                    "  }";
+
     public AbstractOtaLwM2MIntegrationTest() {
         setResources(this.RESOURCES_OTA);
     }
diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/ota/sql/OtaLwM2MIntegrationTest.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/ota/sql/OtaLwM2MIntegrationTest.java
index f53f7e26c5..c7027ed42a 100644
--- a/application/src/test/java/org/thingsboard/server/transport/lwm2m/ota/sql/OtaLwM2MIntegrationTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/ota/sql/OtaLwM2MIntegrationTest.java
@@ -51,46 +51,6 @@ import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.LwM2MProfil
 @Slf4j
 public class OtaLwM2MIntegrationTest extends AbstractOtaLwM2MIntegrationTest {
 
-    protected final String OBSERVE_ATTRIBUTES_WITH_PARAMS_OTA =
-
-            "    {\n" +
-                    "    \"keyName\": {\n" +
-                    "      \"/5_1.0/0/3\": \"state\",\n" +
-                    "      \"/5_1.0/0/5\": \"updateResult\",\n" +
-                    "      \"/5_1.0/0/6\": \"pkgname\",\n" +
-                    "      \"/5_1.0/0/7\": \"pkgversion\",\n" +
-                    "      \"/5_1.0/0/9\": \"firmwareUpdateDeliveryMethod\",\n" +
-                    "      \"/9_1.0/0/0\": \"pkgname\",\n" +
-                    "      \"/9_1.0/0/1\": \"pkgversion\",\n" +
-                    "      \"/9_1.0/0/7\": \"updateState\",\n" +
-                    "      \"/9_1.0/0/9\": \"updateResult\"\n" +
-                    "    },\n" +
-                    "    \"observe\": [\n" +
-                    "      \"/5_1.0/0/3\",\n" +
-                    "      \"/5_1.0/0/5\",\n" +
-                    "      \"/5_1.0/0/6\",\n" +
-                    "      \"/5_1.0/0/7\",\n" +
-                    "      \"/5_1.0/0/9\",\n" +
-                    "      \"/9_1.0/0/0\",\n" +
-                    "      \"/9_1.0/0/1\",\n" +
-                    "      \"/9_1.0/0/7\",\n" +
-                    "      \"/9_1.0/0/9\"\n" +
-                    "    ],\n" +
-                    "    \"attribute\": [],\n" +
-                    "    \"telemetry\": [\n" +
-                    "      \"/5_1.0/0/3\",\n" +
-                    "      \"/5_1.0/0/5\",\n" +
-                    "      \"/5_1.0/0/6\",\n" +
-                    "      \"/5_1.0/0/7\",\n" +
-                    "      \"/5_1.0/0/9\",\n" +
-                    "      \"/9_1.0/0/0\",\n" +
-                    "      \"/9_1.0/0/1\",\n" +
-                    "      \"/9_1.0/0/7\",\n" +
-                    "      \"/9_1.0/0/9\"\n" +
-                    "    ],\n" +
-                    "    \"attributeLwm2m\": {}\n" +
-                    "  }";
-
     private List<OtaPackageUpdateStatus> expectedStatuses;
 
     @Test
@@ -99,8 +59,8 @@ public class OtaLwM2MIntegrationTest extends AbstractOtaLwM2MIntegrationTest {
         createDeviceProfile(transportConfiguration);
         LwM2MDeviceCredentials deviceCredentials = getDeviceCredentialsNoSec(createNoSecClientCredentials(this.CLIENT_ENDPOINT_WITHOUT_FW_INFO));
         final Device device = createDevice(deviceCredentials, this.CLIENT_ENDPOINT_WITHOUT_FW_INFO);
-        createNewClient(SECURITY_NO_SEC, COAP_CONFIG, false, this.CLIENT_ENDPOINT_WITHOUT_FW_INFO, false, null);
-        awaitObserveReadAll(0, false, device.getId().getId().toString());
+        createNewClient(SECURITY_NO_SEC,  null, false, this.CLIENT_ENDPOINT_WITHOUT_FW_INFO);
+        awaitObserveReadAll(0, device.getId().getId().toString());
 
         device.setFirmwareId(createFirmware().getId());
         final Device savedDevice = doPost("/api/device", device, Device.class);
@@ -124,8 +84,8 @@ public class OtaLwM2MIntegrationTest extends AbstractOtaLwM2MIntegrationTest {
         createDeviceProfile(transportConfiguration);
         LwM2MDeviceCredentials deviceCredentials = getDeviceCredentialsNoSec(createNoSecClientCredentials(this.CLIENT_ENDPOINT_OTA5));
         final Device device = createDevice(deviceCredentials, this.CLIENT_ENDPOINT_OTA5);
-        createNewClient(SECURITY_NO_SEC, COAP_CONFIG, false, this.CLIENT_ENDPOINT_OTA5, false, null);
-        awaitObserveReadAll(9, false, device.getId().getId().toString());
+        createNewClient(SECURITY_NO_SEC, null, false, this.CLIENT_ENDPOINT_OTA5);
+        awaitObserveReadAll(9, device.getId().getId().toString());
 
         device.setFirmwareId(createFirmware().getId());
         final Device savedDevice = doPost("/api/device", device, Device.class);
@@ -154,8 +114,8 @@ public class OtaLwM2MIntegrationTest extends AbstractOtaLwM2MIntegrationTest {
         createDeviceProfile(transportConfiguration);
         LwM2MDeviceCredentials deviceCredentials = getDeviceCredentialsNoSec(createNoSecClientCredentials(this.CLIENT_ENDPOINT_OTA9));
         final Device device = createDevice(deviceCredentials, this.CLIENT_ENDPOINT_OTA9);
-        createNewClient(SECURITY_NO_SEC, COAP_CONFIG, false, this.CLIENT_ENDPOINT_OTA9, false, null);
-        awaitObserveReadAll(9, false, device.getId().getId().toString());
+        createNewClient(SECURITY_NO_SEC, null, false, this.CLIENT_ENDPOINT_OTA9);
+        awaitObserveReadAll(9, device.getId().getId().toString());
 
         device.setSoftwareId(createSoftware().getId());
         final Device savedDevice = doPost("/api/device", device, Device.class); //sync call
diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/AbstractRpcLwM2MIntegrationObserveTest.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/AbstractRpcLwM2MIntegrationObserveTest.java
new file mode 100644
index 0000000000..3cda275e13
--- /dev/null
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/AbstractRpcLwM2MIntegrationObserveTest.java
@@ -0,0 +1,34 @@
+/**
+ * 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.rpc;
+
+import org.junit.Before;
+import org.thingsboard.server.dao.service.DaoSqlTest;
+
+@DaoSqlTest
+public abstract class AbstractRpcLwM2MIntegrationObserveTest extends AbstractRpcLwM2MIntegrationTest{
+    private final String[] RESOURCES_RPC_MULTIPLE_19 = new String[]{"0.xml", "1.xml", "2.xml", "3.xml", "5.xml", "6.xml", "9.xml", "19.xml", "3303.xml"};
+
+    public AbstractRpcLwM2MIntegrationObserveTest() {
+        setResources(this.RESOURCES_RPC_MULTIPLE_19);
+    }
+
+    @Before
+    public void initTest () throws Exception {
+        awaitObserveReadAll(2, deviceId);
+    }
+
+}
diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/AbstractRpcLwM2MIntegrationTest.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/AbstractRpcLwM2MIntegrationTest.java
index e2cfa0fd2e..1c6e384ae1 100644
--- a/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/AbstractRpcLwM2MIntegrationTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/AbstractRpcLwM2MIntegrationTest.java
@@ -15,6 +15,8 @@
  */
 package org.thingsboard.server.transport.lwm2m.rpc;
 
+import org.eclipse.leshan.core.link.LinkParser;
+import org.eclipse.leshan.core.link.lwm2m.DefaultLwM2mLinkParser;
 import org.junit.Before;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.device.credentials.lwm2m.LwM2MDeviceCredentials;
@@ -35,6 +37,7 @@ import static org.eclipse.leshan.core.LwM2mId.SOFTWARE_MANAGEMENT;
 import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.BINARY_APP_DATA_CONTAINER;
 import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.LwM2MProfileBootstrapConfigType.NONE;
 import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.OBJECT_ID_0;
+import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.OBJECT_ID_1;
 import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.OBJECT_INSTANCE_ID_0;
 import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.OBJECT_INSTANCE_ID_1;
 import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.RESOURCE_ID_0;
@@ -50,8 +53,8 @@ import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.resources;
 @DaoSqlTest
 public abstract class AbstractRpcLwM2MIntegrationTest extends AbstractLwM2MIntegrationTest {
 
+    protected final LinkParser linkParser = new DefaultLwM2mLinkParser();
     protected String OBSERVE_ATTRIBUTES_WITH_PARAMS_RPC;
-    protected String deviceId;
     public Set expectedObjects;
     public Set expectedObjectIdVers;
     public Set expectedInstances;
@@ -59,6 +62,7 @@ public abstract class AbstractRpcLwM2MIntegrationTest extends AbstractLwM2MInteg
 
     protected String objectInstanceIdVer_1;
     protected String objectIdVer_0;
+    protected String objectIdVer_1;
     protected String objectIdVer_2;
     private static final Predicate PREDICATE_3 = path -> (!((String) path).startsWith("/" + TEMPERATURE_SENSOR) && ((String) path).startsWith("/" + DEVICE));
     protected String objectIdVer_3;
@@ -79,12 +83,15 @@ public abstract class AbstractRpcLwM2MIntegrationTest extends AbstractLwM2MInteg
 
     @Before
     public void startInitRPC() throws Exception {
+        if (this.getClass().getSimpleName().equals("RpcLwm2mIntegrationDiscoverWriteAttributesTest")){
+            isWriteAttribute = true;
+        }
         initRpc();
     }
 
     private void initRpc () throws Exception {
         String endpoint = DEVICE_ENDPOINT_RPC_PREF + endpointSequence.incrementAndGet();
-        createNewClient(SECURITY_NO_SEC, COAP_CONFIG, true, endpoint, false, null);
+        createNewClient(SECURITY_NO_SEC, null, true, endpoint);
         expectedObjects = ConcurrentHashMap.newKeySet();
         expectedObjectIdVers = ConcurrentHashMap.newKeySet();
         expectedInstances = ConcurrentHashMap.newKeySet();
@@ -103,7 +110,9 @@ public abstract class AbstractRpcLwM2MIntegrationTest extends AbstractLwM2MInteg
             }
         });
         String ver_Id_0 = lwM2MTestClient.getLeshanClient().getObjectTree().getModel().getObjectModel(OBJECT_ID_0).version;
+        String ver_Id_1 = lwM2MTestClient.getLeshanClient().getObjectTree().getModel().getObjectModel(OBJECT_ID_1).version;
         objectIdVer_0 = "/" + OBJECT_ID_0 + "_" + ver_Id_0;
+        objectIdVer_1 = "/" + OBJECT_ID_1 + "_" + ver_Id_1;
         objectIdVer_2 = (String) expectedObjectIdVers.stream().filter(path -> ((String) path).startsWith("/" + ACCESS_CONTROL)).findFirst().get();
         objectIdVer_3 = (String) expectedObjectIdVers.stream().filter(PREDICATE_3).findFirst().get();
         objectIdVer_19 = (String) expectedObjectIdVers.stream().filter(path -> ((String) path).startsWith("/" + BINARY_APP_DATA_CONTAINER)).findFirst().get();
@@ -147,7 +156,6 @@ public abstract class AbstractRpcLwM2MIntegrationTest extends AbstractLwM2MInteg
         deviceId = device.getId().getId().toString();
 
         lwM2MTestClient.start(true);
-        awaitObserveReadAll(2, false, device.getId().getId().toString());
     }
 
     protected String pathIdVerToObjectId(String pathIdVer) {
diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/sql/RpcLwm2MIntegrationObserveCompositeTest.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/sql/RpcLwm2MIntegrationObserveCompositeTest.java
new file mode 100644
index 0000000000..94ee1eb48e
--- /dev/null
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/sql/RpcLwm2MIntegrationObserveCompositeTest.java
@@ -0,0 +1,487 @@
+/**
+ * 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.rpc.sql;
+
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.eclipse.leshan.core.ResponseCode;
+import org.junit.Test;
+import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.server.transport.lwm2m.rpc.AbstractRpcLwM2MIntegrationObserveTest;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.OBJECT_INSTANCE_ID_0;
+import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.OBJECT_INSTANCE_ID_1;
+import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.RESOURCE_ID_0;
+import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.RESOURCE_ID_14;
+import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.RESOURCE_ID_15;
+import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.RESOURCE_ID_2;
+import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.RESOURCE_ID_3;
+import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.RESOURCE_ID_5;
+import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.RESOURCE_ID_7;
+import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.RESOURCE_ID_9;
+import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.RESOURCE_ID_NAME_19_0_0;
+import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.RESOURCE_ID_NAME_19_1_0;
+import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.RESOURCE_ID_NAME_3_14;
+import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.RESOURCE_ID_NAME_3_9;
+import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.RESOURCE_INSTANCE_ID_0;
+import static org.thingsboard.server.transport.lwm2m.utils.LwM2MTransportUtil.fromVersionedIdToObjectId;
+
+public class RpcLwm2MIntegrationObserveCompositeTest extends AbstractRpcLwM2MIntegrationObserveTest {
+
+
+    /**
+     *  ObserveComposite {"ids":["5/0/7", "5/0/5", "5/0/3", "3/0/9", "19/1/0/0"]} - Ok
+     * @throws Exception
+     */
+    @Test
+    public void testObserveCompositeAnyResources_Result_CONTENT_Value_LwM2mSingleResource_LwM2mResourceInstance() throws Exception {
+        sendCancelObserveAllWithAwait(deviceId);
+        String expectedIdVer5_0_7 = objectInstanceIdVer_5 + "/" + RESOURCE_ID_7;
+        String expectedIdVer5_0_5= objectInstanceIdVer_5 + "/" + RESOURCE_ID_5;
+        String expectedIdVer5_0_3 = objectInstanceIdVer_5 + "/" + RESOURCE_ID_3;
+        String expectedIdVer19_1_0_0 = objectIdVer_19 + "/" + OBJECT_INSTANCE_ID_1 + "/" + RESOURCE_ID_0 + "/" + RESOURCE_INSTANCE_ID_0;
+        String expectedIds = "[\"" + expectedIdVer5_0_7 + "\", \"" + expectedIdVer5_0_5 + "\", \"" + expectedIdVer5_0_3 + "\", \"" + idVer_3_0_9 + "\", \"" + expectedIdVer19_1_0_0 + "\"]";
+        String actualResult =  sendCompositeRPCByIds("ObserveComposite", expectedIds);
+        ObjectNode rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
+        assertEquals(ResponseCode.CONTENT.getName(), rpcActualResult.get("result").asText());
+        String actualValues = rpcActualResult.get("value").asText();
+        assertTrue(actualValues.contains(fromVersionedIdToObjectId(expectedIdVer5_0_7) + "=LwM2mSingleResource"));
+        assertTrue(actualValues.contains(fromVersionedIdToObjectId(expectedIdVer5_0_3) + "=LwM2mSingleResource"));
+        assertTrue(actualValues.contains(fromVersionedIdToObjectId(expectedIdVer5_0_5) + "=LwM2mSingleResource"));
+        assertTrue(actualValues.contains(fromVersionedIdToObjectId(idVer_3_0_9) + "=LwM2mSingleResource"));
+        assertTrue(actualValues.contains(fromVersionedIdToObjectId(expectedIdVer19_1_0_0) + "=LwM2mResourceInstance"));
+    }
+
+    /**
+     *  ObserveComposite {"ids":["19/1/0/0", "5/0"]} - Ok
+     * @throws Exception
+     */
+    @Test
+    public void testObserveComposite_ObjectInstanceWithOtherObjectResourceInstance_Result_CONTENT_Ok() throws Exception {
+        sendCancelObserveAllWithAwait(deviceId);
+        String expectedIdVer19_1_0 = objectIdVer_19 + "/" + OBJECT_INSTANCE_ID_1 + "/" + RESOURCE_ID_0;
+        String expectedIdVer5_0 = objectInstanceIdVer_5;
+        String expectedIds = "[\"" + expectedIdVer19_1_0 + "\", \"" + expectedIdVer5_0 + "\"]";
+        String actualResult =  sendCompositeRPCByIds("ObserveComposite", expectedIds);
+        ObjectNode rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
+        assertEquals(ResponseCode.CONTENT.getName(), rpcActualResult.get("result").asText());
+        String actual= rpcActualResult.get("value").asText();
+        assertTrue(actual.contains(fromVersionedIdToObjectId(expectedIdVer19_1_0) + "=LwM2mMultipleResource"));
+        assertTrue(actual.contains(fromVersionedIdToObjectId(expectedIdVer5_0) + "=LwM2mObjectInstance"));
+    }
+
+    /**
+     *  ObserveComposite {"ids":["5/0/7", "5/0/2"]} - Ok
+     *  "5/0/2" - Execute^ result == null
+     * @throws Exception
+     */
+    @Test
+    public void testObserveCompositeAnyResources_Result_CONTENT_Value_LwM2mSingleResource_If_Error_Null() throws Exception {
+//        sendCancelObserveAllWithAwait(deviceId);
+        String expectedIdVer5_0_7 = objectInstanceIdVer_5 + "/" + RESOURCE_ID_7;
+        String expectedIdVer5_0_2 = objectInstanceIdVer_5 + "/" + RESOURCE_ID_2;
+        String expectedIds = "[\"" + expectedIdVer5_0_7 + "\", \"" + expectedIdVer5_0_2 + "\"]";
+        String actualResult =  sendCompositeRPCByIds("ObserveComposite", expectedIds);
+        ObjectNode rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
+        assertEquals(ResponseCode.CONTENT.getName(), rpcActualResult.get("result").asText());
+        String actualValues = rpcActualResult.get("value").asText();
+        assertTrue(actualValues.contains(fromVersionedIdToObjectId(expectedIdVer5_0_7) + "=LwM2mSingleResource"));
+        assertTrue(actualValues.contains(fromVersionedIdToObjectId(expectedIdVer5_0_2) + "=null"));
+    }
+
+
+    /**
+     *  ObserveComposite {"ids":["5/0/7", "5/0/2"]} - Ok
+     *  "5/0" contains "5/0/2"
+     * @throws Exception
+     */
+    @Test
+    public void testObserveComposite_Result_BAD_REQUEST_ONE_PATH_CONTAINCE_OTHER() throws Exception {
+        sendCancelObserveAllWithAwait(deviceId);
+        String expectedIdVer5_0 = objectInstanceIdVer_5;
+        String expectedIdVer5_0_2 = objectInstanceIdVer_5 + "/" + RESOURCE_ID_2;
+        String expectedIds = "[\"" + expectedIdVer5_0 + "\", \"" + expectedIdVer5_0_2 + "\"]";
+        String actualResult =  sendCompositeRPCByIds("ObserveComposite", expectedIds);
+        ObjectNode rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
+        assertEquals(ResponseCode.BAD_REQUEST.getName(), rpcActualResult.get("result").asText());
+        String actual= rpcActualResult.get("error").asText();
+        String expected = "Invalid path list :  /5/0 and /5/0/2 are overlapped paths";
+        assertTrue(expected.equals(actual));
+    }
+
+    /**
+     *  Previous -> "3/0/9"
+     *  ObserveComposite {"ids":["5/0/7", "5/0/5", "5/0/3", "3/0/9"]} - CONTENT
+     * @throws Exception
+     */
+    @Test
+    public void testObserveCompositeThereAreObservationOneResource_Result_CONTENT_Value_ObservationAddIfAbsent() throws Exception {
+        String expectedIdVer5_0_7 = objectInstanceIdVer_5 + "/" + RESOURCE_ID_7;
+        String expectedIdVer5_0_5= objectInstanceIdVer_5 + "/" + RESOURCE_ID_5;
+        String expectedIdVer5_0_3 = objectInstanceIdVer_5 + "/" + RESOURCE_ID_3;
+        String expectedIds = "[\"" + expectedIdVer5_0_7 + "\", \"" + expectedIdVer5_0_5 + "\", \"" + expectedIdVer5_0_3 + "\", \"" + idVer_3_0_9 + "\"]";
+        String actualResult =  sendCompositeRPCByIds("ObserveComposite", expectedIds);
+        ObjectNode rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
+        assertEquals(ResponseCode.CONTENT.getName(), rpcActualResult.get("result").asText());
+        String expectedResult = "/3/0/9=LwM2mSingleResource [id=9";
+        assertTrue(rpcActualResult.get("value").asText().contains(expectedResult));
+    }
+
+    /**
+     *  ObserveComposite {"ids":["5/0/7", "5/0/5", "5/0/3", "3/0/9", "19/1/0"]} - Ok
+     * @throws Exception
+     */
+    @Test
+    public void testObserveCompositeAnyResources_Result_CONTENT_Value_LwM2mSingleResource_LwM2mMultipleResource() throws Exception {
+        sendCancelObserveAllWithAwait(deviceId);
+
+        String expectedIdVer5_0_7 = objectInstanceIdVer_5 + "/" + RESOURCE_ID_7;
+        String expectedIdVer5_0_5= objectInstanceIdVer_5 + "/" + RESOURCE_ID_5;
+        String expectedIdVer5_0_3 = objectInstanceIdVer_5 + "/" + RESOURCE_ID_3;
+        String expectedIdVer19_1_0 = objectIdVer_19 + "/" + OBJECT_INSTANCE_ID_1 + "/" + RESOURCE_ID_0;
+        String expectedIds = "[\"" + expectedIdVer5_0_7 + "\", \"" + expectedIdVer5_0_5 + "\", \"" + expectedIdVer5_0_3 + "\", \"" + idVer_3_0_9 + "\", \"" + expectedIdVer19_1_0 + "\"]";
+        String actualResult =  sendCompositeRPCByIds("ObserveComposite", expectedIds);
+        ObjectNode rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
+        assertEquals(ResponseCode.CONTENT.getName(), rpcActualResult.get("result").asText());
+        String actualValues = rpcActualResult.get("value").asText();
+        assertTrue(actualValues.contains(fromVersionedIdToObjectId(expectedIdVer5_0_7) + "=LwM2mSingleResource"));
+        assertTrue(actualValues.contains(fromVersionedIdToObjectId(expectedIdVer5_0_3) + "=LwM2mSingleResource"));
+        assertTrue(actualValues.contains(fromVersionedIdToObjectId(expectedIdVer5_0_5 + "=LwM2mSingleResource")));
+        assertTrue(actualValues.contains(fromVersionedIdToObjectId(idVer_3_0_9) + "=LwM2mSingleResource"));
+        assertTrue(actualValues.contains(fromVersionedIdToObjectId(expectedIdVer19_1_0) + "=LwM2mMultipleResource"));
+    }
+
+    /**
+     *  ObserveComposite with keyName {"keys":["batteryLevel", "UtfOffset", "dataRead", "dataWrite"]} - Ok
+     * @throws Exception
+     */
+    @Test
+    public void testObserveCompositeWithKeyName_Result_CONTENT_Value_SingleResources() throws Exception {
+        sendCancelObserveAllWithAwait(deviceId);
+
+        String expectedKey3_0_9 = RESOURCE_ID_NAME_3_9;
+        String expectedKey3_0_14 = RESOURCE_ID_NAME_3_14;
+        String expectedKey19_0_0 = RESOURCE_ID_NAME_19_0_0;
+        String expectedKey19_1_0 = RESOURCE_ID_NAME_19_1_0;
+        String expectedKeys = "[\"" + expectedKey3_0_9 + "\", \"" + expectedKey3_0_14 + "\", \"" + expectedKey19_0_0 + "\", \"" + expectedKey19_1_0 + "\"]";
+        String actualResult = sendCompositeRPCByKeys("ObserveComposite", expectedKeys);
+        ObjectNode rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
+        assertEquals(ResponseCode.CONTENT.getName(), rpcActualResult.get("result").asText());
+        String actualValues = rpcActualResult.get("value").asText();
+        String expectedIdVer3_0_14 = objectInstanceIdVer_3 + "/" + RESOURCE_ID_14;
+        String expectedIdVer19_0_0 = objectIdVer_19 + "/" + OBJECT_INSTANCE_ID_0 + "/" + RESOURCE_ID_0;
+        String expectedIdVer19_1_0 = objectIdVer_19 + "/" + OBJECT_INSTANCE_ID_1 + "/" + RESOURCE_ID_0;
+        assertTrue(actualValues.contains(fromVersionedIdToObjectId(expectedIdVer3_0_14)));
+        assertTrue(actualValues.contains(fromVersionedIdToObjectId(expectedIdVer19_0_0)));
+        assertTrue(actualValues.contains(fromVersionedIdToObjectId(expectedIdVer19_1_0)));
+        assertTrue(actualValues.contains(fromVersionedIdToObjectId(idVer_3_0_9)));
+    }
+
+    /**
+     *  ObserveComposite with keyName {"keys":["batteryLevel", "UtfOffset", "dataRead", "dataWrite"]} - - BAD_REQUEST
+     * @throws Exception
+     */
+    @Test
+    public void testObserveCompositeWithKeyNameThereAreObservationOneResource_Result_CONTENT_Value_ObservationAddIfAbsent() throws Exception {
+        String expectedKey3_0_9 = RESOURCE_ID_NAME_3_9;
+        String expectedKey3_0_14 = RESOURCE_ID_NAME_3_14;
+        String expectedKey19_0_0 = RESOURCE_ID_NAME_19_0_0;
+        String expectedKey19_1_0 = RESOURCE_ID_NAME_19_1_0;
+        String expectedKeys = "[\"" + expectedKey3_0_9 + "\", \"" + expectedKey3_0_14 + "\", \"" + expectedKey19_0_0 + "\", \"" + expectedKey19_1_0 + "\"]";
+        String expectedIdVer19_1_0 = objectIdVer_19 + "/" + OBJECT_INSTANCE_ID_1 + "/" + RESOURCE_ID_0;
+        String actualResult = sendCompositeRPCByKeys("ObserveComposite", expectedKeys);
+        ObjectNode rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
+        assertEquals(ResponseCode.CONTENT.getName(), rpcActualResult.get("result").asText());
+        String actual = rpcActualResult.get("value").asText();
+        assertTrue(actual.contains(fromVersionedIdToObjectId(expectedIdVer19_1_0) + "=LwM2mMultipleResource"));
+    }
+
+    /**
+     *  ObserveReadAll
+     * {"result":"CONTENT","value":"[\"CompositeObservation: [/19/1/0\",\"/19/0/0\",\"/3/0/14\",\"/3/0/9]\"]"} - Ok
+     * @throws Exception
+     */
+    @Test
+    public void testObserveReadAll_AfterCompositeObservation_Result_CONTENT_Value_SingleObservation_Only() throws Exception {
+        sendCancelObserveAllWithAwait(deviceId);
+
+        String expectedKey3_0_9 = RESOURCE_ID_NAME_3_9;
+        String expectedKey3_0_14 = RESOURCE_ID_NAME_3_14;
+        String expectedKey19_0_0 = RESOURCE_ID_NAME_19_0_0;
+        String expectedKey19_1_0 = RESOURCE_ID_NAME_19_1_0;
+        String expectedKeys = "[\"" + expectedKey3_0_9 + "\", \"" + expectedKey3_0_14 + "\", \"" + expectedKey19_0_0 + "\", \"" + expectedKey19_1_0 + "\"]";
+        String actualResult = sendCompositeRPCByKeys("ObserveComposite", expectedKeys);
+        ObjectNode rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
+        assertEquals(ResponseCode.CONTENT.getName(), rpcActualResult.get("result").asText());
+        String actualResultReadAll = sendCompositeRPCByKeys("ObserveReadAll", null);
+        ObjectNode rpcActualResultReadAll = JacksonUtil.fromString(actualResultReadAll, ObjectNode.class);
+        assertEquals(ResponseCode.CONTENT.getName(), rpcActualResultReadAll.get("result").asText());
+        String actualValues =  rpcActualResultReadAll.get("value").asText();
+        String expectedIdVer3_0_14 = objectInstanceIdVer_3 + "/" + RESOURCE_ID_14;
+        String expectedIdVer19_1_0 = objectIdVer_19 + "/" + OBJECT_INSTANCE_ID_1 + "/" + RESOURCE_ID_0;
+        assertTrue(actualValues.contains("SingleObservation:" + fromVersionedIdToObjectId(idVer_3_0_9)));
+        assertTrue(actualValues.contains("SingleObservation:" + fromVersionedIdToObjectId(expectedIdVer3_0_14)));
+        assertTrue(actualValues.contains("SingleObservation:" + fromVersionedIdToObjectId(expectedIdVer19_1_0)));
+        assertTrue(actualValues.contains("SingleObservation:" + fromVersionedIdToObjectId(idVer_19_0_0)));
+    }
+
+    /**
+     *  ObserveReadAll
+     * {"result":"CONTENT","value":"{"result":"CONTENT","value":"["SingleObservation:/3/0/9","SingleObservation:/3/0/14","SingleObservation:/19/1/0/0","SingleObservation:/19/0/0"]"} - Ok
+     * @throws Exception
+     */
+    @Test
+    public void testObserveReadAll_Result_CONTENT_Value_SingleObservation_Only() throws Exception {
+        sendCancelObserveAllWithAwait(deviceId);
+        
+        String expectedIdVer3_0_14 = objectInstanceIdVer_3 + "/" + RESOURCE_ID_14;
+        String expectedIdVer19_1_0_0 = objectIdVer_19 + "/" + OBJECT_INSTANCE_ID_1 + "/" + RESOURCE_ID_0 + "/" + RESOURCE_INSTANCE_ID_0;
+        String actualResult3_0_9 = sendObserve("Observe", idVer_3_0_9);
+        ObjectNode rpcActualResult3_0_9 = JacksonUtil.fromString(actualResult3_0_9, ObjectNode.class);
+        assertEquals(ResponseCode.CONTENT.getName(), rpcActualResult3_0_9.get("result").asText());
+        String actualResult3_0_14 = sendObserve("Observe", expectedIdVer3_0_14);
+        ObjectNode rpcActualResult3_0_14 = JacksonUtil.fromString(actualResult3_0_14, ObjectNode.class);
+        assertEquals(ResponseCode.CONTENT.getName(), rpcActualResult3_0_14.get("result").asText());
+        String actualResult19_1_0_0 = sendObserve("Observe", expectedIdVer19_1_0_0);
+        ObjectNode rpcActualResult19_1_0_0 = JacksonUtil.fromString(actualResult19_1_0_0, ObjectNode.class);
+        assertEquals(ResponseCode.CONTENT.getName(), rpcActualResult19_1_0_0.get("result").asText());
+        String actualResult19_0_0 = sendObserve("Observe", idVer_19_0_0);
+        ObjectNode rpcActualResult19_0_0 = JacksonUtil.fromString(actualResult19_0_0, ObjectNode.class);
+        assertEquals(ResponseCode.CONTENT.getName(), rpcActualResult19_0_0.get("result").asText());
+        String actualResultReadAll = sendCompositeRPCByKeys("ObserveReadAll", null);
+        ObjectNode rpcActualResultReadAll = JacksonUtil.fromString(actualResultReadAll, ObjectNode.class);
+        assertEquals(ResponseCode.CONTENT.getName(), rpcActualResultReadAll.get("result").asText());
+        String actualValues =  rpcActualResultReadAll.get("value").asText();
+        assertTrue(actualValues.contains("SingleObservation:" + fromVersionedIdToObjectId(idVer_3_0_9)));
+        assertTrue(actualValues.contains("SingleObservation:" + fromVersionedIdToObjectId(expectedIdVer3_0_14)));
+        assertTrue(actualValues.contains("SingleObservation:" + fromVersionedIdToObjectId(expectedIdVer19_1_0_0)));
+        assertTrue(actualValues.contains("SingleObservation:" + fromVersionedIdToObjectId(idVer_19_0_0)));
+    }
+
+    /**
+     *  ObserveReadAll
+     * {"result":"CONTENT","value":"[\"CompositeObservation: [/19/1/0\",\"/19/0/0\",\"/3/0/14\",\"/3/0/9]\"]"} - Ok
+     * @throws Exception
+     */
+    @Test
+    public void testObserveReadAll_AfterCompositeObservation_WithResourceNotReadable_Result_CONTENT_Value_SingleObservation_Only() throws Exception {
+        sendCancelObserveAllWithAwait(deviceId);
+
+        String expectedIdVer5_0_7 = objectInstanceIdVer_5 + "/" + RESOURCE_ID_7;
+        String expectedIdVer5_0_2= objectInstanceIdVer_5 + "/" + RESOURCE_ID_2;
+        String expectedIdVer5_0_3 = objectInstanceIdVer_5 + "/" + RESOURCE_ID_3;
+        String expectedIdVer19_1_0 = objectIdVer_19 + "/" + OBJECT_INSTANCE_ID_1 + "/" + RESOURCE_ID_0;
+        String expectedIds = "[\"" + expectedIdVer5_0_7 + "\", \"" + expectedIdVer5_0_2 + "\", \"" + expectedIdVer5_0_3 + "\", \"" + idVer_3_0_9 + "\", \"" + expectedIdVer19_1_0 + "\"]";
+        String actualResult =  sendCompositeRPCByIds("ObserveComposite", expectedIds);
+        ObjectNode rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
+        assertEquals(ResponseCode.CONTENT.getName(), rpcActualResult.get("result").asText());
+        String actualValues = rpcActualResult.get("value").asText();
+
+        assertTrue(actualValues.contains(fromVersionedIdToObjectId(expectedIdVer5_0_2) + "=null"));
+
+        String actualResultReadAll = sendCompositeRPCByKeys("ObserveReadAll", null);
+        ObjectNode rpcActualResultReadAll = JacksonUtil.fromString(actualResultReadAll, ObjectNode.class);
+        assertEquals(ResponseCode.CONTENT.getName(), rpcActualResultReadAll.get("result").asText());
+        actualValues =  rpcActualResultReadAll.get("value").asText();
+
+        assertFalse(actualValues.contains(fromVersionedIdToObjectId(expectedIdVer5_0_2)));
+
+    }
+
+    /**
+     *  ObserveComposite {"ids":["/5/0/7", "/5/0/5", "/5/0/3", "/3/0/9", "/19/1/0/0"]} - Ok
+     *  ObserveCompositeCancel {"ids":["/5/0/7", "/5/0/5", "/5/0/3", "/3/0/9", "/19/1/0/0"]} - Ok
+     * @throws Exception
+     */
+    @Test
+    public void testObserveCompositeAnyResources_Result_CONTENT_CancelObserveComposite_This_Result_Content_Count_5() throws Exception {
+        sendCancelObserveAllWithAwait(deviceId);
+            // ObserveComposite
+        String expectedIdVer5_0_7 = objectInstanceIdVer_5 + "/" + RESOURCE_ID_7;
+        String expectedIdVer5_0_5= objectInstanceIdVer_5 + "/" + RESOURCE_ID_5;
+        String expectedIdVer5_0_3 = objectInstanceIdVer_5 + "/" + RESOURCE_ID_3;
+        String expectedIdVer19_1_0_0 = objectIdVer_19 + "/" + OBJECT_INSTANCE_ID_1 + "/" + RESOURCE_ID_0 + "/" + RESOURCE_INSTANCE_ID_0;
+        String expectedIds = "[\"" + expectedIdVer5_0_7 + "\", \"" + expectedIdVer5_0_5 + "\", \"" + expectedIdVer5_0_3 + "\", \"" + idVer_3_0_9 + "\", \"" + expectedIdVer19_1_0_0 + "\"]";
+        String actualResult =  sendCompositeRPCByIds("ObserveComposite", expectedIds);
+        ObjectNode rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
+        assertEquals(ResponseCode.CONTENT.getName(), rpcActualResult.get("result").asText());
+           // ObserveCompositeCancel
+        actualResult =  sendCompositeRPCByIds("ObserveCompositeCancel", expectedIds);
+        rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
+        assertEquals(ResponseCode.CONTENT.getName(), rpcActualResult.get("result").asText());
+        assertEquals("5", rpcActualResult.get("value").asText());
+
+        assertEquals(0, (Object) getCntObserveAll(deviceId));
+    }
+
+    /**
+     *  ObserveComposite {"ids":["/3", "/5/0/3", "/19/1/0/0"]} - Ok
+     *  ObserveCompositeCancel {"ids":["/3", "/5/0/3", "/19/1/0/0"]} - Ok
+     * @throws Exception
+     */
+    @Test
+    public void testObserveCompositeOneObjectAnyResources_Result_CONTENT_CancelObserveComposite_This_Result_Content_Count_3() throws Exception {
+        sendCancelObserveAllWithAwait(deviceId);
+            // ObserveComposite
+        String expectedIdVer5_0_3 = objectInstanceIdVer_5 + "/" + RESOURCE_ID_3;
+        String expectedIdVer19_1_0_0 = objectIdVer_19 + "/" + OBJECT_INSTANCE_ID_1 + "/" + RESOURCE_ID_0 + "/" + RESOURCE_INSTANCE_ID_0;
+        String expectedIds = "[\"" + idVer_3_0_9 + "\", \"" + expectedIdVer5_0_3 + "\", \"" + expectedIdVer19_1_0_0 + "\"]";
+        String actualResult =  sendCompositeRPCByIds("ObserveComposite", expectedIds);
+        ObjectNode rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
+        assertEquals(ResponseCode.CONTENT.getName(), rpcActualResult.get("result").asText());
+           // ObserveCompositeCancel
+        actualResult =  sendCompositeRPCByIds("ObserveCompositeCancel", expectedIds);
+        rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
+        assertEquals(ResponseCode.CONTENT.getName(), rpcActualResult.get("result").asText());
+        assertEquals("3", rpcActualResult.get("value").asText());
+
+        assertEquals(0, (Object) getCntObserveAll(deviceId));
+    }
+
+    /**
+     *  ObserveComposite {"ids":["/3/0/9", "/5/0/5", "/5/0/3", "/5/0/7", "/19/1/0/0"]} - Ok
+     *  ObserveCompositeCancel {"ids":["/5", "/19/1/0/0"]} - Ok
+     *  last Observation
+     * @throws Exception
+     */
+    @Test
+    public void testObserveCompositeAnyResources_Result_CONTENT_CancelObserveComposite_OneObjectAnyResource_Result_Content_Count_4() throws Exception {
+        sendCancelObserveAllWithAwait(deviceId);
+            // ObserveComposite
+        String expectedIdVer5_0_7 = objectInstanceIdVer_5 + "/" + RESOURCE_ID_7;
+        String expectedIdVer5_0_5 = objectInstanceIdVer_5 + "/" + RESOURCE_ID_5;
+        String expectedIdVer5_0_3 = objectInstanceIdVer_5 + "/" + RESOURCE_ID_3;
+        String expectedIdVer3_0_9 = objectInstanceIdVer_3 + "/" + RESOURCE_ID_9;
+        String expectedIdVer19_1_0_0 = objectIdVer_19 + "/" + OBJECT_INSTANCE_ID_1 + "/" + RESOURCE_ID_0 + "/" + RESOURCE_INSTANCE_ID_0;
+        String expectedIds = "[\"" +  expectedIdVer5_0_7 + "\", \"" + expectedIdVer5_0_5 + "\", \"" + expectedIdVer5_0_3 + "\", \"" + expectedIdVer3_0_9 + "\", \"" + expectedIdVer19_1_0_0 + "\"]";
+        String actualResult =  sendCompositeRPCByIds("ObserveComposite", expectedIds);
+        ObjectNode rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
+        assertEquals(ResponseCode.CONTENT.getName(), rpcActualResult.get("result").asText());
+        awaitObserveReadAll(5, deviceId);
+
+            // ObserveCompositeCancel
+        expectedIds = "[\"" + objectInstanceIdVer_5 + "\", \"" + expectedIdVer19_1_0_0 + "\"]";
+        actualResult =  sendCompositeRPCByIds("ObserveCompositeCancel", expectedIds);
+        rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
+        assertEquals(ResponseCode.CONTENT.getName(), rpcActualResult.get("result").asText());
+        assertEquals("4", rpcActualResult.get("value").asText());   // CNT = 4 ("/5/0/5", "/5/0/3", "/5/0/7", "/19/1/0/0"9)
+
+        String actualResultReadAll = sendCompositeRPCByKeys("ObserveReadAll", null);
+        ObjectNode rpcActualResultReadAll = JacksonUtil.fromString(actualResultReadAll, ObjectNode.class);
+        assertEquals(ResponseCode.CONTENT.getName(), rpcActualResultReadAll.get("result").asText());
+        String actualValues =  rpcActualResultReadAll.get("value").asText();
+        assertEquals("[\"SingleObservation:" + fromVersionedIdToObjectId(expectedIdVer3_0_9) + "\"]", actualValues);
+    }
+
+    /**
+     * ObserveComposite {"ids":["/3", "/5/0/3", "/19/1/0/0"]} - Ok
+     * ObserveCompositeCancel {"ids":["/3/0/9", "/5/0/3", "/19/1/0/0"} -> BAD_REQUEST
+     * ObserveCompositeCancel {"ids":["/3"} -> CONTENT
+     */
+    @Test
+    public void testObserveOneObjectAnyResources_Result_CONTENT_Cancel_OneResourceFromObjectAnyResource_Result_BAD_REQUEST_Cancel_OneObject_Result_CONTENT() throws Exception {
+        sendCancelObserveAllWithAwait(deviceId);
+            // ObserveComposite
+        sendCancelObserveAllWithAwait(deviceId);
+        String expectedIdVer5_0_3 = objectInstanceIdVer_5 + "/" + RESOURCE_ID_3;
+        String expectedIdVer19_1_0_0 = objectIdVer_19 + "/" + OBJECT_INSTANCE_ID_1 + "/" + RESOURCE_ID_0 + "/" + RESOURCE_INSTANCE_ID_0;
+        String expectedIds = "[\"" +  objectIdVer_3 + "\", \"" + expectedIdVer5_0_3 + "\", \"" + expectedIdVer19_1_0_0 + "\"]";
+        String actualResult =  sendCompositeRPCByIds("ObserveComposite", expectedIds);
+        ObjectNode rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
+        assertEquals(ResponseCode.CONTENT.getName(), rpcActualResult.get("result").asText());
+
+           // ObserveCompositeCancel
+        expectedIds = "[\"" + expectedIdVer19_1_0_0 + "\", \"" + idVer_3_0_9 + "\"]";
+        actualResult =  sendCompositeRPCByIds("ObserveCompositeCancel", expectedIds);
+        rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
+        assertEquals(ResponseCode.BAD_REQUEST.getName(), rpcActualResult.get("result").asText());
+        String expectedValue = "for observation path [" + fromVersionedIdToObjectId(objectIdVer_3) + "], that includes this observation path [" + fromVersionedIdToObjectId(idVer_3_0_9);
+        assertTrue(rpcActualResult.get("error").asText().contains(expectedValue));
+
+            // ObserveCompositeCancel
+        expectedIds = "[\"" + objectIdVer_3 + "\", \"" + expectedIdVer19_1_0_0 + "\"]";
+        actualResult =  sendCompositeRPCByIds("ObserveCompositeCancel", expectedIds);
+        rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
+        assertEquals(ResponseCode.CONTENT.getName(), rpcActualResult.get("result").asText());
+        assertEquals("2", rpcActualResult.get("value").asText());
+
+        String actualResultReadAll = sendCompositeRPCByKeys("ObserveReadAll", null);
+        ObjectNode rpcActualResultReadAll = JacksonUtil.fromString(actualResultReadAll, ObjectNode.class);
+        assertEquals(ResponseCode.CONTENT.getName(), rpcActualResultReadAll.get("result").asText());
+        String actualValues =  rpcActualResultReadAll.get("value").asText();
+        assertEquals("[\"SingleObservation:" + fromVersionedIdToObjectId(expectedIdVer5_0_3) + "\"]", actualValues);
+    }
+
+
+   /**
+     *  ObserveComposite {"ids":["/3/0/9", "/3/0/14", "/5/0/3", "/3/0/15", "/19/1/0/0"]} - Ok
+     *  ObserveCancel {"id":"/3/0/9"} -> INTERNAL_SERVER_ERROR
+     *  ObserveCompositeCancel {"ids":["/3/0/9", "/19/1/0/0", "/3]} - Ok
+     *  last Observation
+     * @throws Exception
+     */
+    @Test
+    public void testObserveCompositeAnyResources_Result_CONTENT_CancelObserveComposite_OneResource_OneObjectAnyResource_Result_Content_Count_4() throws Exception {
+        sendCancelObserveAllWithAwait(deviceId);
+            // ObserveComposite
+        sendCancelObserveAllWithAwait(deviceId);
+        String expectedIdVer3_0_14 = objectIdVer_3 + "/" + OBJECT_INSTANCE_ID_0 + "/" + RESOURCE_ID_14;
+        String expectedIdVer3_0_15= objectIdVer_3 + "/" + OBJECT_INSTANCE_ID_0 + "/" + RESOURCE_ID_15;
+        String expectedIdVer5_0_3 = objectInstanceIdVer_5 + "/" + RESOURCE_ID_3;
+        String expectedIdVer19_1_0_0 = objectIdVer_19 + "/" + OBJECT_INSTANCE_ID_1 + "/" + RESOURCE_ID_0 + "/" + RESOURCE_INSTANCE_ID_0;
+        String expectedIds = "[\"" +  idVer_3_0_9 + "\", \"" + expectedIdVer3_0_14 + "\", \"" + expectedIdVer5_0_3 + "\", \"" + expectedIdVer3_0_15 + "\", \"" + expectedIdVer19_1_0_0 + "\"]";
+        String actualResult =  sendCompositeRPCByIds("ObserveComposite", expectedIds);
+        ObjectNode rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
+        assertEquals(ResponseCode.CONTENT.getName(), rpcActualResult.get("result").asText());
+           // ObserveCompositeCancel
+        expectedIds = "[\"" + idVer_3_0_9 + "\", \"" + expectedIdVer19_1_0_0 + "\", \"" + objectIdVer_3 + "\"]";
+        actualResult =  sendCompositeRPCByIds("ObserveCompositeCancel", expectedIds);
+        rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
+        assertEquals(ResponseCode.CONTENT.getName(), rpcActualResult.get("result").asText());
+        assertEquals("4", rpcActualResult.get("value").asText());
+
+        String actualResultReadAll = sendCompositeRPCByKeys("ObserveReadAll", null);
+        ObjectNode rpcActualResultReadAll = JacksonUtil.fromString(actualResultReadAll, ObjectNode.class);
+        assertEquals(ResponseCode.CONTENT.getName(), rpcActualResultReadAll.get("result").asText());
+        String actualValues =  rpcActualResultReadAll.get("value").asText();
+        assertEquals("[\"SingleObservation:" + fromVersionedIdToObjectId(expectedIdVer5_0_3) + "\"]", actualValues);
+    }
+
+
+    private String sendObserve(String method, String params) throws Exception {
+        String sendRpcRequest;
+        if (params == null) {
+            sendRpcRequest = "{\"method\": \"" + method + "\"}";
+        }
+        else {
+            sendRpcRequest = "{\"method\": \"" + method + "\", \"params\": {\"id\": \"" + params + "\"}}";
+        }
+        return doPostAsync("/api/plugins/rpc/twoway/" + deviceId, sendRpcRequest, String.class, status().isOk());
+    }
+
+    private String sendCompositeRPCByIds(String method, String paths) throws Exception {
+        String setRpcRequest = "{\"method\": \"" + method + "\", \"params\": {\"ids\":" + paths + "}}";
+        return doPostAsync("/api/plugins/rpc/twoway/" + deviceId, setRpcRequest, String.class, status().isOk());
+    }
+
+    private String sendCompositeRPCByKeys(String method, String keys) throws Exception {
+        String setRpcRequest = "{\"method\": \"" + method + "\", \"params\": {\"keys\":" + keys + "}}";
+        return doPostAsync("/api/plugins/rpc/twoway/" + deviceId, setRpcRequest, String.class, status().isOk());
+    }
+}
diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/sql/RpcLwm2mIntegrationCreateTest.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/sql/RpcLwm2mIntegrationCreateTest.java
index 26c5aac6a4..86ab77c733 100644
--- a/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/sql/RpcLwm2mIntegrationCreateTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/sql/RpcLwm2mIntegrationCreateTest.java
@@ -99,7 +99,7 @@ public class RpcLwm2mIntegrationCreateTest extends AbstractRpcLwM2MIntegrationTe
         String actualResult = sendRPCreateById(expectedPath, expectedValue);
         ObjectNode rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
         assertEquals(ResponseCode.BAD_REQUEST.getName(), rpcActualResult.get("result").asText());
-        String expectedObjectId = pathIdVerToObjectId((String) expectedPath);
+        String expectedObjectId = pathIdVerToObjectId(expectedPath);
         LwM2mPath expectedPathId = new LwM2mPath(expectedObjectId);
         String expected = "Specified object id " + expectedPathId.getObjectId() + " absent in the list supported objects of the client or is security object!";
         String actual = rpcActualResult.get("error").asText();
@@ -118,7 +118,7 @@ public class RpcLwm2mIntegrationCreateTest extends AbstractRpcLwM2MIntegrationTe
         String actualResult = sendRPCreateById(expectedPath, expectedValue);
         ObjectNode rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
         assertEquals(ResponseCode.BAD_REQUEST.getName(), rpcActualResult.get("result").asText());
-        String expectedObjectId = pathIdVerToObjectId((String) expectedPath);
+        String expectedObjectId = pathIdVerToObjectId(expectedPath);
         LwM2mPath expectedPathId = new LwM2mPath(expectedObjectId);
         String expected = "Specified object id " + expectedPathId.getObjectId() + " absent in the list supported objects of the client or is security object!";
         String actual = rpcActualResult.get("error").asText();
diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/sql/RpcLwm2mIntegrationDiscoverTest.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/sql/RpcLwm2mIntegrationDiscoverTest.java
index 049ba23118..e1717c9b61 100644
--- a/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/sql/RpcLwm2mIntegrationDiscoverTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/sql/RpcLwm2mIntegrationDiscoverTest.java
@@ -18,6 +18,8 @@ package org.thingsboard.server.transport.lwm2m.rpc.sql;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.eclipse.leshan.core.ResponseCode;
+import org.eclipse.leshan.core.link.Link;
+import org.eclipse.leshan.core.link.LinkParseException;
 import org.eclipse.leshan.core.node.LwM2mPath;
 import org.junit.Test;
 import org.thingsboard.common.util.JacksonUtil;
@@ -33,6 +35,7 @@ import static org.junit.Assert.assertTrue;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.OBJECT_INSTANCE_ID_0;
 import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.RESOURCE_ID_2;
+import static org.thingsboard.server.transport.lwm2m.utils.LwM2MTransportUtil.convertObjectIdToVerId;
 
 
 public class RpcLwm2mIntegrationDiscoverTest extends AbstractRpcLwM2MIntegrationTest {
@@ -52,12 +55,17 @@ public class RpcLwm2mIntegrationDiscoverTest extends AbstractRpcLwM2MIntegration
         Set actualObjects = ConcurrentHashMap.newKeySet();
         Set actualInstances = ConcurrentHashMap.newKeySet();
         rpcActualValue.forEach(node -> {
-            if (!node.get("uriReference").asText().equals("/")) {
-                LwM2mPath path = new LwM2mPath(node.get("uriReference").asText());
-                actualObjects.add("/" + path.getObjectId());
-                if (path.isObjectInstance()) {
-                    actualInstances.add("/" + path.getObjectId() + "/" + path.getObjectInstanceId());
+            try {
+                Link[] parsedLink = linkParser.parseCoreLinkFormat(node.asText().getBytes());
+                if (!parsedLink[0].getUriReference().equals("/")) {
+                    LwM2mPath path = new LwM2mPath(parsedLink[0].getUriReference());
+                    actualObjects.add("/" + path.getObjectId());
+                    if (path.isObjectInstance()) {
+                        actualInstances.add("/" + path.getObjectId() + "/" + path.getObjectInstanceId());
+                    }
                 }
+            } catch (LinkParseException e) {
+                throw new RuntimeException(e);
             }
         });
         assertEquals(expectedInstances, actualInstances);
@@ -92,8 +100,8 @@ public class RpcLwm2mIntegrationDiscoverTest extends AbstractRpcLwM2MIntegration
      * {"result":"CONTENT","value":"</3/0>,</3/0/0>,</3/0/1>,</3/0/2>,</3/0/3>,</3/0/4>,</3/0/5>,</3/0/6>,</3/0/7>,</3/0/8>,</3/0/9>,</3/0/10>,</3/0/11>,</3/0/12>,</3/0/13>,</3/0/14>,</3/0/15>,</3/0/16>,</3/0/1
      * 7>,</3/0/18>,</3/0/19>,</3/0/20>,</3/0/21>,</3/0/22>"}
      * If WriteAttributes implemented and WriteAttributes saved
-     * Discover {"id":"19/0"}
-     * {"result":"CONTENT","value":"[</19/0>;dim=2;pmin=10;pmax=60;gt=50;lt=42.2,</19/0/0>;pmax=120, </19/0/1>, </19/0/2>, </19/0/3>, </19/0/4>, </19/0/5>;lt=45]"}
+     * Discover {"id":"19"}
+     * {"result":"CONTENT","value":"[</19>;ver=1.1,</19/0>;dim=2;pmin=10;pmax=60;gt=50;lt=42.2,</19/0/0>;pmax=120, </19/0/1>, </19/0/2>, </19/0/3>, </19/0/4>, </19/0/5>;lt=45]"}
      */
     @Test
     public void testDiscoverInstance_Return_CONTENT_LinksResourcesOnLyExpectedInstance() throws Exception {
@@ -110,12 +118,12 @@ public class RpcLwm2mIntegrationDiscoverTest extends AbstractRpcLwM2MIntegration
     /**
      * Discover {"id":"3/0/14"}
      * If WriteAttributes implemented:
-     * {"result":"CONTENT","value":"</3/0/14>;pmax=100, "pmin":10, "ver"=1.0"}
+     * {"result":"CONTENT","value":"</3/0/14>;pmax=100, "pmin":10}
      * If WriteAttributes not implemented:
      * {"result":"CONTENT","value":"</3/0/14>"}
      * Discover {"id":"19_1.1/0/0"}
      * If WriteAttributes implemented:
-     * {"result":"CONTENT","value":"</19/0/0>;pmax=100, "pmin":10, "ver"=1.1"}
+     * {"result":"CONTENT","value":"</19/0/0>;pmax=100, "pmin":10}
      * If WriteAttributes not implemented:
      * {"result":"CONTENT","value":"</19/0/0>"}
      */
@@ -125,8 +133,10 @@ public class RpcLwm2mIntegrationDiscoverTest extends AbstractRpcLwM2MIntegration
         String expectedObjectInstanceId = pathIdVerToObjectId(expectedInstance);
         LwM2mPath expectedPath = new LwM2mPath(expectedObjectInstanceId);
         int expectedResource = lwM2MTestClient.getLeshanClient().getObjectTree().getObjectEnablers().get(expectedPath.getObjectId()).getObjectModel().resources.entrySet().stream().findAny().get().getKey();
+        String ver = lwM2MTestClient.getLeshanClient().getObjectTree().getObjectEnablers().get(expectedPath.getObjectId()).getObjectModel().version;
         String expected = expectedInstance + "/" + expectedResource;
-        String actualResult = sendDiscover(expected);
+        String expectedVerId = convertObjectIdToVerId(expected, ver);
+        String actualResult = sendDiscover(expectedVerId);
         ObjectNode rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
         assertEquals(ResponseCode.CONTENT.getName(), rpcActualResult.get("result").asText());
         String expectedResourceId = "<" + expectedObjectInstanceId + "/" + expectedResource + ">";
diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/sql/RpcLwm2mIntegrationDiscoverWriteAttributesTest.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/sql/RpcLwm2mIntegrationDiscoverWriteAttributesTest.java
new file mode 100644
index 0000000000..d7807ee24a
--- /dev/null
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/sql/RpcLwm2mIntegrationDiscoverWriteAttributesTest.java
@@ -0,0 +1,249 @@
+/**
+ * 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.rpc.sql;
+
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.eclipse.leshan.core.ResponseCode;
+import org.junit.Test;
+import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.server.transport.lwm2m.rpc.AbstractRpcLwM2MIntegrationTest;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.RESOURCE_ID_14;
+import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.RESOURCE_ID_6;
+import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.RESOURCE_ID_7;
+
+
+public class RpcLwm2mIntegrationDiscoverWriteAttributesTest extends AbstractRpcLwM2MIntegrationTest {
+
+    /**
+     * WriteAttributes {"id":"/3_1.2/0/6","attributes":{"pmax":100, "pmin":10}}
+     * if not implemented:
+     * {"result":"INTERNAL_SERVER_ERROR","error":"not implemented"}
+     * if implemented:
+     * {"result":"BAD_REQUEST","error":"Attribute pmax can be used for only Resource/Object Instance/Object."}
+     */
+    @Test
+    public void testWriteAttributesResourceWithParametersByResourceInstanceId_Result_BAD_REQUEST() throws Exception {
+        String expectedPath = objectInstanceIdVer_3 + "/" + RESOURCE_ID_6 + "/1";
+        String expectedValue = "{\"pmax\":100, \"pmin\":10}";
+        String actualResult = sendRPCExecuteWithValueById(expectedPath, expectedValue);
+        ObjectNode rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
+        assertEquals(ResponseCode.BAD_REQUEST.getName(), rpcActualResult.get("result").asText());
+        String expected = "Attribute pmax can be used for only Resource/Object Instance/Object.";
+        String actual = rpcActualResult.get("error").asText();
+        assertTrue(actual.equals(expected));
+    }
+    /**
+     * WriteAttributes {"id":"/3_1.2/0/6","attributes":{"pmax":100, "pmin":10}}
+     * if not implemented:
+     * {"result":"INTERNAL_SERVER_ERROR","error":"not implemented"}
+     * if implemented:
+     * {"result":"BAD_REQUEST","error":"Attribute pmax can be used for only Resource/Object Instance/Object."}
+     */
+    @Test
+    public void testWriteAttributeResourceDimWithParametersByResourceId_Result_BAD_REQUEST() throws Exception {
+        String expectedPath = objectInstanceIdVer_3 + "/" + RESOURCE_ID_6;
+        String expectedValue = "{\"dim\":3}";
+        String actualResult = sendRPCExecuteWithValueById(expectedPath, expectedValue);
+        ObjectNode rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
+        assertEquals(ResponseCode.BAD_REQUEST.getName(), rpcActualResult.get("result").asText());
+        String expected = "Attribute dim is of class PROPERTIES but only NOTIFICATION attribute can be used in WRITE ATTRIBUTE request.";
+        String actual = rpcActualResult.get("error").asText();
+        assertTrue(actual.equals(expected));
+    }
+
+    @Test
+    public void testWriteAttributesResourceVerWithParametersById_Result_BAD_REQUEST() throws Exception {
+        String expectedPath = objectIdVer_3;
+        String expectedValue = "{\"ver\":1.3}";
+        String actualResult = sendRPCExecuteWithValueById(expectedPath, expectedValue);
+        ObjectNode rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
+        assertEquals(ResponseCode.BAD_REQUEST.getName(), rpcActualResult.get("result").asText());
+        String expected = "Attribute ver is of class PROPERTIES but only NOTIFICATION attribute can be used in WRITE ATTRIBUTE request.";
+        String actual = rpcActualResult.get("error").asText();
+        assertTrue(actual.equals(expected));
+    }
+
+    @Test
+    public void testWriteAttributesResourceServerUriWithParametersById_Result_BAD_REQUEST() throws Exception {
+        String expectedPath =  objectInstanceIdVer_1;
+        String actualResult = sendRPCReadById(expectedPath);
+        String expectedValue = "{\"uri\":\"coaps://localhost:5690\"}";
+        actualResult = sendRPCExecuteWithValueById(expectedPath, expectedValue);
+        ObjectNode rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
+        assertEquals(ResponseCode.BAD_REQUEST.getName(), rpcActualResult.get("result").asText());
+        String expected = "Attribute uri is of class PROPERTIES but only NOTIFICATION attribute can be used in WRITE ATTRIBUTE request.";
+        String actual = rpcActualResult.get("error").asText();
+        assertTrue(actual.equals(expected));
+    }
+
+    /**
+     * <PROPERTIES> Class Attributes
+     * Dimension 	dim Integer [0:255]
+     * Number of instances existing for a Multiple-Instance Resource
+     * <ObjectID>3</ObjectID>
+     * 			<Item ID="6">
+     * 				<Name>Available Power Sources</Name>
+     *         <Operations>R</Operations>
+     *         <MultipleInstances>Multiple</MultipleInstances>
+     * 				<Type>Integer</Type>
+     * 				<RangeEnumeration>0..7</RangeEnumeration>
+     * WriteAttributes  implemented:	Discover {"id":"3/0/6"} ->  'dim' = 3
+     * "ver" only for objectId
+     */
+    @Test
+    public void testReadDIM_3_0_6_Only_R () throws Exception {
+        String path = objectInstanceIdVer_3 + "/" + RESOURCE_ID_6;
+        String actualResult = sendDiscover(path);
+        ObjectNode rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
+        assertEquals(ResponseCode.CONTENT.getName(), rpcActualResult.get("result").asText());
+        String expected = "</3/0/6>;dim=3";
+        assertTrue(rpcActualResult.get("value").asText().equals(expected));
+
+    }
+
+
+    /**
+     * <PROPERTIES> Class Attributes
+     * Object Version   ver   Object
+     * Provide the  version of the associated Object.
+     * "ver" only for objectId
+     */
+    @Test
+    public void testReadVer () throws Exception {
+        String path = objectIdVer_3;
+        String actualResult = sendDiscover(path);
+        ObjectNode rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
+        assertEquals(ResponseCode.CONTENT.getName(), rpcActualResult.get("result").asText());
+        String expected = "</3>;ver=1.2";
+        assertTrue(rpcActualResult.get("value").asText().contains(expected));
+    }
+
+    /**
+     * WriteAttributes {"id":"/3/0/14","attributes":{"pmax":100, "pmin":10}}
+     * if not implemented:
+     * {"result":"INTERNAL_SERVER_ERROR","error":"not implemented"}
+     * if implemented:
+     * {"result":"CHANGED"}
+     */
+    @Test
+    public void testWriteAttributesResourceWithParametersById_Result_CHANGED() throws Exception {
+        String expectedPath = objectInstanceIdVer_3 + "/" + RESOURCE_ID_14;
+        String expectedValue = "{\"pmax\":100, \"pmin\":10}";
+        String actualResult = sendRPCExecuteWithValueById(expectedPath, expectedValue);
+        ObjectNode rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
+        assertEquals(ResponseCode.CHANGED.getName(), rpcActualResult.get("result").asText());
+            // result changed
+        actualResult = sendDiscover(expectedPath);
+        rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
+        assertEquals(ResponseCode.CONTENT.getName(), rpcActualResult.get("result").asText());
+        String expected = "</3/0/14>;pmax=100;pmin=10";
+        assertTrue(rpcActualResult.get("value").asText().contains(expected));
+    }
+
+    /**
+     * <NOTIFICATION> Class Attributes
+     * Minimum/Maximum Period pmin/pmax
+     * Notes: The Minimum Period Attribute:
+     * -- indicates the minimum time in seconds the LwM2M Client MUST wait between two notifications. If a notification of an observed Resource is supposed to be generated but it is before pmin expiry, notification MUST be sent as soon as pmin expires. In the absence of this parameter, the Minimum Period is defined by the Default Minimum Period set in the LwM2M Server Account.
+     * Notes: The Maximum Period Attribute:
+     * -- indicates the maximum time in seconds the LwM2M Client MAY wait between two notifications. When this "Maximum Period" expires after the last notification, a new notification MUST be sent. In the absence of this parameter, the "Maximum Period" is defined by the Default Maximum Period when set in the LwM2M Server Account or considered as 0 otherwise. The value of 0, means pmax MUST be ignored. The maximum period parameter MUST be greater than the minimum period parameter otherwise pmax will be ignored for the Resource to which such inconsistent timing conditions are applied.
+     * Greater Than  gt Resource
+     * Less Than     lt Resource
+     * Step          st Resource
+     *
+     * Object Id = 1
+     * Default Minimum Period 	Id = 2 		300 or 0
+     * Default Maximum Period 	Id = 3 		6000 or "-"
+     * </3/0>;pmax=65, </3/0/1>, <3/0/2>, </3/0/3>, </3/0/4>,
+     * <3/0/6>;dim=8,<3/0/7>;gt=50;lt=42.2;st=0.5,<3/0/8>;...
+     */
+    @Test
+    public void testWriteAttributesPeriodLtGt () throws Exception {
+        String expectedPath = objectInstanceIdVer_3;
+        String expectedValue = "{\"pmax\":60}";
+        String actualResult = sendRPCExecuteWithValueById(expectedPath, expectedValue);
+        ObjectNode rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
+        assertEquals(ResponseCode.CHANGED.getName(), rpcActualResult.get("result").asText());
+        expectedPath = objectInstanceIdVer_3;
+        expectedValue = "{\"pmax\":65}";
+        actualResult = sendRPCExecuteWithValueById(expectedPath, expectedValue);
+        rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
+        assertEquals(ResponseCode.CHANGED.getName(), rpcActualResult.get("result").asText());
+        expectedPath = objectInstanceIdVer_3 + "/" + RESOURCE_ID_7;
+        expectedValue ="{\"gt\":50, \"lt\":42.2, \"st\":0.5}";
+        actualResult = sendRPCExecuteWithValueById(expectedPath, expectedValue);
+        rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
+        assertEquals(ResponseCode.CHANGED.getName(), rpcActualResult.get("result").asText());
+            // ObjectId
+        expectedPath = objectIdVer_3;
+        actualResult = sendDiscover(expectedPath);
+        rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
+        assertEquals(ResponseCode.CONTENT.getName(), rpcActualResult.get("result").asText());
+            // String expected = "</3>;ver=1.2,</3/0>;pmax=60,</3/0/0>,</3/0/1>,</3/0/2>,</3/0/3>,</3/0/6>;dim=3,</3/0/7>;st=0.5;lt=42.2;gt=50.0,</3/0/8>,</3/0/9>,</3/0/10>,</3/0/11>;dim=1,</3/0/13>,</3/0/14>,</3/0/15>,</3/0/16>,</3/0/17>,</3/0/18>,</3/0/19>,</3/0/20>,</3/0/21>";
+        String expected = "</3>;ver=1.2,</3/0>;pmax=65";
+        assertTrue(rpcActualResult.get("value").asText().contains(expected));
+        expected = "</3/0/6>;dim=3,</3/0/7>;st=0.5;lt=42.2;gt=50.0";
+        assertTrue(rpcActualResult.get("value").asText().contains(expected));
+            // ObjectInstanceId
+        expectedPath = objectInstanceIdVer_3;
+        actualResult = sendDiscover(expectedPath);
+        rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
+        assertEquals(ResponseCode.CONTENT.getName(), rpcActualResult.get("result").asText());
+        expected = "</3/0>;pmax=65";
+        assertTrue(rpcActualResult.get("value").asText().contains(expected));
+        expected = "</3/0/6>;dim=3,</3/0/7>;st=0.5;lt=42.2;gt=50.0";
+        assertTrue(rpcActualResult.get("value").asText().contains(expected));
+            // ResourceId
+        expectedPath = objectInstanceIdVer_3 + "/" + RESOURCE_ID_6;
+        actualResult = sendDiscover(expectedPath);
+        rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
+        assertEquals(ResponseCode.CONTENT.getName(), rpcActualResult.get("result").asText());
+        expected = "</3/0/6>;dim=3";
+        assertTrue(rpcActualResult.get("value").asText().contains(expected));
+        expectedPath = objectInstanceIdVer_3 + "/" + RESOURCE_ID_7;
+        actualResult = sendDiscover(expectedPath);
+        rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
+        assertEquals(ResponseCode.CONTENT.getName(), rpcActualResult.get("result").asText());
+        expected = "</3/0/7>;st=0.5;lt=42.2;gt=50.0";
+        assertTrue(rpcActualResult.get("value").asText().contains(expected));
+            // ResourceInstanceId
+        expectedPath = objectInstanceIdVer_3 + "/" + RESOURCE_ID_6+ "/1";
+        actualResult = sendDiscover(expectedPath);
+        rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
+        assertEquals(ResponseCode.INTERNAL_SERVER_ERROR.getName(), rpcActualResult.get("result").asText());
+        expected = "InvalidRequestException: Discover request cannot target resource instance path: /3/0/6/1";
+        assertTrue(rpcActualResult.get("error").asText().contains(expected));
+    }
+
+    private String sendRPCExecuteWithValueById(String path, String value) throws Exception {
+        String setRpcRequest = "{\"method\": \"WriteAttributes\", \"params\": {\"id\": \"" + path + "\", \"attributes\": " + value + " }}";
+        return doPostAsync("/api/plugins/rpc/twoway/" + deviceId, setRpcRequest, String.class, status().isOk());
+    }
+
+    private String sendRPCReadById(String path) throws Exception {
+        String setRpcRequest = "{\"method\": \"Read\", \"params\": {\"id\": \"" + path + "\"}}";
+        return doPostAsync("/api/plugins/rpc/twoway/" + deviceId, setRpcRequest, String.class, status().isOk());
+    }
+
+    private String sendDiscover(String path) throws Exception {
+        String setRpcRequest = "{\"method\": \"Discover\", \"params\": {\"id\": \"" + path + "\"}}";
+        return doPostAsync("/api/plugins/rpc/twoway/" + deviceId, setRpcRequest, String.class, status().isOk());
+    }
+}
diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/sql/RpcLwm2mIntegrationObserveTest.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/sql/RpcLwm2mIntegrationObserveTest.java
index 609fcd8667..5a849e70e4 100644
--- a/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/sql/RpcLwm2mIntegrationObserveTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/sql/RpcLwm2mIntegrationObserveTest.java
@@ -17,88 +17,141 @@ package org.thingsboard.server.transport.lwm2m.rpc.sql;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import lombok.extern.slf4j.Slf4j;
+import org.eclipse.leshan.core.LwM2m.Version;
 import org.eclipse.leshan.core.ResponseCode;
 import org.eclipse.leshan.core.node.LwM2mPath;
+import org.eclipse.leshan.core.response.ReadResponse;
+import org.eclipse.leshan.server.registration.Registration;
 import org.junit.Test;
+import org.mockito.Mockito;
+import org.springframework.boot.test.mock.mockito.SpyBean;
 import org.thingsboard.common.util.JacksonUtil;
-import org.thingsboard.server.transport.lwm2m.rpc.AbstractRpcLwM2MIntegrationTest;
+import org.thingsboard.server.transport.lwm2m.rpc.AbstractRpcLwM2MIntegrationObserveTest;
+import org.thingsboard.server.transport.lwm2m.server.uplink.DefaultLwM2mUplinkMsgHandler;
+
+import java.util.Optional;
 
 import static org.eclipse.leshan.core.LwM2mId.ACCESS_CONTROL;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.timeout;
+import static org.mockito.Mockito.verify;
 import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.OBJECT_INSTANCE_ID_0;
 import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.RESOURCE_ID_0;
-import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.RESOURCE_ID_14;
+import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.RESOURCE_ID_2;
 import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.RESOURCE_ID_3;
+import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.RESOURCE_ID_9;
 import static org.thingsboard.server.transport.lwm2m.utils.LwM2MTransportUtil.fromVersionedIdToObjectId;
 
 @Slf4j
-public class RpcLwm2mIntegrationObserveTest extends AbstractRpcLwM2MIntegrationTest {
+public class RpcLwm2mIntegrationObserveTest extends AbstractRpcLwM2MIntegrationObserveTest {
+
+    @SpyBean
+    DefaultLwM2mUplinkMsgHandler defaultUplinkMsgHandlerTest;
+
+    @Test
+    public void testObserveReadAll_Count_2_CancelAll_Count_0_Ok() throws Exception {
+        String actualResultReadAll = sendRpcObserve("ObserveReadAll", null);
+        ObjectNode  rpcActualResult = JacksonUtil.fromString(actualResultReadAll, ObjectNode.class);
+        assertEquals(ResponseCode.CONTENT.getName(), rpcActualResult.get("result").asText());
+        String actualValuesReadAll = rpcActualResult.get("value").asText();
+        assertEquals(2, actualValuesReadAll.split(",").length);
+        String expected = "\"SingleObservation:/19/0/0\"";
+        assertTrue(actualValuesReadAll.contains(expected));
+        expected = "\"SingleObservation:/3/0/9\"";
+        assertTrue(actualValuesReadAll.contains(expected));
+    }
 
     /**
-     * ObserveReadAll&ObserveReadAll
+     * Observe "3_1.2/0/9"
      * @throws Exception
      */
     @Test
-    public void testObserveReadAllNothingObservation_Result_CONTENT_Value_Count_0() throws Exception {
-        String idVer_3_0_0 = objectInstanceIdVer_3 + "/" + RESOURCE_ID_0;
-        sendRpcObserve("Observe", fromVersionedIdToObjectId(idVer_3_0_0));
-        String actualResultBefore = sendRpcObserve("ObserveReadAll", null);
-        ObjectNode rpcActualResultBefore = JacksonUtil.fromString(actualResultBefore, ObjectNode.class);
-        assertEquals(ResponseCode.CONTENT.getName(), rpcActualResultBefore.get("result").asText());
-        int cntObserveBefore = rpcActualResultBefore.get("value").asText().split(",").length;
-        assertTrue(cntObserveBefore > 0);
-        String actualResult = sendRpcObserve("ObserveCancelAll", null);
+    public void testObserveOneResource_Result_CONTENT_Value_Count_3_After_Cancel_Count_2() throws Exception {
+        sendCancelObserveAllWithAwait(deviceId);
+        String idVer_3_0_9 = objectInstanceIdVer_3 + "/" + RESOURCE_ID_9;
+        String actualResult = sendRpcObserve("Observe", idVer_3_0_9);
         ObjectNode rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
         assertEquals(ResponseCode.CONTENT.getName(), rpcActualResult.get("result").asText());
-        int cntObserveCancelAll = Integer.parseInt(rpcActualResult.get("value").asText());
-        assertTrue(cntObserveCancelAll > 0);
-        String actualResultAfter = sendRpcObserve("ObserveReadAll", null);
-        ObjectNode rpcActualResultAfter = JacksonUtil.fromString(actualResultAfter, ObjectNode.class);
-        assertEquals(ResponseCode.CONTENT.getName(), rpcActualResultAfter.get("result").asText());
-        String expectResultAfter = "[]";
-        assertEquals( expectResultAfter, rpcActualResultAfter.get("value").asText());
+        assertTrue(rpcActualResult.get("value").asText().contains("LwM2mSingleResource"));
+        assertEquals(Optional.of(1).get(), Optional.ofNullable(getCntObserveAll(deviceId)).get());
+
+        int cntUpdate = 3;
+        verify(defaultUplinkMsgHandlerTest,  timeout(10000).times(cntUpdate))
+                .onUpdateValueAfterReadResponse(Mockito.any(Registration.class), eq(idVer_3_0_9), Mockito.any(ReadResponse.class));
     }
 
     /**
-     * Observe {"id":"/3/0/0"}
+     * Observe "3_1.2/0"
      * @throws Exception
      */
     @Test
-    public void testObserveSingleResourceWithout_IdVer_1_0_Result_CONTENT_Value_SingleResource() throws Exception {
-        String expectedId = objectInstanceIdVer_3 + "/" + RESOURCE_ID_0;
-        String actualResult = sendRpcObserve("Observe", fromVersionedIdToObjectId(expectedId));
+    public void testObserveOneObjectInstance_Result_CONTENT_Value_Count_3_After_Cancel_Count_2() throws Exception {
+        sendCancelObserveAllWithAwait(deviceId);
+        String idVer_3_0 = objectInstanceIdVer_3;
+        String actualResult = sendRpcObserve("Observe", idVer_3_0);
         ObjectNode rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
         assertEquals(ResponseCode.CONTENT.getName(), rpcActualResult.get("result").asText());
         assertTrue(rpcActualResult.get("value").asText().contains("LwM2mSingleResource"));
+        assertEquals(Optional.of(1).get(), Optional.ofNullable(getCntObserveAll(deviceId)).get());
+        int cntUpdate = 3;
+        verify(defaultUplinkMsgHandlerTest,  timeout(10000).times(cntUpdate))
+                .updateAttrTelemetry(Mockito.any(Registration.class), eq(idVer_3_0_9));
     }
+
     /**
-     * Observe {"id":"/3_1.0/0/14"}
+     * Observe "3_1.2"
      * @throws Exception
      */
     @Test
-    public void testObserveSingleResourceWith_IdVer_1_0_Result_CONTENT_Value_SingleResource() throws Exception {
-        String expectedId = objectInstanceIdVer_3 + "/" + RESOURCE_ID_14;
-        String actualResult = sendRpcObserve("Observe", expectedId);
+    public void testObserveOneObject_Result_CONTENT_Value_Count_3_After_Cancel_Count_2() throws Exception {
+        sendCancelObserveAllWithAwait(deviceId);
+        String idVer_3_0 = objectInstanceIdVer_3;
+        String actualResult = sendRpcObserve("Observe", idVer_3_0);
         ObjectNode rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
         assertEquals(ResponseCode.CONTENT.getName(), rpcActualResult.get("result").asText());
         assertTrue(rpcActualResult.get("value").asText().contains("LwM2mSingleResource"));
+        assertEquals(Optional.of(1).get(), Optional.ofNullable(getCntObserveAll(deviceId)).get());
+        int cntUpdate = 3;
+        verify(defaultUplinkMsgHandlerTest,  timeout(10000).times(cntUpdate))
+                .updateAttrTelemetry(Mockito.any(Registration.class), eq(idVer_3_0_9));
     }
 
+
     /**
-     * Observe {"id":"/3_1.1/0/13"}
+     * Repeated request on Observe
+     * Observe {"id":"/3_1.2/0/0"}
      * @throws Exception
      */
     @Test
-    public void testObserveWithBadVersion_Result_BadRequest_ErrorMsg_BadVersionMustBe1_0() throws Exception {
+    public void testObserveRepeated_Result_CONTENT_AddIfAbsent() throws Exception {
+        String idVer_3_0_0 = objectInstanceIdVer_3 + "/" + RESOURCE_ID_0;
+        String actualResult = sendRpcObserve("Observe", idVer_3_0_0);
+        ObjectNode rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
+        assertEquals(ResponseCode.CONTENT.getName(), rpcActualResult.get("result").asText());
+        actualResult = sendRpcObserve("Observe", idVer_3_0_0);
+        rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
+        assertEquals(ResponseCode.CONTENT.getName(), rpcActualResult.get("result").asText());
+        String expected = "LwM2mSingleResource [id=0";
+        assertTrue(rpcActualResult.get("value").asText().contains(expected));
+    }
+
+    /**
+     * Observe {"id":"/3_1.?/0/13"}
+     * @throws Exception
+     */
+    @Test
+    public void testObserveWithBadVersion_Result_BadRequest_ErrorMsg_BadVersionMustBe_Ver() throws Exception {
         String expectedInstance = (String) expectedInstances.stream().filter(path -> !((String)path).contains("_")).findFirst().get();
         LwM2mPath expectedPath = new LwM2mPath(expectedInstance);
         int expectedResource = lwM2MTestClient.getLeshanClient().getObjectTree().getObjectEnablers().get(expectedPath.getObjectId()).getObjectModel().resources.entrySet().stream().findAny().get().getKey();
-        String expectedId = "/" + expectedPath.getObjectId() + "_1.2" + "/" + expectedPath.getObjectInstanceId() + "/" + expectedResource;
+        String ver = lwM2MTestClient.getLeshanClient().getObjectTree().getObjectEnablers().get(expectedPath.getObjectId()).getObjectModel().version;
+        String expectedId = "/" + expectedPath.getObjectId() + "_" + Version.MAX + "/" + expectedPath.getObjectInstanceId() + "/" + expectedResource;
         String actualResult = sendRpcObserve("Observe", expectedId);
         ObjectNode rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
         assertEquals(ResponseCode.BAD_REQUEST.getName(), rpcActualResult.get("result").asText());
-        String expected = "Specified resource id " + expectedId +" is not valid version! Must be version: 1.0";
+        String expected = "Specified resource id " + expectedId +" is not valid version! Must be version: " + ver;
         assertEquals(expected, rpcActualResult.get("error").asText());
     }
 
@@ -132,12 +185,11 @@ public class RpcLwm2mIntegrationObserveTest extends AbstractRpcLwM2MIntegrationT
     }
 
     /**
-     * Repeated request on Observe
-     * Observe {"id":"/5/0/0"}
+     * Observe resource Write -> "/5/0/02"
      * @throws Exception
      */
     @Test
-    public void testObserveRSourceNotRead_Result_METHOD_NOT_ALLOWED() throws Exception {
+    public void testObserveResourceNotRead_Result_METHOD_NOT_ALLOWED() throws Exception {
         String expectedId = objectInstanceIdVer_5 + "/" + RESOURCE_ID_0;
         sendRpcObserve("Observe", expectedId);
         String actualResult = sendRpcObserve("Observe", expectedId);
@@ -145,55 +197,184 @@ public class RpcLwm2mIntegrationObserveTest extends AbstractRpcLwM2MIntegrationT
         assertEquals(ResponseCode.METHOD_NOT_ALLOWED.getName(), rpcActualResult.get("result").asText());
     }
 
+    /**
+     * Observe resource Execute -> "/5/0/2"
+     * @throws Exception
+     */
+    @Test
+    public void testObserveExecuteResource_Result_METHOD_NOT_ALLOWED() throws Exception {
+        String expectedId = objectInstanceIdVer_5 + "/" + RESOURCE_ID_2;
+        sendRpcObserve("Observe", expectedId);
+        String actual = sendRpcObserve("Observe", expectedId);
+        ObjectNode rpcActual = JacksonUtil.fromString(actual, ObjectNode.class);
+        assertEquals(ResponseCode.METHOD_NOT_ALLOWED.getName(), rpcActual.get("result").asText());
+    }
+
     /**
      * Repeated request on Observe
-     * Observe {"id":"/3/0/9"}
+     * Observe {"id":"/3_1.2/0/0"}
      * @throws Exception
      */
     @Test
-    public void testObserveRepeatedRequestObserveOnDevice_Result_BAD_REQUEST_ErrorMsg_AlreadyRegistered() throws Exception {
+    public void testObserveRepeatedRequestObserveOnDevice_Result_CONTENT_PutIfAbsent() throws Exception {
         String idVer_3_0_0 = objectInstanceIdVer_3 + "/" + RESOURCE_ID_0;
-        sendRpcObserve("Observe", fromVersionedIdToObjectId(idVer_3_0_0));
-        sendRpcObserve("ObserveReadAll", null);
         String actualResult = sendRpcObserve("Observe", idVer_3_0_0);
         ObjectNode rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
-        assertEquals(ResponseCode.BAD_REQUEST.getName(), rpcActualResult.get("result").asText());
-        String expected = "Observation is already registered!";
-        assertEquals(expected, rpcActualResult.get("error").asText());
+        assertEquals(ResponseCode.CONTENT.getName(), rpcActualResult.get("result").asText());
+        actualResult = sendRpcObserve("Observe", idVer_3_0_0);
+        rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
+        assertEquals(ResponseCode.CONTENT.getName(), rpcActualResult.get("result").asText());
+        String expected = "LwM2mSingleResource [id=0";
+        assertTrue(rpcActualResult.get("value").asText().contains(expected));
     }
 
     /**
-     * ObserveReadAll
+     *  Observe {"id":["3"]} - Ok
+     *  PreviousObservation  contains "3/0/9"
      * @throws Exception
      */
     @Test
-    public void testObserveReadAll_Result_CONTENT_Value_Contains_Paths_Count_ObserveReadAll() throws Exception {
+    public void testObserve_Result_CONTENT_ONE_PATH_PreviousObservation_CONTAINCE_OTHER_CurrentObservation() throws Exception {
+        sendCancelObserveAllWithAwait(deviceId);
+            // "3/0/9"
+        String idVer_3_0_9 = objectInstanceIdVer_3 + "/" + RESOURCE_ID_9;
+        String actualResult3_0_9 = sendRpcObserve("Observe", idVer_3_0_9);
+        ObjectNode rpcActualResult = JacksonUtil.fromString(actualResult3_0_9, ObjectNode.class);
+        assertEquals(ResponseCode.CONTENT.getName(), rpcActualResult.get("result").asText());
+            // "3"
+        String actualResult3 = sendRpcObserve("Observe", objectIdVer_3);
+        rpcActualResult = JacksonUtil.fromString(actualResult3, ObjectNode.class);
+        assertEquals(ResponseCode.CONTENT.getName(), rpcActualResult.get("result").asText());
+            // PreviousObservation "3/0/9" change to CurrentObservation "3"
         String actualResultReadAll = sendRpcObserve("ObserveReadAll", null);
-        ObjectNode rpcActualResultReadAll = JacksonUtil.fromString(actualResultReadAll, ObjectNode.class);
-        assertEquals(ResponseCode.CONTENT.getName(), rpcActualResultReadAll.get("result").asText());
-        String actualValuesReadAll = rpcActualResultReadAll.get("value").asText();
-        log.warn("ObserveReadAll:  [{}]", actualValuesReadAll);
-        assertEquals(2, actualValuesReadAll.split(",").length);
+        rpcActualResult = JacksonUtil.fromString(actualResultReadAll, ObjectNode.class);
+        assertEquals(ResponseCode.CONTENT.getName(), rpcActualResult.get("result").asText());
+        String actualValuesReadAll = rpcActualResult.get("value").asText();
+        assertEquals(1, actualValuesReadAll.split(",").length);
+        String expected = "\"SingleObservation:/3\"";
+        assertTrue(actualValuesReadAll.contains(expected));
+    }
+
+    /**
+     *  Observe {"id":["3/0/9"]} - Ok
+     *  PreviousObservation  contains "3"
+     * @throws Exception
+     */
+    @Test
+    public void testObserve_Result_CONTENT_ONE_PATH_CurrentObservation_CONTAINCE_OTHER_PreviousObservation() throws Exception {
+        sendCancelObserveAllWithAwait(deviceId);
+
+            // "3"
+        String actualResult3 = sendRpcObserve("Observe", objectIdVer_3);
+        ObjectNode rpcActualResult = JacksonUtil.fromString(actualResult3, ObjectNode.class);
+        assertEquals(ResponseCode.CONTENT.getName(), rpcActualResult.get("result").asText());
+
+            // "3/0/0"; WARN: - Token collision ? existing observation [/3] includes input observation [/3/0/0]
+        String idVer_3_0_0 = objectInstanceIdVer_3 + "/" + RESOURCE_ID_0;
+        String actualResult3_0_0 = sendRpcObserve("Observe", idVer_3_0_0);
+        rpcActualResult = JacksonUtil.fromString(actualResult3_0_0, ObjectNode.class);
+        assertEquals(ResponseCode.CONTENT.getName(), rpcActualResult.get("result").asText());
+
+        String actualResultReadAll = sendRpcObserve("ObserveReadAll", null);
+        rpcActualResult = JacksonUtil.fromString(actualResultReadAll, ObjectNode.class);
+        assertEquals(ResponseCode.CONTENT.getName(), rpcActualResult.get("result").asText());
+        String actualValuesReadAll = rpcActualResult.get("value").asText();
+        assertEquals(1, actualValuesReadAll.split(",").length);
+        String expected = "\"SingleObservation:/3\"";
+        assertTrue(actualValuesReadAll.contains(expected));
     }
 
 
     /**
-     * ObserveCancel {"id":"/3/0/3"}
-     * ObserveCancel {"id":"/5/0/3"}
+     * Observe {"id":"/3/0/9"}
+     * ObserveCancel {"id":"/3/0/9"}
      */
     @Test
-    public void testObserveCancelOneResource_Result_CONTENT_Value_Count_1() throws Exception {
-        sendRpcObserve("ObserveCancelAll", null);
-        String expectedId_3_0_3 = objectInstanceIdVer_3 + "/" + RESOURCE_ID_3;
-        String expectedId_5_0_3 = objectInstanceIdVer_5 + "/" + RESOURCE_ID_3;
-        sendRpcObserve("Observe", expectedId_3_0_3);
-        sendRpcObserve("Observe", expectedId_5_0_3);
-        String actualResult = sendRpcObserve("ObserveCancel", expectedId_3_0_3);
-        ObjectNode rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
+    public void testObserveResource_ObserveCancelResource_Result_CONTENT_Count_1() throws Exception {
+        sendCancelObserveAllWithAwait(deviceId);
+
+        String  expectedId_3_0_9 = objectInstanceIdVer_3 + "/" + RESOURCE_ID_9;
+        sendRpcObserve("Observe", expectedId_3_0_9);
+        String actualResultReadAll = sendRpcObserve("ObserveReadAll", null);
+        ObjectNode rpcActualResult = JacksonUtil.fromString(actualResultReadAll, ObjectNode.class);
+        assertEquals(ResponseCode.CONTENT.getName(), rpcActualResult.get("result").asText());
+        String actualValuesReadAll = rpcActualResult.get("value").asText();
+        assertEquals(1, actualValuesReadAll.split(",").length);
+        String expected = "\"SingleObservation:" + fromVersionedIdToObjectId(expectedId_3_0_9) + "\"";
+        assertTrue(actualValuesReadAll.contains(expected));
+
+        // cancel observe "/3_1.2/0/9"
+        String actualResult = sendRpcObserve("ObserveCancel", expectedId_3_0_9);
+        rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
         assertEquals(ResponseCode.CONTENT.getName(), rpcActualResult.get("result").asText());
         assertEquals("1", rpcActualResult.get("value").asText());
     }
 
+
+    /**
+     * Observe {"id":"/3"}
+     * ObserveCancel {"id":"/3/0/9"} -> INTERNAL_SERVER_ERROR
+     * ObserveCancel {"id":"/3"} -> CONTENT
+     */
+    @Test
+    public void testObserveObject_ObserveCancelOneResource_Result_INTERNAL_SERVER_ERROR_Than_Cancel_ObserveObject_Result_CONTENT_Count_1() throws Exception {
+        sendCancelObserveAllWithAwait(deviceId);
+
+        String expectedId_3 = objectIdVer_3;
+        sendRpcObserve("Observe", expectedId_3);
+        String actualResultReadAll = sendRpcObserve("ObserveReadAll", null);
+        ObjectNode rpcActualResult = JacksonUtil.fromString(actualResultReadAll, ObjectNode.class);
+        assertEquals(ResponseCode.CONTENT.getName(), rpcActualResult.get("result").asText());
+        String actualValuesReadAll = rpcActualResult.get("value").asText();
+        assertEquals(1, actualValuesReadAll.split(",").length);
+        String expected = "\"SingleObservation:" + fromVersionedIdToObjectId(expectedId_3) + "\"";
+        assertTrue(actualValuesReadAll.contains(expected));
+
+            // cancel observe "/3_1.2/0/9"
+        String  expectedId_3_0_9 = objectInstanceIdVer_3 + "/" + RESOURCE_ID_9;
+        String actualResult = sendRpcObserve("ObserveCancel", expectedId_3_0_9);
+        String expectedValue = "for observation path [" + fromVersionedIdToObjectId(objectIdVer_3) + "], that includes this observation path [" + fromVersionedIdToObjectId(expectedId_3_0_9);
+        rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
+        assertEquals(ResponseCode.BAD_REQUEST.getName(), rpcActualResult.get("result").asText());
+        assertTrue(rpcActualResult.get("error").asText().contains(expectedValue));
+
+            // cancel observe "/3_1.2"
+        actualResult = sendRpcObserve("ObserveCancel", expectedId_3);
+        rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
+        assertEquals(ResponseCode.CONTENT.getName(), rpcActualResult.get("result").asText());
+        assertEquals("1", rpcActualResult.get("value").asText());
+    }
+
+    /**
+     * Observe {"id":"/3/0/0"}
+     * Observe {"id":"/3/0/9"}
+     * ObserveCancel {"id":"/3"} - Ok, cnt = 2
+     */
+    @Test
+    public void testObserveResource_ObserveCancelObject_Result_CONTENT_Count_1() throws Exception {
+        sendCancelObserveAllWithAwait(deviceId);
+        String expectedId_3_0_0 = objectInstanceIdVer_3 + "/" + RESOURCE_ID_0;
+        sendRpcObserve("Observe", expectedId_3_0_0);
+        String  expectedId_3_0_9 = objectInstanceIdVer_3 + "/" + RESOURCE_ID_9;
+        sendRpcObserve("Observe", expectedId_3_0_9);
+        String actualResultReadAll = sendRpcObserve("ObserveReadAll", null);
+        ObjectNode rpcActualResult = JacksonUtil.fromString(actualResultReadAll, ObjectNode.class);
+        assertEquals(ResponseCode.CONTENT.getName(), rpcActualResult.get("result").asText());
+        String actualValuesReadAll = rpcActualResult.get("value").asText();
+        assertEquals(2, actualValuesReadAll.split(",").length);
+        String expected_3_0_0 = "\"SingleObservation:" + fromVersionedIdToObjectId(expectedId_3_0_0) + "\"";
+        String expected_3_0_9 = "\"SingleObservation:" + fromVersionedIdToObjectId(expectedId_3_0_9) + "\"";
+        assertTrue(actualValuesReadAll.contains(expected_3_0_0));
+        assertTrue(actualValuesReadAll.contains(expected_3_0_9));
+
+            // cancel observe "/3_1.2"
+        String expectedId_3 = objectIdVer_3;
+        String actualResult = sendRpcObserve("ObserveCancel", expectedId_3);
+        rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
+        assertEquals(ResponseCode.CONTENT.getName(), rpcActualResult.get("result").asText());
+        assertEquals("2", rpcActualResult.get("value").asText());
+    }
+
     private String sendRpcObserve(String method, String params) throws Exception {
         return sendObserve(method, params, deviceId);
     }
diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/sql/RpcLwm2mIntegrationReadTest.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/sql/RpcLwm2mIntegrationReadTest.java
index 00a6bde635..52e32f2d55 100644
--- a/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/sql/RpcLwm2mIntegrationReadTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/sql/RpcLwm2mIntegrationReadTest.java
@@ -50,22 +50,28 @@ public class RpcLwm2mIntegrationReadTest extends AbstractRpcLwM2MIntegrationTest
      */
     @Test
     public void testReadAllObjectsInClientById_Result_CONTENT_Value_IsLwM2mObject_IsInstances() throws Exception {
-                expectedObjectIdVers.forEach(expected -> {
-            try {
-                String actualResult  = sendRPCById((String) expected);
-                String expectedObjectId = pathIdVerToObjectId((String) expected);
-                LwM2mPath expectedPath = new LwM2mPath(expectedObjectId);
-                ObjectNode rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
-                assertEquals(ResponseCode.CONTENT.getName(), rpcActualResult.get("result").asText());
-                String expectedObjectInstances = "LwM2mObject [id=" + expectedPath.getObjectId() + ", instances={0=LwM2mObjectInstance [id=0, resources=";
-                if (expectedPath.getObjectId() == 2) {
-                    expectedObjectInstances = "LwM2mObject [id=2, instances={}]";
+        try {
+            expectedObjectIdVers.forEach(expected -> {
+                try {
+                    String actualResult = sendRPCById((String) expected);
+                    String expectedObjectId = pathIdVerToObjectId((String) expected);
+                    LwM2mPath expectedPath = new LwM2mPath(expectedObjectId);
+                    ObjectNode rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
+                     assertEquals(ResponseCode.CONTENT.getName(), rpcActualResult.get("result").asText());
+                    String expectedObjectInstances = "LwM2mObject [id=" + expectedPath.getObjectId() + ", instances={0=LwM2mObjectInstance [id=0, resources=";
+                    if (expectedPath.getObjectId() == 1) {
+                        expectedObjectInstances = "LwM2mObject [id=1, instances={1=";
+                    } else if (expectedPath.getObjectId() == 2) {
+                        expectedObjectInstances = "LwM2mObject [id=2, instances={}]";
+                    }
+                    assertTrue(rpcActualResult.get("value").asText().contains(expectedObjectInstances));
+                } catch (Exception e) {
+                    e.printStackTrace();
                 }
-                assertTrue(rpcActualResult.get("value").asText().contains(expectedObjectInstances));
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        });
+            });
+        } catch (Exception e2){
+            e2.printStackTrace();
+        }
     }
 
     /**
diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/sql/RpcLwm2mIntegrationWriteAttributesTest.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/sql/RpcLwm2mIntegrationWriteAttributesTest.java
deleted file mode 100644
index b78758dc82..0000000000
--- a/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/sql/RpcLwm2mIntegrationWriteAttributesTest.java
+++ /dev/null
@@ -1,56 +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.rpc.sql;
-
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.eclipse.leshan.core.ResponseCode;
-import org.junit.Test;
-import org.thingsboard.common.util.JacksonUtil;
-import org.thingsboard.server.transport.lwm2m.rpc.AbstractRpcLwM2MIntegrationTest;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.RESOURCE_ID_14;
-
-
-public class RpcLwm2mIntegrationWriteAttributesTest extends AbstractRpcLwM2MIntegrationTest {
-
-    /**
-     * WriteAttributes {"id":"/3/0/14","attributes":{"pmax":100, "pmin":10}}
-     * if not implemented:
-     * {"result":"INTERNAL_SERVER_ERROR","error":"not implemented"}
-     * if implemented:
-     * {"result":"CHANGED"}
-     */
-    @Test
-    public void testWriteAttributesResourceWithParametersById_Result_INTERNAL_SERVER_ERROR() throws Exception {
-        String expectedPath = objectInstanceIdVer_3 + "/" + RESOURCE_ID_14;
-        String expectedValue = "{\"pmax\":100, \"pmin\":10}";
-        String actualResult = sendRPCExecuteWithValueById(expectedPath, expectedValue);
-        ObjectNode rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
-        assertEquals(ResponseCode.INTERNAL_SERVER_ERROR.getName(), rpcActualResult.get("result").asText());
-        String expected = "not implemented";
-        String actual = rpcActualResult.get("error").asText();
-        assertTrue(actual.equals(expected));
-    }
-
-    private String sendRPCExecuteWithValueById(String path, String value) throws Exception {
-        String setRpcRequest = "{\"method\": \"WriteAttributes\", \"params\": {\"id\": \"" + path + "\", \"attributes\": " + value + " }}";
-        return doPostAsync("/api/plugins/rpc/twoway/" + deviceId, setRpcRequest, String.class, status().isOk());
-    }
-
-}
diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/sql/RpcLwm2mIntegrationWriteTest.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/sql/RpcLwm2mIntegrationWriteTest.java
index 9d9e30f889..a230b17eb3 100644
--- a/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/sql/RpcLwm2mIntegrationWriteTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/sql/RpcLwm2mIntegrationWriteTest.java
@@ -161,8 +161,8 @@ public class RpcLwm2mIntegrationWriteTest extends AbstractRpcLwM2MIntegrationTes
         int resourceInstanceId25 = 25;
         String expectedValue0 = "00ad45675600";
         String expectedValue25 = "25ad45675600cdef";
-        String expectedValue = "{\"" + RESOURCE_ID_0 + "\":{\"" + resourceInstanceId0 + "\":\"" + expectedValue0 + "\", \"" + resourceInstanceId25 + "\":\"" + expectedValue25 + "\"}}";
-        String actualResult = sendRPCWriteObjectById("WriteUpdate", expectedPath, expectedValue);
+        String expectedValueResourcesObject19 = "{\"" + RESOURCE_ID_0 + "\":{\"" + resourceInstanceId0 + "\":\"" + expectedValue0 + "\", \"" + resourceInstanceId25 + "\":\"" + expectedValue25 + "\"}}";
+        String actualResult = sendRPCWriteObjectById("WriteUpdate", expectedPath, expectedValueResourcesObject19);
         ObjectNode rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
         assertEquals(ResponseCode.CHANGED.getName(), rpcActualResult.get("result").asText());
         String expectedPath0 = expectedPath + "/" + RESOURCE_ID_0 + "/" + resourceInstanceId0;
@@ -181,29 +181,37 @@ public class RpcLwm2mIntegrationWriteTest extends AbstractRpcLwM2MIntegrationTes
 
     /**
      * ResourceInstance + KeySingleResource + IdSingleResource
-     * WriteComposite {"nodes":{"/19/1/0/2":"00001234", "UtfOffset":"+04", "/3/0/15":"Kiyv/Europe"}}
+     * WriteComposite {"/19_1.1/0":{"0":{"0":"00ad45675600", "25":"25ad45675600cdef"}}, "UtfOffset":"+04", "/3_1.0/0/15":"Kiyv/Europe"}
      * {"result":"CHANGED"}
      */
     @Test
-    public void testWriteCompositeValueSingleResourceResourceInstanceByIdKey_Result_CHANGED() throws Exception {
-        int resourceInstanceId2 = 2;
-        String expectedPath19_1_0_2 = objectIdVer_19 + "/" + OBJECT_INSTANCE_ID_1 + "/" + RESOURCE_ID_0 + "/" + resourceInstanceId2;
-        String expectedValue19_1_0_2 = "00001234";
+    public void testWriteCompositeValueSingleResourceWithMultiResourceInstanceByIdKey_Result_CHANGED() throws Exception {
+        String expectedPath_19_0 = objectIdVer_19 + "/" + OBJECT_INSTANCE_ID_0;
+        int resourceInstanceId0 = 0;
+        int resourceInstanceId25 = 25;
+        String expectedValue0 = "00ad45675600";
+        String expectedValue25 = "25ad45675600cdef";
+        String expectedValue_19_Resources = "{\"" + RESOURCE_ID_0 + "\":{\"" + resourceInstanceId0 + "\":\"" + expectedValue0 + "\", \"" + resourceInstanceId25 + "\":\"" + expectedValue25 + "\"}}";
+
         String expectedKey3_0_14 = RESOURCE_ID_NAME_3_14;
         String expectedValue3_0_14 = "+04";
         String expectedPath3_0_15 = objectInstanceIdVer_3 + "/" + RESOURCE_ID_15;
         String expectedValue3_0_15 = "Kiyv/Europe";
-        String nodes = "{\"" + expectedPath19_1_0_2 + "\":\"" + expectedValue19_1_0_2 + "\", \"" + expectedKey3_0_14 +
+        String nodes = "{\"" + expectedPath_19_0 + "\":" + expectedValue_19_Resources + ", \"" + expectedKey3_0_14 +
                 "\":\"" + expectedValue3_0_14 + "\", \"" + expectedPath3_0_15 + "\":\"" + expectedValue3_0_15 + "\"}";
         String actualResult = sendCompositeRPC(nodes);
         ObjectNode rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
         assertEquals(ResponseCode.CHANGED.getName(), rpcActualResult.get("result").asText());
-        actualResult = sendRPCReadById(expectedPath19_1_0_2);
+        actualResult = sendRPCReadById(expectedPath_19_0 + "/" + RESOURCE_ID_0 + "/" + resourceInstanceId0);
         rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
         String actualValues = rpcActualResult.get("value").asText();
-        String expected = "LwM2mResourceInstance [id=" + resourceInstanceId2 + ", value=" + expectedValue19_1_0_2.length()/2 + "Bytes, type=OPAQUE]";
+        String expected = "LwM2mResourceInstance [id=" + resourceInstanceId0 + ", value=" + expectedValue0.length()/2 + "Bytes, type=OPAQUE]";
         assertTrue(actualValues.contains(expected));
-        actualResult = sendRPCReadByKey(expectedKey3_0_14);
+        actualResult = sendRPCReadById(expectedPath_19_0 + "/" + RESOURCE_ID_0 + "/" + resourceInstanceId25);
+        rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
+        actualValues = rpcActualResult.get("value").asText();
+        expected = "LwM2mResourceInstance [id=" + resourceInstanceId25 + ", value=" + expectedValue25.length()/2 + "Bytes, type=OPAQUE]";
+        assertTrue(actualValues.contains(expected));       actualResult = sendRPCReadByKey(expectedKey3_0_14);
         rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
         actualValues = rpcActualResult.get("value").asText();
         expected = "LwM2mSingleResource [id=" + RESOURCE_ID_14 + ", value=" + expectedValue3_0_14 + ", type=STRING]";
@@ -217,29 +225,36 @@ public class RpcLwm2mIntegrationWriteTest extends AbstractRpcLwM2MIntegrationTes
 
     /**
      * multipleResource == error
-     * bad - cannot be used for value Json, only primitive: SingleResource, ResourceInstance (for Json: WriteUpdate, WriteReplace)
-     * WriteComposite {"nodes":{"/19/0/0":{"0":"abcd5678", "10":"abcd5678"}}}
+     * WriteComposite {"/19_1.1/0/0":{"0":"00ad45675600", "25":"25ad45675600cdef"}}
+     * {"result":"CHANGED"}
      */
     @Test
-    public void testWriteCompositeValueSingleMultipleResourceByIdKey_Result_BAD_REQUEST_WriteComposite_operation_for_SingleResources_or_and_ResourceInstance() throws Exception {
-        String nodes = "{\"/19/0/0\":{\"0\":\"abcd5678\", \"10\":\"abcd5678\"}}";
+    public void testWriteCompositeValueSingleMultipleResourceOpaqueValueInputHexStringByIdKey_Result_CHANGED() throws Exception {
+        String expectedPath_19_0 = objectIdVer_19 + "/" + OBJECT_INSTANCE_ID_0;
+        int resourceInstanceId0 = 0;
+        int resourceInstanceId25 = 25;
+        String expectedValue0 = "00ad45675600";
+        String expectedValue25 = "25ad45675600cdef";
+        String nodes = "{\"" + expectedPath_19_0 + "/" + RESOURCE_ID_0 + "\":{\"" + resourceInstanceId0 + "\":\"" + expectedValue0 + "\", \"" + resourceInstanceId25 + "\":\"" + expectedValue25 + "\"}}";
+
         String actualResult = sendCompositeRPC(nodes);
         ObjectNode rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
-        assertEquals(ResponseCode.BAD_REQUEST.getName(), rpcActualResult.get("result").asText());
-        String actualValues = rpcActualResult.get("error").asText();
-        String expectedNodes = nodes.replaceAll("\"", "").replaceAll(":", "=");
-        String expected = String.format("nodes: %s is not validate value. " +
-                "The WriteComposite operation is only used for SingleResources or/and ResourceInstance.", expectedNodes);
-        assertEquals(expected, actualValues);
+        assertEquals(ResponseCode.CHANGED.getName(), rpcActualResult.get("result").asText());
+        actualResult = sendRPCReadById(expectedPath_19_0 + "/" + RESOURCE_ID_0 + "/" + resourceInstanceId0);
+        rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
+        String actualValues = rpcActualResult.get("value").asText();
+        String expected = "LwM2mResourceInstance [id=" + resourceInstanceId0 + ", value=" + expectedValue0.length()/2 + "Bytes, type=OPAQUE]";
+        assertTrue(actualValues.contains(expected));
+        actualResult = sendRPCReadById(expectedPath_19_0 + "/" + RESOURCE_ID_0 + "/" + resourceInstanceId25);
+        rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
+        actualValues = rpcActualResult.get("value").asText();
+        expected = "LwM2mResourceInstance [id=" + resourceInstanceId25 + ", value=" + expectedValue25.length()/2 + "Bytes, type=OPAQUE]";
+        assertTrue(actualValues.contains(expected));
     }
 
 
     /**
      * update_resourceInstances&update_singleResource
-     * new ResourceInstance if Resource is Multiple & Resource Single
-     *  - WriteReplace  {"id":"/19_1.2/1/0","value":{"2":ddff12"}}
-     *  - WriteReplace {"key":"UtfOffset","value":"+04"}
-     *  - WriteReplace {"id":"/3/0/15","value":"Kiyv/Europe"}
      * WriteComposite {"nodes":{"/19_1.1/1/0/2":"00001234", "UtfOffset":"+04", "/3/0/15":"Kiyv/Europe"}}}
      * {"result":"CHANGED"}
      */
@@ -331,4 +346,4 @@ public class RpcLwm2mIntegrationWriteTest extends AbstractRpcLwM2MIntegrationTes
         String setRpcRequest = "{\"method\": \"WriteComposite\", \"params\": {\"nodes\":" + nodes + "}}";
         return doPostAsync("/api/plugins/rpc/twoway/" + deviceId, setRpcRequest, String.class, status().isOk());
     }
-}
\ No newline at end of file
+}
diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/AbstractSecurityLwM2MIntegrationTest.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/AbstractSecurityLwM2MIntegrationTest.java
index 8925b0ded4..e787d26265 100644
--- a/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/AbstractSecurityLwM2MIntegrationTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/AbstractSecurityLwM2MIntegrationTest.java
@@ -18,7 +18,6 @@ package org.thingsboard.server.transport.lwm2m.security;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.binary.Base64;
-import org.eclipse.californium.elements.config.Configuration;
 import org.eclipse.leshan.client.object.Security;
 import org.eclipse.leshan.core.ResponseCode;
 import org.eclipse.leshan.core.util.Hex;
@@ -26,6 +25,7 @@ import org.junit.Assert;
 import org.springframework.test.web.servlet.MvcResult;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.Device;
+import org.thingsboard.server.common.data.device.credentials.lwm2m.AbstractLwM2MClientSecurityCredential;
 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;
@@ -50,6 +50,7 @@ import org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.LwM2MProfileBootst
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
 import java.security.GeneralSecurityException;
 import java.security.KeyStore;
 import java.security.PrivateKey;
@@ -59,13 +60,16 @@ import java.security.cert.X509Certificate;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Random;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
 import static org.awaitility.Awaitility.await;
-import static org.eclipse.leshan.client.object.Security.noSecBootstap;
+import static org.eclipse.leshan.client.object.Security.noSecBootstrap;
+import static org.eclipse.leshan.client.object.Security.psk;
 import static org.junit.Assert.assertEquals;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.thingsboard.server.common.data.device.credentials.lwm2m.LwM2MSecurityMode.PSK;
 import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.LwM2MClientState.ON_DEREGISTRATION_STARTED;
 import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.LwM2MClientState.ON_DEREGISTRATION_SUCCESS;
 import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.LwM2MClientState.ON_REGISTRATION_STARTED;
@@ -89,6 +93,7 @@ public abstract class AbstractSecurityLwM2MIntegrationTest extends AbstractLwM2M
     protected static final String SERVER_STORE_PWD = "server_ks_password";
     protected static final String SERVER_CERT_ALIAS = "server";
     protected static final String SERVER_CERT_ALIAS_BS = "bootstrap";
+    protected static final Security SECURITY_NO_SEC_BS = noSecBootstrap(URI_BS);;
     protected final X509Certificate serverX509Cert;                                               // server certificate signed by rootCA
     protected final X509Certificate serverX509CertBs;                                             // serverBs certificate signed by rootCA
     protected final PublicKey serverPublicKeyFromCert;                                            // server public key used for RPK
@@ -117,6 +122,13 @@ public abstract class AbstractSecurityLwM2MIntegrationTest extends AbstractLwM2M
 
     private final LwM2MBootstrapClientCredentials defaultBootstrapCredentials;
 
+    protected AbstractLwM2MClientSecurityCredential clientCredentials;
+    protected Security security;
+    protected Lwm2mDeviceProfileTransportConfiguration transportConfiguration;
+    protected LwM2MDeviceCredentials deviceCredentials;
+    protected String clientEndpoint;
+    protected final Random randomSuffix = new Random();
+
 
     public AbstractSecurityLwM2MIntegrationTest() {
         // create client credentials
@@ -171,9 +183,8 @@ public abstract class AbstractSecurityLwM2MIntegrationTest extends AbstractLwM2M
                                           LwM2MClientState finishState) throws Exception {
         Lwm2mDeviceProfileTransportConfiguration transportConfiguration = getTransportConfiguration(OBSERVE_ATTRIBUTES_WITHOUT_PARAMS, getBootstrapServerCredentialsNoSec(type));
         LwM2MDeviceCredentials deviceCredentials = getDeviceCredentialsNoSec(createNoSecClientCredentials(clientEndpoint));
-        this.basicTestConnection(noSecBootstap(URI_BS),
+        this.basicTestConnection(null , SECURITY_NO_SEC_BS,
                 deviceCredentials,
-                COAP_CONFIG_BS,
                 clientEndpoint,
                 transportConfiguration,
                 awaitAlias,
@@ -183,22 +194,22 @@ public abstract class AbstractSecurityLwM2MIntegrationTest extends AbstractLwM2M
                 false);
     }
 
-    protected void basicTestConnection(Security security,
+    protected void basicTestConnection(Security security, Security securityBs,
                                        LwM2MDeviceCredentials deviceCredentials,
-                                       Configuration coapConfig,
                                        String endpoint,
                                        Lwm2mDeviceProfileTransportConfiguration transportConfiguration,
                                        String awaitAlias,
                                        Set<LwM2MClientState> expectedStatuses,
-                                       boolean isBootstrap,
+                                       boolean isAwaitObserveReadAll,
                                        LwM2MClientState finishState,
                                        boolean isStartLw) throws Exception {
         createDeviceProfile(transportConfiguration);
         final Device device = createDevice(deviceCredentials, endpoint);
-        device.getId().getId().toString();
-        createNewClient(security, coapConfig, true, endpoint, isBootstrap, null);
+        createNewClient(security, securityBs, true, endpoint);
         lwM2MTestClient.start(isStartLw);
-        awaitObserveReadAll(0, isBootstrap, device.getId().getId().toString());
+        if (isAwaitObserveReadAll) {
+            awaitObserveReadAll(0, device.getId().getId().toString());
+        }
         await(awaitAlias)
                 .atMost(40, TimeUnit.SECONDS)
                 .until(() -> {
@@ -220,34 +231,29 @@ public abstract class AbstractSecurityLwM2MIntegrationTest extends AbstractLwM2M
         LwM2MDeviceCredentials deviceCredentials = getDeviceCredentialsNoSec(createNoSecClientCredentials(clientEndpoint));
         this.basicTestConnectionBootstrapRequestTrigger(
                 SECURITY_NO_SEC,
+                SECURITY_NO_SEC_BS,
                 deviceCredentials,
-                COAP_CONFIG,
                 clientEndpoint,
                 transportConfiguration,
                 awaitAlias,
                 expectedStatusesRegistrationLwm2mSuccess,
-                expectedStatusesRegistrationBsSuccess,
-                false,
-                SECURITY_NO_SEC_BS);
+                expectedStatusesRegistrationBsSuccess);
     }
 
-    private void basicTestConnectionBootstrapRequestTrigger(Security security,
+    private void basicTestConnectionBootstrapRequestTrigger(Security security, Security securityBs,
                                                             LwM2MDeviceCredentials deviceCredentials,
-                                                            Configuration coapConfig,
                                                             String endpoint,
                                                             Lwm2mDeviceProfileTransportConfiguration transportConfiguration,
                                                             String awaitAlias,
                                                             Set<LwM2MClientState> expectedStatusesLwm2m,
-                                                            Set<LwM2MClientState> expectedStatusesBs,
-                                                            boolean isBootstrap,
-                                                            Security securityBs) throws Exception {
+                                                            Set<LwM2MClientState> expectedStatusesBs) throws Exception {
 
         createDeviceProfile(transportConfiguration);
         final Device device = createDevice(deviceCredentials, endpoint);
         String deviceIdStr = device.getId().getId().toString();
-        createNewClient(security, coapConfig, true, endpoint, isBootstrap, securityBs);
+        createNewClient(security, securityBs, true, endpoint);
         lwM2MTestClient.start(true);
-        awaitObserveReadAll(0, isBootstrap, deviceIdStr);
+        awaitObserveReadAll(0, deviceIdStr);
         await(awaitAlias)
                 .atMost(40, TimeUnit.SECONDS)
                 .until(() -> {
@@ -263,7 +269,7 @@ public abstract class AbstractSecurityLwM2MIntegrationTest extends AbstractLwM2M
         Assert.assertTrue(lwM2MTestClient.getClientStates().containsAll(expectedStatusesLwm2m));
 
         String executedPath = "/" + OBJECT_ID_1 + "_" +  lwM2MTestClient.getLeshanClient().getObjectTree().getModel().getObjectModel(OBJECT_ID_1).version
-                + "/0/" + RESOURCE_ID_9;
+                + "/" +serverId + "/" + RESOURCE_ID_9;
         lwM2MTestClient.setClientStates(new HashSet<>());
         String actualResult = sendRPCSecurityExecuteById(executedPath, deviceIdStr, endpoint);
         ObjectNode rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
@@ -337,7 +343,7 @@ public abstract class AbstractSecurityLwM2MIntegrationTest extends AbstractLwM2M
             default:
                 throw new IllegalStateException("Unexpected value: " + mode);
         }
-        bootstrapServerCredential.setShortServerId(isBootstrap ? shortServerIdBs : shortServerId);
+        bootstrapServerCredential.setShortServerId(isBootstrap ? shortServerIdBs0 : shortServerId);
         bootstrapServerCredential.setBootstrapServerIs(isBootstrap);
         bootstrapServerCredential.setHost(isBootstrap ? hostBs : host);
         bootstrapServerCredential.setPort(isBootstrap ? securityPortBs : securityPort);
@@ -382,6 +388,27 @@ public abstract class AbstractSecurityLwM2MIntegrationTest extends AbstractLwM2M
         return bootstrapCredentials;
     }
 
+
+    protected void initDeviceCredentialsNoSek() {
+        clientEndpoint = CLIENT_ENDPOINT_NO_SEC + "_" + randomSuffix.nextInt(100);
+        security = SECURITY_NO_SEC;
+        deviceCredentials = getDeviceCredentialsNoSec(createNoSecClientCredentials(clientEndpoint));
+    }
+    protected void initDeviceCredentialsPsk() {
+        int suf =  randomSuffix.nextInt(10);
+        clientEndpoint = CLIENT_ENDPOINT_PSK + "_" + suf;
+        String identity = CLIENT_PSK_IDENTITY + "_" + suf;
+        clientCredentials = new PSKClientCredential();
+        clientCredentials.setEndpoint(clientEndpoint);
+        ((PSKClientCredential)clientCredentials).setIdentity(identity);
+        clientCredentials.setKey(CLIENT_PSK_KEY);
+        security = psk(SECURE_URI,
+                shortServerId,
+                identity.getBytes(StandardCharsets.UTF_8),
+                Hex.decodeHex(CLIENT_PSK_KEY.toCharArray()));
+        deviceCredentials = getDeviceCredentialsSecure(clientCredentials, null, null, PSK, false);
+    }
+
     private LwM2MBootstrapClientCredentials getBootstrapClientCredentialsRpk(X509Certificate certificate, PrivateKey privateKey, boolean privateKeyIsBad) {
         LwM2MBootstrapClientCredentials bootstrapCredentials = new LwM2MBootstrapClientCredentials();
         RPKBootstrapClientCredential serverCredentials = new RPKBootstrapClientCredential();
@@ -443,3 +470,4 @@ public abstract class AbstractSecurityLwM2MIntegrationTest extends AbstractLwM2M
         return doPostAsync("/api/plugins/rpc/twoway/" + deviceId, setRpcRequest, String.class, status().isOk());
     }
 }
+
diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/cid/AbstractSecurityLwM2MIntegrationDtlsCidLength0Test.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/cid/AbstractSecurityLwM2MIntegrationDtlsCidLength0Test.java
new file mode 100644
index 0000000000..126dc39197
--- /dev/null
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/cid/AbstractSecurityLwM2MIntegrationDtlsCidLength0Test.java
@@ -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.
+ */
+package org.thingsboard.server.transport.lwm2m.security.cid;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.test.context.TestPropertySource;
+import org.thingsboard.server.dao.service.DaoSqlTest;
+
+
+@TestPropertySource(properties = {
+        "transport.lwm2m.dtls.connection_id_length=0"
+})
+
+@DaoSqlTest
+@Slf4j
+public abstract class AbstractSecurityLwM2MIntegrationDtlsCidLength0Test extends AbstractSecurityLwM2MIntegrationDtlsCidLengthTest {
+
+
+    protected void  testNoSecDtlsCidLength(Integer dtlsCidLength) throws Exception {
+        testNoSecDtlsCidLength(dtlsCidLength, 0);
+    }
+    protected void  testPskDtlsCidLength(Integer dtlsCidLength) throws Exception {
+        testPskDtlsCidLength(dtlsCidLength, 0);
+    }
+}
diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/cid/AbstractSecurityLwM2MIntegrationDtlsCidLength3Test.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/cid/AbstractSecurityLwM2MIntegrationDtlsCidLength3Test.java
new file mode 100644
index 0000000000..d3f6605e11
--- /dev/null
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/cid/AbstractSecurityLwM2MIntegrationDtlsCidLength3Test.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.transport.lwm2m.security.cid;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.test.context.TestPropertySource;
+import org.thingsboard.server.dao.service.DaoSqlTest;
+
+
+@TestPropertySource(properties = {
+        "transport.lwm2m.dtls.connection_id_length=3"
+})
+
+@DaoSqlTest
+@Slf4j
+public abstract class AbstractSecurityLwM2MIntegrationDtlsCidLength3Test extends AbstractSecurityLwM2MIntegrationDtlsCidLengthTest {
+
+    protected void  testNoSecDtlsCidLength(Integer dtlsCidLength) throws Exception {
+        testNoSecDtlsCidLength(dtlsCidLength, 3);
+    }
+    protected void  testPskDtlsCidLength(Integer dtlsCidLength) throws Exception {
+        testPskDtlsCidLength(dtlsCidLength, 3);
+    }
+}
diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/cid/AbstractSecurityLwM2MIntegrationDtlsCidLengthNullTest.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/cid/AbstractSecurityLwM2MIntegrationDtlsCidLengthNullTest.java
new file mode 100644
index 0000000000..1a63159352
--- /dev/null
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/cid/AbstractSecurityLwM2MIntegrationDtlsCidLengthNullTest.java
@@ -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.
+ */
+package org.thingsboard.server.transport.lwm2m.security.cid;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.test.context.TestPropertySource;
+import org.thingsboard.server.dao.service.DaoSqlTest;
+
+
+@TestPropertySource(properties = {
+        "transport.lwm2m.dtls.connection_id_length="
+})
+
+@DaoSqlTest
+@Slf4j
+public abstract class AbstractSecurityLwM2MIntegrationDtlsCidLengthNullTest extends AbstractSecurityLwM2MIntegrationDtlsCidLengthTest {
+
+
+    protected void  testNoSecDtlsCidLength(Integer dtlsCidLength) throws Exception {
+        testNoSecDtlsCidLength(dtlsCidLength, null);
+    }
+    protected void  testPskDtlsCidLength(Integer dtlsCidLength) throws Exception {
+        testPskDtlsCidLength(dtlsCidLength, null);
+    }
+}
diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/cid/AbstractSecurityLwM2MIntegrationDtlsCidLengthTest.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/cid/AbstractSecurityLwM2MIntegrationDtlsCidLengthTest.java
new file mode 100644
index 0000000000..291149b7e8
--- /dev/null
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/cid/AbstractSecurityLwM2MIntegrationDtlsCidLengthTest.java
@@ -0,0 +1,85 @@
+/**
+ * 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.security.cid;
+
+import lombok.extern.slf4j.Slf4j;
+import org.eclipse.californium.elements.config.Configuration;
+import org.eclipse.leshan.client.californium.endpoint.CaliforniumClientEndpoint;
+import org.eclipse.leshan.client.californium.endpoint.CaliforniumClientEndpointsProvider;
+import org.junit.Assert;
+import org.thingsboard.server.common.data.Device;
+import org.thingsboard.server.dao.service.DaoSqlTest;
+import org.thingsboard.server.transport.lwm2m.security.AbstractSecurityLwM2MIntegrationTest;
+
+import java.util.concurrent.TimeUnit;
+
+import static org.awaitility.Awaitility.await;
+import static org.eclipse.californium.scandium.config.DtlsConfig.DTLS_CONNECTION_ID_LENGTH;
+import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.LwM2MClientState.ON_READ_CONNECTION_ID;
+import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.LwM2MClientState.ON_UPDATE_SUCCESS;
+import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.LwM2MClientState.ON_WRITE_CONNECTION_ID;
+
+@DaoSqlTest
+@Slf4j
+public abstract class AbstractSecurityLwM2MIntegrationDtlsCidLengthTest extends AbstractSecurityLwM2MIntegrationTest {
+
+    protected String awaitAlias;
+
+    protected void testNoSecDtlsCidLength(Integer dtlsCidLength, Integer serverDtlsCidLength) throws Exception {
+        initDeviceCredentialsNoSek();
+        basicTestConnectionDtlsCidLength(dtlsCidLength, serverDtlsCidLength);
+    }
+    protected void testPskDtlsCidLength(Integer dtlsCidLength, Integer serverDtlsCidLength) throws Exception {
+        initDeviceCredentialsPsk();
+        basicTestConnectionDtlsCidLength(dtlsCidLength, serverDtlsCidLength);
+    }
+
+    protected void basicTestConnectionDtlsCidLength(Integer clientDtlsCidLength,
+                                                    Integer serverDtlsCidLength) throws Exception {
+        createDeviceProfile(transportConfiguration);
+        final Device device = createDevice(deviceCredentials, clientEndpoint);
+        device.getId().getId().toString();
+        createNewClient(security, null, true, clientEndpoint, clientDtlsCidLength);
+        lwM2MTestClient.start(true);
+        await(awaitAlias)
+                .atMost(40, TimeUnit.SECONDS)
+                .until(() -> lwM2MTestClient.getClientStates().contains(ON_UPDATE_SUCCESS));
+        Assert.assertTrue(lwM2MTestClient.getClientStates().containsAll(expectedStatusesRegistrationLwm2mSuccess));
+
+        Configuration clientCoapConfig = ((CaliforniumClientEndpoint)((CaliforniumClientEndpointsProvider)lwM2MTestClient
+                .getLeshanClient().getEndpointsProvider().toArray()[0]).getEndpoints().toArray()[0]).getCoapEndpoint().getConfig();
+        Assert.assertEquals(clientDtlsCidLength, clientCoapConfig.get(DTLS_CONNECTION_ID_LENGTH));
+
+        if (security.equals(SECURITY_NO_SEC)) {
+            Assert.assertTrue(lwM2MTestClient.getClientDtlsCid().isEmpty());
+        } else {
+            Assert.assertEquals(2L, lwM2MTestClient.getClientDtlsCid().size());
+            Assert.assertTrue(lwM2MTestClient.getClientDtlsCid().keySet().contains(ON_READ_CONNECTION_ID));
+            Assert.assertTrue(lwM2MTestClient.getClientDtlsCid().keySet().contains(ON_WRITE_CONNECTION_ID));
+            if (serverDtlsCidLength == null) {
+                Assert.assertNull(lwM2MTestClient.getClientDtlsCid().get(ON_WRITE_CONNECTION_ID));
+                Assert.assertNull(lwM2MTestClient.getClientDtlsCid().get(ON_READ_CONNECTION_ID));
+            } else {
+                Assert.assertEquals(clientDtlsCidLength, lwM2MTestClient.getClientDtlsCid().get(ON_READ_CONNECTION_ID));
+                if (clientDtlsCidLength == null) {
+                    Assert.assertNull(lwM2MTestClient.getClientDtlsCid().get(ON_READ_CONNECTION_ID));
+                } else {
+                    Assert.assertEquals(Integer.valueOf(serverDtlsCidLength), lwM2MTestClient.getClientDtlsCid().get(ON_WRITE_CONNECTION_ID));
+                }
+            }
+        }
+    }
+}
diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/cid/serverDtlsCidLength_0/NoSecLwM2MIntegrationDtlsCidLengthTest.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/cid/serverDtlsCidLength_0/NoSecLwM2MIntegrationDtlsCidLengthTest.java
new file mode 100644
index 0000000000..8ce9053e5e
--- /dev/null
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/cid/serverDtlsCidLength_0/NoSecLwM2MIntegrationDtlsCidLengthTest.java
@@ -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.
+ */
+package org.thingsboard.server.transport.lwm2m.security.cid.serverDtlsCidLength_0;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.thingsboard.server.transport.lwm2m.security.cid.AbstractSecurityLwM2MIntegrationDtlsCidLength0Test;
+
+import static org.thingsboard.server.common.data.device.credentials.lwm2m.LwM2MSecurityMode.NO_SEC;
+import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.LwM2MProfileBootstrapConfigType.NONE;
+
+public class NoSecLwM2MIntegrationDtlsCidLengthTest extends AbstractSecurityLwM2MIntegrationDtlsCidLength0Test {
+
+    @Before
+    public void setUpNoSecDtlsCidLength() {
+        transportConfiguration = getTransportConfiguration(OBSERVE_ATTRIBUTES_WITHOUT_PARAMS, getBootstrapServerCredentialsSecure(NO_SEC, NONE));
+        awaitAlias = "await on client state (NoSec_Lwm2m) DtlsCidLength = 0";
+    }
+
+    @Test
+    public void testWithNoSecConnectLwm2mSuccessClientDtlsCidLength_Null() throws Exception {
+        testNoSecDtlsCidLength(null);
+    }
+
+    @Test
+    public void testWithNoSecConnectLwm2mSuccessClientDtlsCidLength_0() throws Exception {
+        testNoSecDtlsCidLength(0);
+    }
+
+    @Test
+    public void testWithNoSecConnectLwm2mSuccessClientDtlsCidLength_2() throws Exception {
+        testNoSecDtlsCidLength(2);
+    }
+}
diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/cid/serverDtlsCidLength_0/PskLwm2mIntegrationDtlsCidLengthTest.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/cid/serverDtlsCidLength_0/PskLwm2mIntegrationDtlsCidLengthTest.java
new file mode 100644
index 0000000000..1d73025edc
--- /dev/null
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/cid/serverDtlsCidLength_0/PskLwm2mIntegrationDtlsCidLengthTest.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.transport.lwm2m.security.cid.serverDtlsCidLength_0;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.thingsboard.server.transport.lwm2m.security.cid.AbstractSecurityLwM2MIntegrationDtlsCidLength0Test;
+
+import static org.thingsboard.server.common.data.device.credentials.lwm2m.LwM2MSecurityMode.PSK;
+import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.LwM2MProfileBootstrapConfigType.NONE;
+
+public class PskLwm2mIntegrationDtlsCidLengthTest extends AbstractSecurityLwM2MIntegrationDtlsCidLength0Test {
+
+    @Before
+    public void createProfileRpc() {
+        transportConfiguration = getTransportConfiguration(OBSERVE_ATTRIBUTES_WITHOUT_PARAMS, getBootstrapServerCredentialsSecure(PSK, NONE));
+        awaitAlias = "await on client state (Psk_Lwm2m) DtlsCidLength = 0";
+    }
+
+    @Test
+    public void testWithPskConnectLwm2mSuccessClientDtlsCidLength_Null() throws Exception {
+        testPskDtlsCidLength(null);
+    }
+
+    @Test
+    public void testWithPskConnectLwm2mSuccessClientDtlsCidLength_0() throws Exception {
+        testPskDtlsCidLength(0);
+    }
+
+    @Test
+    public void testWithPskConnectLwm2mSuccessClientDtlsCidLength_2() throws Exception {
+        testPskDtlsCidLength(2);
+    }
+}
+
diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/cid/serverDtlsCidLength_3/NoSecLwM2MIntegrationDtlsCidLengthTest.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/cid/serverDtlsCidLength_3/NoSecLwM2MIntegrationDtlsCidLengthTest.java
new file mode 100644
index 0000000000..932632a359
--- /dev/null
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/cid/serverDtlsCidLength_3/NoSecLwM2MIntegrationDtlsCidLengthTest.java
@@ -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.
+ */
+package org.thingsboard.server.transport.lwm2m.security.cid.serverDtlsCidLength_3;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.thingsboard.server.transport.lwm2m.security.cid.AbstractSecurityLwM2MIntegrationDtlsCidLength3Test;
+
+import static org.thingsboard.server.common.data.device.credentials.lwm2m.LwM2MSecurityMode.NO_SEC;
+import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.LwM2MProfileBootstrapConfigType.NONE;
+
+public class NoSecLwM2MIntegrationDtlsCidLengthTest extends AbstractSecurityLwM2MIntegrationDtlsCidLength3Test {
+
+    @Before
+    public void setUpNoSecDtlsCidLength() {
+        transportConfiguration = getTransportConfiguration(OBSERVE_ATTRIBUTES_WITHOUT_PARAMS, getBootstrapServerCredentialsSecure(NO_SEC, NONE));
+        awaitAlias = "await on client state (NoSec_Lwm2m) DtlsCidLength = 3";
+    }
+
+    @Test
+    public void testWithNoSecConnectLwm2mSuccessClientDtlsCidLength_Null() throws Exception {
+        testNoSecDtlsCidLength(null);
+    }
+
+    @Test
+    public void testWithNoSecConnectLwm2mSuccessClientDtlsCidLength_0() throws Exception {
+        testNoSecDtlsCidLength(0);
+    }
+
+    @Test
+    public void testWithNoSecConnectLwm2mSuccessClientDtlsCidLength_2() throws Exception {
+        testNoSecDtlsCidLength(2);
+    }
+}
diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/cid/serverDtlsCidLength_3/PskLwm2mIntegrationDtlsCidLengthTest.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/cid/serverDtlsCidLength_3/PskLwm2mIntegrationDtlsCidLengthTest.java
new file mode 100644
index 0000000000..6049b57f77
--- /dev/null
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/cid/serverDtlsCidLength_3/PskLwm2mIntegrationDtlsCidLengthTest.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.transport.lwm2m.security.cid.serverDtlsCidLength_3;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.thingsboard.server.transport.lwm2m.security.cid.AbstractSecurityLwM2MIntegrationDtlsCidLength3Test;
+
+import static org.thingsboard.server.common.data.device.credentials.lwm2m.LwM2MSecurityMode.PSK;
+import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.LwM2MProfileBootstrapConfigType.NONE;
+
+public class PskLwm2mIntegrationDtlsCidLengthTest extends AbstractSecurityLwM2MIntegrationDtlsCidLength3Test {
+
+    @Before
+    public void createProfileRpc() {
+        transportConfiguration = getTransportConfiguration(OBSERVE_ATTRIBUTES_WITHOUT_PARAMS, getBootstrapServerCredentialsSecure(PSK, NONE));
+        awaitAlias = "await on client state (Psk_Lwm2m) DtlsCidLength = 3";
+    }
+
+    @Test
+    public void testWithPskConnectLwm2mSuccessClientDtlsCidLength_Null() throws Exception {
+        testPskDtlsCidLength(null);
+    }
+
+    @Test
+    public void testWithPskConnectLwm2mSuccessClientDtlsCidLength_0() throws Exception {
+        testPskDtlsCidLength(0);
+    }
+
+    @Test
+    public void testWithPskConnectLwm2mSuccessClientDtlsCidLength_2() throws Exception {
+        testPskDtlsCidLength(2);
+    }
+}
+
diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/cid/serverDtlsCidLength_null/NoSecLwM2MIntegrationDtlsCidLengthTest.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/cid/serverDtlsCidLength_null/NoSecLwM2MIntegrationDtlsCidLengthTest.java
new file mode 100644
index 0000000000..d8c7c67b2b
--- /dev/null
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/cid/serverDtlsCidLength_null/NoSecLwM2MIntegrationDtlsCidLengthTest.java
@@ -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.
+ */
+package org.thingsboard.server.transport.lwm2m.security.cid.serverDtlsCidLength_null;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.thingsboard.server.transport.lwm2m.security.cid.AbstractSecurityLwM2MIntegrationDtlsCidLengthNullTest;
+
+import static org.thingsboard.server.common.data.device.credentials.lwm2m.LwM2MSecurityMode.NO_SEC;
+import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.LwM2MProfileBootstrapConfigType.NONE;
+
+public class NoSecLwM2MIntegrationDtlsCidLengthTest extends AbstractSecurityLwM2MIntegrationDtlsCidLengthNullTest {
+
+    @Before
+    public void setUpNoSecDtlsCidLength() {
+        transportConfiguration = getTransportConfiguration(OBSERVE_ATTRIBUTES_WITHOUT_PARAMS, getBootstrapServerCredentialsSecure(NO_SEC, NONE));
+        awaitAlias = "await on client state (NoSec_Lwm2m) DtlsCidLength = Null";
+    }
+
+    @Test
+    public void testWithNoSecConnectLwm2mSuccessClientDtlsCidLength_Null() throws Exception {
+        testNoSecDtlsCidLength(null);
+    }
+
+    @Test
+    public void testWithNoSecConnectLwm2mSuccessClientDtlsCidLength_0() throws Exception {
+        testNoSecDtlsCidLength(0);
+    }
+
+    @Test
+    public void testWithNoSecConnectLwm2mSuccessClientDtlsCidLength_2() throws Exception {
+        testNoSecDtlsCidLength(2);
+    }
+}
diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/cid/serverDtlsCidLength_null/PskLwm2mIntegrationDtlsCidLengthTest.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/cid/serverDtlsCidLength_null/PskLwm2mIntegrationDtlsCidLengthTest.java
new file mode 100644
index 0000000000..6fefaf7622
--- /dev/null
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/cid/serverDtlsCidLength_null/PskLwm2mIntegrationDtlsCidLengthTest.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.transport.lwm2m.security.cid.serverDtlsCidLength_null;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.thingsboard.server.transport.lwm2m.security.cid.AbstractSecurityLwM2MIntegrationDtlsCidLengthNullTest;
+
+import static org.thingsboard.server.common.data.device.credentials.lwm2m.LwM2MSecurityMode.PSK;
+import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.LwM2MProfileBootstrapConfigType.NONE;
+
+public class PskLwm2mIntegrationDtlsCidLengthTest extends AbstractSecurityLwM2MIntegrationDtlsCidLengthNullTest {
+
+    @Before
+    public void createProfileRpc() {
+        transportConfiguration = getTransportConfiguration(OBSERVE_ATTRIBUTES_WITHOUT_PARAMS, getBootstrapServerCredentialsSecure(PSK, NONE));
+        awaitAlias = "await on client state (Psk_Lwm2m) DtlsCidLength = Null";
+    }
+
+    @Test
+    public void testWithPskConnectLwm2mSuccessClientDtlsCidLength_Null() throws Exception {
+        testPskDtlsCidLength(null);
+    }
+
+    @Test
+    public void testWithPskConnectLwm2mSuccessClientDtlsCidLength_0() throws Exception {
+        testPskDtlsCidLength(0);
+    }
+
+    @Test
+    public void testWithPskConnectLwm2mSuccessClientDtlsCidLength_2() throws Exception {
+        testPskDtlsCidLength(2);
+    }
+}
+
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
new file mode 100644
index 0000000000..9e9a38925c
--- /dev/null
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/diffPort/AbstractLwM2MIntegrationDiffPortTest.java
@@ -0,0 +1,93 @@
+/**
+ * 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.security.diffPort;
+
+import lombok.extern.slf4j.Slf4j;
+import org.eclipse.leshan.core.peer.IpPeer;
+import org.eclipse.leshan.core.peer.LwM2mPeer;
+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.springframework.boot.test.mock.mockito.SpyBean;
+import org.thingsboard.server.common.data.device.profile.Lwm2mDeviceProfileTransportConfiguration;
+import org.thingsboard.server.dao.service.DaoSqlTest;
+import org.thingsboard.server.transport.lwm2m.security.AbstractSecurityLwM2MIntegrationTest;
+
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.util.concurrent.TimeUnit;
+
+import static org.awaitility.Awaitility.await;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doAnswer;
+import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.LwM2MClientState.ON_REGISTRATION_STARTED;
+import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.LwM2MClientState.ON_REGISTRATION_SUCCESS;
+import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.LwM2MClientState.ON_UPDATE_SUCCESS;
+
+@DaoSqlTest
+@Slf4j
+public abstract class AbstractLwM2MIntegrationDiffPortTest extends AbstractSecurityLwM2MIntegrationTest {
+
+    @SpyBean
+    private RegistrationStore registrationStoreTest;
+
+    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);
+        lwM2MTestClient.start(true);
+        await(awaitAlias)
+                .atMost(40, TimeUnit.SECONDS)
+                .until(() -> lwM2MTestClient.getClientStates().contains(ON_REGISTRATION_SUCCESS) || lwM2MTestClient.getClientStates().contains(ON_REGISTRATION_STARTED));
+        Assert.assertTrue(lwM2MTestClient.getClientStates().containsAll(expectedStatusesRegistrationLwm2mSuccess));
+
+        await(awaitAlias)
+                .atMost(40, TimeUnit.SECONDS)
+                .until(() -> lwM2MTestClient.getClientStates().contains(ON_UPDATE_SUCCESS));
+
+        Assert.assertTrue(lwM2MTestClient.getClientStates().containsAll(expectedStatusesRegistrationLwm2mSuccessUpdate));
+    }
+
+    private RegistrationUpdate registrationUpdateNewPort (RegistrationUpdate update, int portValueChange) {
+        Integer portOld = update.getPort();
+        Integer portNew = portOld + portValueChange;
+        log.warn("portOld: [{}], portNew: [{}]", portOld, portNew);
+        InetAddress addressOld = update.getAddress();
+        InetSocketAddress socketAddressUpdate = new InetSocketAddress(addressOld, portNew);
+        SocketIdentity socketIdentity = new SocketIdentity(socketAddressUpdate);
+        LwM2mPeer sender = new IpPeer(new InetSocketAddress(addressOld, portNew), socketIdentity);
+        return new RegistrationUpdate(update.getRegistrationId(), sender,
+                update.getLifeTimeInSec(), update.getSmsNumber(), update.getBindingMode(),
+                update.getObjectLinks(), update.getAlternatePath(),
+                update.getSupportedContentFormats(), update.getSupportedObjects(),
+                update.getAvailableInstances(), update.getAdditionalAttributes(),
+                update.getApplicationData());
+    }
+}
diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/diffPort/LwM2MIntegrationDiffPortTest.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/diffPort/LwM2MIntegrationDiffPortTest.java
new file mode 100644
index 0000000000..204bc70b5f
--- /dev/null
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/diffPort/LwM2MIntegrationDiffPortTest.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.transport.lwm2m.security.diffPort;
+
+import org.junit.Test;
+import org.thingsboard.server.common.data.device.profile.Lwm2mDeviceProfileTransportConfiguration;
+
+import static org.thingsboard.server.common.data.device.credentials.lwm2m.LwM2MSecurityMode.NO_SEC;
+import static org.thingsboard.server.common.data.device.credentials.lwm2m.LwM2MSecurityMode.PSK;
+import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.LwM2MProfileBootstrapConfigType.NONE;
+
+public class LwM2MIntegrationDiffPortTest extends AbstractLwM2MIntegrationDiffPortTest {
+
+    @Test
+    public void testWithNoSecConnectLwm2mSuccess_AfterRegistration_UpdateRegistrationFromDifferentPort_Ok() throws Exception {
+        String awaitAlias = "await on client state (NoSec different port)";
+        Lwm2mDeviceProfileTransportConfiguration transportConfiguration = getTransportConfiguration(OBSERVE_ATTRIBUTES_WITHOUT_PARAMS, getBootstrapServerCredentialsSecure(NO_SEC, NONE));
+        initDeviceCredentialsNoSek();
+        basicTestConnectionDifferentPort(
+                transportConfiguration,
+                awaitAlias);
+    }
+    @Test
+    public void testWithPskConnectLwm2mSuccess_AfterRegistration_UpdateRegistrationFromDifferentPort_Ok() throws Exception {
+        String awaitAlias = "await on client state (Psk different port)";
+        Lwm2mDeviceProfileTransportConfiguration transportConfiguration = getTransportConfiguration(OBSERVE_ATTRIBUTES_WITHOUT_PARAMS, getBootstrapServerCredentialsSecure(PSK, NONE));
+        initDeviceCredentialsPsk();
+        basicTestConnectionDifferentPort(
+                transportConfiguration,
+                awaitAlias);
+    }
+}
diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/sql/NoSecLwM2MIntegrationTest.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/sql/NoSecLwM2MIntegrationTest.java
index 44922782be..a5296a16b1 100644
--- a/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/sql/NoSecLwM2MIntegrationTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/sql/NoSecLwM2MIntegrationTest.java
@@ -19,7 +19,6 @@ import org.junit.Test;
 import org.thingsboard.server.common.data.device.credentials.lwm2m.LwM2MDeviceCredentials;
 import org.thingsboard.server.transport.lwm2m.security.AbstractSecurityLwM2MIntegrationTest;
 
-import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.LwM2MClientState.ON_BOOTSTRAP_SUCCESS;
 import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.LwM2MClientState.ON_REGISTRATION_SUCCESS;
 import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.LwM2MProfileBootstrapConfigType.BOOTSTRAP_ONLY;
 import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.LwM2MProfileBootstrapConfigType.BOTH;
@@ -33,13 +32,19 @@ public class NoSecLwM2MIntegrationTest extends AbstractSecurityLwM2MIntegrationT
     public void testWithNoSecConnectLwm2mSuccessAndObserveTelemetry() throws Exception {
         String clientEndpoint = CLIENT_ENDPOINT_NO_SEC;
         LwM2MDeviceCredentials clientCredentials = getDeviceCredentialsNoSec(createNoSecClientCredentials(clientEndpoint));
-        super.basicTestConnectionObserveTelemetry(SECURITY_NO_SEC, clientCredentials, COAP_CONFIG, clientEndpoint);
+        super.basicTestConnectionObserveTelemetry(SECURITY_NO_SEC, clientCredentials, clientEndpoint, false);
+    }
+    @Test
+    public void testWithNoSecQueueModeConnectLwm2mSuccessAndObserveTelemetry() throws Exception {
+        String clientEndpoint = CLIENT_ENDPOINT_NO_SEC + "_QueueMode";
+        LwM2MDeviceCredentials clientCredentials = getDeviceCredentialsNoSec(createNoSecClientCredentials(clientEndpoint));
+        super.basicTestConnectionObserveTelemetry(SECURITY_NO_SEC, clientCredentials, clientEndpoint, true);
     }
 
     // Bootstrap + Lwm2m
     @Test
     public void testWithNoSecConnectBsSuccess_UpdateTwoSectionsBootstrapAndLm2m_ConnectLwm2mSuccess() throws Exception {
-        String clientEndpoint = CLIENT_ENDPOINT_NO_SEC_BS;
+        String clientEndpoint = CLIENT_ENDPOINT_NO_SEC_BS + BOTH.name();
         String awaitAlias = "await on client state (NoSecBS two section)";
         basicTestConnectionBefore(clientEndpoint, awaitAlias, BOTH, expectedStatusesRegistrationBsSuccess, ON_REGISTRATION_SUCCESS);
     }
@@ -51,20 +56,7 @@ public class NoSecLwM2MIntegrationTest extends AbstractSecurityLwM2MIntegrationT
         basicTestConnectionBefore(clientEndpoint, awaitAlias, LWM2M_ONLY, expectedStatusesRegistrationBsSuccess, ON_REGISTRATION_SUCCESS);
     }
 
-    @Test
-    public void testWithNoSecConnectBsSuccess_UpdateBootstrapSectionAndLm2m_ConnectLwm2mSuccess() throws Exception {
-        String clientEndpoint = CLIENT_ENDPOINT_NO_SEC + BOOTSTRAP_ONLY.name();
-        String awaitAlias = "await on client state (NoSecBS Bootstrap section)";
-        basicTestConnectionBefore(clientEndpoint, awaitAlias, BOOTSTRAP_ONLY, expectedStatusesBsSuccess, ON_BOOTSTRAP_SUCCESS);
-    }
-
-    @Test
-    public void testWithNoSecConnectBsSuccess_UpdateNoneSectionAndLm2m_ConnectLwm2mSuccess() throws Exception {
-        String clientEndpoint = CLIENT_ENDPOINT_NO_SEC + NONE.name();
-        String awaitAlias = "await on client state (NoSecBS None section)";
-        basicTestConnectionBefore(clientEndpoint, awaitAlias, NONE, expectedStatusesBsSuccess, ON_BOOTSTRAP_SUCCESS);
-    }
-
+    // Bs trigger
     @Test
     public void testWithNoSecConnectLwm2mSuccessBootstrapRequestTriggerConnectBsSuccess_UpdateTwoSectionAndLm2m_ConnectLwm2mSuccess() throws Exception {
         String clientEndpoint = CLIENT_ENDPOINT_NO_SEC_BS + "Trigger" + BOTH.name();
diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/sql/PskLwm2mIntegrationTest.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/sql/PskLwm2mIntegrationTest.java
index 7a159f3fe8..2684f210ca 100644
--- a/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/sql/PskLwm2mIntegrationTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/sql/PskLwm2mIntegrationTest.java
@@ -24,7 +24,7 @@ import org.thingsboard.server.common.data.device.credentials.lwm2m.PSKClientCred
 import org.thingsboard.server.common.data.device.profile.Lwm2mDeviceProfileTransportConfiguration;
 import org.thingsboard.server.transport.lwm2m.security.AbstractSecurityLwM2MIntegrationTest;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import java.nio.charset.StandardCharsets;
 
 import static org.eclipse.leshan.client.object.Security.psk;
@@ -55,13 +55,13 @@ public class PskLwm2mIntegrationTest extends AbstractSecurityLwM2MIntegrationTes
         Lwm2mDeviceProfileTransportConfiguration transportConfiguration = getTransportConfiguration(OBSERVE_ATTRIBUTES_WITHOUT_PARAMS, getBootstrapServerCredentialsSecure(PSK, NONE));
         LwM2MDeviceCredentials deviceCredentials = getDeviceCredentialsSecure(clientCredentials, null, null, PSK, false);
         this.basicTestConnection(security,
+                null,
                 deviceCredentials,
-                COAP_CONFIG,
                 clientEndpoint,
                 transportConfiguration,
                 "await on client state (Psk_Lwm2m)",
                 expectedStatusesRegistrationLwm2mSuccess,
-                false,
+                true,
                 ON_REGISTRATION_SUCCESS,
                 true);
     }
@@ -100,15 +100,14 @@ public class PskLwm2mIntegrationTest extends AbstractSecurityLwM2MIntegrationTes
                 Hex.decodeHex(keyPsk.toCharArray()));
         Lwm2mDeviceProfileTransportConfiguration transportConfiguration = getTransportConfiguration(OBSERVE_ATTRIBUTES_WITHOUT_PARAMS, getBootstrapServerCredentialsSecure(PSK, BOTH));
         LwM2MDeviceCredentials deviceCredentials = getDeviceCredentialsSecure(clientCredentials, null, null, PSK, false);
-        this.basicTestConnection(securityBs,
+        this.basicTestConnection(null, securityBs,
                 deviceCredentials,
-                COAP_CONFIG_BS,
                 clientEndpoint,
                 transportConfiguration,
                 "await on client state (PskBS two section)",
                 expectedStatusesRegistrationBsSuccess,
-                true,
+                false,
                 ON_REGISTRATION_SUCCESS,
-                true);
+                false);
     }
 }
diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/sql/RpkLwM2MIntegrationTest.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/sql/RpkLwM2MIntegrationTest.java
index c63bb38a76..b6ebfc442e 100644
--- a/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/sql/RpkLwM2MIntegrationTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/sql/RpkLwM2MIntegrationTest.java
@@ -25,7 +25,7 @@ import org.thingsboard.server.common.data.device.credentials.lwm2m.RPKClientCred
 import org.thingsboard.server.common.data.device.profile.Lwm2mDeviceProfileTransportConfiguration;
 import org.thingsboard.server.transport.lwm2m.security.AbstractSecurityLwM2MIntegrationTest;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import java.security.PrivateKey;
 import java.security.cert.X509Certificate;
 
@@ -49,21 +49,20 @@ public class RpkLwM2MIntegrationTest extends AbstractSecurityLwM2MIntegrationTes
         RPKClientCredential clientCredentials = new RPKClientCredential();
         clientCredentials.setEndpoint(clientEndpoint);
         clientCredentials.setKey(Base64.encodeBase64String(certificate.getPublicKey().getEncoded()));
-        Security securityBs = rpk(SECURE_URI,
+        Security security = rpk(SECURE_URI,
                 shortServerId,
                 certificate.getPublicKey().getEncoded(),
                 privateKey.getEncoded(),
                 serverX509Cert.getPublicKey().getEncoded());
         Lwm2mDeviceProfileTransportConfiguration transportConfiguration = getTransportConfiguration(OBSERVE_ATTRIBUTES_WITHOUT_PARAMS, getBootstrapServerCredentialsSecure(RPK, NONE));
         LwM2MDeviceCredentials deviceCredentials = getDeviceCredentialsSecure(clientCredentials, privateKey, certificate, RPK, false);
-        this.basicTestConnection(securityBs,
+        this.basicTestConnection(security, null,
                 deviceCredentials,
-                COAP_CONFIG,
                 clientEndpoint,
                 transportConfiguration,
                 "await on client state (Rpk_Lwm2m)",
                 expectedStatusesRegistrationLwm2mSuccess,
-                false,
+                true,
                 ON_REGISTRATION_SUCCESS,
                 true);
     }
@@ -117,14 +116,13 @@ public class RpkLwM2MIntegrationTest extends AbstractSecurityLwM2MIntegrationTes
                 serverX509CertBs.getPublicKey().getEncoded());
         Lwm2mDeviceProfileTransportConfiguration transportConfiguration = getTransportConfiguration(OBSERVE_ATTRIBUTES_WITHOUT_PARAMS, getBootstrapServerCredentialsSecure(RPK, BOTH));
         LwM2MDeviceCredentials deviceCredentials = getDeviceCredentialsSecure(clientCredentials, clientPrivateKeyFromCertTrust, certificate, RPK, false);
-        this.basicTestConnection(securityBs,
+        this.basicTestConnection(null, securityBs,
                 deviceCredentials,
-                COAP_CONFIG_BS,
                 clientEndpoint,
                 transportConfiguration,
                 "await on client state (RpkBS two section)",
                 expectedStatusesRegistrationBsSuccess,
-                true,
+                false,
                 ON_REGISTRATION_SUCCESS,
                 true);
     }
diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/sql/X509_NoTrustLwM2MIntegrationTest.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/sql/X509_NoTrustLwM2MIntegrationTest.java
index 8c0eb0ca2f..072dea9a6e 100644
--- a/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/sql/X509_NoTrustLwM2MIntegrationTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/sql/X509_NoTrustLwM2MIntegrationTest.java
@@ -15,19 +15,19 @@
  */
 package org.thingsboard.server.transport.lwm2m.security.sql;
 
+import jakarta.servlet.http.HttpServletResponse;
 import org.eclipse.leshan.client.object.Security;
 import org.eclipse.leshan.core.util.Hex;
 import org.junit.Test;
 import org.springframework.test.web.servlet.MvcResult;
-import org.springframework.util.Base64Utils;
 import org.thingsboard.server.common.data.device.credentials.lwm2m.LwM2MDeviceCredentials;
 import org.thingsboard.server.common.data.device.credentials.lwm2m.X509ClientCredential;
 import org.thingsboard.server.common.data.device.profile.Lwm2mDeviceProfileTransportConfiguration;
 import org.thingsboard.server.transport.lwm2m.security.AbstractSecurityLwM2MIntegrationTest;
 
-import javax.servlet.http.HttpServletResponse;
 import java.security.PrivateKey;
 import java.security.cert.X509Certificate;
+import java.util.Base64;
 
 import static org.eclipse.leshan.client.object.Security.x509;
 import static org.eclipse.leshan.client.object.Security.x509Bootstrap;
@@ -48,7 +48,7 @@ public class X509_NoTrustLwM2MIntegrationTest extends AbstractSecurityLwM2MInteg
         PrivateKey privateKey = clientPrivateKeyFromCertTrustNo;
         X509ClientCredential clientCredentials = new X509ClientCredential();
         clientCredentials.setEndpoint(clientEndpoint);
-        clientCredentials.setCert(Base64Utils.encodeToString(certificate.getEncoded()));
+        clientCredentials.setCert(Base64.getEncoder().encodeToString(certificate.getEncoded()));
         Security security = x509(SECURE_URI,
                 shortServerId,
                 certificate.getEncoded(),
@@ -57,13 +57,13 @@ public class X509_NoTrustLwM2MIntegrationTest extends AbstractSecurityLwM2MInteg
         Lwm2mDeviceProfileTransportConfiguration transportConfiguration = getTransportConfiguration(OBSERVE_ATTRIBUTES_WITHOUT_PARAMS, getBootstrapServerCredentialsSecure(X509, NONE));
         LwM2MDeviceCredentials deviceCredentials = getDeviceCredentialsSecure(clientCredentials, privateKey, certificate, X509, false);
         this.basicTestConnection(security,
+                null,
                 deviceCredentials,
-                COAP_CONFIG,
                 clientEndpoint,
                 transportConfiguration,
                 "await on client state (X509_Trust_Lwm2m)",
                 expectedStatusesRegistrationLwm2mSuccess,
-                false,
+                true,
                 ON_REGISTRATION_SUCCESS,
                 true);
     }
@@ -92,7 +92,7 @@ public class X509_NoTrustLwM2MIntegrationTest extends AbstractSecurityLwM2MInteg
         PrivateKey privateKey = clientPrivateKeyFromCertTrustNo;
         X509ClientCredential clientCredentials = new X509ClientCredential();
         clientCredentials.setEndpoint(clientEndpoint);
-        clientCredentials.setCert(Base64Utils.encodeToString(certificate.getEncoded()));
+        clientCredentials.setCert(Base64.getEncoder().encodeToString(certificate.getEncoded()));
         Lwm2mDeviceProfileTransportConfiguration transportConfiguration = getTransportConfiguration(OBSERVE_ATTRIBUTES_WITHOUT_PARAMS, getBootstrapServerCredentialsSecure(X509, NONE));
         LwM2MDeviceCredentials deviceCredentials = getDeviceCredentialsSecure(clientCredentials, privateKey, certificate, X509, true);
         createDeviceProfile(transportConfiguration);
@@ -110,7 +110,7 @@ public class X509_NoTrustLwM2MIntegrationTest extends AbstractSecurityLwM2MInteg
         PrivateKey privateKey = clientPrivateKeyFromCertTrustNo;
         X509ClientCredential clientCredentials = new X509ClientCredential();
         clientCredentials.setEndpoint(clientEndpoint);
-        clientCredentials.setCert(Base64Utils.encodeToString(certificate.getEncoded()));
+        clientCredentials.setCert(Base64.getEncoder().encodeToString(certificate.getEncoded()));
         Security security = x509Bootstrap(SECURE_URI_BS,
                 certificate.getEncoded(),
                 privateKey.getEncoded(),
@@ -118,13 +118,13 @@ public class X509_NoTrustLwM2MIntegrationTest extends AbstractSecurityLwM2MInteg
         Lwm2mDeviceProfileTransportConfiguration transportConfiguration = getTransportConfiguration(OBSERVE_ATTRIBUTES_WITHOUT_PARAMS, getBootstrapServerCredentialsSecure(X509, BOTH));
         LwM2MDeviceCredentials deviceCredentials = getDeviceCredentialsSecure(clientCredentials, privateKey, certificate, X509, false);
         this.basicTestConnection(security,
+                null,
                 deviceCredentials,
-                COAP_CONFIG_BS,
                 clientEndpoint,
                 transportConfiguration,
                 "await on client state (X509NoTrust two section)",
                 expectedStatusesRegistrationBsSuccess,
-                true,
+                false,
                 ON_REGISTRATION_SUCCESS,
                 true);
     }
diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/sql/X509_TrustLwM2MIntegrationTest.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/sql/X509_TrustLwM2MIntegrationTest.java
index ca3319f506..9bc1643902 100644
--- a/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/sql/X509_TrustLwM2MIntegrationTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/sql/X509_TrustLwM2MIntegrationTest.java
@@ -51,13 +51,13 @@ public class X509_TrustLwM2MIntegrationTest extends AbstractSecurityLwM2MIntegra
         Lwm2mDeviceProfileTransportConfiguration transportConfiguration = getTransportConfiguration(OBSERVE_ATTRIBUTES_WITHOUT_PARAMS, getBootstrapServerCredentialsSecure(X509, NONE));
         LwM2MDeviceCredentials deviceCredentials = getDeviceCredentialsSecure(clientCredentials, privateKey, certificate, X509, false);
         this.basicTestConnection(security,
+                null,
                 deviceCredentials,
-                COAP_CONFIG,
                 clientEndpoint,
                 transportConfiguration,
                 "await on client state (X509_Trust_Lwm2m)",
                 expectedStatusesRegistrationLwm2mSuccess,
-                false,
+                true,
                 ON_REGISTRATION_SUCCESS,
                 true);
     }
@@ -78,13 +78,13 @@ public class X509_TrustLwM2MIntegrationTest extends AbstractSecurityLwM2MIntegra
         Lwm2mDeviceProfileTransportConfiguration transportConfiguration = getTransportConfiguration(OBSERVE_ATTRIBUTES_WITHOUT_PARAMS, getBootstrapServerCredentialsSecure(X509, BOTH));
         LwM2MDeviceCredentials deviceCredentials = getDeviceCredentialsSecure(clientCredentials, privateKey, certificate, X509, false);
         this.basicTestConnection(security,
+                null,
                 deviceCredentials,
-                COAP_CONFIG_BS,
                 clientEndpoint,
                 transportConfiguration,
                 "await on client state (X509Trust two section)",
                 expectedStatusesRegistrationBsSuccess,
-                true,
+                false,
                 ON_REGISTRATION_SUCCESS,
                 true);
     }
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..f43144a24e 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"/>
@@ -31,12 +31,16 @@
     <!--    To reduce logs -->
     <logger name="org.apache.catalina.loader.WebappClassLoaderBase" level="ERROR" />
     <logger name="org.thingsboard.server.service.queue.DefaultTbClusterService" level="ERROR" />
+    <logger name="org.thingsboard.server.service.security.auth.jwt.settings.DefaultJwtSettingsService" level="ERROR" />
 
     <!-- Coap client context debug for the test scope -->
     <!--    <logger name="org.thingsboard.server.transport.coap.client.DefaultCoapClientContext" level="TRACE" />-->
 
     <!-- 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/application/src/test/resources/lwm2m/3.xml b/application/src/test/resources/lwm2m/3.xml
index 724fc4cb33..e71c2045c2 100644
--- a/application/src/test/resources/lwm2m/3.xml
+++ b/application/src/test/resources/lwm2m/3.xml
@@ -64,7 +64,7 @@ LEGAL DISCLAIMER
 		<ObjectID>3</ObjectID>
 		<ObjectURN>urn:oma:lwm2m:oma:3:1.0</ObjectURN>
 		<LWM2MVersion>1.1</LWM2MVersion>
-		<ObjectVersion>1.0</ObjectVersion>
+		<ObjectVersion>1.2</ObjectVersion>
 		<MultipleInstances>Single</MultipleInstances>
 		<Mandatory>Mandatory</Mandatory>
 		<Resources>
diff --git a/application/src/test/resources/lwm2m/5.xml b/application/src/test/resources/lwm2m/5.xml
index 5133f7d9ab..ddcea323b0 100644
--- a/application/src/test/resources/lwm2m/5.xml
+++ b/application/src/test/resources/lwm2m/5.xml
@@ -70,7 +70,7 @@ A LwM2M Server MUST support block-wise transfer. Other protocols, such as HTTP/H
 		<ObjectID>5</ObjectID>
 		<ObjectURN>urn:oma:lwm2m:oma:5</ObjectURN>
 		<LWM2MVersion>1.0</LWM2MVersion>
-		<ObjectVersion>1.0</ObjectVersion>
+		<ObjectVersion>1.2</ObjectVersion>
 		<MultipleInstances>Single</MultipleInstances>
 		<Mandatory>Optional</Mandatory>
 		<Resources>
diff --git a/application/src/test/resources/lwm2m/9.xml b/application/src/test/resources/lwm2m/9.xml
index 4186b1248d..7c78620d85 100644
--- a/application/src/test/resources/lwm2m/9.xml
+++ b/application/src/test/resources/lwm2m/9.xml
@@ -64,7 +64,7 @@ LEGAL DISCLAIMER
 		<ObjectID>9</ObjectID>
 		<ObjectURN>urn:oma:lwm2m:oma:9</ObjectURN>
 		<LWM2MVersion>1.0</LWM2MVersion>
-		<ObjectVersion>1.0</ObjectVersion>
+		<ObjectVersion>1.1</ObjectVersion>
 		<MultipleInstances>Multiple</MultipleInstances>
 		<Mandatory>Optional</Mandatory>
 		<Resources>
diff --git a/common/actor/pom.xml b/common/actor/pom.xml
index c0e13c2cbe..77ea283827 100644
--- a/common/actor/pom.xml
+++ b/common/actor/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.6.3-SNAPSHOT</version>
+        <version>3.7.0-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>
@@ -65,11 +65,6 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.awaitility</groupId>
             <artifactId>awaitility</artifactId>
diff --git a/common/actor/src/test/java/org/thingsboard/server/actors/ActorSystemTest.java b/common/actor/src/test/java/org/thingsboard/server/actors/ActorSystemTest.java
index ca68b1ef66..75bf5bab6e 100644
--- a/common/actor/src/test/java/org/thingsboard/server/actors/ActorSystemTest.java
+++ b/common/actor/src/test/java/org/thingsboard/server/actors/ActorSystemTest.java
@@ -16,12 +16,11 @@
 package org.thingsboard.server.actors;
 
 import lombok.extern.slf4j.Slf4j;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.awaitility.Awaitility;
+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.thingsboard.common.util.ThingsBoardExecutors;
 import org.thingsboard.common.util.ThingsBoardThreadFactory;
 import org.thingsboard.server.common.data.id.DeviceId;
@@ -37,29 +36,31 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 @Slf4j
-@RunWith(MockitoJUnitRunner.class)
 public class ActorSystemTest {
 
     public static final String ROOT_DISPATCHER = "root-dispatcher";
     private static final int _100K = 100 * 1024;
-    public static final int TIMEOUT_AWAIT_MAX_SEC = 100;
+    public static final int TIMEOUT_AWAIT_MAX_SEC = 30;
 
     private volatile TbActorSystem actorSystem;
     private volatile ExecutorService submitPool;
     private ExecutorService executor;
     private int parallelism;
 
-    @Before
+    @BeforeEach
     public void initActorSystem() {
         int cores = Runtime.getRuntime().availableProcessors();
         parallelism = Math.max(2, cores / 2);
+        log.debug("parallelism {}", parallelism);
         TbActorSystemSettings settings = new TbActorSystemSettings(5, parallelism, 42);
         actorSystem = new DefaultTbActorSystem(settings);
         submitPool = Executors.newFixedThreadPool(parallelism, ThingsBoardThreadFactory.forName(getClass().getSimpleName() + "-submit-test-scope")); //order guaranteed
     }
 
-    @After
+    @AfterEach
     public void shutdownActorSystem() {
         actorSystem.stop();
         submitPool.shutdownNow();
@@ -126,8 +127,8 @@ public class ActorSystemTest {
         actorId2.tell(new IntTbActorMsg(42));
         actorSystem.stop(actorId1);
 
-        Assert.assertTrue(testCtx2.getLatch().await(1, TimeUnit.SECONDS));
-        Assert.assertFalse(testCtx1.getLatch().await(1, TimeUnit.SECONDS));
+        Assertions.assertTrue(testCtx2.getLatch().await(1, TimeUnit.SECONDS));
+        Assertions.assertFalse(testCtx1.getLatch().await(1, TimeUnit.SECONDS));
     }
 
     @Test
@@ -136,25 +137,39 @@ public class ActorSystemTest {
         actorSystem.createDispatcher(ROOT_DISPATCHER, executor);
         ActorTestCtx testCtx1 = getActorTestCtx(1);
         ActorTestCtx testCtx2 = getActorTestCtx(1);
+        assertThat(testCtx1.getLatch().getCount()).as("testCtx1 latch initial state").isEqualTo(1);
+        assertThat(testCtx2.getLatch().getCount()).as("testCtx2 latch initial state").isEqualTo(1);
         TbActorId actorId = new TbEntityActorId(new DeviceId(UUID.randomUUID()));
         final CountDownLatch initLatch = new CountDownLatch(1);
         final CountDownLatch actorsReadyLatch = new CountDownLatch(2);
         submitPool.submit(() -> {
+            log.info("submit 1");
             actorSystem.createRootActor(ROOT_DISPATCHER, new SlowCreateActor.SlowCreateActorCreator(actorId, testCtx1, initLatch));
             actorsReadyLatch.countDown();
+            log.info("done 1");
         });
         submitPool.submit(() -> {
+            log.info("submit 2");
             actorSystem.createRootActor(ROOT_DISPATCHER, new SlowCreateActor.SlowCreateActorCreator(actorId, testCtx2, initLatch));
             actorsReadyLatch.countDown();
+            log.info("done 2");
         });
 
         initLatch.countDown(); //replacement for Thread.wait(500) in the SlowCreateActorCreator
-        Assert.assertTrue(actorsReadyLatch.await(TIMEOUT_AWAIT_MAX_SEC, TimeUnit.SECONDS));
-
+        Assertions.assertTrue(actorsReadyLatch.await(TIMEOUT_AWAIT_MAX_SEC, TimeUnit.SECONDS));
+        log.info("actorsReadyLatch ok");
         actorSystem.tell(actorId, new IntTbActorMsg(42));
 
-        Assert.assertTrue(testCtx1.getLatch().await(TIMEOUT_AWAIT_MAX_SEC, TimeUnit.SECONDS));
-        Assert.assertFalse(testCtx2.getLatch().await(1, TimeUnit.SECONDS));
+        //only one of two contexts are initialized. no matter Ctx1 or Ctx2
+        Awaitility.await("one of two actors latch zeroed").atMost(TIMEOUT_AWAIT_MAX_SEC, TimeUnit.SECONDS)
+                        .until(() -> testCtx1.getLatch().getCount() + testCtx2.getLatch().getCount() == 1);
+        Thread.yield();
+        if (testCtx1.getLatch().getCount() == 0) {
+            assertThat(testCtx2.getLatch().await(100, TimeUnit.MILLISECONDS)).as("testCtx2 never latched").isFalse();
+        } else {
+            assertThat(testCtx1.getLatch().await(100, TimeUnit.MILLISECONDS)).as("testCtx1 never latched").isFalse();
+        }
+
     }
 
     @Test
@@ -173,13 +188,13 @@ public class ActorSystemTest {
             });
         }
         initLatch.countDown();
-        Assert.assertTrue(actorsReadyLatch.await(TIMEOUT_AWAIT_MAX_SEC, TimeUnit.SECONDS));
+        Assertions.assertTrue(actorsReadyLatch.await(TIMEOUT_AWAIT_MAX_SEC, TimeUnit.SECONDS));
 
         actorSystem.tell(actorId, new IntTbActorMsg(42));
 
-        Assert.assertTrue(testCtx.getLatch().await(TIMEOUT_AWAIT_MAX_SEC, TimeUnit.SECONDS));
+        Assertions.assertTrue(testCtx.getLatch().await(TIMEOUT_AWAIT_MAX_SEC, TimeUnit.SECONDS));
         //One for creation and one for message
-        Assert.assertEquals(2, testCtx.getInvocationCount().get());
+        Assertions.assertEquals(2, testCtx.getInvocationCount().get());
     }
 
     @Test
@@ -197,9 +212,9 @@ public class ActorSystemTest {
         actorId1.tell(new IntTbActorMsg(42));
         actorId2.tell(new IntTbActorMsg(42));
 
-        Assert.assertFalse(testCtx1.getLatch().await(2, TimeUnit.SECONDS));
-        Assert.assertTrue(testCtx2.getLatch().await(1, TimeUnit.SECONDS));
-        Assert.assertTrue(testCtx1.getLatch().await(3, TimeUnit.SECONDS));
+        Assertions.assertFalse(testCtx1.getLatch().await(2, TimeUnit.SECONDS));
+        Assertions.assertTrue(testCtx2.getLatch().await(1, TimeUnit.SECONDS));
+        Assertions.assertTrue(testCtx1.getLatch().await(3, TimeUnit.SECONDS));
     }
 
 
@@ -233,16 +248,16 @@ public class ActorSystemTest {
             log.info("Submitted all messages");
             testCtxes.forEach(ctx -> {
                 try {
-                    boolean success = ctx.getLatch().await(1, TimeUnit.MINUTES);
+                    boolean success = ctx.getLatch().await(TIMEOUT_AWAIT_MAX_SEC, TimeUnit.SECONDS);
                     if (!success) {
                         log.warn("Failed: {}, {}", ctx.getActual().get(), ctx.getInvocationCount().get());
                     }
-                    Assert.assertTrue(success);
-                    Assert.assertEquals(expected, ctx.getActual().get());
-                    Assert.assertEquals(msgNumber, ctx.getInvocationCount().get());
+                    Assertions.assertTrue(success);
+                    Assertions.assertEquals(expected, ctx.getActual().get());
+                    Assertions.assertEquals(msgNumber, ctx.getInvocationCount().get());
                     ctx.clear();
                 } catch (InterruptedException e) {
-                    e.printStackTrace();
+                    log.error("interrupted", e);
                 }
             });
             long duration = System.nanoTime() - start;
diff --git a/common/actor/src/test/java/org/thingsboard/server/actors/SlowCreateActor.java b/common/actor/src/test/java/org/thingsboard/server/actors/SlowCreateActor.java
index 332224095f..77893ec625 100644
--- a/common/actor/src/test/java/org/thingsboard/server/actors/SlowCreateActor.java
+++ b/common/actor/src/test/java/org/thingsboard/server/actors/SlowCreateActor.java
@@ -28,11 +28,13 @@ public class SlowCreateActor extends TestRootActor {
     public SlowCreateActor(TbActorId actorId, ActorTestCtx testCtx, CountDownLatch initLatch) {
         super(actorId, testCtx);
         try {
+            log.info("awaiting on latch {} ...", initLatch);
             initLatch.await(TIMEOUT_AWAIT_MAX_MS, TimeUnit.MILLISECONDS);
         } catch (InterruptedException e) {
-            e.printStackTrace();
+            log.error("interrupted", e);
         }
         testCtx.getInvocationCount().incrementAndGet();
+        log.info("finished {} ...", initLatch);
     }
 
     public static class SlowCreateActorCreator implements TbActorCreator {
@@ -54,7 +56,10 @@ public class SlowCreateActor extends TestRootActor {
 
         @Override
         public TbActor createActor() {
-            return new SlowCreateActor(actorId, testCtx, initLatch);
+            log.info("creating slow actor...");
+            SlowCreateActor slowCreateActor = new SlowCreateActor(actorId, testCtx, initLatch);
+            log.info("created slow actor {}", slowCreateActor);
+            return slowCreateActor;
         }
     }
 }
diff --git a/common/actor/src/test/resources/junit-platform.properties b/common/actor/src/test/resources/junit-platform.properties
new file mode 100644
index 0000000000..f2ed301920
--- /dev/null
+++ b/common/actor/src/test/resources/junit-platform.properties
@@ -0,0 +1,3 @@
+junit.jupiter.execution.parallel.enabled = true
+junit.jupiter.execution.parallel.mode.default = concurrent
+junit.jupiter.execution.parallel.mode.classes.default = concurrent
diff --git a/common/actor/src/test/resources/logback.xml b/common/actor/src/test/resources/logback-test.xml
similarity index 100%
rename from common/actor/src/test/resources/logback.xml
rename to common/actor/src/test/resources/logback-test.xml
diff --git a/common/cache/pom.xml b/common/cache/pom.xml
index 184aa615ba..8a95b2a16d 100644
--- a/common/cache/pom.xml
+++ b/common/cache/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.6.3-SNAPSHOT</version>
+        <version>3.7.0-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>
@@ -44,6 +44,14 @@
             <groupId>org.thingsboard.common</groupId>
             <artifactId>message</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.thingsboard.common</groupId>
+            <artifactId>util</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.thingsboard.common</groupId>
+            <artifactId>proto</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-autoconfigure</artifactId>
@@ -61,8 +69,8 @@
             <artifactId>caffeine</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -89,11 +97,6 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.awaitility</groupId>
             <artifactId>awaitility</artifactId>
diff --git a/common/cache/src/main/java/org/thingsboard/server/cache/CacheSpecsMap.java b/common/cache/src/main/java/org/thingsboard/server/cache/CacheSpecsMap.java
index c3fce20ebe..583a871fe1 100644
--- a/common/cache/src/main/java/org/thingsboard/server/cache/CacheSpecsMap.java
+++ b/common/cache/src/main/java/org/thingsboard/server/cache/CacheSpecsMap.java
@@ -22,7 +22,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
 import org.thingsboard.server.common.data.CacheConstants;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import java.util.Map;
 
 @Configuration
diff --git a/common/cache/src/main/java/org/thingsboard/server/cache/RedisSslCredentials.java b/common/cache/src/main/java/org/thingsboard/server/cache/RedisSslCredentials.java
new file mode 100644
index 0000000000..aeac975d15
--- /dev/null
+++ b/common/cache/src/main/java/org/thingsboard/server/cache/RedisSslCredentials.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.cache;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@ConfigurationProperties(prefix = "redis.ssl.credentials")
+@Data
+public class RedisSslCredentials {
+
+    private String certFile;
+
+    private String userCertFile;
+
+    private String userKeyFile;
+}
diff --git a/common/cache/src/main/java/org/thingsboard/server/cache/RedisTbTransactionalCache.java b/common/cache/src/main/java/org/thingsboard/server/cache/RedisTbTransactionalCache.java
index 9082d9c5a2..abfbb398c9 100644
--- a/common/cache/src/main/java/org/thingsboard/server/cache/RedisTbTransactionalCache.java
+++ b/common/cache/src/main/java/org/thingsboard/server/cache/RedisTbTransactionalCache.java
@@ -29,6 +29,7 @@ import org.springframework.data.redis.core.types.Expiration;
 import org.springframework.data.redis.serializer.RedisSerializer;
 import org.springframework.data.redis.serializer.StringRedisSerializer;
 import org.thingsboard.server.common.data.FstStatsService;
+import redis.clients.jedis.Connection;
 import redis.clients.jedis.Jedis;
 import redis.clients.jedis.JedisPool;
 import redis.clients.jedis.util.JedisClusterCRC16;
@@ -159,7 +160,7 @@ public abstract class RedisTbTransactionalCache<K extends Serializable, V extend
         RedisConnection connection = connectionFactory.getClusterConnection();
 
         int slotNum = JedisClusterCRC16.getSlot(rawKey);
-        Jedis jedis = ((JedisClusterConnection) connection).getNativeConnection().getConnectionFromSlot(slotNum);
+        Jedis jedis = new Jedis((((JedisClusterConnection) connection).getNativeConnection().getConnectionFromSlot(slotNum)));
 
         JedisConnection jedisConnection = new JedisConnection(jedis, MOCK_POOL, jedis.getDB());
         jedisConnection.setConvertPipelineAndTxResults(connectionFactory.getConvertPipelineAndTxResults());
diff --git a/common/cache/src/main/java/org/thingsboard/server/cache/TBRedisCacheConfiguration.java b/common/cache/src/main/java/org/thingsboard/server/cache/TBRedisCacheConfiguration.java
index 1a5f3fa83f..c3d3655883 100644
--- a/common/cache/src/main/java/org/thingsboard/server/cache/TBRedisCacheConfiguration.java
+++ b/common/cache/src/main/java/org/thingsboard/server/cache/TBRedisCacheConfiguration.java
@@ -16,6 +16,8 @@
 package org.thingsboard.server.cache;
 
 import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.cache.CacheManager;
@@ -31,10 +33,25 @@ import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.format.support.DefaultFormattingConversionService;
 import org.springframework.util.Assert;
+import org.thingsboard.common.util.SslUtil;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.id.EntityId;
 import redis.clients.jedis.JedisPoolConfig;
 
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSocketFactory;
+import javax.net.ssl.TrustManagerFactory;
+import java.io.IOException;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.PrivateKey;
+import java.security.cert.CertPath;
+import java.security.cert.Certificate;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -44,6 +61,7 @@ import java.util.List;
 @ConditionalOnProperty(prefix = "cache", value = "type", havingValue = "redis")
 @EnableCaching
 @Data
+@Slf4j
 public abstract class TBRedisCacheConfiguration {
 
     private static final String COMMA = ",";
@@ -85,11 +103,17 @@ public abstract class TBRedisCacheConfiguration {
     @Value("${redis.pool_config.blockWhenExhausted:true}")
     private boolean blockWhenExhausted;
 
+    @Value("${redis.ssl.enabled:false}")
+    private boolean sslEnabled;
+
     @Bean
     public RedisConnectionFactory redisConnectionFactory() {
         return loadFactory();
     }
 
+    @Autowired
+    private RedisSslCredentials redisSslCredentials;
+
     protected abstract JedisConnectionFactory loadFactory();
 
     /**
@@ -149,4 +173,59 @@ public abstract class TBRedisCacheConfiguration {
         }
         return result;
     }
+
+    protected SSLSocketFactory createSslSocketFactory() {
+        try {
+            SSLContext sslContext = SSLContext.getInstance("TLS");
+            KeyManagerFactory keyManagerFactory = createAndInitKeyManagerFactory();
+            TrustManagerFactory trustManagerFactory = createAndInitTrustManagerFactory();
+            sslContext.init(keyManagerFactory == null ? null : keyManagerFactory.getKeyManagers(), trustManagerFactory.getTrustManagers(), null);
+            return sslContext.getSocketFactory();
+        } catch (Exception e) {
+            throw new RuntimeException("Creating TLS factory failed!", e);
+        }
+    }
+
+    private TrustManagerFactory createAndInitTrustManagerFactory() throws Exception {
+            List<X509Certificate> caCerts = SslUtil.readCertFileByPath(redisSslCredentials.getCertFile());
+            KeyStore caKeyStore = KeyStore.getInstance(KeyStore.getDefaultType());
+            caKeyStore.load(null, null);
+            for (X509Certificate caCert : caCerts) {
+                caKeyStore.setCertificateEntry("redis-caCert-cert-" + caCert.getSubjectX500Principal().getName(), caCert);
+            }
+
+            TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+            trustManagerFactory.init(caKeyStore);
+            return trustManagerFactory;
+    }
+
+    private KeyManagerFactory createAndInitKeyManagerFactory() throws Exception {
+        KeyManagerFactory kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
+        kmf.init(loadKeyStore(), null);
+        return kmf;
+    }
+
+    private KeyStore loadKeyStore() throws KeyStoreException, IOException, NoSuchAlgorithmException, CertificateException {
+        if (redisSslCredentials.getUserCertFile().isBlank() || redisSslCredentials.getUserKeyFile().isBlank()) {
+            return null;
+        }
+        List<X509Certificate> certificates = SslUtil.readCertFileByPath(redisSslCredentials.getCertFile());
+        PrivateKey privateKey = SslUtil.readPrivateKeyByFilePath(redisSslCredentials.getUserKeyFile(), null);
+
+        KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
+        keyStore.load(null);
+        List<X509Certificate> unique = certificates.stream().distinct().toList();
+        for (X509Certificate cert : unique) {
+            keyStore.setCertificateEntry("redis-cert" + cert.getSubjectX500Principal().getName(), cert);
+        }
+
+        if (privateKey != null) {
+            CertificateFactory factory = CertificateFactory.getInstance("X.509");
+            CertPath certPath = factory.generateCertPath(certificates);
+            List<? extends Certificate> path = certPath.getCertificates();
+            Certificate[] x509Certificates = path.toArray(new Certificate[0]);
+            keyStore.setKeyEntry("redis-private-key", privateKey, null, x509Certificates);
+        }
+        return keyStore;
+    }
 }
diff --git a/common/cache/src/main/java/org/thingsboard/server/cache/TBRedisClusterConfiguration.java b/common/cache/src/main/java/org/thingsboard/server/cache/TBRedisClusterConfiguration.java
index fe10e43221..7d8d210c86 100644
--- a/common/cache/src/main/java/org/thingsboard/server/cache/TBRedisClusterConfiguration.java
+++ b/common/cache/src/main/java/org/thingsboard/server/cache/TBRedisClusterConfiguration.java
@@ -20,6 +20,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.redis.connection.RedisClusterConfiguration;
+import org.springframework.data.redis.connection.jedis.JedisClientConfiguration;
 import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
 
 @Configuration
@@ -39,15 +40,29 @@ public class TBRedisClusterConfiguration extends TBRedisCacheConfiguration {
     @Value("${redis.password:}")
     private String password;
 
+    @Value("${redis.ssl.enabled:false}")
+    private boolean useSsl;
+
     public JedisConnectionFactory loadFactory() {
         RedisClusterConfiguration clusterConfiguration = new RedisClusterConfiguration();
         clusterConfiguration.setClusterNodes(getNodes(clusterNodes));
         clusterConfiguration.setMaxRedirects(maxRedirects);
         clusterConfiguration.setPassword(password);
-        if (useDefaultPoolConfig) {
-            return new JedisConnectionFactory(clusterConfiguration);
-        } else {
-            return new JedisConnectionFactory(clusterConfiguration, buildPoolConfig());
+        return new JedisConnectionFactory(clusterConfiguration, buildClientConfig());
+    }
+
+    private JedisClientConfiguration buildClientConfig() {
+        JedisClientConfiguration.JedisClientConfigurationBuilder jedisClientConfigurationBuilder = JedisClientConfiguration.builder();
+        if (!useDefaultPoolConfig) {
+            jedisClientConfigurationBuilder
+                    .usePooling()
+                    .poolConfig(buildPoolConfig());
+        }
+        if (useSsl) {
+            jedisClientConfigurationBuilder
+                    .useSsl()
+                    .sslSocketFactory(createSslSocketFactory());
         }
+        return jedisClientConfigurationBuilder.build();
     }
 }
diff --git a/common/cache/src/main/java/org/thingsboard/server/cache/TBRedisSentinelConfiguration.java b/common/cache/src/main/java/org/thingsboard/server/cache/TBRedisSentinelConfiguration.java
index 1a34e6f5f6..61fa5c2ec9 100644
--- a/common/cache/src/main/java/org/thingsboard/server/cache/TBRedisSentinelConfiguration.java
+++ b/common/cache/src/main/java/org/thingsboard/server/cache/TBRedisSentinelConfiguration.java
@@ -20,6 +20,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.redis.connection.RedisSentinelConfiguration;
+import org.springframework.data.redis.connection.jedis.JedisClientConfiguration;
 import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
 
 @Configuration
@@ -42,6 +43,9 @@ public class TBRedisSentinelConfiguration extends TBRedisCacheConfiguration {
     @Value("${redis.db:}")
     private Integer database;
 
+    @Value("${redis.ssl.enabled:false}")
+    private boolean useSsl;
+
     @Value("${redis.password:}")
     private String password;
 
@@ -52,11 +56,21 @@ public class TBRedisSentinelConfiguration extends TBRedisCacheConfiguration {
         redisSentinelConfiguration.setSentinelPassword(sentinelPassword);
         redisSentinelConfiguration.setPassword(password);
         redisSentinelConfiguration.setDatabase(database);
-        if (useDefaultPoolConfig) {
-            return new JedisConnectionFactory(redisSentinelConfiguration);
-        } else {
-            return new JedisConnectionFactory(redisSentinelConfiguration, buildPoolConfig());
-        }
+        return new JedisConnectionFactory(redisSentinelConfiguration,  buildClientConfig());
     }
 
+    private JedisClientConfiguration buildClientConfig() {
+        JedisClientConfiguration.JedisClientConfigurationBuilder jedisClientConfigurationBuilder = JedisClientConfiguration.builder();
+        if (!useDefaultPoolConfig) {
+            jedisClientConfigurationBuilder
+                    .usePooling()
+                    .poolConfig(buildPoolConfig());
+        }
+        if (useSsl) {
+            jedisClientConfigurationBuilder
+                    .useSsl()
+                    .sslSocketFactory(createSslSocketFactory());
+        }
+        return jedisClientConfigurationBuilder.build();
+    }
 }
diff --git a/common/cache/src/main/java/org/thingsboard/server/cache/TBRedisStandaloneConfiguration.java b/common/cache/src/main/java/org/thingsboard/server/cache/TBRedisStandaloneConfiguration.java
index c14cde2c38..d4235e3662 100644
--- a/common/cache/src/main/java/org/thingsboard/server/cache/TBRedisStandaloneConfiguration.java
+++ b/common/cache/src/main/java/org/thingsboard/server/cache/TBRedisStandaloneConfiguration.java
@@ -57,32 +57,36 @@ public class TBRedisStandaloneConfiguration extends TBRedisCacheConfiguration {
     @Value("${redis.password:}")
     private String password;
 
+    @Value("${redis.ssl.enabled:false}")
+    private boolean useSsl;
+
     public JedisConnectionFactory loadFactory() {
         RedisStandaloneConfiguration standaloneConfiguration = new RedisStandaloneConfiguration();
         standaloneConfiguration.setHostName(host);
         standaloneConfiguration.setPort(port);
         standaloneConfiguration.setDatabase(db);
         standaloneConfiguration.setPassword(password);
-        if (useDefaultClientConfig) {
-            return new JedisConnectionFactory(standaloneConfiguration);
-        } else {
-            return new JedisConnectionFactory(standaloneConfiguration, buildClientConfig());
-        }
+        return new JedisConnectionFactory(standaloneConfiguration, buildClientConfig());
     }
 
     private JedisClientConfiguration buildClientConfig() {
-        if (usePoolConfig) {
-            return JedisClientConfiguration.builder()
-                    .clientName(clientName)
-                    .connectTimeout(Duration.ofMillis(connectTimeout))
-                    .readTimeout(Duration.ofMillis(readTimeout))
-                    .usePooling().poolConfig(buildPoolConfig())
-                    .build();
-        } else {
-            return JedisClientConfiguration.builder()
+        JedisClientConfiguration.JedisClientConfigurationBuilder jedisClientConfigurationBuilder = JedisClientConfiguration.builder();
+        if (!useDefaultClientConfig) {
+            jedisClientConfigurationBuilder
                     .clientName(clientName)
                     .connectTimeout(Duration.ofMillis(connectTimeout))
-                    .readTimeout(Duration.ofMillis(readTimeout)).build();
+                    .readTimeout(Duration.ofMillis(readTimeout));
+        }
+        if (useSsl) {
+            jedisClientConfigurationBuilder
+                    .useSsl()
+                    .sslSocketFactory(createSslSocketFactory());
+        }
+        if (usePoolConfig) {
+            jedisClientConfigurationBuilder
+                    .usePooling()
+                    .poolConfig(buildPoolConfig());
         }
+        return jedisClientConfigurationBuilder.build();
     }
-}
\ No newline at end of file
+}
diff --git a/common/cache/src/main/java/org/thingsboard/server/cache/TbFSTRedisSerializer.java b/common/cache/src/main/java/org/thingsboard/server/cache/TbJsonRedisSerializer.java
similarity index 67%
rename from common/cache/src/main/java/org/thingsboard/server/cache/TbFSTRedisSerializer.java
rename to common/cache/src/main/java/org/thingsboard/server/cache/TbJsonRedisSerializer.java
index 4dead7e7f6..a1e2738e65 100644
--- a/common/cache/src/main/java/org/thingsboard/server/cache/TbFSTRedisSerializer.java
+++ b/common/cache/src/main/java/org/thingsboard/server/cache/TbJsonRedisSerializer.java
@@ -16,17 +16,23 @@
 package org.thingsboard.server.cache;
 
 import org.springframework.data.redis.serializer.SerializationException;
-import org.thingsboard.server.common.data.FSTUtils;
+import org.thingsboard.common.util.JacksonUtil;
 
-public class TbFSTRedisSerializer<K, V> implements TbRedisSerializer<K, V> {
+public class TbJsonRedisSerializer<K, V> implements TbRedisSerializer<K, V> {
+
+    private final Class<V> clazz;
+
+    public TbJsonRedisSerializer(Class<V> clazz) {
+        this.clazz = clazz;
+    }
 
     @Override
-    public byte[] serialize(V value) throws SerializationException {
-        return FSTUtils.encode(value);
+    public byte[] serialize(V v) throws SerializationException {
+        return JacksonUtil.writeValueAsBytes(v);
     }
 
     @Override
     public V deserialize(K key, byte[] bytes) throws SerializationException {
-        return FSTUtils.decode(bytes);
+        return JacksonUtil.fromBytes(bytes, clazz);
     }
 }
diff --git a/common/cache/src/main/java/org/thingsboard/server/cache/TbTypedJsonRedisSerializer.java b/common/cache/src/main/java/org/thingsboard/server/cache/TbTypedJsonRedisSerializer.java
new file mode 100644
index 0000000000..d892bcca2a
--- /dev/null
+++ b/common/cache/src/main/java/org/thingsboard/server/cache/TbTypedJsonRedisSerializer.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.cache;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import org.springframework.data.redis.serializer.SerializationException;
+import org.thingsboard.common.util.JacksonUtil;
+
+public class TbTypedJsonRedisSerializer<K, V> implements TbRedisSerializer<K, V> {
+
+    private final TypeReference<V> valueTypeRef;
+
+    public TbTypedJsonRedisSerializer(TypeReference<V> valueTypeRef) {
+        this.valueTypeRef = valueTypeRef;
+    }
+
+    @Override
+    public byte[] serialize(V v) throws SerializationException {
+        return JacksonUtil.writeValueAsBytes(v);
+    }
+
+    @Override
+    public V deserialize(K key, byte[] bytes) throws SerializationException {
+        return JacksonUtil.fromBytes(bytes, valueTypeRef);
+    }
+}
diff --git a/common/cache/src/main/java/org/thingsboard/server/cache/device/DeviceRedisCache.java b/common/cache/src/main/java/org/thingsboard/server/cache/device/DeviceRedisCache.java
index 716032554e..03eea82f09 100644
--- a/common/cache/src/main/java/org/thingsboard/server/cache/device/DeviceRedisCache.java
+++ b/common/cache/src/main/java/org/thingsboard/server/cache/device/DeviceRedisCache.java
@@ -15,21 +15,40 @@
  */
 package org.thingsboard.server.cache.device;
 
+import com.google.protobuf.InvalidProtocolBufferException;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.serializer.SerializationException;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.cache.CacheSpecsMap;
 import org.thingsboard.server.cache.RedisTbTransactionalCache;
 import org.thingsboard.server.cache.TBRedisCacheConfiguration;
-import org.thingsboard.server.cache.TbFSTRedisSerializer;
+import org.thingsboard.server.cache.TbRedisSerializer;
 import org.thingsboard.server.common.data.CacheConstants;
 import org.thingsboard.server.common.data.Device;
+import org.thingsboard.server.common.util.ProtoUtils;
+import org.thingsboard.server.gen.transport.TransportProtos;
 
 @ConditionalOnProperty(prefix = "cache", value = "type", havingValue = "redis")
 @Service("DeviceCache")
 public class DeviceRedisCache extends RedisTbTransactionalCache<DeviceCacheKey, Device> {
 
     public DeviceRedisCache(TBRedisCacheConfiguration configuration, CacheSpecsMap cacheSpecsMap, RedisConnectionFactory connectionFactory) {
-        super(CacheConstants.DEVICE_CACHE, cacheSpecsMap, connectionFactory, configuration, new TbFSTRedisSerializer<>());
+        super(CacheConstants.DEVICE_CACHE, cacheSpecsMap, connectionFactory, configuration, new TbRedisSerializer<>() {
+
+            @Override
+            public byte[] serialize(Device device) throws SerializationException {
+                return ProtoUtils.toProto(device).toByteArray();
+            }
+
+            @Override
+            public Device deserialize(DeviceCacheKey key, byte[] bytes) throws SerializationException {
+                try {
+                    return ProtoUtils.fromProto(TransportProtos.DeviceProto.parseFrom(bytes));
+                } catch (InvalidProtocolBufferException e) {
+                    throw new SerializationException(e.getMessage());
+                }
+            }
+        });
     }
 }
diff --git a/common/cache/src/main/java/org/thingsboard/server/cache/resourceInfo/ResourceInfoRedisCache.java b/common/cache/src/main/java/org/thingsboard/server/cache/resourceInfo/ResourceInfoRedisCache.java
index 6ca9d46bd2..a74bda05e8 100644
--- a/common/cache/src/main/java/org/thingsboard/server/cache/resourceInfo/ResourceInfoRedisCache.java
+++ b/common/cache/src/main/java/org/thingsboard/server/cache/resourceInfo/ResourceInfoRedisCache.java
@@ -21,7 +21,7 @@ import org.springframework.stereotype.Service;
 import org.thingsboard.server.cache.CacheSpecsMap;
 import org.thingsboard.server.cache.RedisTbTransactionalCache;
 import org.thingsboard.server.cache.TBRedisCacheConfiguration;
-import org.thingsboard.server.cache.TbFSTRedisSerializer;
+import org.thingsboard.server.cache.TbJsonRedisSerializer;
 import org.thingsboard.server.common.data.CacheConstants;
 import org.thingsboard.server.common.data.TbResourceInfo;
 
@@ -30,6 +30,6 @@ import org.thingsboard.server.common.data.TbResourceInfo;
 public class ResourceInfoRedisCache extends RedisTbTransactionalCache<ResourceInfoCacheKey, TbResourceInfo> {
 
     public ResourceInfoRedisCache(TBRedisCacheConfiguration configuration, CacheSpecsMap cacheSpecsMap, RedisConnectionFactory connectionFactory) {
-        super(CacheConstants.RESOURCE_INFO_CACHE, cacheSpecsMap, connectionFactory, configuration, new TbFSTRedisSerializer<>());
+        super(CacheConstants.RESOURCE_INFO_CACHE, cacheSpecsMap, connectionFactory, configuration, new TbJsonRedisSerializer<>(TbResourceInfo.class));
     }
 }
diff --git a/common/cache/src/main/java/org/thingsboard/server/cache/usersUpdateTime/UsersSessionInvalidationRedisCache.java b/common/cache/src/main/java/org/thingsboard/server/cache/usersUpdateTime/UsersSessionInvalidationRedisCache.java
index 97df969203..cf6b69b9fa 100644
--- a/common/cache/src/main/java/org/thingsboard/server/cache/usersUpdateTime/UsersSessionInvalidationRedisCache.java
+++ b/common/cache/src/main/java/org/thingsboard/server/cache/usersUpdateTime/UsersSessionInvalidationRedisCache.java
@@ -22,7 +22,7 @@ import org.springframework.stereotype.Service;
 import org.thingsboard.server.cache.CacheSpecsMap;
 import org.thingsboard.server.cache.RedisTbTransactionalCache;
 import org.thingsboard.server.cache.TBRedisCacheConfiguration;
-import org.thingsboard.server.cache.TbFSTRedisSerializer;
+import org.thingsboard.server.cache.TbJsonRedisSerializer;
 import org.thingsboard.server.common.data.CacheConstants;
 
 @ConditionalOnProperty(prefix = "cache", value = "type", havingValue = "redis")
@@ -31,6 +31,6 @@ public class UsersSessionInvalidationRedisCache extends RedisTbTransactionalCach
 
     @Autowired
     public UsersSessionInvalidationRedisCache(TBRedisCacheConfiguration configuration, CacheSpecsMap cacheSpecsMap, RedisConnectionFactory connectionFactory) {
-        super(CacheConstants.USERS_SESSION_INVALIDATION_CACHE, cacheSpecsMap, connectionFactory, configuration, new TbFSTRedisSerializer<>());
+        super(CacheConstants.USERS_SESSION_INVALIDATION_CACHE, cacheSpecsMap, connectionFactory, configuration, new TbJsonRedisSerializer<>(Long.class));
     }
 }
diff --git a/common/cache/src/test/resources/junit-platform.properties b/common/cache/src/test/resources/junit-platform.properties
new file mode 100644
index 0000000000..f2ed301920
--- /dev/null
+++ b/common/cache/src/test/resources/junit-platform.properties
@@ -0,0 +1,3 @@
+junit.jupiter.execution.parallel.enabled = true
+junit.jupiter.execution.parallel.mode.default = concurrent
+junit.jupiter.execution.parallel.mode.classes.default = concurrent
diff --git a/common/cache/src/test/resources/logback.xml b/common/cache/src/test/resources/logback-test.xml
similarity index 100%
rename from common/cache/src/test/resources/logback.xml
rename to common/cache/src/test/resources/logback-test.xml
diff --git a/common/cluster-api/pom.xml b/common/cluster-api/pom.xml
index 792db2c6bb..eda43510b5 100644
--- a/common/cluster-api/pom.xml
+++ b/common/cluster-api/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.6.3-SNAPSHOT</version>
+        <version>3.7.0-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>
@@ -57,11 +57,11 @@
             <artifactId>guava</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.github.fge</groupId>
+            <groupId>com.github.java-json-tools</groupId>
             <artifactId>json-schema-validator</artifactId>
         </dependency>
         <dependency>
@@ -109,11 +109,6 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.awaitility</groupId>
             <artifactId>awaitility</artifactId>
@@ -123,10 +118,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.xolstice.maven.plugins</groupId>
-                <artifactId>protobuf-maven-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
diff --git a/common/cluster-api/src/main/java/org/thingsboard/server/cluster/TbClusterService.java b/common/cluster-api/src/main/java/org/thingsboard/server/cluster/TbClusterService.java
index 93c8f314bf..301ef69dcc 100644
--- a/common/cluster-api/src/main/java/org/thingsboard/server/cluster/TbClusterService.java
+++ b/common/cluster-api/src/main/java/org/thingsboard/server/cluster/TbClusterService.java
@@ -19,6 +19,7 @@ import org.thingsboard.server.common.data.ApiUsageState;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.TbResource;
+import org.thingsboard.server.common.data.TbResourceInfo;
 import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.common.data.TenantProfile;
 import org.thingsboard.server.common.data.edge.EdgeEventActionType;
@@ -67,7 +68,7 @@ public interface TbClusterService extends TbQueueClusterService {
 
     void broadcastEntityStateChangeEvent(TenantId tenantId, EntityId entityId, ComponentLifecycleEvent state);
 
-    void onDeviceProfileChange(DeviceProfile deviceProfile, TbQueueCallback callback);
+    void onDeviceProfileChange(DeviceProfile deviceProfile, DeviceProfile oldDeviceProfile, TbQueueCallback callback);
 
     void onDeviceProfileDelete(DeviceProfile deviceProfile, TbQueueCallback callback);
 
@@ -87,9 +88,9 @@ public interface TbClusterService extends TbQueueClusterService {
 
     void onDeviceAssignedToTenant(TenantId oldTenantId, Device device);
 
-    void onResourceChange(TbResource resource, TbQueueCallback callback);
+    void onResourceChange(TbResourceInfo resource, TbQueueCallback callback);
 
-    void onResourceDeleted(TbResource resource, TbQueueCallback callback);
+    void onResourceDeleted(TbResourceInfo resource, TbQueueCallback callback);
 
     void onEdgeEventUpdate(TenantId tenantId, EdgeId edgeId);
 
diff --git a/common/coap-server/pom.xml b/common/coap-server/pom.xml
index 036ab0908d..59640b586d 100644
--- a/common/coap-server/pom.xml
+++ b/common/coap-server/pom.xml
@@ -22,7 +22,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.6.3-SNAPSHOT</version>
+        <version>3.7.0-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>
@@ -67,6 +67,16 @@
             <groupId>org.eclipse.californium</groupId>
             <artifactId>scandium</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
 
diff --git a/common/coap-server/src/main/java/org/thingsboard/server/coapserver/DefaultCoapServerService.java b/common/coap-server/src/main/java/org/thingsboard/server/coapserver/DefaultCoapServerService.java
index de5c848789..0eca05aab2 100644
--- a/common/coap-server/src/main/java/org/thingsboard/server/coapserver/DefaultCoapServerService.java
+++ b/common/coap-server/src/main/java/org/thingsboard/server/coapserver/DefaultCoapServerService.java
@@ -27,8 +27,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.thingsboard.common.util.ThingsBoardThreadFactory;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.UnknownHostException;
diff --git a/common/coap-server/src/main/java/org/thingsboard/server/coapserver/TbCoapDtlsSettings.java b/common/coap-server/src/main/java/org/thingsboard/server/coapserver/TbCoapDtlsSettings.java
index e9296f70c5..c2cf1a4603 100644
--- a/common/coap-server/src/main/java/org/thingsboard/server/coapserver/TbCoapDtlsSettings.java
+++ b/common/coap-server/src/main/java/org/thingsboard/server/coapserver/TbCoapDtlsSettings.java
@@ -15,6 +15,7 @@
  */
 package org.thingsboard.server.coapserver;
 
+import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.californium.elements.config.Configuration;
 import org.eclipse.californium.elements.util.SslContextUtil;
@@ -41,10 +42,13 @@ import java.util.Collections;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static org.eclipse.californium.elements.config.CertificateAuthenticationMode.WANTED;
 import static org.eclipse.californium.scandium.config.DtlsConfig.DTLS_CLIENT_AUTHENTICATION_MODE;
+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.californium.scandium.config.DtlsConfig.DTLS_RETRANSMISSION_TIMEOUT;
 import static org.eclipse.californium.scandium.config.DtlsConfig.DTLS_ROLE;
 import static org.eclipse.californium.scandium.config.DtlsConfig.DtlsRole.SERVER_ONLY;
 
+@Getter
 @Slf4j
 @ConditionalOnProperty(prefix = "transport.coap.dtls", value = "enabled", havingValue = "true", matchIfMissing = false)
 @Component
@@ -59,6 +63,9 @@ public class TbCoapDtlsSettings {
     @Value("${transport.coap.dtls.retransmission_timeout:9000}")
     private int dtlsRetransmissionTimeout;
 
+    @Value("${transport.coap.dtls.connection_id_length:}")
+    private Integer cIdLength;
+
     @Bean
     @ConfigurationProperties(prefix = "transport.coap.dtls.credentials")
     public SslCredentialsConfig coapDtlsCredentials() {
@@ -93,6 +100,14 @@ public class TbCoapDtlsSettings {
         configBuilder.set(DTLS_CLIENT_AUTHENTICATION_MODE, WANTED);
         configBuilder.set(DTLS_RETRANSMISSION_TIMEOUT, dtlsRetransmissionTimeout, MILLISECONDS);
         configBuilder.set(DTLS_ROLE, SERVER_ONLY);
+        configBuilder.set(DTLS_CONNECTION_ID_LENGTH, cIdLength);
+        if (cIdLength != null) {
+            if (cIdLength > 4) {
+                configBuilder.set(DTLS_CONNECTION_ID_NODE_ID, 0);
+            } else {
+                configBuilder.set(DTLS_CONNECTION_ID_NODE_ID, null);
+            }
+        }
         configBuilder.setAdvancedCertificateVerifier(
                 new TbCoapDtlsCertificateVerifier(
                         transportService,
diff --git a/common/coap-server/src/test/java/org/thingsboard/server/coapserver/TbCoapDtlsSettingsTest.java b/common/coap-server/src/test/java/org/thingsboard/server/coapserver/TbCoapDtlsSettingsTest.java
new file mode 100644
index 0000000000..72f5b964ae
--- /dev/null
+++ b/common/coap-server/src/test/java/org/thingsboard/server/coapserver/TbCoapDtlsSettingsTest.java
@@ -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.
+ */
+package org.thingsboard.server.coapserver;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.TestPropertySource;
+import org.thingsboard.server.common.transport.TransportService;
+import org.thingsboard.server.common.transport.config.ssl.SslCredentialsConfig;
+import org.thingsboard.server.queue.discovery.TbServiceInfoProvider;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@SpringBootTest(classes = TbCoapDtlsSettings.class)
+@TestPropertySource(properties = {
+        "transport.coap.dtls.enabled=true",
+        "transport.coap.dtls.bind_address=192.168.1.1",
+        "transport.coap.dtls.bind_port=1234",
+        "transport.coap.dtls.retransmission_timeout=100",
+        "transport.coap.dtls.connection_id_length=500",
+        "transport.coap.dtls.x509.skip_validity_check_for_client_cert=true",
+        "transport.coap.dtls.x509.dtls_session_inactivity_timeout=1000",
+        "transport.coap.dtls.x509.dtls_session_report_timeout=3000",
+})
+class TbCoapDtlsSettingsTest {
+
+    @Autowired
+    TbCoapDtlsSettings coapDtlsSettings;
+    @MockBean
+    SslCredentialsConfig sslCredentialsConfig;
+    @MockBean
+    private TransportService transportService;
+    @MockBean
+    private TbServiceInfoProvider serviceInfoProvider;
+
+    @Test
+    public void testCoapDtlsProperties() {
+        assertThat(coapDtlsSettings).as("bean created").isNotNull();
+        assertThat(coapDtlsSettings.getHost()).as("host").isEqualTo("192.168.1.1");
+        assertThat(coapDtlsSettings.getPort()).as("port").isEqualTo(1234);
+        assertThat(coapDtlsSettings.getDtlsRetransmissionTimeout()).as("retransmission_timeout").isEqualTo(100);
+        assertThat(coapDtlsSettings.isSkipValidityCheckForClientCert()).as("skip_validity_check_for_client_cert").isTrue();
+        assertThat(coapDtlsSettings.getDtlsSessionInactivityTimeout()).as("dtls_session_inactivity_timeout").isEqualTo(1000);
+        assertThat(coapDtlsSettings.getDtlsSessionReportTimeout()).as("dtls_session_report_timeout").isEqualTo(3000);
+    }
+
+}
diff --git a/common/dao-api/pom.xml b/common/dao-api/pom.xml
index 3952692b92..8b3d7f7f5f 100644
--- a/common/dao-api/pom.xml
+++ b/common/dao-api/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.6.3-SNAPSHOT</version>
+        <version>3.7.0-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>
@@ -53,11 +53,11 @@
             <artifactId>guava</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.github.fge</groupId>
+            <groupId>com.github.java-json-tools</groupId>
             <artifactId>json-schema-validator</artifactId>
         </dependency>
         <dependency>
@@ -105,11 +105,6 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.awaitility</groupId>
             <artifactId>awaitility</artifactId>
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..5bf6b95853 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
@@ -38,10 +38,13 @@ import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.common.data.query.AlarmCountQuery;
 import org.thingsboard.server.common.data.query.AlarmData;
 import org.thingsboard.server.common.data.query.AlarmDataQuery;
+import org.thingsboard.server.common.data.util.TbPair;
 import org.thingsboard.server.dao.entity.EntityDaoService;
 
 import java.util.Collection;
+import java.util.List;
 import java.util.Set;
+import java.util.UUID;
 
 
 public interface AlarmService extends EntityDaoService {
@@ -106,7 +109,9 @@ public interface AlarmService extends EntityDaoService {
 
     PageData<AlarmId> findAlarmIdsByAssigneeId(TenantId tenantId, UserId userId, PageLink pageLink);
 
-    void deleteEntityAlarmRelations(TenantId tenantId, EntityId entityId);
+    List<TbPair<UUID, Long>> findAlarmIdsByOriginatorId(TenantId tenantId, EntityId originatorId, long createdTimeOffset, AlarmId idOffset, int limit);
+
+    int deleteEntityAlarmRecords(TenantId tenantId, EntityId entityId);
 
     void deleteEntityAlarmRecordsByTenantId(TenantId tenantId);
 
diff --git a/common/dao-api/src/main/java/org/thingsboard/server/dao/asset/AssetProfileService.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/asset/AssetProfileService.java
index d0789f99cd..b09aa5c7f1 100644
--- a/common/dao-api/src/main/java/org/thingsboard/server/dao/asset/AssetProfileService.java
+++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/asset/AssetProfileService.java
@@ -38,10 +38,10 @@ public interface AssetProfileService extends EntityDaoService {
 
     AssetProfileInfo findAssetProfileInfoById(TenantId tenantId, AssetProfileId assetProfileId);
 
-    AssetProfile saveAssetProfile(AssetProfile assetProfile, boolean doValidate);
-
     AssetProfile saveAssetProfile(AssetProfile assetProfile);
 
+    AssetProfile saveAssetProfile(AssetProfile assetProfile, boolean doValidate, boolean publishSaveEvent);
+
     void deleteAssetProfile(TenantId tenantId, AssetProfileId assetProfileId);
 
     PageData<AssetProfile> findAssetProfiles(TenantId tenantId, PageLink pageLink);
diff --git a/common/dao-api/src/main/java/org/thingsboard/server/dao/attributes/AttributesService.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/attributes/AttributesService.java
index 3dd9626739..d869471fa3 100644
--- a/common/dao-api/src/main/java/org/thingsboard/server/dao/attributes/AttributesService.java
+++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/attributes/AttributesService.java
@@ -16,6 +16,7 @@
 package org.thingsboard.server.dao.attributes;
 
 import com.google.common.util.concurrent.ListenableFuture;
+import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
 import org.thingsboard.server.common.data.id.EntityId;
@@ -31,22 +32,45 @@ import java.util.Optional;
  */
 public interface AttributesService {
 
+    @Deprecated(since = "3.7.0")
     ListenableFuture<Optional<AttributeKvEntry>> find(TenantId tenantId, EntityId entityId, String scope, String attributeKey);
 
+    ListenableFuture<Optional<AttributeKvEntry>> find(TenantId tenantId, EntityId entityId, AttributeScope scope, String attributeKey);
+
+    @Deprecated(since = "3.7.0")
     ListenableFuture<List<AttributeKvEntry>> find(TenantId tenantId, EntityId entityId, String scope, Collection<String> attributeKeys);
 
+    ListenableFuture<List<AttributeKvEntry>> find(TenantId tenantId, EntityId entityId, AttributeScope scope, Collection<String> attributeKeys);
+
+    @Deprecated(since = "3.7.0")
     ListenableFuture<List<AttributeKvEntry>> findAll(TenantId tenantId, EntityId entityId, String scope);
 
+    ListenableFuture<List<AttributeKvEntry>> findAll(TenantId tenantId, EntityId entityId, AttributeScope scope);
+
+    @Deprecated(since = "3.7.0")
     ListenableFuture<List<String>> save(TenantId tenantId, EntityId entityId, String scope, List<AttributeKvEntry> attributes);
 
+    ListenableFuture<List<String>> save(TenantId tenantId, EntityId entityId, AttributeScope scope, List<AttributeKvEntry> attributes);
+
+    @Deprecated(since = "3.7.0")
     ListenableFuture<String> save(TenantId tenantId, EntityId entityId, String scope, AttributeKvEntry attribute);
 
+    ListenableFuture<String> save(TenantId tenantId, EntityId entityId, AttributeScope scope, AttributeKvEntry attribute);
+
+    @Deprecated(since = "3.7.0")
     ListenableFuture<List<String>> removeAll(TenantId tenantId, EntityId entityId, String scope, List<String> attributeKeys);
 
+    ListenableFuture<List<String>> removeAll(TenantId tenantId, EntityId entityId, AttributeScope scope, List<String> attributeKeys);
+
     List<String> findAllKeysByDeviceProfileId(TenantId tenantId, DeviceProfileId deviceProfileId);
 
+    @Deprecated(since = "3.7.0")
     List<String> findAllKeysByEntityIds(TenantId tenantId, EntityType entityType, List<EntityId> entityIds);
 
-    List<String> findAllKeysByEntityIds(TenantId tenantId, EntityType entityType, List<EntityId> entityIds, String scope);
+    List<String> findAllKeysByEntityIds(TenantId tenantId, List<EntityId> entityIds);
+
+    List<String> findAllKeysByEntityIds(TenantId tenantId, List<EntityId> entityIds, String scope);
+
+    int removeAllByEntityId(TenantId tenantId, EntityId entityId);
 
 }
diff --git a/common/dao-api/src/main/java/org/thingsboard/server/dao/cassandra/AbstractCassandraCluster.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/cassandra/AbstractCassandraCluster.java
index dae7cd55f8..d6e652c0fc 100644
--- a/common/dao-api/src/main/java/org/thingsboard/server/dao/cassandra/AbstractCassandraCluster.java
+++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/cassandra/AbstractCassandraCluster.java
@@ -29,7 +29,7 @@ import org.thingsboard.server.dao.cassandra.guava.GuavaSession;
 import org.thingsboard.server.dao.cassandra.guava.GuavaSessionBuilder;
 import org.thingsboard.server.dao.cassandra.guava.GuavaSessionUtils;
 
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PreDestroy;
 import java.nio.file.Paths;
 
 @Slf4j
diff --git a/common/dao-api/src/main/java/org/thingsboard/server/dao/cassandra/CassandraCluster.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/cassandra/CassandraCluster.java
index b6925080d8..c1ebb98f08 100644
--- a/common/dao-api/src/main/java/org/thingsboard/server/dao/cassandra/CassandraCluster.java
+++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/cassandra/CassandraCluster.java
@@ -19,7 +19,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.thingsboard.server.dao.util.NoSqlAnyDao;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 @Component("CassandraCluster")
 @NoSqlAnyDao
diff --git a/common/dao-api/src/main/java/org/thingsboard/server/dao/cassandra/CassandraDriverOptions.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/cassandra/CassandraDriverOptions.java
index d2b2ab03b6..23ddf6c96f 100644
--- a/common/dao-api/src/main/java/org/thingsboard/server/dao/cassandra/CassandraDriverOptions.java
+++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/cassandra/CassandraDriverOptions.java
@@ -29,7 +29,7 @@ import org.springframework.stereotype.Component;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.dao.util.NoSqlAnyDao;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/common/dao-api/src/main/java/org/thingsboard/server/dao/cassandra/CassandraInstallCluster.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/cassandra/CassandraInstallCluster.java
index c0a9975e28..776c9db852 100644
--- a/common/dao-api/src/main/java/org/thingsboard/server/dao/cassandra/CassandraInstallCluster.java
+++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/cassandra/CassandraInstallCluster.java
@@ -19,7 +19,7 @@ import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Component;
 import org.thingsboard.server.dao.util.NoSqlAnyDao;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 @Component("CassandraInstallCluster")
 @NoSqlAnyDao
diff --git a/common/dao-api/src/main/java/org/thingsboard/server/dao/device/DeviceProfileService.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/device/DeviceProfileService.java
index 7cfaf4be40..ebcd40bb6d 100644
--- a/common/dao-api/src/main/java/org/thingsboard/server/dao/device/DeviceProfileService.java
+++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/device/DeviceProfileService.java
@@ -38,10 +38,10 @@ public interface DeviceProfileService extends EntityDaoService {
 
     DeviceProfileInfo findDeviceProfileInfoById(TenantId tenantId, DeviceProfileId deviceProfileId);
 
-    DeviceProfile saveDeviceProfile(DeviceProfile deviceProfile, boolean doValidate);
-
     DeviceProfile saveDeviceProfile(DeviceProfile deviceProfile);
 
+    DeviceProfile saveDeviceProfile(DeviceProfile deviceProfile, boolean doValidate, boolean publishSaveEvent);
+
     void deleteDeviceProfile(TenantId tenantId, DeviceProfileId deviceProfileId);
 
     PageData<DeviceProfile> findDeviceProfiles(TenantId tenantId, PageLink pageLink);
diff --git a/common/dao-api/src/main/java/org/thingsboard/server/dao/device/DeviceService.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/device/DeviceService.java
index 3ba7b6ae03..442f76effe 100644
--- a/common/dao-api/src/main/java/org/thingsboard/server/dao/device/DeviceService.java
+++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/device/DeviceService.java
@@ -49,10 +49,10 @@ public interface DeviceService extends EntityDaoService {
 
     Device findDeviceByTenantIdAndName(TenantId tenantId, String name);
 
-    Device saveDevice(Device device, boolean doValidate);
-
     Device saveDevice(Device device);
 
+    Device saveDevice(Device device, boolean doValidate);
+
     Device saveDeviceWithAccessToken(Device device, String accessToken);
 
     Device saveDeviceWithCredentials(Device device, DeviceCredentials deviceCredentials);
diff --git a/common/dao-api/src/main/java/org/thingsboard/server/dao/entity/EntityDaoService.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/entity/EntityDaoService.java
index b1f6ab9cdb..cf55cf1054 100644
--- a/common/dao-api/src/main/java/org/thingsboard/server/dao/entity/EntityDaoService.java
+++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/entity/EntityDaoService.java
@@ -30,10 +30,14 @@ public interface EntityDaoService {
         throw new IllegalArgumentException("Not implemented for " + getEntityType());
     }
 
-    default void deleteEntity(TenantId tenantId, EntityId id) {
+    default void deleteEntity(TenantId tenantId, EntityId id, boolean force) {
         throw new IllegalArgumentException(getEntityType().getNormalName() + " deletion not supported");
     }
 
+    default void deleteByTenantId(TenantId tenantId) {
+        throw new IllegalArgumentException("Deletion by tenant id not supported for " + getEntityType().getNormalName());
+    }
+
     EntityType getEntityType();
 
 }
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/NotificationRequestService.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/notification/NotificationRequestService.java
index 816abc9770..4a80775390 100644
--- a/common/dao-api/src/main/java/org/thingsboard/server/dao/notification/NotificationRequestService.java
+++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/notification/NotificationRequestService.java
@@ -45,7 +45,7 @@ public interface NotificationRequestService {
 
     List<NotificationRequest> findNotificationRequestsByRuleIdAndOriginatorEntityId(TenantId tenantId, NotificationRuleId ruleId, EntityId originatorEntityId);
 
-    void deleteNotificationRequest(TenantId tenantId, NotificationRequestId requestId);
+    void deleteNotificationRequest(TenantId tenantId, NotificationRequest request);
 
     PageData<NotificationRequest> findScheduledNotificationRequests(PageLink pageLink);
 
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/notification/NotificationTemplateService.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/notification/NotificationTemplateService.java
index 1f4019063b..664f976904 100644
--- a/common/dao-api/src/main/java/org/thingsboard/server/dao/notification/NotificationTemplateService.java
+++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/notification/NotificationTemplateService.java
@@ -32,6 +32,8 @@ public interface NotificationTemplateService {
 
     PageData<NotificationTemplate> findNotificationTemplatesByTenantIdAndNotificationTypes(TenantId tenantId, List<NotificationType> notificationTypes, PageLink pageLink);
 
+    int countNotificationTemplatesByTenantIdAndNotificationTypes(TenantId tenantId, List<NotificationType> notificationTypes);
+
     void deleteNotificationTemplateById(TenantId tenantId, NotificationTemplateId id);
 
     void deleteNotificationTemplatesByTenantId(TenantId tenantId);
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..c9e3f605c6
--- /dev/null
+++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/queue/QueueStatsService.java
@@ -0,0 +1,35 @@
+/**
+ * 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);
+
+}
diff --git a/common/dao-api/src/main/java/org/thingsboard/server/dao/rule/RuleChainService.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/rule/RuleChainService.java
index cd8774ac6d..df12b53dc3 100644
--- a/common/dao-api/src/main/java/org/thingsboard/server/dao/rule/RuleChainService.java
+++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/rule/RuleChainService.java
@@ -44,10 +44,14 @@ public interface RuleChainService extends EntityDaoService {
 
     RuleChain saveRuleChain(RuleChain ruleChain);
 
+    RuleChain saveRuleChain(RuleChain ruleChain, boolean publishSaveEvent);
+
     boolean setRootRuleChain(TenantId tenantId, RuleChainId ruleChainId);
 
     RuleChainUpdateResult saveRuleChainMetaData(TenantId tenantId, RuleChainMetaData ruleChainMetaData, Function<RuleNode, RuleNode> ruleNodeUpdater);
 
+    RuleChainUpdateResult saveRuleChainMetaData(TenantId tenantId, RuleChainMetaData ruleChainMetaData, Function<RuleNode, RuleNode> ruleNodeUpdater, boolean publishSaveEvent);
+
     RuleChainMetaData loadRuleChainMetaData(TenantId tenantId, RuleChainId ruleChainId);
 
     RuleChain findRuleChainById(TenantId tenantId, RuleChainId ruleChainId);
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 4e5037c994..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,6 +37,8 @@ public interface TenantService extends EntityDaoService {
 
     Tenant saveTenant(Tenant tenant);
 
+    Tenant saveTenant(Tenant tenant, Consumer<TenantId> defaultEntitiesCreator);
+
     boolean tenantExists(TenantId tenantId);
 
     void deleteTenant(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/dao-api/src/main/java/org/thingsboard/server/dao/usagerecord/ApiUsageStateService.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/usagerecord/ApiUsageStateService.java
index 2ed877dabd..3d09247c7e 100644
--- a/common/dao-api/src/main/java/org/thingsboard/server/dao/usagerecord/ApiUsageStateService.java
+++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/usagerecord/ApiUsageStateService.java
@@ -31,8 +31,6 @@ public interface ApiUsageStateService extends EntityDaoService {
 
     ApiUsageState findApiUsageStateByEntityId(EntityId entityId);
 
-    void deleteApiUsageStateByTenantId(TenantId tenantId);
-
     void deleteApiUsageStateByEntityId(EntityId entityId);
 
     ApiUsageState findApiUsageStateById(TenantId tenantId, ApiUsageStateId id);
diff --git a/common/dao-api/src/main/java/org/thingsboard/server/dao/user/UserService.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/user/UserService.java
index f137bcc334..0cad776e78 100644
--- a/common/dao-api/src/main/java/org/thingsboard/server/dao/user/UserService.java
+++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/user/UserService.java
@@ -77,6 +77,8 @@ public interface UserService extends EntityDaoService {
 
     void deleteTenantAdmins(TenantId tenantId);
 
+    void deleteAllByTenantId(TenantId tenantId);
+
     PageData<User> findCustomerUsers(TenantId tenantId, CustomerId customerId, PageLink pageLink);
 
     PageData<User> findUsersByCustomerIds(TenantId tenantId, List<CustomerId> customerIds, PageLink pageLink);
diff --git a/common/data/pom.xml b/common/data/pom.xml
index ded57d799e..4cd63dbc1f 100644
--- a/common/data/pom.xml
+++ b/common/data/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.6.3-SNAPSHOT</version>
+        <version>3.7.0-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>
@@ -37,8 +37,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.owasp.antisamy</groupId>
@@ -73,11 +73,6 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.awaitility</groupId>
             <artifactId>awaitility</artifactId>
@@ -105,12 +100,8 @@
             <artifactId>commons-codec</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-annotations</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>de.ruedigermoeller</groupId>
-            <artifactId>fst</artifactId>
+            <groupId>io.swagger.core.v3</groupId>
+            <artifactId>swagger-annotations-jakarta</artifactId>
         </dependency>
         <dependency>
             <groupId>com.google.protobuf</groupId>
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/AdminSettings.java b/common/data/src/main/java/org/thingsboard/server/common/data/AdminSettings.java
index 0be61c19c4..07885ac858 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/AdminSettings.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/AdminSettings.java
@@ -16,14 +16,13 @@
 package org.thingsboard.server.common.data;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.thingsboard.server.common.data.id.AdminSettingsId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.validation.Length;
 import org.thingsboard.server.common.data.validation.NoXss;
 
-@ApiModel
+@Schema
 public class AdminSettings extends BaseData<AdminSettingsId> implements HasTenantId {
 
     private static final long serialVersionUID = -7670322981725511892L;
@@ -50,19 +49,19 @@ public class AdminSettings extends BaseData<AdminSettingsId> implements HasTenan
         this.jsonValue = adminSettings.getJsonValue();
     }
 
-    @ApiModelProperty(position = 1, value = "The Id of the Administration Settings, auto-generated, UUID")
+    @Schema(description = "The Id of the Administration Settings, auto-generated, UUID")
     @Override
     public AdminSettingsId getId() {
         return super.getId();
     }
 
-    @ApiModelProperty(position = 2, value = "Timestamp of the settings creation, in milliseconds", example = "1609459200000", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Timestamp of the settings creation, in milliseconds", example = "1609459200000", accessMode = Schema.AccessMode.READ_ONLY)
     @Override
     public long getCreatedTime() {
         return super.getCreatedTime();
     }
 
-    @ApiModelProperty(position = 3, value = "JSON object with Tenant Id.", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "JSON object with Tenant Id.", accessMode = Schema.AccessMode.READ_ONLY)
     public TenantId getTenantId() {
         return tenantId;
     }
@@ -71,7 +70,7 @@ public class AdminSettings extends BaseData<AdminSettingsId> implements HasTenan
         this.tenantId = tenantId;
     }
 
-    @ApiModelProperty(position = 4, value = "The Administration Settings key, (e.g. 'general' or 'mail')", example = "mail")
+    @Schema(description = "The Administration Settings key, (e.g. 'general' or 'mail')", example = "mail")
     public String getKey() {
         return key;
     }
@@ -80,7 +79,7 @@ public class AdminSettings extends BaseData<AdminSettingsId> implements HasTenan
         this.key = key;
     }
 
-    @ApiModelProperty(position = 5, value = "JSON representation of the Administration Settings value")
+    @Schema(description = "JSON representation of the Administration Settings value")
     public JsonNode getJsonValue() {
         return jsonValue;
     }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/FSTUtils.java b/common/data/src/main/java/org/thingsboard/server/common/data/AttributeScope.java
similarity index 55%
rename from common/data/src/main/java/org/thingsboard/server/common/data/FSTUtils.java
rename to common/data/src/main/java/org/thingsboard/server/common/data/AttributeScope.java
index f41d412283..3c58dd3b72 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/FSTUtils.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/AttributeScope.java
@@ -15,21 +15,29 @@
  */
 package org.thingsboard.server.common.data;
 
-import lombok.extern.slf4j.Slf4j;
-import org.nustaq.serialization.FSTConfiguration;
+import lombok.Getter;
 
-@Slf4j
-public class FSTUtils {
+import java.util.Arrays;
+import java.util.Map;
+import java.util.stream.Collectors;
 
-    public static final FSTConfiguration CONFIG = FSTConfiguration.createDefaultConfiguration();
+public enum AttributeScope {
 
-    @SuppressWarnings("unchecked")
-    public static <T> T decode(byte[] byteArray) {
-        return byteArray != null && byteArray.length > 0 ? (T) CONFIG.asObject(byteArray) : null;
+    CLIENT_SCOPE(1),
+    SERVER_SCOPE(2),
+    SHARED_SCOPE(3);
+    @Getter
+    private final int id;
+
+    private static final Map<Integer, AttributeScope> values = Arrays.stream(values())
+            .collect(Collectors.toMap(AttributeScope::getId, scope -> scope));
+
+    AttributeScope(int id) {
+        this.id = id;
     }
 
-    public static <T> byte[] encode(T msq) {
-        return CONFIG.asByteArray(msq);
+    public static AttributeScope valueOf(int id) {
+        return values.get(id);
     }
 
 }
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 5f55c6ea89..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
@@ -19,7 +19,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonProperty.Access;
 import com.fasterxml.jackson.databind.JsonNode;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
@@ -35,9 +36,9 @@ public class Customer extends ContactBased<CustomerId> implements HasTenantId, E
 
     @NoXss
     @Length(fieldName = "title")
-    @ApiModelProperty(position = 3, required = true, value = "Title of the customer", example = "Company A")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Title of the customer", example = "Company A")
     private String title;
-    @ApiModelProperty(position = 5, value = "JSON object with Tenant Id")
+    @Schema(description = "JSON object with Tenant Id")
     private TenantId tenantId;
 
     @Getter @Setter
@@ -74,7 +75,7 @@ public class Customer extends ContactBased<CustomerId> implements HasTenantId, E
         this.title = title;
     }
 
-    @ApiModelProperty(position = 1, value = "JSON object with the customer Id. " +
+    @Schema(description = "JSON object with the customer Id. " +
             "Specify this field to update the customer. " +
             "Referencing non-existing customer Id will cause error. " +
             "Omit this field to create new customer." )
@@ -83,61 +84,61 @@ public class Customer extends ContactBased<CustomerId> implements HasTenantId, E
         return super.getId();
     }
 
-    @ApiModelProperty(position = 2, value = "Timestamp of the customer creation, in milliseconds", example = "1609459200000", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Timestamp of the customer creation, in milliseconds", example = "1609459200000", accessMode = Schema.AccessMode.READ_ONLY)
     @Override
     public long getCreatedTime() {
         return super.getCreatedTime();
     }
 
-    @ApiModelProperty(position = 6, value = "Country", example = "US")
+    @Schema(description = "Country", example = "US")
     @Override
     public String getCountry() {
         return super.getCountry();
     }
 
-    @ApiModelProperty(position = 7, value = "State", example = "NY")
+    @Schema(description = "State", example = "NY")
     @Override
     public String getState() {
         return super.getState();
     }
 
-    @ApiModelProperty(position = 8, value = "City", example = "New York")
+    @Schema(description = "City", example = "New York")
     @Override
     public String getCity() {
         return super.getCity();
     }
 
-    @ApiModelProperty(position = 9, value = "Address Line 1", example = "42 Broadway Suite 12-400")
+    @Schema(description = "Address Line 1", example = "42 Broadway Suite 12-400")
     @Override
     public String getAddress() {
         return super.getAddress();
     }
 
-    @ApiModelProperty(position = 10, value = "Address Line 2", example = "")
+    @Schema(description = "Address Line 2", example = "")
     @Override
     public String getAddress2() {
         return super.getAddress2();
     }
 
-    @ApiModelProperty(position = 11, value = "Zip code", example = "10004")
+    @Schema(description = "Zip code", example = "10004")
     @Override
     public String getZip() {
         return super.getZip();
     }
 
-    @ApiModelProperty(position = 12, value = "Phone number", example = "+1(415)777-7777")
+    @Schema(description = "Phone number", example = "+1(415)777-7777")
     @Override
     public String getPhone() {
         return super.getPhone();
     }
 
-    @ApiModelProperty(position = 13, required = true, value = "Email", example = "example@company.com")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Email", example = "example@company.com")
     @Override
     public String getEmail() {
         return super.getEmail();
     }
 
-    @ApiModelProperty(position = 14, value = "Additional parameters of the device", dataType = "com.fasterxml.jackson.databind.JsonNode")
+    @Schema(description = "Additional parameters of the device",implementation = com.fasterxml.jackson.databind.JsonNode.class)
     @Override
     public JsonNode getAdditionalInfo() {
         return super.getAdditionalInfo();
@@ -159,7 +160,7 @@ public class Customer extends ContactBased<CustomerId> implements HasTenantId, E
 
     @Override
     @JsonProperty(access = Access.READ_ONLY)
-    @ApiModelProperty(position = 4, value = "Name of the customer. Read-only, duplicated from title for backward compatibility", example = "Company A", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Name of the customer. Read-only, duplicated from title for backward compatibility", example = "Company A", accessMode = Schema.AccessMode.READ_ONLY)
     public String getName() {
         return title;
     }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/Dashboard.java b/common/data/src/main/java/org/thingsboard/server/common/data/Dashboard.java
index c95504dc07..e3db68563e 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/Dashboard.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/Dashboard.java
@@ -19,7 +19,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.collect.Streams;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
@@ -59,10 +59,10 @@ public class Dashboard extends DashboardInfo implements ExportableEntity<Dashboa
         this.externalId = dashboard.getExternalId();
     }
 
-    @ApiModelProperty(position = 9, value = "JSON object with main configuration of the dashboard: layouts, widgets, aliases, etc. " +
+    @Schema(description = "JSON object with main configuration of the dashboard: layouts, widgets, aliases, etc. " +
             "The JSON structure of the dashboard configuration is quite complex. " +
             "The easiest way to learn it is to export existing dashboard to JSON."
-            , dataType = "com.fasterxml.jackson.databind.JsonNode")
+            ,implementation = com.fasterxml.jackson.databind.JsonNode.class)
     public JsonNode getConfiguration() {
         return configuration;
     }
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 7f2d324d02..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
@@ -16,20 +16,19 @@
 package org.thingsboard.server.common.data;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.DashboardId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.validation.Length;
 import org.thingsboard.server.common.data.validation.NoXss;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import java.util.HashSet;
 import java.util.Objects;
 import java.util.Set;
 
-@ApiModel
+@Schema
 public class DashboardInfo extends BaseData<DashboardId> implements HasName, HasTenantId, HasTitle, HasImage {
 
     private static final long serialVersionUID = -9080404114760433799L;
@@ -62,7 +61,7 @@ public class DashboardInfo extends BaseData<DashboardId> implements HasName, Has
         this.mobileOrder = dashboardInfo.getMobileOrder();
     }
 
-    @ApiModelProperty(position = 1, value = "JSON object with the dashboard Id. " +
+    @Schema(description = "JSON object with the dashboard Id. " +
             "Specify existing dashboard Id to update the dashboard. " +
             "Referencing non-existing dashboard id will cause error. " +
             "Omit this field to create new dashboard.")
@@ -71,13 +70,13 @@ public class DashboardInfo extends BaseData<DashboardId> implements HasName, Has
         return super.getId();
     }
 
-    @ApiModelProperty(position = 2, value = "Timestamp of the dashboard creation, in milliseconds", example = "1609459200000", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Timestamp of the dashboard creation, in milliseconds", example = "1609459200000", accessMode = Schema.AccessMode.READ_ONLY)
     @Override
     public long getCreatedTime() {
         return super.getCreatedTime();
     }
 
-    @ApiModelProperty(position = 3, value = "JSON object with Tenant Id. Tenant Id of the dashboard can't be changed.", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "JSON object with Tenant Id. Tenant Id of the dashboard can't be changed.", accessMode = Schema.AccessMode.READ_ONLY)
     public TenantId getTenantId() {
         return tenantId;
     }
@@ -86,7 +85,7 @@ public class DashboardInfo extends BaseData<DashboardId> implements HasName, Has
         this.tenantId = tenantId;
     }
 
-    @ApiModelProperty(position = 4, required = true, value = "Title of the dashboard.")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Title of the dashboard.")
     public String getTitle() {
         return title;
     }
@@ -95,7 +94,7 @@ public class DashboardInfo extends BaseData<DashboardId> implements HasName, Has
         this.title = title;
     }
 
-    @ApiModelProperty(position = 8, value = "Thumbnail picture for rendering of the dashboards in a grid view on mobile devices.", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Thumbnail picture for rendering of the dashboards in a grid view on mobile devices.", accessMode = Schema.AccessMode.READ_ONLY)
     public String getImage() {
         return image;
     }
@@ -104,7 +103,7 @@ public class DashboardInfo extends BaseData<DashboardId> implements HasName, Has
         this.image = image;
     }
 
-    @ApiModelProperty(position = 5, value = "List of assigned customers with their info.", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "List of assigned customers with their info.", accessMode = Schema.AccessMode.READ_ONLY)
     public Set<ShortCustomerInfo> getAssignedCustomers() {
         return assignedCustomers;
     }
@@ -113,7 +112,7 @@ public class DashboardInfo extends BaseData<DashboardId> implements HasName, Has
         this.assignedCustomers = assignedCustomers;
     }
 
-    @ApiModelProperty(position = 6, value = "Hide dashboard from mobile devices. Useful if the dashboard is not designed for small screens.", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Hide dashboard from mobile devices. Useful if the dashboard is not designed for small screens.", accessMode = Schema.AccessMode.READ_ONLY)
     public boolean isMobileHide() {
         return mobileHide;
     }
@@ -122,7 +121,7 @@ public class DashboardInfo extends BaseData<DashboardId> implements HasName, Has
         this.mobileHide = mobileHide;
     }
 
-    @ApiModelProperty(position = 7, value = "Order on mobile devices. Useful to adjust sorting of the dashboards for mobile applications", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Order on mobile devices. Useful to adjust sorting of the dashboards for mobile applications", accessMode = Schema.AccessMode.READ_ONLY)
     public Integer getMobileOrder() {
         return mobileOrder;
     }
@@ -180,7 +179,7 @@ public class DashboardInfo extends BaseData<DashboardId> implements HasName, Has
         }
     }
 
-    @ApiModelProperty(position = 4, value = "Same as title of the dashboard. Read-only field. Update the 'title' to change the 'name' of the dashboard.", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Same as title of the dashboard. Read-only field. Update the 'title' to change the 'name' of the dashboard.", accessMode = Schema.AccessMode.READ_ONLY)
     @Override
     @JsonProperty(access = JsonProperty.Access.READ_ONLY)
     public String getName() {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/DataConstants.java b/common/data/src/main/java/org/thingsboard/server/common/data/DataConstants.java
index 53b5d2ec63..b529edeb0c 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/DataConstants.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/DataConstants.java
@@ -44,6 +44,8 @@ public class DataConstants {
     public static final String EDGE_ID = "edgeId";
     public static final String DEVICE_ID = "deviceId";
     public static final String GATEWAY_PARAMETER = "gateway";
+
+    public static final String OVERWRITE_ACTIVITY_TIME_PARAMETER = "overwriteActivityTime";
     public static final String COAP_TRANSPORT_NAME = "COAP";
     public static final String LWM2M_TRANSPORT_NAME = "LWM2M";
     public static final String MQTT_TRANSPORT_NAME = "MQTT";
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 97622dcf79..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
@@ -18,8 +18,7 @@ package org.thingsboard.server.common.data;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
@@ -37,7 +36,7 @@ import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.util.Optional;
 
-@ApiModel
+@Schema
 @EqualsAndHashCode(callSuper = true)
 @Slf4j
 public class Device extends BaseDataWithAdditionalInfo<DeviceId> implements HasLabel, HasTenantId, HasCustomerId, HasOtaPackage, ExportableEntity<DeviceId> {
@@ -58,6 +57,7 @@ public class Device extends BaseDataWithAdditionalInfo<DeviceId> implements HasL
     private DeviceProfileId deviceProfileId;
     private transient DeviceData deviceData;
     @JsonIgnore
+    @Getter @Setter
     private byte[] deviceDataBytes;
 
     private OtaPackageId firmwareId;
@@ -103,7 +103,7 @@ public class Device extends BaseDataWithAdditionalInfo<DeviceId> implements HasL
         return this;
     }
 
-    @ApiModelProperty(position = 1, value = "JSON object with the Device Id. " +
+    @Schema(description = "JSON object with the Device Id. " +
             "Specify this field to update the Device. " +
             "Referencing non-existing Device Id will cause error. " +
             "Omit this field to create new Device." )
@@ -112,13 +112,13 @@ public class Device extends BaseDataWithAdditionalInfo<DeviceId> implements HasL
         return super.getId();
     }
 
-    @ApiModelProperty(position = 2, value = "Timestamp of the device creation, in milliseconds", example = "1609459200000", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Timestamp of the device creation, in milliseconds", example = "1609459200000", accessMode = Schema.AccessMode.READ_ONLY)
     @Override
     public long getCreatedTime() {
         return super.getCreatedTime();
     }
 
-    @ApiModelProperty(position = 3, value = "JSON object with Tenant Id. Use 'assignDeviceToTenant' to change the Tenant Id.", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "JSON object with Tenant Id. Use 'assignDeviceToTenant' to change the Tenant Id.", accessMode = Schema.AccessMode.READ_ONLY)
     public TenantId getTenantId() {
         return tenantId;
     }
@@ -127,7 +127,7 @@ public class Device extends BaseDataWithAdditionalInfo<DeviceId> implements HasL
         this.tenantId = tenantId;
     }
 
-    @ApiModelProperty(position = 4, value = "JSON object with Customer Id. Use 'assignDeviceToCustomer' to change the Customer Id.", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "JSON object with Customer Id. Use 'assignDeviceToCustomer' to change the Customer Id.", accessMode = Schema.AccessMode.READ_ONLY)
     public CustomerId getCustomerId() {
         return customerId;
     }
@@ -136,7 +136,7 @@ public class Device extends BaseDataWithAdditionalInfo<DeviceId> implements HasL
         this.customerId = customerId;
     }
 
-    @ApiModelProperty(position = 5, required = true, value = "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;
@@ -146,7 +146,7 @@ public class Device extends BaseDataWithAdditionalInfo<DeviceId> implements HasL
         this.name = name;
     }
 
-    @ApiModelProperty(position = 6, value = "Device Profile Name", example = "Temperature Sensor")
+    @Schema(description = "Device Profile Name", example = "Temperature Sensor")
     public String getType() {
         return type;
     }
@@ -155,7 +155,7 @@ public class Device extends BaseDataWithAdditionalInfo<DeviceId> implements HasL
         this.type = type;
     }
 
-    @ApiModelProperty(position = 7, value = "Label that may be used in widgets", example = "Room 234 Sensor")
+    @Schema(description = "Label that may be used in widgets", example = "Room 234 Sensor")
     public String getLabel() {
         return label;
     }
@@ -164,7 +164,7 @@ public class Device extends BaseDataWithAdditionalInfo<DeviceId> implements HasL
         this.label = label;
     }
 
-    @ApiModelProperty(position = 8, required = true, value = "JSON object with Device Profile Id.")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "JSON object with Device Profile Id.")
     public DeviceProfileId getDeviceProfileId() {
         return deviceProfileId;
     }
@@ -173,7 +173,7 @@ public class Device extends BaseDataWithAdditionalInfo<DeviceId> implements HasL
         this.deviceProfileId = deviceProfileId;
     }
 
-    @ApiModelProperty(position = 9, value = "JSON object with content specific to type of transport in the device profile.")
+    @Schema(description = "JSON object with content specific to type of transport in the device profile.")
     public DeviceData getDeviceData() {
         if (deviceData != null) {
             return deviceData;
@@ -201,7 +201,7 @@ public class Device extends BaseDataWithAdditionalInfo<DeviceId> implements HasL
         }
     }
 
-    @ApiModelProperty(position = 10, value = "JSON object with Ota Package Id.")
+    @Schema(description = "JSON object with Ota Package Id.")
     public OtaPackageId getFirmwareId() {
         return firmwareId;
     }
@@ -210,7 +210,7 @@ public class Device extends BaseDataWithAdditionalInfo<DeviceId> implements HasL
         this.firmwareId = firmwareId;
     }
 
-    @ApiModelProperty(position = 11, value = "JSON object with Ota Package Id.")
+    @Schema(description = "JSON object with Ota Package Id.")
     public OtaPackageId getSoftwareId() {
         return softwareId;
     }
@@ -219,7 +219,7 @@ public class Device extends BaseDataWithAdditionalInfo<DeviceId> implements HasL
         this.softwareId = softwareId;
     }
 
-    @ApiModelProperty(position = 12, value = "Additional parameters of the device", dataType = "com.fasterxml.jackson.databind.JsonNode")
+    @Schema(description = "Additional parameters of the device",implementation = com.fasterxml.jackson.databind.JsonNode.class)
     @Override
     public JsonNode getAdditionalInfo() {
         return super.getAdditionalInfo();
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/DeviceInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/DeviceInfo.java
index b030e62e65..c324f96ac2 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/DeviceInfo.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/DeviceInfo.java
@@ -15,26 +15,25 @@
  */
 package org.thingsboard.server.common.data;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.id.DeviceId;
 
-@ApiModel
+@Schema
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class DeviceInfo extends Device {
 
     private static final long serialVersionUID = -3004579925090663691L;
 
-    @ApiModelProperty(position = 13, value = "Title of the Customer that owns the device.", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Title of the Customer that owns the device.", accessMode = Schema.AccessMode.READ_ONLY)
     private String customerTitle;
-    @ApiModelProperty(position = 14, value = "Indicates special 'Public' Customer that is auto-generated to use the devices on public dashboards.", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Indicates special 'Public' Customer that is auto-generated to use the devices on public dashboards.", accessMode = Schema.AccessMode.READ_ONLY)
     private boolean customerIsPublic;
-    @ApiModelProperty(position = 15, value = "Name of the corresponding Device Profile.", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Name of the corresponding Device Profile.", accessMode = Schema.AccessMode.READ_ONLY)
     private String deviceProfileName;
-    @ApiModelProperty(position = 16, value = "Device active flag.", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Device active flag.", accessMode = Schema.AccessMode.READ_ONLY)
     private boolean active;
 
     public DeviceInfo() {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/DeviceProfile.java b/common/data/src/main/java/org/thingsboard/server/common/data/DeviceProfile.java
index 5fb3727934..264dd0a29e 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/DeviceProfile.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/DeviceProfile.java
@@ -17,10 +17,11 @@ package org.thingsboard.server.common.data;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.core.JsonProcessingException;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
 import lombok.ToString;
 import lombok.extern.slf4j.Slf4j;
 import org.thingsboard.server.common.data.device.profile.DeviceProfileData;
@@ -32,11 +33,11 @@ import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.validation.Length;
 import org.thingsboard.server.common.data.validation.NoXss;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 
-@ApiModel
+@Schema
 @Data
 @ToString(exclude = {"image", "profileDataBytes"})
 @EqualsAndHashCode(callSuper = true)
@@ -45,50 +46,52 @@ public class DeviceProfile extends BaseData<DeviceProfileId> implements HasName,
 
     private static final long serialVersionUID = 6998485460273302018L;
 
-    @ApiModelProperty(position = 3, value = "JSON object with Tenant Id that owns the profile.", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "JSON object with Tenant Id that owns the profile.", accessMode = Schema.AccessMode.READ_ONLY)
     private TenantId tenantId;
     @NoXss
     @Length(fieldName = "name")
-    @ApiModelProperty(position = 4, value = "Unique Device Profile Name in scope of Tenant.", example = "Moisture Sensor")
+    @Schema(description = "Unique Device Profile Name in scope of Tenant.", example = "Moisture Sensor")
     private String name;
     @NoXss
-    @ApiModelProperty(position = 11, value = "Device Profile description. ")
+    @Schema(description = "Device Profile description. ")
     private String description;
-    @ApiModelProperty(position = 12, value = "Either URL or Base64 data of the icon. Used in the mobile application to visualize set of device profiles in the grid view. ")
+    @Schema(description = "Either URL or Base64 data of the icon. Used in the mobile application to visualize set of device profiles in the grid view. ")
     private String image;
     private boolean isDefault;
-    @ApiModelProperty(position = 16, value = "Type of the profile. Always 'DEFAULT' for now. Reserved for future use.")
+    @Schema(description = "Type of the profile. Always 'DEFAULT' for now. Reserved for future use.")
     private DeviceProfileType type;
-    @ApiModelProperty(position = 14, value = "Type of the transport used to connect the device. Default transport supports HTTP, CoAP and MQTT.")
+    @Schema(description = "Type of the transport used to connect the device. Default transport supports HTTP, CoAP and MQTT.")
     private DeviceTransportType transportType;
-    @ApiModelProperty(position = 15, value = "Provisioning strategy.")
+    @Schema(description = "Provisioning strategy.")
     private DeviceProfileProvisionType provisionType;
-    @ApiModelProperty(position = 7, value = "Reference to the rule chain. " +
+    @Schema(description = "Reference to the rule chain. " +
             "If present, the specified rule chain will be used to process all messages related to device, including telemetry, attribute updates, etc. " +
             "Otherwise, the root rule chain will be used to process those messages.")
     private RuleChainId defaultRuleChainId;
-    @ApiModelProperty(position = 6, value = "Reference to the dashboard. Used in the mobile application to open the default dashboard when user navigates to device details.")
+    @Schema(description = "Reference to the dashboard. Used in the mobile application to open the default dashboard when user navigates to device details.")
     private DashboardId defaultDashboardId;
 
     @NoXss
-    @ApiModelProperty(position = 8, value = "Rule engine queue name. " +
+    @Schema(description = "Rule engine queue name. " +
             "If present, the specified queue will be used to store all unprocessed messages related to device, including telemetry, attribute updates, etc. " +
             "Otherwise, the 'Main' queue will be used to store those messages.")
     private String defaultQueueName;
     @Valid
     private transient DeviceProfileData profileData;
     @JsonIgnore
+    @Getter
+    @Setter
     private byte[] profileDataBytes;
     @NoXss
-    @ApiModelProperty(position = 13, value = "Unique provisioning key used by 'Device Provisioning' feature.")
+    @Schema(description = "Unique provisioning key used by 'Device Provisioning' feature.")
     private String provisionDeviceKey;
 
-    @ApiModelProperty(position = 9, value = "Reference to the firmware OTA package. If present, the specified package will be used as default device firmware. ")
+    @Schema(description = "Reference to the firmware OTA package. If present, the specified package will be used as default device firmware. ")
     private OtaPackageId firmwareId;
-    @ApiModelProperty(position = 10, value = "Reference to the software OTA package. If present, the specified package will be used as default device software. ")
+    @Schema(description = "Reference to the software OTA package. If present, the specified package will be used as default device software. ")
     private OtaPackageId softwareId;
 
-    @ApiModelProperty(position = 17, value = "Reference to the edge rule chain. " +
+    @Schema(description = "Reference to the edge rule chain. " +
             "If present, the specified edge rule chain will be used on the edge to process all messages related to device, including telemetry, attribute updates, etc. " +
             "Otherwise, the edge root rule chain will be used to process those messages.")
     private RuleChainId defaultEdgeRuleChainId;
@@ -121,7 +124,7 @@ public class DeviceProfile extends BaseData<DeviceProfileId> implements HasName,
         this.externalId = deviceProfile.getExternalId();
     }
 
-    @ApiModelProperty(position = 1, value = "JSON object with the device profile Id. " +
+    @Schema(description = "JSON object with the device profile Id. " +
             "Specify this field to update the device profile. " +
             "Referencing non-existing device profile Id will cause error. " +
             "Omit this field to create new device profile.")
@@ -130,18 +133,18 @@ public class DeviceProfile extends BaseData<DeviceProfileId> implements HasName,
         return super.getId();
     }
 
-    @ApiModelProperty(position = 2, value = "Timestamp of the profile creation, in milliseconds", example = "1609459200000", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Timestamp of the profile creation, in milliseconds", example = "1609459200000", accessMode = Schema.AccessMode.READ_ONLY)
     @Override
     public long getCreatedTime() {
         return super.getCreatedTime();
     }
 
-    @ApiModelProperty(position = 5, value = "Used to mark the default profile. Default profile is used when the device profile is not specified during device creation.")
+    @Schema(description = "Used to mark the default profile. Default profile is used when the device profile is not specified during device creation.")
     public boolean isDefault() {
         return isDefault;
     }
 
-    @ApiModelProperty(position = 16, value = "Complex JSON object that includes addition device profile configuration (transport, alarm rules, etc).")
+    @Schema(description = "Complex JSON object that includes addition device profile configuration (transport, alarm rules, etc).")
     public DeviceProfileData getProfileData() {
         if (profileData != null) {
             return profileData;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/DeviceProfileInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/DeviceProfileInfo.java
index 333757a8ae..3bc879ff76 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/DeviceProfileInfo.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/DeviceProfileInfo.java
@@ -17,7 +17,7 @@ package org.thingsboard.server.common.data;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import lombok.Value;
@@ -33,16 +33,16 @@ import java.util.UUID;
 @ToString(callSuper = true, exclude = "image")
 public class DeviceProfileInfo extends EntityInfo {
 
-    @ApiModelProperty(position = 3, value = "Either URL or Base64 data of the icon. Used in the mobile application to visualize set of device profiles in the grid view. ")
+    @Schema(description = "Either URL or Base64 data of the icon. Used in the mobile application to visualize set of device profiles in the grid view. ")
     private final String image;
-    @ApiModelProperty(position = 4, value = "Reference to the dashboard. Used in the mobile application to open the default dashboard when user navigates to device details.")
+    @Schema(description = "Reference to the dashboard. Used in the mobile application to open the default dashboard when user navigates to device details.")
     private final DashboardId defaultDashboardId;
-    @ApiModelProperty(position = 5, value = "Type of the profile. Always 'DEFAULT' for now. Reserved for future use.")
+    @Schema(description = "Type of the profile. Always 'DEFAULT' for now. Reserved for future use.")
     private final DeviceProfileType type;
-    @ApiModelProperty(position = 6, value = "Type of the transport used to connect the device. Default transport supports HTTP, CoAP and MQTT.")
+    @Schema(description = "Type of the transport used to connect the device. Default transport supports HTTP, CoAP and MQTT.")
     private final DeviceTransportType transportType;
 
-    @ApiModelProperty(position = 7, value = "Tenant id.")
+    @Schema(description = "Tenant id.")
     private final TenantId tenantId;
 
     @JsonCreator
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/EdgeUpgradeMessage.java b/common/data/src/main/java/org/thingsboard/server/common/data/EdgeUpgradeMessage.java
index fbf3fca8f5..27beca75e9 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/EdgeUpgradeMessage.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/EdgeUpgradeMessage.java
@@ -15,19 +15,18 @@
  */
 package org.thingsboard.server.common.data;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Map;
 
 @Data
-@ApiModel
+@Schema
 public class EdgeUpgradeMessage implements Serializable {
 
     private static final long serialVersionUID = 2872965507642822989L;
 
-    @ApiModelProperty(position = 1, value = "Mapping for upgrade versions and upgrade strategy (next ver).")
+    @Schema(description = "Mapping for upgrade versions and upgrade strategy (next ver).")
     private final Map<String, EdgeUpgradeInfo> edgeVersions;
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/EntityInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/EntityInfo.java
index 32a64da6b3..5661579562 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/EntityInfo.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/EntityInfo.java
@@ -17,8 +17,7 @@ package org.thingsboard.server.common.data;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.EntityIdFactory;
@@ -26,13 +25,13 @@ import org.thingsboard.server.common.data.id.HasId;
 
 import java.util.UUID;
 
-@ApiModel
+@Schema
 @Data
 public class EntityInfo implements HasId<EntityId>, HasName {
 
-    @ApiModelProperty(position = 1, value = "JSON object with the entity Id. ")
+    @Schema(description = "JSON object with the entity Id. ")
     private final EntityId id;
-    @ApiModelProperty(position = 2, value = "Entity Name")
+    @Schema(description = "Entity Name")
     private final String name;
 
     @JsonCreator
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..6748aebb50 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
@@ -20,7 +20,6 @@ import org.apache.commons.lang3.StringUtils;
 
 import java.util.EnumSet;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * @author Andrew Shvayka
@@ -28,50 +27,57 @@ import java.util.stream.Collectors;
 public enum EntityType {
     TENANT(1),
     CUSTOMER(2),
-    USER(3),
+    USER(3, "tb_user"),
     DASHBOARD(4),
     ASSET(5),
     DEVICE(6),
-    ALARM (7),
-    RULE_CHAIN (11),
-    RULE_NODE (12),
-
-    ENTITY_VIEW (15) {
+    ALARM(7),
+    RULE_CHAIN(11),
+    RULE_NODE(12),
+    ENTITY_VIEW(15) {
         // backward compatibility for TbOriginatorTypeSwitchNode to return correct rule node connection.
         @Override
-        public String getNormalName () {
+        public String getNormalName() {
             return "Entity View";
         }
     },
-    WIDGETS_BUNDLE (16),
-    WIDGET_TYPE (17),
-    TENANT_PROFILE (20),
-    DEVICE_PROFILE (21),
-    ASSET_PROFILE (22),
-    API_USAGE_STATE (23),
-    TB_RESOURCE (24),
-    OTA_PACKAGE (25),
-    EDGE (26),
-    RPC (27),
-    QUEUE (28),
-    NOTIFICATION_TARGET (29),
-    NOTIFICATION_TEMPLATE (30),
-    NOTIFICATION_REQUEST (31),
-    NOTIFICATION (32),
-    NOTIFICATION_RULE (33);
+    WIDGETS_BUNDLE(16),
+    WIDGET_TYPE(17),
+    TENANT_PROFILE(20),
+    DEVICE_PROFILE(21),
+    ASSET_PROFILE(22),
+    API_USAGE_STATE(23),
+    TB_RESOURCE(24, "resource"),
+    OTA_PACKAGE(25),
+    EDGE(26),
+    RPC(27),
+    QUEUE(28),
+    NOTIFICATION_TARGET(29),
+    NOTIFICATION_TEMPLATE(30),
+    NOTIFICATION_REQUEST(31),
+    NOTIFICATION(32),
+    NOTIFICATION_RULE(33),
+    QUEUE_STATS(34);
 
     @Getter
     private final int protoNumber; // Corresponds to EntityTypeProto
+    @Getter
+    private final String tableName;
+    @Getter
+    private final String normalName = StringUtils.capitalize(StringUtils.removeStart(name(), "TB_")
+            .toLowerCase().replaceAll("_", " "));
+
+    public static final List<String> NORMAL_NAMES = EnumSet.allOf(EntityType.class).stream()
+            .map(EntityType::getNormalName).toList();
 
-    private EntityType(int protoNumber) {
+    EntityType(int protoNumber) {
         this.protoNumber = protoNumber;
+        this.tableName = name().toLowerCase();
     }
 
-    public static final List<String> NORMAL_NAMES = EnumSet.allOf(EntityType.class).stream()
-            .map(EntityType::getNormalName).collect(Collectors.toUnmodifiableList());
-
-    @Getter
-    private final String normalName = StringUtils.capitalize(StringUtils.removeStart(name(), "TB_")
-            .toLowerCase().replaceAll("_", " "));
+    EntityType(int protoNumber, String tableName) {
+        this.protoNumber = protoNumber;
+        this.tableName = tableName;
+    }
 
 }
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 3f802c958c..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
@@ -16,7 +16,7 @@
 package org.thingsboard.server.common.data;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -40,23 +40,23 @@ public class EntityView extends BaseDataWithAdditionalInfo<EntityViewId>
 
     private static final long serialVersionUID = 5582010124562018986L;
 
-    @ApiModelProperty(position = 7, value = "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")
-    @ApiModelProperty(position = 5, required = true, value = "Entity View name", example = "A4B72CCDFF33")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Entity View name", example = "A4B72CCDFF33")
     private String name;
     @NoXss
     @Length(fieldName = "type")
-    @ApiModelProperty(position = 6, required = true, value = "Device Profile Name", example = "Temperature Sensor")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Device Profile Name", example = "Temperature Sensor")
     private String type;
-    @ApiModelProperty(position = 8, value = "Set of telemetry and attribute keys to expose via Entity View.")
+    @Schema(description = "Set of telemetry and attribute keys to expose via Entity View.")
     private TelemetryEntityView keys;
-    @ApiModelProperty(position = 9, value = "Represents the start time of the interval that is used to limit access to target device telemetry. Customer will not be able to see entity telemetry that is outside the specified interval;")
+    @Schema(description = "Represents the start time of the interval that is used to limit access to target device telemetry. Customer will not be able to see entity telemetry that is outside the specified interval;")
     private long startTimeMs;
-    @ApiModelProperty(position = 10, value = "Represents the end time of the interval that is used to limit access to target device telemetry. Customer will not be able to see entity telemetry that is outside the specified interval;")
+    @Schema(description = "Represents the end time of the interval that is used to limit access to target device telemetry. Customer will not be able to see entity telemetry that is outside the specified interval;")
     private long endTimeMs;
 
     private EntityViewId externalId;
@@ -82,7 +82,7 @@ public class EntityView extends BaseDataWithAdditionalInfo<EntityViewId>
         this.externalId = entityView.getExternalId();
     }
 
-    @ApiModelProperty(position = 4, value = "JSON object with Customer Id. Use 'assignEntityViewToCustomer' to change the Customer Id.", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "JSON object with Customer Id. Use 'assignEntityViewToCustomer' to change the Customer Id.", accessMode = Schema.AccessMode.READ_ONLY)
     @Override
     public CustomerId getCustomerId() {
         return customerId;
@@ -93,13 +93,13 @@ public class EntityView extends BaseDataWithAdditionalInfo<EntityViewId>
         return name;
     }
 
-    @ApiModelProperty(position = 3, value = "JSON object with Tenant Id.", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "JSON object with Tenant Id.", accessMode = Schema.AccessMode.READ_ONLY)
     @Override
     public TenantId getTenantId() {
         return tenantId;
     }
 
-    @ApiModelProperty(position = 1, value = "JSON object with the Entity View Id. " +
+    @Schema(description = "JSON object with the Entity View Id. " +
             "Specify this field to update the Entity View. " +
             "Referencing non-existing Entity View Id will cause error. " +
             "Omit this field to create new Entity View." )
@@ -108,13 +108,13 @@ public class EntityView extends BaseDataWithAdditionalInfo<EntityViewId>
         return super.getId();
     }
 
-    @ApiModelProperty(position = 2, value = "Timestamp of the Entity View creation, in milliseconds", example = "1609459200000", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Timestamp of the Entity View creation, in milliseconds", example = "1609459200000", accessMode = Schema.AccessMode.READ_ONLY)
     @Override
     public long getCreatedTime() {
         return super.getCreatedTime();
     }
 
-    @ApiModelProperty(position = 11, value = "Additional parameters of the device", dataType = "com.fasterxml.jackson.databind.JsonNode")
+    @Schema(description = "Additional parameters of the device",implementation = com.fasterxml.jackson.databind.JsonNode.class)
     @Override
     public JsonNode getAdditionalInfo() {
         return super.getAdditionalInfo();
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/EntityViewInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/EntityViewInfo.java
index 1c3a49428a..4d69d6e529 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/EntityViewInfo.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/EntityViewInfo.java
@@ -15,7 +15,7 @@
  */
 package org.thingsboard.server.common.data;
 
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.id.EntityViewId;
@@ -24,9 +24,9 @@ import org.thingsboard.server.common.data.id.EntityViewId;
 @EqualsAndHashCode(callSuper = true)
 public class EntityViewInfo extends EntityView {
 
-    @ApiModelProperty(position = 12, value = "Title of the Customer that owns the entity view.", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Title of the Customer that owns the entity view.", accessMode = Schema.AccessMode.READ_ONLY)
     private String customerTitle;
-    @ApiModelProperty(position = 13, value = "Indicates special 'Public' Customer that is auto-generated to use the entity view on public dashboards.", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Indicates special 'Public' Customer that is auto-generated to use the entity view on public dashboards.", accessMode = Schema.AccessMode.READ_ONLY)
     private boolean customerIsPublic;
 
     public EntityViewInfo() {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/EventInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/EventInfo.java
index ba47b3f543..be6525755b 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/EventInfo.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/EventInfo.java
@@ -16,8 +16,7 @@
 package org.thingsboard.server.common.data;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.EventId;
@@ -27,18 +26,18 @@ import org.thingsboard.server.common.data.id.TenantId;
  * @author Andrew Shvayka
  */
 @Data
-@ApiModel
+@Schema
 public class EventInfo extends BaseData<EventId> {
 
-    @ApiModelProperty(position = 1, value = "JSON object with Tenant Id.", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "JSON object with Tenant Id.", accessMode = Schema.AccessMode.READ_ONLY)
     private TenantId tenantId;
-    @ApiModelProperty(position = 2, value = "Event type", example = "STATS")
+    @Schema(description = "Event type", example = "STATS")
     private String type;
-    @ApiModelProperty(position = 3, value = "string", example = "784f394c-42b6-435a-983c-b7beff2784f9")
+    @Schema(description = "string", example = "784f394c-42b6-435a-983c-b7beff2784f9")
     private String uid;
-    @ApiModelProperty(position = 4, value = "JSON object with Entity Id for which event is created.", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "JSON object with Entity Id for which event is created.", accessMode = Schema.AccessMode.READ_ONLY)
     private EntityId entityId;
-    @ApiModelProperty(position = 5, value = "Event body.", dataType = "com.fasterxml.jackson.databind.JsonNode")
+    @Schema(description = "Event body.",implementation = com.fasterxml.jackson.databind.JsonNode.class)
     private transient JsonNode body;
 
     public EventInfo() {
@@ -53,7 +52,7 @@ public class EventInfo extends BaseData<EventId> {
         super(event);
     }
 
-    @ApiModelProperty(position = 6, value = "Timestamp of the event creation, in milliseconds", example = "1609459200000", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Timestamp of the event creation, in milliseconds", example = "1609459200000", accessMode = Schema.AccessMode.READ_ONLY)
     @Override
     public long getCreatedTime() {
         return super.getCreatedTime();
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/ExportableEntity.java b/common/data/src/main/java/org/thingsboard/server/common/data/ExportableEntity.java
index 278f793d28..cb3f38766b 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/ExportableEntity.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/ExportableEntity.java
@@ -15,7 +15,7 @@
  */
 package org.thingsboard.server.common.data;
 
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.HasId;
 import org.thingsboard.server.common.data.id.TenantId;
@@ -24,7 +24,7 @@ public interface ExportableEntity<I extends EntityId> extends HasId<I>, HasName
 
     void setId(I id);
 
-    @ApiModelProperty(position = 100, value = "JSON object with External Id from the VCS", accessMode = ApiModelProperty.AccessMode.READ_ONLY, hidden = true)
+    @Schema(description = "JSON object with External Id from the VCS", accessMode = Schema.AccessMode.READ_ONLY, hidden = true)
     I getExternalId();
 
     void setExternalId(I externalId);
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/HomeDashboard.java b/common/data/src/main/java/org/thingsboard/server/common/data/HomeDashboard.java
index fe6a62e31d..f8707f2e30 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/HomeDashboard.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/HomeDashboard.java
@@ -15,17 +15,16 @@
  */
 package org.thingsboard.server.common.data;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-@ApiModel
+@Schema
 @Data
 public class HomeDashboard extends Dashboard {
 
     public static final String HIDE_DASHBOARD_TOOLBAR_DESCRIPTION = "Hide dashboard toolbar flag. Useful for rendering dashboards on mobile.";
 
-    @ApiModelProperty(position = 10, value = HIDE_DASHBOARD_TOOLBAR_DESCRIPTION)
+    @Schema(description = HIDE_DASHBOARD_TOOLBAR_DESCRIPTION)
     private boolean hideDashboardToolbar;
 
     public HomeDashboard(Dashboard dashboard, boolean hideDashboardToolbar) {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/HomeDashboardInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/HomeDashboardInfo.java
index 0c95b82ce7..11bdaa2997 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/HomeDashboardInfo.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/HomeDashboardInfo.java
@@ -15,18 +15,17 @@
  */
 package org.thingsboard.server.common.data;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import org.thingsboard.server.common.data.id.DashboardId;
 
-@ApiModel
+@Schema
 @Data
 @AllArgsConstructor
 public class HomeDashboardInfo {
-    @ApiModelProperty(position = 1, value = "JSON object with the dashboard Id.")
+    @Schema(description = "JSON object with the dashboard Id.")
     private DashboardId dashboardId;
-    @ApiModelProperty(position = 1, value = HomeDashboard.HIDE_DASHBOARD_TOOLBAR_DESCRIPTION)
+    @Schema(description = HomeDashboard.HIDE_DASHBOARD_TOOLBAR_DESCRIPTION)
     private boolean hideDashboardToolbar;
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/ImageExportData.java b/common/data/src/main/java/org/thingsboard/server/common/data/ImageExportData.java
index a39fa72692..b407563d24 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/ImageExportData.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/ImageExportData.java
@@ -15,14 +15,14 @@
  */
 package org.thingsboard.server.common.data;
 
-import io.swagger.annotations.ApiModel;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
-@ApiModel
+@Schema
 @Slf4j
 @Data
 @NoArgsConstructor
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/JavaSerDesUtil.java b/common/data/src/main/java/org/thingsboard/server/common/data/JavaSerDesUtil.java
new file mode 100644
index 0000000000..7fd8f78a1f
--- /dev/null
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/JavaSerDesUtil.java
@@ -0,0 +1,57 @@
+/**
+ * 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;
+
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+
+@Slf4j
+public class JavaSerDesUtil {
+
+    @SuppressWarnings("unchecked")
+    public static <T> T decode(byte[] byteArray) {
+        if (byteArray == null || byteArray.length == 0) {
+            return null;
+        }
+        InputStream is = new ByteArrayInputStream(byteArray);
+        try (ObjectInputStream ois = new ObjectInputStream(is)) {
+            return (T) ois.readObject();
+        } catch (IOException | ClassNotFoundException e) {
+            log.error("Error during deserialization message, [{}]", e.getMessage());
+            return null;
+        }
+    }
+
+    public static <T> byte[] encode(T msq) {
+        if (msq == null) {
+            return null;
+        }
+        ByteArrayOutputStream boas = new ByteArrayOutputStream();
+        try (ObjectOutputStream ois = new ObjectOutputStream(boas)) {
+            ois.writeObject(msq);
+            return boas.toByteArray();
+        } catch (IOException e) {
+            log.error("Error during serialization message, [{}]", e.getMessage());
+            throw new RuntimeException(e);
+        }
+    }
+}
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/OtaPackage.java b/common/data/src/main/java/org/thingsboard/server/common/data/OtaPackage.java
index 4e35183cbe..28eafefbf4 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/OtaPackage.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/OtaPackage.java
@@ -15,22 +15,21 @@
  */
 package org.thingsboard.server.common.data;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.id.OtaPackageId;
 
 import java.nio.ByteBuffer;
 
-@ApiModel
+@Schema
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class OtaPackage extends OtaPackageInfo {
 
     private static final long serialVersionUID = 3091601761339422546L;
 
-    @ApiModelProperty(position = 16, value = "OTA Package data.", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "OTA Package data.", accessMode = Schema.AccessMode.READ_ONLY)
     private transient ByteBuffer data;
 
     public OtaPackage() {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/OtaPackageInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/OtaPackageInfo.java
index 78acd8bcfe..6cf5e2f1a8 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/OtaPackageInfo.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/OtaPackageInfo.java
@@ -17,8 +17,7 @@ package org.thingsboard.server.common.data;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.JsonNode;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;
@@ -30,7 +29,7 @@ import org.thingsboard.server.common.data.ota.OtaPackageType;
 import org.thingsboard.server.common.data.validation.Length;
 import org.thingsboard.server.common.data.validation.NoXss;
 
-@ApiModel
+@Schema
 @Slf4j
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -38,44 +37,44 @@ public class OtaPackageInfo extends BaseDataWithAdditionalInfo<OtaPackageId> imp
 
     private static final long serialVersionUID = 3168391583570815419L;
 
-    @ApiModelProperty(position = 3, value = "JSON object with Tenant Id. Tenant Id of the ota package can't be changed.", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "JSON object with Tenant Id. Tenant Id of the ota package can't be changed.", accessMode = Schema.AccessMode.READ_ONLY)
     private TenantId tenantId;
-    @ApiModelProperty(position = 4, value = "JSON object with Device Profile Id. Device Profile Id of the ota package can't be changed.", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "JSON object with Device Profile Id. Device Profile Id of the ota package can't be changed.", accessMode = Schema.AccessMode.READ_ONLY)
     private DeviceProfileId deviceProfileId;
-    @ApiModelProperty(position = 5, value = "OTA Package type.", example = "FIRMWARE", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "OTA Package type.", example = "FIRMWARE", accessMode = Schema.AccessMode.READ_ONLY)
     private OtaPackageType type;
     @Length(fieldName = "title")
     @NoXss
-    @ApiModelProperty(position = 6, value = "OTA Package title.", example = "fw", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "OTA Package title.", example = "fw", accessMode = Schema.AccessMode.READ_ONLY)
     private String title;
     @Length(fieldName = "version")
     @NoXss
-    @ApiModelProperty(position = 7, value = "OTA Package version.", example = "1.0", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "OTA Package version.", example = "1.0", accessMode = Schema.AccessMode.READ_ONLY)
     private String version;
     @Length(fieldName = "tag")
     @NoXss
-    @ApiModelProperty(position = 8, value = "OTA Package tag.", example = "fw_1.0", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "OTA Package tag.", example = "fw_1.0", accessMode = Schema.AccessMode.READ_ONLY)
     private String tag;
     @Length(fieldName = "url")
     @NoXss
-    @ApiModelProperty(position = 9, value = "OTA Package url.", example = "http://thingsboard.org/fw/1", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "OTA Package url.", example = "http://thingsboard.org/fw/1", accessMode = Schema.AccessMode.READ_ONLY)
     private String url;
-    @ApiModelProperty(position = 10, value = "Indicates OTA Package 'has data'. Field is returned from DB ('true' if data exists or url is set).  If OTA Package 'has data' is 'false' we can not assign the OTA Package to the Device or Device Profile.", example = "true", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Indicates OTA Package 'has data'. Field is returned from DB ('true' if data exists or url is set).  If OTA Package 'has data' is 'false' we can not assign the OTA Package to the Device or Device Profile.", example = "true", accessMode = Schema.AccessMode.READ_ONLY)
     private boolean hasData;
     @Length(fieldName = "file name")
     @NoXss
-    @ApiModelProperty(position = 11, value = "OTA Package file name.", example = "fw_1.0", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "OTA Package file name.", example = "fw_1.0", accessMode = Schema.AccessMode.READ_ONLY)
     private String fileName;
     @NoXss
     @Length(fieldName = "contentType")
-    @ApiModelProperty(position = 12, value = "OTA Package content type.", example = "APPLICATION_OCTET_STREAM", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "OTA Package content type.", example = "APPLICATION_OCTET_STREAM", accessMode = Schema.AccessMode.READ_ONLY)
     private String contentType;
-    @ApiModelProperty(position = 13, value = "OTA Package checksum algorithm.", example = "CRC32", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "OTA Package checksum algorithm.", example = "CRC32", accessMode = Schema.AccessMode.READ_ONLY)
     private ChecksumAlgorithm checksumAlgorithm;
     @Length(fieldName = "checksum", max = 1020)
-    @ApiModelProperty(position = 14, value = "OTA Package checksum.", example = "0xd87f7e0c", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "OTA Package checksum.", example = "0xd87f7e0c", accessMode = Schema.AccessMode.READ_ONLY)
     private String checksum;
-    @ApiModelProperty(position = 15, value = "OTA Package data size.", example = "8", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "OTA Package data size.", example = "8", accessMode = Schema.AccessMode.READ_ONLY)
     private Long dataSize;
 
     public OtaPackageInfo() {
@@ -103,7 +102,7 @@ public class OtaPackageInfo extends BaseDataWithAdditionalInfo<OtaPackageId> imp
         this.dataSize = otaPackageInfo.getDataSize();
     }
 
-    @ApiModelProperty(position = 1, value = "JSON object with the ota package Id. " +
+    @Schema(description = "JSON object with the ota package Id. " +
             "Specify existing ota package Id to update the ota package. " +
             "Referencing non-existing ota package id will cause error. " +
             "Omit this field to create new ota package.")
@@ -112,7 +111,7 @@ public class OtaPackageInfo extends BaseDataWithAdditionalInfo<OtaPackageId> imp
         return super.getId();
     }
 
-    @ApiModelProperty(position = 2, value = "Timestamp of the ota package creation, in milliseconds", example = "1609459200000", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Timestamp of the ota package creation, in milliseconds", example = "1609459200000", accessMode = Schema.AccessMode.READ_ONLY)
     @Override
     public long getCreatedTime() {
         return super.getCreatedTime();
@@ -129,7 +128,7 @@ public class OtaPackageInfo extends BaseDataWithAdditionalInfo<OtaPackageId> imp
         return StringUtils.isNotEmpty(url);
     }
 
-    @ApiModelProperty(position = 17, value = "OTA Package description.", example = "Description for the OTA Package fw_1.0")
+    @Schema(description = "OTA Package description.", example = "Description for the OTA Package fw_1.0")
     @Override
     public JsonNode getAdditionalInfo() {
         return super.getAdditionalInfo();
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 95a3d50329..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
@@ -15,21 +15,20 @@
  */
 package org.thingsboard.server.common.data;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.thingsboard.server.common.data.security.DeviceCredentials;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;;
 
-@ApiModel
+@Schema
 @Data
 public class SaveDeviceWithCredentialsRequest {
 
-    @ApiModelProperty(position = 1, value = "The JSON with device entity.", required = true)
+    @Schema(description = "The JSON with device entity.", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull
     private final Device device;
-    @ApiModelProperty(position = 2, value = "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/SaveOtaPackageInfoRequest.java b/common/data/src/main/java/org/thingsboard/server/common/data/SaveOtaPackageInfoRequest.java
index c7a2b82c9f..f146074a3d 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/SaveOtaPackageInfoRequest.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/SaveOtaPackageInfoRequest.java
@@ -15,18 +15,17 @@
  */
 package org.thingsboard.server.common.data;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
-@ApiModel
+@Schema
 @Data
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 public class SaveOtaPackageInfoRequest extends OtaPackageInfo {
-    @ApiModelProperty(position = 16, value = "Indicates OTA Package uses url. Should be 'true' if uses url or 'false' if will be used data.", example = "true", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Indicates OTA Package uses url. Should be 'true' if uses url or 'false' if will be used data.", example = "true", accessMode = Schema.AccessMode.READ_ONLY)
     boolean usesUrl;
 
     public SaveOtaPackageInfoRequest(OtaPackageInfo otaPackageInfo, boolean usesUrl) {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/ShortCustomerInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/ShortCustomerInfo.java
index a04f8fafc8..7d3acbf641 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/ShortCustomerInfo.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/ShortCustomerInfo.java
@@ -15,8 +15,7 @@
  */
 package org.thingsboard.server.common.data;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Setter;
@@ -27,20 +26,20 @@ import org.thingsboard.server.common.data.validation.NoXss;
  * Created by igor on 2/27/18.
  */
 
-@ApiModel
+@Schema
 @AllArgsConstructor
 public class ShortCustomerInfo {
 
-    @ApiModelProperty(position = 1, value = "JSON object with the customer Id.")
+    @Schema(description = "JSON object with the customer Id.")
     @Getter @Setter
     private CustomerId customerId;
 
-    @ApiModelProperty(position = 2, value = "Title of the customer.")
+    @Schema(description = "Title of the customer.")
     @Getter @Setter
     @NoXss
     private String title;
 
-    @ApiModelProperty(position = 3, value = "Indicates special 'Public' customer used to embed dashboards on public websites.")
+    @Schema(description = "Indicates special 'Public' customer used to embed dashboards on public websites.")
     @Getter @Setter
     private boolean isPublic;
 
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/SystemInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/SystemInfo.java
index bd71bd3823..bbe7d98c06 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/SystemInfo.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/SystemInfo.java
@@ -15,15 +15,15 @@
  */
 package org.thingsboard.server.common.data;
 
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.util.List;
 
 @Data
 public class SystemInfo {
-    @ApiModelProperty(position = 1, value = "Is monolith.")
+    @Schema(description = "Is monolith.")
     private boolean isMonolith;
-    @ApiModelProperty(position = 2, value = "System data.")
+    @Schema(description = "System data.")
     private List<SystemInfoData> systemData;
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/SystemInfoData.java b/common/data/src/main/java/org/thingsboard/server/common/data/SystemInfoData.java
index 13bb42d897..889d95b671 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/SystemInfoData.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/SystemInfoData.java
@@ -15,26 +15,26 @@
  */
 package org.thingsboard.server.common.data;
 
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 @Data
 public class SystemInfoData {
-    @ApiModelProperty(position = 1, value = "Service Id.")
+    @Schema(description = "Service Id.")
     private String serviceId;
-    @ApiModelProperty(position = 2, value = "Service type.")
+    @Schema(description = "Service type.")
     private String serviceType;
-    @ApiModelProperty(position = 3, value = "CPU usage, in percent.")
+    @Schema(description = "CPU usage, in percent.")
     private Long cpuUsage;
-    @ApiModelProperty(position = 4, value = "Total CPU usage.")
+    @Schema(description = "Total CPU usage.")
     private Long cpuCount;
-    @ApiModelProperty(position = 5, value = "Memory usage, in percent.")
+    @Schema(description = "Memory usage, in percent.")
     private Long memoryUsage;
-    @ApiModelProperty(position = 6, value = "Total memory in bytes.")
+    @Schema(description = "Total memory in bytes.")
     private Long totalMemory;
-    @ApiModelProperty(position = 7, value = "Disk usage, in percent.")
+    @Schema(description = "Disk usage, in percent.")
     private Long discUsage;
-    @ApiModelProperty(position = 8, value = "Total disc space in bytes.")
+    @Schema(description = "Total disc space in bytes.")
     private Long totalDiscSpace;
 
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/TbResource.java b/common/data/src/main/java/org/thingsboard/server/common/data/TbResource.java
index 87336bcbe1..2cae75da2a 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/TbResource.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/TbResource.java
@@ -17,7 +17,7 @@ package org.thingsboard.server.common.data;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.annotation.JsonSetter;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;
@@ -55,7 +55,7 @@ public class TbResource extends TbResourceInfo {
         this.preview = resource.preview;
     }
 
-    @ApiModelProperty(position = 12, value = "Resource data.", example = "77u/PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPCEtLQpGSUxFIElORk9STUFUSU9OCgpPTUEgUGVybWFuZW50IERvY3VtZW50CiAgIEZpbGU6IE9NQS1TVVAtTHdNMk1fQmluYXJ5QXBwRGF0YUNvbnRhaW5lci1WMV8wXzEtMjAxOTAyMjEtQQogICBUeXBlOiB4bWwKClB1YmxpYyBSZWFjaGFibGUgSW5mb3JtYXRpb24KICAgUGF0aDogaHR0cDovL3d3dy5vcGVubW9iaWxlYWxsaWFuY2Uub3JnL3RlY2gvcHJvZmlsZXMKICAgTmFtZTogTHdNMk1fQmluYXJ5QXBwRGF0YUNvbnRhaW5lci12MV8wXzEueG1sCgpOT1JNQVRJVkUgSU5GT1JNQVRJT04KCiAgSW5mb3JtYXRpb24gYWJvdXQgdGhpcyBmaWxlIGNhbiBiZSBmb3VuZCBpbiB0aGUgbGF0ZXN0IHJldmlzaW9uIG9mCgogIE9NQS1UUy1MV00yTV9CaW5hcnlBcHBEYXRhQ29udGFpbmVyLVYxXzBfMQoKICBUaGlzIGlzIGF2YWlsYWJsZSBhdCBodHRwOi8vd3d3Lm9wZW5tb2JpbGVhbGxpYW5jZS5vcmcvCgogIFNlbmQgY29tbWVudHMgdG8gaHR0cHM6Ly9naXRodWIuY29tL09wZW5Nb2JpbGVBbGxpYW5jZS9PTUFfTHdNMk1fZm9yX0RldmVsb3BlcnMvaXNzdWVzCgpDSEFOR0UgSElTVE9SWQoKMTUwNjIwMTggU3RhdHVzIGNoYW5nZWQgdG8gQXBwcm92ZWQgYnkgRE0sIERvYyBSZWYgIyBPTUEtRE0mU0UtMjAxOC0wMDYxLUlOUF9MV00yTV9BUFBEQVRBX1YxXzBfRVJQX2Zvcl9maW5hbF9BcHByb3ZhbAoyMTAyMjAxOSBTdGF0dXMgY2hhbmdlZCB0byBBcHByb3ZlZCBieSBJUFNPLCBEb2MgUmVmICMgT01BLUlQU08tMjAxOS0wMDI1LUlOUF9Md00yTV9PYmplY3RfQXBwX0RhdGFfQ29udGFpbmVyXzFfMF8xX2Zvcl9GaW5hbF9BcHByb3ZhbAoKTEVHQUwgRElTQ0xBSU1FUgoKQ29weXJpZ2h0IDIwMTkgT3BlbiBNb2JpbGUgQWxsaWFuY2UuCgpSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCmFyZSBtZXQ6CgoxLiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodApub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCjIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0Cm5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KMy4gTmVpdGhlciB0aGUgbmFtZSBvZiB0aGUgY29weXJpZ2h0IGhvbGRlciBub3IgdGhlIG5hbWVzIG9mIGl0cwpjb250cmlidXRvcnMgbWF5IGJlIHVzZWQgdG8gZW5kb3JzZSBvciBwcm9tb3RlIHByb2R1Y3RzIGRlcml2ZWQKZnJvbSB0aGlzIHNvZnR3YXJlIHdpdGhvdXQgc3BlY2lmaWMgcHJpb3Igd3JpdHRlbiBwZXJtaXNzaW9uLgoKVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBUSEUgQ09QWVJJR0hUIEhPTERFUlMgQU5EIENPTlRSSUJVVE9SUwoiQVMgSVMiIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVApMSU1JVEVEIFRPLCBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUwpGT1IgQSBQQVJUSUNVTEFSIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIFRIRQpDT1BZUklHSFQgSE9MREVSIE9SIENPTlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULApJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLApCVVQgTk9UIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7CkxPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIKQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUCkxJQUJJTElUWSwgT1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOCkFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRQpQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KClRoZSBhYm92ZSBsaWNlbnNlIGlzIHVzZWQgYXMgYSBsaWNlbnNlIHVuZGVyIGNvcHlyaWdodCBvbmx5LiBQbGVhc2UKcmVmZXJlbmNlIHRoZSBPTUEgSVBSIFBvbGljeSBmb3IgcGF0ZW50IGxpY2Vuc2luZyB0ZXJtczoKaHR0cHM6Ly93d3cub21hc3BlY3dvcmtzLm9yZy9hYm91dC9pbnRlbGxlY3R1YWwtcHJvcGVydHktcmlnaHRzLwoKLS0+CjxMV00yTSB4bWxuczp4c2k9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hLWluc3RhbmNlIiB4c2k6bm9OYW1lc3BhY2VTY2hlbWFMb2NhdGlvbj0iaHR0cDovL29wZW5tb2JpbGVhbGxpYW5jZS5vcmcvdGVjaC9wcm9maWxlcy9MV00yTS54c2QiPgoJPE9iamVjdCBPYmplY3RUeXBlPSJNT0RlZmluaXRpb24iPgoJCTxOYW1lPkJpbmFyeUFwcERhdGFDb250YWluZXI8L05hbWU+CgkJPERlc2NyaXB0aW9uMT48IVtDREFUQVtUaGlzIEx3TTJNIE9iamVjdHMgcHJvdmlkZXMgdGhlIGFwcGxpY2F0aW9uIHNlcnZpY2UgZGF0YSByZWxhdGVkIHRvIGEgTHdNMk0gU2VydmVyLCBlZy4gV2F0ZXIgbWV0ZXIgZGF0YS4gClRoZXJlIGFyZSBzZXZlcmFsIG1ldGhvZHMgdG8gY3JlYXRlIGluc3RhbmNlIHRvIGluZGljYXRlIHRoZSBtZXNzYWdlIGRpcmVjdGlvbiBiYXNlZCBvbiB0aGUgbmVnb3RpYXRpb24gYmV0d2VlbiBBcHBsaWNhdGlvbiBhbmQgTHdNMk0uIFRoZSBDbGllbnQgYW5kIFNlcnZlciBzaG91bGQgbmVnb3RpYXRlIHRoZSBpbnN0YW5jZShzKSB1c2VkIHRvIGV4Y2hhbmdlIHRoZSBkYXRhLiBGb3IgZXhhbXBsZToKIC0gVXNpbmcgYSBzaW5nbGUgaW5zdGFuY2UgZm9yIGJvdGggZGlyZWN0aW9ucyBjb21tdW5pY2F0aW9uLCBmcm9tIENsaWVudCB0byBTZXJ2ZXIgYW5kIGZyb20gU2VydmVyIHRvIENsaWVudC4KIC0gVXNpbmcgYW4gaW5zdGFuY2UgZm9yIGNvbW11bmljYXRpb24gZnJvbSBDbGllbnQgdG8gU2VydmVyIGFuZCBhbm90aGVyIG9uZSBmb3IgY29tbXVuaWNhdGlvbiBmcm9tIFNlcnZlciB0byBDbGllbnQKIC0gVXNpbmcgc2V2ZXJhbCBpbnN0YW5jZXMKXV0+PC9EZXNjcmlwdGlvbjE+CgkJPE9iamVjdElEPjE5PC9PYmplY3RJRD4KCQk8T2JqZWN0VVJOPnVybjpvbWE6bHdtMm06b21hOjE5PC9PYmplY3RVUk4+CgkJPExXTTJNVmVyc2lvbj4xLjA8L0xXTTJNVmVyc2lvbj4KCQk8T2JqZWN0VmVyc2lvbj4xLjA8L09iamVjdFZlcnNpb24+CgkJPE11bHRpcGxlSW5zdGFuY2VzPk11bHRpcGxlPC9NdWx0aXBsZUluc3RhbmNlcz4KCQk8TWFuZGF0b3J5Pk9wdGlvbmFsPC9NYW5kYXRvcnk+CgkJPFJlc291cmNlcz4KCQkJPEl0ZW0gSUQ9IjAiPjxOYW1lPkRhdGE8L05hbWU+CgkJCQk8T3BlcmF0aW9ucz5SVzwvT3BlcmF0aW9ucz4KCQkJCTxNdWx0aXBsZUluc3RhbmNlcz5NdWx0aXBsZTwvTXVsdGlwbGVJbnN0YW5jZXM+CgkJCQk8TWFuZGF0b3J5Pk1hbmRhdG9yeTwvTWFuZGF0b3J5PgoJCQkJPFR5cGU+T3BhcXVlPC9UeXBlPgoJCQkJPFJhbmdlRW51bWVyYXRpb24gLz4KCQkJCTxVbml0cyAvPgoJCQkJPERlc2NyaXB0aW9uPjwhW0NEQVRBW0luZGljYXRlcyB0aGUgYXBwbGljYXRpb24gZGF0YSBjb250ZW50Ll1dPjwvRGVzY3JpcHRpb24+CgkJCTwvSXRlbT4KCQkJPEl0ZW0gSUQ9IjEiPjxOYW1lPkRhdGEgUHJpb3JpdHk8L05hbWU+CgkJCQk8T3BlcmF0aW9ucz5SVzwvT3BlcmF0aW9ucz4KCQkJCTxNdWx0aXBsZUluc3RhbmNlcz5TaW5nbGU8L011bHRpcGxlSW5zdGFuY2VzPgoJCQkJPE1hbmRhdG9yeT5PcHRpb25hbDwvTWFuZGF0b3J5PgoJCQkJPFR5cGU+SW50ZWdlcjwvVHlwZT4KCQkJCTxSYW5nZUVudW1lcmF0aW9uPjEgYnl0ZXM8L1JhbmdlRW51bWVyYXRpb24+CgkJCQk8VW5pdHMgLz4KCQkJCTxEZXNjcmlwdGlvbj48IVtDREFUQVtJbmRpY2F0ZXMgdGhlIEFwcGxpY2F0aW9uIGRhdGEgcHJpb3JpdHk6CjA6SW1tZWRpYXRlCjE6QmVzdEVmZm9ydAoyOkxhdGVzdAozLTEwMDogUmVzZXJ2ZWQgZm9yIGZ1dHVyZSB1c2UuCjEwMS0yNTQ6IFByb3ByaWV0YXJ5IG1vZGUuXV0+PC9EZXNjcmlwdGlvbj4KCQkJPC9JdGVtPgoJCQk8SXRlbSBJRD0iMiI+PE5hbWU+RGF0YSBDcmVhdGlvbiBUaW1lPC9OYW1lPgoJCQkJPE9wZXJhdGlvbnM+Ulc8L09wZXJhdGlvbnM+CgkJCQk8TXVsdGlwbGVJbnN0YW5jZXM+U2luZ2xlPC9NdWx0aXBsZUluc3RhbmNlcz4KCQkJCTxNYW5kYXRvcnk+T3B0aW9uYWw8L01hbmRhdG9yeT4KCQkJCTxUeXBlPlRpbWU8L1R5cGU+CgkJCQk8UmFuZ2VFbnVtZXJhdGlvbiAvPgoJCQkJPFVuaXRzIC8+CgkJCQk8RGVzY3JpcHRpb24+PCFbQ0RBVEFbSW5kaWNhdGVzIHRoZSBEYXRhIGluc3RhbmNlIGNyZWF0aW9uIHRpbWVzdGFtcC5dXT48L0Rlc2NyaXB0aW9uPgoJCQk8L0l0ZW0+CgkJCTxJdGVtIElEPSIzIj48TmFtZT5EYXRhIERlc2NyaXB0aW9uPC9OYW1lPgoJCQkJPE9wZXJhdGlvbnM+Ulc8L09wZXJhdGlvbnM+CgkJCQk8TXVsdGlwbGVJbnN0YW5jZXM+U2luZ2xlPC9NdWx0aXBsZUluc3RhbmNlcz4KCQkJCTxNYW5kYXRvcnk+T3B0aW9uYWw8L01hbmRhdG9yeT4KCQkJCTxUeXBlPlN0cmluZzwvVHlwZT4KCQkJCTxSYW5nZUVudW1lcmF0aW9uPjMyIGJ5dGVzPC9SYW5nZUVudW1lcmF0aW9uPgoJCQkJPFVuaXRzIC8+CgkJCQk8RGVzY3JpcHRpb24+PCFbQ0RBVEFbSW5kaWNhdGVzIHRoZSBkYXRhIGRlc2NyaXB0aW9uLgplLmcuICJtZXRlciByZWFkaW5nIi5dXT48L0Rlc2NyaXB0aW9uPgoJCQk8L0l0ZW0+CgkJCTxJdGVtIElEPSI0Ij48TmFtZT5EYXRhIEZvcm1hdDwvTmFtZT4KCQkJCTxPcGVyYXRpb25zPlJXPC9PcGVyYXRpb25zPgoJCQkJPE11bHRpcGxlSW5zdGFuY2VzPlNpbmdsZTwvTXVsdGlwbGVJbnN0YW5jZXM+CgkJCQk8TWFuZGF0b3J5Pk9wdGlvbmFsPC9NYW5kYXRvcnk+CgkJCQk8VHlwZT5TdHJpbmc8L1R5cGU+CgkJCQk8UmFuZ2VFbnVtZXJhdGlvbj4zMiBieXRlczwvUmFuZ2VFbnVtZXJhdGlvbj4KCQkJCTxVbml0cyAvPgoJCQkJPERlc2NyaXB0aW9uPjwhW0NEQVRBW0luZGljYXRlcyB0aGUgZm9ybWF0IG9mIHRoZSBBcHBsaWNhdGlvbiBEYXRhLgplLmcuIFlHLU1ldGVyLVdhdGVyLVJlYWRpbmcKVVRGOC1zdHJpbmcKXV0+PC9EZXNjcmlwdGlvbj4KCQkJPC9JdGVtPgoJCQk8SXRlbSBJRD0iNSI+PE5hbWU+QXBwIElEPC9OYW1lPgoJCQkJPE9wZXJhdGlvbnM+Ulc8L09wZXJhdGlvbnM+CgkJCQk8TXVsdGlwbGVJbnN0YW5jZXM+U2luZ2xlPC9NdWx0aXBsZUluc3RhbmNlcz4KCQkJCTxNYW5kYXRvcnk+T3B0aW9uYWw8L01hbmRhdG9yeT4KCQkJCTxUeXBlPkludGVnZXI8L1R5cGU+CgkJCQk8UmFuZ2VFbnVtZXJhdGlvbj4yIGJ5dGVzPC9SYW5nZUVudW1lcmF0aW9uPgoJCQkJPFVuaXRzIC8+CgkJCQk8RGVzY3JpcHRpb24+PCFbQ0RBVEFbSW5kaWNhdGVzIHRoZSBkZXN0aW5hdGlvbiBBcHBsaWNhdGlvbiBJRC5dXT48L0Rlc2NyaXB0aW9uPgoJCQk8L0l0ZW0+PC9SZXNvdXJjZXM+CgkJPERlc2NyaXB0aW9uMj48IVtDREFUQVtdXT48L0Rlc2NyaXB0aW9uMj4KCTwvT2JqZWN0Pgo8L0xXTTJNPgo=", accessMode = ApiModelProperty.AccessMode.READ_WRITE)
+    @Schema(description = "Resource data.", example = "77u/PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPCEtLQpGSUxFIElORk9STUFUSU9OCgpPTUEgUGVybWFuZW50IERvY3VtZW50CiAgIEZpbGU6IE9NQS1TVVAtTHdNMk1fQmluYXJ5QXBwRGF0YUNvbnRhaW5lci1WMV8wXzEtMjAxOTAyMjEtQQogICBUeXBlOiB4bWwKClB1YmxpYyBSZWFjaGFibGUgSW5mb3JtYXRpb24KICAgUGF0aDogaHR0cDovL3d3dy5vcGVubW9iaWxlYWxsaWFuY2Uub3JnL3RlY2gvcHJvZmlsZXMKICAgTmFtZTogTHdNMk1fQmluYXJ5QXBwRGF0YUNvbnRhaW5lci12MV8wXzEueG1sCgpOT1JNQVRJVkUgSU5GT1JNQVRJT04KCiAgSW5mb3JtYXRpb24gYWJvdXQgdGhpcyBmaWxlIGNhbiBiZSBmb3VuZCBpbiB0aGUgbGF0ZXN0IHJldmlzaW9uIG9mCgogIE9NQS1UUy1MV00yTV9CaW5hcnlBcHBEYXRhQ29udGFpbmVyLVYxXzBfMQoKICBUaGlzIGlzIGF2YWlsYWJsZSBhdCBodHRwOi8vd3d3Lm9wZW5tb2JpbGVhbGxpYW5jZS5vcmcvCgogIFNlbmQgY29tbWVudHMgdG8gaHR0cHM6Ly9naXRodWIuY29tL09wZW5Nb2JpbGVBbGxpYW5jZS9PTUFfTHdNMk1fZm9yX0RldmVsb3BlcnMvaXNzdWVzCgpDSEFOR0UgSElTVE9SWQoKMTUwNjIwMTggU3RhdHVzIGNoYW5nZWQgdG8gQXBwcm92ZWQgYnkgRE0sIERvYyBSZWYgIyBPTUEtRE0mU0UtMjAxOC0wMDYxLUlOUF9MV00yTV9BUFBEQVRBX1YxXzBfRVJQX2Zvcl9maW5hbF9BcHByb3ZhbAoyMTAyMjAxOSBTdGF0dXMgY2hhbmdlZCB0byBBcHByb3ZlZCBieSBJUFNPLCBEb2MgUmVmICMgT01BLUlQU08tMjAxOS0wMDI1LUlOUF9Md00yTV9PYmplY3RfQXBwX0RhdGFfQ29udGFpbmVyXzFfMF8xX2Zvcl9GaW5hbF9BcHByb3ZhbAoKTEVHQUwgRElTQ0xBSU1FUgoKQ29weXJpZ2h0IDIwMTkgT3BlbiBNb2JpbGUgQWxsaWFuY2UuCgpSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCmFyZSBtZXQ6CgoxLiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodApub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCjIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0Cm5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KMy4gTmVpdGhlciB0aGUgbmFtZSBvZiB0aGUgY29weXJpZ2h0IGhvbGRlciBub3IgdGhlIG5hbWVzIG9mIGl0cwpjb250cmlidXRvcnMgbWF5IGJlIHVzZWQgdG8gZW5kb3JzZSBvciBwcm9tb3RlIHByb2R1Y3RzIGRlcml2ZWQKZnJvbSB0aGlzIHNvZnR3YXJlIHdpdGhvdXQgc3BlY2lmaWMgcHJpb3Igd3JpdHRlbiBwZXJtaXNzaW9uLgoKVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBUSEUgQ09QWVJJR0hUIEhPTERFUlMgQU5EIENPTlRSSUJVVE9SUwoiQVMgSVMiIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVApMSU1JVEVEIFRPLCBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUwpGT1IgQSBQQVJUSUNVTEFSIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIFRIRQpDT1BZUklHSFQgSE9MREVSIE9SIENPTlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULApJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLApCVVQgTk9UIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7CkxPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIKQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUCkxJQUJJTElUWSwgT1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOCkFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRQpQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KClRoZSBhYm92ZSBsaWNlbnNlIGlzIHVzZWQgYXMgYSBsaWNlbnNlIHVuZGVyIGNvcHlyaWdodCBvbmx5LiBQbGVhc2UKcmVmZXJlbmNlIHRoZSBPTUEgSVBSIFBvbGljeSBmb3IgcGF0ZW50IGxpY2Vuc2luZyB0ZXJtczoKaHR0cHM6Ly93d3cub21hc3BlY3dvcmtzLm9yZy9hYm91dC9pbnRlbGxlY3R1YWwtcHJvcGVydHktcmlnaHRzLwoKLS0+CjxMV00yTSB4bWxuczp4c2k9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hLWluc3RhbmNlIiB4c2k6bm9OYW1lc3BhY2VTY2hlbWFMb2NhdGlvbj0iaHR0cDovL29wZW5tb2JpbGVhbGxpYW5jZS5vcmcvdGVjaC9wcm9maWxlcy9MV00yTS54c2QiPgoJPE9iamVjdCBPYmplY3RUeXBlPSJNT0RlZmluaXRpb24iPgoJCTxOYW1lPkJpbmFyeUFwcERhdGFDb250YWluZXI8L05hbWU+CgkJPERlc2NyaXB0aW9uMT48IVtDREFUQVtUaGlzIEx3TTJNIE9iamVjdHMgcHJvdmlkZXMgdGhlIGFwcGxpY2F0aW9uIHNlcnZpY2UgZGF0YSByZWxhdGVkIHRvIGEgTHdNMk0gU2VydmVyLCBlZy4gV2F0ZXIgbWV0ZXIgZGF0YS4gClRoZXJlIGFyZSBzZXZlcmFsIG1ldGhvZHMgdG8gY3JlYXRlIGluc3RhbmNlIHRvIGluZGljYXRlIHRoZSBtZXNzYWdlIGRpcmVjdGlvbiBiYXNlZCBvbiB0aGUgbmVnb3RpYXRpb24gYmV0d2VlbiBBcHBsaWNhdGlvbiBhbmQgTHdNMk0uIFRoZSBDbGllbnQgYW5kIFNlcnZlciBzaG91bGQgbmVnb3RpYXRlIHRoZSBpbnN0YW5jZShzKSB1c2VkIHRvIGV4Y2hhbmdlIHRoZSBkYXRhLiBGb3IgZXhhbXBsZToKIC0gVXNpbmcgYSBzaW5nbGUgaW5zdGFuY2UgZm9yIGJvdGggZGlyZWN0aW9ucyBjb21tdW5pY2F0aW9uLCBmcm9tIENsaWVudCB0byBTZXJ2ZXIgYW5kIGZyb20gU2VydmVyIHRvIENsaWVudC4KIC0gVXNpbmcgYW4gaW5zdGFuY2UgZm9yIGNvbW11bmljYXRpb24gZnJvbSBDbGllbnQgdG8gU2VydmVyIGFuZCBhbm90aGVyIG9uZSBmb3IgY29tbXVuaWNhdGlvbiBmcm9tIFNlcnZlciB0byBDbGllbnQKIC0gVXNpbmcgc2V2ZXJhbCBpbnN0YW5jZXMKXV0+PC9EZXNjcmlwdGlvbjE+CgkJPE9iamVjdElEPjE5PC9PYmplY3RJRD4KCQk8T2JqZWN0VVJOPnVybjpvbWE6bHdtMm06b21hOjE5PC9PYmplY3RVUk4+CgkJPExXTTJNVmVyc2lvbj4xLjA8L0xXTTJNVmVyc2lvbj4KCQk8T2JqZWN0VmVyc2lvbj4xLjA8L09iamVjdFZlcnNpb24+CgkJPE11bHRpcGxlSW5zdGFuY2VzPk11bHRpcGxlPC9NdWx0aXBsZUluc3RhbmNlcz4KCQk8TWFuZGF0b3J5Pk9wdGlvbmFsPC9NYW5kYXRvcnk+CgkJPFJlc291cmNlcz4KCQkJPEl0ZW0gSUQ9IjAiPjxOYW1lPkRhdGE8L05hbWU+CgkJCQk8T3BlcmF0aW9ucz5SVzwvT3BlcmF0aW9ucz4KCQkJCTxNdWx0aXBsZUluc3RhbmNlcz5NdWx0aXBsZTwvTXVsdGlwbGVJbnN0YW5jZXM+CgkJCQk8TWFuZGF0b3J5Pk1hbmRhdG9yeTwvTWFuZGF0b3J5PgoJCQkJPFR5cGU+T3BhcXVlPC9UeXBlPgoJCQkJPFJhbmdlRW51bWVyYXRpb24gLz4KCQkJCTxVbml0cyAvPgoJCQkJPERlc2NyaXB0aW9uPjwhW0NEQVRBW0luZGljYXRlcyB0aGUgYXBwbGljYXRpb24gZGF0YSBjb250ZW50Ll1dPjwvRGVzY3JpcHRpb24+CgkJCTwvSXRlbT4KCQkJPEl0ZW0gSUQ9IjEiPjxOYW1lPkRhdGEgUHJpb3JpdHk8L05hbWU+CgkJCQk8T3BlcmF0aW9ucz5SVzwvT3BlcmF0aW9ucz4KCQkJCTxNdWx0aXBsZUluc3RhbmNlcz5TaW5nbGU8L011bHRpcGxlSW5zdGFuY2VzPgoJCQkJPE1hbmRhdG9yeT5PcHRpb25hbDwvTWFuZGF0b3J5PgoJCQkJPFR5cGU+SW50ZWdlcjwvVHlwZT4KCQkJCTxSYW5nZUVudW1lcmF0aW9uPjEgYnl0ZXM8L1JhbmdlRW51bWVyYXRpb24+CgkJCQk8VW5pdHMgLz4KCQkJCTxEZXNjcmlwdGlvbj48IVtDREFUQVtJbmRpY2F0ZXMgdGhlIEFwcGxpY2F0aW9uIGRhdGEgcHJpb3JpdHk6CjA6SW1tZWRpYXRlCjE6QmVzdEVmZm9ydAoyOkxhdGVzdAozLTEwMDogUmVzZXJ2ZWQgZm9yIGZ1dHVyZSB1c2UuCjEwMS0yNTQ6IFByb3ByaWV0YXJ5IG1vZGUuXV0+PC9EZXNjcmlwdGlvbj4KCQkJPC9JdGVtPgoJCQk8SXRlbSBJRD0iMiI+PE5hbWU+RGF0YSBDcmVhdGlvbiBUaW1lPC9OYW1lPgoJCQkJPE9wZXJhdGlvbnM+Ulc8L09wZXJhdGlvbnM+CgkJCQk8TXVsdGlwbGVJbnN0YW5jZXM+U2luZ2xlPC9NdWx0aXBsZUluc3RhbmNlcz4KCQkJCTxNYW5kYXRvcnk+T3B0aW9uYWw8L01hbmRhdG9yeT4KCQkJCTxUeXBlPlRpbWU8L1R5cGU+CgkJCQk8UmFuZ2VFbnVtZXJhdGlvbiAvPgoJCQkJPFVuaXRzIC8+CgkJCQk8RGVzY3JpcHRpb24+PCFbQ0RBVEFbSW5kaWNhdGVzIHRoZSBEYXRhIGluc3RhbmNlIGNyZWF0aW9uIHRpbWVzdGFtcC5dXT48L0Rlc2NyaXB0aW9uPgoJCQk8L0l0ZW0+CgkJCTxJdGVtIElEPSIzIj48TmFtZT5EYXRhIERlc2NyaXB0aW9uPC9OYW1lPgoJCQkJPE9wZXJhdGlvbnM+Ulc8L09wZXJhdGlvbnM+CgkJCQk8TXVsdGlwbGVJbnN0YW5jZXM+U2luZ2xlPC9NdWx0aXBsZUluc3RhbmNlcz4KCQkJCTxNYW5kYXRvcnk+T3B0aW9uYWw8L01hbmRhdG9yeT4KCQkJCTxUeXBlPlN0cmluZzwvVHlwZT4KCQkJCTxSYW5nZUVudW1lcmF0aW9uPjMyIGJ5dGVzPC9SYW5nZUVudW1lcmF0aW9uPgoJCQkJPFVuaXRzIC8+CgkJCQk8RGVzY3JpcHRpb24+PCFbQ0RBVEFbSW5kaWNhdGVzIHRoZSBkYXRhIGRlc2NyaXB0aW9uLgplLmcuICJtZXRlciByZWFkaW5nIi5dXT48L0Rlc2NyaXB0aW9uPgoJCQk8L0l0ZW0+CgkJCTxJdGVtIElEPSI0Ij48TmFtZT5EYXRhIEZvcm1hdDwvTmFtZT4KCQkJCTxPcGVyYXRpb25zPlJXPC9PcGVyYXRpb25zPgoJCQkJPE11bHRpcGxlSW5zdGFuY2VzPlNpbmdsZTwvTXVsdGlwbGVJbnN0YW5jZXM+CgkJCQk8TWFuZGF0b3J5Pk9wdGlvbmFsPC9NYW5kYXRvcnk+CgkJCQk8VHlwZT5TdHJpbmc8L1R5cGU+CgkJCQk8UmFuZ2VFbnVtZXJhdGlvbj4zMiBieXRlczwvUmFuZ2VFbnVtZXJhdGlvbj4KCQkJCTxVbml0cyAvPgoJCQkJPERlc2NyaXB0aW9uPjwhW0NEQVRBW0luZGljYXRlcyB0aGUgZm9ybWF0IG9mIHRoZSBBcHBsaWNhdGlvbiBEYXRhLgplLmcuIFlHLU1ldGVyLVdhdGVyLVJlYWRpbmcKVVRGOC1zdHJpbmcKXV0+PC9EZXNjcmlwdGlvbj4KCQkJPC9JdGVtPgoJCQk8SXRlbSBJRD0iNSI+PE5hbWU+QXBwIElEPC9OYW1lPgoJCQkJPE9wZXJhdGlvbnM+Ulc8L09wZXJhdGlvbnM+CgkJCQk8TXVsdGlwbGVJbnN0YW5jZXM+U2luZ2xlPC9NdWx0aXBsZUluc3RhbmNlcz4KCQkJCTxNYW5kYXRvcnk+T3B0aW9uYWw8L01hbmRhdG9yeT4KCQkJCTxUeXBlPkludGVnZXI8L1R5cGU+CgkJCQk8UmFuZ2VFbnVtZXJhdGlvbj4yIGJ5dGVzPC9SYW5nZUVudW1lcmF0aW9uPgoJCQkJPFVuaXRzIC8+CgkJCQk8RGVzY3JpcHRpb24+PCFbQ0RBVEFbSW5kaWNhdGVzIHRoZSBkZXN0aW5hdGlvbiBBcHBsaWNhdGlvbiBJRC5dXT48L0Rlc2NyaXB0aW9uPgoJCQk8L0l0ZW0+PC9SZXNvdXJjZXM+CgkJPERlc2NyaXB0aW9uMj48IVtDREFUQVtdXT48L0Rlc2NyaXB0aW9uMj4KCTwvT2JqZWN0Pgo8L0xXTTJNPgo=", accessMode = Schema.AccessMode.READ_WRITE)
     @JsonGetter("data")
     public String getEncodedData() {
         return Optional.ofNullable(data)
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/TbResourceInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/TbResourceInfo.java
index 17fedc9eb6..f1318c2257 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/TbResourceInfo.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/TbResourceInfo.java
@@ -19,8 +19,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;
@@ -31,7 +30,7 @@ import org.thingsboard.server.common.data.validation.NoXss;
 
 import java.util.function.UnaryOperator;
 
-@ApiModel
+@Schema
 @Slf4j
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -39,28 +38,28 @@ public class TbResourceInfo extends BaseData<TbResourceId> implements HasName, H
 
     private static final long serialVersionUID = 7282664529021651736L;
 
-    @ApiModelProperty(position = 3, value = "JSON object with Tenant Id. Tenant Id of the resource can't be changed.", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "JSON object with Tenant Id. Tenant Id of the resource can't be changed.", accessMode = Schema.AccessMode.READ_ONLY)
     private TenantId tenantId;
     @NoXss
     @Length(fieldName = "title")
-    @ApiModelProperty(position = 4, value = "Resource title.", example = "BinaryAppDataContainer id=19 v1.0")
+    @Schema(description = "Resource title.", example = "BinaryAppDataContainer id=19 v1.0")
     private String title;
-    @ApiModelProperty(position = 5, value = "Resource type.", example = "LWM2M_MODEL", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Resource type.", example = "LWM2M_MODEL", accessMode = Schema.AccessMode.READ_ONLY)
     private ResourceType resourceType;
     @NoXss
     @Length(fieldName = "resourceKey")
-    @ApiModelProperty(position = 6, value = "Resource key.", example = "19_1.0", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Resource key.", example = "19_1.0", accessMode = Schema.AccessMode.READ_ONLY)
     private String resourceKey;
     private boolean isPublic;
     private String publicResourceKey;
-    @ApiModelProperty(position = 7, value = "Resource search text.", example = "19_1.0:binaryappdatacontainer", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Resource search text.", example = "19_1.0:binaryappdatacontainer", accessMode = Schema.AccessMode.READ_ONLY)
     private String searchText;
 
-    @ApiModelProperty(position = 8, value = "Resource etag.", example = "33a64df551425fcc55e4d42a148795d9f25f89d4", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Resource etag.", example = "33a64df551425fcc55e4d42a148795d9f25f89d4", accessMode = Schema.AccessMode.READ_ONLY)
     private String etag;
     @NoXss
     @Length(fieldName = "file name")
-    @ApiModelProperty(position = 9, value = "Resource file name.", example = "19.xml", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Resource file name.", example = "19.xml", accessMode = Schema.AccessMode.READ_ONLY)
     private String fileName;
     private JsonNode descriptor;
 
@@ -89,7 +88,7 @@ public class TbResourceInfo extends BaseData<TbResourceId> implements HasName, H
         this.externalId = resourceInfo.externalId;
     }
 
-    @ApiModelProperty(position = 1, value = "JSON object with the Resource Id. " +
+    @Schema(description = "JSON object with the Resource Id. " +
             "Specify this field to update the Resource. " +
             "Referencing non-existing Resource Id will cause error. " +
             "Omit this field to create new Resource.")
@@ -98,7 +97,7 @@ public class TbResourceInfo extends BaseData<TbResourceId> implements HasName, H
         return super.getId();
     }
 
-    @ApiModelProperty(position = 2, value = "Timestamp of the resource creation, in milliseconds", example = "1609459200000", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Timestamp of the resource creation, in milliseconds", example = "1609459200000", accessMode = Schema.AccessMode.READ_ONLY)
     @Override
     public long getCreatedTime() {
         return super.getCreatedTime();
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 19ec508295..b7fade3e09 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
@@ -18,15 +18,14 @@ package org.thingsboard.server.common.data;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.JsonNode;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.TenantProfileId;
 import org.thingsboard.server.common.data.validation.Length;
 import org.thingsboard.server.common.data.validation.NoXss;
 
-@ApiModel
+@Schema
 @EqualsAndHashCode(callSuper = true)
 public class Tenant extends ContactBased<TenantId> implements HasTenantId, HasTitle {
 
@@ -34,14 +33,14 @@ public class Tenant extends ContactBased<TenantId> implements HasTenantId, HasTi
 
     @Length(fieldName = "title")
     @NoXss
-    @ApiModelProperty(position = 3, required = true, value = "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")
-    @ApiModelProperty(position = 5, value = "Geo region of the tenant", example = "North America")
+    @Schema(description = "Geo region of the tenant", example = "North America")
     private String region;
 
-    @ApiModelProperty(position = 6, value = "JSON object with Tenant Profile Id")
+    @Schema(description = "JSON object with Tenant Profile Id")
     private TenantProfileId tenantProfileId;
 
     public Tenant() {
@@ -74,7 +73,7 @@ public class Tenant extends ContactBased<TenantId> implements HasTenantId, HasTi
     }
 
     @Override
-    @ApiModelProperty(position = 4, value = "Name of the tenant. Read-only, duplicated from title for backward compatibility", example = "Company A", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Name of the tenant. Read-only, duplicated from title for backward compatibility", example = "Company A", accessMode = Schema.AccessMode.READ_ONLY)
     @JsonProperty(access = JsonProperty.Access.READ_ONLY)
     public String getName() {
         return title;
@@ -96,7 +95,7 @@ public class Tenant extends ContactBased<TenantId> implements HasTenantId, HasTi
         this.tenantProfileId = tenantProfileId;
     }
 
-    @ApiModelProperty(position = 1, value = "JSON object with the tenant Id. " +
+    @Schema(description = "JSON object with the tenant Id. " +
             "Specify this field to update the tenant. " +
             "Referencing non-existing tenant Id will cause error. " +
             "Omit this field to create new tenant." )
@@ -105,61 +104,61 @@ public class Tenant extends ContactBased<TenantId> implements HasTenantId, HasTi
         return super.getId();
     }
 
-    @ApiModelProperty(position = 2, value = "Timestamp of the tenant creation, in milliseconds", example = "1609459200000", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Timestamp of the tenant creation, in milliseconds", example = "1609459200000", accessMode = Schema.AccessMode.READ_ONLY)
     @Override
     public long getCreatedTime() {
         return super.getCreatedTime();
     }
 
-    @ApiModelProperty(position = 7, value = "Country", example = "US")
+    @Schema(description = "Country", example = "US")
     @Override
     public String getCountry() {
         return super.getCountry();
     }
 
-    @ApiModelProperty(position = 8, value = "State", example = "NY")
+    @Schema(description = "State", example = "NY")
     @Override
     public String getState() {
         return super.getState();
     }
 
-    @ApiModelProperty(position = 9, value = "City", example = "New York")
+    @Schema(description = "City", example = "New York")
     @Override
     public String getCity() {
         return super.getCity();
     }
 
-    @ApiModelProperty(position = 10, value = "Address Line 1", example = "42 Broadway Suite 12-400")
+    @Schema(description = "Address Line 1", example = "42 Broadway Suite 12-400")
     @Override
     public String getAddress() {
         return super.getAddress();
     }
 
-    @ApiModelProperty(position = 11, value = "Address Line 2", example = "")
+    @Schema(description = "Address Line 2", example = "")
     @Override
     public String getAddress2() {
         return super.getAddress2();
     }
 
-    @ApiModelProperty(position = 12, value = "Zip code", example = "10004")
+    @Schema(description = "Zip code", example = "10004")
     @Override
     public String getZip() {
         return super.getZip();
     }
 
-    @ApiModelProperty(position = 13, value = "Phone number", example = "+1(415)777-7777")
+    @Schema(description = "Phone number", example = "+1(415)777-7777")
     @Override
     public String getPhone() {
         return super.getPhone();
     }
 
-    @ApiModelProperty(position = 14, required = true, value = "Email", example = "example@company.com")
+    @Schema(description = "Email", example = "example@company.com")
     @Override
     public String getEmail() {
         return super.getEmail();
     }
 
-    @ApiModelProperty(position = 15, value = "Additional parameters of the device", dataType = "com.fasterxml.jackson.databind.JsonNode")
+    @Schema(description = "Additional parameters of the device",implementation = com.fasterxml.jackson.databind.JsonNode.class)
     @Override
     public JsonNode getAdditionalInfo() {
         return super.getAdditionalInfo();
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/TenantInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/TenantInfo.java
index e6f65ca0c7..4b78f07cce 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/TenantInfo.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/TenantInfo.java
@@ -15,15 +15,14 @@
  */
 package org.thingsboard.server.common.data;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.thingsboard.server.common.data.id.TenantId;
 
-@ApiModel
+@Schema
 @Data
 public class TenantInfo extends Tenant {
-    @ApiModelProperty(position = 15, value = "Tenant Profile name", example = "Default")
+    @Schema(description = "Tenant Profile name", example = "Default")
     private String tenantProfileName;
 
     public TenantInfo() {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/TenantProfile.java b/common/data/src/main/java/org/thingsboard/server/common/data/TenantProfile.java
index a93f829e8d..e60091a16d 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/TenantProfile.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/TenantProfile.java
@@ -18,8 +18,7 @@ package org.thingsboard.server.common.data;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -34,7 +33,7 @@ import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.util.Optional;
 
-@ApiModel
+@Schema
 @Data
 @ToString(exclude = {"profileDataBytes"})
 @EqualsAndHashCode(callSuper = true)
@@ -47,17 +46,17 @@ public class TenantProfile extends BaseData<TenantProfileId> implements HasName
 
     @NoXss
     @Length(fieldName = "name")
-    @ApiModelProperty(position = 3, value = "Name of the tenant profile", example = "High Priority Tenants")
+    @Schema(description = "Name of the tenant profile", example = "High Priority Tenants")
     private String name;
     @NoXss
-    @ApiModelProperty(position = 4, value = "Description of the tenant profile", example = "Any text")
+    @Schema(description = "Description of the tenant profile", example = "Any text")
     private String description;
-    @ApiModelProperty(position = 5, value = "Default Tenant profile to be used.", example = "true")
+    @Schema(description = "Default Tenant profile to be used.", example = "true")
     private boolean isDefault;
-    @ApiModelProperty(position = 6, value = "If enabled, will push all messages related to this tenant and processed by the rule engine into separate queue. " +
+    @Schema(description = "If enabled, will push all messages related to this tenant and processed by the rule engine into separate queue. " +
             "Useful for complex microservices deployments, to isolate processing of the data for specific tenants", example = "true")
     private boolean isolatedTbRuleEngine;
-    @ApiModelProperty(position = 7, value = "Complex JSON object that contains profile settings: queue configs, max devices, max assets, rate limits, etc.")
+    @Schema(description = "Complex JSON object that contains profile settings: queue configs, max devices, max assets, rate limits, etc.")
     private transient TenantProfileData profileData;
     @JsonIgnore
     private byte[] profileDataBytes;
@@ -79,7 +78,7 @@ public class TenantProfile extends BaseData<TenantProfileId> implements HasName
         this.setProfileData(tenantProfile.getProfileData());
     }
 
-    @ApiModelProperty(position = 1, value = "JSON object with the tenant profile Id. " +
+    @Schema(description = "JSON object with the tenant profile Id. " +
             "Specify this field to update the tenant profile. " +
             "Referencing non-existing tenant profile Id will cause error. " +
             "Omit this field to create new tenant profile.")
@@ -88,7 +87,7 @@ public class TenantProfile extends BaseData<TenantProfileId> implements HasName
         return super.getId();
     }
 
-    @ApiModelProperty(position = 2, value = "Timestamp of the tenant profile creation, in milliseconds", example = "1609459200000", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Timestamp of the tenant profile creation, in milliseconds", example = "1609459200000", accessMode = Schema.AccessMode.READ_ONLY)
     @Override
     public long getCreatedTime() {
         return super.getCreatedTime();
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/UpdateMessage.java b/common/data/src/main/java/org/thingsboard/server/common/data/UpdateMessage.java
index 7a803e33a8..69b6c8d392 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/UpdateMessage.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/UpdateMessage.java
@@ -15,27 +15,26 @@
  */
 package org.thingsboard.server.common.data;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.io.Serializable;
 
-@ApiModel
+@Schema
 @Data
 public class UpdateMessage implements Serializable {
 
-    @ApiModelProperty(position = 1, value = "'True' if new platform update is available.")
+    @Schema(description = "'True' if new platform update is available.")
     private final boolean updateAvailable;
-    @ApiModelProperty(position = 2, value = "Current ThingsBoard version.")
+    @Schema(description = "Current ThingsBoard version.")
     private final String currentVersion;
-    @ApiModelProperty(position = 3, value = "Latest ThingsBoard version.")
+    @Schema(description = "Latest ThingsBoard version.")
     private final String latestVersion;
-    @ApiModelProperty(position = 4, value = "Upgrade instructions URL.")
+    @Schema(description = "Upgrade instructions URL.")
     private final String upgradeInstructionsUrl;
-    @ApiModelProperty(position = 5, value = "Current ThingsBoard version release notes URL.")
+    @Schema(description = "Current ThingsBoard version release notes URL.")
     private final String currentVersionReleaseNotesUrl;
-    @ApiModelProperty(position = 6, value = "Latest ThingsBoard version release notes URL.")
+    @Schema(description = "Latest ThingsBoard version release notes URL.")
     private final String latestVersionReleaseNotesUrl;
 
 }
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 7bce893774..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
@@ -18,8 +18,7 @@ package org.thingsboard.server.common.data;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.JsonNode;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.EntityId;
@@ -32,7 +31,7 @@ import org.thingsboard.server.common.data.validation.NoXss;
 
 import static org.apache.commons.lang3.StringUtils.isNotEmpty;
 
-@ApiModel
+@Schema
 @EqualsAndHashCode(callSuper = true)
 public class User extends BaseDataWithAdditionalInfo<UserId> implements HasName, HasTenantId, HasCustomerId, NotificationRecipient {
 
@@ -71,7 +70,7 @@ public class User extends BaseDataWithAdditionalInfo<UserId> implements HasName,
     }
 
 
-    @ApiModelProperty(position = 1, value = "JSON object with the User Id. " +
+    @Schema(description = "JSON object with the User Id. " +
             "Specify this field to update the device. " +
             "Referencing non-existing User Id will cause error. " +
             "Omit this field to create new customer.")
@@ -80,13 +79,13 @@ public class User extends BaseDataWithAdditionalInfo<UserId> implements HasName,
         return super.getId();
     }
 
-    @ApiModelProperty(position = 2, value = "Timestamp of the user creation, in milliseconds", example = "1609459200000", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Timestamp of the user creation, in milliseconds", example = "1609459200000", accessMode = Schema.AccessMode.READ_ONLY)
     @Override
     public long getCreatedTime() {
         return super.getCreatedTime();
     }
 
-    @ApiModelProperty(position = 3, value = "JSON object with the Tenant Id.", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "JSON object with the Tenant Id.", accessMode = Schema.AccessMode.READ_ONLY)
     public TenantId getTenantId() {
         return tenantId;
     }
@@ -95,7 +94,7 @@ public class User extends BaseDataWithAdditionalInfo<UserId> implements HasName,
         this.tenantId = tenantId;
     }
 
-    @ApiModelProperty(position = 4, value = "JSON object with the Customer Id.", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "JSON object with the Customer Id.", accessMode = Schema.AccessMode.READ_ONLY)
     public CustomerId getCustomerId() {
         return customerId;
     }
@@ -104,7 +103,7 @@ public class User extends BaseDataWithAdditionalInfo<UserId> implements HasName,
         this.customerId = customerId;
     }
 
-    @ApiModelProperty(position = 5, required = true, value = "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;
     }
@@ -113,14 +112,14 @@ public class User extends BaseDataWithAdditionalInfo<UserId> implements HasName,
         this.email = email;
     }
 
-    @ApiModelProperty(position = 6, accessMode = ApiModelProperty.AccessMode.READ_ONLY, value = "Duplicates the email of the user, readonly", example = "user@example.com")
+    @Schema(accessMode = Schema.AccessMode.READ_ONLY, description = "Duplicates the email of the user, readonly", example = "user@example.com")
     @Override
     @JsonProperty(access = JsonProperty.Access.READ_ONLY)
     public String getName() {
         return email;
     }
 
-    @ApiModelProperty(position = 7, required = true, value = "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;
     }
@@ -129,7 +128,7 @@ public class User extends BaseDataWithAdditionalInfo<UserId> implements HasName,
         this.authority = authority;
     }
 
-    @ApiModelProperty(position = 8, required = false, value = "First name of the user", example = "John")
+    @Schema(description = "First name of the user", example = "John")
     public String getFirstName() {
         return firstName;
     }
@@ -138,7 +137,7 @@ public class User extends BaseDataWithAdditionalInfo<UserId> implements HasName,
         this.firstName = firstName;
     }
 
-    @ApiModelProperty(position = 9, required = false, value = "Last name of the user", example = "Doe")
+    @Schema(description = "Last name of the user", example = "Doe")
     public String getLastName() {
         return lastName;
     }
@@ -147,7 +146,7 @@ public class User extends BaseDataWithAdditionalInfo<UserId> implements HasName,
         this.lastName = lastName;
     }
 
-    @ApiModelProperty(position = 10, required = false, value = "Phone number of the user", example = "38012345123")
+    @Schema(description = "Phone number of the user", example = "38012345123")
     public String getPhone() {
         return phone;
     }
@@ -156,7 +155,7 @@ public class User extends BaseDataWithAdditionalInfo<UserId> implements HasName,
         this.phone = phone;
     }
 
-    @ApiModelProperty(position = 11, value = "Additional parameters of the user", dataType = "com.fasterxml.jackson.databind.JsonNode")
+    @Schema(description = "Additional parameters of the user", implementation = com.fasterxml.jackson.databind.JsonNode.class)
     @Override
     public JsonNode getAdditionalInfo() {
         return super.getAdditionalInfo();
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/UserEmailInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/UserEmailInfo.java
index 46cf36e9ea..0bb80029f1 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/UserEmailInfo.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/UserEmailInfo.java
@@ -15,25 +15,24 @@
  */
 package org.thingsboard.server.common.data;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import org.thingsboard.server.common.data.id.HasId;
 import org.thingsboard.server.common.data.id.UserId;
 
-@ApiModel
+@Schema
 @Data
 @AllArgsConstructor
 public class UserEmailInfo implements HasId<UserId> {
 
-    @ApiModelProperty(position = 1, value = "User id")
+    @Schema(description = "User id")
     private UserId id;
-    @ApiModelProperty(position = 2, value = "User email", example = "john@gmail.com")
+    @Schema(description = "User email", example = "john@gmail.com")
     private String email;
-    @ApiModelProperty(position = 3, value = "User first name", example = "John")
+    @Schema(description = "User first name", example = "John")
     private String firstName;
-    @ApiModelProperty(position = 4, value = "User last name", example = "Brown")
+    @Schema(description = "User last name", example = "Brown")
     private String lastName;
 
 }
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 da1d8489fd..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
@@ -15,11 +15,11 @@
  */
 package org.thingsboard.server.common.data.alarm;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.JsonNode;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -30,6 +30,7 @@ import org.thingsboard.server.common.data.HasName;
 import org.thingsboard.server.common.data.HasTenantId;
 import org.thingsboard.server.common.data.id.AlarmId;
 import org.thingsboard.server.common.data.id.CustomerId;
+import org.thingsboard.server.common.data.id.DashboardId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.UserId;
@@ -37,11 +38,13 @@ import org.thingsboard.server.common.data.validation.Length;
 import org.thingsboard.server.common.data.validation.NoXss;
 
 import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
 
 /**
  * Created by ashvayka on 11.05.17.
  */
-@ApiModel
+@Schema
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Builder
@@ -49,45 +52,45 @@ import java.util.List;
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class Alarm extends BaseData<AlarmId> implements HasName, HasTenantId, HasCustomerId {
 
-    @ApiModelProperty(position = 3, value = "JSON object with Tenant Id", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "JSON object with Tenant Id", accessMode = Schema.AccessMode.READ_ONLY)
     private TenantId tenantId;
 
-    @ApiModelProperty(position = 4, value = "JSON object with Customer Id", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "JSON object with Customer Id", accessMode = Schema.AccessMode.READ_ONLY)
     private CustomerId customerId;
 
     @NoXss
-    @ApiModelProperty(position = 6, required = true, value = "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;
-    @ApiModelProperty(position = 7, required = true, value = "JSON object with alarm originator id")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "JSON object with alarm originator id")
     private EntityId originator;
-    @ApiModelProperty(position = 8, required = true, value = "Alarm severity", example = "CRITICAL")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Alarm severity", example = "CRITICAL")
     private AlarmSeverity severity;
-    @ApiModelProperty(position = 9, required = true, value = "Acknowledged", example = "true")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Acknowledged", example = "true")
     private boolean acknowledged;
-    @ApiModelProperty(position = 10, required = true, value = "Cleared", example = "false")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Cleared", example = "false")
     private boolean cleared;
-    @ApiModelProperty(position = 11, value = "Alarm assignee user id")
+    @Schema(description = "Alarm assignee user id")
     private UserId assigneeId;
-    @ApiModelProperty(position = 12, value = "Timestamp of the alarm start time, in milliseconds", example = "1634058704565")
+    @Schema(description = "Timestamp of the alarm start time, in milliseconds", example = "1634058704565")
     private long startTs;
-    @ApiModelProperty(position = 13, value = "Timestamp of the alarm end time(last time update), in milliseconds", example = "1634111163522")
+    @Schema(description = "Timestamp of the alarm end time(last time update), in milliseconds", example = "1634111163522")
     private long endTs;
-    @ApiModelProperty(position = 14, value = "Timestamp of the alarm acknowledgement, in milliseconds", example = "1634115221948")
+    @Schema(description = "Timestamp of the alarm acknowledgement, in milliseconds", example = "1634115221948")
     private long ackTs;
-    @ApiModelProperty(position = 15, value = "Timestamp of the alarm clearing, in milliseconds", example = "1634114528465")
+    @Schema(description = "Timestamp of the alarm clearing, in milliseconds", example = "1634114528465")
     private long clearTs;
-    @ApiModelProperty(position = 16, value = "Timestamp of the alarm assignment, in milliseconds", example = "1634115928465")
+    @Schema(description = "Timestamp of the alarm assignment, in milliseconds", example = "1634115928465")
     private long assignTs;
-    @ApiModelProperty(position = 17, value = "JSON object with alarm details")
+    @Schema(description = "JSON object with alarm details")
     private transient JsonNode details;
-    @ApiModelProperty(position = 18, value = "Propagation flag to specify if alarm should be propagated to parent entities of alarm originator", example = "true")
+    @Schema(description = "Propagation flag to specify if alarm should be propagated to parent entities of alarm originator", example = "true")
     private boolean propagate;
-    @ApiModelProperty(position = 19, value = "Propagation flag to specify if alarm should be propagated to the owner (tenant or customer) of alarm originator", example = "true")
+    @Schema(description = "Propagation flag to specify if alarm should be propagated to the owner (tenant or customer) of alarm originator", example = "true")
     private boolean propagateToOwner;
-    @ApiModelProperty(position = 20, value = "Propagation flag to specify if alarm should be propagated to the tenant entity", example = "true")
+    @Schema(description = "Propagation flag to specify if alarm should be propagated to the tenant entity", example = "true")
     private boolean propagateToTenant;
-    @ApiModelProperty(position = 21, value = "JSON array of relation types that should be used for propagation. " +
+    @Schema(description = "JSON array of relation types that should be used for propagation. " +
             "By default, 'propagateRelationTypes' array is empty which means that the alarm will be propagated based on any relation type to parent entities. " +
             "This parameter should be used only in case when 'propagate' parameter is set to true, otherwise, 'propagateRelationTypes' array will be ignored.")
     private List<String> propagateRelationTypes;
@@ -125,12 +128,12 @@ public class Alarm extends BaseData<AlarmId> implements HasName, HasTenantId, Ha
 
     @Override
     @JsonProperty(access = JsonProperty.Access.READ_ONLY)
-    @ApiModelProperty(position = 5, required = true, value = "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;
     }
 
-    @ApiModelProperty(position = 1, value = "JSON object with the alarm Id. " +
+    @Schema(description = "JSON object with the alarm Id. " +
             "Specify this field to update the alarm. " +
             "Referencing non-existing alarm Id will cause error. " +
             "Omit this field to create new alarm.")
@@ -140,14 +143,14 @@ public class Alarm extends BaseData<AlarmId> implements HasName, HasTenantId, Ha
     }
 
 
-    @ApiModelProperty(position = 2, value = "Timestamp of the alarm creation, in milliseconds", example = "1634058704567", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Timestamp of the alarm creation, in milliseconds", example = "1634058704567", accessMode = Schema.AccessMode.READ_ONLY)
     @Override
     public long getCreatedTime() {
         return super.getCreatedTime();
     }
 
     @JsonProperty(access = JsonProperty.Access.READ_ONLY)
-    @ApiModelProperty(position = 22, required = true, value = "status of the Alarm", example = "ACTIVE_UNACK", accessMode = ApiModelProperty.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);
     }
@@ -160,4 +163,10 @@ public class Alarm extends BaseData<AlarmId> implements HasName, HasTenantId, Ha
         }
     }
 
+    @JsonIgnore
+    public DashboardId getDashboardId() {
+        return Optional.ofNullable(getDetails()).map(details -> details.get("dashboardId"))
+                .filter(JsonNode::isTextual).map(id -> new DashboardId(UUID.fromString(id.asText()))).orElse(null);
+    }
+
 }
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 b8a0d59ba2..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
@@ -17,8 +17,7 @@ package org.thingsboard.server.common.data.alarm;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.JsonNode;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -26,38 +25,39 @@ 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;
 import org.thingsboard.server.common.data.validation.NoXss;
 
-@ApiModel
+@Schema
 @Data
 @Builder
 @AllArgsConstructor
 public class AlarmComment extends BaseData<AlarmCommentId> implements HasName {
-    @ApiModelProperty(position = 3, value = "JSON object with Alarm id.", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
-    private EntityId alarmId;
-    @ApiModelProperty(position = 4, value = "JSON object with User id.", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "JSON object with Alarm id.", accessMode = Schema.AccessMode.READ_ONLY)
+    private AlarmId alarmId;
+    @Schema(description = "JSON object with User id.", accessMode = Schema.AccessMode.READ_ONLY)
     private UserId userId;
-    @ApiModelProperty(position = 5, value = "Defines origination of comment. System type means comment was created by TB. OTHER type means comment was created by user.", example = "SYSTEM/OTHER", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @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;
-    @ApiModelProperty(position = 6, value = "JSON object with text of comment.", dataType = "com.fasterxml.jackson.databind.JsonNode")
+    @Schema(description = "JSON object with text of comment.")
     @NoXss
     @Length(fieldName = "comment", max = 10000)
     @EqualsAndHashCode.Include
-    private transient JsonNode comment;
+    private JsonNode comment;
 
-    @ApiModelProperty(position = 1, value = "JSON object with the alarm comment Id. " +
+    @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();
     }
 
-    @ApiModelProperty(position = 2, value = "Timestamp of the alarm comment creation, in milliseconds", example = "1634058704567", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Timestamp of the alarm comment creation, in milliseconds", example = "1634058704567", accessMode = Schema.AccessMode.READ_ONLY)
     @Override
     public long getCreatedTime() {
         return super.getCreatedTime();
@@ -73,7 +73,7 @@ public class AlarmComment extends BaseData<AlarmCommentId> implements HasName {
 
     @Override
     @JsonProperty(access = JsonProperty.Access.READ_ONLY)
-    @ApiModelProperty(position = 5, required = true, value = "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/AlarmCommentInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmCommentInfo.java
index 24e1620f96..6d9994945b 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmCommentInfo.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmCommentInfo.java
@@ -15,24 +15,23 @@
  */
 package org.thingsboard.server.common.data.alarm;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-@ApiModel
+@Schema
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class AlarmCommentInfo extends AlarmComment {
     private static final long serialVersionUID = 2807343093519543377L;
 
-    @ApiModelProperty(position = 19, value = "User first name", example = "John")
+    @Schema(description = "User first name", example = "John")
     private String firstName;
 
-    @ApiModelProperty(position = 19, value = "User last name", example = "Brown")
+    @Schema(description = "User last name", example = "Brown")
     private String lastName;
 
-    @ApiModelProperty(position = 19, value = "User email address", example = "johnBrown@gmail.com")
+    @Schema(description = "User email address", example = "johnBrown@gmail.com")
     private String email;
 
     public AlarmCommentInfo() {
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 9a92802d69..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
@@ -16,7 +16,7 @@
 package org.thingsboard.server.common.data.alarm;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Builder;
 import lombok.Data;
 import org.thingsboard.server.common.data.id.AlarmId;
@@ -27,37 +27,37 @@ import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.validation.Length;
 import org.thingsboard.server.common.data.validation.NoXss;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 
 @Data
 @Builder
 public class AlarmCreateOrUpdateActiveRequest implements AlarmModificationRequest {
 
     @NotNull
-    @ApiModelProperty(position = 1, value = "JSON object with Tenant Id", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "JSON object with Tenant Id", accessMode = Schema.AccessMode.READ_ONLY)
     private TenantId tenantId;
-    @ApiModelProperty(position = 2, value = "JSON object with Customer Id", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "JSON object with Customer Id", accessMode = Schema.AccessMode.READ_ONLY)
     private CustomerId customerId;
     @NotNull
-    @ApiModelProperty(position = 3, required = true, value = "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
-    @ApiModelProperty(position = 4, required = true, value = "JSON object with alarm originator id")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "JSON object with alarm originator id")
     private EntityId originator;
     @NotNull
-    @ApiModelProperty(position = 5, required = true, value = "Alarm severity", example = "CRITICAL")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Alarm severity", example = "CRITICAL")
     private AlarmSeverity severity;
-    @ApiModelProperty(position = 6, value = "Timestamp of the alarm start time, in milliseconds", example = "1634058704565")
+    @Schema(description = "Timestamp of the alarm start time, in milliseconds", example = "1634058704565")
     private long startTs;
-    @ApiModelProperty(position = 7, value = "Timestamp of the alarm end time(last time update), in milliseconds", example = "1634111163522")
+    @Schema(description = "Timestamp of the alarm end time(last time update), in milliseconds", example = "1634111163522")
     private long endTs;
     @NoXss
-    @ApiModelProperty(position = 8, value = "JSON object with alarm details")
+    @Schema(description = "JSON object with alarm details")
     private JsonNode details;
     @Valid
-    @ApiModelProperty(position = 9, value = "JSON object with propagation details")
+    @Schema(description = "JSON object with propagation details")
     private AlarmPropagationInfo propagation;
 
     private UserId userId;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmInfo.java
index f9443ce6fc..08f36e1ede 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmInfo.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmInfo.java
@@ -15,8 +15,7 @@
  */
 package org.thingsboard.server.common.data.alarm;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
@@ -24,24 +23,24 @@ import lombok.ToString;
 
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
-@ApiModel
+@Schema
 public class AlarmInfo extends Alarm {
 
     private static final long serialVersionUID = 2807343093519543363L;
 
     @Getter
     @Setter
-    @ApiModelProperty(position = 19, value = "Alarm originator name", example = "Thermostat")
+    @Schema(description = "Alarm originator name", example = "Thermostat")
     private String originatorName;
 
     @Getter
     @Setter
-    @ApiModelProperty(position = 20, value = "Alarm originator label", example = "Thermostat label")
+    @Schema(description = "Alarm originator label", example = "Thermostat label")
     private String originatorLabel;
 
     @Getter
     @Setter
-    @ApiModelProperty(position = 21, value = "Alarm assignee")
+    @Schema(description = "Alarm assignee")
     private AlarmAssignee assignee;
 
     public AlarmInfo() {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmPropagationInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmPropagationInfo.java
index ec04171c9f..24440dbd93 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmPropagationInfo.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmPropagationInfo.java
@@ -15,7 +15,7 @@
  */
 package org.thingsboard.server.common.data.alarm;
 
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Builder;
 import lombok.Data;
 import org.thingsboard.server.common.data.validation.NoXss;
@@ -29,14 +29,14 @@ public class AlarmPropagationInfo {
 
     public static AlarmPropagationInfo EMPTY = new AlarmPropagationInfo(false, false, false, Collections.emptyList());
 
-    @ApiModelProperty(position = 1, value = "Propagation flag to specify if alarm should be propagated to parent entities of alarm originator", example = "true")
+    @Schema(description = "Propagation flag to specify if alarm should be propagated to parent entities of alarm originator", example = "true")
     private boolean propagate;
-    @ApiModelProperty(position = 2, value = "Propagation flag to specify if alarm should be propagated to the owner (tenant or customer) of alarm originator", example = "true")
+    @Schema(description = "Propagation flag to specify if alarm should be propagated to the owner (tenant or customer) of alarm originator", example = "true")
     private boolean propagateToOwner;
-    @ApiModelProperty(position = 3, value = "Propagation flag to specify if alarm should be propagated to the tenant entity", example = "true")
+    @Schema(description = "Propagation flag to specify if alarm should be propagated to the tenant entity", example = "true")
     private boolean propagateToTenant;
     @NoXss
-    @ApiModelProperty(position = 4, value = "JSON array of relation types that should be used for propagation. " +
+    @Schema(description = "JSON array of relation types that should be used for propagation. " +
             "By default, 'propagateRelationTypes' array is empty which means that the alarm will be propagated based on any relation type to parent entities. " +
             "This parameter should be used only in case when 'propagate' parameter is set to true, otherwise, 'propagateRelationTypes' array will be ignored.")
     private List<String> propagateRelationTypes;
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 8899127131..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
@@ -16,7 +16,7 @@
 package org.thingsboard.server.common.data.alarm;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Builder;
 import lombok.Data;
 import org.thingsboard.server.common.data.id.AlarmId;
@@ -24,34 +24,34 @@ import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.validation.NoXss;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 
 @Data
 @Builder
 public class AlarmUpdateRequest implements AlarmModificationRequest {
 
     @NotNull
-    @ApiModelProperty(position = 1, value = "JSON object with Tenant Id", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "JSON object with Tenant Id", accessMode = Schema.AccessMode.READ_ONLY)
     private TenantId tenantId;
     @NotNull
-    @ApiModelProperty(position = 2, value = "JSON object with the alarm Id. " +
+    @Schema(description = "JSON object with the alarm Id. " +
             "Specify this field to update the alarm. " +
             "Referencing non-existing alarm Id will cause error. " +
             "Omit this field to create new alarm.")
     private AlarmId alarmId;
     @NotNull
-    @ApiModelProperty(position = 3, required = true, value = "Alarm severity", example = "CRITICAL")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Alarm severity", example = "CRITICAL")
     private AlarmSeverity severity;
-    @ApiModelProperty(position = 4, value = "Timestamp of the alarm start time, in milliseconds", example = "1634058704565")
+    @Schema(description = "Timestamp of the alarm start time, in milliseconds", example = "1634058704565")
     private long startTs;
-    @ApiModelProperty(position = 5, value = "Timestamp of the alarm end time(last time update), in milliseconds", example = "1634111163522")
+    @Schema(description = "Timestamp of the alarm end time(last time update), in milliseconds", example = "1634111163522")
     private long endTs;
     @NoXss
-    @ApiModelProperty(position = 6, value = "JSON object with alarm details")
+    @Schema(description = "JSON object with alarm details")
     private JsonNode details;
     @Valid
-    @ApiModelProperty(position = 7, value = "JSON object with propagation details")
+    @Schema(description = "JSON object with propagation details")
     private AlarmPropagationInfo propagation;
 
     private UserId userId;
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 a30f6a21ef..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
@@ -16,8 +16,7 @@
 package org.thingsboard.server.common.data.asset;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
@@ -35,7 +34,7 @@ import org.thingsboard.server.common.data.validation.NoXss;
 
 import java.util.Optional;
 
-@ApiModel
+@Schema
 @EqualsAndHashCode(callSuper = true)
 public class Asset extends BaseDataWithAdditionalInfo<AssetId> implements HasLabel, HasTenantId, HasCustomerId, ExportableEntity<AssetId> {
 
@@ -88,7 +87,7 @@ public class Asset extends BaseDataWithAdditionalInfo<AssetId> implements HasLab
         this.externalId = asset.getExternalId();
     }
 
-    @ApiModelProperty(position = 1, value = "JSON object with the asset Id. " +
+    @Schema(description = "JSON object with the asset Id. " +
             "Specify this field to update the asset. " +
             "Referencing non-existing asset Id will cause error. " +
             "Omit this field to create new asset.")
@@ -97,13 +96,13 @@ public class Asset extends BaseDataWithAdditionalInfo<AssetId> implements HasLab
         return super.getId();
     }
 
-    @ApiModelProperty(position = 2, value = "Timestamp of the asset creation, in milliseconds", example = "1609459200000", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Timestamp of the asset creation, in milliseconds", example = "1609459200000", accessMode = Schema.AccessMode.READ_ONLY)
     @Override
     public long getCreatedTime() {
         return super.getCreatedTime();
     }
 
-    @ApiModelProperty(position = 3, value = "JSON object with Tenant Id.", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "JSON object with Tenant Id.", accessMode = Schema.AccessMode.READ_ONLY)
     public TenantId getTenantId() {
         return tenantId;
     }
@@ -112,7 +111,7 @@ public class Asset extends BaseDataWithAdditionalInfo<AssetId> implements HasLab
         this.tenantId = tenantId;
     }
 
-    @ApiModelProperty(position = 4, value = "JSON object with Customer Id. Use 'assignAssetToCustomer' to change the Customer Id.", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "JSON object with Customer Id. Use 'assignAssetToCustomer' to change the Customer Id.", accessMode = Schema.AccessMode.READ_ONLY)
     public CustomerId getCustomerId() {
         return customerId;
     }
@@ -121,7 +120,7 @@ public class Asset extends BaseDataWithAdditionalInfo<AssetId> implements HasLab
         this.customerId = customerId;
     }
 
-    @ApiModelProperty(position = 5, required = true, value = "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;
@@ -131,7 +130,7 @@ public class Asset extends BaseDataWithAdditionalInfo<AssetId> implements HasLab
         this.name = name;
     }
 
-    @ApiModelProperty(position = 6, value = "Asset type", example = "Building")
+    @Schema(description = "Asset type", example = "Building")
     public String getType() {
         return type;
     }
@@ -140,7 +139,7 @@ public class Asset extends BaseDataWithAdditionalInfo<AssetId> implements HasLab
         this.type = type;
     }
 
-    @ApiModelProperty(position = 7, value = "Label that may be used in widgets", example = "NY Building")
+    @Schema(description = "Label that may be used in widgets", example = "NY Building")
     public String getLabel() {
         return label;
     }
@@ -149,7 +148,7 @@ public class Asset extends BaseDataWithAdditionalInfo<AssetId> implements HasLab
         this.label = label;
     }
 
-    @ApiModelProperty(position = 8, value = "JSON object with Asset Profile Id.")
+    @Schema(description = "JSON object with Asset Profile Id.")
     public AssetProfileId getAssetProfileId() {
         return assetProfileId;
     }
@@ -158,7 +157,7 @@ public class Asset extends BaseDataWithAdditionalInfo<AssetId> implements HasLab
         this.assetProfileId = assetProfileId;
     }
 
-    @ApiModelProperty(position = 9, value = "Additional parameters of the asset", dataType = "com.fasterxml.jackson.databind.JsonNode")
+    @Schema(description = "Additional parameters of the asset",implementation = com.fasterxml.jackson.databind.JsonNode.class)
     @Override
     public JsonNode getAdditionalInfo() {
         return super.getAdditionalInfo();
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/asset/AssetInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/asset/AssetInfo.java
index a0b5665039..5466be1ce1 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/asset/AssetInfo.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/asset/AssetInfo.java
@@ -15,25 +15,24 @@
  */
 package org.thingsboard.server.common.data.asset;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.id.AssetId;
 
-@ApiModel
+@Schema
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class AssetInfo extends Asset {
 
     private static final long serialVersionUID = -4094528227011066194L;
 
-    @ApiModelProperty(position = 10, value = "Title of the Customer that owns the asset.", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Title of the Customer that owns the asset.", accessMode = Schema.AccessMode.READ_ONLY)
     private String customerTitle;
-    @ApiModelProperty(position = 11, value = "Indicates special 'Public' Customer that is auto-generated to use the assets on public dashboards.", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Indicates special 'Public' Customer that is auto-generated to use the assets on public dashboards.", accessMode = Schema.AccessMode.READ_ONLY)
     private boolean customerIsPublic;
 
-    @ApiModelProperty(position = 12, value = "Name of the corresponding Asset Profile.", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Name of the corresponding Asset Profile.", accessMode = Schema.AccessMode.READ_ONLY)
     private String assetProfileName;
 
 
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/asset/AssetProfile.java b/common/data/src/main/java/org/thingsboard/server/common/data/asset/AssetProfile.java
index c06f99764d..2eb98a604a 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/asset/AssetProfile.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/asset/AssetProfile.java
@@ -15,8 +15,7 @@
  */
 package org.thingsboard.server.common.data.asset;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -34,7 +33,7 @@ import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.validation.Length;
 import org.thingsboard.server.common.data.validation.NoXss;
 
-@ApiModel
+@Schema
 @Data
 @ToString(exclude = {"image"})
 @EqualsAndHashCode(callSuper = true)
@@ -43,32 +42,32 @@ public class AssetProfile extends BaseData<AssetProfileId> implements HasName, H
 
     private static final long serialVersionUID = 6998485460273302018L;
 
-    @ApiModelProperty(position = 3, value = "JSON object with Tenant Id that owns the profile.", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "JSON object with Tenant Id that owns the profile.", accessMode = Schema.AccessMode.READ_ONLY)
     private TenantId tenantId;
     @NoXss
     @Length(fieldName = "name")
-    @ApiModelProperty(position = 4, value = "Unique Asset Profile Name in scope of Tenant.", example = "Building")
+    @Schema(description = "Unique Asset Profile Name in scope of Tenant.", example = "Building")
     private String name;
     @NoXss
-    @ApiModelProperty(position = 11, value = "Asset Profile description. ")
+    @Schema(description = "Asset Profile description. ")
     private String description;
-    @ApiModelProperty(position = 12, value = "Either URL or Base64 data of the icon. Used in the mobile application to visualize set of asset profiles in the grid view. ")
+    @Schema(description = "Either URL or Base64 data of the icon. Used in the mobile application to visualize set of asset profiles in the grid view. ")
     private String image;
     private boolean isDefault;
-    @ApiModelProperty(position = 7, value = "Reference to the rule chain. " +
+    @Schema(description = "Reference to the rule chain. " +
             "If present, the specified rule chain will be used to process all messages related to asset, including asset updates, telemetry, attribute updates, etc. " +
             "Otherwise, the root rule chain will be used to process those messages.")
     private RuleChainId defaultRuleChainId;
-    @ApiModelProperty(position = 6, value = "Reference to the dashboard. Used in the mobile application to open the default dashboard when user navigates to asset details.")
+    @Schema(description = "Reference to the dashboard. Used in the mobile application to open the default dashboard when user navigates to asset details.")
     private DashboardId defaultDashboardId;
 
     @NoXss
-    @ApiModelProperty(position = 8, value = "Rule engine queue name. " +
+    @Schema(description = "Rule engine queue name. " +
             "If present, the specified queue will be used to store all unprocessed messages related to asset, including asset updates, telemetry, attribute updates, etc. " +
             "Otherwise, the 'Main' queue will be used to store those messages.")
     private String defaultQueueName;
 
-    @ApiModelProperty(position = 13, value = "Reference to the edge rule chain. " +
+    @Schema(description = "Reference to the edge rule chain. " +
             "If present, the specified edge rule chain will be used on the edge to process all messages related to asset, including asset updates, telemetry, attribute updates, etc. " +
             "Otherwise, the edge root rule chain will be used to process those messages.")
     private RuleChainId defaultEdgeRuleChainId;
@@ -97,7 +96,7 @@ public class AssetProfile extends BaseData<AssetProfileId> implements HasName, H
         this.externalId = assetProfile.getExternalId();
     }
 
-    @ApiModelProperty(position = 1, value = "JSON object with the asset profile Id. " +
+    @Schema(description = "JSON object with the asset profile Id. " +
             "Specify this field to update the asset profile. " +
             "Referencing non-existing asset profile Id will cause error. " +
             "Omit this field to create new asset profile.")
@@ -106,13 +105,13 @@ public class AssetProfile extends BaseData<AssetProfileId> implements HasName, H
         return super.getId();
     }
 
-    @ApiModelProperty(position = 2, value = "Timestamp of the profile creation, in milliseconds", example = "1609459200000", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Timestamp of the profile creation, in milliseconds", example = "1609459200000", accessMode = Schema.AccessMode.READ_ONLY)
     @Override
     public long getCreatedTime() {
         return super.getCreatedTime();
     }
 
-    @ApiModelProperty(position = 5, value = "Used to mark the default profile. Default profile is used when the asset profile is not specified during asset creation.")
+    @Schema(description = "Used to mark the default profile. Default profile is used when the asset profile is not specified during asset creation.")
     public boolean isDefault() {
         return isDefault;
     }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/asset/AssetProfileInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/asset/AssetProfileInfo.java
index 142c7363ea..49b3052425 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/asset/AssetProfileInfo.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/asset/AssetProfileInfo.java
@@ -17,7 +17,7 @@ package org.thingsboard.server.common.data.asset;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import lombok.Value;
@@ -35,12 +35,12 @@ import java.util.UUID;
 @ToString(callSuper = true, exclude = "image")
 public class AssetProfileInfo extends EntityInfo {
 
-    @ApiModelProperty(position = 3, value = "Either URL or Base64 data of the icon. Used in the mobile application to visualize set of asset profiles in the grid view. ")
+    @Schema(description = "Either URL or Base64 data of the icon. Used in the mobile application to visualize set of asset profiles in the grid view. ")
     private final String image;
-    @ApiModelProperty(position = 4, value = "Reference to the dashboard. Used in the mobile application to open the default dashboard when user navigates to asset details.")
+    @Schema(description = "Reference to the dashboard. Used in the mobile application to open the default dashboard when user navigates to asset details.")
     private final DashboardId defaultDashboardId;
 
-    @ApiModelProperty(position = 5, value = "Tenant id.")
+    @Schema(description = "Tenant id.")
     private final TenantId tenantId;
 
     @JsonCreator
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/asset/AssetSearchQuery.java b/common/data/src/main/java/org/thingsboard/server/common/data/asset/AssetSearchQuery.java
index ea0118e92a..edb6858385 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/asset/AssetSearchQuery.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/asset/AssetSearchQuery.java
@@ -15,7 +15,7 @@
  */
 package org.thingsboard.server.common.data.asset;
 
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.relation.EntityRelation;
@@ -32,11 +32,11 @@ import java.util.List;
 @Data
 public class AssetSearchQuery {
 
-    @ApiModelProperty(position = 3, value = "Main search parameters.")
+    @Schema(description = "Main search parameters.")
     private RelationsSearchParameters parameters;
-    @ApiModelProperty(position = 1, value = "Type of the relation between root entity and asset (e.g. 'Contains' or 'Manages').")
+    @Schema(description = "Type of the relation between root entity and asset (e.g. 'Contains' or 'Manages').")
     private String relationType;
-    @ApiModelProperty(position = 2, value = "Array of asset types to filter the related entities (e.g. 'Building', 'Vehicle').")
+    @Schema(description = "Array of asset types to filter the related entities (e.g. 'Building', 'Vehicle').")
     private List<String> assetTypes;
 
     public EntityRelationsQuery toEntitySearchQuery() {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/audit/AuditLog.java b/common/data/src/main/java/org/thingsboard/server/common/data/audit/AuditLog.java
index db8c9ee8a3..bc7ac85755 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/audit/AuditLog.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/audit/AuditLog.java
@@ -16,8 +16,7 @@
 package org.thingsboard.server.common.data.audit;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.BaseData;
@@ -28,31 +27,31 @@ import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.validation.NoXss;
 
-@ApiModel
+@Schema
 @EqualsAndHashCode(callSuper = true)
 @Data
 public class AuditLog extends BaseData<AuditLogId> {
 
-    @ApiModelProperty(position = 3, value = "JSON object with Tenant Id", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "JSON object with Tenant Id", accessMode = Schema.AccessMode.READ_ONLY)
     private TenantId tenantId;
-    @ApiModelProperty(position = 4, value = "JSON object with Customer Id", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "JSON object with Customer Id", accessMode = Schema.AccessMode.READ_ONLY)
     private CustomerId customerId;
-    @ApiModelProperty(position = 5, value = "JSON object with Entity id", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "JSON object with Entity id", accessMode = Schema.AccessMode.READ_ONLY)
     private EntityId entityId;
     @NoXss
-    @ApiModelProperty(position = 6, value = "Name of the logged entity", example = "Thermometer", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Name of the logged entity", example = "Thermometer", accessMode = Schema.AccessMode.READ_ONLY)
     private String entityName;
-    @ApiModelProperty(position = 7, value = "JSON object with User id.", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "JSON object with User id.", accessMode = Schema.AccessMode.READ_ONLY)
     private UserId userId;
-    @ApiModelProperty(position = 8, value = "Unique user name(email) of the user that performed some action on logged entity", example = "tenant@thingsboard.org", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Unique user name(email) of the user that performed some action on logged entity", example = "tenant@thingsboard.org", accessMode = Schema.AccessMode.READ_ONLY)
     private String userName;
-    @ApiModelProperty(position = 9, value = "String represented Action type", example = "ADDED", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "String represented Action type", example = "ADDED", accessMode = Schema.AccessMode.READ_ONLY)
     private ActionType actionType;
-    @ApiModelProperty(position = 10, value = "JsonNode represented action data", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "JsonNode represented action data", accessMode = Schema.AccessMode.READ_ONLY)
     private JsonNode actionData;
-    @ApiModelProperty(position = 11, value = "String represented Action status", example = "SUCCESS", allowableValues = "SUCCESS,FAILURE", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "String represented Action status", example = "SUCCESS", allowableValues = "SUCCESS,FAILURE", accessMode = Schema.AccessMode.READ_ONLY)
     private ActionStatus actionStatus;
-    @ApiModelProperty(position = 12, value = "Failure action details info. An empty string in case of action status type 'SUCCESS', otherwise includes stack trace of the caused exception.", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Failure action details info. An empty string in case of action status type 'SUCCESS', otherwise includes stack trace of the caused exception.", accessMode = Schema.AccessMode.READ_ONLY)
     private String actionFailureDetails;
 
     public AuditLog() {
@@ -77,13 +76,13 @@ public class AuditLog extends BaseData<AuditLogId> {
         this.actionFailureDetails = auditLog.getActionFailureDetails();
     }
 
-    @ApiModelProperty(position = 2, value = "Timestamp of the auditLog creation, in milliseconds", example = "1609459200000", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Timestamp of the auditLog creation, in milliseconds", example = "1609459200000", accessMode = Schema.AccessMode.READ_ONLY)
     @Override
     public long getCreatedTime() {
         return super.getCreatedTime();
     }
 
-    @ApiModelProperty(position = 1, value = "JSON object with the auditLog Id")
+    @Schema(description = "JSON object with the auditLog Id")
     @Override
     public AuditLogId getId() {
         return super.getId();
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/DeviceSearchQuery.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/DeviceSearchQuery.java
index caeffab84c..73efd4f448 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/DeviceSearchQuery.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/DeviceSearchQuery.java
@@ -15,8 +15,7 @@
  */
 package org.thingsboard.server.common.data.device;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.relation.EntityRelation;
@@ -27,15 +26,15 @@ import org.thingsboard.server.common.data.relation.RelationsSearchParameters;
 import java.util.Collections;
 import java.util.List;
 
-@ApiModel
+@Schema
 @Data
 public class DeviceSearchQuery {
 
-    @ApiModelProperty(position = 3, value = "Main search parameters.")
+    @Schema(description = "Main search parameters.")
     private RelationsSearchParameters parameters;
-    @ApiModelProperty(position = 1, value = "Type of the relation between root entity and device (e.g. 'Contains' or 'Manages').")
+    @Schema(description = "Type of the relation between root entity and device (e.g. 'Contains' or 'Manages').")
     private String relationType;
-    @ApiModelProperty(position = 2, value = "Array of device types to filter the related entities (e.g. 'Temperature Sensor', 'Smoke Sensor').")
+    @Schema(description = "Array of device types to filter the related entities (e.g. 'Temperature Sensor', 'Smoke Sensor').")
     private List<String> deviceTypes;
 
     public EntityRelationsQuery toEntitySearchQuery() {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/data/DefaultDeviceConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/data/DefaultDeviceConfiguration.java
index 5b8ed86fca..47e7fc8596 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/data/DefaultDeviceConfiguration.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/data/DefaultDeviceConfiguration.java
@@ -15,11 +15,11 @@
  */
 package org.thingsboard.server.common.data.device.data;
 
-import io.swagger.annotations.ApiModel;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.thingsboard.server.common.data.DeviceProfileType;
 
-@ApiModel
+@Schema
 @Data
 public class DefaultDeviceConfiguration implements DeviceConfiguration {
 
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/data/DeviceConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/data/DeviceConfiguration.java
index 110b0df86f..f6ddb614b6 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/data/DeviceConfiguration.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/data/DeviceConfiguration.java
@@ -19,12 +19,12 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import io.swagger.annotations.ApiModel;
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.thingsboard.server.common.data.DeviceProfileType;
 
 import java.io.Serializable;
 
-@ApiModel
+@Schema
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonTypeInfo(
         use = JsonTypeInfo.Id.NAME,
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/data/DeviceData.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/data/DeviceData.java
index 595e23fe81..3aa01dfbdc 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/data/DeviceData.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/data/DeviceData.java
@@ -15,21 +15,20 @@
  */
 package org.thingsboard.server.common.data.device.data;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.io.Serializable;
 
-@ApiModel
+@Schema
 @Data
 public class DeviceData implements Serializable {
 
     private static final long serialVersionUID = -3771567735290681274L;
 
-    @ApiModelProperty(position = 1, value = "Device configuration for device profile type. DEFAULT is only supported value for now")
+    @Schema(description = "Device configuration for device profile type. DEFAULT is only supported value for now")
     private DeviceConfiguration configuration;
-    @ApiModelProperty(position = 2, value = "Device transport configuration used to connect the device")
+    @Schema(description = "Device transport configuration used to connect the device")
     private DeviceTransportConfiguration transportConfiguration;
 
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/data/DeviceTransportConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/data/DeviceTransportConfiguration.java
index bcbbf631f2..7b1143272c 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/data/DeviceTransportConfiguration.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/data/DeviceTransportConfiguration.java
@@ -19,12 +19,12 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import io.swagger.annotations.ApiModel;
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.thingsboard.server.common.data.DeviceTransportType;
 
 import java.io.Serializable;
 
-@ApiModel
+@Schema
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonTypeInfo(
         use = JsonTypeInfo.Id.NAME,
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/AlarmCondition.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/AlarmCondition.java
index 76d48c0d24..5983c4dd06 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/AlarmCondition.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/AlarmCondition.java
@@ -16,23 +16,22 @@
 package org.thingsboard.server.common.data.device.profile;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import java.io.Serializable;
 import java.util.List;
 
-@ApiModel
+@Schema
 @Data
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class AlarmCondition implements Serializable {
 
     @Valid
-    @ApiModelProperty(position = 1, value = "JSON array of alarm condition filters")
+    @Schema(description = "JSON array of alarm condition filters")
     private List<AlarmConditionFilter> condition;
-    @ApiModelProperty(position = 2, value = "JSON object representing alarm condition type")
+    @Schema(description = "JSON object representing alarm condition type")
     private AlarmConditionSpec spec;
 
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/AlarmConditionFilter.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/AlarmConditionFilter.java
index a97d56193c..2f6e20f013 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/AlarmConditionFilter.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/AlarmConditionFilter.java
@@ -15,30 +15,29 @@
  */
 package org.thingsboard.server.common.data.device.profile;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.thingsboard.server.common.data.query.EntityKeyValueType;
 import org.thingsboard.server.common.data.query.KeyFilterPredicate;
 import org.thingsboard.server.common.data.validation.NoXss;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import java.io.Serializable;
 
-@ApiModel
+@Schema
 @Data
 public class AlarmConditionFilter implements Serializable {
 
     @Valid
-    @ApiModelProperty(position = 1, value = "JSON object for specifying alarm condition by specific key")
+    @Schema(description = "JSON object for specifying alarm condition by specific key")
     private AlarmConditionFilterKey key;
-    @ApiModelProperty(position = 2, value = "String representation of the type of the value", example = "NUMERIC")
+    @Schema(description = "String representation of the type of the value", example = "NUMERIC")
     private EntityKeyValueType valueType;
     @NoXss
-    @ApiModelProperty(position = 3, value = "Value used in Constant comparison. For other types, such as TIME_SERIES or ATTRIBUTE, the predicate condition is used")
+    @Schema(description = "Value used in Constant comparison. For other types, such as TIME_SERIES or ATTRIBUTE, the predicate condition is used")
     private Object value;
     @Valid
-    @ApiModelProperty(position = 4, value = "JSON object representing filter condition")
+    @Schema(description = "JSON object representing filter condition")
     private KeyFilterPredicate predicate;
 
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/AlarmConditionFilterKey.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/AlarmConditionFilterKey.java
index 713f223790..51c04b1756 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/AlarmConditionFilterKey.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/AlarmConditionFilterKey.java
@@ -15,21 +15,20 @@
  */
 package org.thingsboard.server.common.data.device.profile;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.thingsboard.server.common.data.validation.NoXss;
 
 import java.io.Serializable;
 
-@ApiModel
+@Schema
 @Data
 public class AlarmConditionFilterKey implements Serializable {
 
-    @ApiModelProperty(position = 1, value = "The key type", example = "TIME_SERIES")
+    @Schema(description = "The key type", example = "TIME_SERIES")
     private final AlarmConditionKeyType type;
     @NoXss
-    @ApiModelProperty(position = 2, value = "String value representing the key", example = "temp")
+    @Schema(description = "String value representing the key", example = "temp")
     private final String key;
 
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/AlarmRule.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/AlarmRule.java
index 5c985100bd..a42b0523d2 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/AlarmRule.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/AlarmRule.java
@@ -15,29 +15,28 @@
  */
 package org.thingsboard.server.common.data.device.profile;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.thingsboard.server.common.data.id.DashboardId;
 import org.thingsboard.server.common.data.validation.NoXss;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import java.io.Serializable;
 
-@ApiModel
+@Schema
 @Data
 public class AlarmRule implements Serializable {
 
     @Valid
-    @ApiModelProperty(position = 1, value = "JSON object representing the alarm rule condition")
+    @Schema(description = "JSON object representing the alarm rule condition")
     private AlarmCondition condition;
-    @ApiModelProperty(position = 2, value = "JSON object representing time interval during which the rule is active")
+    @Schema(description = "JSON object representing time interval during which the rule is active")
     private AlarmSchedule schedule;
     // Advanced
     @NoXss
-    @ApiModelProperty(position = 3, value = "String value representing the additional details for an alarm rule")
+    @Schema(description = "String value representing the additional details for an alarm rule")
     private String alarmDetails;
-    @ApiModelProperty(position = 4, value = "JSON object with the dashboard Id representing the reference to alarm details dashboard used by mobile application")
+    @Schema(description = "JSON object with the dashboard Id representing the reference to alarm details dashboard used by mobile application")
     private DashboardId dashboardId;
 
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DeviceProfileAlarm.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DeviceProfileAlarm.java
index d67d6e13c6..ebf39ceec9 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DeviceProfileAlarm.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DeviceProfileAlarm.java
@@ -15,46 +15,45 @@
  */
 package org.thingsboard.server.common.data.device.profile;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.thingsboard.server.common.data.alarm.AlarmSeverity;
 import org.thingsboard.server.common.data.validation.Length;
 import org.thingsboard.server.common.data.validation.NoXss;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import java.io.Serializable;
 import java.util.List;
 import java.util.TreeMap;
 
-@ApiModel
+@Schema
 @Data
 public class DeviceProfileAlarm implements Serializable {
 
-    @ApiModelProperty(position = 1, value = "String value representing the alarm rule id", example = "highTemperatureAlarmID")
+    @Schema(description = "String value representing the alarm rule id", example = "highTemperatureAlarmID")
     private String id;
     @Length(fieldName = "alarm type")
     @NoXss
-    @ApiModelProperty(position = 2, value = "String value representing type of the alarm", example = "High Temperature Alarm")
+    @Schema(description = "String value representing type of the alarm", example = "High Temperature Alarm")
     private String alarmType;
 
     @Valid
-    @ApiModelProperty(position = 3, value = "Complex JSON object representing create alarm rules. The unique create alarm rule can be created for each alarm severity type. " +
+    @Schema(description = "Complex JSON object representing create alarm rules. The unique create alarm rule can be created for each alarm severity type. " +
             "There can be 5 create alarm rules configured per a single alarm type. See method implementation notes and AlarmRule model for more details")
     private TreeMap<AlarmSeverity, AlarmRule> createRules;
     @Valid
-    @ApiModelProperty(position = 4, value = "JSON object representing clear alarm rule")
+    @Schema(description = "JSON object representing clear alarm rule")
     private AlarmRule clearRule;
 
     // Hidden in advanced settings
-    @ApiModelProperty(position = 5, value = "Propagation flag to specify if alarm should be propagated to parent entities of alarm originator", example = "true")
+    @Schema(description = "Propagation flag to specify if alarm should be propagated to parent entities of alarm originator", example = "true")
     private boolean propagate;
-    @ApiModelProperty(position = 6, value = "Propagation flag to specify if alarm should be propagated to the owner (tenant or customer) of alarm originator", example = "true")
+    @Schema(description = "Propagation flag to specify if alarm should be propagated to the owner (tenant or customer) of alarm originator", example = "true")
     private boolean propagateToOwner;
-    @ApiModelProperty(position = 7, value = "Propagation flag to specify if alarm should be propagated to the tenant entity", example = "true")
+    @Schema(description = "Propagation flag to specify if alarm should be propagated to the tenant entity", example = "true")
     private boolean propagateToTenant;
 
-    @ApiModelProperty(position = 8, value = "JSON array of relation types that should be used for propagation. " +
+    @Schema(description = "JSON array of relation types that should be used for propagation. " +
             "By default, 'propagateRelationTypes' array is empty which means that the alarm will be propagated based on any relation type to parent entities. " +
             "This parameter should be used only in case when 'propagate' parameter is set to true, otherwise, 'propagateRelationTypes' array will be ignored.")
     private List<String> propagateRelationTypes;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DeviceProfileData.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DeviceProfileData.java
index 06c3f3ef20..3c1b684c74 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DeviceProfileData.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DeviceProfileData.java
@@ -15,29 +15,28 @@
  */
 package org.thingsboard.server.common.data.device.profile;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import java.io.Serializable;
 import java.util.List;
 
-@ApiModel
+@Schema
 @Data
 public class DeviceProfileData implements Serializable {
 
     private static final long serialVersionUID = -3864805547939495272L;
 
-    @ApiModelProperty(position = 1, value = "JSON object of device profile configuration")
+    @Schema(description = "JSON object of device profile configuration")
     private DeviceProfileConfiguration configuration;
     @Valid
-    @ApiModelProperty(position = 2, value = "JSON object of device profile transport configuration")
+    @Schema(description = "JSON object of device profile transport configuration")
     private DeviceProfileTransportConfiguration transportConfiguration;
-    @ApiModelProperty(position = 3, value = "JSON object of provisioning strategy type per device profile")
+    @Schema(description = "JSON object of provisioning strategy type per device profile")
     private DeviceProfileProvisionConfiguration provisionConfiguration;
     @Valid
-    @ApiModelProperty(position = 4, value = "JSON array of alarm rules configuration per device profile")
+    @Schema(description = "JSON array of alarm rules configuration per device profile")
     private List<DeviceProfileAlarm> alarms;
 
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/lwm2m/ObjectAttributes.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/lwm2m/ObjectAttributes.java
index 68ba8d3039..bffda8235f 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/lwm2m/ObjectAttributes.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/lwm2m/ObjectAttributes.java
@@ -17,6 +17,7 @@ package org.thingsboard.server.common.data.device.profile.lwm2m;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
+import org.eclipse.leshan.core.LwM2m;
 
 import java.io.Serializable;
 
@@ -25,13 +26,25 @@ import java.io.Serializable;
 public class ObjectAttributes implements Serializable {
 
     private static final long serialVersionUID = 4765123984733721312L;
-
     private Long dim;
+    private Long ssid;
+    private String uri;
     private String ver;
+    private String lwm2m;
     private Long pmin;
     private Long pmax;
     private Double gt;
     private Double lt;
     private Double st;
+    private Long epmin;
+    private Long epmax;
+
+    public LwM2m.Version getVer(){
+        return  ver != null ? new LwM2m.Version(ver) : null;
+    }
+
+    public LwM2m.LwM2mVersion getLwm2m(){
+        return lwm2m != null ?  LwM2m.LwM2mVersion.get(lwm2m) : null;
+    }
 
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/lwm2m/bootstrap/LwM2MServerSecurityConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/lwm2m/bootstrap/LwM2MServerSecurityConfig.java
index 8a12e155e3..2fb80c7a5c 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/lwm2m/bootstrap/LwM2MServerSecurityConfig.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/lwm2m/bootstrap/LwM2MServerSecurityConfig.java
@@ -15,54 +15,55 @@
  */
 package org.thingsboard.server.common.data.device.profile.lwm2m.bootstrap;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-@ApiModel
+import java.io.Serializable;
+
+@Schema
 @Data
-public class LwM2MServerSecurityConfig {
+public class LwM2MServerSecurityConfig implements Serializable {
 
-    @ApiModelProperty(position = 1, value = "Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. " +
+    @Schema(description = "Server short Id. Used as link to associate server Object Instance. 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.", example = "123", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+            "The values ID:1 and ID:65534 values MUST NOT be used for identifying the LwM2M Server.", example = "123", accessMode = Schema.AccessMode.READ_ONLY)
     protected Integer shortServerId = 123;
     /** Security -> ObjectId = 0 'LWM2M Security' */
-    @ApiModelProperty(position = 2, value = "Is Bootstrap Server or Lwm2m Server. " +
+    @Schema(description = "Is Bootstrap Server or Lwm2m Server. " +
             "The LwM2M Client MAY be configured to use one or more LwM2M Server Account(s). " +
             "The LwM2M Client MUST have at most one LwM2M Bootstrap-Server Account. " +
-            "(*) The LwM2M client MUST have at least one LwM2M server account after completing the boot sequence specified.", example = "true or false", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+            "(*) The LwM2M client MUST have at least one LwM2M server account after completing the boot sequence specified.", example = "true or false", accessMode = Schema.AccessMode.READ_ONLY)
     protected boolean bootstrapServerIs = false;
-    @ApiModelProperty(position = 3, value = "Host for 'No Security' mode", example = "0.0.0.0", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Host for 'No Security' mode", example = "0.0.0.0", accessMode = Schema.AccessMode.READ_ONLY)
     protected String host;
-    @ApiModelProperty(position = 4, value = "Port for  Lwm2m Server: 'No Security' mode: Lwm2m Server or Bootstrap Server", example = "'5685' or '5687'", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Port for  Lwm2m Server: 'No Security' mode: Lwm2m Server or Bootstrap Server", example = "'5685' or '5687'", accessMode = Schema.AccessMode.READ_ONLY)
     protected Integer port;
-    @ApiModelProperty(position = 7, value = "Client Hold Off Time. The number of seconds to wait before initiating a Client Initiated Bootstrap once the LwM2M Client has determined it should initiate this bootstrap mode. (This information is relevant for use with a Bootstrap-Server only.)", example = "1", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Client Hold Off Time. The number of seconds to wait before initiating a Client Initiated Bootstrap once the LwM2M Client has determined it should initiate this bootstrap mode. (This information is relevant for use with a Bootstrap-Server only.)", example = "1", accessMode = Schema.AccessMode.READ_ONLY)
     protected Integer clientHoldOffTime = 1;
-    @ApiModelProperty(position = 8, value = "Server Public Key for 'Security' mode (DTLS): RPK or X509. Format: base64 encoded", example = "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEAZ0pSaGKHk/GrDaUDnQZpeEdGwX7m3Ws+U/kiVat\n" +
-            "+44sgk3c8g0LotfMpLlZJPhPwJ6ipXV+O1r7IZUjBs3LNA==", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Server Public Key for 'Security' mode (DTLS): RPK or X509. Format: base64 encoded", example = "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEAZ0pSaGKHk/GrDaUDnQZpeEdGwX7m3Ws+U/kiVat\n" +
+            "+44sgk3c8g0LotfMpLlZJPhPwJ6ipXV+O1r7IZUjBs3LNA==", accessMode = Schema.AccessMode.READ_ONLY)
     protected String serverPublicKey;
-    @ApiModelProperty(position = 9, value = "Server Public Key for 'Security' mode (DTLS): X509. Format: base64 encoded", example = "MMIICODCCAd6gAwIBAgIUI88U1zowOdrxDK/dOV+36gJxI2MwCgYIKoZIzj0EAwIwejELMAkGA1UEBhMCVUs\n" +
+    @Schema(description = "Server Public Key for 'Security' mode (DTLS): X509. Format: base64 encoded", example = "MMIICODCCAd6gAwIBAgIUI88U1zowOdrxDK/dOV+36gJxI2MwCgYIKoZIzj0EAwIwejELMAkGA1UEBhMCVUs\n" +
             "xEjAQBgNVBAgTCUt5aXYgY2l0eTENMAsGA1UEBxMES3lpdjEUMBIGA1UEChMLVGhpbmdzYm9hcmQxFzAVBgNVBAsMDkRFVkVMT1BFUl9URVNUMRkwFwYDVQQDDBBpbnRlcm1lZGlhdGVfY2EwMB4XDTIyMDEwOTEzMDMwMFoXDTI3MDEwODEzMDMwMFowFDESMBAGA1UEAxM\n" +
             "JbG9jYWxob3N0MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEUO3vBo/JTv0eooY7XHiKAIVDoWKFqtrU7C6q8AIKqpLcqhCdW+haFeBOH3PjY6EwaWkY04Bir4oanU0s7tz2uKOBpzCBpDAOBgNVHQ8BAf8EBAMCBaAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwDAYDVR0TAQH/\n" +
             "BAIwADAdBgNVHQ4EFgQUEjc3Q4a0TxzP/3x3EV4fHxYUg0YwHwYDVR0jBBgwFoAUuSquGycMU6Q0SYNcbtSkSD3TfH0wLwYDVR0RBCgwJoIVbG9jYWxob3N0LmxvY2FsZG9tYWlugglsb2NhbGhvc3SCAiAtMAoGCCqGSM49BAMCA0gAMEUCIQD7dbZObyUaoDiNbX+9fUNp\n" +
-            "AWrD7N7XuJUwZ9FcN75R3gIgb2RNjDkHoyUyF1YajwkBk+7XmIXNClmizNJigj908mw=", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+            "AWrD7N7XuJUwZ9FcN75R3gIgb2RNjDkHoyUyF1YajwkBk+7XmIXNClmizNJigj908mw=", accessMode = Schema.AccessMode.READ_ONLY)
     protected String serverCertificate;
-    @ApiModelProperty(position = 10, value = "Bootstrap Server Account Timeout (If the value is set to 0, or if this resource is not instantiated, the Bootstrap-Server Account lifetime is infinite.)", example = "0", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Bootstrap Server Account Timeout (If the value is set to 0, or if this resource is not instantiated, the Bootstrap-Server Account lifetime is infinite.)", example = "0", accessMode = Schema.AccessMode.READ_ONLY)
     Integer bootstrapServerAccountTimeout = 0;
 
     /** Config -> ObjectId = 1 'LwM2M Server' */
-    @ApiModelProperty(position = 11, value = "Specify the lifetime of the registration in seconds.", example = "300", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Specify the lifetime of the registration in seconds.", example = "300", accessMode = Schema.AccessMode.READ_ONLY)
     private Integer lifetime = 300;
-    @ApiModelProperty(position = 12, value = "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.", example = "1", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "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.", example = "1", accessMode = Schema.AccessMode.READ_ONLY)
     private Integer defaultMinPeriod = 1;
     /** ResourceID=6 'Notification Storing When Disabled or Offline' */
-    @ApiModelProperty(position = 13, value = "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. " +
+    @Schema(description = "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.", example = "true", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+            "The default value is true.", example = "true", accessMode = Schema.AccessMode.READ_ONLY)
     private boolean notifIfDisabled = true;
-    @ApiModelProperty(position = 14, value = "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.", example = "U", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "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.", example = "U", accessMode = Schema.AccessMode.READ_ONLY)
     private String binding = "U";
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/lwm2m/bootstrap/LwM2MServerSecurityConfigDefault.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/lwm2m/bootstrap/LwM2MServerSecurityConfigDefault.java
index 64d331d54e..5c136c3e4e 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/lwm2m/bootstrap/LwM2MServerSecurityConfigDefault.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/lwm2m/bootstrap/LwM2MServerSecurityConfigDefault.java
@@ -15,15 +15,14 @@
  */
 package org.thingsboard.server.common.data.device.profile.lwm2m.bootstrap;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-@ApiModel
+@Schema
 @Data
 public class LwM2MServerSecurityConfigDefault extends LwM2MServerSecurityConfig {
-    @ApiModelProperty(position = 5, value = "Host for 'Security' mode (DTLS)", example = "0.0.0.0", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Host for 'Security' mode (DTLS)", example = "0.0.0.0", accessMode = Schema.AccessMode.READ_ONLY)
     protected String securityHost;
-    @ApiModelProperty(position = 6, value = "Port for 'Security' mode (DTLS): Lwm2m Server or Bootstrap Server", example = "5686 or 5688", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Port for 'Security' mode (DTLS): Lwm2m Server or Bootstrap Server", example = "5686 or 5688", accessMode = Schema.AccessMode.READ_ONLY)
     protected Integer securityPort;
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/lwm2m/bootstrap/NoSecLwM2MBootstrapServerCredential.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/lwm2m/bootstrap/NoSecLwM2MBootstrapServerCredential.java
index 55c35f59f0..a4f75726e1 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/lwm2m/bootstrap/NoSecLwM2MBootstrapServerCredential.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/lwm2m/bootstrap/NoSecLwM2MBootstrapServerCredential.java
@@ -17,8 +17,11 @@ package org.thingsboard.server.common.data.device.profile.lwm2m.bootstrap;
 
 import org.thingsboard.server.common.data.device.credentials.lwm2m.LwM2MSecurityMode;
 
+import java.io.Serial;
+
 public class NoSecLwM2MBootstrapServerCredential extends AbstractLwM2MBootstrapServerCredential {
 
+    @Serial
     private static final long serialVersionUID = 5540417758424747066L;
 
     @Override
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 ad98d377a0..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
@@ -15,8 +15,7 @@
  */
 package org.thingsboard.server.common.data.edge;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.EqualsAndHashCode;
 import lombok.Setter;
 import lombok.ToString;
@@ -31,7 +30,7 @@ import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.validation.Length;
 import org.thingsboard.server.common.data.validation.NoXss;
 
-@ApiModel
+@Schema
 @EqualsAndHashCode(callSuper = true)
 @ToString
 @Setter
@@ -89,7 +88,7 @@ public class Edge extends BaseDataWithAdditionalInfo<EdgeId> implements HasLabel
         this.secret = edge.getSecret();
     }
 
-    @ApiModelProperty(position = 1, value = "JSON object with the Edge Id. " +
+    @Schema(description = "JSON object with the Edge Id. " +
             "Specify this field to update the Edge. " +
             "Referencing non-existing Edge Id will cause error. " +
             "Omit this field to create new Edge." )
@@ -98,51 +97,51 @@ public class Edge extends BaseDataWithAdditionalInfo<EdgeId> implements HasLabel
         return super.getId();
     }
 
-    @ApiModelProperty(position = 2, value = "Timestamp of the edge creation, in milliseconds", example = "1609459200000", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Timestamp of the edge creation, in milliseconds", example = "1609459200000", accessMode = Schema.AccessMode.READ_ONLY)
     @Override
     public long getCreatedTime() {
         return super.getCreatedTime();
     }
 
-    @ApiModelProperty(position = 3, value = "JSON object with Tenant Id. Use 'assignDeviceToTenant' to change the Tenant Id.", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "JSON object with Tenant Id. Use 'assignDeviceToTenant' to change the Tenant Id.", accessMode = Schema.AccessMode.READ_ONLY)
     @Override
     public TenantId getTenantId() {
         return this.tenantId;
     }
 
-    @ApiModelProperty(position = 4, value = "JSON object with Customer Id. Use 'assignEdgeToCustomer' to change the Customer Id.", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "JSON object with Customer Id. Use 'assignEdgeToCustomer' to change the Customer Id.", accessMode = Schema.AccessMode.READ_ONLY)
     @Override
     public CustomerId getCustomerId() {
         return this.customerId;
     }
 
-    @ApiModelProperty(position = 5, value = "JSON object with Root Rule Chain Id. Use 'setEdgeRootRuleChain' to change the Root Rule Chain Id.", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "JSON object with Root Rule Chain Id. Use 'setEdgeRootRuleChain' to change the Root Rule Chain Id.", accessMode = Schema.AccessMode.READ_ONLY)
     public RuleChainId getRootRuleChainId() {
         return this.rootRuleChainId;
     }
 
-    @ApiModelProperty(position = 6, required = true, value = "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;
     }
 
-    @ApiModelProperty(position = 7, required = true, value = "Edge type", example = "Silos")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Edge type", example = "Silos")
     public String getType() {
         return this.type;
     }
 
-    @ApiModelProperty(position = 8, value = "Label that may be used in widgets", example = "Silo Edge on far field")
+    @Schema(description = "Label that may be used in widgets", example = "Silo Edge on far field")
     public String getLabel() {
         return this.label;
     }
 
-    @ApiModelProperty(position = 9, required = true, value = "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;
     }
 
-    @ApiModelProperty(position = 10, required = true, value = "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/edge/EdgeInstructions.java b/common/data/src/main/java/org/thingsboard/server/common/data/edge/EdgeInstructions.java
index 8b9259e707..6de4382110 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/edge/EdgeInstructions.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/edge/EdgeInstructions.java
@@ -15,18 +15,17 @@
  */
 package org.thingsboard.server.common.data.edge;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-@ApiModel
+@Schema
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 public class EdgeInstructions {
 
-    @ApiModelProperty(position = 1, value = "Markdown with install/upgrade instructions")
+    @Schema(description = "Markdown with install/upgrade instructions")
     private String instructions;
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/edge/EdgeSearchQuery.java b/common/data/src/main/java/org/thingsboard/server/common/data/edge/EdgeSearchQuery.java
index cec7dbe7c3..5450096716 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/edge/EdgeSearchQuery.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/edge/EdgeSearchQuery.java
@@ -15,7 +15,7 @@
  */
 package org.thingsboard.server.common.data.edge;
 
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.relation.EntityRelation;
@@ -29,11 +29,11 @@ import java.util.List;
 @Data
 public class EdgeSearchQuery {
 
-    @ApiModelProperty(position = 3, value = "Main search parameters.")
+    @Schema(description = "Main search parameters.")
     private RelationsSearchParameters parameters;
-    @ApiModelProperty(position = 1, value = "Type of the relation between root entity and edge (e.g. 'Contains' or 'Manages').")
+    @Schema(description = "Type of the relation between root entity and edge (e.g. 'Contains' or 'Manages').")
     private String relationType;
-    @ApiModelProperty(position = 2, value = "Array of edge types to filter the related entities (e.g. 'Silos', 'Stores').")
+    @Schema(description = "Array of edge types to filter the related entities (e.g. 'Silos', 'Stores').")
     private List<String> edgeTypes;
 
     public EntityRelationsQuery toEntitySearchQuery() {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/entityview/EntityViewSearchQuery.java b/common/data/src/main/java/org/thingsboard/server/common/data/entityview/EntityViewSearchQuery.java
index 99cac8d404..de027eed45 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/entityview/EntityViewSearchQuery.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/entityview/EntityViewSearchQuery.java
@@ -15,8 +15,7 @@
  */
 package org.thingsboard.server.common.data.entityview;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.relation.EntityRelation;
@@ -27,15 +26,15 @@ import org.thingsboard.server.common.data.relation.RelationsSearchParameters;
 import java.util.Collections;
 import java.util.List;
 
-@ApiModel
+@Schema
 @Data
 public class EntityViewSearchQuery {
 
-    @ApiModelProperty(position = 3, value = "Main search parameters.")
+    @Schema(description = "Main search parameters.")
     private RelationsSearchParameters parameters;
-    @ApiModelProperty(position = 1, value = "Type of the relation between root entity and device (e.g. 'Contains' or 'Manages').")
+    @Schema(description = "Type of the relation between root entity and device (e.g. 'Contains' or 'Manages').")
     private String relationType;
-    @ApiModelProperty(position = 2, value = "Array of entity view types to filter the related entities (e.g. 'Temperature Sensor', 'Smoke Sensor').")
+    @Schema(description = "Array of entity view types to filter the related entities (e.g. 'Temperature Sensor', 'Smoke Sensor').")
     private List<String> entityViewTypes;
 
     public EntityRelationsQuery toEntitySearchQuery() {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/event/DebugEventFilter.java b/common/data/src/main/java/org/thingsboard/server/common/data/event/DebugEventFilter.java
index f82b8de2c6..c810dfdbb2 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/event/DebugEventFilter.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/event/DebugEventFilter.java
@@ -15,20 +15,19 @@
  */
 package org.thingsboard.server.common.data.event;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.thingsboard.server.common.data.StringUtils;
 
 @Data
-@ApiModel
+@Schema
 public abstract class DebugEventFilter implements EventFilter {
 
-    @ApiModelProperty(position = 1, value = "String value representing the server name, identifier or ip address where the platform is running", example = "ip-172-31-24-152")
+    @Schema(description = "String value representing the server name, identifier or ip address where the platform is running", example = "ip-172-31-24-152")
     protected String server;
-    @ApiModelProperty(position = 10, value = "Boolean value to filter the errors", allowableValues = "false, true")
+    @Schema(description = "Boolean value to filter the errors", allowableValues = "false, true")
     protected boolean isError;
-    @ApiModelProperty(position = 11, value = "The case insensitive 'contains' filter based on error message", example = "not present in the DB")
+    @Schema(description = "The case insensitive 'contains' filter based on error message", example = "not present in the DB")
     protected String errorStr;
 
     public void setIsError(boolean isError) {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/event/ErrorEventFilter.java b/common/data/src/main/java/org/thingsboard/server/common/data/event/ErrorEventFilter.java
index 5e1743b9e1..62cb7782b9 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/event/ErrorEventFilter.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/event/ErrorEventFilter.java
@@ -15,20 +15,19 @@
  */
 package org.thingsboard.server.common.data.event;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.thingsboard.server.common.data.StringUtils;
 
 @Data
-@ApiModel
+@Schema
 public class ErrorEventFilter implements EventFilter {
 
-    @ApiModelProperty(position = 1, value = "String value representing the server name, identifier or ip address where the platform is running", example = "ip-172-31-24-152")
+    @Schema(description = "String value representing the server name, identifier or ip address where the platform is running", example = "ip-172-31-24-152")
     protected String server;
-    @ApiModelProperty(position = 2, value = "String value representing the method name when the error happened", example = "onClusterEventMsg")
+    @Schema(description = "String value representing the method name when the error happened", example = "onClusterEventMsg")
     protected String method;
-    @ApiModelProperty(position = 3, value = "The case insensitive 'contains' filter based on error message", example = "not present in the DB")
+    @Schema(description = "The case insensitive 'contains' filter based on error message", example = "not present in the DB")
     protected String errorStr;
 
     @Override
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 5feed350e8..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
@@ -17,10 +17,9 @@ package org.thingsboard.server.common.data.event;
 
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 
-@ApiModel
+@Schema
 @JsonTypeInfo(
         use = JsonTypeInfo.Id.NAME,
         include = JsonTypeInfo.As.PROPERTY,
@@ -34,7 +33,7 @@ import io.swagger.annotations.ApiModelProperty;
 })
 public interface EventFilter {
 
-    @ApiModelProperty(position = 1, required = true, value = "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/event/LifeCycleEventFilter.java b/common/data/src/main/java/org/thingsboard/server/common/data/event/LifeCycleEventFilter.java
index 5bef68df23..643dd0bef2 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/event/LifeCycleEventFilter.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/event/LifeCycleEventFilter.java
@@ -15,22 +15,21 @@
  */
 package org.thingsboard.server.common.data.event;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.thingsboard.server.common.data.StringUtils;
 
 @Data
-@ApiModel
+@Schema
 public class LifeCycleEventFilter implements EventFilter {
 
-    @ApiModelProperty(position = 1, value = "String value representing the server name, identifier or ip address where the platform is running", example = "ip-172-31-24-152")
+    @Schema(description = "String value representing the server name, identifier or ip address where the platform is running", example = "ip-172-31-24-152")
     protected String server;
-    @ApiModelProperty(position = 2, value = "String value representing the lifecycle event type", example = "STARTED")
+    @Schema(description = "String value representing the lifecycle event type", example = "STARTED")
     protected String event;
-    @ApiModelProperty(position = 3, value = "String value representing status of the lifecycle event", allowableValues = "Success, Failure")
+    @Schema(description = "String value representing status of the lifecycle event", allowableValues = "Success, Failure")
     protected String status;
-    @ApiModelProperty(position = 4, value = "The case insensitive 'contains' filter based on error message", example = "not present in the DB")
+    @Schema(description = "The case insensitive 'contains' filter based on error message", example = "not present in the DB")
     protected String errorStr;
 
     @Override
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/event/RuleChainDebugEventFilter.java b/common/data/src/main/java/org/thingsboard/server/common/data/event/RuleChainDebugEventFilter.java
index ffb5591ebd..a17b38766e 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/event/RuleChainDebugEventFilter.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/event/RuleChainDebugEventFilter.java
@@ -15,18 +15,17 @@
  */
 package org.thingsboard.server.common.data.event;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.StringUtils;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel
+@Schema
 public class RuleChainDebugEventFilter extends DebugEventFilter {
 
-    @ApiModelProperty(position = 2, value = "String value representing the message")
+    @Schema(description = "String value representing the message")
     protected String message;
 
     @Override
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/event/RuleNodeDebugEventFilter.java b/common/data/src/main/java/org/thingsboard/server/common/data/event/RuleNodeDebugEventFilter.java
index 2fa997c749..6f99de5986 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/event/RuleNodeDebugEventFilter.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/event/RuleNodeDebugEventFilter.java
@@ -15,32 +15,31 @@
  */
 package org.thingsboard.server.common.data.event;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.StringUtils;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel
+@Schema
 public class RuleNodeDebugEventFilter extends DebugEventFilter {
 
-    @ApiModelProperty(position = 2, value = "String value representing msg direction type (incoming to entity or outcoming from entity)", allowableValues = "IN, OUT")
+    @Schema(description = "String value representing msg direction type (incoming to entity or outcoming from entity)", allowableValues = "IN, OUT")
     protected String msgDirectionType;
-    @ApiModelProperty(position = 3, value = "String value representing the entity id in the event body (originator of the message)", example = "de9d54a0-2b7a-11ec-a3cc-23386423d98f")
+    @Schema(description = "String value representing the entity id in the event body (originator of the message)", example = "de9d54a0-2b7a-11ec-a3cc-23386423d98f")
     protected String entityId;
-    @ApiModelProperty(position = 4, value = "String value representing the entity type", allowableValues = "DEVICE")
+    @Schema(description = "String value representing the entity type", allowableValues = "DEVICE")
     protected String entityType;
-    @ApiModelProperty(position = 5, value = "String value representing the message id in the rule engine", example = "de9d54a0-2b7a-11ec-a3cc-23386423d98f")
+    @Schema(description = "String value representing the message id in the rule engine", example = "de9d54a0-2b7a-11ec-a3cc-23386423d98f")
     protected String msgId;
-    @ApiModelProperty(position = 6, value = "String value representing the message type", example = "POST_TELEMETRY_REQUEST")
+    @Schema(description = "String value representing the message type", example = "POST_TELEMETRY_REQUEST")
     protected String msgType;
-    @ApiModelProperty(position = 7, value = "String value representing the type of message routing", example = "Success")
+    @Schema(description = "String value representing the type of message routing", example = "Success")
     protected String relationType;
-    @ApiModelProperty(position = 8, value = "The case insensitive 'contains' filter based on data (key and value) for the message.", example = "humidity")
+    @Schema(description = "The case insensitive 'contains' filter based on data (key and value) for the message.", example = "humidity")
     protected String dataSearch;
-    @ApiModelProperty(position = 9, value = "The case insensitive 'contains' filter based on metadata (key and value) for the message.", example = "deviceName")
+    @Schema(description = "The case insensitive 'contains' filter based on metadata (key and value) for the message.", example = "deviceName")
     protected String metadataSearch;
 
     @Override
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/event/StatisticsEventFilter.java b/common/data/src/main/java/org/thingsboard/server/common/data/event/StatisticsEventFilter.java
index e15094c947..a3ea107b53 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/event/StatisticsEventFilter.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/event/StatisticsEventFilter.java
@@ -15,24 +15,23 @@
  */
 package org.thingsboard.server.common.data.event;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.thingsboard.server.common.data.StringUtils;
 
 @Data
-@ApiModel
+@Schema
 public class StatisticsEventFilter implements EventFilter {
 
-    @ApiModelProperty(position = 1, value = "String value representing the server name, identifier or ip address where the platform is running", example = "ip-172-31-24-152")
+    @Schema(description = "String value representing the server name, identifier or ip address where the platform is running", example = "ip-172-31-24-152")
     protected String server;
-    @ApiModelProperty(position = 2, value = "The minimum number of successfully processed messages", example = "25")
+    @Schema(description = "The minimum number of successfully processed messages", example = "25")
     protected Integer minMessagesProcessed;
-    @ApiModelProperty(position = 3, value = "The maximum number of successfully processed messages", example = "250")
+    @Schema(description = "The maximum number of successfully processed messages", example = "250")
     protected Integer maxMessagesProcessed;
-    @ApiModelProperty(position = 4, value = "The minimum number of errors occurred during messages processing", example = "30")
+    @Schema(description = "The minimum number of errors occurred during messages processing", example = "30")
     protected Integer minErrorsOccurred;
-    @ApiModelProperty(position = 5, value = "The maximum number of errors occurred during messages processing", example = "300")
+    @Schema(description = "The maximum number of errors occurred during messages processing", example = "300")
     protected Integer maxErrorsOccurred;
 
     @Override
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/housekeeper/AlarmsDeletionHousekeeperTask.java b/common/data/src/main/java/org/thingsboard/server/common/data/housekeeper/AlarmsDeletionHousekeeperTask.java
new file mode 100644
index 0000000000..60a50916ef
--- /dev/null
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/housekeeper/AlarmsDeletionHousekeeperTask.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.common.data.housekeeper;
+
+import lombok.AccessLevel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.id.TenantId;
+
+import java.util.List;
+import java.util.UUID;
+
+@Data
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public class AlarmsDeletionHousekeeperTask extends HousekeeperTask {
+
+    private List<UUID> alarms;
+
+    public AlarmsDeletionHousekeeperTask(TenantId tenantId, EntityId entityId) {
+        this(tenantId, entityId, null);
+    }
+
+    public AlarmsDeletionHousekeeperTask(TenantId tenantId, EntityId entityId, List<UUID> alarms) {
+        super(tenantId, entityId, HousekeeperTaskType.DELETE_ALARMS);
+        this.alarms = alarms;
+    }
+
+    @Override
+    public String getDescription() {
+        return super.getDescription() + (alarms != null ? " (" + alarms + ")" : "");
+    }
+
+}
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/housekeeper/AlarmsUnassignHousekeeperTask.java b/common/data/src/main/java/org/thingsboard/server/common/data/housekeeper/AlarmsUnassignHousekeeperTask.java
new file mode 100644
index 0000000000..5911418dc3
--- /dev/null
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/housekeeper/AlarmsUnassignHousekeeperTask.java
@@ -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.
+ */
+package org.thingsboard.server.common.data.housekeeper;
+
+import lombok.AccessLevel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+import org.thingsboard.server.common.data.User;
+
+@Data
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public class AlarmsUnassignHousekeeperTask extends HousekeeperTask {
+
+    private String userTitle;
+
+    protected AlarmsUnassignHousekeeperTask(User user) {
+        super(user.getTenantId(), user.getId(), HousekeeperTaskType.UNASSIGN_ALARMS);
+        this.userTitle = user.getTitle();
+    }
+
+}
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/housekeeper/EntitiesDeletionHousekeeperTask.java b/common/data/src/main/java/org/thingsboard/server/common/data/housekeeper/EntitiesDeletionHousekeeperTask.java
new file mode 100644
index 0000000000..b98af48d42
--- /dev/null
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/housekeeper/EntitiesDeletionHousekeeperTask.java
@@ -0,0 +1,50 @@
+/**
+ * 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.housekeeper;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+import org.thingsboard.server.common.data.EntityType;
+import org.thingsboard.server.common.data.id.TenantId;
+
+import java.util.List;
+import java.util.UUID;
+
+@Data
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
+public class EntitiesDeletionHousekeeperTask extends HousekeeperTask {
+
+    private EntityType entityType;
+    private List<UUID> entities;
+
+    public EntitiesDeletionHousekeeperTask(TenantId tenantId, EntityType entityType, List<UUID> entities) {
+        super(tenantId, tenantId, HousekeeperTaskType.DELETE_ENTITIES);
+        this.entityType = entityType;
+        this.entities = entities;
+    }
+
+    @JsonIgnore
+    @Override
+    public String getDescription() {
+        return entityType.getNormalName().toLowerCase() + "s deletion (" + entities + ")";
+    }
+
+}
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/housekeeper/HousekeeperTask.java b/common/data/src/main/java/org/thingsboard/server/common/data/housekeeper/HousekeeperTask.java
new file mode 100644
index 0000000000..8757b1121e
--- /dev/null
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/housekeeper/HousekeeperTask.java
@@ -0,0 +1,89 @@
+/**
+ * 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.housekeeper;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonSubTypes.Type;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import lombok.AccessLevel;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.NonNull;
+import org.thingsboard.server.common.data.EntityType;
+import org.thingsboard.server.common.data.User;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.id.TenantId;
+
+import java.io.Serializable;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "taskType", visible = true, include = JsonTypeInfo.As.EXISTING_PROPERTY, defaultImpl = HousekeeperTask.class)
+@JsonSubTypes({
+        @Type(name = "DELETE_TS_HISTORY", value = TsHistoryDeletionHousekeeperTask.class),
+        @Type(name = "DELETE_LATEST_TS", value = LatestTsDeletionHousekeeperTask.class),
+        @Type(name = "DELETE_TENANT_ENTITIES", value = TenantEntitiesDeletionHousekeeperTask.class),
+        @Type(name = "DELETE_ENTITIES", value = EntitiesDeletionHousekeeperTask.class),
+        @Type(name = "DELETE_ALARMS", value = AlarmsDeletionHousekeeperTask.class),
+        @Type(name = "UNASSIGN_ALARMS", value = AlarmsUnassignHousekeeperTask.class)
+})
+@Data
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public class HousekeeperTask implements Serializable {
+
+    private TenantId tenantId;
+    private EntityId entityId;
+    private HousekeeperTaskType taskType;
+    private long ts;
+
+    protected HousekeeperTask(@NonNull TenantId tenantId, @NonNull EntityId entityId, @NonNull HousekeeperTaskType taskType) {
+        this.tenantId = tenantId;
+        this.entityId = entityId;
+        this.taskType = taskType;
+        this.ts = System.currentTimeMillis();
+    }
+
+    public static HousekeeperTask deleteAttributes(TenantId tenantId, EntityId entityId) {
+        return new HousekeeperTask(tenantId, entityId, HousekeeperTaskType.DELETE_ATTRIBUTES);
+    }
+
+    public static HousekeeperTask deleteTelemetry(TenantId tenantId, EntityId entityId) {
+        return new HousekeeperTask(tenantId, entityId, HousekeeperTaskType.DELETE_TELEMETRY);
+    }
+
+    public static HousekeeperTask deleteEvents(TenantId tenantId, EntityId entityId) {
+        return new HousekeeperTask(tenantId, entityId, HousekeeperTaskType.DELETE_EVENTS);
+    }
+
+    public static HousekeeperTask unassignAlarms(User user) {
+        return new AlarmsUnassignHousekeeperTask(user);
+    }
+
+    public static HousekeeperTask deleteAlarms(TenantId tenantId, EntityId entityId) {
+        return new AlarmsDeletionHousekeeperTask(tenantId, entityId);
+    }
+
+    public static HousekeeperTask deleteTenantEntities(TenantId tenantId, EntityType entityType) {
+        return new TenantEntitiesDeletionHousekeeperTask(tenantId, entityType);
+    }
+
+    @JsonIgnore
+    public String getDescription() {
+        return taskType.getDescription() + " for " + entityId.getEntityType().getNormalName().toLowerCase() + " " + entityId.getId();
+    }
+
+}
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/housekeeper/HousekeeperTaskType.java b/common/data/src/main/java/org/thingsboard/server/common/data/housekeeper/HousekeeperTaskType.java
new file mode 100644
index 0000000000..edd13b3d5d
--- /dev/null
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/housekeeper/HousekeeperTaskType.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.common.data.housekeeper;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+@Getter
+public enum HousekeeperTaskType {
+
+    DELETE_ATTRIBUTES("attributes deletion"),
+    DELETE_TELEMETRY("telemetry deletion"),
+    DELETE_LATEST_TS("latest telemetry deletion"),
+    DELETE_TS_HISTORY("timeseries history deletion"),
+    DELETE_EVENTS("events deletion"),
+    DELETE_ALARMS("alarms deletion"),
+    UNASSIGN_ALARMS("alarms unassigning"),
+    DELETE_TENANT_ENTITIES("tenant entities deletion"),
+    DELETE_ENTITIES("entities deletion");
+
+    private final String description;
+
+}
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/housekeeper/LatestTsDeletionHousekeeperTask.java b/common/data/src/main/java/org/thingsboard/server/common/data/housekeeper/LatestTsDeletionHousekeeperTask.java
new file mode 100644
index 0000000000..4f0f56479e
--- /dev/null
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/housekeeper/LatestTsDeletionHousekeeperTask.java
@@ -0,0 +1,44 @@
+/**
+ * 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.housekeeper;
+
+import lombok.AccessLevel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.id.TenantId;
+
+@Data
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public class LatestTsDeletionHousekeeperTask extends HousekeeperTask {
+
+    private String key;
+
+    public LatestTsDeletionHousekeeperTask(TenantId tenantId, EntityId entityId, String key) {
+        super(tenantId, entityId, HousekeeperTaskType.DELETE_LATEST_TS);
+        this.key = key;
+    }
+
+    @Override
+    public String getDescription() {
+        return super.getDescription() + (key != null ? " for key '" + key + "'" : "");
+    }
+
+}
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/housekeeper/TenantEntitiesDeletionHousekeeperTask.java b/common/data/src/main/java/org/thingsboard/server/common/data/housekeeper/TenantEntitiesDeletionHousekeeperTask.java
new file mode 100644
index 0000000000..f6c6d5030c
--- /dev/null
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/housekeeper/TenantEntitiesDeletionHousekeeperTask.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.common.data.housekeeper;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+import org.thingsboard.server.common.data.EntityType;
+import org.thingsboard.server.common.data.id.TenantId;
+
+@Data
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
+public class TenantEntitiesDeletionHousekeeperTask extends HousekeeperTask {
+
+    private EntityType entityType;
+
+    public TenantEntitiesDeletionHousekeeperTask(TenantId tenantId, EntityType entityType) {
+        super(tenantId, tenantId, HousekeeperTaskType.DELETE_TENANT_ENTITIES);
+        this.entityType = entityType;
+    }
+
+    @JsonIgnore
+    @Override
+    public String getDescription() {
+        return entityType.getNormalName().toLowerCase() + "s deletion";
+    }
+
+}
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/housekeeper/TsHistoryDeletionHousekeeperTask.java b/common/data/src/main/java/org/thingsboard/server/common/data/housekeeper/TsHistoryDeletionHousekeeperTask.java
new file mode 100644
index 0000000000..8f462f2dff
--- /dev/null
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/housekeeper/TsHistoryDeletionHousekeeperTask.java
@@ -0,0 +1,44 @@
+/**
+ * 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.housekeeper;
+
+import lombok.AccessLevel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.id.TenantId;
+
+@Data
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public class TsHistoryDeletionHousekeeperTask extends HousekeeperTask {
+
+    private String key;
+
+    public TsHistoryDeletionHousekeeperTask(TenantId tenantId, EntityId entityId, String key) {
+        super(tenantId, entityId, HousekeeperTaskType.DELETE_TS_HISTORY);
+        this.key = key;
+    }
+
+    @Override
+    public String getDescription() {
+        return super.getDescription() + (key != null ? " for key '" + key + "'" : "");
+    }
+
+}
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/id/AlarmCommentId.java b/common/data/src/main/java/org/thingsboard/server/common/data/id/AlarmCommentId.java
index 29c59c67b4..5432c37d82 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/id/AlarmCommentId.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/id/AlarmCommentId.java
@@ -17,11 +17,11 @@ package org.thingsboard.server.common.data.id;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModel;
+import io.swagger.v3.oas.annotations.media.Schema;
 
 import java.util.UUID;
 
-@ApiModel
+@Schema
 public class AlarmCommentId extends UUIDBased {
 
     private static final long serialVersionUID = 1L;
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 22d7499157..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
@@ -17,13 +17,12 @@ package org.thingsboard.server.common.data.id;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.thingsboard.server.common.data.EntityType;
 
 import java.util.UUID;
 
-@ApiModel
+@Schema
 public class AlarmId extends UUIDBased implements EntityId {
 
     private static final long serialVersionUID = 1L;
@@ -37,7 +36,7 @@ public class AlarmId extends UUIDBased implements EntityId {
         return new AlarmId(UUID.fromString(alarmId));
     }
 
-    @ApiModelProperty(position = 2, required = true, value = "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 32d8ed711a..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
@@ -17,13 +17,12 @@ package org.thingsboard.server.common.data.id;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.thingsboard.server.common.data.EntityType;
 
 import java.util.UUID;
 
-@ApiModel
+@Schema
 public class ApiUsageStateId extends UUIDBased implements EntityId {
 
     @JsonCreator
@@ -35,7 +34,7 @@ public class ApiUsageStateId extends UUIDBased implements EntityId {
         return new ApiUsageStateId(UUID.fromString(userId));
     }
 
-    @ApiModelProperty(position = 2, required = true, value = "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 8f03c66a88..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
@@ -17,13 +17,12 @@ package org.thingsboard.server.common.data.id;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.thingsboard.server.common.data.EntityType;
 
 import java.util.UUID;
 
-@ApiModel
+@Schema
 public class AssetId extends UUIDBased implements EntityId {
 
     private static final long serialVersionUID = 1L;
@@ -37,7 +36,7 @@ public class AssetId extends UUIDBased implements EntityId {
         return new AssetId(UUID.fromString(assetId));
     }
 
-    @ApiModelProperty(position = 2, required = true, value = "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 23e70acc39..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
@@ -17,7 +17,7 @@ package org.thingsboard.server.common.data.id;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.thingsboard.server.common.data.EntityType;
 
 import java.util.UUID;
@@ -35,7 +35,7 @@ public class AssetProfileId extends UUIDBased implements EntityId {
         return new AssetProfileId(UUID.fromString(assetProfileId));
     }
 
-    @ApiModelProperty(position = 2, required = true, value = "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 1c800e8096..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
@@ -17,13 +17,12 @@ package org.thingsboard.server.common.data.id;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.thingsboard.server.common.data.EntityType;
 
 import java.util.UUID;
 
-@ApiModel
+@Schema
 public final class CustomerId extends UUIDBased implements EntityId {
 
     private static final long serialVersionUID = 1L;
@@ -33,7 +32,7 @@ public final class CustomerId extends UUIDBased implements EntityId {
         super(id);
     }
 
-    @ApiModelProperty(position = 2, required = true, value = "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 4b718c8398..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
@@ -17,13 +17,12 @@ package org.thingsboard.server.common.data.id;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.thingsboard.server.common.data.EntityType;
 
 import java.util.UUID;
 
-@ApiModel
+@Schema
 public class DashboardId extends UUIDBased implements EntityId {
 
     @JsonCreator
@@ -35,7 +34,7 @@ public class DashboardId extends UUIDBased implements EntityId {
         return new DashboardId(UUID.fromString(dashboardId));
     }
 
-    @ApiModelProperty(position = 2, required = true, value = "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 49f2975f99..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
@@ -17,13 +17,12 @@ package org.thingsboard.server.common.data.id;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.thingsboard.server.common.data.EntityType;
 
 import java.util.UUID;
 
-@ApiModel
+@Schema
 public class DeviceId extends UUIDBased implements EntityId {
 
     private static final long serialVersionUID = 1L;
@@ -38,7 +37,7 @@ public class DeviceId extends UUIDBased implements EntityId {
     }
 
     @Override
-    @ApiModelProperty(position = 2, required = true, value = "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 17517c5225..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
@@ -17,7 +17,7 @@ package org.thingsboard.server.common.data.id;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.thingsboard.server.common.data.EntityType;
 
 import java.util.UUID;
@@ -35,7 +35,7 @@ public class DeviceProfileId extends UUIDBased implements EntityId {
         return new DeviceProfileId(UUID.fromString(deviceProfileId));
     }
 
-    @ApiModelProperty(position = 2, required = true, value = "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 f0ec706718..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
@@ -18,7 +18,7 @@ package org.thingsboard.server.common.data.id;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.springframework.util.ConcurrentReferenceHashMap;
 import org.springframework.util.ConcurrentReferenceHashMap.ReferenceType;
 import org.thingsboard.server.common.data.EntityType;
@@ -41,7 +41,7 @@ public class EdgeId extends UUIDBased implements EntityId {
         return new EdgeId(UUID.fromString(edgeId));
     }
 
-    @ApiModelProperty(position = 2, required = true, value = "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 b75345c539..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
@@ -18,8 +18,7 @@ package org.thingsboard.server.common.data.id;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.thingsboard.server.common.data.EntityType;
 
 import java.io.Serializable;
@@ -31,15 +30,15 @@ import java.util.UUID;
 
 @JsonDeserialize(using = EntityIdDeserializer.class)
 @JsonSerialize(using = EntityIdSerializer.class)
-@ApiModel
+@Schema
 public interface EntityId extends HasUUID, Serializable { //NOSONAR, the constant is closely related to EntityId
 
     UUID NULL_UUID = UUID.fromString("13814000-1dd2-11b2-8080-808080808080");
 
-    @ApiModelProperty(position = 1, required = true, value = "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();
 
-    @ApiModelProperty(position = 2, 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 217ddc14f7..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
@@ -17,7 +17,7 @@ package org.thingsboard.server.common.data.id;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.thingsboard.server.common.data.EntityType;
 
 import java.util.UUID;
@@ -38,7 +38,7 @@ public class EntityViewId extends UUIDBased implements EntityId {
         return new EntityViewId(UUID.fromString(entityViewID));
     }
 
-    @ApiModelProperty(position = 2, required = true, value = "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 46366b00dd..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
@@ -17,7 +17,7 @@ package org.thingsboard.server.common.data.id;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.thingsboard.server.common.data.EntityType;
 
 import java.util.UUID;
@@ -29,7 +29,7 @@ public class NotificationId extends UUIDBased implements EntityId {
         super(id);
     }
 
-    @ApiModelProperty(position = 2, required = true, value = "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 47f7e09604..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
@@ -17,7 +17,7 @@ package org.thingsboard.server.common.data.id;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.thingsboard.server.common.data.EntityType;
 
 import java.util.UUID;
@@ -29,7 +29,7 @@ public class NotificationRequestId extends UUIDBased implements EntityId {
         super(id);
     }
 
-    @ApiModelProperty(position = 2, required = true, value = "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 f7e128644f..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
@@ -17,7 +17,7 @@ package org.thingsboard.server.common.data.id;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.thingsboard.server.common.data.EntityType;
 
 import java.util.UUID;
@@ -29,7 +29,7 @@ public class NotificationRuleId extends UUIDBased implements EntityId {
         super(id);
     }
 
-    @ApiModelProperty(position = 2, required = true, value = "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 a3c4f66544..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
@@ -17,7 +17,7 @@ package org.thingsboard.server.common.data.id;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.thingsboard.server.common.data.EntityType;
 
 import java.util.UUID;
@@ -29,7 +29,7 @@ public class NotificationTargetId extends UUIDBased implements EntityId {
         super(id);
     }
 
-    @ApiModelProperty(position = 2, required = true, value = "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 f5c94da442..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
@@ -17,7 +17,7 @@ package org.thingsboard.server.common.data.id;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.thingsboard.server.common.data.EntityType;
 
 import java.util.UUID;
@@ -29,7 +29,7 @@ public class NotificationTemplateId extends UUIDBased implements EntityId {
         super(id);
     }
 
-    @ApiModelProperty(position = 2, required = true, value = "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 177b4d287f..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
@@ -17,7 +17,7 @@ package org.thingsboard.server.common.data.id;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.thingsboard.server.common.data.EntityType;
 
 import java.util.UUID;
@@ -35,7 +35,7 @@ public class OtaPackageId extends UUIDBased implements EntityId {
         return new OtaPackageId(UUID.fromString(firmwareId));
     }
 
-    @ApiModelProperty(position = 2, required = true, value = "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 40b0f17b22..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
@@ -17,7 +17,7 @@ package org.thingsboard.server.common.data.id;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.thingsboard.server.common.data.EntityType;
 
 import java.util.UUID;
@@ -35,9 +35,9 @@ public class QueueId extends UUIDBased implements EntityId {
         return new QueueId(UUID.fromString(queueId));
     }
 
-    @ApiModelProperty(position = 2, required = true, value = "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 60aa980c25..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
@@ -17,7 +17,7 @@ package org.thingsboard.server.common.data.id;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.thingsboard.server.common.data.EntityType;
 
 import java.util.UUID;
@@ -31,7 +31,7 @@ public final class RpcId extends UUIDBased implements EntityId {
         super(id);
     }
 
-    @ApiModelProperty(position = 2, required = true, value = "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 72c468ec68..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
@@ -17,7 +17,7 @@ package org.thingsboard.server.common.data.id;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.thingsboard.server.common.data.EntityType;
 
 import java.util.UUID;
@@ -29,7 +29,7 @@ public class RuleChainId extends UUIDBased implements EntityId {
         super(id);
     }
 
-    @ApiModelProperty(position = 2, required = true, value = "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 e11bcdfdc4..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
@@ -17,7 +17,7 @@ package org.thingsboard.server.common.data.id;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.thingsboard.server.common.data.EntityType;
 
 import java.util.UUID;
@@ -29,7 +29,7 @@ public class RuleNodeId extends UUIDBased implements EntityId {
         super(id);
     }
 
-    @ApiModelProperty(position = 2, required = true, value = "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 3346bdd339..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
@@ -17,7 +17,7 @@ package org.thingsboard.server.common.data.id;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.thingsboard.server.common.data.EntityType;
 
 import java.util.UUID;
@@ -31,7 +31,7 @@ public class TbResourceId extends UUIDBased implements EntityId {
         super(id);
     }
 
-    @ApiModelProperty(position = 2, required = true, value = "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 10bcb84c99..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
@@ -18,7 +18,7 @@ package org.thingsboard.server.common.data.id;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.springframework.util.ConcurrentReferenceHashMap;
 import org.springframework.util.ConcurrentReferenceHashMap.ReferenceType;
 import org.thingsboard.server.common.data.EntityType;
@@ -50,7 +50,7 @@ public final class TenantId extends UUIDBased implements EntityId {
         return this.equals(SYS_TENANT_ID);
     }
 
-    @ApiModelProperty(position = 2, required = true, value = "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 b42c596bbd..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
@@ -17,7 +17,7 @@ package org.thingsboard.server.common.data.id;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.thingsboard.server.common.data.EntityType;
 
 import java.util.UUID;
@@ -35,7 +35,7 @@ public class TenantProfileId extends UUIDBased implements EntityId {
         return new TenantProfileId(UUID.fromString(tenantProfileId));
     }
 
-    @ApiModelProperty(position = 2, required = true, value = "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 6497aa1a6b..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
@@ -15,13 +15,12 @@
  */
 package org.thingsboard.server.common.data.id;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 
 import java.io.Serializable;
 import java.util.UUID;
 
-@ApiModel
+@Schema
 public abstract class UUIDBased implements HasUUID, Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -37,7 +36,7 @@ public abstract class UUIDBased implements HasUUID, Serializable {
         this.id = id;
     }
 
-    @ApiModelProperty(position = 1, required = true, value = "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;
     }
@@ -69,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 9412474c95..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
@@ -17,11 +17,12 @@ package org.thingsboard.server.common.data.id;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 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));
     }
 
-    @ApiModelProperty(position = 2, required = true, value = "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 13b639f7b1..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
@@ -17,7 +17,7 @@ package org.thingsboard.server.common.data.id;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.thingsboard.server.common.data.EntityType;
 
 import java.util.UUID;
@@ -31,7 +31,7 @@ public final class WidgetTypeId extends UUIDBased implements EntityId {
         super(id);
     }
 
-    @ApiModelProperty(position = 2, required = true, value = "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 7821177eee..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
@@ -17,7 +17,7 @@ package org.thingsboard.server.common.data.id;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.thingsboard.server.common.data.EntityType;
 
 import java.util.UUID;
@@ -31,7 +31,7 @@ public final class WidgetsBundleId extends UUIDBased implements EntityId {
         super(id);
     }
 
-    @ApiModelProperty(position = 2, required = true, value = "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/BaseAttributeKvEntry.java b/common/data/src/main/java/org/thingsboard/server/common/data/kv/BaseAttributeKvEntry.java
index d5c16169c2..ced1486c14 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/kv/BaseAttributeKvEntry.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/kv/BaseAttributeKvEntry.java
@@ -15,7 +15,7 @@
  */
 package org.thingsboard.server.common.data.kv;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import java.util.Optional;
 
 /**
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/kv/BasicTsKvEntry.java b/common/data/src/main/java/org/thingsboard/server/common/data/kv/BasicTsKvEntry.java
index 671e4c855f..396d1df5ba 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/kv/BasicTsKvEntry.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/kv/BasicTsKvEntry.java
@@ -15,7 +15,7 @@
  */
 package org.thingsboard.server.common.data.kv;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import java.util.Objects;
 import java.util.Optional;
 
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/limit/LimitedApi.java b/common/data/src/main/java/org/thingsboard/server/common/data/limit/LimitedApi.java
index 980eb880a0..1a0f038c90 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/limit/LimitedApi.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/limit/LimitedApi.java
@@ -33,6 +33,8 @@ public enum LimitedApi {
     CASSANDRA_QUERIES(DefaultTenantProfileConfiguration::getCassandraQueryTenantRateLimitsConfiguration, "Cassandra queries", true),
     EDGE_EVENTS(DefaultTenantProfileConfiguration::getEdgeEventRateLimits, "Edge events", true),
     EDGE_EVENTS_PER_EDGE(DefaultTenantProfileConfiguration::getEdgeEventRateLimitsPerEdge, "Edge events per edge", false),
+    EDGE_UPLINK_MESSAGES(DefaultTenantProfileConfiguration::getEdgeUplinkMessagesRateLimits, "Edge uplink messages", true),
+    EDGE_UPLINK_MESSAGES_PER_EDGE(DefaultTenantProfileConfiguration::getEdgeUplinkMessagesRateLimitsPerEdge, "Edge uplink messages per edge", false),
     PASSWORD_RESET(false, true),
     TWO_FA_VERIFICATION_CODE_SEND(false, true),
     TWO_FA_VERIFICATION_CODE_CHECK(false, true),
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/lwm2m/LwM2mInstance.java b/common/data/src/main/java/org/thingsboard/server/common/data/lwm2m/LwM2mInstance.java
index 2d5051f6c7..ba3344159c 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/lwm2m/LwM2mInstance.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/lwm2m/LwM2mInstance.java
@@ -15,16 +15,15 @@
  */
 package org.thingsboard.server.common.data.lwm2m;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-@ApiModel
+@Schema
 @Data
 public class LwM2mInstance {
-    @ApiModelProperty(position = 1, value = "LwM2M Instance id.", example = "0")
+    @Schema(description = "LwM2M Instance id.", example = "0")
     int id;
-    @ApiModelProperty(position = 2, value = "LwM2M Resource observe.")
+    @Schema(description = "LwM2M Resource observe.")
     LwM2mResourceObserve[] resources;
 
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/lwm2m/LwM2mObject.java b/common/data/src/main/java/org/thingsboard/server/common/data/lwm2m/LwM2mObject.java
index 8c04ec3a2a..bdba82408e 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/lwm2m/LwM2mObject.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/lwm2m/LwM2mObject.java
@@ -15,23 +15,22 @@
  */
 package org.thingsboard.server.common.data.lwm2m;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-@ApiModel
+@Schema
 @Data
 public class LwM2mObject {
-    @ApiModelProperty(position = 1, value = "LwM2M Object id.", example = "19")
+    @Schema(description = "LwM2M Object id.", example = "19")
     int id;
-    @ApiModelProperty(position = 2, value = "LwM2M Object key id.", example = "19_1.0")
+    @Schema(description = "LwM2M Object key id.", example = "19_1.0")
     String keyId;
-    @ApiModelProperty(position = 3, value = "LwM2M Object name.", example = "BinaryAppDataContainer")
+    @Schema(description = "LwM2M Object name.", example = "BinaryAppDataContainer")
     String name;
-    @ApiModelProperty(position = 4, value = "LwM2M Object multiple.", example = "true")
+    @Schema(description = "LwM2M Object multiple.", example = "true")
     boolean multiple;
-    @ApiModelProperty(position = 5, value = "LwM2M Object mandatory.", example = "false")
+    @Schema(description = "LwM2M Object mandatory.", example = "false")
     boolean mandatory;
-    @ApiModelProperty(position = 6, value = "LwM2M Object instances.")
+    @Schema(description = "LwM2M Object instances.")
     LwM2mInstance [] instances;
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/lwm2m/LwM2mResourceObserve.java b/common/data/src/main/java/org/thingsboard/server/common/data/lwm2m/LwM2mResourceObserve.java
index 4d85f9218a..6eae5e626a 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/lwm2m/LwM2mResourceObserve.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/lwm2m/LwM2mResourceObserve.java
@@ -15,28 +15,27 @@
  */
 package org.thingsboard.server.common.data.lwm2m;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
 import java.util.stream.Stream;
 
-@ApiModel
+@Schema
 @Data
 @AllArgsConstructor
 public class LwM2mResourceObserve {
-    @ApiModelProperty(position = 1, value = "LwM2M Resource Observe id.", example = "0")
+    @Schema(description = "LwM2M Resource Observe id.", example = "0")
     int id;
-    @ApiModelProperty(position = 2, value = "LwM2M Resource Observe name.", example = "Data")
+    @Schema(description = "LwM2M Resource Observe name.", example = "Data")
     String name;
-    @ApiModelProperty(position = 3, value = "LwM2M Resource Observe observe.", example = "false")
+    @Schema(description = "LwM2M Resource Observe observe.", example = "false")
     boolean observe;
-    @ApiModelProperty(position = 4, value = "LwM2M Resource Observe attribute.", example = "false")
+    @Schema(description = "LwM2M Resource Observe attribute.", example = "false")
     boolean attribute;
-    @ApiModelProperty(position = 5, value = "LwM2M Resource Observe telemetry.", example = "false")
+    @Schema(description = "LwM2M Resource Observe telemetry.", example = "false")
     boolean telemetry;
-    @ApiModelProperty(position = 6, value = "LwM2M Resource Observe key name.", example = "data")
+    @Schema(description = "LwM2M Resource Observe key name.", example = "data")
     String keyName;
 
     public LwM2mResourceObserve(int id, String name, boolean observe, boolean attribute, boolean telemetry) {
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/notification/NotificationRequest.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/NotificationRequest.java
index 66a15ee94e..0dd7b7fc47 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/NotificationRequest.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/NotificationRequest.java
@@ -33,8 +33,8 @@ import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.notification.info.NotificationInfo;
 import org.thingsboard.server.common.data.notification.template.NotificationTemplate;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotEmpty;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotEmpty;
 import java.util.List;
 import java.util.UUID;
 
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/NotificationRequestConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/NotificationRequestConfig.java
index 47eda57641..3a7dfc06f1 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/NotificationRequestConfig.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/NotificationRequestConfig.java
@@ -17,7 +17,7 @@ package org.thingsboard.server.common.data.notification;
 
 import lombok.Data;
 
-import javax.validation.constraints.Max;
+import jakarta.validation.constraints.Max;
 
 @Data
 public class NotificationRequestConfig {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/NotificationRequestStats.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/NotificationRequestStats.java
index f7cdbda6fc..e9e22e81ee 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/NotificationRequestStats.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/NotificationRequestStats.java
@@ -31,29 +31,45 @@ import java.util.concurrent.atomic.AtomicInteger;
 public class NotificationRequestStats {
 
     private final Map<NotificationDeliveryMethod, AtomicInteger> sent;
+    @JsonIgnore
+    private final AtomicInteger totalSent;
     private final Map<NotificationDeliveryMethod, Map<String, String>> errors;
+    private final AtomicInteger totalErrors;
     private String error;
     @JsonIgnore
     private final Map<NotificationDeliveryMethod, Set<Object>> processedRecipients;
 
     public NotificationRequestStats() {
         this.sent = new ConcurrentHashMap<>();
+        this.totalSent = new AtomicInteger();
         this.errors = new ConcurrentHashMap<>();
+        this.totalErrors = new AtomicInteger();
         this.processedRecipients = new ConcurrentHashMap<>();
     }
 
     @JsonCreator
     public NotificationRequestStats(@JsonProperty("sent") Map<NotificationDeliveryMethod, AtomicInteger> sent,
                                     @JsonProperty("errors") Map<NotificationDeliveryMethod, Map<String, String>> errors,
+                                    @JsonProperty("totalErrors") Integer totalErrors,
                                     @JsonProperty("error") String error) {
         this.sent = sent;
+        this.totalSent = null;
         this.errors = errors;
+        if (totalErrors == null) {
+            if (errors != null) {
+                totalErrors = errors.values().stream().mapToInt(Map::size).sum();
+            } else {
+                totalErrors = 0;
+            }
+        }
+        this.totalErrors = new AtomicInteger(totalErrors);
         this.error = error;
         this.processedRecipients = Collections.emptyMap();
     }
 
     public void reportSent(NotificationDeliveryMethod deliveryMethod, NotificationRecipient recipient) {
         sent.computeIfAbsent(deliveryMethod, k -> new AtomicInteger()).incrementAndGet();
+        totalSent.incrementAndGet();
     }
 
     public void reportError(NotificationDeliveryMethod deliveryMethod, Throwable error, NotificationRecipient recipient) {
@@ -64,7 +80,11 @@ public class NotificationRequestStats {
         if (errorMessage == null) {
             errorMessage = error.getClass().getSimpleName();
         }
-        errors.computeIfAbsent(deliveryMethod, k -> new ConcurrentHashMap<>()).put(recipient.getTitle(), errorMessage);
+        Map<String, String> errors = this.errors.computeIfAbsent(deliveryMethod, k -> new ConcurrentHashMap<>());
+        if (errors.size() < 100) {
+            errors.put(recipient.getTitle(), errorMessage);
+        }
+        totalErrors.incrementAndGet();
     }
 
     public void reportProcessed(NotificationDeliveryMethod deliveryMethod, Object recipientId) {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/NotificationType.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/NotificationType.java
index cfc91d8fca..5f91725b40 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/NotificationType.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/NotificationType.java
@@ -30,5 +30,6 @@ public enum NotificationType {
     RULE_NODE,
     RATE_LIMITS,
     EDGE_CONNECTION,
-    EDGE_COMMUNICATION_FAILURE
+    EDGE_COMMUNICATION_FAILURE,
+    TASK_PROCESSING_FAILURE
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/info/AlarmAssignmentNotificationInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/info/AlarmAssignmentNotificationInfo.java
index c2b12cc17c..13567405d8 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/info/AlarmAssignmentNotificationInfo.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/info/AlarmAssignmentNotificationInfo.java
@@ -23,6 +23,7 @@ import org.thingsboard.server.common.data.User;
 import org.thingsboard.server.common.data.alarm.AlarmSeverity;
 import org.thingsboard.server.common.data.alarm.AlarmStatus;
 import org.thingsboard.server.common.data.id.CustomerId;
+import org.thingsboard.server.common.data.id.DashboardId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.UserId;
 
@@ -55,6 +56,7 @@ public class AlarmAssignmentNotificationInfo implements RuleOriginatedNotificati
     private AlarmSeverity alarmSeverity;
     private AlarmStatus alarmStatus;
     private CustomerId alarmCustomerId;
+    private DashboardId dashboardId;
 
     @Override
     public Map<String, String> getTemplateData() {
@@ -94,4 +96,9 @@ public class AlarmAssignmentNotificationInfo implements RuleOriginatedNotificati
         return alarmOriginator;
     }
 
+    @Override
+    public DashboardId getDashboardId() {
+        return dashboardId;
+    }
+
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/info/AlarmCommentNotificationInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/info/AlarmCommentNotificationInfo.java
index aed023084f..d819b42c3c 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/info/AlarmCommentNotificationInfo.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/info/AlarmCommentNotificationInfo.java
@@ -23,6 +23,7 @@ import org.thingsboard.server.common.data.User;
 import org.thingsboard.server.common.data.alarm.AlarmSeverity;
 import org.thingsboard.server.common.data.alarm.AlarmStatus;
 import org.thingsboard.server.common.data.id.CustomerId;
+import org.thingsboard.server.common.data.id.DashboardId;
 import org.thingsboard.server.common.data.id.EntityId;
 
 import java.util.Map;
@@ -50,6 +51,7 @@ public class AlarmCommentNotificationInfo implements RuleOriginatedNotificationI
     private AlarmSeverity alarmSeverity;
     private AlarmStatus alarmStatus;
     private CustomerId alarmCustomerId;
+    private DashboardId dashboardId;
 
     @Override
     public Map<String, String> getTemplateData() {
@@ -80,4 +82,9 @@ public class AlarmCommentNotificationInfo implements RuleOriginatedNotificationI
         return alarmOriginator;
     }
 
+    @Override
+    public DashboardId getDashboardId() {
+        return dashboardId;
+    }
+
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/info/AlarmNotificationInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/info/AlarmNotificationInfo.java
index 13b8c2e3ea..fb7fa478ea 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/info/AlarmNotificationInfo.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/info/AlarmNotificationInfo.java
@@ -22,6 +22,7 @@ import lombok.NoArgsConstructor;
 import org.thingsboard.server.common.data.alarm.AlarmSeverity;
 import org.thingsboard.server.common.data.alarm.AlarmStatus;
 import org.thingsboard.server.common.data.id.CustomerId;
+import org.thingsboard.server.common.data.id.DashboardId;
 import org.thingsboard.server.common.data.id.EntityId;
 
 import java.util.Map;
@@ -45,6 +46,7 @@ public class AlarmNotificationInfo implements RuleOriginatedNotificationInfo {
     private boolean acknowledged;
     private boolean cleared;
     private CustomerId alarmCustomerId;
+    private DashboardId dashboardId;
 
     @Override
     public Map<String, String> getTemplateData() {
@@ -70,4 +72,9 @@ public class AlarmNotificationInfo implements RuleOriginatedNotificationInfo {
         return alarmOriginator;
     }
 
+    @Override
+    public DashboardId getDashboardId() {
+        return dashboardId;
+    }
+
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/info/NotificationInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/info/NotificationInfo.java
index 14d2a876c0..50e3f05e6d 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/info/NotificationInfo.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/info/NotificationInfo.java
@@ -18,6 +18,7 @@ package org.thingsboard.server.common.data.notification.info;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import org.thingsboard.server.common.data.id.DashboardId;
 import org.thingsboard.server.common.data.id.EntityId;
 
 import java.util.Map;
@@ -33,4 +34,8 @@ public interface NotificationInfo {
         return null;
     }
 
+    default DashboardId getDashboardId() {
+        return null;
+    }
+
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/info/TaskProcessingFailureNotificationInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/info/TaskProcessingFailureNotificationInfo.java
new file mode 100644
index 0000000000..cbee861c04
--- /dev/null
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/info/TaskProcessingFailureNotificationInfo.java
@@ -0,0 +1,61 @@
+/**
+ * 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.notification.info;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.thingsboard.server.common.data.housekeeper.HousekeeperTaskType;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.id.TenantId;
+
+import java.util.Map;
+
+import static org.thingsboard.server.common.data.util.CollectionsUtil.mapOf;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class TaskProcessingFailureNotificationInfo implements RuleOriginatedNotificationInfo {
+
+    private TenantId tenantId;
+    private EntityId entityId;
+    private HousekeeperTaskType taskType;
+    private String taskDescription;
+    private String error;
+    private int attempt;
+
+    @Override
+    public Map<String, String> getTemplateData() {
+        return mapOf(
+                "tenantId", tenantId.toString(),
+                "entityType", entityId.getEntityType().getNormalName(),
+                "entityId", entityId.getId().toString(),
+                "taskType", taskType.getDescription(),
+                "taskDescription", taskDescription,
+                "error", error,
+                "attempt", String.valueOf(attempt)
+        );
+    }
+
+    @Override
+    public TenantId getAffectedTenantId() {
+        return tenantId;
+    }
+
+}
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/DefaultNotificationRuleRecipientsConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/DefaultNotificationRuleRecipientsConfig.java
index 309b3c3064..d7423f9f17 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/DefaultNotificationRuleRecipientsConfig.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/DefaultNotificationRuleRecipientsConfig.java
@@ -18,7 +18,7 @@ package org.thingsboard.server.common.data.notification.rule;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import javax.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotEmpty;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/EscalatedNotificationRuleRecipientsConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/EscalatedNotificationRuleRecipientsConfig.java
index d2d8e86317..ef18d027a8 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/EscalatedNotificationRuleRecipientsConfig.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/EscalatedNotificationRuleRecipientsConfig.java
@@ -18,7 +18,7 @@ package org.thingsboard.server.common.data.notification.rule;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import javax.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotEmpty;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/NotificationRule.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/NotificationRule.java
index 525a88f804..ccd6afdd5b 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/NotificationRule.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/NotificationRule.java
@@ -31,10 +31,10 @@ import org.thingsboard.server.common.data.notification.rule.trigger.config.Notif
 import org.thingsboard.server.common.data.validation.Length;
 import org.thingsboard.server.common.data.validation.NoXss;
 
-import javax.validation.Valid;
-import javax.validation.constraints.AssertTrue;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.AssertTrue;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.List;
 import java.util.stream.Collectors;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/NotificationRuleRecipientsConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/NotificationRuleRecipientsConfig.java
index 9b32bf570d..092c2e1672 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/NotificationRuleRecipientsConfig.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/NotificationRuleRecipientsConfig.java
@@ -23,7 +23,7 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import lombok.Data;
 import org.thingsboard.server.common.data.notification.rule.trigger.config.NotificationRuleTriggerType;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/TaskProcessingFailureTrigger.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/TaskProcessingFailureTrigger.java
new file mode 100644
index 0000000000..3626e09c0b
--- /dev/null
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/TaskProcessingFailureTrigger.java
@@ -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.
+ */
+package org.thingsboard.server.common.data.notification.rule.trigger;
+
+import lombok.Builder;
+import lombok.Data;
+import org.thingsboard.server.common.data.housekeeper.HousekeeperTask;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.notification.rule.trigger.config.NotificationRuleTriggerType;
+
+@Data
+@Builder
+public class TaskProcessingFailureTrigger implements NotificationRuleTrigger {
+
+    private final HousekeeperTask task;
+    private final int attempt;
+    private final Throwable error;
+
+    @Override
+    public NotificationRuleTriggerType getType() {
+        return NotificationRuleTriggerType.TASK_PROCESSING_FAILURE;
+    }
+
+    @Override
+    public TenantId getTenantId() {
+        return task.getTenantId();
+    }
+
+    @Override
+    public EntityId getOriginatorEntityId() {
+        return task.getEntityId();
+    }
+
+    @Override
+    public boolean deduplicate() {
+        return false;
+    }
+
+}
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/AlarmAssignmentNotificationRuleTriggerConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/AlarmAssignmentNotificationRuleTriggerConfig.java
index f3ae624cf0..b99f19dae8 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/AlarmAssignmentNotificationRuleTriggerConfig.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/AlarmAssignmentNotificationRuleTriggerConfig.java
@@ -22,7 +22,7 @@ import lombok.NoArgsConstructor;
 import org.thingsboard.server.common.data.alarm.AlarmSearchStatus;
 import org.thingsboard.server.common.data.alarm.AlarmSeverity;
 
-import javax.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotEmpty;
 import java.util.Set;
 
 @Data
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/AlarmNotificationRuleTriggerConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/AlarmNotificationRuleTriggerConfig.java
index 0c5ee22e18..aea8846d8a 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/AlarmNotificationRuleTriggerConfig.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/AlarmNotificationRuleTriggerConfig.java
@@ -22,7 +22,7 @@ import lombok.NoArgsConstructor;
 import org.thingsboard.server.common.data.alarm.AlarmSearchStatus;
 import org.thingsboard.server.common.data.alarm.AlarmSeverity;
 
-import javax.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotEmpty;
 import java.io.Serializable;
 import java.util.Set;
 
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/DeviceActivityNotificationRuleTriggerConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/DeviceActivityNotificationRuleTriggerConfig.java
index a3adb5baa8..f092c1e4e1 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/DeviceActivityNotificationRuleTriggerConfig.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/DeviceActivityNotificationRuleTriggerConfig.java
@@ -20,7 +20,7 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotEmpty;
 import java.util.Set;
 import java.util.UUID;
 
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/EntitiesLimitNotificationRuleTriggerConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/EntitiesLimitNotificationRuleTriggerConfig.java
index dd2bfda210..f23cd7906e 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/EntitiesLimitNotificationRuleTriggerConfig.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/EntitiesLimitNotificationRuleTriggerConfig.java
@@ -21,7 +21,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.thingsboard.server.common.data.EntityType;
 
-import javax.validation.constraints.Max;
+import jakarta.validation.constraints.Max;
 import java.util.Set;
 
 @Data
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/NotificationRuleTriggerConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/NotificationRuleTriggerConfig.java
index 15a5e59255..1621ec8120 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/NotificationRuleTriggerConfig.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/NotificationRuleTriggerConfig.java
@@ -38,6 +38,7 @@ import java.io.Serializable;
         @Type(value = RateLimitsNotificationRuleTriggerConfig.class, name = "RATE_LIMITS"),
         @Type(value = EdgeConnectionNotificationRuleTriggerConfig.class, name = "EDGE_CONNECTION"),
         @Type(value = EdgeCommunicationFailureNotificationRuleTriggerConfig.class, name = "EDGE_COMMUNICATION_FAILURE"),
+        @Type(value = TaskProcessingFailureNotificationRuleTriggerConfig.class, name = "TASK_PROCESSING_FAILURE")
 })
 public interface NotificationRuleTriggerConfig extends Serializable {
 
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/NotificationRuleTriggerType.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/NotificationRuleTriggerType.java
index 8469fac752..8846ae284d 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/NotificationRuleTriggerType.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/NotificationRuleTriggerType.java
@@ -31,7 +31,8 @@ public enum NotificationRuleTriggerType {
     NEW_PLATFORM_VERSION(false),
     ENTITIES_LIMIT(false),
     API_USAGE_LIMIT(false),
-    RATE_LIMITS(false);
+    RATE_LIMITS(false),
+    TASK_PROCESSING_FAILURE(false);
 
     private final boolean tenantLevel;
 
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/TaskProcessingFailureNotificationRuleTriggerConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/TaskProcessingFailureNotificationRuleTriggerConfig.java
new file mode 100644
index 0000000000..73f0517238
--- /dev/null
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/TaskProcessingFailureNotificationRuleTriggerConfig.java
@@ -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.
+ */
+package org.thingsboard.server.common.data.notification.rule.trigger.config;
+
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class TaskProcessingFailureNotificationRuleTriggerConfig implements NotificationRuleTriggerConfig {
+
+    @Override
+    public NotificationRuleTriggerType getTriggerType() {
+        return NotificationRuleTriggerType.TASK_PROCESSING_FAILURE;
+    }
+
+}
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/settings/MobileAppNotificationDeliveryMethodConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/settings/MobileAppNotificationDeliveryMethodConfig.java
index cc66cb229c..92eb2b345b 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/settings/MobileAppNotificationDeliveryMethodConfig.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/settings/MobileAppNotificationDeliveryMethodConfig.java
@@ -15,11 +15,10 @@
  */
 package org.thingsboard.server.common.data.notification.settings;
 
+import jakarta.validation.constraints.NotEmpty;
 import lombok.Data;
 import org.thingsboard.server.common.data.notification.NotificationDeliveryMethod;
 
-import javax.validation.constraints.NotEmpty;
-
 @Data
 public class MobileAppNotificationDeliveryMethodConfig implements NotificationDeliveryMethodConfig {
 
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/settings/NotificationSettings.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/settings/NotificationSettings.java
index 8b2a2237ad..ea47537b93 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/settings/NotificationSettings.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/settings/NotificationSettings.java
@@ -18,8 +18,8 @@ package org.thingsboard.server.common.data.notification.settings;
 import lombok.Data;
 import org.thingsboard.server.common.data.notification.NotificationDeliveryMethod;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.Map;
 
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/settings/SlackNotificationDeliveryMethodConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/settings/SlackNotificationDeliveryMethodConfig.java
index f1a3eeb4d2..8d65eb3523 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/settings/SlackNotificationDeliveryMethodConfig.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/settings/SlackNotificationDeliveryMethodConfig.java
@@ -18,7 +18,7 @@ package org.thingsboard.server.common.data.notification.settings;
 import lombok.Data;
 import org.thingsboard.server.common.data.notification.NotificationDeliveryMethod;
 
-import javax.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotEmpty;
 
 @Data
 public class SlackNotificationDeliveryMethodConfig implements NotificationDeliveryMethodConfig {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/settings/UserNotificationSettings.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/settings/UserNotificationSettings.java
index 8e258e9874..903a239459 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/settings/UserNotificationSettings.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/settings/UserNotificationSettings.java
@@ -23,9 +23,9 @@ import org.thingsboard.server.common.data.notification.NotificationDeliveryMetho
 import org.thingsboard.server.common.data.notification.NotificationType;
 import org.thingsboard.server.common.data.notification.targets.NotificationTargetType;
 
-import javax.validation.Valid;
-import javax.validation.constraints.AssertTrue;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.AssertTrue;
+import jakarta.validation.constraints.NotNull;
 import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/MicrosoftTeamsNotificationTargetConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/MicrosoftTeamsNotificationTargetConfig.java
index 9dbfdb6f1f..aa68f7aa40 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/MicrosoftTeamsNotificationTargetConfig.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/MicrosoftTeamsNotificationTargetConfig.java
@@ -18,8 +18,8 @@ package org.thingsboard.server.common.data.notification.targets;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotEmpty;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/NotificationTarget.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/NotificationTarget.java
index e3652786d9..6e45f04e65 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/NotificationTarget.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/NotificationTarget.java
@@ -26,9 +26,9 @@ import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.validation.Length;
 import org.thingsboard.server.common.data.validation.NoXss;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/CustomerUsersFilter.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/CustomerUsersFilter.java
index a238a3c788..40a863b7d8 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/CustomerUsersFilter.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/CustomerUsersFilter.java
@@ -17,7 +17,7 @@ package org.thingsboard.server.common.data.notification.targets.platform;
 
 import lombok.Data;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.util.UUID;
 
 @Data
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/PlatformUsersNotificationTargetConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/PlatformUsersNotificationTargetConfig.java
index a7752cef5d..0792cb2d07 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/PlatformUsersNotificationTargetConfig.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/PlatformUsersNotificationTargetConfig.java
@@ -20,8 +20,8 @@ import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.notification.targets.NotificationTargetConfig;
 import org.thingsboard.server.common.data.notification.targets.NotificationTargetType;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/UserListFilter.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/UserListFilter.java
index 7f02ff07a2..eea1921f18 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/UserListFilter.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/UserListFilter.java
@@ -17,7 +17,7 @@ package org.thingsboard.server.common.data.notification.targets.platform;
 
 import lombok.Data;
 
-import javax.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotEmpty;
 import java.util.List;
 import java.util.UUID;
 
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/slack/SlackConversation.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/slack/SlackConversation.java
index 0801b2b229..63b1f990e3 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/slack/SlackConversation.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/slack/SlackConversation.java
@@ -24,8 +24,8 @@ import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.thingsboard.server.common.data.notification.targets.NotificationRecipient;
 
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 
 import static org.apache.commons.lang3.StringUtils.isEmpty;
 
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/slack/SlackNotificationTargetConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/slack/SlackNotificationTargetConfig.java
index d1c1ccea8c..fbf10c370f 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/slack/SlackNotificationTargetConfig.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/slack/SlackNotificationTargetConfig.java
@@ -20,8 +20,8 @@ import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.notification.targets.NotificationTargetConfig;
 import org.thingsboard.server.common.data.notification.targets.NotificationTargetType;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/template/DeliveryMethodNotificationTemplate.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/template/DeliveryMethodNotificationTemplate.java
index 3996fa9e8c..9cb1e103d0 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/template/DeliveryMethodNotificationTemplate.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/template/DeliveryMethodNotificationTemplate.java
@@ -24,7 +24,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.thingsboard.server.common.data.notification.NotificationDeliveryMethod;
 
-import javax.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotEmpty;
 import java.util.List;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/template/EmailDeliveryMethodNotificationTemplate.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/template/EmailDeliveryMethodNotificationTemplate.java
index fa1c8a569d..acd78e4ffd 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/template/EmailDeliveryMethodNotificationTemplate.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/template/EmailDeliveryMethodNotificationTemplate.java
@@ -23,7 +23,7 @@ import org.thingsboard.server.common.data.notification.NotificationDeliveryMetho
 import org.thingsboard.server.common.data.validation.Length;
 import org.thingsboard.server.common.data.validation.NoXss;
 
-import javax.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotEmpty;
 import java.util.List;
 
 @Data
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/template/MobileAppDeliveryMethodNotificationTemplate.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/template/MobileAppDeliveryMethodNotificationTemplate.java
index 96e8b80453..123efb0076 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/template/MobileAppDeliveryMethodNotificationTemplate.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/template/MobileAppDeliveryMethodNotificationTemplate.java
@@ -16,13 +16,13 @@
 package org.thingsboard.server.common.data.notification.template;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import jakarta.validation.constraints.NotEmpty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 import org.thingsboard.server.common.data.notification.NotificationDeliveryMethod;
 
-import javax.validation.constraints.NotEmpty;
 import java.util.List;
 
 @Data
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/template/NotificationTemplate.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/template/NotificationTemplate.java
index cebf3e8c78..54c11be1e4 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/template/NotificationTemplate.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/template/NotificationTemplate.java
@@ -27,9 +27,9 @@ import org.thingsboard.server.common.data.notification.NotificationType;
 import org.thingsboard.server.common.data.validation.Length;
 import org.thingsboard.server.common.data.validation.NoXss;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/template/NotificationTemplateConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/template/NotificationTemplateConfig.java
index 3d88de75a6..59e50c7885 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/template/NotificationTemplateConfig.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/template/NotificationTemplateConfig.java
@@ -18,8 +18,8 @@ package org.thingsboard.server.common.data.notification.template;
 import lombok.Data;
 import org.thingsboard.server.common.data.notification.NotificationDeliveryMethod;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotEmpty;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotEmpty;
 import java.util.HashMap;
 import java.util.Map;
 
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/template/WebDeliveryMethodNotificationTemplate.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/template/WebDeliveryMethodNotificationTemplate.java
index ff9c74823e..55ee91d988 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/template/WebDeliveryMethodNotificationTemplate.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/template/WebDeliveryMethodNotificationTemplate.java
@@ -27,7 +27,7 @@ import org.thingsboard.server.common.data.notification.NotificationDeliveryMetho
 import org.thingsboard.server.common.data.validation.Length;
 import org.thingsboard.server.common.data.validation.NoXss;
 
-import javax.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotEmpty;
 import java.util.List;
 import java.util.Optional;
 
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 ea75457189..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
@@ -15,8 +15,7 @@
  */
 package org.thingsboard.server.common.data.oauth2;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -27,31 +26,31 @@ import org.thingsboard.server.common.data.validation.Length;
 @EqualsAndHashCode
 @Data
 @ToString
-@ApiModel
+@Schema
 public class OAuth2BasicMapperConfig {
     @Length(fieldName = "emailAttributeKey", max = 31)
-    @ApiModelProperty(value = "Email attribute key of OAuth2 principal attributes. " +
+    @Schema(description = "Email attribute key of OAuth2 principal attributes. " +
             "Must be specified for BASIC mapper type and cannot be specified for GITHUB type")
     private final String emailAttributeKey;
     @Length(fieldName = "firstNameAttributeKey", max = 31)
-    @ApiModelProperty(value = "First name attribute key")
+    @Schema(description = "First name attribute key")
     private final String firstNameAttributeKey;
     @Length(fieldName = "lastNameAttributeKey", max = 31)
-    @ApiModelProperty(value = "Last name attribute key")
+    @Schema(description = "Last name attribute key")
     private final String lastNameAttributeKey;
-    @ApiModelProperty(value = "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")
-    @ApiModelProperty(value = "Tenant name pattern for CUSTOM naming strategy. " +
+    @Schema(description = "Tenant name pattern for CUSTOM naming strategy. " +
             "OAuth2 attributes in the pattern can be used by enclosing attribute key in '%{' and '}'", example = "%{email}")
     private final String tenantNamePattern;
     @Length(fieldName = "customerNamePattern")
-    @ApiModelProperty(value = "Customer name pattern. When creating a user on the first OAuth2 log in, if specified, " +
+    @Schema(description = "Customer name pattern. When creating a user on the first OAuth2 log in, if specified, " +
             "customer name will be used to create or find existing customer in the platform and assign customerId to the user")
     private final String customerNamePattern;
     @Length(fieldName = "defaultDashboardName")
-    @ApiModelProperty(value = "Name of the tenant's dashboard to set as default dashboard for newly created user")
+    @Schema(description = "Name of the tenant's dashboard to set as default dashboard for newly created user")
     private final String defaultDashboardName;
-    @ApiModelProperty(value = "Whether default dashboard should be open in full screen")
+    @Schema(description = "Whether default dashboard should be open in full screen")
     private final boolean alwaysFullScreen;
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2ClientInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2ClientInfo.java
index 306544bfef..8194e02693 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2ClientInfo.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2ClientInfo.java
@@ -15,8 +15,7 @@
  */
 package org.thingsboard.server.common.data.oauth2;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -26,14 +25,14 @@ import lombok.NoArgsConstructor;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-@ApiModel
+@Schema
 public class OAuth2ClientInfo {
 
-    @ApiModelProperty(value = "OAuth2 client name", example = "GitHub")
+    @Schema(description = "OAuth2 client name", example = "GitHub")
     private String name;
-    @ApiModelProperty(value = "Name of the icon, displayed on OAuth2 log in button", example = "github-logo")
+    @Schema(description = "Name of the icon, displayed on OAuth2 log in button", example = "github-logo")
     private String icon;
-    @ApiModelProperty(value = "URI for OAuth2 log in. On HTTP GET request to this URI, it redirects to the OAuth2 provider page",
+    @Schema(description = "URI for OAuth2 log in. On HTTP GET request to this URI, it redirects to the OAuth2 provider page",
             example = "/oauth2/authorization/8352f191-2b4d-11ec-9ed1-cbf57c026ecc")
     private String url;
 
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 401927cd84..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
@@ -15,8 +15,7 @@
  */
 package org.thingsboard.server.common.data.oauth2;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
@@ -26,52 +25,52 @@ import org.thingsboard.server.common.data.HasName;
 import org.thingsboard.server.common.data.id.OAuth2ClientRegistrationTemplateId;
 import org.thingsboard.server.common.data.validation.Length;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import java.util.List;
 
 @EqualsAndHashCode(callSuper = true)
 @Data
 @ToString
 @NoArgsConstructor
-@ApiModel
+@Schema
 public class OAuth2ClientRegistrationTemplate extends BaseDataWithAdditionalInfo<OAuth2ClientRegistrationTemplateId> implements HasName {
 
     @Length(fieldName = "providerId")
-    @ApiModelProperty(value = "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
-    @ApiModelProperty(value = "Default config for mapping OAuth2 log in response to platform entities")
+    @Schema(description = "Default config for mapping OAuth2 log in response to platform entities")
     private OAuth2MapperConfig mapperConfig;
     @Length(fieldName = "authorizationUri")
-    @ApiModelProperty(value = "Default authorization URI of the OAuth2 provider")
+    @Schema(description = "Default authorization URI of the OAuth2 provider")
     private String authorizationUri;
     @Length(fieldName = "accessTokenUri")
-    @ApiModelProperty(value = "Default access token URI of the OAuth2 provider")
+    @Schema(description = "Default access token URI of the OAuth2 provider")
     private String accessTokenUri;
-    @ApiModelProperty(value = "Default OAuth scopes that will be requested from OAuth2 platform")
+    @Schema(description = "Default OAuth scopes that will be requested from OAuth2 platform")
     private List<String> scope;
     @Length(fieldName = "userInfoUri")
-    @ApiModelProperty(value = "Default user info URI of the OAuth2 provider")
+    @Schema(description = "Default user info URI of the OAuth2 provider")
     private String userInfoUri;
     @Length(fieldName = "userNameAttributeName")
-    @ApiModelProperty(value = "Default name of the username attribute in OAuth2 provider log in response")
+    @Schema(description = "Default name of the username attribute in OAuth2 provider log in response")
     private String userNameAttributeName;
     @Length(fieldName = "jwkSetUri")
-    @ApiModelProperty(value = "Default JSON Web Key URI of the OAuth2 provider")
+    @Schema(description = "Default JSON Web Key URI of the OAuth2 provider")
     private String jwkSetUri;
     @Length(fieldName = "clientAuthenticationMethod")
-    @ApiModelProperty(value = "Default client authentication method to use: 'BASIC' or 'POST'")
+    @Schema(description = "Default client authentication method to use: 'BASIC' or 'POST'")
     private String clientAuthenticationMethod;
-    @ApiModelProperty(value = "Comment for OAuth2 provider")
+    @Schema(description = "Comment for OAuth2 provider")
     private String comment;
     @Length(fieldName = "loginButtonIcon")
-    @ApiModelProperty(value = "Default log in button icon for OAuth2 provider")
+    @Schema(description = "Default log in button icon for OAuth2 provider")
     private String loginButtonIcon;
     @Length(fieldName = "loginButtonLabel")
-    @ApiModelProperty(value = "Default OAuth2 provider label")
+    @Schema(description = "Default OAuth2 provider label")
     private String loginButtonLabel;
     @Length(fieldName = "helpLink")
-    @ApiModelProperty(value = "Help link for OAuth2 provider")
+    @Schema(description = "Help link for OAuth2 provider")
     private String helpLink;
 
     public OAuth2ClientRegistrationTemplate(OAuth2ClientRegistrationTemplate clientRegistrationTemplate) {
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 69c3c88ee3..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
@@ -15,8 +15,7 @@
  */
 package org.thingsboard.server.common.data.oauth2;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -30,10 +29,10 @@ import lombok.ToString;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-@ApiModel
+@Schema
 public class OAuth2DomainInfo {
-    @ApiModelProperty(value = "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;
-    @ApiModelProperty(value = "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 b25ac56544..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
@@ -15,8 +15,7 @@
  */
 package org.thingsboard.server.common.data.oauth2;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -32,10 +31,12 @@ import java.util.List;
 @Builder(toBuilder = true)
 @NoArgsConstructor
 @AllArgsConstructor
-@ApiModel
+@Schema
 public class OAuth2Info {
-    @ApiModelProperty("Whether OAuth2 settings are enabled or not")
+    @Schema(description = "Whether OAuth2 settings are enabled or not")
     private boolean enabled;
-    @ApiModelProperty(value = "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 668178fa04..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
@@ -15,29 +15,29 @@
  */
 package org.thingsboard.server.common.data.oauth2;
 
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 
 @Builder(toBuilder = true)
 @EqualsAndHashCode
 @Data
 @ToString
 public class OAuth2MapperConfig {
-    @ApiModelProperty(value = "Whether user should be created if not yet present on the platform after successful authentication")
+    @Schema(description = "Whether user should be created if not yet present on the platform after successful authentication")
     private boolean allowUserCreation;
-    @ApiModelProperty(value = "Whether user credentials should be activated when user is created after successful authentication")
+    @Schema(description = "Whether user credentials should be activated when user is created after successful authentication")
     private boolean activateUser;
-    @ApiModelProperty(value = "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
-    @ApiModelProperty(value = "Mapper config for BASIC and GITHUB mapper types")
+    @Schema(description = "Mapper config for BASIC and GITHUB mapper types")
     private OAuth2BasicMapperConfig basic;
     @Valid
-    @ApiModelProperty(value = "Mapper config for CUSTOM mapper type")
+    @Schema(description = "Mapper config for CUSTOM mapper type")
     private OAuth2CustomMapperConfig custom;
 }
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 b7e7f85b11..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
@@ -15,8 +15,7 @@
  */
 package org.thingsboard.server.common.data.oauth2;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -30,10 +29,10 @@ import lombok.ToString;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-@ApiModel
+@Schema
 public class OAuth2MobileInfo {
-    @ApiModelProperty(value = "Application package name. Cannot be empty", required = true)
+    @Schema(description = "Application package name. Cannot be empty", requiredMode = Schema.RequiredMode.REQUIRED)
     private String pkgName;
-    @ApiModelProperty(value = "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 b619daf357..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
@@ -15,8 +15,7 @@
  */
 package org.thingsboard.server.common.data.oauth2;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -32,16 +31,16 @@ import java.util.List;
 @Builder(toBuilder = true)
 @NoArgsConstructor
 @AllArgsConstructor
-@ApiModel
+@Schema
 public class OAuth2ParamsInfo {
 
-    @ApiModelProperty(value = "List of configured domains where OAuth2 platform will redirect a user after successful " +
+    @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;
-    @ApiModelProperty(value = "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;
-    @ApiModelProperty(value = "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 6e9833e4eb..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
@@ -16,8 +16,7 @@
 package org.thingsboard.server.common.data.oauth2;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -33,34 +32,34 @@ import java.util.List;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-@ApiModel
+@Schema
 public class OAuth2RegistrationInfo {
-    @ApiModelProperty(value = "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;
-    @ApiModelProperty(value = "OAuth2 client ID. Cannot be empty", required = true)
+    @Schema(description = "OAuth2 client ID. Cannot be empty", requiredMode = Schema.RequiredMode.REQUIRED)
     private String clientId;
-    @ApiModelProperty(value = "OAuth2 client secret. Cannot be empty", required = true)
+    @Schema(description = "OAuth2 client secret. Cannot be empty", requiredMode = Schema.RequiredMode.REQUIRED)
     private String clientSecret;
-    @ApiModelProperty(value = "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;
-    @ApiModelProperty(value = "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;
-    @ApiModelProperty(value = "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;
-    @ApiModelProperty(value = "User info URI of the OAuth2 provider")
+    @Schema(description = "User info URI of the OAuth2 provider")
     private String userInfoUri;
-    @ApiModelProperty(value = "Name of the username attribute in OAuth2 provider response. Cannot be empty")
+    @Schema(description = "Name of the username attribute in OAuth2 provider response. Cannot be empty")
     private String userNameAttributeName;
-    @ApiModelProperty(value = "JSON Web Key URI of the OAuth2 provider")
+    @Schema(description = "JSON Web Key URI of the OAuth2 provider")
     private String jwkSetUri;
-    @ApiModelProperty(value = "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;
-    @ApiModelProperty(value = "OAuth2 provider label. Cannot be empty", required = true)
+    @Schema(description = "OAuth2 provider label. Cannot be empty", requiredMode = Schema.RequiredMode.REQUIRED)
     private String loginButtonLabel;
-    @ApiModelProperty(value = "Log in button icon for OAuth2 provider")
+    @Schema(description = "Log in button icon for OAuth2 provider")
     private String loginButtonIcon;
-    @ApiModelProperty(value = "List of platforms for which usage of the OAuth2 client is allowed (empty for all allowed)")
+    @Schema(description = "List of platforms for which usage of the OAuth2 client is allowed (empty for all allowed)")
     private List<PlatformType> platforms;
-    @ApiModelProperty(value = "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 7e06b1b147..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
@@ -15,8 +15,7 @@
  */
 package org.thingsboard.server.common.data.objects;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -28,15 +27,15 @@ import java.util.List;
  * Created by Victor Basanets on 9/05/2017.
  */
 @Data
-@ApiModel
+@Schema
 @NoArgsConstructor
 public class AttributesEntityView implements Serializable {
 
-    @ApiModelProperty(position = 1, required = true, value = "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<>();
-    @ApiModelProperty(position = 3, required = true, value = "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<>();
-    @ApiModelProperty(position = 2, required = true, value = "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 1669c51198..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
@@ -15,8 +15,7 @@
  */
 package org.thingsboard.server.common.data.objects;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -27,14 +26,14 @@ import java.util.List;
 /**
  * Created by Victor Basanets on 9/05/2017.
  */
-@ApiModel
+@Schema
 @Data
 @NoArgsConstructor
 public class TelemetryEntityView implements Serializable {
 
-    @ApiModelProperty(position = 1, required = true, value = "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;
-    @ApiModelProperty(position = 2, required = true, value = "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/PageData.java b/common/data/src/main/java/org/thingsboard/server/common/data/page/PageData.java
index 9042e4865f..3df123d870 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/page/PageData.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/page/PageData.java
@@ -17,9 +17,9 @@ package org.thingsboard.server.common.data.page;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.io.Serializable;
 import java.util.Collections;
@@ -27,8 +27,9 @@ import java.util.List;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-@ApiModel
+@Schema
 @EqualsAndHashCode
+@ToString
 public class PageData<T> implements Serializable {
 
     public static final PageData EMPTY_PAGE_DATA = new PageData<>();
@@ -58,22 +59,22 @@ public class PageData<T> implements Serializable {
         return (PageData<T>) EMPTY_PAGE_DATA;
     }
 
-    @ApiModelProperty(position = 1, value = "Array of the entities", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Array of the entities", accessMode = Schema.AccessMode.READ_ONLY)
     public List<T> getData() {
         return data;
     }
 
-    @ApiModelProperty(position = 2, value = "Total number of available pages. Calculated based on the 'pageSize' request parameter and total number of entities that match search criteria", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Total number of available pages. Calculated based on the 'pageSize' request parameter and total number of entities that match search criteria", accessMode = Schema.AccessMode.READ_ONLY)
     public int getTotalPages() {
         return totalPages;
     }
 
-    @ApiModelProperty(position = 3, value = "Total number of elements in all available pages", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Total number of elements in all available pages", accessMode = Schema.AccessMode.READ_ONLY)
     public long getTotalElements() {
         return totalElements;
     }
 
-    @ApiModelProperty(position = 4, value = "'false' value indicates the end of the result set", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "'false' value indicates the end of the result set", accessMode = Schema.AccessMode.READ_ONLY)
     @JsonProperty("hasNext")
     public boolean hasNext() {
         return hasNext;
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..d6a3b5ad7d 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;
@@ -62,31 +63,40 @@ public class PageLink {
 
     @JsonIgnore
     public PageLink nextPageLink() {
-        return new PageLink(this.pageSize, this.page+1, this.textSearch, this.sortOrder);
+        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()));
     }
 
-    private Sort.Order toSortOrder(SortOrder sortOrder, Map<String,String> columnMap) {
+    private Sort.Order toSortOrder(SortOrder sortOrder, Map<String, String> columnMap) {
         String property = sortOrder.getProperty();
         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/SortOrder.java b/common/data/src/main/java/org/thingsboard/server/common/data/page/SortOrder.java
index 5cafed6df2..539dd1cb40 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/page/SortOrder.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/page/SortOrder.java
@@ -32,6 +32,10 @@ public class SortOrder {
         this.direction = direction;
     }
 
+    public static SortOrder of(String property, Direction direction) {
+        return new SortOrder(property, direction);
+    }
+
     public static enum Direction {
         ASC, DESC
     }
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/plugin/ComponentDescriptor.java b/common/data/src/main/java/org/thingsboard/server/common/data/plugin/ComponentDescriptor.java
index ee117a6a86..d58ca2d62d 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/plugin/ComponentDescriptor.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/plugin/ComponentDescriptor.java
@@ -16,13 +16,11 @@
 package org.thingsboard.server.common.data.plugin;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import org.thingsboard.server.common.data.BaseData;
-import org.thingsboard.server.common.data.BaseDataWithAdditionalInfo;
 import org.thingsboard.server.common.data.id.ComponentDescriptorId;
 import org.thingsboard.server.common.data.validation.Length;
 
@@ -31,31 +29,31 @@ import java.util.Objects;
 /**
  * @author Andrew Shvayka
  */
-@ApiModel
+@Schema
 @ToString
 public class ComponentDescriptor extends BaseData<ComponentDescriptorId> {
 
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(position = 3, value = "Type of the Rule Node", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Type of the Rule Node", accessMode = Schema.AccessMode.READ_ONLY)
     @Getter @Setter private ComponentType type;
-    @ApiModelProperty(position = 4, value = "Scope of the Rule Node. Always set to 'TENANT', since no rule chains on the 'SYSTEM' level yet.", accessMode = ApiModelProperty.AccessMode.READ_ONLY, allowableValues = "TENANT", example = "TENANT")
+    @Schema(description = "Scope of the Rule Node. Always set to 'TENANT', since no rule chains on the 'SYSTEM' level yet.", accessMode = Schema.AccessMode.READ_ONLY, allowableValues = "TENANT", example = "TENANT")
     @Getter @Setter private ComponentScope scope;
-    @ApiModelProperty(position = 5, value = "Clustering mode of the RuleNode. This mode represents the ability to start Rule Node in multiple microservices.", accessMode = ApiModelProperty.AccessMode.READ_ONLY, allowableValues = "USER_PREFERENCE, ENABLED, SINGLETON", example = "ENABLED")
+    @Schema(description = "Clustering mode of the RuleNode. This mode represents the ability to start Rule Node in multiple microservices.", accessMode = Schema.AccessMode.READ_ONLY, allowableValues = "USER_PREFERENCE, ENABLED, SINGLETON", example = "ENABLED")
     @Getter @Setter private ComponentClusteringMode clusteringMode;
     @Length(fieldName = "name")
-    @ApiModelProperty(position = 6, value = "Name of the Rule Node. Taken from the @RuleNode annotation.", accessMode = ApiModelProperty.AccessMode.READ_ONLY, example = "Custom Rule Node")
+    @Schema(description = "Name of the Rule Node. Taken from the @RuleNode annotation.", accessMode = Schema.AccessMode.READ_ONLY, example = "Custom Rule Node")
     @Getter @Setter private String name;
-    @ApiModelProperty(position = 7, value = "Full name of the Java class that implements the Rule Engine Node interface.", accessMode = ApiModelProperty.AccessMode.READ_ONLY, example = "com.mycompany.CustomRuleNode")
+    @Schema(description = "Full name of the Java class that implements the Rule Engine Node interface.", accessMode = Schema.AccessMode.READ_ONLY, example = "com.mycompany.CustomRuleNode")
     @Getter @Setter private String clazz;
-    @ApiModelProperty(position = 8, value = "Complex JSON object that represents the Rule Node configuration.", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Complex JSON object that represents the Rule Node configuration.", accessMode = Schema.AccessMode.READ_ONLY)
     @Getter @Setter private transient JsonNode configurationDescriptor;
-    @ApiModelProperty(position = 9, value = "Rule node configuration version. By default, this value is 0. If the rule node is a versioned node, this value might be greater than 0.", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Rule node configuration version. By default, this value is 0. If the rule node is a versioned node, this value might be greater than 0.", accessMode = Schema.AccessMode.READ_ONLY)
     @Getter @Setter private int configurationVersion;
     @Length(fieldName = "actions")
-    @ApiModelProperty(position = 10, value = "Rule Node Actions. Deprecated. Always null.", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Rule Node Actions. Deprecated. Always null.", accessMode = Schema.AccessMode.READ_ONLY)
     @Getter @Setter private String actions;
-    @ApiModelProperty(position = 11, value = "Indicates that the RuleNode supports queue name configuration.", accessMode = ApiModelProperty.AccessMode.READ_ONLY, example = "true")
+    @Schema(description = "Indicates that the RuleNode supports queue name configuration.", accessMode = Schema.AccessMode.READ_ONLY, example = "true")
     @Getter @Setter private boolean hasQueueName;
 
     public ComponentDescriptor() {
@@ -79,7 +77,7 @@ public class ComponentDescriptor extends BaseData<ComponentDescriptorId> {
         this.hasQueueName = plugin.isHasQueueName();
     }
 
-    @ApiModelProperty(position = 1, value = "JSON object with the descriptor Id. " +
+    @Schema(description = "JSON object with the descriptor Id. " +
             "Specify existing descriptor id to update the descriptor. " +
             "Referencing non-existing descriptor Id will cause error. " +
             "Omit this field to create new descriptor." )
@@ -88,7 +86,7 @@ public class ComponentDescriptor extends BaseData<ComponentDescriptorId> {
         return super.getId();
     }
 
-    @ApiModelProperty(position = 2, value = "Timestamp of the descriptor creation, in milliseconds", example = "1609459200000", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Timestamp of the descriptor creation, in milliseconds", example = "1609459200000", accessMode = Schema.AccessMode.READ_ONLY)
     @Override
     public long getCreatedTime() {
         return super.getCreatedTime();
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityCountQuery.java b/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityCountQuery.java
index 6086729213..3dd24147e7 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityCountQuery.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityCountQuery.java
@@ -15,14 +15,14 @@
  */
 package org.thingsboard.server.common.data.query;
 
-import io.swagger.annotations.ApiModel;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.ToString;
 
 import java.util.Collections;
 import java.util.List;
 
-@ApiModel
+@Schema
 @ToString
 public class EntityCountQuery {
 
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityKey.java b/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityKey.java
index f3dae621c8..8c1b21236f 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityKey.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityKey.java
@@ -15,12 +15,12 @@
  */
 package org.thingsboard.server.common.data.query;
 
-import io.swagger.annotations.ApiModel;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.io.Serializable;
 
-@ApiModel
+@Schema
 @Data
 public class EntityKey implements Serializable {
     private static final long serialVersionUID = -6421575477523085543L;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/query/FilterPredicateValue.java b/common/data/src/main/java/org/thingsboard/server/common/data/query/FilterPredicateValue.java
index f88ff68238..6183edf461 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/query/FilterPredicateValue.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/query/FilterPredicateValue.java
@@ -22,7 +22,7 @@ import lombok.Data;
 import lombok.Getter;
 import org.thingsboard.server.common.data.validation.NoXss;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import java.io.Serializable;
 
 @Data
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/query/KeyFilter.java b/common/data/src/main/java/org/thingsboard/server/common/data/query/KeyFilter.java
index 79b89969d3..0f936a2a92 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/query/KeyFilter.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/query/KeyFilter.java
@@ -15,12 +15,12 @@
  */
 package org.thingsboard.server.common.data.query;
 
-import io.swagger.annotations.ApiModel;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.io.Serializable;
 
-@ApiModel
+@Schema
 @Data
 public class KeyFilter implements Serializable {
 
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/query/StringFilterPredicate.java b/common/data/src/main/java/org/thingsboard/server/common/data/query/StringFilterPredicate.java
index e547e22086..89d9dc4653 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/query/StringFilterPredicate.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/query/StringFilterPredicate.java
@@ -17,7 +17,7 @@ package org.thingsboard.server.common.data.query;
 
 import lombok.Data;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 
 @Data
 public class StringFilterPredicate implements SimpleKeyFilterPredicate<String> {
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/relation/EntityRelation.java b/common/data/src/main/java/org/thingsboard/server/common/data/relation/EntityRelation.java
index 06319e6732..1b32cc632e 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/relation/EntityRelation.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/relation/EntityRelation.java
@@ -17,8 +17,7 @@ package org.thingsboard.server.common.data.relation;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.JsonNode;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.extern.slf4j.Slf4j;
 import org.thingsboard.server.common.data.BaseDataWithAdditionalInfo;
 import org.thingsboard.server.common.data.id.EntityId;
@@ -27,7 +26,7 @@ import org.thingsboard.server.common.data.validation.Length;
 import java.io.Serializable;
 
 @Slf4j
-@ApiModel
+@Schema
 public class EntityRelation implements Serializable {
 
     private static final long serialVersionUID = 2807343040519543363L;
@@ -73,7 +72,7 @@ public class EntityRelation implements Serializable {
         this.additionalInfo = entityRelation.getAdditionalInfo();
     }
 
-    @ApiModelProperty(position = 1, value = "JSON object with [from] Entity Id.", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "JSON object with [from] Entity Id.", accessMode = Schema.AccessMode.READ_ONLY)
     public EntityId getFrom() {
         return from;
     }
@@ -82,7 +81,7 @@ public class EntityRelation implements Serializable {
         this.from = from;
     }
 
-    @ApiModelProperty(position = 2, value = "JSON object with [to] Entity Id.", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "JSON object with [to] Entity Id.", accessMode = Schema.AccessMode.READ_ONLY)
     public EntityId getTo() {
         return to;
     }
@@ -91,7 +90,7 @@ public class EntityRelation implements Serializable {
         this.to = to;
     }
 
-    @ApiModelProperty(position = 3, value = "String value of relation type.", example = "Contains")
+    @Schema(description = "String value of relation type.", example = "Contains")
     public String getType() {
         return type;
     }
@@ -100,7 +99,7 @@ public class EntityRelation implements Serializable {
         this.type = type;
     }
 
-    @ApiModelProperty(position = 4, value = "Represents the type group of the relation.", example = "COMMON")
+    @Schema(description = "Represents the type group of the relation.", example = "COMMON")
     public RelationTypeGroup getTypeGroup() {
         return typeGroup;
     }
@@ -109,7 +108,7 @@ public class EntityRelation implements Serializable {
         this.typeGroup = typeGroup;
     }
 
-    @ApiModelProperty(position = 5, value = "Additional parameters of the relation", dataType = "com.fasterxml.jackson.databind.JsonNode")
+    @Schema(description = "Additional parameters of the relation",implementation = com.fasterxml.jackson.databind.JsonNode.class)
     public JsonNode getAdditionalInfo() {
         return BaseDataWithAdditionalInfo.getJson(() -> additionalInfo, () -> additionalInfoBytes);
     }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/relation/EntityRelationInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/relation/EntityRelationInfo.java
index 733cf959f1..539e3b9033 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/relation/EntityRelationInfo.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/relation/EntityRelationInfo.java
@@ -15,7 +15,7 @@
  */
 package org.thingsboard.server.common.data.relation;
 
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 
 public class EntityRelationInfo extends EntityRelation {
 
@@ -32,7 +32,7 @@ public class EntityRelationInfo extends EntityRelation {
         super(entityRelation);
     }
 
-    @ApiModelProperty(position = 6, value = "Name of the entity for [from] direction.", accessMode = ApiModelProperty.AccessMode.READ_ONLY, example = "A4B72CCDFF33")
+    @Schema(description = "Name of the entity for [from] direction.", accessMode = Schema.AccessMode.READ_ONLY, example = "A4B72CCDFF33")
     public String getFromName() {
         return fromName;
     }
@@ -41,7 +41,7 @@ public class EntityRelationInfo extends EntityRelation {
         this.fromName = fromName;
     }
 
-    @ApiModelProperty(position = 7, value = "Name of the entity for [to] direction.", accessMode = ApiModelProperty.AccessMode.READ_ONLY, example = "A4B72CCDFF35")
+    @Schema(description = "Name of the entity for [to] direction.", accessMode = Schema.AccessMode.READ_ONLY, example = "A4B72CCDFF35")
     public String getToName() {
         return toName;
     }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/relation/EntityRelationsQuery.java b/common/data/src/main/java/org/thingsboard/server/common/data/relation/EntityRelationsQuery.java
index f3c5e02d4e..20b102e961 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/relation/EntityRelationsQuery.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/relation/EntityRelationsQuery.java
@@ -15,8 +15,7 @@
  */
 package org.thingsboard.server.common.data.relation;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.util.List;
@@ -25,12 +24,12 @@ import java.util.List;
  * Created by ashvayka on 02.05.17.
  */
 @Data
-@ApiModel
+@Schema
 public class EntityRelationsQuery {
 
-    @ApiModelProperty(position = 2, value = "Main search parameters.")
+    @Schema(description = "Main search parameters.")
     private RelationsSearchParameters parameters;
-    @ApiModelProperty(position = 1, value = "Main filters.")
+    @Schema(description = "Main filters.")
     private List<RelationEntityTypeFilter> filters;
 
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/relation/RelationEntityTypeFilter.java b/common/data/src/main/java/org/thingsboard/server/common/data/relation/RelationEntityTypeFilter.java
index 43432675fd..f4eccf7984 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/relation/RelationEntityTypeFilter.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/relation/RelationEntityTypeFilter.java
@@ -15,8 +15,7 @@
  */
 package org.thingsboard.server.common.data.relation;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import org.thingsboard.server.common.data.EntityType;
@@ -28,12 +27,12 @@ import java.util.List;
  */
 @Data
 @AllArgsConstructor
-@ApiModel
+@Schema
 public class RelationEntityTypeFilter {
 
-    @ApiModelProperty(position = 1, value = "Type of the relation between root entity and other entity (e.g. 'Contains' or 'Manages').", example = "Contains")
+    @Schema(description = "Type of the relation between root entity and other entity (e.g. 'Contains' or 'Manages').", example = "Contains")
     private String relationType;
 
-    @ApiModelProperty(position = 2, value = "Array of entity types to filter the related entities (e.g. 'DEVICE', 'ASSET').")
+    @Schema(description = "Array of entity types to filter the related entities (e.g. 'DEVICE', 'ASSET').")
     private List<EntityType> entityTypes;
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/relation/RelationsSearchParameters.java b/common/data/src/main/java/org/thingsboard/server/common/data/relation/RelationsSearchParameters.java
index 9e4fd731f7..497a797046 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/relation/RelationsSearchParameters.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/relation/RelationsSearchParameters.java
@@ -16,8 +16,7 @@
 package org.thingsboard.server.common.data.relation;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import org.thingsboard.server.common.data.EntityType;
@@ -29,22 +28,22 @@ import java.util.UUID;
 /**
  * Created by ashvayka on 03.05.17.
  */
-@ApiModel
+@Schema
 @Data
 @AllArgsConstructor
 public class RelationsSearchParameters {
 
-    @ApiModelProperty(position = 1, value = "Root entity id to start search from.", example = "784f394c-42b6-435a-983c-b7beff2784f9")
+    @Schema(description = "Root entity id to start search from.", example = "784f394c-42b6-435a-983c-b7beff2784f9")
     private UUID rootId;
-    @ApiModelProperty(position = 2, value = "Type of the root entity.")
+    @Schema(description = "Type of the root entity.")
     private EntityType rootType;
-    @ApiModelProperty(position = 3, value = "Type of the root entity.")
+    @Schema(description = "Type of the root entity.")
     private EntitySearchDirection direction;
-    @ApiModelProperty(position = 4, value = "Type of the relation.")
+    @Schema(description = "Type of the relation.")
     private RelationTypeGroup relationTypeGroup;
-    @ApiModelProperty(position = 5, value = "Maximum level of the search depth.")
+    @Schema(description = "Maximum level of the search depth.")
     private int maxLevel = 1;
-    @ApiModelProperty(position = 6, value = "Fetch entities that match the last level of search. Useful to find Devices that are strictly 'maxLevel' relations away from the root entity.")
+    @Schema(description = "Fetch entities that match the last level of search. Useful to find Devices that are strictly 'maxLevel' relations away from the root entity.")
     private boolean fetchLastLevelOnly;
 
     public RelationsSearchParameters(EntityId entityId, EntitySearchDirection direction, int maxLevel, boolean fetchLastLevelOnly) {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/rpc/Rpc.java b/common/data/src/main/java/org/thingsboard/server/common/data/rpc/Rpc.java
index 89f9e51438..0163da1302 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/rpc/Rpc.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/rpc/Rpc.java
@@ -16,8 +16,7 @@
 package org.thingsboard.server.common.data.rpc;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.BaseData;
@@ -26,24 +25,24 @@ import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.RpcId;
 import org.thingsboard.server.common.data.id.TenantId;
 
-@ApiModel
+@Schema
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class Rpc extends BaseData<RpcId> implements HasTenantId {
 
-    @ApiModelProperty(position = 3, value = "JSON object with Tenant Id.", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "JSON object with Tenant Id.", accessMode = Schema.AccessMode.READ_ONLY)
     private TenantId tenantId;
-    @ApiModelProperty(position = 4, value = "JSON object with Device Id.", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "JSON object with Device Id.", accessMode = Schema.AccessMode.READ_ONLY)
     private DeviceId deviceId;
-    @ApiModelProperty(position = 5, value = "Expiration time of the request.", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Expiration time of the request.", accessMode = Schema.AccessMode.READ_ONLY)
     private long expirationTime;
-    @ApiModelProperty(position = 6, value = "The request body that will be used to send message to device.", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "The request body that will be used to send message to device.", accessMode = Schema.AccessMode.READ_ONLY)
     private JsonNode request;
-    @ApiModelProperty(position = 7, value = "The response from the device.", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "The response from the device.", accessMode = Schema.AccessMode.READ_ONLY)
     private JsonNode response;
-    @ApiModelProperty(position = 8, value = "The current status of the RPC call.", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "The current status of the RPC call.", accessMode = Schema.AccessMode.READ_ONLY)
     private RpcStatus status;
-    @ApiModelProperty(position = 9, value = "Additional info used in the rule engine to process the updates to the RPC state.", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Additional info used in the rule engine to process the updates to the RPC state.", accessMode = Schema.AccessMode.READ_ONLY)
     private JsonNode additionalInfo;
 
     public Rpc() {
@@ -65,13 +64,13 @@ public class Rpc extends BaseData<RpcId> implements HasTenantId {
         this.additionalInfo = rpc.getAdditionalInfo();
     }
 
-    @ApiModelProperty(position = 1, value = "JSON object with the rpc Id. Referencing non-existing rpc Id will cause error.")
+    @Schema(description = "JSON object with the rpc Id. Referencing non-existing rpc Id will cause error.")
     @Override
     public RpcId getId() {
         return super.getId();
     }
 
-    @ApiModelProperty(position = 2, value = "Timestamp of the rpc creation, in milliseconds", example = "1609459200000", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Timestamp of the rpc creation, in milliseconds", example = "1609459200000", accessMode = Schema.AccessMode.READ_ONLY)
     @Override
     public long getCreatedTime() {
         return super.getCreatedTime();
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 46d6dcad43..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
@@ -15,21 +15,20 @@
  */
 package org.thingsboard.server.common.data.rule;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 
 import java.io.Serializable;
 
-@ApiModel
+@Schema
 @Data
 @Slf4j
 public class DefaultRuleChainCreateRequest implements Serializable {
 
     private static final long serialVersionUID = 5600333716030561537L;
 
-    @ApiModelProperty(position = 1, required = true, value = "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 2325a35815..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
@@ -15,20 +15,19 @@
  */
 package org.thingsboard.server.common.data.rule;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 /**
  * Created by ashvayka on 21.03.18.
  */
-@ApiModel
+@Schema
 @Data
 public class NodeConnectionInfo {
-    @ApiModelProperty(position = 1, required = true, value = "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;
-    @ApiModelProperty(position = 2, required = true, value = "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;
-    @ApiModelProperty(position = 3, required = true, value = "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 6fbef53d34..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
@@ -17,8 +17,7 @@ package org.thingsboard.server.common.data.rule;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.JsonNode;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;
@@ -32,7 +31,7 @@ import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.validation.Length;
 import org.thingsboard.server.common.data.validation.NoXss;
 
-@ApiModel
+@Schema
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Slf4j
@@ -40,21 +39,21 @@ public class RuleChain extends BaseDataWithAdditionalInfo<RuleChainId> implement
 
     private static final long serialVersionUID = -5656679015121935465L;
 
-    @ApiModelProperty(position = 3, required = true, value = "JSON object with Tenant Id.", accessMode = ApiModelProperty.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")
-    @ApiModelProperty(position = 4, required = true, value = "Rule Chain name", example = "Humidity data processing")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Rule Chain name", example = "Humidity data processing")
     private String name;
-    @ApiModelProperty(position = 5, value = "Rule Chain type. 'EDGE' rule chains are processing messages on the edge devices only.", example = "A4B72CCDFF33")
+    @Schema(description = "Rule Chain type. 'EDGE' rule chains are processing messages on the edge devices only.", example = "A4B72CCDFF33")
     private RuleChainType type;
-    @ApiModelProperty(position = 6, value = "JSON object with Rule Chain Id. Pointer to the first rule node that should receive all messages pushed to this rule chain.")
+    @Schema(description = "JSON object with Rule Chain Id. Pointer to the first rule node that should receive all messages pushed to this rule chain.")
     private RuleNodeId firstRuleNodeId;
-    @ApiModelProperty(position = 7, value = "Indicates root rule chain. The root rule chain process messages from all devices and entities by default. User may configure default rule chain per device profile.")
+    @Schema(description = "Indicates root rule chain. The root rule chain process messages from all devices and entities by default. User may configure default rule chain per device profile.")
     private boolean root;
-    @ApiModelProperty(position = 8, value = "Reserved for future usage.")
+    @Schema(description = "Reserved for future usage.")
     private boolean debugMode;
-    @ApiModelProperty(position = 9, value = "Reserved for future usage. The actual list of rule nodes and their relations is stored in the database separately.")
+    @Schema(description = "Reserved for future usage. The actual list of rule nodes and their relations is stored in the database separately.")
     private transient JsonNode configuration;
 
     private RuleChainId externalId;
@@ -86,7 +85,7 @@ public class RuleChain extends BaseDataWithAdditionalInfo<RuleChainId> implement
         return name;
     }
 
-    @ApiModelProperty(position = 1, value = "JSON object with the Rule Chain Id. " +
+    @Schema(description = "JSON object with the Rule Chain Id. " +
             "Specify this field to update the Rule Chain. " +
             "Referencing non-existing Rule Chain Id will cause error. " +
             "Omit this field to create new rule chain." )
@@ -95,7 +94,7 @@ public class RuleChain extends BaseDataWithAdditionalInfo<RuleChainId> implement
         return super.getId();
     }
 
-    @ApiModelProperty(position = 2, value = "Timestamp of the rule chain creation, in milliseconds", example = "1609459200000", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Timestamp of the rule chain creation, in milliseconds", example = "1609459200000", accessMode = Schema.AccessMode.READ_ONLY)
     @Override
     public long getCreatedTime() {
         return super.getCreatedTime();
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 90ba94898a..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
@@ -16,23 +16,22 @@
 package org.thingsboard.server.common.data.rule;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.thingsboard.server.common.data.id.RuleChainId;
 
 /**
  * Created by ashvayka on 21.03.18.
  */
-@ApiModel
+@Schema
 @Data
 public class RuleChainConnectionInfo {
-    @ApiModelProperty(position = 1, required = true, value = "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;
-    @ApiModelProperty(position = 2, required = true, value = "JSON object with the Rule Chain Id.")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "JSON object with the Rule Chain Id.")
     private RuleChainId targetRuleChainId;
-    @ApiModelProperty(position = 3, required = true, value = "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;
-    @ApiModelProperty(position = 4, required = true, value = "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 2f97bbd858..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
@@ -15,18 +15,17 @@
  */
 package org.thingsboard.server.common.data.rule;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.util.List;
 
-@ApiModel
+@Schema
 @Data
 public class RuleChainData {
 
-    @ApiModelProperty(position = 1, required = true, value = "List of the Rule Chain objects.", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "List of the Rule Chain objects.", accessMode = Schema.AccessMode.READ_ONLY)
     List<RuleChain> ruleChains;
-    @ApiModelProperty(position = 2, required = true, value = "List of the Rule Chain metadata objects.", accessMode = ApiModelProperty.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 e204aa38ed..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
@@ -15,8 +15,7 @@
  */
 package org.thingsboard.server.common.data.rule;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.thingsboard.server.common.data.id.RuleChainId;
 
@@ -26,23 +25,23 @@ import java.util.List;
 /**
  * Created by igor on 3/13/18.
  */
-@ApiModel
+@Schema
 @Data
 public class RuleChainMetaData {
 
-    @ApiModelProperty(position = 1, required = true, value = "JSON object with Rule Chain Id.", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "JSON object with Rule Chain Id.", accessMode = Schema.AccessMode.READ_ONLY)
     private RuleChainId ruleChainId;
 
-    @ApiModelProperty(position = 2, required = true, value = "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;
 
-    @ApiModelProperty(position = 3, required = true, value = "List of rule node JSON objects")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "List of rule node JSON objects")
     private List<RuleNode> nodes;
 
-    @ApiModelProperty(position = 4, required = true, value = "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;
 
-    @ApiModelProperty(position = 5, required = true, value = "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 0089df8d8e..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
@@ -15,8 +15,7 @@
  */
 package org.thingsboard.server.common.data.rule;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.thingsboard.server.common.data.id.RuleChainId;
@@ -24,21 +23,21 @@ import org.thingsboard.server.common.data.id.RuleNodeId;
 
 import java.util.Set;
 
-@ApiModel
+@Schema
 @Data
 @Slf4j
 public class RuleChainOutputLabelsUsage {
 
-    @ApiModelProperty(position = 1, required = true, value = "Rule Chain Id", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Rule Chain Id", accessMode = Schema.AccessMode.READ_ONLY)
     private RuleChainId ruleChainId;
-    @ApiModelProperty(position = 2, required = true, value = "Rule Node Id", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Rule Node Id", accessMode = Schema.AccessMode.READ_ONLY)
     private RuleNodeId ruleNodeId;
 
-    @ApiModelProperty(position = 3, required = true, value = "Rule Chain Name", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Rule Chain Name", accessMode = Schema.AccessMode.READ_ONLY)
     private String ruleChainName;
-    @ApiModelProperty(position = 4, required = true, value = "Rule Node Name", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Rule Node Name", accessMode = Schema.AccessMode.READ_ONLY)
     private String ruleNodeName;
-    @ApiModelProperty(position = 5, required = true, value = "Output labels", accessMode = ApiModelProperty.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/rule/RuleNode.java b/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleNode.java
index 4d1e696d1a..542debcfdd 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleNode.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleNode.java
@@ -17,8 +17,7 @@ package org.thingsboard.server.common.data.rule;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.JsonNode;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;
@@ -29,7 +28,7 @@ import org.thingsboard.server.common.data.id.RuleNodeId;
 import org.thingsboard.server.common.data.validation.Length;
 import org.thingsboard.server.common.data.validation.NoXss;
 
-@ApiModel
+@Schema
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Slf4j
@@ -37,24 +36,24 @@ public class RuleNode extends BaseDataWithAdditionalInfo<RuleNodeId> implements
 
     private static final long serialVersionUID = -5656679015121235465L;
 
-    @ApiModelProperty(position = 3, value = "JSON object with the Rule Chain Id. ", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "JSON object with the Rule Chain Id. ", accessMode = Schema.AccessMode.READ_ONLY)
     private RuleChainId ruleChainId;
     @Length(fieldName = "type")
-    @ApiModelProperty(position = 4, value = "Full Java Class Name of the rule node implementation. ", example = "com.mycompany.iot.rule.engine.ProcessingNode")
+    @Schema(description = "Full Java Class Name of the rule node implementation. ", example = "com.mycompany.iot.rule.engine.ProcessingNode")
     private String type;
     @NoXss
     @Length(fieldName = "name")
-    @ApiModelProperty(position = 5, value = "User defined name of the rule node. Used on UI and for logging. ", example = "Process sensor reading")
+    @Schema(description = "User defined name of the rule node. Used on UI and for logging. ", example = "Process sensor reading")
     private String name;
-    @ApiModelProperty(position = 6, value = "Enable/disable debug. ", example = "false")
+    @Schema(description = "Enable/disable debug. ", example = "false")
     private boolean debugMode;
-    @ApiModelProperty(position = 7, value = "Enable/disable singleton mode. ", example = "false")
+    @Schema(description = "Enable/disable singleton mode. ", example = "false")
     private boolean singletonMode;
-    @ApiModelProperty(position = 8, value = "Queue name. ", example = "Main")
+    @Schema(description = "Queue name. ", example = "Main")
     private String queueName;
-    @ApiModelProperty(position = 9, value = "Version of rule node configuration. ", example = "0")
+    @Schema(description = "Version of rule node configuration. ", example = "0")
     private int configurationVersion;
-    @ApiModelProperty(position = 10, value = "JSON with the rule node configuration. Structure depends on the rule node implementation.", dataType = "com.fasterxml.jackson.databind.JsonNode")
+    @Schema(description = "JSON with the rule node configuration. Structure depends on the rule node implementation.", implementation = com.fasterxml.jackson.databind.JsonNode.class)
     private transient JsonNode configuration;
     @JsonIgnore
     private byte[] configurationBytes;
@@ -93,22 +92,22 @@ public class RuleNode extends BaseDataWithAdditionalInfo<RuleNodeId> implements
         setJson(data, json -> this.configuration = json, bytes -> this.configurationBytes = bytes);
     }
 
-    @ApiModelProperty(position = 1, value = "JSON object with the Rule Node Id. " +
+    @Schema(description = "JSON object with the Rule Node Id. " +
             "Specify this field to update the Rule Node. " +
             "Referencing non-existing Rule Node Id will cause error. " +
-            "Omit this field to create new rule node." )
+            "Omit this field to create new rule node.")
     @Override
     public RuleNodeId getId() {
         return super.getId();
     }
 
-    @ApiModelProperty(position = 2, value = "Timestamp of the rule node creation, in milliseconds", example = "1609459200000", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Timestamp of the rule node creation, in milliseconds", example = "1609459200000", accessMode = Schema.AccessMode.READ_ONLY)
     @Override
     public long getCreatedTime() {
         return super.getCreatedTime();
     }
 
-    @ApiModelProperty(position = 10, value = "Additional parameters of the rule node. Contains 'layoutX' and 'layoutY' properties for visualization.", dataType = "com.fasterxml.jackson.databind.JsonNode")
+    @Schema(description = "Additional parameters of the rule node. Contains 'layoutX' and 'layoutY' properties for visualization.", implementation = com.fasterxml.jackson.databind.JsonNode.class)
     @Override
     public JsonNode getAdditionalInfo() {
         return super.getAdditionalInfo();
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 258000eafa..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
@@ -15,14 +15,13 @@
  */
 package org.thingsboard.server.common.data.security;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.BaseData;
 import org.thingsboard.server.common.data.id.DeviceCredentialsId;
 import org.thingsboard.server.common.data.id.DeviceId;
 
-@ApiModel
+@Schema
 @EqualsAndHashCode(callSuper = true)
 public class DeviceCredentials extends BaseData<DeviceCredentialsId> implements DeviceCredentialsFilter {
 
@@ -48,7 +47,7 @@ public class DeviceCredentials extends BaseData<DeviceCredentialsId> implements
         this.credentialsValue = deviceCredentials.getCredentialsValue();
     }
 
-    @ApiModelProperty(position = 1, required = true, accessMode = ApiModelProperty.AccessMode.READ_ONLY, value = "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
@@ -56,13 +55,13 @@ public class DeviceCredentials extends BaseData<DeviceCredentialsId> implements
         return super.getId();
     }
 
-    @ApiModelProperty(position = 2, value = "Timestamp of the device credentials creation, in milliseconds", example = "1609459200000")
+    @Schema(description = "Timestamp of the device credentials creation, in milliseconds", example = "1609459200000")
     @Override
     public long getCreatedTime() {
         return super.getCreatedTime();
     }
 
-    @ApiModelProperty(position = 3, required = true, value = "JSON object with the device Id.")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "JSON object with the device Id.")
     public DeviceId getDeviceId() {
         return deviceId;
     }
@@ -71,7 +70,7 @@ public class DeviceCredentials extends BaseData<DeviceCredentialsId> implements
         this.deviceId = deviceId;
     }
 
-    @ApiModelProperty(position = 4, value = "Type of the credentials", allowableValues="ACCESS_TOKEN, X509_CERTIFICATE, MQTT_BASIC, LWM2M_CREDENTIALS")
+    @Schema(description = "Type of the credentials", allowableValues ="ACCESS_TOKEN, X509_CERTIFICATE, MQTT_BASIC, LWM2M_CREDENTIALS")
     @Override
     public DeviceCredentialsType getCredentialsType() {
         return credentialsType;
@@ -81,7 +80,7 @@ public class DeviceCredentials extends BaseData<DeviceCredentialsId> implements
         this.credentialsType = credentialsType;
     }
 
-    @ApiModelProperty(position = 5, required = true, value = "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."
@@ -95,7 +94,7 @@ public class DeviceCredentials extends BaseData<DeviceCredentialsId> implements
         this.credentialsId = credentialsId;
     }
 
-    @ApiModelProperty(position = 6, value = "Value of the credentials. " +
+    @Schema(description = "Value of the credentials. " +
             "Null in case of ACCESS_TOKEN credentials type. Base64 value in case of X509_CERTIFICATE. " +
             "Complex object in case of MQTT_BASIC and LWM2M_CREDENTIALS", example = "Null in case of ACCESS_TOKEN. See model definition.")
     public String getCredentialsValue() {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/security/model/JwtPair.java b/common/data/src/main/java/org/thingsboard/server/common/data/security/model/JwtPair.java
index 3e33e9b7ce..459aa7b26f 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/security/model/JwtPair.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/security/model/JwtPair.java
@@ -15,20 +15,19 @@
  */
 package org.thingsboard.server.common.data.security.model;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.thingsboard.server.common.data.security.Authority;
 
-@ApiModel(value = "JWT Pair")
+@Schema(description = "JWT Pair")
 @Data
 @NoArgsConstructor
 public class JwtPair {
 
-    @ApiModelProperty(position = 1, value = "The JWT Access Token. Used to perform API calls.", example = "AAB254FF67D..")
+    @Schema(description = "The JWT Access Token. Used to perform API calls.", example = "AAB254FF67D..")
     private String token;
-    @ApiModelProperty(position = 1, value = "The JWT Refresh Token. Used to get new JWT Access Token if old one has expired.", example = "AAB254FF67D..")
+    @Schema(description = "The JWT Refresh Token. Used to get new JWT Access Token if old one has expired.", example = "AAB254FF67D..")
     private String refreshToken;
 
     private Authority scope;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/security/model/JwtSettings.java b/common/data/src/main/java/org/thingsboard/server/common/data/security/model/JwtSettings.java
index 42ac9a3a1c..d8368f247b 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/security/model/JwtSettings.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/security/model/JwtSettings.java
@@ -15,13 +15,12 @@
  */
 package org.thingsboard.server.common.data.security.model;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-@ApiModel(value = "JWT Settings")
+@Schema(description = "JWT Settings")
 @AllArgsConstructor
 @NoArgsConstructor
 @Data
@@ -30,26 +29,26 @@ public class JwtSettings {
     /**
      * {@link JwtToken} will expire after this time.
      */
-    @ApiModelProperty(position = 1, value = "The JWT will expire after seconds.", example = "9000")
+    @Schema(description = "The JWT will expire after seconds.", example = "9000")
     private Integer tokenExpirationTime;
 
     /**
      * {@link JwtToken} can be refreshed during this timeframe.
      */
-    @ApiModelProperty(position = 2, value = "The JWT can be refreshed during seconds.", example = "604800")
+    @Schema(description = "The JWT can be refreshed during seconds.", example = "604800")
     private Integer refreshTokenExpTime;
 
     /**
      * Token issuer.
      */
-    @ApiModelProperty(position = 3, value = "The JWT issuer.", example = "thingsboard.io")
+    @Schema(description = "The JWT issuer.", example = "thingsboard.io")
     private String tokenIssuer;
 
     /**
      * Key is used to sign {@link JwtToken}.
      * Base64 encoded
      */
-    @ApiModelProperty(position = 4, value = "The JWT key is used to sing token. Base64 encoded.", example = "cTU4WnNqemI2aU5wbWVjdm1vYXRzanhjNHRUcXliMjE=")
+    @Schema(description = "The JWT key is used to sing token. Base64 encoded.", example = "cTU4WnNqemI2aU5wbWVjdm1vYXRzanhjNHRUcXliMjE=")
     private String tokenSigningKey;
 
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/security/model/SecuritySettings.java b/common/data/src/main/java/org/thingsboard/server/common/data/security/model/SecuritySettings.java
index ade397bfed..07262c7eb4 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/security/model/SecuritySettings.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/security/model/SecuritySettings.java
@@ -15,22 +15,21 @@
  */
 package org.thingsboard.server.common.data.security.model;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.io.Serializable;
 
-@ApiModel
+@Schema
 @Data
 public class SecuritySettings implements Serializable {
 
     private static final long serialVersionUID = -1307613974597312465L;
 
-    @ApiModelProperty(position = 1, value = "The user password policy object." )
+    @Schema(description = "The user password policy object." )
     private UserPasswordPolicy passwordPolicy;
-    @ApiModelProperty(position = 2, value = "Maximum number of failed login attempts allowed before user account is locked." )
+    @Schema(description = "Maximum number of failed login attempts allowed before user account is locked." )
     private Integer maxFailedLoginAttempts;
-    @ApiModelProperty(position = 3, value = "Email to use for notifications about locked users." )
+    @Schema(description = "Email to use for notifications about locked users." )
     private String userLockoutNotificationEmail;
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/security/model/UserPasswordPolicy.java b/common/data/src/main/java/org/thingsboard/server/common/data/security/model/UserPasswordPolicy.java
index 7c57f848d5..8a5243dc31 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/security/model/UserPasswordPolicy.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/security/model/UserPasswordPolicy.java
@@ -15,36 +15,35 @@
  */
 package org.thingsboard.server.common.data.security.model;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.io.Serializable;
 
-@ApiModel
+@Schema
 @Data
 public class UserPasswordPolicy implements Serializable {
 
-    @ApiModelProperty(position = 1, value = "Minimum number of symbols in the password." )
+    @Schema(description = "Minimum number of symbols in the password." )
     private Integer minimumLength;
-    @ApiModelProperty(position = 1, value = "Maximum number of symbols in the password." )
+    @Schema(description = "Maximum number of symbols in the password." )
     private Integer maximumLength;
-    @ApiModelProperty(position = 1, value = "Minimum number of uppercase letters in the password." )
+    @Schema(description = "Minimum number of uppercase letters in the password." )
     private Integer minimumUppercaseLetters;
-    @ApiModelProperty(position = 1, value = "Minimum number of lowercase letters in the password." )
+    @Schema(description = "Minimum number of lowercase letters in the password." )
     private Integer minimumLowercaseLetters;
-    @ApiModelProperty(position = 1, value = "Minimum number of digits in the password." )
+    @Schema(description = "Minimum number of digits in the password." )
     private Integer minimumDigits;
-    @ApiModelProperty(position = 1, value = "Minimum number of special in the password." )
+    @Schema(description = "Minimum number of special in the password." )
     private Integer minimumSpecialCharacters;
-    @ApiModelProperty(position = 1, value = "Allow whitespaces")
+    @Schema(description = "Allow whitespaces")
     private Boolean allowWhitespaces = true;
-    @ApiModelProperty(position = 1, value = "Force user to update password if existing one does not pass validation")
+    @Schema(description = "Force user to update password if existing one does not pass validation")
     private Boolean forceUserToResetPasswordIfNotValid = false;
 
-    @ApiModelProperty(position = 1, value = "Password expiration period (days). Force expiration of the password." )
+    @Schema(description = "Password expiration period (days). Force expiration of the password." )
     private Integer passwordExpirationPeriodDays;
-    @ApiModelProperty(position = 1, value = "Password reuse frequency (days). Disallow to use the same password for the defined number of days" )
+    @Schema(description = "Password reuse frequency (days). Disallow to use the same password for the defined number of days" )
     private Integer passwordReuseFrequencyDays;
 
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/PlatformTwoFaSettings.java b/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/PlatformTwoFaSettings.java
index 23537cd39a..a334a5f67c 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/PlatformTwoFaSettings.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/PlatformTwoFaSettings.java
@@ -20,10 +20,10 @@ import lombok.Data;
 import org.thingsboard.server.common.data.security.model.mfa.provider.TwoFaProviderConfig;
 import org.thingsboard.server.common.data.security.model.mfa.provider.TwoFaProviderType;
 
-import javax.validation.Valid;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
 import java.util.List;
 import java.util.Optional;
 
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/account/BackupCodeTwoFaAccountConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/account/BackupCodeTwoFaAccountConfig.java
index 7c89835160..fe3636b475 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/account/BackupCodeTwoFaAccountConfig.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/account/BackupCodeTwoFaAccountConfig.java
@@ -20,7 +20,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.security.model.mfa.provider.TwoFaProviderType;
 
-import javax.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotEmpty;
 import java.util.Set;
 
 @Data
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/account/EmailTwoFaAccountConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/account/EmailTwoFaAccountConfig.java
index ce998a293e..2b9542e67b 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/account/EmailTwoFaAccountConfig.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/account/EmailTwoFaAccountConfig.java
@@ -19,8 +19,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.security.model.mfa.provider.TwoFaProviderType;
 
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.NotBlank;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/account/SmsTwoFaAccountConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/account/SmsTwoFaAccountConfig.java
index c5cfc10507..9c9359796a 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/account/SmsTwoFaAccountConfig.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/account/SmsTwoFaAccountConfig.java
@@ -19,8 +19,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.security.model.mfa.provider.TwoFaProviderType;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Pattern;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Pattern;
 
 @EqualsAndHashCode(callSuper = true)
 @Data
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/account/TotpTwoFaAccountConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/account/TotpTwoFaAccountConfig.java
index b1a54e7b04..f0450daed1 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/account/TotpTwoFaAccountConfig.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/account/TotpTwoFaAccountConfig.java
@@ -19,8 +19,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.security.model.mfa.provider.TwoFaProviderType;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Pattern;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Pattern;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/provider/BackupCodeTwoFaProviderConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/provider/BackupCodeTwoFaProviderConfig.java
index a12961b7b1..ed8ef1d2a1 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/provider/BackupCodeTwoFaProviderConfig.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/provider/BackupCodeTwoFaProviderConfig.java
@@ -17,7 +17,7 @@ package org.thingsboard.server.common.data.security.model.mfa.provider;
 
 import lombok.Data;
 
-import javax.validation.constraints.Min;
+import jakarta.validation.constraints.Min;
 
 @Data
 public class BackupCodeTwoFaProviderConfig implements TwoFaProviderConfig {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/provider/OtpBasedTwoFaProviderConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/provider/OtpBasedTwoFaProviderConfig.java
index da07372815..a2c167a76a 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/provider/OtpBasedTwoFaProviderConfig.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/provider/OtpBasedTwoFaProviderConfig.java
@@ -17,7 +17,7 @@ package org.thingsboard.server.common.data.security.model.mfa.provider;
 
 import lombok.Data;
 
-import javax.validation.constraints.Min;
+import jakarta.validation.constraints.Min;
 
 @Data
 public abstract class OtpBasedTwoFaProviderConfig implements TwoFaProviderConfig {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/provider/SmsTwoFaProviderConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/provider/SmsTwoFaProviderConfig.java
index 7e991034c1..79ae76331c 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/provider/SmsTwoFaProviderConfig.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/provider/SmsTwoFaProviderConfig.java
@@ -18,8 +18,8 @@ package org.thingsboard.server.common.data.security.model.mfa.provider;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Pattern;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Pattern;
 
 @EqualsAndHashCode(callSuper = true)
 @Data
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/provider/TotpTwoFaProviderConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/provider/TotpTwoFaProviderConfig.java
index 36733a8e78..d9ccad10e0 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/provider/TotpTwoFaProviderConfig.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/provider/TotpTwoFaProviderConfig.java
@@ -17,7 +17,7 @@ package org.thingsboard.server.common.data.security.model.mfa.provider;
 
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 
 @Data
 public class TotpTwoFaProviderConfig implements TwoFaProviderConfig {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/settings/AbstractUserDashboardInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/settings/AbstractUserDashboardInfo.java
index fc71e4ee5c..132800cf2d 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/settings/AbstractUserDashboardInfo.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/settings/AbstractUserDashboardInfo.java
@@ -15,23 +15,22 @@
  */
 package org.thingsboard.server.common.data.settings;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.thingsboard.server.common.data.HasTitle;
 
 import java.io.Serializable;
 import java.util.UUID;
 
-@ApiModel
+@Schema
 @Data
 public abstract class AbstractUserDashboardInfo implements HasTitle, Serializable {
 
     private static final long serialVersionUID = -6461562426034242608L;
 
-    @ApiModelProperty(position = 1, value = "JSON object with Dashboard id.", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "JSON object with Dashboard id.", accessMode = Schema.AccessMode.READ_ONLY)
     private UUID id;
-    @ApiModelProperty(position = 2, value = "Title of the dashboard.")
+    @Schema(description = "Title of the dashboard.")
     private String title;
 
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/settings/LastVisitedDashboardInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/settings/LastVisitedDashboardInfo.java
index aae9448c1a..44355e772a 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/settings/LastVisitedDashboardInfo.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/settings/LastVisitedDashboardInfo.java
@@ -15,23 +15,22 @@
  */
 package org.thingsboard.server.common.data.settings;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
 
 @EqualsAndHashCode(callSuper = true)
-@ApiModel
+@Schema
 @Data
 public class LastVisitedDashboardInfo extends AbstractUserDashboardInfo implements Serializable {
 
     private static final long serialVersionUID = -6461562426034242608L;
 
-    @ApiModelProperty(position = 3, value = "Starred flag")
+    @Schema(description = "Starred flag")
     private boolean starred;
-    @ApiModelProperty(position = 4, value = "Last visit timestamp")
+    @Schema(description = "Last visit timestamp")
     private long lastVisited;
 
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/settings/StarredDashboardInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/settings/StarredDashboardInfo.java
index c85a806790..558b34b7c9 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/settings/StarredDashboardInfo.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/settings/StarredDashboardInfo.java
@@ -15,20 +15,19 @@
  */
 package org.thingsboard.server.common.data.settings;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
 
 @EqualsAndHashCode(callSuper = true)
-@ApiModel
+@Schema
 @Data
 public class StarredDashboardInfo extends AbstractUserDashboardInfo implements Serializable {
 
     private static final long serialVersionUID = -7830828696329673361L;
-    @ApiModelProperty(position = 4, value = "Starred timestamp")
+    @Schema(description = "Starred timestamp")
     private long starredAt;
 
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/settings/UserDashboardsInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/settings/UserDashboardsInfo.java
index c2d0cee01d..a6dabcd372 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/settings/UserDashboardsInfo.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/settings/UserDashboardsInfo.java
@@ -15,8 +15,7 @@
  */
 package org.thingsboard.server.common.data.settings;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
@@ -25,7 +24,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-@ApiModel
+@Schema
 @Data
 @AllArgsConstructor
 public class UserDashboardsInfo implements Serializable {
@@ -33,10 +32,10 @@ public class UserDashboardsInfo implements Serializable {
     private static final long serialVersionUID = 2628320657987010348L;
     public static final UserDashboardsInfo EMPTY = new UserDashboardsInfo(Collections.emptyList(), Collections.emptyList());
 
-    @ApiModelProperty(position = 1, value = "List of last visited dashboards.", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "List of last visited dashboards.", accessMode = Schema.AccessMode.READ_ONLY)
     private List<LastVisitedDashboardInfo> last;
 
-    @ApiModelProperty(position = 2, value = "List of starred dashboards.", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "List of starred dashboards.", accessMode = Schema.AccessMode.READ_ONLY)
     private List<StarredDashboardInfo> starred;
 
     public UserDashboardsInfo() {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/settings/UserSettings.java b/common/data/src/main/java/org/thingsboard/server/common/data/settings/UserSettings.java
index bebefc9c2b..0956c256a3 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/settings/UserSettings.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/settings/UserSettings.java
@@ -17,9 +17,9 @@ package org.thingsboard.server.common.data.settings;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.JsonNode;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import lombok.ToString;
 import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.validation.Length;
 import org.thingsboard.server.common.data.validation.NoXss;
@@ -29,26 +29,27 @@ import java.io.Serializable;
 import static org.thingsboard.server.common.data.BaseDataWithAdditionalInfo.getJson;
 import static org.thingsboard.server.common.data.BaseDataWithAdditionalInfo.setJson;
 
-@ApiModel
+@Schema
 @Data
 public class UserSettings implements Serializable {
 
     private static final long serialVersionUID = 2628320657987010348L;
 
-    @ApiModelProperty(position = 1, value = "JSON object with User id.", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "JSON object with User id.", accessMode = Schema.AccessMode.READ_ONLY)
     private UserId userId;
 
-    @ApiModelProperty(position = 2, value = "Type of the settings.")
+    @Schema(description = "Type of the settings.")
     @NoXss
     @Length(fieldName = "type", max = 50)
     private UserSettingsType type;
 
-    @ApiModelProperty(position = 3, value = "JSON object with user settings.", dataType = "com.fasterxml.jackson.databind.JsonNode")
+    @Schema(description = "JSON object with user settings.",implementation = com.fasterxml.jackson.databind.JsonNode.class)
     @NoXss
     @Length(fieldName = "settings", max = 100000)
     private transient JsonNode settings;
 
     @JsonIgnore
+    @ToString.Exclude
     private byte[] settingsBytes;
 
     public JsonNode getSettings() {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/sms/config/AwsSnsSmsProviderConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/sms/config/AwsSnsSmsProviderConfiguration.java
index 750f9ca3f0..ef17873df8 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/sms/config/AwsSnsSmsProviderConfiguration.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/sms/config/AwsSnsSmsProviderConfiguration.java
@@ -15,19 +15,18 @@
  */
 package org.thingsboard.server.common.data.sms.config;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-@ApiModel
+@Schema
 @Data
 public class AwsSnsSmsProviderConfiguration implements SmsProviderConfiguration {
 
-    @ApiModelProperty(position = 1, value = "The AWS SNS Access Key ID.")
+    @Schema(description = "The AWS SNS Access Key ID.")
     private String accessKeyId;
-    @ApiModelProperty(position = 2, value = "The AWS SNS Access Key.")
+    @Schema(description = "The AWS SNS Access Key.")
     private String secretAccessKey;
-    @ApiModelProperty(position = 3, value = "The AWS region.")
+    @Schema(description = "The AWS region.")
     private String region;
 
     @Override
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 f3afe74d40..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
@@ -15,43 +15,43 @@
  */
 package org.thingsboard.server.common.data.sms.config;
 
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 @Data
 public class SmppSmsProviderConfiguration implements SmsProviderConfiguration {
-    @ApiModelProperty(value = "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;
 
-    @ApiModelProperty(value = "SMPP host", required = true)
+    @Schema(description = "SMPP host", requiredMode = Schema.RequiredMode.REQUIRED)
     private String host;
-    @ApiModelProperty(value = "SMPP port", required = true)
+    @Schema(description = "SMPP port", requiredMode = Schema.RequiredMode.REQUIRED)
     private Integer port;
 
-    @ApiModelProperty(value = "System ID", required = true)
+    @Schema(description = "System ID", requiredMode = Schema.RequiredMode.REQUIRED)
     private String systemId;
-    @ApiModelProperty(value = "Password", required = true)
+    @Schema(description = "Password", requiredMode = Schema.RequiredMode.REQUIRED)
     private String password;
 
-    @ApiModelProperty(value = "System type", required = false)
+    @Schema(description = "System type", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private String systemType;
-    @ApiModelProperty(value = "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;
-    @ApiModelProperty(value = "Service type", required = false)
+    @Schema(description = "Service type", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private String serviceType;
 
-    @ApiModelProperty(value = "Source address", required = false)
+    @Schema(description = "Source address", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private String sourceAddress;
-    @ApiModelProperty(value = "Source TON (Type of Number). Needed is source address is set. 5 by default.\n" +
+    @Schema(description = "Source TON (Type of Number). Needed is source address is set. 5 by default.\n" +
             "0 - Unknown\n" +
             "1 - International\n" +
             "2 - National\n" +
             "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;
-    @ApiModelProperty(value = "Source NPI (Numbering Plan Identification). Needed is source address is set. 0 by default.\n" +
+    @Schema(description = "Source NPI (Numbering Plan Identification). Needed is source address is set. 0 by default.\n" +
             "0 - Unknown\n" +
             "1 - ISDN/telephone numbering plan (E163/E164)\n" +
             "3 - Data numbering plan (X.121)\n" +
@@ -61,19 +61,19 @@ 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;
 
-    @ApiModelProperty(value = "Destination TON (Type of Number). 5 by default.\n" +
+    @Schema(description = "Destination TON (Type of Number). 5 by default.\n" +
             "0 - Unknown\n" +
             "1 - International\n" +
             "2 - National\n" +
             "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;
-    @ApiModelProperty(value = "Destination NPI (Numbering Plan Identification). 0 by default.\n" +
+    @Schema(description = "Destination NPI (Numbering Plan Identification). 0 by default.\n" +
             "0 - Unknown\n" +
             "1 - ISDN/telephone numbering plan (E163/E164)\n" +
             "3 - Data numbering plan (X.121)\n" +
@@ -83,14 +83,14 @@ 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;
 
-    @ApiModelProperty(value = "Address range", required = false)
+    @Schema(description = "Address range", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private String addressRange;
 
-    @ApiModelProperty(allowableValues = "0-10,13-14",
-            value = "0 - SMSC Default Alphabet (ASCII for short and long code and to GSM for toll-free, used as default)\n" +
+    @Schema(allowableValues = "0-10,13-14",
+            description = "0 - SMSC Default Alphabet (ASCII for short and long code and to GSM for toll-free, used as default)\n" +
                     "1 - IA5 (ASCII for short and long code, Latin 9 for toll-free (ISO-8859-9))\n" +
                     "2 - Octet Unspecified (8-bit binary)\n" +
                     "3 - Latin 1 (ISO-8859-1)\n" +
@@ -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/sms/config/TestSmsRequest.java b/common/data/src/main/java/org/thingsboard/server/common/data/sms/config/TestSmsRequest.java
index a4df943326..f2996af5d7 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/sms/config/TestSmsRequest.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/sms/config/TestSmsRequest.java
@@ -15,19 +15,18 @@
  */
 package org.thingsboard.server.common.data.sms.config;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-@ApiModel
+@Schema
 @Data
 public class TestSmsRequest {
 
-    @ApiModelProperty(position = 1, value = "The SMS provider configuration")
+    @Schema(description = "The SMS provider configuration")
     private SmsProviderConfiguration providerConfiguration;
-    @ApiModelProperty(position = 2, value = "The phone number or other identifier to specify as a recipient of the SMS.")
+    @Schema(description = "The phone number or other identifier to specify as a recipient of the SMS.")
     private String numberTo;
-    @ApiModelProperty(position = 3, value = "The test message")
+    @Schema(description = "The test message")
     private String message;
 
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/sms/config/TwilioSmsProviderConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/sms/config/TwilioSmsProviderConfiguration.java
index 8deff11da6..a6ae9a3978 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/sms/config/TwilioSmsProviderConfiguration.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/sms/config/TwilioSmsProviderConfiguration.java
@@ -15,19 +15,18 @@
  */
 package org.thingsboard.server.common.data.sms.config;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-@ApiModel
+@Schema
 @Data
 public class TwilioSmsProviderConfiguration implements SmsProviderConfiguration {
 
-    @ApiModelProperty(position = 1, value = "Twilio account Sid.")
+    @Schema(description = "Twilio account Sid.")
     private String accountSid;
-    @ApiModelProperty(position = 2, value = "Twilio account Token.")
+    @Schema(description = "Twilio account Token.")
     private String accountToken;
-    @ApiModelProperty(position = 3, value = "The number/id of a sender.")
+    @Schema(description = "The number/id of a sender.")
     private String numberFrom;
 
     @Override
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/sync/ie/importing/csv/BulkImportColumnType.java b/common/data/src/main/java/org/thingsboard/server/common/data/sync/ie/importing/csv/BulkImportColumnType.java
index 6a205b6587..53b728e294 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/sync/ie/importing/csv/BulkImportColumnType.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/sync/ie/importing/csv/BulkImportColumnType.java
@@ -16,7 +16,7 @@
 package org.thingsboard.server.common.data.sync.ie.importing.csv;
 
 import lombok.Getter;
-import org.thingsboard.server.common.data.DataConstants;
+import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.device.credentials.lwm2m.LwM2MSecurityMode;
 
 @Getter
@@ -24,8 +24,8 @@ public enum BulkImportColumnType {
     NAME,
     TYPE,
     LABEL,
-    SHARED_ATTRIBUTE(DataConstants.SHARED_SCOPE, true),
-    SERVER_ATTRIBUTE(DataConstants.SERVER_SCOPE, true),
+    SHARED_ATTRIBUTE(AttributeScope.SHARED_SCOPE.name(), true),
+    SERVER_ATTRIBUTE(AttributeScope.SERVER_SCOPE.name(), true),
     TIMESERIES(true),
     ACCESS_TOKEN,
     X509,
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/data/src/main/java/org/thingsboard/server/common/data/tenant/profile/DefaultTenantProfileConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/tenant/profile/DefaultTenantProfileConfiguration.java
index 3fe110de0b..a0cfbfe1e1 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/tenant/profile/DefaultTenantProfileConfiguration.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/tenant/profile/DefaultTenantProfileConfiguration.java
@@ -83,6 +83,8 @@ public class DefaultTenantProfileConfiguration implements TenantProfileConfigura
 
     private String edgeEventRateLimits;
     private String edgeEventRateLimitsPerEdge;
+    private String edgeUplinkMessagesRateLimits;
+    private String edgeUplinkMessagesRateLimitsPerEdge;
 
     private int defaultStorageTtlDays;
     private int alarmsTtlDays;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/tenant/profile/TenantProfileData.java b/common/data/src/main/java/org/thingsboard/server/common/data/tenant/profile/TenantProfileData.java
index ea30dd70e8..ed76a21cab 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/tenant/profile/TenantProfileData.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/tenant/profile/TenantProfileData.java
@@ -15,23 +15,22 @@
  */
 package org.thingsboard.server.common.data.tenant.profile;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.io.Serializable;
 import java.util.List;
 
-@ApiModel
+@Schema
 @Data
 public class TenantProfileData implements Serializable {
 
     private static final long serialVersionUID = -3642550257035920976L;
 
-    @ApiModelProperty(position = 1, value = "Complex JSON object that contains profile settings: max devices, max assets, rate limits, etc.")
+    @Schema(description = "Complex JSON object that contains profile settings: max devices, max assets, rate limits, etc.")
     private TenantProfileConfiguration configuration;
 
-    @ApiModelProperty(position = 2, value = "JSON array of queue configuration per tenant profile")
+    @Schema(description = "JSON array of queue configuration per tenant profile")
     private List<TenantProfileQueueConfiguration> queueConfiguration;
 
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/util/TbDDFFileParser.java b/common/data/src/main/java/org/thingsboard/server/common/data/util/TbDDFFileParser.java
index ce1c7a1783..6c918ae2c0 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/util/TbDDFFileParser.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/util/TbDDFFileParser.java
@@ -17,8 +17,6 @@ package org.thingsboard.server.common.data.util;
 
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.leshan.core.LwM2m;
-import org.eclipse.leshan.core.model.DDFFileValidator;
-import org.eclipse.leshan.core.model.DefaultDDFFileValidator;
 import org.eclipse.leshan.core.model.InvalidDDFFileException;
 import org.eclipse.leshan.core.model.ObjectModel;
 import org.eclipse.leshan.core.model.ResourceModel;
@@ -41,7 +39,7 @@ import java.util.Map;
 
 @Slf4j
 public class TbDDFFileParser {
-    private static final DDFFileValidator ddfFileValidator = new DefaultDDFFileValidator();
+    private static final TbDefaultDDFFileValidator ddfFileValidator = new TbDefaultDDFFileValidator();
 
     public List<ObjectModel> parse(InputStream inputStream, String streamName)
             throws InvalidDDFFileException, IOException {
@@ -269,4 +267,4 @@ public class TbDDFFileParser {
         }
         return new ResourceModel(id, name, operations, multiple, mandatory, type, rangeEnumeration, units, description);
     }
-}
\ No newline at end of file
+}
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/util/TbDefaultDDFFileValidator.java b/common/data/src/main/java/org/thingsboard/server/common/data/util/TbDefaultDDFFileValidator.java
new file mode 100644
index 0000000000..b12bd5707e
--- /dev/null
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/util/TbDefaultDDFFileValidator.java
@@ -0,0 +1,129 @@
+/**
+ * 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.util;
+
+
+import org.eclipse.leshan.core.LwM2m.LwM2mVersion;
+import org.eclipse.leshan.core.model.DDFFileValidator;
+import org.eclipse.leshan.core.model.InvalidDDFFileException;
+import org.eclipse.leshan.core.util.Validate;
+import org.w3c.dom.Node;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXNotRecognizedException;
+import org.xml.sax.SAXNotSupportedException;
+
+import javax.xml.XMLConstants;
+import javax.xml.transform.Source;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamSource;
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
+import javax.xml.validation.Validator;
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * A DDF File Validator.
+ * <p>
+ * Validate a DDF File against the embedded LWM2M schema.
+ * <p>
+ * Support LWM2M version 1.0 and 1.1.
+ */
+
+public class TbDefaultDDFFileValidator implements DDFFileValidator {
+    private static String LWM2M_V1_0_SCHEMA_PATH = "/schemas/LWM2M.xsd";
+    private static String LWM2M_V1_1_SCHEMA_PATH = "/schemas/LWM2M-v1_1.xsd";
+
+    private final String schema;
+
+    /**
+     * Create a {@link DDFFileValidator} using the LWM2M v1.1 schema.
+     */
+    public TbDefaultDDFFileValidator() {
+        this(LwM2mVersion.V1_1);
+    }
+
+    /**
+     * Create a {@link DDFFileValidator} using schema corresponding to LWM2M {@link LwM2mVersion}.
+     */
+    public TbDefaultDDFFileValidator(LwM2mVersion version) {
+        Validate.notNull(version, "version must not be null");
+        if (LwM2mVersion.V1_0.equals(version)) {
+            schema = LWM2M_V1_0_SCHEMA_PATH;
+        } else if (LwM2mVersion.V1_1.equals(version)) {
+            schema = LWM2M_V1_1_SCHEMA_PATH;
+        } else {
+            throw new IllegalStateException(String.format("Unsupported version %s", version));
+        }
+    }
+
+    @Override
+    public void validate(Node xmlToValidate) throws InvalidDDFFileException {
+        try {
+            validate(new DOMSource(xmlToValidate));
+        } catch (SAXException | IOException e) {
+            throw new InvalidDDFFileException(e);
+        }
+    }
+
+    /**
+     * Validate a XML {@link Source} against the embedded LWM2M Schema.
+     *
+     * @param xmlToValidate an XML source to validate
+     * @throws SAXException see {@link Validator#validate(Source)}
+     * @throws IOException see {@link Validator#validate(Source)}
+     */
+    public void validate(Source xmlToValidate) throws SAXException, IOException {
+        Validator validator = getEmbeddedLwM2mSchema().newValidator();
+        validator.validate(xmlToValidate);
+    }
+
+    /**
+     * Get the Embedded the LWM2M.xsd Schema.
+     *
+     * @throws SAXException see {@link SchemaFactory#newSchema(Source)}
+     */
+    protected Schema getEmbeddedLwM2mSchema() throws SAXException {
+        InputStream inputStream = DDFFileValidator.class.getResourceAsStream(schema);
+        Source source = new StreamSource(inputStream);
+        SchemaFactory schemaFactory = createSchemaFactory();
+        return schemaFactory.newSchema(source);
+    }
+
+    protected SchemaFactory createSchemaFactory() {
+        SchemaFactory factory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
+//        SchemaFactory factory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI);
+        try {
+            // Create Safe SchemaFactory (not vulnerable to XXE Attacks)
+            // --------------------------------------------------------
+            // There is several recommendation from different source we try to apply all, even if some are maybe
+            // redundant.
+
+            // from :
+            // https://semgrep.dev/docs/cheat-sheets/java-xxe/
+            factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
+
+            // from :
+            // https://cheatsheetseries.owasp.org/cheatsheets/XML_External_Entity_Prevention_Cheat_Sheet.html#schemafactory
+//            factory.setProperty(XMLConstants.ACCESS_EXTERNAL_DTD, "");
+//            factory.setProperty(XMLConstants.ACCESS_EXTERNAL_SCHEMA, "");
+
+        } catch (SAXNotRecognizedException | SAXNotSupportedException e) {
+            throw new IllegalStateException("Unable to create SchemaFactory", e);
+        }
+        return factory;
+    }
+}
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/validation/Length.java b/common/data/src/main/java/org/thingsboard/server/common/data/validation/Length.java
index 1e9a70a389..3437530387 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/validation/Length.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/validation/Length.java
@@ -15,8 +15,8 @@
  */
 package org.thingsboard.server.common.data.validation;
 
-import javax.validation.Constraint;
-import javax.validation.Payload;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/validation/NoXss.java b/common/data/src/main/java/org/thingsboard/server/common/data/validation/NoXss.java
index 5f32a8a3c9..2ca8f546f4 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/validation/NoXss.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/validation/NoXss.java
@@ -15,8 +15,8 @@
  */
 package org.thingsboard.server.common.data.validation;
 
-import javax.validation.Constraint;
-import javax.validation.Payload;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/widget/BaseWidgetType.java b/common/data/src/main/java/org/thingsboard/server/common/data/widget/BaseWidgetType.java
index 0825ca82d8..5bf721a2f4 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/widget/BaseWidgetType.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/widget/BaseWidgetType.java
@@ -15,7 +15,7 @@
  */
 package org.thingsboard.server.common.data.widget;
 
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.thingsboard.server.common.data.BaseData;
 import org.thingsboard.server.common.data.HasName;
@@ -30,18 +30,18 @@ public class BaseWidgetType extends BaseData<WidgetTypeId> implements HasName, H
 
     private static final long serialVersionUID = 8388684344603660756L;
 
-    @ApiModelProperty(position = 3, value = "JSON object with Tenant Id.", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "JSON object with Tenant Id.", accessMode = Schema.AccessMode.READ_ONLY)
     private TenantId tenantId;
     @NoXss
     @Length(fieldName = "fqn")
-    @ApiModelProperty(position = 5, value = "Unique FQN that is used in dashboards as a reference widget type", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Unique FQN that is used in dashboards as a reference widget type", accessMode = Schema.AccessMode.READ_ONLY)
     private String fqn;
     @NoXss
     @Length(fieldName = "name")
-    @ApiModelProperty(position = 6, value = "Widget name used in search and UI")
+    @Schema(description = "Widget name used in search and UI", accessMode = Schema.AccessMode.READ_ONLY)
     private String name;
 
-    @ApiModelProperty(position = 7, value = "Whether widget type is deprecated.", example = "true")
+    @Schema(description = "Whether widget type is deprecated.", example = "true")
     private boolean deprecated;
 
     public BaseWidgetType() {
@@ -60,7 +60,7 @@ public class BaseWidgetType extends BaseData<WidgetTypeId> implements HasName, H
         this.deprecated = widgetType.isDeprecated();
     }
 
-    @ApiModelProperty(position = 1, value = "JSON object with the Widget Type Id. " +
+    @Schema(description = "JSON object with the Widget Type Id. " +
             "Specify this field to update the Widget Type. " +
             "Referencing non-existing Widget Type Id will cause error. " +
             "Omit this field to create new Widget Type." )
@@ -69,7 +69,7 @@ public class BaseWidgetType extends BaseData<WidgetTypeId> implements HasName, H
         return super.getId();
     }
 
-    @ApiModelProperty(position = 2, value = "Timestamp of the Widget Type creation, in milliseconds", example = "1609459200000", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Timestamp of the Widget Type creation, in milliseconds", example = "1609459200000", accessMode = Schema.AccessMode.READ_ONLY)
     @Override
     public long getCreatedTime() {
         return super.getCreatedTime();
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/widget/WidgetType.java b/common/data/src/main/java/org/thingsboard/server/common/data/widget/WidgetType.java
index 2a379289e8..53e8ac10eb 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/widget/WidgetType.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/widget/WidgetType.java
@@ -16,14 +16,14 @@
 package org.thingsboard.server.common.data.widget;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.thingsboard.server.common.data.id.WidgetTypeId;
 
 @Data
 public class WidgetType extends BaseWidgetType {
 
-    @ApiModelProperty(position = 8, value = "Complex JSON object that describes the widget type")
+    @Schema(description = "Complex JSON object that describes the widget type", accessMode = Schema.AccessMode.READ_ONLY)
     private transient JsonNode descriptor;
 
     public WidgetType() {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/widget/WidgetTypeDetails.java b/common/data/src/main/java/org/thingsboard/server/common/data/widget/WidgetTypeDetails.java
index 07145adc02..f29fe8fec5 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/widget/WidgetTypeDetails.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/widget/WidgetTypeDetails.java
@@ -16,7 +16,7 @@
 package org.thingsboard.server.common.data.widget;
 
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
@@ -32,14 +32,14 @@ import org.thingsboard.server.common.data.validation.NoXss;
 @JsonPropertyOrder({ "fqn", "name", "deprecated", "image", "description", "descriptor", "externalId" })
 public class WidgetTypeDetails extends WidgetType implements HasName, HasTenantId, HasImage, ExportableEntity<WidgetTypeId> {
 
-    @ApiModelProperty(position = 9, value = "Relative or external image URL. Replaced with image data URL (Base64) in case of relative URL and 'inlineImages' option enabled.")
+    @Schema(description = "Relative or external image URL. Replaced with image data URL (Base64) in case of relative URL and 'inlineImages' option enabled.")
     private String image;
     @NoXss
     @Length(fieldName = "description", max = 1024)
-    @ApiModelProperty(position = 10, value = "Description of the widget")
+    @Schema(description = "Description of the widget")
     private String description;
     @NoXss
-    @ApiModelProperty(position = 11, value = "Tags of the widget type")
+    @Schema(description = "Tags of the widget type")
     private String[] tags;
 
     @Getter
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/widget/WidgetTypeInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/widget/WidgetTypeInfo.java
index 309924a6c2..1ce8ad6ddc 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/widget/WidgetTypeInfo.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/widget/WidgetTypeInfo.java
@@ -15,7 +15,7 @@
  */
 package org.thingsboard.server.common.data.widget;
 
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.thingsboard.server.common.data.id.WidgetTypeId;
 import org.thingsboard.server.common.data.validation.NoXss;
@@ -23,16 +23,16 @@ import org.thingsboard.server.common.data.validation.NoXss;
 @Data
 public class WidgetTypeInfo extends BaseWidgetType {
 
-    @ApiModelProperty(position = 8, value = "Base64 encoded widget thumbnail", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Base64 encoded widget thumbnail", accessMode = Schema.AccessMode.READ_ONLY)
     private String image;
     @NoXss
-    @ApiModelProperty(position = 9, value = "Description of the widget type", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Description of the widget type", accessMode = Schema.AccessMode.READ_ONLY)
     private String description;
     @NoXss
-    @ApiModelProperty(position = 10, value = "Tags of the widget type", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Tags of the widget type", accessMode = Schema.AccessMode.READ_ONLY)
     private String[] tags;
     @NoXss
-    @ApiModelProperty(position = 11, value = "Type of the widget (timeseries, latest, control, alarm or static)", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Type of the widget (timeseries, latest, control, alarm or static)", accessMode = Schema.AccessMode.READ_ONLY)
     private String widgetType;
 
     public WidgetTypeInfo() {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/widget/WidgetsBundle.java b/common/data/src/main/java/org/thingsboard/server/common/data/widget/WidgetsBundle.java
index 87fcfd7db4..7e75f5e58f 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/widget/WidgetsBundle.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/widget/WidgetsBundle.java
@@ -16,8 +16,7 @@
 package org.thingsboard.server.common.data.widget;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
@@ -32,7 +31,7 @@ import org.thingsboard.server.common.data.id.WidgetsBundleId;
 import org.thingsboard.server.common.data.validation.Length;
 import org.thingsboard.server.common.data.validation.NoXss;
 
-@ApiModel
+@Schema
 @EqualsAndHashCode(callSuper = true)
 public class WidgetsBundle extends BaseData<WidgetsBundleId> implements HasName, HasTenantId, ExportableEntity<WidgetsBundleId>, HasTitle, HasImage {
 
@@ -40,38 +39,38 @@ public class WidgetsBundle extends BaseData<WidgetsBundleId> implements HasName,
 
     @Getter
     @Setter
-    @ApiModelProperty(position = 3, value = "JSON object with Tenant Id.", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "JSON object with Tenant Id.", accessMode = Schema.AccessMode.READ_ONLY)
     private TenantId tenantId;
 
     @NoXss
     @Length(fieldName = "alias")
     @Getter
     @Setter
-    @ApiModelProperty(position = 4, value = "Unique alias that is used in widget types as a reference widget bundle", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Unique alias that is used in widget types as a reference widget bundle", accessMode = Schema.AccessMode.READ_ONLY)
     private String alias;
 
     @NoXss
     @Length(fieldName = "title")
     @Getter
     @Setter
-    @ApiModelProperty(position = 5, value = "Title used in search and UI", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Title used in search and UI", accessMode = Schema.AccessMode.READ_ONLY)
     private String title;
 
     @Getter
     @Setter
-    @ApiModelProperty(position = 6, value = "Relative or external image URL. Replaced with image data URL (Base64) in case of relative URL and 'inlineImages' option enabled.", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Relative or external image URL. Replaced with image data URL (Base64) in case of relative URL and 'inlineImages' option enabled.", accessMode = Schema.AccessMode.READ_ONLY)
     private String image;
 
     @NoXss
     @Length(fieldName = "description", max = 1024)
     @Getter
     @Setter
-    @ApiModelProperty(position = 7, value = "Description", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Description", accessMode = Schema.AccessMode.READ_ONLY)
     private String description;
 
     @Getter
     @Setter
-    @ApiModelProperty(position = 8, value = "Order", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Order", accessMode = Schema.AccessMode.READ_ONLY)
     private Integer order;
 
     @Getter
@@ -97,7 +96,7 @@ public class WidgetsBundle extends BaseData<WidgetsBundleId> implements HasName,
         this.externalId = widgetsBundle.getExternalId();
     }
 
-    @ApiModelProperty(position = 1, value = "JSON object with the Widget Bundle Id. " +
+    @Schema(description = "JSON object with the Widget Bundle Id. " +
             "Specify this field to update the Widget Bundle. " +
             "Referencing non-existing Widget Bundle Id will cause error. " +
             "Omit this field to create new Widget Bundle." )
@@ -106,13 +105,13 @@ public class WidgetsBundle extends BaseData<WidgetsBundleId> implements HasName,
         return super.getId();
     }
 
-    @ApiModelProperty(position = 2, value = "Timestamp of the Widget Bundle creation, in milliseconds", example = "1609459200000", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Timestamp of the Widget Bundle creation, in milliseconds", example = "1609459200000", accessMode = Schema.AccessMode.READ_ONLY)
     @Override
     public long getCreatedTime() {
         return super.getCreatedTime();
     }
 
-    @ApiModelProperty(position = 3, value = "Same as title of the Widget Bundle. Read-only field. Update the 'title' to change the 'name' of the Widget Bundle.", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @Schema(description = "Same as title of the Widget Bundle. Read-only field. Update the 'title' to change the 'name' of the Widget Bundle.", accessMode = Schema.AccessMode.READ_ONLY)
     @Override
     @JsonProperty(access = JsonProperty.Access.READ_ONLY)
     public String getName() {
diff --git a/common/data/src/test/java/org/thingsboard/server/common/data/DynamicProtoUtilsTest.java b/common/data/src/test/java/org/thingsboard/server/common/data/DynamicProtoUtilsTest.java
index 7e769cf0b1..5ea19e1338 100644
--- a/common/data/src/test/java/org/thingsboard/server/common/data/DynamicProtoUtilsTest.java
+++ b/common/data/src/test/java/org/thingsboard/server/common/data/DynamicProtoUtilsTest.java
@@ -19,18 +19,18 @@ import com.github.os72.protobuf.dynamic.DynamicSchema;
 import com.google.protobuf.Descriptors;
 import com.google.protobuf.DynamicMessage;
 import com.squareup.wire.schema.internal.parser.ProtoFileElement;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 import java.util.List;
 import java.util.Set;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class DynamicProtoUtilsTest {
 
     @Test
diff --git a/common/data/src/test/java/org/thingsboard/server/common/data/UUIDConverterTest.java b/common/data/src/test/java/org/thingsboard/server/common/data/UUIDConverterTest.java
index 8932ee47a8..909eb4c160 100644
--- a/common/data/src/test/java/org/thingsboard/server/common/data/UUIDConverterTest.java
+++ b/common/data/src/test/java/org/thingsboard/server/common/data/UUIDConverterTest.java
@@ -16,11 +16,10 @@
 package org.thingsboard.server.common.data;
 
 import com.datastax.oss.driver.api.core.uuid.Uuids;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Assertions;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 import java.util.Random;
 import java.util.UUID;
@@ -28,14 +27,14 @@ import java.util.UUID;
 /**
  * Created by ashvayka on 14.07.17.
  */
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension .class)
 public class UUIDConverterTest {
 
     @Test
     public void basicUuidToStringTest() {
         UUID original = UUID.fromString("58e0a7d7-eebc-11d8-9669-0800200c9a66");
         String result = UUIDConverter.fromTimeUUID(original);
-        Assert.assertEquals("1d8eebc58e0a7d796690800200c9a66", result);
+        Assertions.assertEquals("1d8eebc58e0a7d796690800200c9a66", result);
     }
 
 
@@ -47,13 +46,13 @@ public class UUIDConverterTest {
     @Test
     public void basicUuidConversion() {
         UUID original = UUID.fromString("3dd11790-abf2-11ea-b151-83a091b9d4cc");
-        Assert.assertEquals(Uuids.unixTimestamp(original), 1591886749577L);
+        Assertions.assertEquals(Uuids.unixTimestamp(original), 1591886749577L);
     }
 
     @Test
     public void basicStringToUUIDTest() {
         UUID result = UUIDConverter.fromString("1d8eebc58e0a7d796690800200c9a66");
-        Assert.assertEquals(UUID.fromString("58e0a7d7-eebc-11d8-9669-0800200c9a66"), result);
+        Assertions.assertEquals(UUID.fromString("58e0a7d7-eebc-11d8-9669-0800200c9a66"), result);
     }
 
     @Test
@@ -83,7 +82,7 @@ public class UUIDConverterTest {
                 System.out.println("Before: " + before + " | " + beforeStr);
                 System.out.println("After: " + after + " | " + afterStr);
             }
-            Assert.assertTrue(afterStr.compareTo(beforeStr) >= 0);
+            Assertions.assertTrue(afterStr.compareTo(beforeStr) >= 0);
         }
     }
 
diff --git a/common/data/src/test/java/org/thingsboard/server/common/data/id/EntityIdTest.java b/common/data/src/test/java/org/thingsboard/server/common/data/id/EntityIdTest.java
index 2ca15fc42d..e5f61418f8 100644
--- a/common/data/src/test/java/org/thingsboard/server/common/data/id/EntityIdTest.java
+++ b/common/data/src/test/java/org/thingsboard/server/common/data/id/EntityIdTest.java
@@ -15,14 +15,14 @@
  */
 package org.thingsboard.server.common.data.id;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 public class EntityIdTest {
 
     @Test
     public void givenConstantNullUuid_whenCompare_thenToStringEqualsPredefinedUuid() {
-        Assert.assertEquals("13814000-1dd2-11b2-8080-808080808080", EntityId.NULL_UUID.toString());
+        Assertions.assertEquals("13814000-1dd2-11b2-8080-808080808080", EntityId.NULL_UUID.toString());
     }
 
 }
\ No newline at end of file
diff --git a/common/data/src/test/resources/junit-platform.properties b/common/data/src/test/resources/junit-platform.properties
new file mode 100644
index 0000000000..f2ed301920
--- /dev/null
+++ b/common/data/src/test/resources/junit-platform.properties
@@ -0,0 +1,3 @@
+junit.jupiter.execution.parallel.enabled = true
+junit.jupiter.execution.parallel.mode.default = concurrent
+junit.jupiter.execution.parallel.mode.classes.default = concurrent
diff --git a/common/data/src/test/resources/logback-test.xml b/common/data/src/test/resources/logback-test.xml
new file mode 100644
index 0000000000..52f2a77588
--- /dev/null
+++ b/common/data/src/test/resources/logback-test.xml
@@ -0,0 +1,14 @@
+<?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>
+
+    <root level="INFO">
+        <appender-ref ref="console"/>
+    </root>
+
+</configuration>
diff --git a/common/edge-api/pom.xml b/common/edge-api/pom.xml
index 2c5f26ef55..cf3134f09b 100644
--- a/common/edge-api/pom.xml
+++ b/common/edge-api/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.6.3-SNAPSHOT</version>
+        <version>3.7.0-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>
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/message/pom.xml b/common/message/pom.xml
index 90932261b4..6f650c127b 100644
--- a/common/message/pom.xml
+++ b/common/message/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.6.3-SNAPSHOT</version>
+        <version>3.7.0-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>
@@ -42,7 +42,7 @@
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-jdk15on</artifactId>
+            <artifactId>bcprov-jdk18on</artifactId>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -61,7 +61,7 @@
             <artifactId>logback-classic</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.github.vladimir-bukhtoyarov</groupId>
+            <groupId>com.bucket4j</groupId>
             <artifactId>bucket4j-core</artifactId>
         </dependency>
         <dependency>
@@ -74,11 +74,6 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.awaitility</groupId>
             <artifactId>awaitility</artifactId>
diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/EncryptionUtil.java b/common/message/src/main/java/org/thingsboard/server/common/msg/EncryptionUtil.java
index df5a4a728c..27c9bdecf8 100644
--- a/common/message/src/main/java/org/thingsboard/server/common/msg/EncryptionUtil.java
+++ b/common/message/src/main/java/org/thingsboard/server/common/msg/EncryptionUtil.java
@@ -17,7 +17,7 @@ package org.thingsboard.server.common.msg;
 
 import lombok.extern.slf4j.Slf4j;
 import org.bouncycastle.crypto.digests.SHA3Digest;
-import org.bouncycastle.pqc.math.linearalgebra.ByteUtils;
+import org.bouncycastle.pqc.legacy.math.linearalgebra.ByteUtils;
 
 /**
  * @author Valerii Sosliuk
diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/housekeeper/HousekeeperClient.java b/common/message/src/main/java/org/thingsboard/server/common/msg/housekeeper/HousekeeperClient.java
new file mode 100644
index 0000000000..e2a3af9242
--- /dev/null
+++ b/common/message/src/main/java/org/thingsboard/server/common/msg/housekeeper/HousekeeperClient.java
@@ -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.
+ */
+package org.thingsboard.server.common.msg.housekeeper;
+
+import org.thingsboard.server.common.data.housekeeper.HousekeeperTask;
+
+public interface HousekeeperClient {
+
+    void submitTask(HousekeeperTask task);
+
+}
diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/tools/TbRateLimits.java b/common/message/src/main/java/org/thingsboard/server/common/msg/tools/TbRateLimits.java
index d93f8982c6..9ed1ac4384 100644
--- a/common/message/src/main/java/org/thingsboard/server/common/msg/tools/TbRateLimits.java
+++ b/common/message/src/main/java/org/thingsboard/server/common/msg/tools/TbRateLimits.java
@@ -16,7 +16,7 @@
 package org.thingsboard.server.common.msg.tools;
 
 import io.github.bucket4j.Bandwidth;
-import io.github.bucket4j.Bucket4j;
+import io.github.bucket4j.Bucket;
 import io.github.bucket4j.Refill;
 import io.github.bucket4j.local.LocalBucket;
 import io.github.bucket4j.local.LocalBucketBuilder;
@@ -38,7 +38,7 @@ public class TbRateLimits {
     }
 
     public TbRateLimits(String limitsConfiguration, boolean refillIntervally) {
-        LocalBucketBuilder builder = Bucket4j.builder();
+        LocalBucketBuilder builder = Bucket.builder();
         boolean initialized = false;
         for (String limitSrc : limitsConfiguration.split(",")) {
             long capacity = Long.parseLong(limitSrc.split(":")[0]);
diff --git a/common/message/src/test/java/org/thingsboard/server/common/msg/EncryptionUtilTest.java b/common/message/src/test/java/org/thingsboard/server/common/msg/EncryptionUtilTest.java
new file mode 100644
index 0000000000..d67fe74fea
--- /dev/null
+++ b/common/message/src/test/java/org/thingsboard/server/common/msg/EncryptionUtilTest.java
@@ -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.
+ */
+package org.thingsboard.server.common.msg;
+
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class EncryptionUtilTest {
+
+    @Test
+    void getSha3Hash256Size() {
+        assertThat(EncryptionUtil.getSha3Hash("ThingsBoard"))
+                .isEqualTo("281c7ba06d0ac2ff651fa968572f26a38c96225ea54644522837b54b9c6144f7");
+    }
+
+}
diff --git a/common/message/src/test/java/org/thingsboard/server/common/msg/TbMsgMetaDataTest.java b/common/message/src/test/java/org/thingsboard/server/common/msg/TbMsgMetaDataTest.java
index af63b61523..a90699ee0e 100644
--- a/common/message/src/test/java/org/thingsboard/server/common/msg/TbMsgMetaDataTest.java
+++ b/common/message/src/test/java/org/thingsboard/server/common/msg/TbMsgMetaDataTest.java
@@ -18,12 +18,12 @@ package org.thingsboard.server.common.msg;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class TbMsgMetaDataTest {
 
@@ -32,7 +32,7 @@ public class TbMsgMetaDataTest {
     private JsonNode metadataJson;
     private Map<String, String> metadataExpected;
 
-    @Before
+    @BeforeEach
     public void startInit() throws Exception {
         metadataJson = objectMapper.readValue(metadataJsonStr, JsonNode.class);
         metadataExpected = objectMapper.convertValue(metadataJson, new TypeReference<>() {
diff --git a/common/message/src/test/java/org/thingsboard/server/common/msg/TbMsgProcessingStackItemTest.java b/common/message/src/test/java/org/thingsboard/server/common/msg/TbMsgProcessingStackItemTest.java
index eae50cd6d0..565f766a7f 100644
--- a/common/message/src/test/java/org/thingsboard/server/common/msg/TbMsgProcessingStackItemTest.java
+++ b/common/message/src/test/java/org/thingsboard/server/common/msg/TbMsgProcessingStackItemTest.java
@@ -16,7 +16,7 @@
 package org.thingsboard.server.common.msg;
 
 import org.junit.jupiter.api.Test;
-import org.thingsboard.server.common.data.FSTUtils;
+import org.thingsboard.server.common.data.JavaSerDesUtil;
 import org.thingsboard.server.common.data.id.RuleChainId;
 import org.thingsboard.server.common.data.id.RuleNodeId;
 
@@ -29,8 +29,8 @@ class TbMsgProcessingStackItemTest {
     @Test
     void testSerialization() {
         TbMsgProcessingStackItem item = new TbMsgProcessingStackItem(new RuleChainId(UUID.randomUUID()), new RuleNodeId(UUID.randomUUID()));
-        byte[] bytes = FSTUtils.encode(item);
-        TbMsgProcessingStackItem itemDecoded = FSTUtils.decode(bytes);
+        byte[] bytes = JavaSerDesUtil.encode(item);
+        TbMsgProcessingStackItem itemDecoded = JavaSerDesUtil.decode(bytes);
         assertThat(item).isEqualTo(itemDecoded);
     }
 
diff --git a/common/message/src/test/java/org/thingsboard/server/common/msg/queue/TopicPartitionInfoTest.java b/common/message/src/test/java/org/thingsboard/server/common/msg/queue/TopicPartitionInfoTest.java
index 4dfdef5d19..6dc62af063 100644
--- a/common/message/src/test/java/org/thingsboard/server/common/msg/queue/TopicPartitionInfoTest.java
+++ b/common/message/src/test/java/org/thingsboard/server/common/msg/queue/TopicPartitionInfoTest.java
@@ -15,7 +15,7 @@
  */
 package org.thingsboard.server.common.msg.queue;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.thingsboard.server.common.data.id.TenantId;
 
 import static org.hamcrest.CoreMatchers.is;
diff --git a/common/message/src/test/java/org/thingsboard/server/common/msg/tools/RateLimitsTest.java b/common/message/src/test/java/org/thingsboard/server/common/msg/tools/RateLimitsTest.java
index d3fe8cbb82..0930bb89ce 100644
--- a/common/message/src/test/java/org/thingsboard/server/common/msg/tools/RateLimitsTest.java
+++ b/common/message/src/test/java/org/thingsboard/server/common/msg/tools/RateLimitsTest.java
@@ -16,7 +16,7 @@
 package org.thingsboard.server.common.msg.tools;
 
 import org.awaitility.pollinterval.FixedPollInterval;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.concurrent.TimeUnit;
 
diff --git a/common/message/src/test/resources/junit-platform.properties b/common/message/src/test/resources/junit-platform.properties
new file mode 100644
index 0000000000..f2ed301920
--- /dev/null
+++ b/common/message/src/test/resources/junit-platform.properties
@@ -0,0 +1,3 @@
+junit.jupiter.execution.parallel.enabled = true
+junit.jupiter.execution.parallel.mode.default = concurrent
+junit.jupiter.execution.parallel.mode.classes.default = concurrent
diff --git a/common/message/src/test/resources/logback-test.xml b/common/message/src/test/resources/logback-test.xml
new file mode 100644
index 0000000000..52f2a77588
--- /dev/null
+++ b/common/message/src/test/resources/logback-test.xml
@@ -0,0 +1,14 @@
+<?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>
+
+    <root level="INFO">
+        <appender-ref ref="console"/>
+    </root>
+
+</configuration>
diff --git a/common/pom.xml b/common/pom.xml
index 02a64aaa1c..b12140012d 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.6.3-SNAPSHOT</version>
+        <version>3.7.0-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <artifactId>common</artifactId>
@@ -35,6 +35,7 @@
     </properties>
     <modules>
         <module>data</module>
+        <module>proto</module>
         <module>util</module>
         <module>message</module>
         <module>actor</module>
@@ -48,7 +49,6 @@
         <module>edge-api</module>
         <module>version-control</module>
         <module>script</module>
-        <module>proto</module>
     </modules>
 
 </project>
diff --git a/common/proto/pom.xml b/common/proto/pom.xml
index e538fffe3e..06ae7293ba 100644
--- a/common/proto/pom.xml
+++ b/common/proto/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.6.3-SNAPSHOT</version>
+        <version>3.7.0-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>
@@ -44,6 +44,10 @@
             <groupId>org.thingsboard.common</groupId>
             <artifactId>message</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.thingsboard.common</groupId>
+            <artifactId>util</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.google.protobuf</groupId>
             <artifactId>protobuf-java</artifactId>
@@ -63,15 +67,16 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.awaitility</groupId>
-            <artifactId>awaitility</artifactId>
+            <groupId>org.jeasy</groupId>
+            <artifactId>easy-random-core</artifactId>
             <scope>test</scope>
         </dependency>
+
     </dependencies>
 
     <build>
@@ -91,4 +96,4 @@
         </repository>
     </distributionManagement>
 
-</project>
\ No newline at end of file
+</project>
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..7cfef02873 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) {
@@ -591,16 +590,16 @@ public class JsonConverter {
         return GSON.fromJson(element, type);
     }
 
-    public static void setTypeCastEnabled(boolean enabled) {
+    static void setTypeCastEnabled(boolean enabled) {
         isTypeCastEnabled = enabled;
     }
 
-    public static void setMaxStringValueLength(int length) {
+    static void setMaxStringValueLength(int length) {
         maxStringValueLength = length;
     }
 
     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
new file mode 100644
index 0000000000..74674e1e45
--- /dev/null
+++ b/common/proto/src/main/java/org/thingsboard/server/common/util/KvProtoUtil.java
@@ -0,0 +1,159 @@
+/**
+ * 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.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.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()) {
+            clientAttributes = Collections.emptyList();
+        } else {
+            clientAttributes = new ArrayList<>(result.size());
+            for (AttributeKvEntry attrEntry : result) {
+                clientAttributes.add(toTsKvProto(attrEntry.getLastUpdateTs(), attrEntry));
+            }
+        }
+        return clientAttributes;
+    }
+
+    public static List<TransportProtos.TsKvProto> toTsKvProtoList(List<TsKvEntry> result) {
+        List<TransportProtos.TsKvProto> ts;
+        if (result == null || result.isEmpty()) {
+            ts = Collections.emptyList();
+        } else {
+            ts = new ArrayList<>(result.size());
+            for (TsKvEntry attrEntry : result) {
+                ts.add(toTsKvProto(attrEntry.getTs(), attrEntry));
+            }
+        }
+        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.toKeyValueTypeProto(kvEntry)).build();
+    }
+
+    public static TsKvEntry fromTsKvProto(TransportProtos.TsKvProto proto) {
+        return new BasicTsKvEntry(proto.getTs(), fromTsKvProto(proto.getKv()));
+    }
+
+    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 -> 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 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 TransportProtos.TsKvProto.Builder toTsKvProtoBuilder(long ts, KvEntry kvEntry) {
+        return TransportProtos.TsKvProto.newBuilder().setTs(ts).setKv(KvProtoUtil.toKeyValueTypeProto(kvEntry));
+    }
+
+    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;
+    }
+
+    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 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 9daa9de9da..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
@@ -15,11 +15,40 @@
  */
 package org.thingsboard.server.common.util;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.google.protobuf.ByteString;
+import lombok.extern.slf4j.Slf4j;
+import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.server.common.data.ApiUsageState;
+import org.thingsboard.server.common.data.ApiUsageStateValue;
+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.EntityType;
+import org.thingsboard.server.common.data.ResourceType;
+import org.thingsboard.server.common.data.TbResource;
+import org.thingsboard.server.common.data.Tenant;
+import org.thingsboard.server.common.data.TenantProfile;
+import org.thingsboard.server.common.data.device.data.CoapDeviceTransportConfiguration;
+import org.thingsboard.server.common.data.device.data.Lwm2mDeviceTransportConfiguration;
+import org.thingsboard.server.common.data.device.data.PowerMode;
+import org.thingsboard.server.common.data.device.data.PowerSavingConfiguration;
+import org.thingsboard.server.common.data.id.ApiUsageStateId;
+import org.thingsboard.server.common.data.id.CustomerId;
+import org.thingsboard.server.common.data.id.DashboardId;
+import org.thingsboard.server.common.data.id.DeviceCredentialsId;
 import org.thingsboard.server.common.data.id.DeviceId;
+import org.thingsboard.server.common.data.id.DeviceProfileId;
 import org.thingsboard.server.common.data.id.EdgeId;
+import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.EntityIdFactory;
+import org.thingsboard.server.common.data.id.OtaPackageId;
+import org.thingsboard.server.common.data.id.RuleChainId;
+import org.thingsboard.server.common.data.id.TbResourceId;
 import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.id.TenantProfileId;
 import org.thingsboard.server.common.data.kv.AttributeKey;
 import org.thingsboard.server.common.data.kv.AttributeKvEntry;
 import org.thingsboard.server.common.data.kv.BaseAttributeKvEntry;
@@ -34,6 +63,8 @@ import org.thingsboard.server.common.data.rpc.RpcError;
 import org.thingsboard.server.common.data.rpc.ToDeviceRpcRequestBody;
 import org.thingsboard.server.common.data.security.DeviceCredentials;
 import org.thingsboard.server.common.data.security.DeviceCredentialsType;
+import org.thingsboard.server.common.data.sync.vc.RepositoryAuthMethod;
+import org.thingsboard.server.common.data.sync.vc.RepositorySettings;
 import org.thingsboard.server.common.msg.ToDeviceActorNotificationMsg;
 import org.thingsboard.server.common.msg.edge.EdgeEventUpdateMsg;
 import org.thingsboard.server.common.msg.edge.FromEdgeSyncResponse;
@@ -56,8 +87,10 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
 import java.util.UUID;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
+@Slf4j
 public class ProtoUtils {
 
     private static final EntityType[] entityTypeByProtoNumber;
@@ -225,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());
             }
@@ -401,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();
         }
@@ -474,26 +499,563 @@ 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;
     }
+
+    public static TransportProtos.DeviceProto toProto(Device device) {
+        var builder = TransportProtos.DeviceProto.newBuilder()
+                .setTenantIdMSB(device.getTenantId().getId().getMostSignificantBits())
+                .setTenantIdLSB(device.getTenantId().getId().getLeastSignificantBits())
+                .setDeviceIdMSB(device.getId().getId().getMostSignificantBits())
+                .setDeviceIdLSB(device.getId().getId().getLeastSignificantBits())
+                .setCreatedTime(device.getCreatedTime())
+                .setDeviceName(device.getName())
+                .setDeviceType(device.getType())
+                .setDeviceProfileIdMSB(device.getDeviceProfileId().getId().getMostSignificantBits())
+                .setDeviceProfileIdLSB(device.getDeviceProfileId().getId().getLeastSignificantBits());
+
+        if (isNotNull(device.getCustomerId())) {
+            builder.setCustomerIdMSB(getMsb(device.getCustomerId()))
+                    .setCustomerIdLSB(getLsb(device.getCustomerId()));
+        }
+        if (isNotNull(device.getLabel())) {
+            builder.setDeviceLabel(device.getLabel());
+        }
+        if (isNotNull(device.getAdditionalInfo())) {
+            builder.setAdditionalInfo(JacksonUtil.toString(device.getAdditionalInfo()));
+        }
+        if (isNotNull(device.getFirmwareId())) {
+            builder.setFirmwareIdMSB(getMsb(device.getFirmwareId()))
+                    .setFirmwareIdLSB(getLsb(device.getFirmwareId()));
+        }
+        if (isNotNull(device.getSoftwareId())) {
+            builder.setSoftwareIdMSB(getMsb(device.getSoftwareId()))
+                    .setSoftwareIdLSB(getLsb(device.getSoftwareId()));
+        }
+        if (isNotNull(device.getExternalId())) {
+            builder.setExternalIdMSB(getMsb(device.getExternalId()))
+                    .setExternalIdLSB(getLsb(device.getExternalId()));
+        }
+        if (isNotNull(device.getDeviceDataBytes())) {
+            builder.setDeviceData(ByteString.copyFrom(device.getDeviceDataBytes()));
+        }
+        return builder.build();
+    }
+
+    public static Device fromProto(TransportProtos.DeviceProto proto) {
+        Device device = new Device(getEntityId(proto.getDeviceIdMSB(), proto.getDeviceIdLSB(), DeviceId::new));
+        device.setCreatedTime(proto.getCreatedTime());
+        device.setTenantId(getEntityId(proto.getTenantIdMSB(), proto.getTenantIdLSB(), TenantId::new));
+        device.setName(proto.getDeviceName());
+        device.setType(proto.getDeviceType());
+        device.setDeviceProfileId(getEntityId(proto.getDeviceProfileIdMSB(), proto.getDeviceProfileIdLSB(), DeviceProfileId::new));
+        if (proto.hasCustomerIdMSB() && proto.hasCustomerIdLSB()) {
+            device.setCustomerId(getEntityId(proto.getCustomerIdMSB(), proto.getCustomerIdLSB(), CustomerId::new));
+        }
+        if (proto.hasDeviceLabel()) {
+            device.setLabel(proto.getDeviceLabel());
+        }
+        if (proto.hasAdditionalInfo()) {
+            device.setAdditionalInfo(JacksonUtil.toJsonNode(proto.getAdditionalInfo()));
+        }
+        if (proto.hasFirmwareIdMSB() && proto.hasFirmwareIdLSB()) {
+            device.setFirmwareId(getEntityId(proto.getFirmwareIdMSB(), proto.getFirmwareIdLSB(), OtaPackageId::new));
+        }
+        if (proto.hasSoftwareIdMSB() && proto.hasSoftwareIdLSB()) {
+            device.setSoftwareId(getEntityId(proto.getSoftwareIdMSB(), proto.getSoftwareIdLSB(), OtaPackageId::new));
+        }
+        if (proto.hasExternalIdMSB() && proto.hasExternalIdLSB()) {
+            device.setExternalId(getEntityId(proto.getExternalIdMSB(), proto.getExternalIdLSB(), DeviceId::new));
+        }
+        if (proto.hasDeviceData()) {
+            device.setDeviceDataBytes(proto.getDeviceData().toByteArray());
+        }
+        return device;
+    }
+
+    public static TransportProtos.DeviceProfileProto toProto(DeviceProfile deviceProfile) {
+        var builder = TransportProtos.DeviceProfileProto.newBuilder()
+                .setTenantIdMSB(getMsb(deviceProfile.getTenantId()))
+                .setTenantIdLSB(getLsb(deviceProfile.getTenantId()))
+                .setDeviceProfileIdMSB(getMsb(deviceProfile.getId()))
+                .setDeviceProfileIdLSB(getLsb(deviceProfile.getId()))
+                .setCreatedTime(deviceProfile.getCreatedTime())
+                .setName(deviceProfile.getName())
+                .setIsDefault(deviceProfile.isDefault())
+                .setType(deviceProfile.getType().name())
+                .setTransportType(deviceProfile.getTransportType().name())
+                .setProvisionType(deviceProfile.getProvisionType().name());
+
+        if (isNotNull(deviceProfile.getProfileDataBytes())) {
+            builder.setDeviceProfileData(ByteString.copyFrom(deviceProfile.getProfileDataBytes()));
+        }
+        if (isNotNull(deviceProfile.getDescription())) {
+            builder.setDescription(deviceProfile.getDescription());
+        }
+        if (isNotNull(deviceProfile.getImage())) {
+            builder.setImage(deviceProfile.getImage());
+        }
+        if (isNotNull(deviceProfile.getDefaultRuleChainId())) {
+            builder.setDefaultRuleChainIdMSB(getMsb(deviceProfile.getDefaultRuleChainId()))
+                    .setDefaultRuleChainIdLSB(getLsb(deviceProfile.getDefaultRuleChainId()));
+        }
+        if (isNotNull(deviceProfile.getDefaultDashboardId())) {
+            builder.setDefaultDashboardIdMSB(getMsb(deviceProfile.getDefaultDashboardId()))
+                    .setDefaultDashboardIdLSB(getLsb(deviceProfile.getDefaultDashboardId()));
+        }
+        if (isNotNull(deviceProfile.getDefaultQueueName())) {
+            builder.setDefaultQueueName(deviceProfile.getDefaultQueueName());
+        }
+        if (isNotNull(deviceProfile.getProvisionDeviceKey())) {
+            builder.setProvisionDeviceKey(deviceProfile.getProvisionDeviceKey());
+        }
+        if (isNotNull(deviceProfile.getFirmwareId())) {
+            builder.setFirmwareIdMSB(getMsb(deviceProfile.getFirmwareId()))
+                    .setFirmwareIdLSB(getLsb(deviceProfile.getFirmwareId()));
+        }
+        if (isNotNull(deviceProfile.getSoftwareId())) {
+            builder.setSoftwareIdMSB(getMsb(deviceProfile.getSoftwareId()))
+                    .setSoftwareIdLSB(getLsb(deviceProfile.getSoftwareId()));
+        }
+        if (isNotNull(deviceProfile.getExternalId())) {
+            builder.setExternalIdMSB(getMsb(deviceProfile.getExternalId()))
+                    .setExternalIdLSB(getLsb(deviceProfile.getExternalId()));
+        }
+        if (isNotNull(deviceProfile.getDefaultEdgeRuleChainId())) {
+            builder.setDefaultEdgeRuleChainIdMSB(getMsb(deviceProfile.getDefaultEdgeRuleChainId()))
+                    .setDefaultEdgeRuleChainIdLSB(getLsb(deviceProfile.getDefaultEdgeRuleChainId()));
+        }
+        return builder.build();
+    }
+
+    public static DeviceProfile fromProto(TransportProtos.DeviceProfileProto proto) {
+        DeviceProfile deviceProfile = new DeviceProfile(getEntityId(proto.getDeviceProfileIdMSB(), proto.getDeviceProfileIdLSB(), DeviceProfileId::new));
+        deviceProfile.setCreatedTime(proto.getCreatedTime());
+        deviceProfile.setTenantId(getEntityId(proto.getTenantIdMSB(), proto.getTenantIdLSB(), TenantId::new));
+        deviceProfile.setName(proto.getName());
+        deviceProfile.setDefault(proto.getIsDefault());
+        deviceProfile.setType(DeviceProfileType.valueOf(proto.getType()));
+        deviceProfile.setTransportType(DeviceTransportType.valueOf(proto.getTransportType()));
+        deviceProfile.setProvisionType(DeviceProfileProvisionType.valueOf(proto.getProvisionType()));
+        if (proto.hasDeviceProfileData()) {
+            deviceProfile.setProfileDataBytes(proto.getDeviceProfileData().toByteArray());
+        }
+        if (proto.hasDescription()) {
+            deviceProfile.setDescription(proto.getDescription());
+        }
+        if (proto.hasImage()) {
+            deviceProfile.setImage(proto.getImage());
+        }
+        if (proto.hasDefaultRuleChainIdMSB() && proto.hasDefaultRuleChainIdLSB()) {
+            deviceProfile.setDefaultRuleChainId(getEntityId(proto.getDefaultRuleChainIdMSB(), proto.getDefaultRuleChainIdLSB(), RuleChainId::new));
+            deviceProfile.setDefaultDashboardId(getEntityId(proto.getDefaultDashboardIdMSB(), proto.getDefaultDashboardIdLSB(), DashboardId::new));
+        }
+        if (proto.hasDefaultQueueName()) {
+            deviceProfile.setDefaultQueueName(proto.getDefaultQueueName());
+        }
+        if (proto.hasProvisionDeviceKey()) {
+            deviceProfile.setProvisionDeviceKey(proto.getProvisionDeviceKey());
+        }
+        if (proto.hasFirmwareIdMSB() && proto.hasFirmwareIdLSB()) {
+            deviceProfile.setFirmwareId(getEntityId(proto.getFirmwareIdMSB(), proto.getFirmwareIdLSB(), OtaPackageId::new));
+        }
+        if (proto.hasSoftwareIdMSB() && proto.hasSoftwareIdLSB()) {
+            deviceProfile.setSoftwareId(getEntityId(proto.getSoftwareIdMSB(), proto.getSoftwareIdLSB(), OtaPackageId::new));
+        }
+        if (proto.hasExternalIdMSB() && proto.hasExternalIdLSB()) {
+            deviceProfile.setExternalId(getEntityId(proto.getExternalIdMSB(), proto.getExternalIdLSB(), DeviceProfileId::new));
+        }
+        if (proto.hasDefaultEdgeRuleChainIdMSB() && proto.hasDefaultEdgeRuleChainIdLSB()) {
+            deviceProfile.setDefaultEdgeRuleChainId(getEntityId(proto.getDefaultEdgeRuleChainIdMSB(), proto.getDefaultEdgeRuleChainIdLSB(), RuleChainId::new));
+        }
+        return deviceProfile;
+    }
+
+    public static TransportProtos.TenantProto toProto(Tenant tenant) {
+        var builder = TransportProtos.TenantProto.newBuilder()
+                .setTenantIdMSB(getMsb(tenant.getTenantId()))
+                .setTenantIdLSB(getLsb(tenant.getTenantId()))
+                .setCreatedTime(tenant.getCreatedTime())
+                .setTenantProfileIdMSB(getMsb(tenant.getTenantProfileId()))
+                .setTenantProfileIdLSB(getLsb(tenant.getTenantProfileId()))
+                .setTitle(tenant.getTitle());
+
+        if (isNotNull(tenant.getRegion())) {
+            builder.setRegion(tenant.getRegion());
+        }
+        if (isNotNull(tenant.getCountry())) {
+            builder.setCountry(tenant.getCountry());
+        }
+        if (isNotNull(tenant.getState())) {
+            builder.setState(tenant.getState());
+        }
+        if (isNotNull(tenant.getCity())) {
+            builder.setCity(tenant.getCity());
+        }
+        if (isNotNull(tenant.getAddress())) {
+            builder.setAddress(tenant.getAddress());
+        }
+        if (isNotNull(tenant.getAddress2())) {
+            builder.setAddress2(tenant.getAddress2());
+        }
+        if (isNotNull(tenant.getZip())) {
+            builder.setZip(tenant.getZip());
+        }
+        if (isNotNull(tenant.getPhone())) {
+            builder.setPhone(tenant.getPhone());
+        }
+        if (isNotNull(tenant.getEmail())) {
+            builder.setEmail(tenant.getEmail());
+        }
+        if (isNotNull(tenant.getAdditionalInfo())) {
+            builder.setAdditionalInfo(JacksonUtil.toString(tenant.getAdditionalInfo()));
+        }
+        return builder.build();
+    }
+
+    public static Tenant fromProto(TransportProtos.TenantProto proto) {
+        Tenant tenant = new Tenant(getEntityId(proto.getTenantIdMSB(), proto.getTenantIdLSB(), TenantId::new));
+        tenant.setCreatedTime(proto.getCreatedTime());
+        tenant.setTenantProfileId(getEntityId(proto.getTenantProfileIdMSB(), proto.getTenantProfileIdLSB(), TenantProfileId::new));
+        tenant.setTitle(proto.getTitle());
+
+        if (proto.hasRegion()) {
+            tenant.setRegion(proto.getRegion());
+        }
+        if (proto.hasCountry()) {
+            tenant.setCountry(proto.getCountry());
+        }
+        if (proto.hasState()) {
+            tenant.setState(proto.getState());
+        }
+        if (proto.hasCity()) {
+            tenant.setCity(proto.getCity());
+        }
+        if (proto.hasAddress()) {
+            tenant.setAddress(proto.getAddress());
+        }
+        if (proto.hasAddress2()) {
+            tenant.setAddress2(proto.getAddress2());
+        }
+        if (proto.hasZip()) {
+            tenant.setZip(proto.getZip());
+        }
+        if (proto.hasPhone()) {
+            tenant.setPhone(proto.getPhone());
+        }
+        if (proto.hasEmail()) {
+            tenant.setEmail(proto.getEmail());
+        }
+        if (proto.hasAdditionalInfo()) {
+            tenant.setAdditionalInfo(JacksonUtil.toJsonNode(proto.getAdditionalInfo()));
+        }
+        return tenant;
+    }
+
+    public static TransportProtos.TenantProfileProto toProto(TenantProfile tenantProfile) {
+        var builder = TransportProtos.TenantProfileProto.newBuilder()
+                .setTenantProfileIdMSB(getMsb(tenantProfile.getId()))
+                .setTenantProfileIdLSB(getLsb(tenantProfile.getId()))
+                .setCreatedTime(tenantProfile.getCreatedTime())
+                .setName(tenantProfile.getName())
+                .setIsDefault(tenantProfile.isDefault())
+                .setIsolatedTbRuleEngine(tenantProfile.isIsolatedTbRuleEngine());
+
+        if (isNotNull(tenantProfile.getDescription())) {
+            builder.setDescription(tenantProfile.getDescription());
+        }
+        if (isNotNull(tenantProfile.getProfileDataBytes())) {
+            builder.setProfileData(ByteString.copyFrom(tenantProfile.getProfileDataBytes()));
+        }
+        return builder.build();
+    }
+
+    public static TenantProfile fromProto(TransportProtos.TenantProfileProto proto) {
+        TenantProfile tenantProfile = new TenantProfile(getEntityId(proto.getTenantProfileIdMSB(), proto.getTenantProfileIdLSB(), TenantProfileId::new));
+        tenantProfile.setCreatedTime(proto.getCreatedTime());
+        tenantProfile.setName(proto.getName());
+        tenantProfile.setDefault(proto.getIsDefault());
+        tenantProfile.setIsolatedTbRuleEngine(proto.getIsolatedTbRuleEngine());
+        if (proto.hasDescription()) {
+            tenantProfile.setDescription(proto.getDescription());
+        }
+        if (proto.hasProfileData()) {
+            tenantProfile.setProfileDataBytes(proto.getProfileData().toByteArray());
+        }
+        return tenantProfile;
+    }
+
+    public static TransportProtos.TbResourceProto toProto(TbResource resource) {
+        var builder = TransportProtos.TbResourceProto.newBuilder()
+                .setTenantIdMSB(getMsb(resource.getTenantId()))
+                .setTenantIdLSB(getLsb(resource.getTenantId()))
+                .setResourceIdMSB(getMsb(resource.getId()))
+                .setResourceIdLSB(getLsb(resource.getId()))
+                .setCreatedTime(resource.getCreatedTime())
+                .setTitle(resource.getTitle())
+                .setResourceType(resource.getResourceType().name())
+                .setResourceKey(resource.getResourceKey())
+                .setIsPublic(resource.isPublic())
+                .setSearchText(resource.getSearchText())
+                .setFileName(resource.getFileName());
+        if (isNotNull(resource.getPublicResourceKey())) {
+            builder.setPublicResourceKey(resource.getPublicResourceKey());
+        }
+        if (isNotNull(resource.getEtag())) {
+            builder.setEtag(resource.getEtag());
+        }
+        if (isNotNull(resource.getDescriptor())) {
+            builder.setResourceDescriptor(JacksonUtil.toString(resource.getDescriptor()));
+        }
+        if (isNotNull(resource.getExternalId())) {
+            builder.setExternalIdMSB(getMsb(resource.getExternalId()))
+                    .setExternalIdLSB(getLsb(resource.getExternalId()));
+        }
+        if (isNotNull(resource.getData())) {
+            builder.setData(ByteString.copyFrom(resource.getData()));
+        }
+        if (isNotNull(resource.getPreview())) {
+            builder.setPreview(ByteString.copyFrom(resource.getPreview()));
+        }
+        return builder.build();
+    }
+
+    public static TbResource fromProto(TransportProtos.TbResourceProto proto) {
+        TbResource resource = new TbResource(getEntityId(proto.getResourceIdMSB(), proto.getResourceIdLSB(), TbResourceId::new));
+        resource.setTenantId(getEntityId(proto.getTenantIdMSB(), proto.getTenantIdLSB(), TenantId::new));
+        resource.setCreatedTime(proto.getCreatedTime());
+        resource.setTitle(proto.getTitle());
+        resource.setResourceType(ResourceType.valueOf(proto.getResourceType()));
+        resource.setResourceKey(proto.getResourceKey());
+        resource.setPublic(proto.getIsPublic());
+        resource.setSearchText(proto.getSearchText());
+        resource.setFileName(proto.getFileName());
+        if (proto.hasPublicResourceKey()) {
+            resource.setPublicResourceKey(proto.getPublicResourceKey());
+        }
+        if (proto.hasEtag()) {
+            resource.setEtag(proto.getEtag());
+        }
+        if (proto.hasResourceDescriptor()) {
+            resource.setDescriptor(JacksonUtil.toJsonNode(proto.getResourceDescriptor()));
+        }
+        if (proto.hasExternalIdMSB() && proto.hasExternalIdLSB()) {
+            resource.setExternalId(getEntityId(proto.getExternalIdMSB(), proto.getExternalIdLSB(), TbResourceId::new));
+        }
+        if (proto.hasData()) {
+            resource.setData(proto.getData().toByteArray());
+        }
+        if (proto.hasPreview()) {
+            resource.setPreview(proto.getPreview().toByteArray());
+        }
+        return resource;
+    }
+
+    public static TransportProtos.ApiUsageStateProto toProto(ApiUsageState apiUsageState) {
+        return TransportProtos.ApiUsageStateProto.newBuilder()
+                .setTenantProfileIdMSB(getMsb(apiUsageState.getTenantId()))
+                .setTenantProfileIdLSB(getLsb(apiUsageState.getTenantId()))
+                .setApiUsageStateIdMSB(getMsb(apiUsageState.getId()))
+                .setApiUsageStateIdLSB(getLsb(apiUsageState.getId()))
+                .setCreatedTime(apiUsageState.getCreatedTime())
+                .setEntityType(toProto(apiUsageState.getEntityId().getEntityType()))
+                .setEntityIdMSB(getMsb(apiUsageState.getEntityId()))
+                .setEntityIdLSB(getLsb(apiUsageState.getEntityId()))
+                .setTransportState(apiUsageState.getTransportState().name())
+                .setDbStorageState(apiUsageState.getDbStorageState().name())
+                .setReExecState(apiUsageState.getReExecState().name())
+                .setJsExecState(apiUsageState.getJsExecState().name())
+                .setTbelExecState(apiUsageState.getTbelExecState().name())
+                .setEmailExecState(apiUsageState.getEmailExecState().name())
+                .setSmsExecState(apiUsageState.getSmsExecState().name())
+                .setAlarmExecState(apiUsageState.getAlarmExecState().name()).build();
+    }
+
+    public static ApiUsageState fromProto(TransportProtos.ApiUsageStateProto proto) {
+        ApiUsageState apiUsageState = new ApiUsageState(getEntityId(proto.getApiUsageStateIdMSB(), proto.getApiUsageStateIdLSB(), ApiUsageStateId::new));
+        apiUsageState.setTenantId(getEntityId(proto.getTenantProfileIdMSB(), proto.getTenantProfileIdLSB(), TenantId::new));
+        apiUsageState.setCreatedTime(proto.getCreatedTime());
+        apiUsageState.setEntityId(EntityIdFactory.getByTypeAndUuid(fromProto(proto.getEntityType()), new UUID(proto.getEntityIdMSB(), proto.getEntityIdLSB())));
+        apiUsageState.setTransportState(ApiUsageStateValue.valueOf(proto.getTransportState()));
+        apiUsageState.setDbStorageState(ApiUsageStateValue.valueOf(proto.getDbStorageState()));
+        apiUsageState.setReExecState(ApiUsageStateValue.valueOf(proto.getReExecState()));
+        apiUsageState.setJsExecState(ApiUsageStateValue.valueOf(proto.getJsExecState()));
+        apiUsageState.setTbelExecState(ApiUsageStateValue.valueOf(proto.getTbelExecState()));
+        apiUsageState.setEmailExecState(ApiUsageStateValue.valueOf(proto.getEmailExecState()));
+        apiUsageState.setSmsExecState(ApiUsageStateValue.valueOf(proto.getSmsExecState()));
+        apiUsageState.setAlarmExecState(ApiUsageStateValue.valueOf(proto.getAlarmExecState()));
+        return apiUsageState;
+    }
+
+    public static TransportProtos.RepositorySettingsProto toProto(RepositorySettings repositorySettings) {
+        var builder = TransportProtos.RepositorySettingsProto.newBuilder()
+                .setRepositoryUri(repositorySettings.getRepositoryUri())
+                .setAuthMethod(repositorySettings.getAuthMethod().name())
+                .setReadOnly(repositorySettings.isReadOnly())
+                .setShowMergeCommits(repositorySettings.isShowMergeCommits());
+
+        if (isNotNull(repositorySettings.getUsername())) {
+            builder.setUsername(repositorySettings.getUsername());
+        }
+        if (isNotNull(repositorySettings.getPassword())) {
+            builder.setPassword(repositorySettings.getPassword());
+        }
+        if (isNotNull(repositorySettings.getPrivateKeyFileName())) {
+            builder.setPrivateKeyFileName(repositorySettings.getPrivateKeyFileName());
+        }
+        if (isNotNull(repositorySettings.getPrivateKey())) {
+            builder.setPrivateKey(repositorySettings.getPrivateKey());
+        }
+        if (isNotNull(repositorySettings.getPrivateKeyPassword())) {
+            builder.setPrivateKeyPassword(repositorySettings.getPrivateKeyPassword());
+        }
+        if (isNotNull(repositorySettings.getDefaultBranch())) {
+            builder.setDefaultBranch(repositorySettings.getDefaultBranch());
+        }
+        return builder.build();
+    }
+
+    public static RepositorySettings fromProto(TransportProtos.RepositorySettingsProto proto) {
+        RepositorySettings repositorySettings = new RepositorySettings();
+        repositorySettings.setRepositoryUri(proto.getRepositoryUri());
+        repositorySettings.setAuthMethod(RepositoryAuthMethod.valueOf(proto.getAuthMethod()));
+        repositorySettings.setReadOnly(proto.getReadOnly());
+        repositorySettings.setShowMergeCommits(proto.getShowMergeCommits());
+        if (proto.hasUsername()) {
+            repositorySettings.setUsername(proto.getUsername());
+        }
+        if (proto.hasPassword()) {
+            repositorySettings.setPassword(proto.getPassword());
+        }
+        if (proto.hasPrivateKeyFileName()) {
+            repositorySettings.setPrivateKeyFileName(proto.getPrivateKeyFileName());
+        }
+        if (proto.hasPrivateKey()) {
+            repositorySettings.setPrivateKey(proto.getPrivateKey());
+        }
+        if (proto.hasPrivateKeyPassword()) {
+            repositorySettings.setPrivateKeyPassword(proto.getPrivateKeyPassword());
+        }
+        if (proto.hasDefaultBranch()) {
+            repositorySettings.setDefaultBranch(proto.getDefaultBranch());
+        }
+        return repositorySettings;
+    }
+
+    public static TransportProtos.DeviceCredentialsProto toProto(DeviceCredentials deviceCredentials) {
+        TransportProtos.DeviceCredentialsProto.Builder builder = TransportProtos.DeviceCredentialsProto.newBuilder()
+                .setCredentialsIdMSB(deviceCredentials.getId().getId().getMostSignificantBits())
+                .setCredentialsIdLSB(deviceCredentials.getId().getId().getLeastSignificantBits())
+                .setCreatedTime(deviceCredentials.getCreatedTime())
+                .setDeviceIdMSB(getMsb(deviceCredentials.getDeviceId()))
+                .setDeviceIdLSB(getLsb(deviceCredentials.getDeviceId()))
+                .setCredentialsId(deviceCredentials.getCredentialsId())
+                .setCredentialsType(TransportProtos.CredentialsType.valueOf(deviceCredentials.getCredentialsType().name()));
+
+        if (deviceCredentials.getCredentialsValue() != null) {
+            builder.setCredentialsValue(deviceCredentials.getCredentialsValue());
+        }
+        return builder.build();
+    }
+
+    public static DeviceCredentials fromProto(TransportProtos.DeviceCredentialsProto proto) {
+        DeviceCredentials deviceCredentials =
+                new DeviceCredentials(new DeviceCredentialsId(new UUID(proto.getCredentialsIdMSB(), proto.getCredentialsIdLSB())));
+        deviceCredentials.setCreatedTime(proto.getCreatedTime());
+        deviceCredentials.setDeviceId(getEntityId(proto.getDeviceIdMSB(), proto.getDeviceIdLSB(), DeviceId::new));
+        deviceCredentials.setCredentialsId(proto.getCredentialsId());
+        deviceCredentials.setCredentialsType(DeviceCredentialsType.valueOf(proto.getCredentialsType().name()));
+        deviceCredentials.setCredentialsValue(proto.hasCredentialsValue() ? proto.getCredentialsValue() : null);
+        return deviceCredentials;
+    }
+
+    public static <T> TransportProtos.EntityUpdateMsg toEntityUpdateProto(T entity) {
+        var builder = TransportProtos.EntityUpdateMsg.newBuilder();
+        if (entity instanceof Device) {
+            builder.setDevice(toProto((Device) entity));
+        } else if (entity instanceof DeviceProfile) {
+            builder.setDeviceProfile(toProto((DeviceProfile) entity));
+        } else if (entity instanceof Tenant) {
+            builder.setTenant(toProto((Tenant) entity));
+        } else if (entity instanceof TenantProfile) {
+            builder.setTenantProfile(toProto((TenantProfile) entity));
+        } else if (entity instanceof ApiUsageState) {
+            builder.setApiUsageState(toProto((ApiUsageState) entity));
+        } else {
+            log.warn("[{}] entity does not support toProto serialization .", entity.getClass().getSimpleName());
+        }
+        return builder.build();
+    }
+
+    public static TransportProtos.DeviceInfoProto toDeviceInfoProto(Device device) throws JsonProcessingException {
+        TransportProtos.DeviceInfoProto.Builder builder = TransportProtos.DeviceInfoProto.newBuilder()
+                .setTenantIdMSB(device.getTenantId().getId().getMostSignificantBits())
+                .setTenantIdLSB(device.getTenantId().getId().getLeastSignificantBits())
+                .setCustomerIdMSB(getMsb(device.getCustomerId()))
+                .setCustomerIdLSB(getLsb(device.getCustomerId()))
+                .setDeviceIdMSB(device.getId().getId().getMostSignificantBits())
+                .setDeviceIdLSB(device.getId().getId().getLeastSignificantBits())
+                .setDeviceName(device.getName())
+                .setDeviceType(device.getType())
+                .setDeviceProfileIdMSB(device.getDeviceProfileId().getId().getMostSignificantBits())
+                .setDeviceProfileIdLSB(device.getDeviceProfileId().getId().getLeastSignificantBits())
+                .setAdditionalInfo(JacksonUtil.toString(device.getAdditionalInfo()));
+
+        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();
+            if (powerMode != null) {
+                builder.setPowerMode(powerMode.name());
+                if (powerMode.equals(PowerMode.PSM)) {
+                    builder.setPsmActivityTimer(checkLong(psmConfiguration.getPsmActivityTimer()));
+                } else if (powerMode.equals(PowerMode.E_DRX)) {
+                    builder.setEdrxCycle(checkLong(psmConfiguration.getEdrxCycle()));
+                    builder.setPagingTransmissionWindow(checkLong(psmConfiguration.getPagingTransmissionWindow()));
+                }
+            }
+        }
+        return builder.build();
+    }
+
+    private static boolean isNotNull(Object obj) {
+        return obj != null;
+    }
+
+    private static <T extends EntityId> T getEntityId(long msb, long lsb, Function<UUID, T> entityId) {
+        return entityId.apply(new UUID(msb, lsb));
+    }
+
+    private static Long getMsb(EntityId entityId) {
+        if (isNotNull(entityId)) {
+            return entityId.getId().getMostSignificantBits();
+        }
+        return 0L;
+    }
+
+    private static Long getLsb(EntityId entityId) {
+        if (isNotNull(entityId)) {
+            return entityId.getId().getLeastSignificantBits();
+        }
+        return 0L;
+    }
+
+    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 6e33faaf69..7b2aa2fe1b 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;
 }
 
 /**
@@ -183,6 +184,142 @@ message DeviceInfoProto {
   int64 pagingTransmissionWindow = 15;
 }
 
+message DeviceProto {
+  int64 tenantIdMSB = 1;
+  int64 tenantIdLSB = 2;
+  int64 deviceIdMSB = 3;
+  int64 deviceIdLSB = 4;
+  int64 createdTime = 5;
+  string deviceName = 6;
+  optional string deviceLabel = 7;
+  string deviceType = 8;
+  optional string additionalInfo = 9;
+  int64 deviceProfileIdMSB = 10;
+  int64 deviceProfileIdLSB = 11;
+  optional int64 customerIdMSB = 12;
+  optional int64 customerIdLSB = 13;
+  optional bytes deviceData = 14;
+  optional int64 firmwareIdMSB = 15;
+  optional int64 firmwareIdLSB = 16;
+  optional int64 softwareIdMSB = 17;
+  optional int64 softwareIdLSB = 18;
+  optional int64 externalIdMSB = 19;
+  optional int64 externalIdLSB = 20;
+}
+
+message DeviceProfileProto {
+  int64 tenantIdMSB = 1;
+  int64 tenantIdLSB = 2;
+  int64 deviceProfileIdMSB = 3;
+  int64 deviceProfileIdLSB = 4;
+  int64 createdTime = 5;
+  string name = 6;
+  optional string description = 7;
+  optional string image = 8;
+  bool isDefault = 9;
+  string type = 10;
+  string transportType = 11;
+  string provisionType = 12;
+  optional int64 defaultRuleChainIdMSB = 13;
+  optional int64 defaultRuleChainIdLSB = 14;
+  optional int64 defaultDashboardIdMSB = 15;
+  optional int64 defaultDashboardIdLSB = 16;
+  optional string defaultQueueName = 17;
+  optional bytes deviceProfileData = 18;
+  optional string provisionDeviceKey = 19;
+  optional int64 firmwareIdMSB = 20;
+  optional int64 firmwareIdLSB = 21;
+  optional int64 softwareIdMSB = 22;
+  optional int64 softwareIdLSB = 23;
+  optional int64 defaultEdgeRuleChainIdMSB = 24;
+  optional int64 defaultEdgeRuleChainIdLSB = 25;
+  optional int64 externalIdMSB = 26;
+  optional int64 externalIdLSB = 27;
+}
+
+message TenantProto {
+  int64 tenantIdMSB = 1;
+  int64 tenantIdLSB = 2;
+  int64 createdTime = 3;
+  string title = 4;
+  optional string region = 5;
+  int64 tenantProfileIdMSB = 6;
+  int64 tenantProfileIdLSB = 7;
+  optional string country = 8;
+  optional string state = 9;
+  optional string city = 10;
+  optional string address = 11;
+  optional string address2 = 12;
+  optional string zip = 13;
+  optional string phone = 14;
+  optional string email = 15;
+  optional string additionalInfo = 16;
+}
+
+message TenantProfileProto {
+  int64 tenantProfileIdMSB = 1;
+  int64 tenantProfileIdLSB = 2;
+  int64 createdTime = 3;
+  string name = 4;
+  optional string description = 5;
+  bool isDefault = 6;
+  bool isolatedTbRuleEngine = 7;
+  optional bytes profileData = 8;
+}
+
+message TbResourceProto {
+  int64 tenantIdMSB = 1;
+  int64 tenantIdLSB = 2;
+  int64 resourceIdMSB = 3;
+  int64 resourceIdLSB = 4;
+  int64 createdTime = 5;
+  string title = 6;
+  string resourceType = 7;
+  string resourceKey = 8;
+  bool isPublic = 9;
+  optional string publicResourceKey = 10;
+  string searchText = 11;
+  optional string etag = 12;
+  string fileName = 13;
+  optional string resourceDescriptor = 14;
+  optional int64 externalIdMSB = 15;
+  optional int64 externalIdLSB = 16;
+  optional bytes data = 17;
+  optional bytes preview = 18;
+}
+
+message ApiUsageStateProto {
+  int64 tenantProfileIdMSB = 1;
+  int64 tenantProfileIdLSB = 2;
+  int64 apiUsageStateIdMSB = 3;
+  int64 apiUsageStateIdLSB = 4;
+  int64 createdTime = 5;
+  EntityTypeProto entityType = 6;
+  int64 entityIdMSB = 7;
+  int64 entityIdLSB = 8;
+  string transportState = 9;
+  string dbStorageState = 10;
+  string reExecState = 11;
+  string jsExecState = 12;
+  string tbelExecState = 13;
+  string emailExecState = 14;
+  string smsExecState = 15;
+  string alarmExecState = 16;
+}
+
+message RepositorySettingsProto {
+  string repositoryUri = 1;
+  string authMethod = 2;
+  optional string username = 3;
+  optional string password = 4;
+  optional string privateKeyFileName = 5;
+  optional string privateKey = 6;
+  optional string privateKeyPassword = 7;
+  optional string defaultBranch = 8;
+  bool readOnly = 9;
+  bool showMergeCommits = 10;
+}
+
 /**
  * Transport Service Messages;
  */
@@ -242,7 +379,7 @@ message ValidateBasicMqttCredRequestMsg {
 message ValidateDeviceCredentialsResponseMsg {
   DeviceInfoProto deviceInfo = 1;
   string credentialsBody = 2;
-  bytes profileBody = 3;
+  DeviceProfileProto deviceProfile = 3;
 }
 
 message GetOrCreateDeviceFromGatewayRequestMsg {
@@ -254,7 +391,7 @@ message GetOrCreateDeviceFromGatewayRequestMsg {
 
 message GetOrCreateDeviceFromGatewayResponseMsg {
   DeviceInfoProto deviceInfo = 1;
-  bytes profileBody = 2;
+  DeviceProfileProto deviceProfile = 2;
   TransportApiRequestErrorCode error = 3;
 }
 
@@ -342,7 +479,7 @@ message GetResourceRequestMsg {
 }
 
 message GetResourceResponseMsg {
-  bytes resource = 1;
+  TbResourceProto resource = 1;
 }
 
 message ValidateDeviceLwM2MCredentialsRequestMsg {
@@ -370,8 +507,11 @@ message GetDeviceProfileRequestMsg {
 
 message GetEntityProfileResponseMsg {
   string entityType = 1;
-  bytes data = 2;
-  bytes apiState = 3;
+  oneof data {
+    TenantProfileProto tenantProfile = 2;
+    DeviceProfileProto deviceProfile = 3;
+  }
+  ApiUsageStateProto apiState = 4;
 }
 
 message GetDeviceRequestMsg {
@@ -382,6 +522,7 @@ message GetDeviceRequestMsg {
 message GetDeviceResponseMsg {
   int64 deviceProfileIdMSB = 1;
   int64 deviceProfileIdLSB = 2;
+  //Json
   bytes deviceTransportConfiguration = 3;
 }
 
@@ -391,7 +532,7 @@ message GetDeviceCredentialsRequestMsg {
 }
 
 message GetDeviceCredentialsResponseMsg {
-  bytes deviceCredentialsData = 1;
+  DeviceCredentialsProto deviceCredentialsData = 1;
 }
 
 message GetSnmpDevicesRequestMsg {
@@ -405,8 +546,13 @@ message GetSnmpDevicesResponseMsg {
 }
 
 message EntityUpdateMsg {
-  string entityType = 1;
-  bytes data = 2;
+  oneof entityUpdate {
+    TenantProto tenant = 1;
+    TenantProfileProto tenantProfile = 2;
+    DeviceProto device = 3;
+    DeviceProfileProto deviceProfile = 4;
+    ApiUsageStateProto apiUsageState = 5;
+  }
 }
 
 message EntityDeleteMsg {
@@ -494,11 +640,14 @@ message ClaimDeviceMsg {
 }
 
 message DeviceCredentialsProto {
-  int64 deviceIdMSB = 1;
-  int64 deviceIdLSB = 2;
-  CredentialsType credentialsType = 3;
-  string credentialsId = 4;
-  optional string credentialsValue = 5;
+  int64 credentialsIdMSB = 1;
+  int64 credentialsIdLSB = 2;
+  int64 createdTime = 3;
+  int64 deviceIdMSB = 4;
+  int64 deviceIdLSB = 5;
+  CredentialsType credentialsType = 6;
+  string credentialsId = 7;
+  optional string credentialsValue = 8;
 }
 
 message CredentialsDataProto {
@@ -1218,7 +1367,7 @@ message ToVersionControlServiceMsg {
   int64 tenantIdLSB = 3;
   int64 requestIdMSB = 4;
   int64 requestIdLSB = 5;
-  bytes vcSettings = 6;
+  RepositorySettingsProto vcSettings = 6;
   GenericRepositoryRequestMsg initRepositoryRequest = 7;
   GenericRepositoryRequestMsg testRepositoryRequest = 8;
   GenericRepositoryRequestMsg clearRepositoryRequest = 9;
@@ -1305,21 +1454,17 @@ message ToCoreMsg {
 message ToCoreNotificationMsg {
   LocalSubscriptionServiceMsgProto toLocalSubscriptionServiceMsg = 1;
   FromDeviceRPCResponseProto fromDeviceRpcResponse = 2;
-  bytes componentLifecycleMsg = 3 [deprecated = true];
-  bytes edgeEventUpdateMsg = 4 [deprecated = true];
-  repeated QueueUpdateMsg queueUpdateMsgs = 5;
-  repeated QueueDeleteMsg queueDeleteMsgs = 6;
-  VersionControlResponseMsg vcResponseMsg = 7;
-  bytes toEdgeSyncRequestMsg = 8 [deprecated = true];
-  bytes fromEdgeSyncResponseMsg = 9 [deprecated = true];
-  SubscriptionMgrMsgProto toSubscriptionMgrMsg = 10;
-  NotificationRuleProcessorMsg notificationRuleProcessorMsg = 11;
-  ComponentLifecycleMsgProto componentLifecycle = 12;
-  CoreStartupMsg coreStartupMsg = 13;
-  EdgeEventUpdateMsgProto edgeEventUpdate = 14;
-  ToEdgeSyncRequestMsgProto toEdgeSyncRequest = 15;
-  FromEdgeSyncResponseMsgProto fromEdgeSyncResponse = 16;
-  ResourceCacheInvalidateMsg resourceCacheInvalidateMsg = 17;
+  repeated QueueUpdateMsg queueUpdateMsgs = 3;
+  repeated QueueDeleteMsg queueDeleteMsgs = 4;
+  VersionControlResponseMsg vcResponseMsg = 5;
+  SubscriptionMgrMsgProto toSubscriptionMgrMsg = 6;
+  NotificationRuleProcessorMsg notificationRuleProcessorMsg = 7;
+  ComponentLifecycleMsgProto componentLifecycle = 8;
+  CoreStartupMsg coreStartupMsg = 9;
+  EdgeEventUpdateMsgProto edgeEventUpdate = 10;
+  ToEdgeSyncRequestMsgProto toEdgeSyncRequest = 11;
+  FromEdgeSyncResponseMsgProto fromEdgeSyncResponse = 12;
+  ResourceCacheInvalidateMsg resourceCacheInvalidateMsg = 13;
 }
 
 /* Messages that are handled by ThingsBoard RuleEngine Service */
@@ -1332,7 +1477,6 @@ message ToRuleEngineMsg {
 }
 
 message ToRuleEngineNotificationMsg {
-  bytes componentLifecycleMsg = 1 [deprecated = true];
   FromDeviceRPCResponseProto fromDeviceRpcResponse = 2;
   repeated QueueUpdateMsg queueUpdateMsgs = 3;
   repeated QueueDeleteMsg queueDeleteMsgs = 4;
@@ -1418,3 +1562,16 @@ message LifecycleEventProto {
   bool success = 7;
   string error = 8;
 }
+
+message ToHousekeeperServiceMsg {
+  HousekeeperTaskProto task = 1;
+}
+
+message HousekeeperTaskProto {
+  string value = 1;
+  int64 ts = 2;
+
+  // reprocessing
+  int32 attempt = 50;
+  repeated string errors = 51;
+}
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..04f911cdf9 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
@@ -17,81 +17,87 @@ package org.thingsboard.server.common.adaptor;
 
 import com.google.gson.JsonParser;
 import com.google.gson.JsonSyntaxException;
-import org.junit.Assert;
+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.api.parallel.Isolated;
 
 import java.util.ArrayList;
 
+@Isolated("JsonConverter static settings being modified")
 public class JsonConverterTest {
 
-    private final JsonParser JSON_PARSER = new JsonParser();
-
     @BeforeEach
     public void before() {
         JsonConverter.setTypeCastEnabled(true);
     }
 
+    @AfterEach
+    public void after() {
+        //restore default state for a static class
+        JsonConverter.setTypeCastEnabled(true);
+    }
+
     @Test
     public void testParseBigDecimalAsLong() {
-        var result = JsonConverter.convertToTelemetry(JSON_PARSER.parse("{\"meterReadingDelta\": 1E+1}"), 0L);
-        Assert.assertEquals(10L, result.get(0L).get(0).getLongValue().get().longValue());
+        var result = JsonConverter.convertToTelemetry(JsonParser.parseString("{\"meterReadingDelta\": 1E+1}"), 0L);
+        Assertions.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);
-        Assert.assertEquals(10.1, result.get(0L).get(0).getDoubleValue().get(), 0.0);
+        var result = JsonConverter.convertToTelemetry(JsonParser.parseString("{\"meterReadingDelta\": 101E-1}"), 0L);
+        Assertions.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}")));
-        Assert.assertEquals(10L, result.get(0).getLongValue().get().longValue());
+        var result = new ArrayList<>(JsonConverter.convertToAttributes(JsonParser.parseString("{\"meterReadingDelta\": 1E1}")));
+        Assertions.assertEquals(10L, result.get(0).getLongValue().get().longValue());
     }
 
     @Test
     public void testParseAsDoubleWithZero() {
-        var result = JsonConverter.convertToTelemetry(JSON_PARSER.parse("{\"meterReadingDelta\": 42.0}"), 0L);
-        Assert.assertEquals(42.0, result.get(0L).get(0).getDoubleValue().get(), 0.0);
+        var result = JsonConverter.convertToTelemetry(JsonParser.parseString("{\"meterReadingDelta\": 42.0}"), 0L);
+        Assertions.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);
-        Assert.assertEquals(1.1, result.get(0L).get(0).getDoubleValue().get(), 0.0);
+        var result = JsonConverter.convertToTelemetry(JsonParser.parseString("{\"meterReadingDelta\": 1.1}"), 0L);
+        Assertions.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);
-        Assert.assertEquals(11L, result.get(0L).get(0).getLongValue().get().longValue());
+        var result = JsonConverter.convertToTelemetry(JsonParser.parseString("{\"meterReadingDelta\": 11}"), 0L);
+        Assertions.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);
-        Assert.assertEquals("99701010061400066000", result.get(0L).get(0).getStrValue().get());
+        var result = JsonConverter.convertToTelemetry(JsonParser.parseString("{\"meterReadingDelta\": 9.9701010061400066E19}"), 0L);
+        Assertions.assertEquals("99701010061400066000", result.get(0L).get(0).getStrValue().get());
     }
 
     @Test
     public void testParseBigDecimalAsStringOutOfLongRange2() {
-        var result = JsonConverter.convertToTelemetry(JSON_PARSER.parse("{\"meterReadingDelta\": 99701010061400066001}"), 0L);
-        Assert.assertEquals("99701010061400066001", result.get(0L).get(0).getStrValue().get());
+        var result = JsonConverter.convertToTelemetry(JsonParser.parseString("{\"meterReadingDelta\": 99701010061400066001}"), 0L);
+        Assertions.assertEquals("99701010061400066001", result.get(0L).get(0).getStrValue().get());
     }
 
     @Test
     public void testParseBigDecimalAsStringOutOfLongRange3() {
-        var result = JsonConverter.convertToTelemetry(JSON_PARSER.parse("{\"meterReadingDelta\": 1E19}"), 0L);
-        Assert.assertEquals("10000000000000000000", result.get(0L).get(0).getStrValue().get());
+        var result = JsonConverter.convertToTelemetry(JsonParser.parseString("{\"meterReadingDelta\": 1E19}"), 0L);
+        Assertions.assertEquals("10000000000000000000", result.get(0L).get(0).getStrValue().get());
     }
 
     @Test
     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 +105,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/proto/src/test/java/org/thingsboard/server/common/util/ProtoUtilsTest.java b/common/proto/src/test/java/org/thingsboard/server/common/util/ProtoUtilsTest.java
index 4bb98f6cd2..904e85f702 100644
--- a/common/proto/src/test/java/org/thingsboard/server/common/util/ProtoUtilsTest.java
+++ b/common/proto/src/test/java/org/thingsboard/server/common/util/ProtoUtilsTest.java
@@ -15,9 +15,25 @@
  */
 package org.thingsboard.server.common.util;
 
+import com.fasterxml.jackson.databind.JsonNode;
+import org.jeasy.random.EasyRandom;
+import org.jeasy.random.EasyRandomParameters;
 import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.server.common.data.ApiUsageState;
+import org.thingsboard.server.common.data.Device;
+import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.EntityType;
+import org.thingsboard.server.common.data.TbResource;
+import org.thingsboard.server.common.data.Tenant;
+import org.thingsboard.server.common.data.TenantProfile;
+import org.thingsboard.server.common.data.device.data.DefaultDeviceConfiguration;
+import org.thingsboard.server.common.data.device.data.DefaultDeviceTransportConfiguration;
+import org.thingsboard.server.common.data.device.data.DeviceConfiguration;
+import org.thingsboard.server.common.data.device.data.DeviceTransportConfiguration;
+import org.thingsboard.server.common.data.device.profile.DeviceProfileData;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.EdgeId;
 import org.thingsboard.server.common.data.id.EntityId;
@@ -34,6 +50,9 @@ import org.thingsboard.server.common.data.rpc.RpcError;
 import org.thingsboard.server.common.data.rpc.ToDeviceRpcRequestBody;
 import org.thingsboard.server.common.data.security.DeviceCredentials;
 import org.thingsboard.server.common.data.security.DeviceCredentialsType;
+import org.thingsboard.server.common.data.sync.vc.RepositorySettings;
+import org.thingsboard.server.common.data.tenant.profile.DefaultTenantProfileConfiguration;
+import org.thingsboard.server.common.data.tenant.profile.TenantProfileConfiguration;
 import org.thingsboard.server.common.msg.edge.EdgeEventUpdateMsg;
 import org.thingsboard.server.common.msg.edge.FromEdgeSyncResponse;
 import org.thingsboard.server.common.msg.edge.ToEdgeSyncRequest;
@@ -62,6 +81,19 @@ class ProtoUtilsTest {
     DeviceId deviceId = new DeviceId(UUID.fromString("ceebb9e5-4239-437c-a507-dc5f71f1232d"));
     EdgeId edgeId = new EdgeId(UUID.fromString("364be452-2183-459b-af93-1ddb325feac1"));
     UUID id = UUID.fromString("31a07d85-6ed5-46f8-83c0-6715cb0a8782");
+    static EasyRandom easyRandom;
+
+    @BeforeAll
+    static void init() {
+        EasyRandomParameters parameters = new EasyRandomParameters()
+                .randomize(DeviceConfiguration.class, DefaultDeviceConfiguration::new)
+                .randomize(DeviceTransportConfiguration.class, DefaultDeviceTransportConfiguration::new)
+                .randomize(JsonNode.class, JacksonUtil::newObjectNode)
+                .randomize(DeviceProfileData.class, DeviceProfileData::new)
+                .randomize(TenantProfileConfiguration.class, DefaultTenantProfileConfiguration::new)
+                .randomize(EntityId.class, () -> new DeviceId(UUID.randomUUID()));
+        easyRandom = new EasyRandom(parameters);
+    }
 
     @Test
     void protoComponentLifecycleSerialization() {
@@ -179,4 +211,54 @@ class ProtoUtilsTest {
         Assertions.assertNotNull(serializedMsg);
         assertThat(ProtoUtils.fromProto(serializedMsg)).as("deserialized").isEqualTo(msg);
     }
+
+    private static final String description = "Failed to deserialize %s, because found some new fields which absent in %sProto!!!";
+
+    @Test
+    void protoSerializationDeserializationEntities() {
+        Device expectedDevice = easyRandom.nextObject(Device.class);
+        TransportProtos.DeviceProto deviceProto = ProtoUtils.toProto(expectedDevice);
+        Device actualDevice = ProtoUtils.fromProto(deviceProto);
+        assertEqualDeserializedEntity(expectedDevice, actualDevice, "Device");
+
+        DeviceCredentials expectedCredentials = easyRandom.nextObject(DeviceCredentials.class);
+        TransportProtos.DeviceCredentialsProto credentialsProto = ProtoUtils.toProto(expectedCredentials);
+        DeviceCredentials actualCredentials = ProtoUtils.fromProto(credentialsProto);
+        assertEqualDeserializedEntity(expectedCredentials, actualCredentials, "DeviceCredentials");
+
+        DeviceProfile expectedDeviceProfile = easyRandom.nextObject(DeviceProfile.class);
+        TransportProtos.DeviceProfileProto deviceProfileProto = ProtoUtils.toProto(expectedDeviceProfile);
+        DeviceProfile actualDeviceProfile = ProtoUtils.fromProto(deviceProfileProto);
+        assertEqualDeserializedEntity(expectedDeviceProfile, actualDeviceProfile, "DeviceProfile");
+
+        Tenant expectedTenant = easyRandom.nextObject(Tenant.class);
+        TransportProtos.TenantProto tenantProto = ProtoUtils.toProto(expectedTenant);
+        Tenant actualTenant = ProtoUtils.fromProto(tenantProto);
+        assertEqualDeserializedEntity(expectedTenant, actualTenant, "Tenant");
+
+        TenantProfile expectedTenantProfile = easyRandom.nextObject(TenantProfile.class);
+        TransportProtos.TenantProfileProto tenantProfileProto = ProtoUtils.toProto(expectedTenantProfile);
+        TenantProfile actualTenantProfile = ProtoUtils.fromProto(tenantProfileProto);
+        assertEqualDeserializedEntity(expectedTenantProfile, actualTenantProfile, "TenantProfile");
+
+        TbResource expectedResource = easyRandom.nextObject(TbResource.class);
+        TransportProtos.TbResourceProto resourceProto = ProtoUtils.toProto(expectedResource);
+        TbResource actualResource = ProtoUtils.fromProto(resourceProto);
+        assertEqualDeserializedEntity(expectedResource, actualResource, "TbResource");
+
+        ApiUsageState expectedState = easyRandom.nextObject(ApiUsageState.class);
+        TransportProtos.ApiUsageStateProto stateProto = ProtoUtils.toProto(expectedState);
+        ApiUsageState actualState = ProtoUtils.fromProto(stateProto);
+        assertEqualDeserializedEntity(expectedState, actualState, "ApiUsageState");
+
+        RepositorySettings expectedSettings = easyRandom.nextObject(RepositorySettings.class);
+        TransportProtos.RepositorySettingsProto settingsProto = ProtoUtils.toProto(expectedSettings);
+        RepositorySettings actualSettings = ProtoUtils.fromProto(settingsProto);
+        assertEqualDeserializedEntity(expectedSettings, actualSettings, "RepositorySettings");
+    }
+
+    private void assertEqualDeserializedEntity(Object expected, Object actual, String entityName) {
+        assertThat(actual).as(String.format(description, entityName, entityName)).isEqualTo(expected);
+    }
+
 }
diff --git a/common/proto/src/test/resources/junit-platform.properties b/common/proto/src/test/resources/junit-platform.properties
new file mode 100644
index 0000000000..f2ed301920
--- /dev/null
+++ b/common/proto/src/test/resources/junit-platform.properties
@@ -0,0 +1,3 @@
+junit.jupiter.execution.parallel.enabled = true
+junit.jupiter.execution.parallel.mode.default = concurrent
+junit.jupiter.execution.parallel.mode.classes.default = concurrent
diff --git a/common/proto/src/test/resources/logback-test.xml b/common/proto/src/test/resources/logback-test.xml
new file mode 100644
index 0000000000..52f2a77588
--- /dev/null
+++ b/common/proto/src/test/resources/logback-test.xml
@@ -0,0 +1,14 @@
+<?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>
+
+    <root level="INFO">
+        <appender-ref ref="console"/>
+    </root>
+
+</configuration>
diff --git a/common/queue/pom.xml b/common/queue/pom.xml
index 1eb4dd6ce8..cd77d9da07 100644
--- a/common/queue/pom.xml
+++ b/common/queue/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.6.3-SNAPSHOT</version>
+        <version>3.7.0-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>
@@ -36,6 +36,10 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.thingsboard.common</groupId>
+            <artifactId>proto</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.thingsboard.common</groupId>
             <artifactId>data</artifactId>
@@ -125,11 +129,6 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.awaitility</groupId>
             <artifactId>awaitility</artifactId>
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/azure/servicebus/TbServiceBusQueueConfigs.java b/common/queue/src/main/java/org/thingsboard/server/queue/azure/servicebus/TbServiceBusQueueConfigs.java
index c0a6b5504a..093e2f2c19 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/azure/servicebus/TbServiceBusQueueConfigs.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/azure/servicebus/TbServiceBusQueueConfigs.java
@@ -21,7 +21,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.stereotype.Component;
 import org.thingsboard.server.queue.util.PropertyUtils;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import java.util.Map;
 
 @Component
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/common/AbstractTbQueueConsumerTemplate.java b/common/queue/src/main/java/org/thingsboard/server/queue/common/AbstractTbQueueConsumerTemplate.java
index 531e30b343..ac263c10c8 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/common/AbstractTbQueueConsumerTemplate.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/common/AbstractTbQueueConsumerTemplate.java
@@ -21,7 +21,7 @@ import org.thingsboard.server.common.msg.queue.TopicPartitionInfo;
 import org.thingsboard.server.queue.TbQueueConsumer;
 import org.thingsboard.server.queue.TbQueueMsg;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/common/DefaultTbQueueRequestTemplate.java b/common/queue/src/main/java/org/thingsboard/server/queue/common/DefaultTbQueueRequestTemplate.java
index 4df70551d2..b7a3db45a0 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/common/DefaultTbQueueRequestTemplate.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/common/DefaultTbQueueRequestTemplate.java
@@ -33,7 +33,7 @@ import org.thingsboard.server.queue.TbQueueMsgMetadata;
 import org.thingsboard.server.queue.TbQueueProducer;
 import org.thingsboard.server.queue.TbQueueRequestTemplate;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/discovery/DefaultTbServiceInfoProvider.java b/common/queue/src/main/java/org/thingsboard/server/queue/discovery/DefaultTbServiceInfoProvider.java
index 2dce7517bb..ddc17bb8ee 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/discovery/DefaultTbServiceInfoProvider.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/discovery/DefaultTbServiceInfoProvider.java
@@ -29,7 +29,7 @@ import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.gen.transport.TransportProtos.ServiceInfo;
 import org.thingsboard.server.queue.util.AfterContextReady;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.Arrays;
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/discovery/HashPartitionService.java b/common/queue/src/main/java/org/thingsboard/server/queue/discovery/HashPartitionService.java
index a8763c0428..e5ad2a3622 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/discovery/HashPartitionService.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/discovery/HashPartitionService.java
@@ -35,7 +35,7 @@ import org.thingsboard.server.queue.discovery.event.PartitionChangeEvent;
 import org.thingsboard.server.queue.discovery.event.ServiceListChangedEvent;
 import org.thingsboard.server.queue.util.AfterStartUp;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -512,7 +512,7 @@ public class HashPartitionService implements PartitionService {
         return tenantRoutingInfoMap.computeIfAbsent(tenantId, tenantRoutingInfoService::getRoutingInfo);
     }
 
-    private TenantId getIsolatedOrSystemTenantId(ServiceType serviceType, TenantId tenantId) {
+    protected TenantId getIsolatedOrSystemTenantId(ServiceType serviceType, TenantId tenantId) {
         return isIsolated(serviceType, tenantId) ? tenantId : TenantId.SYS_TENANT_ID;
     }
 
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/discovery/ZkDiscoveryService.java b/common/queue/src/main/java/org/thingsboard/server/queue/discovery/ZkDiscoveryService.java
index 09844bcc83..97b83fd878 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/discovery/ZkDiscoveryService.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/discovery/ZkDiscoveryService.java
@@ -43,8 +43,8 @@ import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.queue.discovery.event.OtherServiceShutdownEvent;
 import org.thingsboard.server.queue.util.AfterStartUp;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import java.util.List;
 import java.util.NoSuchElementException;
 import java.util.concurrent.ConcurrentHashMap;
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/environment/EnvironmentLogService.java b/common/queue/src/main/java/org/thingsboard/server/queue/environment/EnvironmentLogService.java
index 57b1cfa598..45508ed029 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/environment/EnvironmentLogService.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/environment/EnvironmentLogService.java
@@ -20,7 +20,7 @@ import org.apache.zookeeper.Environment;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 /**
  * Created by igor on 11/24/16.
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/housekeeper/DefaultHousekeeperClient.java b/common/queue/src/main/java/org/thingsboard/server/queue/housekeeper/DefaultHousekeeperClient.java
new file mode 100644
index 0000000000..ce5311b0e7
--- /dev/null
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/housekeeper/DefaultHousekeeperClient.java
@@ -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.
+ */
+package org.thingsboard.server.queue.housekeeper;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.server.common.data.housekeeper.HousekeeperTask;
+import org.thingsboard.server.common.data.housekeeper.HousekeeperTaskType;
+import org.thingsboard.server.common.msg.housekeeper.HousekeeperClient;
+import org.thingsboard.server.common.msg.queue.TopicPartitionInfo;
+import org.thingsboard.server.gen.transport.TransportProtos;
+import org.thingsboard.server.gen.transport.TransportProtos.ToHousekeeperServiceMsg;
+import org.thingsboard.server.queue.TbQueueCallback;
+import org.thingsboard.server.queue.TbQueueMsgMetadata;
+import org.thingsboard.server.queue.TbQueueProducer;
+import org.thingsboard.server.queue.common.TbProtoQueueMsg;
+import org.thingsboard.server.queue.provider.TbQueueProducerProvider;
+
+@Service
+@Slf4j
+public class DefaultHousekeeperClient implements HousekeeperClient {
+
+    private final HousekeeperConfig config;
+    private final TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> producer;
+    private final TopicPartitionInfo submitTpi;
+    private final TbQueueCallback submitCallback;
+
+    public DefaultHousekeeperClient(HousekeeperConfig config,
+                                    TbQueueProducerProvider producerProvider) {
+        this.config = config;
+        this.producer = producerProvider.getHousekeeperMsgProducer();
+        this.submitTpi = TopicPartitionInfo.builder().topic(producer.getDefaultTopic()).build();
+        this.submitCallback = new TbQueueCallback() {
+            @Override
+            public void onSuccess(TbQueueMsgMetadata metadata) {
+                log.trace("Submitted Housekeeper task");
+            }
+
+            @Override
+            public void onFailure(Throwable t) {
+                log.error("Failed to submit Housekeeper task", t);
+            }
+        };
+    }
+
+    @Override
+    public void submitTask(HousekeeperTask task) {
+        HousekeeperTaskType taskType = task.getTaskType();
+        if (config.getDisabledTaskTypes().contains(taskType)) {
+            log.trace("Task type {} is disabled, ignoring {}", taskType, task);
+            return;
+        }
+
+        log.debug("[{}][{}][{}] Submitting task: {}", task.getTenantId(), task.getEntityId().getEntityType(), task.getEntityId(), task);
+        /*
+         * using msg key as entity id so that msgs related to certain entity are pushed to same partition,
+         * e.g. on tenant deletion (entity id is tenant id), we need to clean up tenant entities in certain order
+         * */
+        try {
+            producer.send(submitTpi, new TbProtoQueueMsg<>(task.getEntityId().getId(), ToHousekeeperServiceMsg.newBuilder()
+                    .setTask(TransportProtos.HousekeeperTaskProto.newBuilder()
+                            .setValue(JacksonUtil.toString(task))
+                            .setTs(task.getTs())
+                            .setAttempt(0)
+                            .build())
+                    .build()), submitCallback);
+        } catch (Throwable t) {
+            log.error("Failed to submit Housekeeper task {}", task, t);
+        }
+    }
+
+}
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/housekeeper/HousekeeperConfig.java b/common/queue/src/main/java/org/thingsboard/server/queue/housekeeper/HousekeeperConfig.java
new file mode 100644
index 0000000000..4ca3776d4d
--- /dev/null
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/housekeeper/HousekeeperConfig.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.queue.housekeeper;
+
+import lombok.Getter;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.thingsboard.server.common.data.housekeeper.HousekeeperTaskType;
+
+import java.util.Set;
+
+@Component
+@Getter
+public class HousekeeperConfig {
+
+    @Value("${queue.core.housekeeper.disabled-task-types:}")
+    private Set<HousekeeperTaskType> disabledTaskTypes;
+    @Value("${queue.core.housekeeper.task-processing-timeout-ms:120000}")
+    private int taskProcessingTimeout;
+    @Value("${queue.core.housekeeper.poll-interval-ms:500}")
+    private int pollInterval;
+    @Value("${queue.core.housekeeper.task-reprocessing-delay-ms:3000}")
+    private int taskReprocessingDelay;
+    @Value("${queue.core.housekeeper.max-reprocessing-attempts:10}")
+    private int maxReprocessingAttempts;
+
+}
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/kafka/TbKafkaConsumerStatsService.java b/common/queue/src/main/java/org/thingsboard/server/queue/kafka/TbKafkaConsumerStatsService.java
index 706dbc8bed..dbc1b7b7c4 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/kafka/TbKafkaConsumerStatsService.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/kafka/TbKafkaConsumerStatsService.java
@@ -35,8 +35,8 @@ import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.msg.queue.ServiceType;
 import org.thingsboard.server.queue.discovery.PartitionService;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/kafka/TbKafkaTopicConfigs.java b/common/queue/src/main/java/org/thingsboard/server/queue/kafka/TbKafkaTopicConfigs.java
index d23d92ee26..c55d8a5b8a 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/kafka/TbKafkaTopicConfigs.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/kafka/TbKafkaTopicConfigs.java
@@ -21,7 +21,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Component;
 import org.thingsboard.server.queue.util.PropertyUtils;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import java.util.Map;
 
 @Component
@@ -43,6 +43,10 @@ public class TbKafkaTopicConfigs {
     private String fwUpdatesProperties;
     @Value("${queue.kafka.topic-properties.version-control:}")
     private String vcProperties;
+    @Value("${queue.kafka.topic-properties.housekeeper:}")
+    private String housekeeperProperties;
+    @Value("${queue.kafka.topic-properties.housekeeper-reprocessing:}")
+    private String housekeeperReprocessingProperties;
 
     @Getter
     private Map<String, String> coreConfigs;
@@ -62,6 +66,10 @@ public class TbKafkaTopicConfigs {
     private Map<String, String> fwUpdatesConfigs;
     @Getter
     private Map<String, String> vcConfigs;
+    @Getter
+    private Map<String, String> housekeeperConfigs;
+    @Getter
+    private Map<String, String> housekeeperReprocessingConfigs;
 
     @PostConstruct
     private void init() {
@@ -76,6 +84,8 @@ public class TbKafkaTopicConfigs {
         jsExecutorResponseConfigs.put(NUM_PARTITIONS_SETTING, "1");
         fwUpdatesConfigs = PropertyUtils.getProps(fwUpdatesProperties);
         vcConfigs = PropertyUtils.getProps(vcProperties);
+        housekeeperConfigs = PropertyUtils.getProps(housekeeperProperties);
+        housekeeperReprocessingConfigs = PropertyUtils.getProps(housekeeperReprocessingProperties);
     }
 
 }
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/memory/DefaultInMemoryStorage.java b/common/queue/src/main/java/org/thingsboard/server/queue/memory/DefaultInMemoryStorage.java
index 9c7dc02b4f..f46a05ca26 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/memory/DefaultInMemoryStorage.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/memory/DefaultInMemoryStorage.java
@@ -20,8 +20,10 @@ import org.springframework.stereotype.Component;
 import org.thingsboard.server.queue.TbQueueMsg;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+import java.util.Optional;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.LinkedBlockingQueue;
@@ -47,6 +49,11 @@ public final class DefaultInMemoryStorage implements InMemoryStorage {
         return storage.values().stream().map(BlockingQueue::size).reduce(0, Integer::sum);
     }
 
+    @Override
+    public int getLag(String topic) {
+        return Optional.ofNullable(storage.get(topic)).map(Collection::size).orElse(0);
+    }
+
     @Override
     public boolean put(String topic, TbQueueMsg msg) {
         return storage.computeIfAbsent(topic, (t) -> new LinkedBlockingQueue<>()).add(msg);
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/memory/InMemoryStorage.java b/common/queue/src/main/java/org/thingsboard/server/queue/memory/InMemoryStorage.java
index 0e753d1a81..81b174a0d3 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/memory/InMemoryStorage.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/memory/InMemoryStorage.java
@@ -25,6 +25,8 @@ public interface InMemoryStorage {
 
     int getLagTotal();
 
+    int getLag(String topic);
+
     boolean put(String topic, TbQueueMsg msg);
 
     <T extends TbQueueMsg> List<T> get(String topic) throws InterruptedException;
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/notification/RemoteNotificationRuleProcessor.java b/common/queue/src/main/java/org/thingsboard/server/queue/notification/RemoteNotificationRuleProcessor.java
index fbfc416648..577a49f495 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/notification/RemoteNotificationRuleProcessor.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/notification/RemoteNotificationRuleProcessor.java
@@ -20,16 +20,16 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.stereotype.Service;
+import org.thingsboard.server.common.data.JavaSerDesUtil;
 import org.thingsboard.server.common.data.notification.rule.trigger.NotificationRuleTrigger;
 import org.thingsboard.server.common.msg.notification.NotificationRuleProcessor;
 import org.thingsboard.server.common.msg.queue.ServiceType;
 import org.thingsboard.server.common.msg.queue.TopicPartitionInfo;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.queue.common.TbProtoQueueMsg;
-import org.thingsboard.server.queue.discovery.TopicService;
 import org.thingsboard.server.queue.discovery.PartitionService;
+import org.thingsboard.server.queue.discovery.TopicService;
 import org.thingsboard.server.queue.provider.TbQueueProducerProvider;
-import org.thingsboard.server.queue.util.DataDecodingEncodingService;
 
 import java.util.UUID;
 
@@ -43,7 +43,6 @@ public class RemoteNotificationRuleProcessor implements NotificationRuleProcesso
     private final TbQueueProducerProvider producerProvider;
     private final TopicService topicService;
     private final PartitionService partitionService;
-    private final DataDecodingEncodingService encodingService;
 
     @Override
     public void process(NotificationRuleTrigger trigger) {
@@ -54,7 +53,7 @@ public class RemoteNotificationRuleProcessor implements NotificationRuleProcesso
 
             log.debug("Submitting notification rule trigger: {}", trigger);
             TransportProtos.NotificationRuleProcessorMsg.Builder msg = TransportProtos.NotificationRuleProcessorMsg.newBuilder()
-                    .setTrigger(ByteString.copyFrom(encodingService.encode(trigger)));
+                    .setTrigger(ByteString.copyFrom(JavaSerDesUtil.encode(trigger)));
 
             partitionService.getAllServiceIds(ServiceType.TB_CORE).stream().findAny().ifPresent(serviceId -> {
                 TopicPartitionInfo tpi = topicService.getNotificationsTopic(ServiceType.TB_CORE, serviceId);
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/AwsSqsMonolithQueueFactory.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/AwsSqsMonolithQueueFactory.java
index 8a127384be..26ec51097f 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/AwsSqsMonolithQueueFactory.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/AwsSqsMonolithQueueFactory.java
@@ -26,6 +26,7 @@ import org.thingsboard.server.gen.js.JsInvokeProtos.RemoteJsResponse;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
+import org.thingsboard.server.gen.transport.TransportProtos.ToHousekeeperServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToOtaPackageStateServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineNotificationMsg;
@@ -54,7 +55,7 @@ import org.thingsboard.server.queue.sqs.TbAwsSqsProducerTemplate;
 import org.thingsboard.server.queue.sqs.TbAwsSqsQueueAttributes;
 import org.thingsboard.server.queue.sqs.TbAwsSqsSettings;
 
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PreDestroy;
 import java.nio.charset.StandardCharsets;
 
 @Component
@@ -226,6 +227,28 @@ public class AwsSqsMonolithQueueFactory implements TbCoreQueueFactory, TbRuleEng
         return new TbAwsSqsProducerTemplate<>(vcAdmin, sqsSettings, topicService.buildTopicName(vcSettings.getTopic()));
     }
 
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperMsgProducer() {
+        return new TbAwsSqsProducerTemplate<>(coreAdmin, sqsSettings, topicService.buildTopicName(coreSettings.getHousekeeperTopic()));
+    }
+
+    @Override
+    public TbQueueConsumer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperMsgConsumer() {
+        return new TbAwsSqsConsumerTemplate<>(coreAdmin, sqsSettings, topicService.buildTopicName(coreSettings.getHousekeeperTopic()),
+                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToHousekeeperServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
+    }
+
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperReprocessingMsgProducer() {
+        return new TbAwsSqsProducerTemplate<>(coreAdmin, sqsSettings, topicService.buildTopicName(coreSettings.getHousekeeperReprocessingTopic()));
+    }
+
+    @Override
+    public TbQueueConsumer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperReprocessingMsgConsumer() {
+        return new TbAwsSqsConsumerTemplate<>(coreAdmin, sqsSettings, topicService.buildTopicName(coreSettings.getHousekeeperReprocessingTopic()),
+                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToHousekeeperServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
+    }
+
     @PreDestroy
     private void destroy() {
         if (coreAdmin != null) {
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/AwsSqsTbCoreQueueFactory.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/AwsSqsTbCoreQueueFactory.java
index 6c69b2ec10..0c4fe824fa 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/AwsSqsTbCoreQueueFactory.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/AwsSqsTbCoreQueueFactory.java
@@ -24,6 +24,7 @@ import org.thingsboard.server.gen.js.JsInvokeProtos;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
+import org.thingsboard.server.gen.transport.TransportProtos.ToHousekeeperServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToOtaPackageStateServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineNotificationMsg;
@@ -52,7 +53,7 @@ import org.thingsboard.server.queue.sqs.TbAwsSqsProducerTemplate;
 import org.thingsboard.server.queue.sqs.TbAwsSqsQueueAttributes;
 import org.thingsboard.server.queue.sqs.TbAwsSqsSettings;
 
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PreDestroy;
 import java.nio.charset.StandardCharsets;
 
 @Component
@@ -205,6 +206,28 @@ public class AwsSqsTbCoreQueueFactory implements TbCoreQueueFactory {
         return new TbAwsSqsProducerTemplate<>(vcAdmin, sqsSettings, topicService.buildTopicName(vcSettings.getTopic()));
     }
 
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperMsgProducer() {
+        return new TbAwsSqsProducerTemplate<>(coreAdmin, sqsSettings, topicService.buildTopicName(coreSettings.getHousekeeperTopic()));
+    }
+
+    @Override
+    public TbQueueConsumer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperMsgConsumer() {
+        return new TbAwsSqsConsumerTemplate<>(coreAdmin, sqsSettings, topicService.buildTopicName(coreSettings.getHousekeeperTopic()),
+                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToHousekeeperServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
+    }
+
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperReprocessingMsgProducer() {
+        return new TbAwsSqsProducerTemplate<>(coreAdmin, sqsSettings, topicService.buildTopicName(coreSettings.getHousekeeperReprocessingTopic()));
+    }
+
+    @Override
+    public TbQueueConsumer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperReprocessingMsgConsumer() {
+        return new TbAwsSqsConsumerTemplate<>(coreAdmin, sqsSettings, topicService.buildTopicName(coreSettings.getHousekeeperReprocessingTopic()),
+                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToHousekeeperServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
+    }
+
     @PreDestroy
     private void destroy() {
         if (coreAdmin != null) {
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/AwsSqsTbRuleEngineQueueFactory.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/AwsSqsTbRuleEngineQueueFactory.java
index 6d48ceb1b6..000578333a 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/AwsSqsTbRuleEngineQueueFactory.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/AwsSqsTbRuleEngineQueueFactory.java
@@ -33,8 +33,8 @@ import org.thingsboard.server.queue.TbQueueRequestTemplate;
 import org.thingsboard.server.queue.common.DefaultTbQueueRequestTemplate;
 import org.thingsboard.server.queue.common.TbProtoJsQueueMsg;
 import org.thingsboard.server.queue.common.TbProtoQueueMsg;
-import org.thingsboard.server.queue.discovery.TopicService;
 import org.thingsboard.server.queue.discovery.TbServiceInfoProvider;
+import org.thingsboard.server.queue.discovery.TopicService;
 import org.thingsboard.server.queue.settings.TbQueueCoreSettings;
 import org.thingsboard.server.queue.settings.TbQueueRemoteJsInvokeSettings;
 import org.thingsboard.server.queue.settings.TbQueueRuleEngineSettings;
@@ -45,7 +45,7 @@ import org.thingsboard.server.queue.sqs.TbAwsSqsProducerTemplate;
 import org.thingsboard.server.queue.sqs.TbAwsSqsQueueAttributes;
 import org.thingsboard.server.queue.sqs.TbAwsSqsSettings;
 
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PreDestroy;
 import java.nio.charset.StandardCharsets;
 
 @Component
@@ -159,6 +159,10 @@ public class AwsSqsTbRuleEngineQueueFactory implements TbRuleEngineQueueFactory
         return new TbAwsSqsProducerTemplate<>(otaAdmin, sqsSettings, topicService.buildTopicName(coreSettings.getOtaPackageTopic()));
     }
 
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<TransportProtos.ToHousekeeperServiceMsg>> createHousekeeperMsgProducer() {
+        return new TbAwsSqsProducerTemplate<>(coreAdmin, sqsSettings, topicService.buildTopicName(coreSettings.getHousekeeperTopic()));
+    }
 
     @PreDestroy
     private void destroy() {
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/AwsSqsTbVersionControlQueueFactory.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/AwsSqsTbVersionControlQueueFactory.java
index 3aec2e3a39..aa79349dac 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/AwsSqsTbVersionControlQueueFactory.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/AwsSqsTbVersionControlQueueFactory.java
@@ -31,7 +31,7 @@ import org.thingsboard.server.queue.sqs.TbAwsSqsProducerTemplate;
 import org.thingsboard.server.queue.sqs.TbAwsSqsQueueAttributes;
 import org.thingsboard.server.queue.sqs.TbAwsSqsSettings;
 
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PreDestroy;
 
 @Component
 @ConditionalOnExpression("'${queue.type:null}'=='aws-sqs' && '${service.type:null}'=='tb-vc-executor'")
@@ -80,6 +80,11 @@ public class AwsSqsTbVersionControlQueueFactory implements TbVersionControlQueue
         );
     }
 
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<TransportProtos.ToHousekeeperServiceMsg>> createHousekeeperMsgProducer() {
+        return new TbAwsSqsProducerTemplate<>(coreAdmin, sqsSettings, topicService.buildTopicName(coreSettings.getHousekeeperTopic()));
+    }
+
     @PreDestroy
     private void destroy() {
         if (coreAdmin != null) {
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/AwsSqsTransportQueueFactory.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/AwsSqsTransportQueueFactory.java
index c27ad4e092..ec07847631 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/AwsSqsTransportQueueFactory.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/AwsSqsTransportQueueFactory.java
@@ -43,7 +43,7 @@ import org.thingsboard.server.queue.sqs.TbAwsSqsProducerTemplate;
 import org.thingsboard.server.queue.sqs.TbAwsSqsQueueAttributes;
 import org.thingsboard.server.queue.sqs.TbAwsSqsSettings;
 
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PreDestroy;
 
 @Component
 @ConditionalOnExpression("'${queue.type:null}'=='aws-sqs' && (('${service.type:null}'=='monolith' && '${transport.api_enabled:true}'=='true') || '${service.type:null}'=='tb-transport')")
@@ -131,6 +131,11 @@ public class AwsSqsTransportQueueFactory implements TbTransportQueueFactory {
         return new TbAwsSqsProducerTemplate<>(coreAdmin, sqsSettings, topicService.buildTopicName(coreSettings.getUsageStatsTopic()));
     }
 
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<TransportProtos.ToHousekeeperServiceMsg>> createHousekeeperMsgProducer() {
+        return new TbAwsSqsProducerTemplate<>(coreAdmin, sqsSettings, topicService.buildTopicName(coreSettings.getHousekeeperTopic()));
+    }
+
     @PreDestroy
     private void destroy() {
         if (coreAdmin != null) {
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/HousekeeperClientQueueFactory.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/HousekeeperClientQueueFactory.java
new file mode 100644
index 0000000000..79c38a04e9
--- /dev/null
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/HousekeeperClientQueueFactory.java
@@ -0,0 +1,26 @@
+/**
+ * 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.queue.provider;
+
+import org.thingsboard.server.gen.transport.TransportProtos.ToHousekeeperServiceMsg;
+import org.thingsboard.server.queue.TbQueueProducer;
+import org.thingsboard.server.queue.common.TbProtoQueueMsg;
+
+public interface HousekeeperClientQueueFactory {
+
+    TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperMsgProducer();
+
+}
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/InMemoryMonolithQueueFactory.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/InMemoryMonolithQueueFactory.java
index a681038aa9..310bc75fe4 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/InMemoryMonolithQueueFactory.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/InMemoryMonolithQueueFactory.java
@@ -160,6 +160,26 @@ public class InMemoryMonolithQueueFactory implements TbCoreQueueFactory, TbRuleE
         return new InMemoryTbQueueProducer<>(storage, topicService.buildTopicName(vcSettings.getTopic()));
     }
 
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<TransportProtos.ToHousekeeperServiceMsg>> createHousekeeperMsgProducer() {
+        return new InMemoryTbQueueProducer<>(storage, topicService.buildTopicName(coreSettings.getHousekeeperTopic()));
+    }
+
+    @Override
+    public TbQueueConsumer<TbProtoQueueMsg<TransportProtos.ToHousekeeperServiceMsg>> createHousekeeperMsgConsumer() {
+        return new InMemoryTbQueueConsumer<>(storage, topicService.buildTopicName(coreSettings.getHousekeeperTopic()));
+    }
+
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<TransportProtos.ToHousekeeperServiceMsg>> createHousekeeperReprocessingMsgProducer() {
+        return new InMemoryTbQueueProducer<>(storage, topicService.buildTopicName(coreSettings.getHousekeeperReprocessingTopic()));
+    }
+
+    @Override
+    public TbQueueConsumer<TbProtoQueueMsg<TransportProtos.ToHousekeeperServiceMsg>> createHousekeeperReprocessingMsgConsumer() {
+        return new InMemoryTbQueueConsumer<>(storage, topicService.buildTopicName(coreSettings.getHousekeeperReprocessingTopic()));
+    }
+
     @Scheduled(fixedRateString = "${queue.in_memory.stats.print-interval-ms:60000}")
     private void printInMemoryStats() {
         storage.printStats();
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/InMemoryTbTransportQueueFactory.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/InMemoryTbTransportQueueFactory.java
index f08a822466..4ee79aef60 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/InMemoryTbTransportQueueFactory.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/InMemoryTbTransportQueueFactory.java
@@ -120,4 +120,9 @@ public class InMemoryTbTransportQueueFactory implements TbTransportQueueFactory
         return new InMemoryTbQueueProducer<>(storage, topicService.buildTopicName(coreSettings.getUsageStatsTopic()));
     }
 
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<TransportProtos.ToHousekeeperServiceMsg>> createHousekeeperMsgProducer() {
+        return new InMemoryTbQueueProducer<>(storage, topicService.buildTopicName(coreSettings.getHousekeeperTopic()));
+    }
+
 }
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/KafkaMonolithQueueFactory.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/KafkaMonolithQueueFactory.java
index 3459096e08..cd09f682c6 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/KafkaMonolithQueueFactory.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/KafkaMonolithQueueFactory.java
@@ -25,6 +25,7 @@ import org.thingsboard.server.gen.js.JsInvokeProtos;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
+import org.thingsboard.server.gen.transport.TransportProtos.ToHousekeeperServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToOtaPackageStateServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineNotificationMsg;
@@ -39,8 +40,8 @@ import org.thingsboard.server.queue.TbQueueRequestTemplate;
 import org.thingsboard.server.queue.common.DefaultTbQueueRequestTemplate;
 import org.thingsboard.server.queue.common.TbProtoJsQueueMsg;
 import org.thingsboard.server.queue.common.TbProtoQueueMsg;
-import org.thingsboard.server.queue.discovery.TopicService;
 import org.thingsboard.server.queue.discovery.TbServiceInfoProvider;
+import org.thingsboard.server.queue.discovery.TopicService;
 import org.thingsboard.server.queue.kafka.TbKafkaAdmin;
 import org.thingsboard.server.queue.kafka.TbKafkaConsumerStatsService;
 import org.thingsboard.server.queue.kafka.TbKafkaConsumerTemplate;
@@ -54,7 +55,7 @@ import org.thingsboard.server.queue.settings.TbQueueTransportApiSettings;
 import org.thingsboard.server.queue.settings.TbQueueTransportNotificationSettings;
 import org.thingsboard.server.queue.settings.TbQueueVersionControlSettings;
 
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PreDestroy;
 import java.nio.charset.StandardCharsets;
 import java.util.concurrent.atomic.AtomicLong;
 
@@ -82,6 +83,8 @@ public class KafkaMonolithQueueFactory implements TbCoreQueueFactory, TbRuleEngi
     private final TbQueueAdmin notificationAdmin;
     private final TbQueueAdmin fwUpdatesAdmin;
     private final TbQueueAdmin vcAdmin;
+    private final TbQueueAdmin housekeeperAdmin;
+    private final TbQueueAdmin housekeeperReprocessingAdmin;
 
     private final AtomicLong consumerCount = new AtomicLong();
 
@@ -115,6 +118,8 @@ public class KafkaMonolithQueueFactory implements TbCoreQueueFactory, TbRuleEngi
         this.notificationAdmin = new TbKafkaAdmin(kafkaSettings, kafkaTopicConfigs.getNotificationsConfigs());
         this.fwUpdatesAdmin = new TbKafkaAdmin(kafkaSettings, kafkaTopicConfigs.getFwUpdatesConfigs());
         this.vcAdmin = new TbKafkaAdmin(kafkaSettings, kafkaTopicConfigs.getVcConfigs());
+        this.housekeeperAdmin = new TbKafkaAdmin(kafkaSettings, kafkaTopicConfigs.getHousekeeperConfigs());
+        this.housekeeperReprocessingAdmin = new TbKafkaAdmin(kafkaSettings, kafkaTopicConfigs.getHousekeeperReprocessingConfigs());
     }
 
     @Override
@@ -346,6 +351,52 @@ public class KafkaMonolithQueueFactory implements TbCoreQueueFactory, TbRuleEngi
         return requestBuilder.build();
     }
 
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperMsgProducer() {
+        return TbKafkaProducerTemplate.<TbProtoQueueMsg<ToHousekeeperServiceMsg>>builder()
+                .settings(kafkaSettings)
+                .clientId("monolith-housekeeper-producer-" + serviceInfoProvider.getServiceId())
+                .defaultTopic(topicService.buildTopicName(coreSettings.getHousekeeperTopic()))
+                .admin(housekeeperAdmin)
+                .build();
+    }
+
+    @Override
+    public TbQueueConsumer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperMsgConsumer() {
+        return TbKafkaConsumerTemplate.<TbProtoQueueMsg<ToHousekeeperServiceMsg>>builder()
+                .settings(kafkaSettings)
+                .topic(topicService.buildTopicName(coreSettings.getHousekeeperTopic()))
+                .clientId("monolith-housekeeper-consumer-" + serviceInfoProvider.getServiceId())
+                .groupId(topicService.buildTopicName("monolith-housekeeper-consumer"))
+                .decoder(msg -> new TbProtoQueueMsg<>(msg.getKey(), ToHousekeeperServiceMsg.parseFrom(msg.getData()), msg.getHeaders()))
+                .admin(housekeeperAdmin)
+                .statsService(consumerStatsService)
+                .build();
+    }
+
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperReprocessingMsgProducer() {
+        return TbKafkaProducerTemplate.<TbProtoQueueMsg<ToHousekeeperServiceMsg>>builder()
+                .settings(kafkaSettings)
+                .clientId("monolith-housekeeper-reprocessing-producer-" + serviceInfoProvider.getServiceId())
+                .defaultTopic(topicService.buildTopicName(coreSettings.getHousekeeperReprocessingTopic()))
+                .admin(housekeeperReprocessingAdmin)
+                .build();
+    }
+
+    @Override
+    public TbQueueConsumer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperReprocessingMsgConsumer() {
+        return TbKafkaConsumerTemplate.<TbProtoQueueMsg<ToHousekeeperServiceMsg>>builder()
+                .settings(kafkaSettings)
+                .topic(topicService.buildTopicName(coreSettings.getHousekeeperReprocessingTopic()))
+                .clientId("monolith-housekeeper-reprocessing-consumer-" + serviceInfoProvider.getServiceId())
+                .groupId(topicService.buildTopicName("monolith-housekeeper-reprocessing-consumer"))
+                .decoder(msg -> new TbProtoQueueMsg<>(msg.getKey(), ToHousekeeperServiceMsg.parseFrom(msg.getData()), msg.getHeaders()))
+                .admin(housekeeperReprocessingAdmin)
+                .statsService(consumerStatsService)
+                .build();
+    }
+
     @PreDestroy
     private void destroy() {
         if (coreAdmin != null) {
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/KafkaTbCoreQueueFactory.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/KafkaTbCoreQueueFactory.java
index 1852693304..95fea30d7b 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/KafkaTbCoreQueueFactory.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/KafkaTbCoreQueueFactory.java
@@ -23,6 +23,7 @@ import org.thingsboard.server.common.msg.queue.ServiceType;
 import org.thingsboard.server.gen.js.JsInvokeProtos;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
+import org.thingsboard.server.gen.transport.TransportProtos.ToHousekeeperServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToOtaPackageStateServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineNotificationMsg;
@@ -38,8 +39,8 @@ import org.thingsboard.server.queue.TbQueueRequestTemplate;
 import org.thingsboard.server.queue.common.DefaultTbQueueRequestTemplate;
 import org.thingsboard.server.queue.common.TbProtoJsQueueMsg;
 import org.thingsboard.server.queue.common.TbProtoQueueMsg;
-import org.thingsboard.server.queue.discovery.TopicService;
 import org.thingsboard.server.queue.discovery.TbServiceInfoProvider;
+import org.thingsboard.server.queue.discovery.TopicService;
 import org.thingsboard.server.queue.kafka.TbKafkaAdmin;
 import org.thingsboard.server.queue.kafka.TbKafkaConsumerStatsService;
 import org.thingsboard.server.queue.kafka.TbKafkaConsumerTemplate;
@@ -53,7 +54,7 @@ import org.thingsboard.server.queue.settings.TbQueueTransportApiSettings;
 import org.thingsboard.server.queue.settings.TbQueueTransportNotificationSettings;
 import org.thingsboard.server.queue.settings.TbQueueVersionControlSettings;
 
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PreDestroy;
 import java.nio.charset.StandardCharsets;
 
 @Component
@@ -80,6 +81,8 @@ public class KafkaTbCoreQueueFactory implements TbCoreQueueFactory {
     private final TbQueueAdmin notificationAdmin;
     private final TbQueueAdmin fwUpdatesAdmin;
     private final TbQueueAdmin vcAdmin;
+    private final TbQueueAdmin housekeeperAdmin;
+    private final TbQueueAdmin housekeeperReprocessingAdmin;
 
     public KafkaTbCoreQueueFactory(TopicService topicService,
                                    TbKafkaSettings kafkaSettings,
@@ -112,6 +115,8 @@ public class KafkaTbCoreQueueFactory implements TbCoreQueueFactory {
         this.notificationAdmin = new TbKafkaAdmin(kafkaSettings, kafkaTopicConfigs.getNotificationsConfigs());
         this.fwUpdatesAdmin = new TbKafkaAdmin(kafkaSettings, kafkaTopicConfigs.getFwUpdatesConfigs());
         this.vcAdmin = new TbKafkaAdmin(kafkaSettings, kafkaTopicConfigs.getVcConfigs());
+        this.housekeeperAdmin = new TbKafkaAdmin(kafkaSettings, kafkaTopicConfigs.getHousekeeperConfigs());
+        this.housekeeperReprocessingAdmin = new TbKafkaAdmin(kafkaSettings, kafkaTopicConfigs.getHousekeeperReprocessingConfigs());
     }
 
     @Override
@@ -303,6 +308,53 @@ public class KafkaTbCoreQueueFactory implements TbCoreQueueFactory {
         return requestBuilder.build();
     }
 
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperMsgProducer() {
+        return TbKafkaProducerTemplate.<TbProtoQueueMsg<ToHousekeeperServiceMsg>>builder()
+                .settings(kafkaSettings)
+                .clientId("tb-core-housekeeper-producer-" + serviceInfoProvider.getServiceId())
+                .defaultTopic(topicService.buildTopicName(coreSettings.getHousekeeperTopic()))
+                .admin(housekeeperAdmin)
+                .build();
+    }
+
+    @Override
+    public TbQueueConsumer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperMsgConsumer() {
+        return TbKafkaConsumerTemplate.<TbProtoQueueMsg<ToHousekeeperServiceMsg>>builder()
+                .settings(kafkaSettings)
+                .topic(topicService.buildTopicName(coreSettings.getHousekeeperTopic()))
+                .clientId("tb-core-housekeeper-consumer-" + serviceInfoProvider.getServiceId())
+                .groupId(topicService.buildTopicName("tb-core-housekeeper-consumer"))
+                .decoder(msg -> new TbProtoQueueMsg<>(msg.getKey(), ToHousekeeperServiceMsg.parseFrom(msg.getData()), msg.getHeaders()))
+                .admin(housekeeperAdmin)
+                .statsService(consumerStatsService)
+                .build();
+    }
+
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperReprocessingMsgProducer() {
+        return TbKafkaProducerTemplate.<TbProtoQueueMsg<ToHousekeeperServiceMsg>>builder()
+                .settings(kafkaSettings)
+                .clientId("tb-core-housekeeper-reprocessing-producer-" + serviceInfoProvider.getServiceId())
+                .defaultTopic(topicService.buildTopicName(coreSettings.getHousekeeperReprocessingTopic()))
+                .admin(housekeeperReprocessingAdmin)
+                .build();
+    }
+
+    @Override
+    public TbQueueConsumer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperReprocessingMsgConsumer() {
+        return TbKafkaConsumerTemplate.<TbProtoQueueMsg<ToHousekeeperServiceMsg>>builder()
+                .settings(kafkaSettings)
+                .topic(topicService.buildTopicName(coreSettings.getHousekeeperReprocessingTopic()))
+                .clientId("tb-core-housekeeper-reprocessing-consumer-" + serviceInfoProvider.getServiceId())
+                .groupId(topicService.buildTopicName("tb-core-housekeeper-reprocessing-consumer"))
+                .decoder(msg -> new TbProtoQueueMsg<>(msg.getKey(), ToHousekeeperServiceMsg.parseFrom(msg.getData()), msg.getHeaders()))
+                .admin(housekeeperReprocessingAdmin)
+                .statsService(consumerStatsService)
+                .build();
+    }
+
+
     @PreDestroy
     private void destroy() {
         if (coreAdmin != null) {
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/KafkaTbRuleEngineQueueFactory.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/KafkaTbRuleEngineQueueFactory.java
index 63798f95a1..568380d7b5 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/KafkaTbRuleEngineQueueFactory.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/KafkaTbRuleEngineQueueFactory.java
@@ -25,6 +25,7 @@ import org.thingsboard.server.gen.js.JsInvokeProtos;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
+import org.thingsboard.server.gen.transport.TransportProtos.ToHousekeeperServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineNotificationMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToTransportMsg;
@@ -49,7 +50,7 @@ import org.thingsboard.server.queue.settings.TbQueueRemoteJsInvokeSettings;
 import org.thingsboard.server.queue.settings.TbQueueRuleEngineSettings;
 import org.thingsboard.server.queue.settings.TbQueueTransportNotificationSettings;
 
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PreDestroy;
 import java.nio.charset.StandardCharsets;
 import java.util.concurrent.atomic.AtomicLong;
 
@@ -72,6 +73,7 @@ public class KafkaTbRuleEngineQueueFactory implements TbRuleEngineQueueFactory {
     private final TbQueueAdmin jsExecutorResponseAdmin;
     private final TbQueueAdmin notificationAdmin;
     private final TbQueueAdmin fwUpdatesAdmin;
+    private final TbQueueAdmin housekeeperAdmin;
     private final AtomicLong consumerCount = new AtomicLong();
 
     public KafkaTbRuleEngineQueueFactory(TopicService topicService, TbKafkaSettings kafkaSettings,
@@ -97,6 +99,7 @@ public class KafkaTbRuleEngineQueueFactory implements TbRuleEngineQueueFactory {
         this.jsExecutorResponseAdmin = new TbKafkaAdmin(kafkaSettings, kafkaTopicConfigs.getJsExecutorResponseConfigs());
         this.notificationAdmin = new TbKafkaAdmin(kafkaSettings, kafkaTopicConfigs.getNotificationsConfigs());
         this.fwUpdatesAdmin = new TbKafkaAdmin(kafkaSettings, kafkaTopicConfigs.getFwUpdatesConfigs());
+        this.housekeeperAdmin = new TbKafkaAdmin(kafkaSettings, kafkaTopicConfigs.getHousekeeperConfigs());
     }
 
     @Override
@@ -230,6 +233,16 @@ public class KafkaTbRuleEngineQueueFactory implements TbRuleEngineQueueFactory {
         return requestBuilder.build();
     }
 
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperMsgProducer() {
+        return TbKafkaProducerTemplate.<TbProtoQueueMsg<ToHousekeeperServiceMsg>>builder()
+                .settings(kafkaSettings)
+                .clientId("tb-rule-engine-housekeeper-producer-" + serviceInfoProvider.getServiceId())
+                .defaultTopic(topicService.buildTopicName(coreSettings.getHousekeeperTopic()))
+                .admin(housekeeperAdmin)
+                .build();
+    }
+
     @PreDestroy
     private void destroy() {
         if (coreAdmin != null) {
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/KafkaTbTransportQueueFactory.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/KafkaTbTransportQueueFactory.java
index 7cecc94290..40904c7c65 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/KafkaTbTransportQueueFactory.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/KafkaTbTransportQueueFactory.java
@@ -21,6 +21,7 @@ import org.springframework.stereotype.Component;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
+import org.thingsboard.server.gen.transport.TransportProtos.ToHousekeeperServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToTransportMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToUsageStatsServiceMsg;
@@ -45,7 +46,7 @@ import org.thingsboard.server.queue.settings.TbQueueRuleEngineSettings;
 import org.thingsboard.server.queue.settings.TbQueueTransportApiSettings;
 import org.thingsboard.server.queue.settings.TbQueueTransportNotificationSettings;
 
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PreDestroy;
 
 @Component
 @ConditionalOnExpression("'${queue.type:null}'=='kafka' && (('${service.type:null}'=='monolith' && '${transport.api_enabled:true}'=='true') || '${service.type:null}'=='tb-transport')")
@@ -66,6 +67,7 @@ public class KafkaTbTransportQueueFactory implements TbTransportQueueFactory {
     private final TbQueueAdmin transportApiRequestAdmin;
     private final TbQueueAdmin transportApiResponseAdmin;
     private final TbQueueAdmin notificationAdmin;
+    private final TbQueueAdmin housekeeperAdmin;
 
     public KafkaTbTransportQueueFactory(TbKafkaSettings kafkaSettings,
                                         TbServiceInfoProvider serviceInfoProvider,
@@ -90,6 +92,7 @@ public class KafkaTbTransportQueueFactory implements TbTransportQueueFactory {
         this.transportApiRequestAdmin = new TbKafkaAdmin(kafkaSettings, kafkaTopicConfigs.getTransportApiRequestConfigs());
         this.transportApiResponseAdmin = new TbKafkaAdmin(kafkaSettings, kafkaTopicConfigs.getTransportApiResponseConfigs());
         this.notificationAdmin = new TbKafkaAdmin(kafkaSettings, kafkaTopicConfigs.getNotificationsConfigs());
+        this.housekeeperAdmin = new TbKafkaAdmin(kafkaSettings, kafkaTopicConfigs.getHousekeeperConfigs());
     }
 
     @Override
@@ -173,6 +176,16 @@ public class KafkaTbTransportQueueFactory implements TbTransportQueueFactory {
         return requestBuilder.build();
     }
 
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperMsgProducer() {
+        return TbKafkaProducerTemplate.<TbProtoQueueMsg<ToHousekeeperServiceMsg>>builder()
+                .settings(kafkaSettings)
+                .clientId("tb-transport-housekeeper-producer-" + serviceInfoProvider.getServiceId())
+                .defaultTopic(topicService.buildTopicName(coreSettings.getHousekeeperTopic()))
+                .admin(housekeeperAdmin)
+                .build();
+    }
+
     @PreDestroy
     private void destroy() {
         if (coreAdmin != null) {
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/KafkaTbVersionControlQueueFactory.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/KafkaTbVersionControlQueueFactory.java
index e39da6bdfc..c6633b030c 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/KafkaTbVersionControlQueueFactory.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/KafkaTbVersionControlQueueFactory.java
@@ -17,7 +17,9 @@ package org.thingsboard.server.queue.provider;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.stereotype.Component;
+import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
+import org.thingsboard.server.gen.transport.TransportProtos.ToHousekeeperServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToUsageStatsServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToVersionControlServiceMsg;
 import org.thingsboard.server.queue.TbQueueAdmin;
@@ -35,7 +37,7 @@ import org.thingsboard.server.queue.kafka.TbKafkaTopicConfigs;
 import org.thingsboard.server.queue.settings.TbQueueCoreSettings;
 import org.thingsboard.server.queue.settings.TbQueueVersionControlSettings;
 
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PreDestroy;
 
 @Component
 @ConditionalOnExpression("'${queue.type:null}'=='kafka' && '${service.type:null}'=='tb-vc-executor'")
@@ -51,6 +53,7 @@ public class KafkaTbVersionControlQueueFactory implements TbVersionControlQueueF
     private final TbQueueAdmin coreAdmin;
     private final TbQueueAdmin vcAdmin;
     private final TbQueueAdmin notificationAdmin;
+    private final TbQueueAdmin housekeeperAdmin;
 
     public KafkaTbVersionControlQueueFactory(TbKafkaSettings kafkaSettings,
                                              TbServiceInfoProvider serviceInfoProvider,
@@ -69,6 +72,7 @@ public class KafkaTbVersionControlQueueFactory implements TbVersionControlQueueF
         this.coreAdmin = new TbKafkaAdmin(kafkaSettings, kafkaTopicConfigs.getCoreConfigs());
         this.vcAdmin = new TbKafkaAdmin(kafkaSettings, kafkaTopicConfigs.getVcConfigs());
         this.notificationAdmin = new TbKafkaAdmin(kafkaSettings, kafkaTopicConfigs.getNotificationsConfigs());
+        this.housekeeperAdmin = new TbKafkaAdmin(kafkaSettings, kafkaTopicConfigs.getHousekeeperConfigs());
     }
 
 
@@ -105,6 +109,16 @@ public class KafkaTbVersionControlQueueFactory implements TbVersionControlQueueF
         return requestBuilder.build();
     }
 
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperMsgProducer() {
+        return TbKafkaProducerTemplate.<TbProtoQueueMsg<ToHousekeeperServiceMsg>>builder()
+                .settings(kafkaSettings)
+                .clientId("tb-vc-housekeeper-producer-" + serviceInfoProvider.getServiceId())
+                .defaultTopic(topicService.buildTopicName(coreSettings.getHousekeeperTopic()))
+                .admin(housekeeperAdmin)
+                .build();
+    }
+
     @PreDestroy
     private void destroy() {
         if (coreAdmin != null) {
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 62fe40f853..a3734daa91 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
@@ -26,6 +26,7 @@ import org.thingsboard.server.gen.js.JsInvokeProtos.RemoteJsResponse;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
+import org.thingsboard.server.gen.transport.TransportProtos.ToHousekeeperServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToOtaPackageStateServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineNotificationMsg;
@@ -40,8 +41,8 @@ import org.thingsboard.server.queue.TbQueueRequestTemplate;
 import org.thingsboard.server.queue.common.DefaultTbQueueRequestTemplate;
 import org.thingsboard.server.queue.common.TbProtoJsQueueMsg;
 import org.thingsboard.server.queue.common.TbProtoQueueMsg;
-import org.thingsboard.server.queue.discovery.TopicService;
 import org.thingsboard.server.queue.discovery.TbServiceInfoProvider;
+import org.thingsboard.server.queue.discovery.TopicService;
 import org.thingsboard.server.queue.pubsub.TbPubSubAdmin;
 import org.thingsboard.server.queue.pubsub.TbPubSubConsumerTemplate;
 import org.thingsboard.server.queue.pubsub.TbPubSubProducerTemplate;
@@ -54,7 +55,7 @@ import org.thingsboard.server.queue.settings.TbQueueTransportApiSettings;
 import org.thingsboard.server.queue.settings.TbQueueTransportNotificationSettings;
 import org.thingsboard.server.queue.settings.TbQueueVersionControlSettings;
 
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PreDestroy;
 import java.nio.charset.StandardCharsets;
 
 @Component
@@ -109,40 +110,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 +156,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 +169,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 +203,51 @@ 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()));
+    }
+
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperMsgProducer() {
+        return new TbPubSubProducerTemplate<>(coreAdmin, pubSubSettings, topicService.buildTopicName(coreSettings.getHousekeeperTopic()));
+    }
+
+    @Override
+    public TbQueueConsumer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperMsgConsumer() {
+        return new TbPubSubConsumerTemplate<>(coreAdmin, pubSubSettings, topicService.buildTopicName(coreSettings.getHousekeeperTopic()),
+                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToHousekeeperServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
+    }
+
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperReprocessingMsgProducer() {
+        return new TbPubSubProducerTemplate<>(coreAdmin, pubSubSettings, topicService.buildTopicName(coreSettings.getHousekeeperReprocessingTopic()));
+    }
+
+    @Override
+    public TbQueueConsumer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperReprocessingMsgConsumer() {
+        return new TbPubSubConsumerTemplate<>(coreAdmin, pubSubSettings, topicService.buildTopicName(coreSettings.getHousekeeperReprocessingTopic()),
+                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToHousekeeperServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
     }
 
     @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 0e7e1ba241..c48559467d 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
@@ -24,6 +24,7 @@ import org.thingsboard.server.gen.js.JsInvokeProtos;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
+import org.thingsboard.server.gen.transport.TransportProtos.ToHousekeeperServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToOtaPackageStateServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineNotificationMsg;
@@ -38,8 +39,8 @@ import org.thingsboard.server.queue.TbQueueRequestTemplate;
 import org.thingsboard.server.queue.common.DefaultTbQueueRequestTemplate;
 import org.thingsboard.server.queue.common.TbProtoJsQueueMsg;
 import org.thingsboard.server.queue.common.TbProtoQueueMsg;
-import org.thingsboard.server.queue.discovery.TopicService;
 import org.thingsboard.server.queue.discovery.TbServiceInfoProvider;
+import org.thingsboard.server.queue.discovery.TopicService;
 import org.thingsboard.server.queue.pubsub.TbPubSubAdmin;
 import org.thingsboard.server.queue.pubsub.TbPubSubConsumerTemplate;
 import org.thingsboard.server.queue.pubsub.TbPubSubProducerTemplate;
@@ -51,7 +52,7 @@ import org.thingsboard.server.queue.settings.TbQueueRuleEngineSettings;
 import org.thingsboard.server.queue.settings.TbQueueTransportApiSettings;
 import org.thingsboard.server.queue.settings.TbQueueTransportNotificationSettings;
 
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PreDestroy;
 import java.nio.charset.StandardCharsets;
 
 @Component
@@ -100,32 +101,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 +139,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 +173,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
@@ -198,6 +199,28 @@ public class PubSubTbCoreQueueFactory implements TbCoreQueueFactory {
         return null;
     }
 
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperMsgProducer() {
+        return new TbPubSubProducerTemplate<>(coreAdmin, pubSubSettings, topicService.buildTopicName(coreSettings.getHousekeeperTopic()));
+    }
+
+    @Override
+    public TbQueueConsumer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperMsgConsumer() {
+        return new TbPubSubConsumerTemplate<>(coreAdmin, pubSubSettings, topicService.buildTopicName(coreSettings.getHousekeeperTopic()),
+                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToHousekeeperServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
+    }
+
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperReprocessingMsgProducer() {
+        return new TbPubSubProducerTemplate<>(coreAdmin, pubSubSettings, topicService.buildTopicName(coreSettings.getHousekeeperReprocessingTopic()));
+    }
+
+    @Override
+    public TbQueueConsumer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperReprocessingMsgConsumer() {
+        return new TbPubSubConsumerTemplate<>(coreAdmin, pubSubSettings, topicService.buildTopicName(coreSettings.getHousekeeperReprocessingTopic()),
+                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToHousekeeperServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
+    }
+
     @PreDestroy
     private void destroy() {
         if (coreAdmin != null) {
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/PubSubTbRuleEngineQueueFactory.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/PubSubTbRuleEngineQueueFactory.java
index 070384e60e..3895971655 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/PubSubTbRuleEngineQueueFactory.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/PubSubTbRuleEngineQueueFactory.java
@@ -25,6 +25,8 @@ import org.thingsboard.server.gen.js.JsInvokeProtos;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
+import org.thingsboard.server.gen.transport.TransportProtos.ToHousekeeperServiceMsg;
+import org.thingsboard.server.gen.transport.TransportProtos.ToOtaPackageStateServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineNotificationMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToTransportMsg;
@@ -36,8 +38,8 @@ import org.thingsboard.server.queue.TbQueueRequestTemplate;
 import org.thingsboard.server.queue.common.DefaultTbQueueRequestTemplate;
 import org.thingsboard.server.queue.common.TbProtoJsQueueMsg;
 import org.thingsboard.server.queue.common.TbProtoQueueMsg;
-import org.thingsboard.server.queue.discovery.TopicService;
 import org.thingsboard.server.queue.discovery.TbServiceInfoProvider;
+import org.thingsboard.server.queue.discovery.TopicService;
 import org.thingsboard.server.queue.pubsub.TbPubSubAdmin;
 import org.thingsboard.server.queue.pubsub.TbPubSubConsumerTemplate;
 import org.thingsboard.server.queue.pubsub.TbPubSubProducerTemplate;
@@ -48,7 +50,7 @@ import org.thingsboard.server.queue.settings.TbQueueRemoteJsInvokeSettings;
 import org.thingsboard.server.queue.settings.TbQueueRuleEngineSettings;
 import org.thingsboard.server.queue.settings.TbQueueTransportNotificationSettings;
 
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PreDestroy;
 import java.nio.charset.StandardCharsets;
 
 @Component
@@ -157,10 +159,15 @@ public class PubSubTbRuleEngineQueueFactory implements TbRuleEngineQueueFactory
     }
 
     @Override
-    public TbQueueProducer<TbProtoQueueMsg<TransportProtos.ToOtaPackageStateServiceMsg>> createToOtaPackageStateServiceMsgProducer() {
+    public TbQueueProducer<TbProtoQueueMsg<ToOtaPackageStateServiceMsg>> createToOtaPackageStateServiceMsgProducer() {
         return new TbPubSubProducerTemplate<>(coreAdmin, pubSubSettings, topicService.buildTopicName(coreSettings.getOtaPackageTopic()));
     }
 
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperMsgProducer() {
+        return new TbPubSubProducerTemplate<>(coreAdmin, pubSubSettings, topicService.buildTopicName(coreSettings.getHousekeeperTopic()));
+    }
+
     @PreDestroy
     private void destroy() {
         if (coreAdmin != null) {
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/PubSubTbVersionControlQueueFactory.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/PubSubTbVersionControlQueueFactory.java
index ed40a43deb..3faf35bbc7 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/PubSubTbVersionControlQueueFactory.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/PubSubTbVersionControlQueueFactory.java
@@ -31,7 +31,7 @@ import org.thingsboard.server.queue.pubsub.TbPubSubSubscriptionSettings;
 import org.thingsboard.server.queue.settings.TbQueueCoreSettings;
 import org.thingsboard.server.queue.settings.TbQueueVersionControlSettings;
 
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PreDestroy;
 
 @Component
 @ConditionalOnExpression("'${queue.type:null}'=='pubsub' && '${service.type:null}'=='tb-vc-executor'")
@@ -79,6 +79,11 @@ public class PubSubTbVersionControlQueueFactory implements TbVersionControlQueue
         );
     }
 
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<TransportProtos.ToHousekeeperServiceMsg>> createHousekeeperMsgProducer() {
+        return new TbPubSubProducerTemplate<>(coreAdmin, pubSubSettings, topicService.buildTopicName(coreSettings.getHousekeeperTopic()));
+    }
+
     @PreDestroy
     private void destroy() {
         if (coreAdmin != null) {
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/PubSubTransportQueueFactory.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/PubSubTransportQueueFactory.java
index 3323308bef..9f993a553d 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/PubSubTransportQueueFactory.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/PubSubTransportQueueFactory.java
@@ -21,6 +21,7 @@ import org.springframework.stereotype.Component;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
+import org.thingsboard.server.gen.transport.TransportProtos.ToHousekeeperServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToTransportMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToUsageStatsServiceMsg;
@@ -44,7 +45,7 @@ import org.thingsboard.server.queue.settings.TbQueueRuleEngineSettings;
 import org.thingsboard.server.queue.settings.TbQueueTransportApiSettings;
 import org.thingsboard.server.queue.settings.TbQueueTransportNotificationSettings;
 
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PreDestroy;
 
 @Component
 @ConditionalOnExpression("'${queue.type:null}'=='pubsub' && (('${service.type:null}'=='monolith' && '${transport.api_enabled:true}'=='true') || '${service.type:null}'=='tb-transport')")
@@ -131,6 +132,11 @@ public class PubSubTransportQueueFactory implements TbTransportQueueFactory {
         return new TbPubSubProducerTemplate<>(coreAdmin, pubSubSettings, topicService.buildTopicName(coreSettings.getUsageStatsTopic()));
     }
 
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperMsgProducer() {
+        return new TbPubSubProducerTemplate<>(coreAdmin, pubSubSettings, topicService.buildTopicName(coreSettings.getHousekeeperTopic()));
+    }
+
     @PreDestroy
     private void destroy() {
         if (coreAdmin != null) {
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/RabbitMqMonolithQueueFactory.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/RabbitMqMonolithQueueFactory.java
index 1b7f705175..40f4fdc2e5 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/RabbitMqMonolithQueueFactory.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/RabbitMqMonolithQueueFactory.java
@@ -26,6 +26,7 @@ import org.thingsboard.server.gen.js.JsInvokeProtos.RemoteJsResponse;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
+import org.thingsboard.server.gen.transport.TransportProtos.ToHousekeeperServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToOtaPackageStateServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineNotificationMsg;
@@ -40,8 +41,8 @@ import org.thingsboard.server.queue.TbQueueRequestTemplate;
 import org.thingsboard.server.queue.common.DefaultTbQueueRequestTemplate;
 import org.thingsboard.server.queue.common.TbProtoJsQueueMsg;
 import org.thingsboard.server.queue.common.TbProtoQueueMsg;
-import org.thingsboard.server.queue.discovery.TopicService;
 import org.thingsboard.server.queue.discovery.TbServiceInfoProvider;
+import org.thingsboard.server.queue.discovery.TopicService;
 import org.thingsboard.server.queue.rabbitmq.TbRabbitMqAdmin;
 import org.thingsboard.server.queue.rabbitmq.TbRabbitMqConsumerTemplate;
 import org.thingsboard.server.queue.rabbitmq.TbRabbitMqProducerTemplate;
@@ -54,7 +55,7 @@ import org.thingsboard.server.queue.settings.TbQueueTransportApiSettings;
 import org.thingsboard.server.queue.settings.TbQueueTransportNotificationSettings;
 import org.thingsboard.server.queue.settings.TbQueueVersionControlSettings;
 
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PreDestroy;
 import java.nio.charset.StandardCharsets;
 
 @Component
@@ -224,6 +225,28 @@ public class RabbitMqMonolithQueueFactory implements TbCoreQueueFactory, TbRuleE
         return new TbRabbitMqProducerTemplate<>(vcAdmin, rabbitMqSettings, topicService.buildTopicName(vcSettings.getTopic()));
     }
 
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperMsgProducer() {
+        return new TbRabbitMqProducerTemplate<>(coreAdmin, rabbitMqSettings, topicService.buildTopicName(coreSettings.getHousekeeperTopic()));
+    }
+
+    @Override
+    public TbQueueConsumer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperMsgConsumer() {
+        return new TbRabbitMqConsumerTemplate<>(coreAdmin, rabbitMqSettings, topicService.buildTopicName(coreSettings.getHousekeeperTopic()),
+                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToHousekeeperServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
+    }
+
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperReprocessingMsgProducer() {
+        return new TbRabbitMqProducerTemplate<>(coreAdmin, rabbitMqSettings, topicService.buildTopicName(coreSettings.getHousekeeperReprocessingTopic()));
+    }
+
+    @Override
+    public TbQueueConsumer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperReprocessingMsgConsumer() {
+        return new TbRabbitMqConsumerTemplate<>(coreAdmin, rabbitMqSettings, topicService.buildTopicName(coreSettings.getHousekeeperReprocessingTopic()),
+                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToHousekeeperServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
+    }
+
     @PreDestroy
     private void destroy() {
         if (coreAdmin != null) {
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/RabbitMqTbCoreQueueFactory.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/RabbitMqTbCoreQueueFactory.java
index e0d0ea3b3a..06fe34c458 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/RabbitMqTbCoreQueueFactory.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/RabbitMqTbCoreQueueFactory.java
@@ -38,8 +38,8 @@ import org.thingsboard.server.queue.TbQueueRequestTemplate;
 import org.thingsboard.server.queue.common.DefaultTbQueueRequestTemplate;
 import org.thingsboard.server.queue.common.TbProtoJsQueueMsg;
 import org.thingsboard.server.queue.common.TbProtoQueueMsg;
-import org.thingsboard.server.queue.discovery.TopicService;
 import org.thingsboard.server.queue.discovery.TbServiceInfoProvider;
+import org.thingsboard.server.queue.discovery.TopicService;
 import org.thingsboard.server.queue.rabbitmq.TbRabbitMqAdmin;
 import org.thingsboard.server.queue.rabbitmq.TbRabbitMqConsumerTemplate;
 import org.thingsboard.server.queue.rabbitmq.TbRabbitMqProducerTemplate;
@@ -51,7 +51,7 @@ import org.thingsboard.server.queue.settings.TbQueueRuleEngineSettings;
 import org.thingsboard.server.queue.settings.TbQueueTransportApiSettings;
 import org.thingsboard.server.queue.settings.TbQueueTransportNotificationSettings;
 
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PreDestroy;
 import java.nio.charset.StandardCharsets;
 
 @Component
@@ -198,6 +198,28 @@ public class RabbitMqTbCoreQueueFactory implements TbCoreQueueFactory {
         return new TbRabbitMqProducerTemplate<>(coreAdmin, rabbitMqSettings, topicService.buildTopicName(coreSettings.getUsageStatsTopic()));
     }
 
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<TransportProtos.ToHousekeeperServiceMsg>> createHousekeeperMsgProducer() {
+        return new TbRabbitMqProducerTemplate<>(coreAdmin, rabbitMqSettings, topicService.buildTopicName(coreSettings.getHousekeeperTopic()));
+    }
+
+    @Override
+    public TbQueueConsumer<TbProtoQueueMsg<TransportProtos.ToHousekeeperServiceMsg>> createHousekeeperMsgConsumer() {
+        return new TbRabbitMqConsumerTemplate<>(coreAdmin, rabbitMqSettings, topicService.buildTopicName(coreSettings.getHousekeeperTopic()),
+                msg -> new TbProtoQueueMsg<>(msg.getKey(), TransportProtos.ToHousekeeperServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
+    }
+
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<TransportProtos.ToHousekeeperServiceMsg>> createHousekeeperReprocessingMsgProducer() {
+        return new TbRabbitMqProducerTemplate<>(coreAdmin, rabbitMqSettings, topicService.buildTopicName(coreSettings.getHousekeeperReprocessingTopic()));
+    }
+
+    @Override
+    public TbQueueConsumer<TbProtoQueueMsg<TransportProtos.ToHousekeeperServiceMsg>> createHousekeeperReprocessingMsgConsumer() {
+        return new TbRabbitMqConsumerTemplate<>(coreAdmin, rabbitMqSettings, topicService.buildTopicName(coreSettings.getHousekeeperReprocessingTopic()),
+                msg -> new TbProtoQueueMsg<>(msg.getKey(), TransportProtos.ToHousekeeperServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
+    }
+
     @PreDestroy
     private void destroy() {
         if (coreAdmin != null) {
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/RabbitMqTbRuleEngineQueueFactory.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/RabbitMqTbRuleEngineQueueFactory.java
index 929ea8298c..8d7016404a 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/RabbitMqTbRuleEngineQueueFactory.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/RabbitMqTbRuleEngineQueueFactory.java
@@ -48,7 +48,7 @@ import org.thingsboard.server.queue.settings.TbQueueRemoteJsInvokeSettings;
 import org.thingsboard.server.queue.settings.TbQueueRuleEngineSettings;
 import org.thingsboard.server.queue.settings.TbQueueTransportNotificationSettings;
 
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PreDestroy;
 import java.nio.charset.StandardCharsets;
 
 @Component
@@ -160,6 +160,11 @@ public class RabbitMqTbRuleEngineQueueFactory implements TbRuleEngineQueueFactor
         return new TbRabbitMqProducerTemplate<>(coreAdmin, rabbitMqSettings, topicService.buildTopicName(coreSettings.getOtaPackageTopic()));
     }
 
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<TransportProtos.ToHousekeeperServiceMsg>> createHousekeeperMsgProducer() {
+        return new TbRabbitMqProducerTemplate<>(coreAdmin, rabbitMqSettings, topicService.buildTopicName(coreSettings.getHousekeeperTopic()));
+    }
+
     @PreDestroy
     private void destroy() {
         if (coreAdmin != null) {
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/RabbitMqTbVersionControlQueueFactory.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/RabbitMqTbVersionControlQueueFactory.java
index bd14db38b4..d2842a3492 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/RabbitMqTbVersionControlQueueFactory.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/RabbitMqTbVersionControlQueueFactory.java
@@ -31,7 +31,7 @@ import org.thingsboard.server.queue.rabbitmq.TbRabbitMqSettings;
 import org.thingsboard.server.queue.settings.TbQueueCoreSettings;
 import org.thingsboard.server.queue.settings.TbQueueVersionControlSettings;
 
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PreDestroy;
 
 @Component
 @ConditionalOnExpression("'${queue.type:null}'=='rabbitmq' && '${service.type:null}'=='tb-vc-executor'")
@@ -79,6 +79,11 @@ public class RabbitMqTbVersionControlQueueFactory implements TbVersionControlQue
         );
     }
 
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<TransportProtos.ToHousekeeperServiceMsg>> createHousekeeperMsgProducer() {
+        return new TbRabbitMqProducerTemplate<>(coreAdmin, rabbitMqSettings, topicService.buildTopicName(coreSettings.getHousekeeperTopic()));
+    }
+
     @PreDestroy
     private void destroy() {
         if (coreAdmin != null) {
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/RabbitMqTransportQueueFactory.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/RabbitMqTransportQueueFactory.java
index d5fb7bd0e2..13df3414d8 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/RabbitMqTransportQueueFactory.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/RabbitMqTransportQueueFactory.java
@@ -44,7 +44,7 @@ import org.thingsboard.server.queue.settings.TbQueueRuleEngineSettings;
 import org.thingsboard.server.queue.settings.TbQueueTransportApiSettings;
 import org.thingsboard.server.queue.settings.TbQueueTransportNotificationSettings;
 
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PreDestroy;
 
 @Component
 @ConditionalOnExpression("'${queue.type:null}'=='rabbitmq' && (('${service.type:null}'=='monolith' && '${transport.api_enabled:true}'=='true') || '${service.type:null}'=='tb-transport')")
@@ -132,6 +132,11 @@ public class RabbitMqTransportQueueFactory implements TbTransportQueueFactory {
         return new TbRabbitMqProducerTemplate<>(coreAdmin, rabbitMqSettings, topicService.buildTopicName(coreSettings.getUsageStatsTopic()));
     }
 
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<TransportProtos.ToHousekeeperServiceMsg>> createHousekeeperMsgProducer() {
+        return new TbRabbitMqProducerTemplate<>(coreAdmin, rabbitMqSettings, topicService.buildTopicName(coreSettings.getHousekeeperTopic()));
+    }
+
     @PreDestroy
     private void destroy() {
         if (coreAdmin != null) {
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/ServiceBusMonolithQueueFactory.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/ServiceBusMonolithQueueFactory.java
index 359cbf67b8..c52ec7f7b2 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/ServiceBusMonolithQueueFactory.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/ServiceBusMonolithQueueFactory.java
@@ -25,6 +25,7 @@ import org.thingsboard.server.gen.js.JsInvokeProtos;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
+import org.thingsboard.server.gen.transport.TransportProtos.ToHousekeeperServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToOtaPackageStateServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineNotificationMsg;
@@ -44,8 +45,8 @@ import org.thingsboard.server.queue.azure.servicebus.TbServiceBusSettings;
 import org.thingsboard.server.queue.common.DefaultTbQueueRequestTemplate;
 import org.thingsboard.server.queue.common.TbProtoJsQueueMsg;
 import org.thingsboard.server.queue.common.TbProtoQueueMsg;
-import org.thingsboard.server.queue.discovery.TopicService;
 import org.thingsboard.server.queue.discovery.TbServiceInfoProvider;
+import org.thingsboard.server.queue.discovery.TopicService;
 import org.thingsboard.server.queue.settings.TbQueueCoreSettings;
 import org.thingsboard.server.queue.settings.TbQueueRemoteJsInvokeSettings;
 import org.thingsboard.server.queue.settings.TbQueueRuleEngineSettings;
@@ -53,7 +54,7 @@ import org.thingsboard.server.queue.settings.TbQueueTransportApiSettings;
 import org.thingsboard.server.queue.settings.TbQueueTransportNotificationSettings;
 import org.thingsboard.server.queue.settings.TbQueueVersionControlSettings;
 
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PreDestroy;
 import java.nio.charset.StandardCharsets;
 
 @Component
@@ -223,6 +224,28 @@ public class ServiceBusMonolithQueueFactory implements TbCoreQueueFactory, TbRul
         return new TbServiceBusProducerTemplate<>(vcAdmin, serviceBusSettings, topicService.buildTopicName(vcSettings.getTopic()));
     }
 
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperMsgProducer() {
+        return new TbServiceBusProducerTemplate<>(coreAdmin, serviceBusSettings, topicService.buildTopicName(coreSettings.getHousekeeperTopic()));
+    }
+
+    @Override
+    public TbQueueConsumer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperMsgConsumer() {
+        return new TbServiceBusConsumerTemplate<>(coreAdmin, serviceBusSettings, topicService.buildTopicName(coreSettings.getHousekeeperTopic()),
+                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToHousekeeperServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
+    }
+
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperReprocessingMsgProducer() {
+        return new TbServiceBusProducerTemplate<>(coreAdmin, serviceBusSettings, topicService.buildTopicName(coreSettings.getHousekeeperReprocessingTopic()));
+    }
+
+    @Override
+    public TbQueueConsumer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperReprocessingMsgConsumer() {
+        return new TbServiceBusConsumerTemplate<>(coreAdmin, serviceBusSettings, topicService.buildTopicName(coreSettings.getHousekeeperReprocessingTopic()),
+                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToHousekeeperServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
+    }
+
     @PreDestroy
     private void destroy() {
         if (coreAdmin != null) {
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/ServiceBusTbCoreQueueFactory.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/ServiceBusTbCoreQueueFactory.java
index d2ef072ffa..37fcfad1bd 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/ServiceBusTbCoreQueueFactory.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/ServiceBusTbCoreQueueFactory.java
@@ -24,6 +24,7 @@ import org.thingsboard.server.gen.js.JsInvokeProtos;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
+import org.thingsboard.server.gen.transport.TransportProtos.ToHousekeeperServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToOtaPackageStateServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineNotificationMsg;
@@ -43,15 +44,15 @@ import org.thingsboard.server.queue.azure.servicebus.TbServiceBusSettings;
 import org.thingsboard.server.queue.common.DefaultTbQueueRequestTemplate;
 import org.thingsboard.server.queue.common.TbProtoJsQueueMsg;
 import org.thingsboard.server.queue.common.TbProtoQueueMsg;
-import org.thingsboard.server.queue.discovery.TopicService;
 import org.thingsboard.server.queue.discovery.TbServiceInfoProvider;
+import org.thingsboard.server.queue.discovery.TopicService;
 import org.thingsboard.server.queue.settings.TbQueueCoreSettings;
 import org.thingsboard.server.queue.settings.TbQueueRemoteJsInvokeSettings;
 import org.thingsboard.server.queue.settings.TbQueueRuleEngineSettings;
 import org.thingsboard.server.queue.settings.TbQueueTransportApiSettings;
 import org.thingsboard.server.queue.settings.TbQueueTransportNotificationSettings;
 
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PreDestroy;
 import java.nio.charset.StandardCharsets;
 
 @Component
@@ -198,6 +199,28 @@ public class ServiceBusTbCoreQueueFactory implements TbCoreQueueFactory {
         return null;
     }
 
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperMsgProducer() {
+        return new TbServiceBusProducerTemplate<>(coreAdmin, serviceBusSettings, topicService.buildTopicName(coreSettings.getHousekeeperTopic()));
+    }
+
+    @Override
+    public TbQueueConsumer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperMsgConsumer() {
+        return new TbServiceBusConsumerTemplate<>(coreAdmin, serviceBusSettings, topicService.buildTopicName(coreSettings.getHousekeeperTopic()),
+                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToHousekeeperServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
+    }
+
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperReprocessingMsgProducer() {
+        return new TbServiceBusProducerTemplate<>(coreAdmin, serviceBusSettings, topicService.buildTopicName(coreSettings.getHousekeeperReprocessingTopic()));
+    }
+
+    @Override
+    public TbQueueConsumer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperReprocessingMsgConsumer() {
+        return new TbServiceBusConsumerTemplate<>(coreAdmin, serviceBusSettings, topicService.buildTopicName(coreSettings.getHousekeeperReprocessingTopic()),
+                msg -> new TbProtoQueueMsg<>(msg.getKey(), ToHousekeeperServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
+    }
+
     @PreDestroy
     private void destroy() {
         if (coreAdmin != null) {
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/ServiceBusTbRuleEngineQueueFactory.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/ServiceBusTbRuleEngineQueueFactory.java
index b09ab1d30d..cd2c52c21d 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/ServiceBusTbRuleEngineQueueFactory.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/ServiceBusTbRuleEngineQueueFactory.java
@@ -41,14 +41,14 @@ import org.thingsboard.server.queue.azure.servicebus.TbServiceBusSettings;
 import org.thingsboard.server.queue.common.DefaultTbQueueRequestTemplate;
 import org.thingsboard.server.queue.common.TbProtoJsQueueMsg;
 import org.thingsboard.server.queue.common.TbProtoQueueMsg;
-import org.thingsboard.server.queue.discovery.TopicService;
 import org.thingsboard.server.queue.discovery.TbServiceInfoProvider;
+import org.thingsboard.server.queue.discovery.TopicService;
 import org.thingsboard.server.queue.settings.TbQueueCoreSettings;
 import org.thingsboard.server.queue.settings.TbQueueRemoteJsInvokeSettings;
 import org.thingsboard.server.queue.settings.TbQueueRuleEngineSettings;
 import org.thingsboard.server.queue.settings.TbQueueTransportNotificationSettings;
 
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PreDestroy;
 import java.nio.charset.StandardCharsets;
 
 @Component
@@ -160,6 +160,11 @@ public class ServiceBusTbRuleEngineQueueFactory implements TbRuleEngineQueueFact
         return new TbServiceBusProducerTemplate<>(coreAdmin, serviceBusSettings, topicService.buildTopicName(coreSettings.getOtaPackageTopic()));
     }
 
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<TransportProtos.ToHousekeeperServiceMsg>> createHousekeeperMsgProducer() {
+        return new TbServiceBusProducerTemplate<>(coreAdmin, serviceBusSettings, topicService.buildTopicName(coreSettings.getHousekeeperTopic()));
+    }
+
     @PreDestroy
     private void destroy() {
         if (coreAdmin != null) {
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/ServiceBusTbVersionControlQueueFactory.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/ServiceBusTbVersionControlQueueFactory.java
index 2e5e5c4bc3..c3447a1012 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/ServiceBusTbVersionControlQueueFactory.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/ServiceBusTbVersionControlQueueFactory.java
@@ -31,7 +31,7 @@ import org.thingsboard.server.queue.discovery.TopicService;
 import org.thingsboard.server.queue.settings.TbQueueCoreSettings;
 import org.thingsboard.server.queue.settings.TbQueueVersionControlSettings;
 
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PreDestroy;
 
 @Component
 @ConditionalOnExpression("'${queue.type:null}'=='service-bus' && '${service.type:null}'=='tb-vc-executor'")
@@ -79,6 +79,11 @@ public class ServiceBusTbVersionControlQueueFactory implements TbVersionControlQ
         );
     }
 
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<TransportProtos.ToHousekeeperServiceMsg>> createHousekeeperMsgProducer() {
+        return new TbServiceBusProducerTemplate<>(coreAdmin, serviceBusSettings, topicService.buildTopicName(coreSettings.getHousekeeperTopic()));
+    }
+
     @PreDestroy
     private void destroy() {
         if (coreAdmin != null) {
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/ServiceBusTransportQueueFactory.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/ServiceBusTransportQueueFactory.java
index d782a1ff9e..f2ed799905 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/ServiceBusTransportQueueFactory.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/ServiceBusTransportQueueFactory.java
@@ -44,7 +44,7 @@ import org.thingsboard.server.queue.settings.TbQueueRuleEngineSettings;
 import org.thingsboard.server.queue.settings.TbQueueTransportApiSettings;
 import org.thingsboard.server.queue.settings.TbQueueTransportNotificationSettings;
 
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PreDestroy;
 
 @Component
 @ConditionalOnExpression("'${queue.type:null}'=='service-bus' && (('${service.type:null}'=='monolith' && '${transport.api_enabled:true}'=='true') || '${service.type:null}'=='tb-transport')")
@@ -133,6 +133,11 @@ public class ServiceBusTransportQueueFactory implements TbTransportQueueFactory
         return new TbServiceBusProducerTemplate<>(coreAdmin, serviceBusSettings, topicService.buildTopicName(coreSettings.getUsageStatsTopic()));
     }
 
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<TransportProtos.ToHousekeeperServiceMsg>> createHousekeeperMsgProducer() {
+        return new TbServiceBusProducerTemplate<>(coreAdmin, serviceBusSettings, topicService.buildTopicName(coreSettings.getHousekeeperTopic()));
+    }
+
     @PreDestroy
     private void destroy() {
         if (coreAdmin != null) {
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbCoreQueueFactory.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbCoreQueueFactory.java
index 5aa7866033..20a67c2e09 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbCoreQueueFactory.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbCoreQueueFactory.java
@@ -18,6 +18,7 @@ package org.thingsboard.server.queue.provider;
 import org.thingsboard.server.gen.js.JsInvokeProtos;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
+import org.thingsboard.server.gen.transport.TransportProtos.ToHousekeeperServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToOtaPackageStateServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineNotificationMsg;
@@ -36,7 +37,7 @@ import org.thingsboard.server.queue.common.TbProtoQueueMsg;
  * Responsible for initialization of various Producers and Consumers used by TB Core Node.
  * Implementation Depends on the queue queue.type from yml or TB_QUEUE_TYPE environment variable
  */
-public interface TbCoreQueueFactory extends TbUsageStatsClientQueueFactory {
+public interface TbCoreQueueFactory extends TbUsageStatsClientQueueFactory, HousekeeperClientQueueFactory {
 
     /**
      * Used to push messages to instances of TB Transport Service
@@ -130,4 +131,11 @@ public interface TbCoreQueueFactory extends TbUsageStatsClientQueueFactory {
      * @return
      */
     TbQueueProducer<TbProtoQueueMsg<ToVersionControlServiceMsg>> createVersionControlMsgProducer();
+
+    TbQueueConsumer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperMsgConsumer();
+
+    TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperReprocessingMsgProducer();
+
+    TbQueueConsumer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> createHousekeeperReprocessingMsgConsumer();
+
 }
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbCoreQueueProducerProvider.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbCoreQueueProducerProvider.java
index 5a99f361b4..3dcd716a96 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbCoreQueueProducerProvider.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbCoreQueueProducerProvider.java
@@ -18,6 +18,7 @@ package org.thingsboard.server.queue.provider;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
+import org.thingsboard.server.gen.transport.TransportProtos.ToHousekeeperServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineNotificationMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToTransportMsg;
@@ -27,7 +28,7 @@ import org.thingsboard.server.queue.TbQueueProducer;
 import org.thingsboard.server.queue.common.TbProtoQueueMsg;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 @Service
 @TbCoreComponent
@@ -41,6 +42,7 @@ public class TbCoreQueueProducerProvider implements TbQueueProducerProvider {
     private TbQueueProducer<TbProtoQueueMsg<ToCoreNotificationMsg>> toTbCoreNotifications;
     private TbQueueProducer<TbProtoQueueMsg<ToUsageStatsServiceMsg>> toUsageStats;
     private TbQueueProducer<TbProtoQueueMsg<ToVersionControlServiceMsg>> toVersionControl;
+    private TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> toHousekeeper;
 
     public TbCoreQueueProducerProvider(TbCoreQueueFactory tbQueueProvider) {
         this.tbQueueProvider = tbQueueProvider;
@@ -55,6 +57,7 @@ public class TbCoreQueueProducerProvider implements TbQueueProducerProvider {
         this.toTbCoreNotifications = tbQueueProvider.createTbCoreNotificationsMsgProducer();
         this.toUsageStats = tbQueueProvider.createToUsageStatsServiceMsgProducer();
         this.toVersionControl = tbQueueProvider.createVersionControlMsgProducer();
+        this.toHousekeeper = tbQueueProvider.createHousekeeperMsgProducer();
     }
 
     @Override
@@ -91,4 +94,10 @@ public class TbCoreQueueProducerProvider implements TbQueueProducerProvider {
     public TbQueueProducer<TbProtoQueueMsg<ToVersionControlServiceMsg>> getTbVersionControlMsgProducer() {
         return toVersionControl;
     }
+
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> getHousekeeperMsgProducer() {
+        return toHousekeeper;
+    }
+
 }
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbQueueProducerProvider.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbQueueProducerProvider.java
index 4dbdca4375..a752301cd8 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbQueueProducerProvider.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbQueueProducerProvider.java
@@ -17,6 +17,7 @@ package org.thingsboard.server.queue.provider;
 
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
+import org.thingsboard.server.gen.transport.TransportProtos.ToHousekeeperServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineNotificationMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToTransportMsg;
@@ -78,4 +79,7 @@ public interface TbQueueProducerProvider {
      * @return
      */
     TbQueueProducer<TbProtoQueueMsg<ToVersionControlServiceMsg>> getTbVersionControlMsgProducer();
+
+    TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> getHousekeeperMsgProducer();
+
 }
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbRuleEngineProducerProvider.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbRuleEngineProducerProvider.java
index e4d98796f4..768d6b9c24 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbRuleEngineProducerProvider.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbRuleEngineProducerProvider.java
@@ -20,6 +20,7 @@ import org.springframework.stereotype.Service;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
+import org.thingsboard.server.gen.transport.TransportProtos.ToHousekeeperServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineNotificationMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToTransportMsg;
@@ -27,7 +28,7 @@ import org.thingsboard.server.gen.transport.TransportProtos.ToUsageStatsServiceM
 import org.thingsboard.server.queue.TbQueueProducer;
 import org.thingsboard.server.queue.common.TbProtoQueueMsg;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 @Service
 @ConditionalOnExpression("'${service.type:null}'=='tb-rule-engine'")
@@ -40,6 +41,7 @@ public class TbRuleEngineProducerProvider implements TbQueueProducerProvider {
     private TbQueueProducer<TbProtoQueueMsg<ToRuleEngineNotificationMsg>> toRuleEngineNotifications;
     private TbQueueProducer<TbProtoQueueMsg<ToCoreNotificationMsg>> toTbCoreNotifications;
     private TbQueueProducer<TbProtoQueueMsg<ToUsageStatsServiceMsg>> toUsageStats;
+    private TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> toHousekeeper;
 
     public TbRuleEngineProducerProvider(TbRuleEngineQueueFactory tbQueueProvider) {
         this.tbQueueProvider = tbQueueProvider;
@@ -53,6 +55,7 @@ public class TbRuleEngineProducerProvider implements TbQueueProducerProvider {
         this.toRuleEngineNotifications = tbQueueProvider.createRuleEngineNotificationsMsgProducer();
         this.toTbCoreNotifications = tbQueueProvider.createTbCoreNotificationsMsgProducer();
         this.toUsageStats = tbQueueProvider.createToUsageStatsServiceMsgProducer();
+        this.toHousekeeper = tbQueueProvider.createHousekeeperMsgProducer();
     }
 
     @Override
@@ -89,4 +92,10 @@ public class TbRuleEngineProducerProvider implements TbQueueProducerProvider {
     public TbQueueProducer<TbProtoQueueMsg<TransportProtos.ToVersionControlServiceMsg>> getTbVersionControlMsgProducer() {
         throw new RuntimeException("Not Implemented! Should not be used by Rule Engine!");
     }
+
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> getHousekeeperMsgProducer() {
+        return toHousekeeper;
+    }
+
 }
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbRuleEngineQueueFactory.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbRuleEngineQueueFactory.java
index cd4575af6a..f23c7e47f3 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbRuleEngineQueueFactory.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbRuleEngineQueueFactory.java
@@ -32,7 +32,7 @@ import org.thingsboard.server.queue.common.TbProtoQueueMsg;
  * Responsible for initialization of various Producers and Consumers used by TB Core Node.
  * Implementation Depends on the queue queue.type from yml or TB_QUEUE_TYPE environment variable
  */
-public interface TbRuleEngineQueueFactory extends TbUsageStatsClientQueueFactory {
+public interface TbRuleEngineQueueFactory extends TbUsageStatsClientQueueFactory, HousekeeperClientQueueFactory {
 
     /**
      * Used to push messages to instances of TB Transport Service
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbTransportQueueFactory.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbTransportQueueFactory.java
index 909089f175..c1a0a0fd24 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbTransportQueueFactory.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbTransportQueueFactory.java
@@ -26,7 +26,7 @@ import org.thingsboard.server.queue.TbQueueProducer;
 import org.thingsboard.server.queue.TbQueueRequestTemplate;
 import org.thingsboard.server.queue.common.TbProtoQueueMsg;
 
-public interface TbTransportQueueFactory extends TbUsageStatsClientQueueFactory {
+public interface TbTransportQueueFactory extends TbUsageStatsClientQueueFactory, HousekeeperClientQueueFactory {
 
     TbQueueRequestTemplate<TbProtoQueueMsg<TransportApiRequestMsg>, TbProtoQueueMsg<TransportApiResponseMsg>> createTransportApiRequestTemplate();
 
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbTransportQueueProducerProvider.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbTransportQueueProducerProvider.java
index c83b905a7c..010eaf404f 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbTransportQueueProducerProvider.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbTransportQueueProducerProvider.java
@@ -20,6 +20,7 @@ import org.springframework.stereotype.Service;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
+import org.thingsboard.server.gen.transport.TransportProtos.ToHousekeeperServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineNotificationMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToTransportMsg;
@@ -27,7 +28,7 @@ import org.thingsboard.server.gen.transport.TransportProtos.ToUsageStatsServiceM
 import org.thingsboard.server.queue.TbQueueProducer;
 import org.thingsboard.server.queue.common.TbProtoQueueMsg;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 @Service
 @ConditionalOnExpression("'${service.type:null}'=='tb-transport'")
@@ -38,6 +39,7 @@ public class TbTransportQueueProducerProvider implements TbQueueProducerProvider
     private TbQueueProducer<TbProtoQueueMsg<ToCoreMsg>> toTbCore;
     private TbQueueProducer<TbProtoQueueMsg<ToCoreNotificationMsg>> toTbCoreNotifications;
     private TbQueueProducer<TbProtoQueueMsg<ToUsageStatsServiceMsg>> toUsageStats;
+    private TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> toHousekeeper;
 
     public TbTransportQueueProducerProvider(TbTransportQueueFactory tbQueueProvider) {
         this.tbQueueProvider = tbQueueProvider;
@@ -49,6 +51,7 @@ public class TbTransportQueueProducerProvider implements TbQueueProducerProvider
         this.toRuleEngine = tbQueueProvider.createRuleEngineMsgProducer();
         this.toUsageStats = tbQueueProvider.createToUsageStatsServiceMsgProducer();
         this.toTbCoreNotifications = tbQueueProvider.createTbCoreNotificationsMsgProducer();
+        this.toHousekeeper = tbQueueProvider.createHousekeeperMsgProducer();
     }
 
     @Override
@@ -85,4 +88,10 @@ public class TbTransportQueueProducerProvider implements TbQueueProducerProvider
     public TbQueueProducer<TbProtoQueueMsg<ToUsageStatsServiceMsg>> getTbUsageStatsMsgProducer() {
         return toUsageStats;
     }
+
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> getHousekeeperMsgProducer() {
+        return toHousekeeper;
+    }
+
 }
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbVersionControlProducerProvider.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbVersionControlProducerProvider.java
index dbbaa9f072..1e697c644a 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbVersionControlProducerProvider.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbVersionControlProducerProvider.java
@@ -20,6 +20,7 @@ import org.springframework.stereotype.Service;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
+import org.thingsboard.server.gen.transport.TransportProtos.ToHousekeeperServiceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineNotificationMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToTransportMsg;
@@ -27,7 +28,7 @@ import org.thingsboard.server.gen.transport.TransportProtos.ToUsageStatsServiceM
 import org.thingsboard.server.queue.TbQueueProducer;
 import org.thingsboard.server.queue.common.TbProtoQueueMsg;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 @Service
 @ConditionalOnExpression("'${service.type:null}'=='tb-vc-executor'")
@@ -36,6 +37,7 @@ public class TbVersionControlProducerProvider implements TbQueueProducerProvider
     private final TbVersionControlQueueFactory tbQueueProvider;
     private TbQueueProducer<TbProtoQueueMsg<ToCoreNotificationMsg>> toTbCoreNotifications;
     private TbQueueProducer<TbProtoQueueMsg<ToUsageStatsServiceMsg>> toUsageStats;
+    private TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> toHousekeeper;
 
     public TbVersionControlProducerProvider(TbVersionControlQueueFactory tbQueueProvider) {
         this.tbQueueProvider = tbQueueProvider;
@@ -45,6 +47,7 @@ public class TbVersionControlProducerProvider implements TbQueueProducerProvider
     public void init() {
         this.toTbCoreNotifications = tbQueueProvider.createTbCoreNotificationsMsgProducer();
         this.toUsageStats = tbQueueProvider.createToUsageStatsServiceMsgProducer();
+        this.toHousekeeper = tbQueueProvider.createHousekeeperMsgProducer();
     }
 
     @Override
@@ -54,7 +57,7 @@ public class TbVersionControlProducerProvider implements TbQueueProducerProvider
 
     @Override
     public TbQueueProducer<TbProtoQueueMsg<ToRuleEngineMsg>> getRuleEngineMsgProducer() {
-         throw new RuntimeException("Not Implemented! Should not be used by Version Control Service!");
+        throw new RuntimeException("Not Implemented! Should not be used by Version Control Service!");
     }
 
     @Override
@@ -81,4 +84,10 @@ public class TbVersionControlProducerProvider implements TbQueueProducerProvider
     public TbQueueProducer<TbProtoQueueMsg<ToUsageStatsServiceMsg>> getTbUsageStatsMsgProducer() {
         return toUsageStats;
     }
+
+    @Override
+    public TbQueueProducer<TbProtoQueueMsg<ToHousekeeperServiceMsg>> getHousekeeperMsgProducer() {
+        return toHousekeeper;
+    }
+
 }
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbVersionControlQueueFactory.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbVersionControlQueueFactory.java
index 168a466015..3917df24cd 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbVersionControlQueueFactory.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/TbVersionControlQueueFactory.java
@@ -25,7 +25,7 @@ import org.thingsboard.server.queue.common.TbProtoQueueMsg;
  * Responsible for initialization of various Producers and Consumers used by TB Version Control Node.
  * Implementation Depends on the queue queue.type from yml or TB_QUEUE_TYPE environment variable
  */
-public interface TbVersionControlQueueFactory extends TbUsageStatsClientQueueFactory {
+public interface TbVersionControlQueueFactory extends TbUsageStatsClientQueueFactory, HousekeeperClientQueueFactory {
 
     /**
      * Used to push notifications to other instances of TB Core Service
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/pubsub/TbPubSubSettings.java b/common/queue/src/main/java/org/thingsboard/server/queue/pubsub/TbPubSubSettings.java
index 9c5a794806..8652b16eca 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/pubsub/TbPubSubSettings.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/pubsub/TbPubSubSettings.java
@@ -26,8 +26,8 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.stereotype.Component;
 import org.thingsboard.common.util.ThingsBoardThreadFactory;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.util.concurrent.Executors;
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/pubsub/TbPubSubSubscriptionSettings.java b/common/queue/src/main/java/org/thingsboard/server/queue/pubsub/TbPubSubSubscriptionSettings.java
index 3fd4e25479..3b67d6b282 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/pubsub/TbPubSubSubscriptionSettings.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/pubsub/TbPubSubSubscriptionSettings.java
@@ -21,7 +21,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.stereotype.Component;
 import org.thingsboard.server.queue.util.PropertyUtils;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import java.util.Map;
 
 @Component
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/rabbitmq/TbRabbitMqQueueArguments.java b/common/queue/src/main/java/org/thingsboard/server/queue/rabbitmq/TbRabbitMqQueueArguments.java
index 75b5f8adbc..b9b7f319df 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/rabbitmq/TbRabbitMqQueueArguments.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/rabbitmq/TbRabbitMqQueueArguments.java
@@ -21,7 +21,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.stereotype.Component;
 import org.thingsboard.server.common.data.StringUtils;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.regex.Pattern;
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/rabbitmq/TbRabbitMqSettings.java b/common/queue/src/main/java/org/thingsboard/server/queue/rabbitmq/TbRabbitMqSettings.java
index 88ea2ceeb9..72e1e7b902 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/rabbitmq/TbRabbitMqSettings.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/rabbitmq/TbRabbitMqSettings.java
@@ -22,7 +22,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 @Slf4j
 @ConditionalOnExpression("'${queue.type:null}'=='rabbitmq'")
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/scheduler/DefaultSchedulerComponent.java b/common/queue/src/main/java/org/thingsboard/server/queue/scheduler/DefaultSchedulerComponent.java
index 1f0499f845..9dc2785005 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/scheduler/DefaultSchedulerComponent.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/scheduler/DefaultSchedulerComponent.java
@@ -18,8 +18,8 @@ package org.thingsboard.server.queue.scheduler;
 import org.springframework.stereotype.Component;
 import org.thingsboard.common.util.ThingsBoardThreadFactory;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import java.util.concurrent.Callable;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/settings/TbQueueCoreSettings.java b/common/queue/src/main/java/org/thingsboard/server/queue/settings/TbQueueCoreSettings.java
index 0a8c12eb8d..2aa01193b0 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/settings/TbQueueCoreSettings.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/settings/TbQueueCoreSettings.java
@@ -34,6 +34,12 @@ public class TbQueueCoreSettings {
     @Value("${queue.core.usage-stats-topic:tb_usage_stats}")
     private String usageStatsTopic;
 
+    @Value("${queue.core.housekeeper.topic:tb_housekeeper}")
+    private String housekeeperTopic;
+
+    @Value("${queue.core.housekeeper.reprocessing-topic:tb_housekeeper.reprocessing}")
+    private String housekeeperReprocessingTopic;
+
     @Value("${queue.core.partitions}")
     private int partitions;
 }
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/sqs/TbAwsSqsQueueAttributes.java b/common/queue/src/main/java/org/thingsboard/server/queue/sqs/TbAwsSqsQueueAttributes.java
index 5da11c53af..f9c2ad0e7a 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/sqs/TbAwsSqsQueueAttributes.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/sqs/TbAwsSqsQueueAttributes.java
@@ -22,7 +22,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.stereotype.Component;
 import org.thingsboard.server.common.data.StringUtils;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import java.util.HashMap;
 import java.util.Map;
 
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/usagestats/DefaultTbApiUsageReportClient.java b/common/queue/src/main/java/org/thingsboard/server/queue/usagestats/DefaultTbApiUsageReportClient.java
index d5efba7a17..4faf5e1a31 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/usagestats/DefaultTbApiUsageReportClient.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/usagestats/DefaultTbApiUsageReportClient.java
@@ -37,7 +37,7 @@ import org.thingsboard.server.queue.discovery.TbServiceInfoProvider;
 import org.thingsboard.server.queue.provider.TbQueueProducerProvider;
 import org.thingsboard.server.queue.scheduler.SchedulerComponent;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import java.util.EnumMap;
 import java.util.Random;
 import java.util.UUID;
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/util/ProtoWithFSTService.java b/common/queue/src/main/java/org/thingsboard/server/queue/util/ProtoWithFSTService.java
deleted file mode 100644
index 180b7832b2..0000000000
--- a/common/queue/src/main/java/org/thingsboard/server/queue/util/ProtoWithFSTService.java
+++ /dev/null
@@ -1,63 +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.queue.util;
-
-import lombok.extern.slf4j.Slf4j;
-import org.nustaq.serialization.FSTConfiguration;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.thingsboard.server.common.data.FSTUtils;
-import org.thingsboard.server.common.data.FstStatsService;
-
-import java.util.Optional;
-
-@Slf4j
-@Service
-public class ProtoWithFSTService implements DataDecodingEncodingService {
-
-    @Autowired
-    private FstStatsService fstStatsService;
-
-    public static final FSTConfiguration CONFIG = FSTConfiguration.createDefaultConfiguration();
-
-    @Override
-    public <T> Optional<T> decode(byte[] byteArray) {
-        try {
-            long startTime = System.nanoTime();
-            Optional<T> optional = Optional.ofNullable(FSTUtils.decode(byteArray));
-            optional.ifPresent(obj -> {
-                fstStatsService.recordDecodeTime(obj.getClass(), startTime);
-                fstStatsService.incrementDecode(obj.getClass());
-            });
-            return optional;
-        } catch (IllegalArgumentException e) {
-            log.error("Error during deserialization message, [{}]", e.getMessage());
-            return Optional.empty();
-        }
-    }
-
-
-    @Override
-    public <T> byte[] encode(T msq) {
-        long startTime = System.nanoTime();
-        var bytes = FSTUtils.encode(msq);
-        fstStatsService.recordEncodeTime(msq.getClass(), startTime);
-        fstStatsService.incrementEncode(msq.getClass());
-        return bytes;
-    }
-
-
-}
diff --git a/common/queue/src/test/java/org/thingsboard/server/queue/common/DefaultTbQueueRequestTemplateTest.java b/common/queue/src/test/java/org/thingsboard/server/queue/common/DefaultTbQueueRequestTemplateTest.java
index b90e81b6b8..b7a3ae20d3 100644
--- a/common/queue/src/test/java/org/thingsboard/server/queue/common/DefaultTbQueueRequestTemplateTest.java
+++ b/common/queue/src/test/java/org/thingsboard/server/queue/common/DefaultTbQueueRequestTemplateTest.java
@@ -16,13 +16,13 @@
 package org.thingsboard.server.queue.common;
 
 import lombok.extern.slf4j.Slf4j;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.AfterEach;
+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.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.thingsboard.server.queue.TbQueueAdmin;
 import org.thingsboard.server.queue.TbQueueConsumer;
 import org.thingsboard.server.queue.TbQueueMsg;
@@ -48,6 +48,7 @@ import static org.mockito.BDDMockito.willDoNothing;
 import static org.mockito.BDDMockito.willReturn;
 import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
 import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
@@ -56,7 +57,7 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.hamcrest.MockitoHamcrest.longThat;
 
 @Slf4j
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class DefaultTbQueueRequestTemplateTest {
 
     @Mock
@@ -76,16 +77,16 @@ public class DefaultTbQueueRequestTemplateTest {
 
     DefaultTbQueueRequestTemplate<TbQueueMsg, TbQueueMsg> inst;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
-        willReturn(topic).given(responseTemplate).getTopic();
+        lenient().doReturn(topic).when(responseTemplate).getTopic();
         inst = spy(new DefaultTbQueueRequestTemplate<>(
                 queueAdmin, requestTemplate, responseTemplate,
                 maxRequestTimeout, maxPendingRequests, pollInterval, executorMock));
 
     }
 
-    @After
+    @AfterEach
     public void tearDown() throws Exception {
         if (executor != null) {
             executor.shutdownNow();
diff --git a/common/queue/src/test/java/org/thingsboard/server/queue/discovery/ZkDiscoveryServiceTest.java b/common/queue/src/test/java/org/thingsboard/server/queue/discovery/ZkDiscoveryServiceTest.java
index 2e0c58e38b..63806f7630 100644
--- a/common/queue/src/test/java/org/thingsboard/server/queue/discovery/ZkDiscoveryServiceTest.java
+++ b/common/queue/src/test/java/org/thingsboard/server/queue/discovery/ZkDiscoveryServiceTest.java
@@ -20,12 +20,13 @@ import org.apache.curator.framework.imps.CuratorFrameworkState;
 import org.apache.curator.framework.recipes.cache.ChildData;
 import org.apache.curator.framework.recipes.cache.PathChildrenCache;
 import org.apache.curator.framework.recipes.cache.PathChildrenCacheEvent;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.test.util.ReflectionTestUtils;
 import org.thingsboard.common.util.ThingsBoardThreadFactory;
@@ -39,8 +40,8 @@ import java.util.concurrent.ScheduledExecutorService;
 
 import static org.apache.curator.framework.recipes.cache.PathChildrenCacheEvent.Type.CHILD_ADDED;
 import static org.apache.curator.framework.recipes.cache.PathChildrenCacheEvent.Type.CHILD_REMOVED;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.never;
@@ -49,7 +50,7 @@ import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class ZkDiscoveryServiceTest {
 
     @Mock
@@ -78,7 +79,7 @@ public class ZkDiscoveryServiceTest {
     final TransportProtos.ServiceInfo childInfo = TransportProtos.ServiceInfo.newBuilder().setServiceId("tb-rule-engine-1").build();
     final ChildData childData = new ChildData("/thingsboard/nodes/0000000020", null, childInfo.toByteArray());
 
-    @Before
+    @BeforeEach
     public void setup() {
         zkDiscoveryService = Mockito.spy(new ZkDiscoveryService(applicationEventPublisher, serviceInfoProvider, partitionService));
         ScheduledExecutorService zkExecutorService = Executors.newSingleThreadScheduledExecutor(ThingsBoardThreadFactory.forName("zk-discovery"));
diff --git a/common/queue/src/test/java/org/thingsboard/server/queue/memory/DefaultInMemoryStorageTest.java b/common/queue/src/test/java/org/thingsboard/server/queue/memory/DefaultInMemoryStorageTest.java
index 403c487341..f8e3bc2bc1 100644
--- a/common/queue/src/test/java/org/thingsboard/server/queue/memory/DefaultInMemoryStorageTest.java
+++ b/common/queue/src/test/java/org/thingsboard/server/queue/memory/DefaultInMemoryStorageTest.java
@@ -17,7 +17,7 @@ package org.thingsboard.server.queue.memory;
 
 import com.google.gson.Gson;
 import lombok.extern.slf4j.Slf4j;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.thingsboard.server.queue.TbQueueMsg;
 import org.thingsboard.server.queue.common.DefaultTbQueueMsg;
 
diff --git a/common/queue/src/test/resources/junit-platform.properties b/common/queue/src/test/resources/junit-platform.properties
new file mode 100644
index 0000000000..f2ed301920
--- /dev/null
+++ b/common/queue/src/test/resources/junit-platform.properties
@@ -0,0 +1,3 @@
+junit.jupiter.execution.parallel.enabled = true
+junit.jupiter.execution.parallel.mode.default = concurrent
+junit.jupiter.execution.parallel.mode.classes.default = concurrent
diff --git a/common/script/pom.xml b/common/script/pom.xml
index 05f2e78980..b307d328d2 100644
--- a/common/script/pom.xml
+++ b/common/script/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.6.3-SNAPSHOT</version>
+        <version>3.7.0-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>
diff --git a/common/script/remote-js-client/pom.xml b/common/script/remote-js-client/pom.xml
index 5e85aad623..d196dd13ea 100644
--- a/common/script/remote-js-client/pom.xml
+++ b/common/script/remote-js-client/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard.common</groupId>
-        <version>3.6.3-SNAPSHOT</version>
+        <version>3.7.0-SNAPSHOT</version>
         <artifactId>script</artifactId>
     </parent>
     <groupId>org.thingsboard.common.script</groupId>
@@ -66,11 +66,6 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.awaitility</groupId>
             <artifactId>awaitility</artifactId>
diff --git a/common/script/remote-js-client/src/main/java/org/thingsboard/server/service/script/RemoteJsInvokeService.java b/common/script/remote-js-client/src/main/java/org/thingsboard/server/service/script/RemoteJsInvokeService.java
index d59ecc7b89..159ff59cea 100644
--- a/common/script/remote-js-client/src/main/java/org/thingsboard/server/service/script/RemoteJsInvokeService.java
+++ b/common/script/remote-js-client/src/main/java/org/thingsboard/server/service/script/RemoteJsInvokeService.java
@@ -37,8 +37,8 @@ import org.thingsboard.server.queue.TbQueueRequestTemplate;
 import org.thingsboard.server.queue.common.TbProtoJsQueueMsg;
 import org.thingsboard.server.queue.common.TbProtoQueueMsg;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import java.util.Map;
 import java.util.Optional;
 import java.util.UUID;
diff --git a/common/script/script-api/pom.xml b/common/script/script-api/pom.xml
index 473301a19e..b760129479 100644
--- a/common/script/script-api/pom.xml
+++ b/common/script/script-api/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard.common</groupId>
-        <version>3.6.3-SNAPSHOT</version>
+        <version>3.7.0-SNAPSHOT</version>
         <artifactId>script</artifactId>
     </parent>
     <groupId>org.thingsboard.common.script</groupId>
@@ -52,6 +52,10 @@
             <groupId>org.javadelight</groupId>
             <artifactId>delight-nashorn-sandbox</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.openjdk.nashorn</groupId>
+            <artifactId>nashorn-core</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
@@ -102,11 +106,6 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.awaitility</groupId>
             <artifactId>awaitility</artifactId>
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/ScriptStatCallback.java b/common/script/script-api/src/main/java/org/thingsboard/script/api/ScriptStatCallback.java
index a51cc1a4b7..4945072530 100644
--- a/common/script/script-api/src/main/java/org/thingsboard/script/api/ScriptStatCallback.java
+++ b/common/script/script-api/src/main/java/org/thingsboard/script/api/ScriptStatCallback.java
@@ -19,7 +19,7 @@ import com.google.common.util.concurrent.FutureCallback;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicInteger;
 
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 c5b67e2fe0..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
@@ -31,8 +31,8 @@ import org.thingsboard.script.api.TbScriptException;
 import org.thingsboard.server.common.stats.TbApiUsageReportClient;
 import org.thingsboard.server.common.stats.TbApiUsageStateClient;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import javax.script.Invocable;
 import javax.script.ScriptEngine;
 import javax.script.ScriptEngineManager;
@@ -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/DefaultTbelInvokeService.java b/common/script/script-api/src/main/java/org/thingsboard/script/api/tbel/DefaultTbelInvokeService.java
index 413fd12310..ac631408ee 100644
--- a/common/script/script-api/src/main/java/org/thingsboard/script/api/tbel/DefaultTbelInvokeService.java
+++ b/common/script/script-api/src/main/java/org/thingsboard/script/api/tbel/DefaultTbelInvokeService.java
@@ -46,8 +46,8 @@ import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.stats.TbApiUsageReportClient;
 import org.thingsboard.server.common.stats.TbApiUsageStateClient;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import java.io.Serializable;
 import java.nio.charset.StandardCharsets;
 import java.util.Calendar;
diff --git a/common/script/script-api/src/main/java/org/thingsboard/script/api/tbel/TbDate.java b/common/script/script-api/src/main/java/org/thingsboard/script/api/tbel/TbDate.java
index 3c44273a62..fa1c827c61 100644
--- a/common/script/script-api/src/main/java/org/thingsboard/script/api/tbel/TbDate.java
+++ b/common/script/script-api/src/main/java/org/thingsboard/script/api/tbel/TbDate.java
@@ -65,7 +65,11 @@ public class TbDate implements Serializable, Cloneable {
     }
 
     public TbDate(String s, String pattern, String locale, String zoneId) {
-       this.instant = parseInstant(s, pattern, locale, zoneId);
+        this.instant = parseInstant(s, pattern, locale, zoneId);
+    }
+
+    public TbDate(String s, String pattern, Locale locale, ZoneId zoneId) {
+        instant =  parseInstant(s, pattern, locale, zoneId);
     }
 
     public TbDate(long dateMilliSecond) {
@@ -246,11 +250,11 @@ public class TbDate implements Serializable, Cloneable {
         return instant.toEpochMilli();
     }
 
-   public static long UTC(int year) {
+    public static long UTC(int year) {
         return UTC(year, 0, 0, 0, 0, 0, 0);
     }
     public static long UTC(int year, int month) {
-       return UTC(year, month, 0, 0, 0, 0, 0);
+        return UTC(year, month, 0, 0, 0, 0, 0);
     }
     public static long UTC(int year, int month, int date) {
         return UTC(year, month, date, 0, 0, 0, 0);
@@ -259,7 +263,7 @@ public class TbDate implements Serializable, Cloneable {
         return UTC(year, month, date, hrs, 0, 0, 0);
     }
     public static long UTC(int year, int month, int date, int hrs, int min) {
-       return UTC(year, month, date, hrs, min, 0, 0);
+        return UTC(year, month, date, hrs, min, 0, 0);
     }
     public static long UTC(int year, int month, int date, int hrs, int min, int sec) {
         return UTC(year, month, date, hrs, min, sec, 0);
@@ -283,22 +287,22 @@ public class TbDate implements Serializable, Cloneable {
     }
     // day in week
     public int getUTCDay() {
-       return getUTCDateTime().getDayOfWeek().getValue();
+        return getUTCDateTime().getDayOfWeek().getValue();
     }
 
     public int getUTCHours() {
-       return getUTCDateTime().getHour();
+        return getUTCDateTime().getHour();
     }
 
     public int getUTCMinutes() {
-       return getZonedDateTime().getMinute();
+        return getZonedDateTime().getMinute();
     }
 
     public int getUTCSeconds() {
-       return getUTCDateTime().getSecond();
+        return getUTCDateTime().getSecond();
     }
     public int getUTCMilliseconds() {
-       return getUTCDateTime().getNano()/1000000;
+        return getUTCDateTime().getNano()/1000000;
     }
 
     public void setUTCFullYear(int year) {
@@ -376,25 +380,25 @@ public class TbDate implements Serializable, Cloneable {
     }
     // day in week
     public int getDay() {
-       return getLocalDateTime().getDayOfWeek().getValue();
+        return getLocalDateTime().getDayOfWeek().getValue();
     }
 
     public int getHours() {
-       return getLocalDateTime().getHour();
+        return getLocalDateTime().getHour();
     }
 
     public int getMinutes() {
-       return getLocalDateTime().getMinute();
+        return getLocalDateTime().getMinute();
     }
 
     public int getSeconds() {
-       return getLocalDateTime().getSecond();
+        return getLocalDateTime().getSecond();
     }
     public int getMilliseconds() {
         return getLocalDateTime().getNano()/1000000;
     }
     // Milliseconds since Jan 1, 1970, 00:00:00.000 GMT
-     public long getTime() {
+    public long getTime() {
         return instant.toEpochMilli();
     }
     public long valueOf(){
@@ -473,8 +477,8 @@ public class TbDate implements Serializable, Cloneable {
     }
 
     // Milliseconds since Jan 1, 1970, 00:00:00.000 GMT
-     public void setTime(long dateMilliSecond) {
-         instant = Instant.ofEpochMilli(dateMilliSecond);
+    public void setTime(long dateMilliSecond) {
+        instant = Instant.ofEpochMilli(dateMilliSecond);
     }
 
     public ZoneOffset getLocaleZoneOffset(Instant... instants){
@@ -559,9 +563,9 @@ public class TbDate implements Serializable, Cloneable {
         }
     }
     private static Instant getInstant_RFC_1123(String s) {
-            // assuming RFC-1123 value "Tue, 3 Jun 2008 11:05:30 GMT"
-            // assuming RFC-1123 value "Tue, 3 Jun 2008 11:05:30 GMT-02:00"
-            // assuming RFC-1123 value "Tue, 3 Jun 2008 11:05:30 -0200"
+        // assuming RFC-1123 value "Tue, 3 Jun 2008 11:05:30 GMT"
+        // assuming RFC-1123 value "Tue, 3 Jun 2008 11:05:30 GMT-02:00"
+        // assuming RFC-1123 value "Tue, 3 Jun 2008 11:05:30 -0200"
         DateTimeFormatter formatter = DateTimeFormatter.RFC_1123_DATE_TIME;
         try {
             return Instant.from(formatter.parse(s));
@@ -581,4 +585,11 @@ public class TbDate implements Serializable, Cloneable {
         value =  value.trim() + " " + id.replaceAll(":", "");
         return Instant.from(DateTimeFormatter.RFC_1123_DATE_TIME.parse(value));
     }
+
+    private static Instant parseInstant(String s, String pattern, Locale locale, ZoneId zoneId) {
+        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern(pattern, locale);
+        LocalDateTime localDateTime = LocalDateTime.parse(s, dateTimeFormatter);
+        ZonedDateTime zonedDateTime = localDateTime.atZone(zoneId);
+        return zonedDateTime.toInstant();
+    }
 }
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 18380038e5..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,6 +30,8 @@ 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;
@@ -37,14 +40,39 @@ 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)));
@@ -165,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) {
@@ -579,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);
     }
@@ -613,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;
@@ -653,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/TbDateConstructorTest.java b/common/script/script-api/src/test/java/org/thingsboard/script/api/tbel/TbDateConstructorTest.java
index ff42047eed..6b061f2f49 100644
--- a/common/script/script-api/src/test/java/org/thingsboard/script/api/tbel/TbDateConstructorTest.java
+++ b/common/script/script-api/src/test/java/org/thingsboard/script/api/tbel/TbDateConstructorTest.java
@@ -15,8 +15,8 @@
  */
 package org.thingsboard.script.api.tbel;
 
-import org.junit.Assert;
 import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.mvel2.CompileException;
@@ -27,8 +27,8 @@ import org.mvel2.SandboxedParserConfiguration;
 import java.io.Serializable;
 import java.util.HashMap;
 
-import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mvel2.MVEL.compileExpression;
 import static org.mvel2.MVEL.executeTbExpression;
 
@@ -56,14 +56,14 @@ public class TbDateConstructorTest {
         String body = "var d = new Date(\"2023-08-06T04:04:05.123Z\"); \n" +
                 "d.toISOString()";
         Object res = executeScript(body);
-        Assert.assertNotEquals("2023-08-06T04:04:05.123Z".length(),  res);
+        Assertions.assertNotEquals("2023-08-06T04:04:05.123Z".length(),  res);
 
             // two: date in String + pattern
         body = "var pattern = \"yyyy-MM-dd HH:mm:ss.SSSXXX\";\n" +
                 "var d = new Date(\"2023-08-06 04:04:05.000Z\", pattern);\n" +
                 "d.toISOString()";
         res = executeScript(body);
-        Assert.assertNotEquals("2023-08-06T04:04:05Z".length(),  res);
+        Assertions.assertNotEquals("2023-08-06T04:04:05Z".length(),  res);
 
 
         // three: date in String + pattern + locale
@@ -71,14 +71,14 @@ public class TbDateConstructorTest {
                 "var d = new Date(\"02:15:30 PM, Sun 10/09/2022\", pattern, \"en-US\");" +
                 "d.toISOString()";
         res = executeScript(body);
-        Assert.assertNotEquals("2023-08-06T04:04:05Z".length(),  res);
+        Assertions.assertNotEquals("2023-08-06T04:04:05Z".length(),  res);
 
         // four: date in String + pattern + locale + TimeZone
         body = "var pattern = \"hh:mm:ss a, EEE M/d/uuuu\";\n" +
                 "var d = new Date(\"02:15:30 PM, Sun 10/09/2022\", pattern, \"en-US\", \"America/New_York\");" +
                 "d.toISOString()";
         res = executeScript(body);
-        Assert.assertNotEquals("22022-10-09T18:15:30Z".length(),  res);
+        Assertions.assertNotEquals("22022-10-09T18:15:30Z".length(),  res);
     }
 
     @Test
diff --git a/common/script/script-api/src/test/java/org/thingsboard/script/api/tbel/TbDateTest.java b/common/script/script-api/src/test/java/org/thingsboard/script/api/tbel/TbDateTest.java
index 3d565089a6..439966536b 100644
--- a/common/script/script-api/src/test/java/org/thingsboard/script/api/tbel/TbDateTest.java
+++ b/common/script/script-api/src/test/java/org/thingsboard/script/api/tbel/TbDateTest.java
@@ -21,10 +21,9 @@ import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.ListeningExecutorService;
 import com.google.common.util.concurrent.MoreExecutors;
 import lombok.extern.slf4j.Slf4j;
-import org.assertj.core.api.Assertions;
 import org.assertj.core.data.Offset;
-import org.junit.Assert;
 import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.mvel2.ConversionException;
 import org.thingsboard.common.util.JacksonUtil;
@@ -42,8 +41,8 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @Slf4j
 class TbDateTest {
@@ -128,7 +127,7 @@ class TbDateTest {
         String tsStr = String.format(pattern, String.format("%02d", month), date, hrs);  //Thu Feb 29 2024 14:35:42.987 GMT+0000
         TbDate tbDate = new TbDate(tsStr);
         long ts = 1709217342987L; //Thu Feb 29 2024 14:35:42.987 GMT+0000
-        Assert.assertEquals(ts, tbDate.parseSecondMilli());
+        Assertions.assertEquals(ts, tbDate.parseSecondMilli());
         int offsetLocalSecond = tbDate.getLocaleZoneOffset().getTotalSeconds(); // for example 7200 for GMT + 2
 
         String datePrefix = tsStr; //without time zone
@@ -154,22 +153,22 @@ class TbDateTest {
         String s = "02:15:30 PM, Sun 10/09/2022";
         String pattern = "hh:mm:ss a, EEE M/d/uuuu";
         TbDate d = new TbDate(s, pattern, "en-US");
-            // tz = local
+        // tz = local
         int localOffsetHrs = ZoneId.systemDefault().getRules().getOffset(d.getInstant()).getTotalSeconds()/60/60;
         int hrs = 14 - localOffsetHrs;
         String expected = "2022-10-09T" + hrs + ":15:30Z";
-        Assert.assertEquals(expected, d.toISOString());
+        Assertions.assertEquals(expected, d.toISOString());
 
-            // tz = "-04:00"
+        // tz = "-04:00"
         s = "2023-08-06T04:04:05.00-04:00";
         d = new TbDate(s);
-        Assert.assertEquals("2023-08-06T08:04:05Z", d.toISOString());
+        Assertions.assertEquals("2023-08-06T08:04:05Z", d.toISOString());
 
         s = "02:15:30 PM, Sun 10/09/2022";
         d = new TbDate(s, pattern, "en-US", "-04:00");
-        Assert.assertEquals("2022-10-09T18:15:30Z", d.toISOString());
+        Assertions.assertEquals("2022-10-09T18:15:30Z", d.toISOString());
         d = new TbDate(s, pattern,"en-US", "America/New_York");
-        Assert.assertEquals("2022-10-09T18:15:30Z", d.toISOString());
+        Assertions.assertEquals("2022-10-09T18:15:30Z", d.toISOString());
             // tz = "+02:00"
         /**
          * For Java 11:
@@ -180,7 +179,7 @@ class TbDateTest {
         String s_ver = Runtime.version().feature() == 11 ? "09:15:30 nachm., So. 10/09/2022" :
                                                            "09:15:30 PM, So. 10/09/2022";
         d = new TbDate(s_ver, pattern, "de","Europe/Berlin");
-        Assert.assertEquals("2022-10-09T19:15:30Z", d.toISOString());
+        Assertions.assertEquals("2022-10-09T19:15:30Z", d.toISOString());
 
         s = "02:15:30 пп, середа, 4 жовтня 2023 р.";
         pattern = "hh:mm:ss a, EEEE, d MMMM y 'р.'";
@@ -188,50 +187,50 @@ class TbDateTest {
         localOffsetHrs = ZoneId.systemDefault().getRules().getOffset(d.getInstant()).getTotalSeconds()/60/60;
         hrs = 14 - localOffsetHrs;
         expected = "2023-10-04T" + hrs + ":15:30Z";
-        Assert.assertEquals(expected, d.toISOString());
+        Assertions.assertEquals(expected, d.toISOString());
 
         d = new TbDate(1693962245000L);
-        Assert.assertEquals("2023-09-06T01:04:05Z", d.toISOString());
+        Assertions.assertEquals("2023-09-06T01:04:05Z", d.toISOString());
 
         // Depends on time zone, so we just check it works;
-        Assert.assertNotNull(d.toLocaleDateString());
-        Assert.assertNotNull(d.toLocaleDateString("en-US"));
+        Assertions.assertNotNull(d.toLocaleDateString());
+        Assertions.assertNotNull(d.toLocaleDateString("en-US"));
 
-        Assert.assertEquals("9/5/23", d.toLocaleDateString("en-US", "America/New_York"));
-        Assert.assertEquals("23. 9. 5.", d.toLocaleDateString("ko-KR",  "America/New_York"));
-        Assert.assertEquals("06.09.23",  d.toLocaleDateString( "uk-UA", "Europe/Kiev"));
-        Assert.assertEquals("5\u200F/9\u200F/2023",  d.toLocaleDateString( "ar-EG", "America/New_York"));
+        Assertions.assertEquals("9/5/23", d.toLocaleDateString("en-US", "America/New_York"));
+        Assertions.assertEquals("23. 9. 5.", d.toLocaleDateString("ko-KR",  "America/New_York"));
+        Assertions.assertEquals("06.09.23",  d.toLocaleDateString( "uk-UA", "Europe/Kiev"));
+        Assertions.assertEquals("5\u200F/9\u200F/2023",  d.toLocaleDateString( "ar-EG", "America/New_York"));
 
-        Assert.assertEquals("Tuesday, September 5, 2023", d.toLocaleDateString("en-US", JacksonUtil.newObjectNode()
+        Assertions.assertEquals("Tuesday, September 5, 2023", d.toLocaleDateString("en-US", JacksonUtil.newObjectNode()
                 .put("timeZone", "America/New_York")
                 .put("dateStyle", "full")
                 .toString()));
-        Assert.assertEquals("2023년 9월 5일 화요일", d.toLocaleDateString("ko-KR", JacksonUtil.newObjectNode()
+        Assertions.assertEquals("2023년 9월 5일 화요일", d.toLocaleDateString("ko-KR", JacksonUtil.newObjectNode()
                 .put("timeZone", "America/New_York")
                 .put("dateStyle", "full")
                 .toString()));
-        Assert.assertEquals("середа, 6 вересня 2023 р.", d.toLocaleDateString("uk-UA", JacksonUtil.newObjectNode()
+        Assertions.assertEquals("середа, 6 вересня 2023 р.", d.toLocaleDateString("uk-UA", JacksonUtil.newObjectNode()
                 .put("timeZone", "Europe/Kiev")
                 .put("dateStyle", "full")
                 .toString()));
-        Assert.assertEquals("الثلاثاء، 5 سبتمبر 2023", d.toLocaleDateString("ar-EG", JacksonUtil.newObjectNode()
+        Assertions.assertEquals("الثلاثاء، 5 سبتمبر 2023", d.toLocaleDateString("ar-EG", JacksonUtil.newObjectNode()
                 .put("timeZone", "America/New_York")
                 .put("dateStyle", "full")
                 .toString()));
 
-        Assert.assertEquals("Tuesday 9/5/2023", d.toLocaleDateString("en-US", JacksonUtil.newObjectNode()
+        Assertions.assertEquals("Tuesday 9/5/2023", d.toLocaleDateString("en-US", JacksonUtil.newObjectNode()
                 .put("timeZone", "America/New_York")
                 .put("pattern", "EEEE M/d/yyyy")
                 .toString()));
-        Assert.assertEquals("화요일 9/5/2023", d.toLocaleDateString("ko-KR", JacksonUtil.newObjectNode()
+        Assertions.assertEquals("화요일 9/5/2023", d.toLocaleDateString("ko-KR", JacksonUtil.newObjectNode()
                 .put("timeZone", "America/New_York")
                 .put("pattern", "EEEE M/d/yyyy")
                 .toString()));
-        Assert.assertEquals("середа 9/6/2023", d.toLocaleDateString("uk-UA", JacksonUtil.newObjectNode()
+        Assertions.assertEquals("середа 9/6/2023", d.toLocaleDateString("uk-UA", JacksonUtil.newObjectNode()
                 .put("timeZone", "Europe/Kiev")
                 .put("pattern", "EEEE M/d/yyyy")
                 .toString()));
-        Assert.assertEquals("الثلاثاء 9/5/2023", d.toLocaleDateString("ar-EG", JacksonUtil.newObjectNode()
+        Assertions.assertEquals("الثلاثاء 9/5/2023", d.toLocaleDateString("ar-EG", JacksonUtil.newObjectNode()
                 .put("timeZone", "America/New_York")
                 .put("pattern", "EEEE M/d/yyyy")
                 .toString()));
@@ -242,44 +241,44 @@ class TbDateTest {
         TbDate d = new TbDate(1693962245000L);
 
         // Depends on time zone, so we just check it works;
-        Assert.assertNotNull(d.toLocaleTimeString());
-        Assert.assertNotNull(d.toLocaleTimeString("en-US"));
+        Assertions.assertNotNull(d.toLocaleTimeString());
+        Assertions.assertNotNull(d.toLocaleTimeString("en-US"));
 
-        Assert.assertEquals("9:04:05 PM", d.toLocaleTimeString("en-US", "America/New_York"));
-        Assert.assertEquals("오후 9:04:05", d.toLocaleTimeString("ko-KR",  "America/New_York"));
-        Assert.assertEquals("04:04:05",  d.toLocaleTimeString( "uk-UA", "Europe/Kiev"));
-        Assert.assertEquals("9:04:05 م",  d.toLocaleTimeString( "ar-EG", "America/New_York"));
+        Assertions.assertEquals("9:04:05 PM", d.toLocaleTimeString("en-US", "America/New_York"));
+        Assertions.assertEquals("오후 9:04:05", d.toLocaleTimeString("ko-KR",  "America/New_York"));
+        Assertions.assertEquals("04:04:05",  d.toLocaleTimeString( "uk-UA", "Europe/Kiev"));
+        Assertions.assertEquals("9:04:05 م",  d.toLocaleTimeString( "ar-EG", "America/New_York"));
 
-        Assert.assertEquals("9:04:05 PM Eastern Daylight Time", d.toLocaleTimeString("en-US", JacksonUtil.newObjectNode()
+        Assertions.assertEquals("9:04:05 PM Eastern Daylight Time", d.toLocaleTimeString("en-US", JacksonUtil.newObjectNode()
                 .put("timeZone", "America/New_York")
                 .put("timeStyle", "full")
                 .toString()));
-        Assert.assertEquals("오후 9시 4분 5초 미 동부 하계 표준시", d.toLocaleTimeString("ko-KR", JacksonUtil.newObjectNode()
+        Assertions.assertEquals("오후 9시 4분 5초 미 동부 하계 표준시", d.toLocaleTimeString("ko-KR", JacksonUtil.newObjectNode()
                 .put("timeZone", "America/New_York")
                 .put("timeStyle", "full")
                 .toString()));
-        Assert.assertEquals("04:04:05 за східноєвропейським літнім часом", d.toLocaleTimeString("uk-UA", JacksonUtil.newObjectNode()
+        Assertions.assertEquals("04:04:05 за східноєвропейським літнім часом", d.toLocaleTimeString("uk-UA", JacksonUtil.newObjectNode()
                 .put("timeZone", "Europe/Kiev")
                 .put("timeStyle", "full")
                 .toString()));
-        Assert.assertEquals("9:04:05 م التوقيت الصيفي الشرقي لأمريكا الشمالية", d.toLocaleTimeString("ar-EG", JacksonUtil.newObjectNode()
+        Assertions.assertEquals("9:04:05 م التوقيت الصيفي الشرقي لأمريكا الشمالية", d.toLocaleTimeString("ar-EG", JacksonUtil.newObjectNode()
                 .put("timeZone", "America/New_York")
                 .put("timeStyle", "full")
                 .toString()));
 
-        Assert.assertEquals("9:04:05 PM", d.toLocaleTimeString("en-US", JacksonUtil.newObjectNode()
+        Assertions.assertEquals("9:04:05 PM", d.toLocaleTimeString("en-US", JacksonUtil.newObjectNode()
                 .put("timeZone", "America/New_York")
                 .put("pattern", "h:mm:ss a")
                 .toString()));
-        Assert.assertEquals("9:04:05 오후", d.toLocaleTimeString("ko-KR", JacksonUtil.newObjectNode()
+        Assertions.assertEquals("9:04:05 오후", d.toLocaleTimeString("ko-KR", JacksonUtil.newObjectNode()
                 .put("timeZone", "America/New_York")
                 .put("pattern", "h:mm:ss a")
                 .toString()));
-        Assert.assertEquals("4:04:05 дп", d.toLocaleTimeString("uk-UA", JacksonUtil.newObjectNode()
+        Assertions.assertEquals("4:04:05 дп", d.toLocaleTimeString("uk-UA", JacksonUtil.newObjectNode()
                 .put("timeZone", "Europe/Kiev")
                 .put("pattern", "h:mm:ss a")
                 .toString()));
-        Assert.assertEquals("9:04:05 م", d.toLocaleTimeString("ar-EG", JacksonUtil.newObjectNode()
+        Assertions.assertEquals("9:04:05 م", d.toLocaleTimeString("ar-EG", JacksonUtil.newObjectNode()
                 .put("timeZone", "America/New_York")
                 .put("pattern", "h:mm:ss a")
                 .toString()));
@@ -290,27 +289,27 @@ class TbDateTest {
         TbDate d = new TbDate(1693962245000L);
 
         // Depends on time zone, so we just check it works;
-        Assert.assertNotNull(d.toLocaleString());
-        Assert.assertNotNull(d.toLocaleString("en-US"));
+        Assertions.assertNotNull(d.toLocaleString());
+        Assertions.assertNotNull(d.toLocaleString("en-US"));
 
-        Assert.assertEquals("9/5/23, 9:04:05 PM", d.toLocaleString("en-US", "America/New_York"));
-        Assert.assertEquals("23. 9. 5. 오후 9:04:05", d.toLocaleString("ko-KR",  "America/New_York"));
-        Assert.assertEquals("06.09.23, 04:04:05",  d.toLocaleString( "uk-UA", "Europe/Kiev"));
+        Assertions.assertEquals("9/5/23, 9:04:05 PM", d.toLocaleString("en-US", "America/New_York"));
+        Assertions.assertEquals("23. 9. 5. 오후 9:04:05", d.toLocaleString("ko-KR",  "America/New_York"));
+        Assertions.assertEquals("06.09.23, 04:04:05",  d.toLocaleString( "uk-UA", "Europe/Kiev"));
         String expected_ver = Runtime.version().feature() == 11 ? "5\u200F/9\u200F/2023 9:04:05 م" :
                                                                   "5\u200F/9\u200F/2023, 9:04:05 م";
-        Assert.assertEquals(expected_ver,  d.toLocaleString( "ar-EG", "America/New_York"));
+        Assertions.assertEquals(expected_ver,  d.toLocaleString( "ar-EG", "America/New_York"));
 
-        Assert.assertEquals("Tuesday, September 5, 2023 at 9:04:05 PM Eastern Daylight Time", d.toLocaleString("en-US", JacksonUtil.newObjectNode()
+        Assertions.assertEquals("Tuesday, September 5, 2023 at 9:04:05 PM Eastern Daylight Time", d.toLocaleString("en-US", JacksonUtil.newObjectNode()
                 .put("timeZone", "America/New_York")
                 .put("dateStyle", "full")
                 .put("timeStyle", "full")
                 .toString()));
-        Assert.assertEquals("2023년 9월 5일 화요일 오후 9시 4분 5초 미 동부 하계 표준시", d.toLocaleString("ko-KR", JacksonUtil.newObjectNode()
+        Assertions.assertEquals("2023년 9월 5일 화요일 오후 9시 4분 5초 미 동부 하계 표준시", d.toLocaleString("ko-KR", JacksonUtil.newObjectNode()
                 .put("timeZone", "America/New_York")
                 .put("dateStyle", "full")
                 .put("timeStyle", "full")
-                .toString())); 
-        Assert.assertEquals("середа, 6 вересня 2023 р. о 04:04:05 за східноєвропейським літнім часом", d.toLocaleString("uk-UA", JacksonUtil.newObjectNode()
+                .toString()));
+        Assertions.assertEquals("середа, 6 вересня 2023 р. о 04:04:05 за східноєвропейським літнім часом", d.toLocaleString("uk-UA", JacksonUtil.newObjectNode()
                 .put("timeZone", "Europe/Kiev")
                 .put("dateStyle", "full")
                 .put("timeStyle", "full")
@@ -318,100 +317,100 @@ class TbDateTest {
 
         expected_ver = Runtime.version().feature() == 11 ? "الثلاثاء، 5 سبتمبر 2023 9:04:05 م التوقيت الصيفي الشرقي لأمريكا الشمالية" :
                                                            "الثلاثاء، 5 سبتمبر 2023 في 9:04:05 م التوقيت الصيفي الشرقي لأمريكا الشمالية";
-        Assert.assertEquals(expected_ver, d.toLocaleString("ar-EG", JacksonUtil.newObjectNode()
+        Assertions.assertEquals(expected_ver, d.toLocaleString("ar-EG", JacksonUtil.newObjectNode()
                 .put("timeZone", "America/New_York")
                 .put("dateStyle", "full")
                 .put("timeStyle", "full")
-                .toString())); 
+                .toString()));
 
-        Assert.assertEquals("9/5/2023, 9:04:05 PM", d.toLocaleString("en-US", JacksonUtil.newObjectNode()
+        Assertions.assertEquals("9/5/2023, 9:04:05 PM", d.toLocaleString("en-US", JacksonUtil.newObjectNode()
                 .put("timeZone", "America/New_York")
                 .put("pattern", "M/d/yyyy, h:mm:ss a")
-                .toString())); 
-        Assert.assertEquals("9/5/2023, 9:04:05 오후", d.toLocaleString("ko-KR", JacksonUtil.newObjectNode()
+                .toString()));
+        Assertions.assertEquals("9/5/2023, 9:04:05 오후", d.toLocaleString("ko-KR", JacksonUtil.newObjectNode()
                 .put("timeZone", "America/New_York")
                 .put("pattern", "M/d/yyyy, h:mm:ss a")
-                .toString())); 
-        Assert.assertEquals("9/6/2023, 4:04:05 дп", d.toLocaleString("uk-UA", JacksonUtil.newObjectNode()
+                .toString()));
+        Assertions.assertEquals("9/6/2023, 4:04:05 дп", d.toLocaleString("uk-UA", JacksonUtil.newObjectNode()
                 .put("timeZone", "Europe/Kiev")
                 .put("pattern", "M/d/yyyy, h:mm:ss a")
-                .toString())); 
-        Assert.assertEquals("9/5/2023, 9:04:05 م", d.toLocaleString("ar-EG", JacksonUtil.newObjectNode()
+                .toString()));
+        Assertions.assertEquals("9/5/2023, 9:04:05 م", d.toLocaleString("ar-EG", JacksonUtil.newObjectNode()
                 .put("timeZone", "America/New_York")
                 .put("pattern", "M/d/yyyy, h:mm:ss a")
-                .toString())); 
+                .toString()));
     }
 
     @Test
     void TestFromString () {
         String stringDateUTC = "2023-09-06T01:04:05.00Z";
         TbDate d = new TbDate(stringDateUTC);
-        Assert.assertEquals("2023-09-06T01:04:05Z", d.toISOString());
+        Assertions.assertEquals("2023-09-06T01:04:05Z", d.toISOString());
         String stringDateTZ = "2023-09-06T01:04:05.00+04:00:00";
         d = new TbDate(stringDateTZ);
-        Assert.assertEquals("2023-09-05T21:04:05Z", d.toISOString());
+        Assertions.assertEquals("2023-09-05T21:04:05Z", d.toISOString());
         stringDateTZ = "2023-09-06T01:04:05.00+04";
         d = new TbDate(stringDateTZ);
-        Assert.assertEquals("2023-09-05T21:04:05Z", d.toISOString());
+        Assertions.assertEquals("2023-09-05T21:04:05Z", d.toISOString());
         stringDateTZ = "2023-09-06T01:04:05.00-04:00";
         d = new TbDate(stringDateTZ);
-        Assert.assertEquals("2023-09-06T05:04:05Z", d.toISOString());
+        Assertions.assertEquals("2023-09-06T05:04:05Z", d.toISOString());
         stringDateTZ = "2023-09-06T01:04:05.00+04:30:56";
         d = new TbDate(stringDateTZ);
-        Assert.assertEquals("2023-09-05T20:33:09Z", d.toISOString());
+        Assertions.assertEquals("2023-09-05T20:33:09Z", d.toISOString());
         stringDateTZ = "2023-09-06T01:04:05.00-02:00";
         d = new TbDate(stringDateTZ);
-        Assert.assertEquals("2023-09-06T03:04:05Z", d.toISOString());
-            // Without_TZ
+        Assertions.assertEquals("2023-09-06T03:04:05Z", d.toISOString());
+        // Without_TZ
         stringDateTZ = "2023-08-06T04:04:05.123";
         d = new TbDate(stringDateTZ);
-        Assert.assertEquals("2023-08-06 04:04:05", d.toLocaleString());
+        Assertions.assertEquals("2023-08-06 04:04:05", d.toLocaleString());
 
-            // With TZ RFC_1123
+        // With TZ RFC_1123
         String stringDateRFC_1123 = "Sat, 3 Jun 2023 11:05:30 GMT";
         d = new TbDate(stringDateRFC_1123);
-        Assert.assertEquals("2023-06-03T11:05:30Z", d.toISOString());
+        Assertions.assertEquals("2023-06-03T11:05:30Z", d.toISOString());
         stringDateRFC_1123  = "Sat, 3 Jun 2023 01:04:05 +043056";
         d = new TbDate(stringDateRFC_1123);
-        Assert.assertEquals("2023-06-02T20:33:09Z", d.toISOString());
-       stringDateRFC_1123  = "Sat, 3 Jun 2023 11:05:30 +0400";
+        Assertions.assertEquals("2023-06-02T20:33:09Z", d.toISOString());
+        stringDateRFC_1123  = "Sat, 3 Jun 2023 11:05:30 +0400";
         d = new TbDate(stringDateRFC_1123);
-        Assert.assertEquals("2023-06-03T07:05:30Z", d.toISOString());
+        Assertions.assertEquals("2023-06-03T07:05:30Z", d.toISOString());
         stringDateRFC_1123  = "Thu, 29 Feb 2024 11:05:30 -03";
         d = new TbDate(stringDateRFC_1123);
-        Assert.assertEquals("2024-02-29T14:05:30Z", d.toISOString());
-            // Without TZ RFC_1123
+        Assertions.assertEquals("2024-02-29T14:05:30Z", d.toISOString());
+        // Without TZ RFC_1123
         stringDateRFC_1123  = "Sat, 3 Jun 2023 11:05:30";
         d = new TbDate(stringDateRFC_1123);
-        Assert.assertEquals("2023-06-03 11:05:30", d.toLocaleString());
+        Assertions.assertEquals("2023-06-03 11:05:30", d.toLocaleString());
 
         // With pattern + locale - ok
         String pattern = "hh:mm:ss a, EEE M/d/uuuu";
         String stringDate_ver_RFC_1123 = Runtime.version().feature() == 11 ? "09:15:30 nachm., So. 10/09/2022" :
-                                                                             "09:15:30 PM, So. 10/09/2022";
+                "09:15:30 PM, So. 10/09/2022";
         d = new TbDate(stringDate_ver_RFC_1123 , pattern, "de");
-        Assert.assertEquals("2022-10-09 21:15:30", d.toLocaleString());
+        Assertions.assertEquals("2022-10-09 21:15:30", d.toLocaleString());
 
-            // failed TZ
+        // failed TZ
         String expectedMessage = "Cannot parse value";
         String finalStringDateZ_error0 = "2023-09-06T01:04:05.00+045";
         Exception actual = assertThrows(ConversionException.class, () -> {
             new TbDate(finalStringDateZ_error0);
         });
         assertTrue(actual.getMessage().contains(expectedMessage));
-            // failed TZ
+        // failed TZ
         String finalStringDateZ_error1 = "2023-08-06T04:04:05.123+04:00:00:00";
         actual = assertThrows(ConversionException.class, () -> {
             new TbDate(finalStringDateZ_error1);
         });
         assertTrue(actual.getMessage().contains(expectedMessage));
-            // failed TZ
+        // failed TZ
         String finalStringDateZ_error2 ="2023-08-06T04:04:05.123+4";
         actual = assertThrows(ConversionException.class, () -> {
             new TbDate(finalStringDateZ_error2);
         });
         assertTrue(actual.getMessage().contains(expectedMessage));
-            // The locale does not match the pattern RFC_1123
+        // The locale does not match the pattern RFC_1123
         String finalStringDateZ_error3= "02:15:30 PM, Sun 10/09/2022";
         pattern = "hh:mm:ss a, EEE M/d/uuuu";
         String finalPattern = pattern;
@@ -421,11 +420,11 @@ class TbDateTest {
         assertTrue(actual.getMessage().contains(expectedMessage));
 
         // failed DayOfWeek RFC_1123
-       String stringDateRFC_1123_error  = "Tue, 3 Jun 2023 11:05:30 GMT";
-       actual = assertThrows(ConversionException.class, () -> {
+        String stringDateRFC_1123_error  = "Tue, 3 Jun 2023 11:05:30 GMT";
+        actual = assertThrows(ConversionException.class, () -> {
             new TbDate(stringDateRFC_1123_error);
         });
-       assertTrue(actual.getMessage().contains(expectedMessage));
+        assertTrue(actual.getMessage().contains(expectedMessage));
     }
 
     @Test
@@ -433,10 +432,10 @@ class TbDateTest {
         String stringDateStart = "1970-01-01T00:00:00Z";
         TbDate d = new TbDate(stringDateStart);
         long actualMillis = TbDate.parse("1970-01-01 T00:00:00");
-        Assert.assertEquals(-d.getLocaleZoneOffset().getTotalSeconds() * 1000, actualMillis);
+        Assertions.assertEquals(-d.getLocaleZoneOffset().getTotalSeconds() * 1000, actualMillis);
         String pattern = "yyyy-MM-dd HH:mm:ss.SSS";
         String stringDate = "1995-12-04 00:12:00.000";
-        Assert.assertNotEquals(-1L,  TbDate.parse(stringDate, pattern));
+        Assertions.assertNotEquals(-1L,  TbDate.parse(stringDate, pattern));
     }
 
     @Test
@@ -450,67 +449,67 @@ class TbDateTest {
         TbDate dLocal1 = new TbDate(d1.parseSecondMilli() + d1.getLocaleZoneOffset().getTotalSeconds()*1000);
         TbDate dLocal2 = new TbDate(d2.parseSecondMilli() + d2.getLocaleZoneOffset().getTotalSeconds()*1000);
 
-        Assert.assertEquals(dLocal.getUTCFullYear(), d.getFullYear());
-        Assert.assertEquals(dLocal0.getUTCFullYear(), d0.getFullYear());
-        Assert.assertEquals(dLocal1.getUTCFullYear(), d1.getFullYear());
-        Assert.assertEquals(dLocal2.getUTCFullYear(), d2.getFullYear());
-
-        Assert.assertEquals(dLocal.getUTCMonth(), d.getMonth());
-        Assert.assertEquals(dLocal0.getUTCMonth(), d0.getMonth());
-        Assert.assertEquals(dLocal1.getUTCMonth(), d1.getMonth());
-        Assert.assertEquals(dLocal2.getUTCMonth(), d2.getMonth());
-
-        Assert.assertEquals(dLocal.getUTCDate(), d.getDate());
-        Assert.assertEquals(dLocal0.getUTCDate(), d0.getDate());
-        Assert.assertEquals(dLocal1.getUTCDate(), d1.getDate());
-        Assert.assertEquals(dLocal2.getUTCDate(), d2.getDate());
-
-        Assert.assertEquals(dLocal.getUTCDay(), d.getDay());
-        Assert.assertEquals(dLocal0.getUTCDay(), d0.getDay());
-        Assert.assertEquals(dLocal1.getUTCDay(), d1.getDay());
-        Assert.assertEquals(dLocal2.getUTCDay(), d2.getDay());
-
-        Assert.assertEquals(dLocal.getUTCHours(), d.getHours());
-        Assert.assertEquals(dLocal0.getUTCHours(), d0.getHours());
-        Assert.assertEquals(dLocal1.getUTCHours(), d1.getHours());
-        Assert.assertEquals(dLocal2.getUTCHours(), d2.getHours());
-
-        Assert.assertEquals(dLocal.getUTCMinutes(), d.getMinutes());
-        Assert.assertEquals(dLocal0.getUTCMinutes(), d0.getMinutes());
-        Assert.assertEquals(dLocal1.getUTCMinutes(), d1.getMinutes());
-        Assert.assertEquals(dLocal2.getUTCMinutes(), d2.getMinutes());
-
-        Assert.assertEquals(dLocal.getUTCSeconds(), d.getSeconds());
-        Assert.assertEquals(dLocal0.getUTCSeconds(), d0.getSeconds());
-        Assert.assertEquals(dLocal1.getUTCSeconds(), d1.getSeconds());
-        Assert.assertEquals(dLocal2.getUTCSeconds(), d2.getSeconds());
-
-        Assert.assertEquals(dLocal.getUTCMilliseconds(), d.getMilliseconds());
-        Assert.assertEquals(dLocal0.getUTCMilliseconds(), d0.getMilliseconds());
-        Assert.assertEquals(dLocal1.getUTCMilliseconds(), d1.getMilliseconds());
-        Assert.assertEquals(dLocal2.getUTCMilliseconds(), d2.getMilliseconds());
+        Assertions.assertEquals(dLocal.getUTCFullYear(), d.getFullYear());
+        Assertions.assertEquals(dLocal0.getUTCFullYear(), d0.getFullYear());
+        Assertions.assertEquals(dLocal1.getUTCFullYear(), d1.getFullYear());
+        Assertions.assertEquals(dLocal2.getUTCFullYear(), d2.getFullYear());
+
+        Assertions.assertEquals(dLocal.getUTCMonth(), d.getMonth());
+        Assertions.assertEquals(dLocal0.getUTCMonth(), d0.getMonth());
+        Assertions.assertEquals(dLocal1.getUTCMonth(), d1.getMonth());
+        Assertions.assertEquals(dLocal2.getUTCMonth(), d2.getMonth());
+
+        Assertions.assertEquals(dLocal.getUTCDate(), d.getDate());
+        Assertions.assertEquals(dLocal0.getUTCDate(), d0.getDate());
+        Assertions.assertEquals(dLocal1.getUTCDate(), d1.getDate());
+        Assertions.assertEquals(dLocal2.getUTCDate(), d2.getDate());
+
+        Assertions.assertEquals(dLocal.getUTCDay(), d.getDay());
+        Assertions.assertEquals(dLocal0.getUTCDay(), d0.getDay());
+        Assertions.assertEquals(dLocal1.getUTCDay(), d1.getDay());
+        Assertions.assertEquals(dLocal2.getUTCDay(), d2.getDay());
+
+        Assertions.assertEquals(dLocal.getUTCHours(), d.getHours());
+        Assertions.assertEquals(dLocal0.getUTCHours(), d0.getHours());
+        Assertions.assertEquals(dLocal1.getUTCHours(), d1.getHours());
+        Assertions.assertEquals(dLocal2.getUTCHours(), d2.getHours());
+
+        Assertions.assertEquals(dLocal.getUTCMinutes(), d.getMinutes());
+        Assertions.assertEquals(dLocal0.getUTCMinutes(), d0.getMinutes());
+        Assertions.assertEquals(dLocal1.getUTCMinutes(), d1.getMinutes());
+        Assertions.assertEquals(dLocal2.getUTCMinutes(), d2.getMinutes());
+
+        Assertions.assertEquals(dLocal.getUTCSeconds(), d.getSeconds());
+        Assertions.assertEquals(dLocal0.getUTCSeconds(), d0.getSeconds());
+        Assertions.assertEquals(dLocal1.getUTCSeconds(), d1.getSeconds());
+        Assertions.assertEquals(dLocal2.getUTCSeconds(), d2.getSeconds());
+
+        Assertions.assertEquals(dLocal.getUTCMilliseconds(), d.getMilliseconds());
+        Assertions.assertEquals(dLocal0.getUTCMilliseconds(), d0.getMilliseconds());
+        Assertions.assertEquals(dLocal1.getUTCMilliseconds(), d1.getMilliseconds());
+        Assertions.assertEquals(dLocal2.getUTCMilliseconds(), d2.getMilliseconds());
     }
 
     @Test
     void Test_Year_Moth_Date_Hours_Min_Sec_Without_TZ() {
 
         TbDate d = new TbDate(2023, 8, 18);
-        Assert.assertEquals("2023-08-18 00:00:00", d.toLocaleString());
+        Assertions.assertEquals("2023-08-18 00:00:00", d.toLocaleString());
         d = new TbDate(2023, 9, 17, 17, 34);
-        Assert.assertEquals("2023-09-17 17:34:00", d.toLocaleString());
+        Assertions.assertEquals("2023-09-17 17:34:00", d.toLocaleString());
         d = new TbDate(23, 9, 7, 8, 4);
-        Assert.assertEquals("2023-09-07 08:04:00", d.toLocaleString());
+        Assertions.assertEquals("2023-09-07 08:04:00", d.toLocaleString());
         d = new TbDate(23, 9, 7, 8, 4, 5);
-        Assert.assertEquals("2023-09-07 08:04:05", d.toLocaleString());
+        Assertions.assertEquals("2023-09-07 08:04:05", d.toLocaleString());
         d = new TbDate(23, 9, 7, 8, 4, 5, 567);
-        Assert.assertEquals("2023-09-07 08:04:05", d.toLocaleString());
+        Assertions.assertEquals("2023-09-07 08:04:05", d.toLocaleString());
     }
 
     @Test
     void Test_DateString_With_Pattern() {
         String pattern = "yyyy-MM-dd HH:mm:ss.SSSXXX";
         TbDate d = new TbDate("2023-08-06 04:04:05.000-04:00", pattern);
-        Assert.assertEquals("2023-08-06T08:04:05Z", d.toISOString());
+        Assertions.assertEquals("2023-08-06T08:04:05Z", d.toISOString());
     }
     @Test
     void Test_DateString_With_TZ() {
@@ -524,7 +523,7 @@ class TbDateTest {
         int localOffsetHrs = ZoneId.systemDefault().getRules().getOffset(d.getInstant()).getTotalSeconds()/60/60;
         TbDateTestEntity tbDateTest = new TbDateTestEntity(23, 9, date, hrs + localOffsetHrs - tz);
         String expected = String.format(pattern, tbDateTest.geDateStr(), tbDateTest.geHoursStr());
-        Assert.assertEquals(expected, d.toLocaleString());
+        Assertions.assertEquals(expected, d.toLocaleString());
 
         tz = +5;
         tzStr = "+05:00";
@@ -533,7 +532,7 @@ class TbDateTest {
         localOffsetHrs = ZoneId.systemDefault().getRules().getOffset(d.getInstant()).getTotalSeconds()/60/60;
         tbDateTest = new TbDateTestEntity(23, 9, date, hrs + localOffsetHrs - tz);
         expected = String.format(pattern, tbDateTest.geDateStr(), tbDateTest.geHoursStr());
-        Assert.assertEquals(expected, d.toLocaleString());
+        Assertions.assertEquals(expected, d.toLocaleString());
 
         tz = -2;
         tzStr = "-02";
@@ -542,7 +541,7 @@ class TbDateTest {
         localOffsetHrs = ZoneId.systemDefault().getRules().getOffset(d.getInstant()).getTotalSeconds()/60/60;
         tbDateTest = new TbDateTestEntity(23, 9, date, hrs + localOffsetHrs - tz);
         expected = String.format(pattern, tbDateTest.geDateStr(), tbDateTest.geHoursStr());
-        Assert.assertEquals(expected, d.toLocaleString());
+        Assertions.assertEquals(expected, d.toLocaleString());
     }
 
     @Test
@@ -556,13 +555,13 @@ class TbDateTest {
         int localOffsetHrs = 0;
         TbDateTestEntity tbDateTest = new TbDateTestEntity(23, 9, date, hrs + localOffsetHrs - tz);
         String expected = String.format(pattern, tbDateTest.geDateStr(), tbDateTest.geHoursStr());
-        Assert.assertEquals(expected, d.toLocaleString());
+        Assertions.assertEquals(expected, d.toLocaleString());
 
         d = new TbDate(23, 9, date, hrs, 4, 5, tzStr);
         localOffsetHrs = ZoneId.systemDefault().getRules().getOffset(d.getInstant()).getTotalSeconds()/60/60;
         tbDateTest = new TbDateTestEntity(23, 9, date, hrs + localOffsetHrs - tz);
         expected = String.format(pattern, tbDateTest.geDateStr(), tbDateTest.geHoursStr());
-        Assert.assertEquals(expected, d.toLocaleString());
+        Assertions.assertEquals(expected, d.toLocaleString());
 
         tz = 3;
         tzStr = "+03:00";
@@ -570,7 +569,7 @@ class TbDateTest {
         localOffsetHrs = ZoneId.systemDefault().getRules().getOffset(d.getInstant()).getTotalSeconds()/60/60;
         tbDateTest = new TbDateTestEntity(23, 9, date, hrs + localOffsetHrs - tz);
         expected = String.format(pattern, tbDateTest.geDateStr(), tbDateTest.geHoursStr());
-        Assert.assertEquals(expected, d.toLocaleString());
+        Assertions.assertEquals(expected, d.toLocaleString());
 
         tz = -4;
         tzStr = "-04:00";
@@ -578,19 +577,19 @@ class TbDateTest {
         localOffsetHrs = ZoneId.systemDefault().getRules().getOffset(d.getInstant()).getTotalSeconds()/60/60;
         tbDateTest = new TbDateTestEntity(23, 9, date, hrs + localOffsetHrs - tz);
         expected = String.format(pattern, tbDateTest.geDateStr(), tbDateTest.geHoursStr());
-        Assert.assertEquals(expected, d.toLocaleString());
+        Assertions.assertEquals(expected, d.toLocaleString());
     }
 
     @Test
     public void TestToUTC() {
-        Assert.assertEquals(-2209075200000L, TbDate.UTC(0));
-        Assert.assertEquals("1899-12-31T00:00:00Z", new TbDate(TbDate.UTC(0)).toJSON());
-        Assert.assertEquals("1996-02-02T03:04:05Z", new TbDate(TbDate.UTC(96, 2, 2, 3, 4, 5)).toJSON());
-        Assert.assertEquals("2022-12-31T03:04:05.678Z", new TbDate(TbDate.UTC(22, 0, 0, 3, 4, 5, 678)).toJSON());
-        Assert.assertEquals("0903-12-31T03:04:05.678Z", new TbDate(TbDate.UTC(903, 0, 0, 3, 4, 5, 678)).toJSON());
-        Assert.assertEquals("1958-12-31T03:04:05.678Z", new TbDate(TbDate.UTC(1958, 0, 0, 3, 4, 5, 678)).toJSON());
-        Assert.assertEquals("2032-04-05T03:04:05.678Z", new TbDate(TbDate.UTC(2032, 4, 5, 3, 4, 5, 678)).toJSON());
-        Assert.assertEquals("2024-02-29T03:04:05.678Z", new TbDate(TbDate.UTC(2024, 2, 29, 3, 4, 5, 678)).toJSON());
+        Assertions.assertEquals(-2209075200000L, TbDate.UTC(0));
+        Assertions.assertEquals("1899-12-31T00:00:00Z", new TbDate(TbDate.UTC(0)).toJSON());
+        Assertions.assertEquals("1996-02-02T03:04:05Z", new TbDate(TbDate.UTC(96, 2, 2, 3, 4, 5)).toJSON());
+        Assertions.assertEquals("2022-12-31T03:04:05.678Z", new TbDate(TbDate.UTC(22, 0, 0, 3, 4, 5, 678)).toJSON());
+        Assertions.assertEquals("0903-12-31T03:04:05.678Z", new TbDate(TbDate.UTC(903, 0, 0, 3, 4, 5, 678)).toJSON());
+        Assertions.assertEquals("1958-12-31T03:04:05.678Z", new TbDate(TbDate.UTC(1958, 0, 0, 3, 4, 5, 678)).toJSON());
+        Assertions.assertEquals("2032-04-05T03:04:05.678Z", new TbDate(TbDate.UTC(2032, 4, 5, 3, 4, 5, 678)).toJSON());
+        Assertions.assertEquals("2024-02-29T03:04:05.678Z", new TbDate(TbDate.UTC(2024, 2, 29, 3, 4, 5, 678)).toJSON());
         Exception actual = assertThrows(DateTimeException.class, () -> {
             TbDate.UTC(2023, 2, 29, 3, 4, 5, 678);
         });
@@ -601,16 +600,16 @@ class TbDateTest {
     @Test
     void TestMethodGetTimeUTC() {
         TbDate ddUTC = new TbDate(TbDate.UTC(1996, 1, 2, 3, 4, 5));
-        Assert.assertEquals(820551845000L, ddUTC.valueOf());
+        Assertions.assertEquals(820551845000L, ddUTC.valueOf());
         TbDate dd = new TbDate(1996, 1, 2, 3, 4, 5);
         int localOffsetMilli = ZoneId.systemDefault().getRules().getOffset(dd.getInstant()).getTotalSeconds()*1000;
-        Assert.assertEquals((dd.valueOf() + localOffsetMilli), ddUTC.valueOf());
+        Assertions.assertEquals((dd.valueOf() + localOffsetMilli), ddUTC.valueOf());
 
         ddUTC = new TbDate(TbDate.UTC(1969, 7, 20, 20, 17, 40));
-        Assert.assertEquals(-14182940000L, ddUTC.valueOf());
+        Assertions.assertEquals(-14182940000L, ddUTC.valueOf());
         TbDate beforeStartUTC = new TbDate(1969, 7, 20, 20, 17, 40);
         localOffsetMilli = ZoneId.systemDefault().getRules().getOffset(beforeStartUTC.getInstant()).getTotalSeconds()*1000;
-        Assert.assertEquals((beforeStartUTC.valueOf() + localOffsetMilli), ddUTC.valueOf());
+        Assertions.assertEquals((beforeStartUTC.valueOf() + localOffsetMilli), ddUTC.valueOf());
     }
 
     @Test
@@ -714,51 +713,51 @@ class TbDateTest {
         TbDate d1 = new TbDate(1975, 12, 31, 23, 15, 30, 567, "-03:00");
         long dateMilliSecond = d1.getTime();
         int fiveMinutesInMillis = 5 * 60 * 1000;
-        Assert.assertEquals(15, d1.getUTCMinutes());
-        Assert.assertEquals(4, d1.getUTCDay());
+        Assertions.assertEquals(15, d1.getUTCMinutes());
+        Assertions.assertEquals(4, d1.getUTCDay());
         d1.setTime(dateMilliSecond + fiveMinutesInMillis);
-        Assert.assertEquals(20, d1.getUTCMinutes());
-        Assert.assertEquals(4, d1.getUTCDay());
+        Assertions.assertEquals(20, d1.getUTCMinutes());
+        Assertions.assertEquals(4, d1.getUTCDay());
         d1.setTime(-378682769433L);
-        Assert.assertEquals(1958, d1.getUTCFullYear());
-        Assert.assertEquals(1, d1.getUTCMonth());
-        Assert.assertEquals(1, d1.getUTCDate());
-        Assert.assertEquals(2, d1.getUTCHours());
-        Assert.assertEquals(20, d1.getUTCMinutes());
-        Assert.assertEquals(30, d1.getUTCSeconds());
-        Assert.assertEquals(567, d1.getUTCMilliseconds());
-        Assert.assertEquals(3, d1.getUTCDay());
+        Assertions.assertEquals(1958, d1.getUTCFullYear());
+        Assertions.assertEquals(1, d1.getUTCMonth());
+        Assertions.assertEquals(1, d1.getUTCDate());
+        Assertions.assertEquals(2, d1.getUTCHours());
+        Assertions.assertEquals(20, d1.getUTCMinutes());
+        Assertions.assertEquals(30, d1.getUTCSeconds());
+        Assertions.assertEquals(567, d1.getUTCMilliseconds());
+        Assertions.assertEquals(3, d1.getUTCDay());
     }
-     @Test
+    @Test
     void TestMethodSeFullYearMonthDate() {
-         TbDate d = new TbDate(2024, 1, 1, 1, 15, 30, 567);
-         testResultChangeDateTime(d);
+        TbDate d = new TbDate(2024, 1, 1, 1, 15, 30, 567);
+        testResultChangeDateTime(d);
 
-         d = new TbDate(2023, 12, 31, 22, 15, 30, 567);
-         testResultChangeDateTime(d);
+        d = new TbDate(2023, 12, 31, 22, 15, 30, 567);
+        testResultChangeDateTime(d);
 
-         d = new TbDate(1975, 12, 31, 1, 15, 30, 567);
-         testResultChangeDateTime(d);
+        d = new TbDate(1975, 12, 31, 1, 15, 30, 567);
+        testResultChangeDateTime(d);
 
-         d.setFullYear(1969);
-         testResultChangeDateTime(d);
+        d.setFullYear(1969);
+        testResultChangeDateTime(d);
 
-         d.setFullYear(1975, 2);
-         testResultChangeDateTime(d);
+        d.setFullYear(1975, 2);
+        testResultChangeDateTime(d);
 
-         d.setFullYear(2023, 6, 30);
-         testResultChangeDateTime(d);
+        d.setFullYear(2023, 6, 30);
+        testResultChangeDateTime(d);
 
-         d.setMonth(2);
-         testResultChangeDateTime(d);
+        d.setMonth(2);
+        testResultChangeDateTime(d);
 
-         d.setMonth(1, 24);
-         testResultChangeDateTime(d);
+        d.setMonth(1, 24);
+        testResultChangeDateTime(d);
 
-         d.setDate(6);
-         testResultChangeDateTime(d);
-     }
-     @Test
+        d.setDate(6);
+        testResultChangeDateTime(d);
+    }
+    @Test
     void TestMethodSeHoursMinutesSecondsMilliSec() {
         TbDate d1 = new TbDate(1975, 12, 31, 23, 15, 30, 567, "+02:00");
         TbDate d2 = new TbDate(1975, 12, 31, 23, 15, 30, 567, "-02:00");
@@ -787,95 +786,95 @@ class TbDateTest {
 
         d1.setMinutes(5);
         d2.setMinutes(15);
-        Assert.assertEquals(5, d1.getMinutes());
-        Assert.assertEquals(15, d2.getMinutes());
+        Assertions.assertEquals(5, d1.getMinutes());
+        Assertions.assertEquals(15, d2.getMinutes());
 
         d1.setMinutes(5, 34);
         d2.setMinutes(25, 43);
-        Assert.assertEquals(5, d1.getMinutes());
-        Assert.assertEquals(34, d1.getSeconds());
-        Assert.assertEquals(25, d2.getMinutes());
-        Assert.assertEquals(43, d2.getSeconds());
+        Assertions.assertEquals(5, d1.getMinutes());
+        Assertions.assertEquals(34, d1.getSeconds());
+        Assertions.assertEquals(25, d2.getMinutes());
+        Assertions.assertEquals(43, d2.getSeconds());
 
         d1.setMinutes(25, 14, 567);
         d2.setMinutes(45, 3, 876);
-        Assert.assertEquals(25, d1.getMinutes());
-        Assert.assertEquals(14, d1.getSeconds());
-        Assert.assertEquals(567, d1.getMilliseconds());
-        Assert.assertEquals(45, d2.getMinutes());
-        Assert.assertEquals(3, d2.getSeconds());
-        Assert.assertEquals(876, d2.getMilliseconds());
+        Assertions.assertEquals(25, d1.getMinutes());
+        Assertions.assertEquals(14, d1.getSeconds());
+        Assertions.assertEquals(567, d1.getMilliseconds());
+        Assertions.assertEquals(45, d2.getMinutes());
+        Assertions.assertEquals(3, d2.getSeconds());
+        Assertions.assertEquals(876, d2.getMilliseconds());
 
         d1.setSeconds(5);
         d2.setSeconds(23);
-        Assert.assertEquals(5, d1.getSeconds());
-        Assert.assertEquals(23, d2.getSeconds());
+        Assertions.assertEquals(5, d1.getSeconds());
+        Assertions.assertEquals(23, d2.getSeconds());
 
         d1.setSeconds(45, 987);
         d2.setSeconds(54, 842);
-        Assert.assertEquals(45, d1.getSeconds());
-        Assert.assertEquals(987, d1.getMilliseconds());
-        Assert.assertEquals(54, d2.getSeconds());
-        Assert.assertEquals(842, d2.getMilliseconds());
+        Assertions.assertEquals(45, d1.getSeconds());
+        Assertions.assertEquals(987, d1.getMilliseconds());
+        Assertions.assertEquals(54, d2.getSeconds());
+        Assertions.assertEquals(842, d2.getMilliseconds());
 
         d1.setMilliseconds(675);
         d2.setMilliseconds(923);
-        Assert.assertEquals(675, d1.getMilliseconds());
-        Assert.assertEquals(923, d2.getMilliseconds());
+        Assertions.assertEquals(675, d1.getMilliseconds());
+        Assertions.assertEquals(923, d2.getMilliseconds());
     }
     @Test
     public void toStringAsJs() {
         TbDate d1 = new TbDate(1975, 12, 31, 23,15,30, 567,"-04:00");
-        Assert.assertEquals("четвер, 1 січня 1976 р. о 06:15:30 за східноєвропейським стандартним часом", d1.toString("uk-UA", "Europe/Kyiv"));
-        Assert.assertEquals("Thursday, January 1, 1976 at 6:15:30 AM Eastern European Standard Time", d1.toString("en-US", "Europe/Kyiv"));
-        Assert.assertEquals("1976 Jan 1, Thu 06:15:30 Eastern European Time", d1.toString("UTC", "Europe/Kyiv"));
-        Assert.assertEquals("Wednesday, December 31, 1975 at 10:15:30 PM Eastern Standard Time", d1.toString("en-US", "America/New_York"));
-        Assert.assertEquals("1975 Dec 31, Wed 22:15:30 Eastern Standard Time", d1.toString("GMT", "America/New_York"));
-        Assert.assertEquals("1975 Dec 31, Wed 22:15:30 Eastern Standard Time", d1.toString("UTC", "America/New_York"));
-
-        Assert.assertEquals(d1.toUTCString("UTC"), d1.toUTCString());
-        Assert.assertEquals("четвер, 1 січня 1976 р., 03:15:30", d1.toUTCString("uk-UA"));
-        Assert.assertEquals("Thursday, January 1, 1976, 3:15:30 AM", d1.toUTCString("en-US"));
-
-        Assert.assertEquals("1976-01-01T03:15:30.567Z", d1.toJSON());
-        Assert.assertEquals("1976-01-01T03:15:30.567Z", d1.toISOString());
-
-        Assert.assertEquals("1976-01-01 06:15:30", d1.toLocaleString("UTC", "Europe/Kyiv"));
-        Assert.assertEquals("01.01.76, 06:15:30", d1.toLocaleString("uk-UA", "Europe/Kyiv"));
-        Assert.assertEquals("1975-12-31 22:15:30", d1.toLocaleString("UTC", "America/New_York"));
-        Assert.assertEquals("12/31/75, 10:15:30 PM", d1.toLocaleString("en-US", "America/New_York"));
-
-        Assert.assertEquals("1976 Jan 1, Thu", d1.toDateString("UTC", "Europe/Kyiv"));
-        Assert.assertEquals("четвер, 1 січня 1976 р.", d1.toDateString("uk-UA", "Europe/Kyiv"));
-        Assert.assertEquals("1975 Dec 31, Wed", d1.toDateString("UTC", "America/New_York"));
-        Assert.assertEquals("Wednesday, December 31, 1975", d1.toDateString("en-US", "America/New_York"));
-
-        Assert.assertEquals("06:15:30", d1.toLocaleTimeString("uk-UA", "Europe/Kyiv"));
-        Assert.assertEquals("06:15:30", d1.toLocaleTimeString("UTC", "Europe/Kyiv"));
-        Assert.assertEquals("10:15:30 PM", d1.toLocaleTimeString("en-US", "America/New_York"));
-        Assert.assertEquals("22:15:30", d1.toLocaleTimeString("UTC", "America/New_York"));
-
-        Assert.assertEquals("06:15:30 за східноєвропейським стандартним часом", d1.toTimeString("uk-UA", "Europe/Kyiv"));
-        Assert.assertEquals("06:15:30 Eastern European Time", d1.toTimeString("UTC", "Europe/Kyiv"));
-        Assert.assertEquals("10:15:30 PM Eastern Standard Time", d1.toTimeString("en-US", "America/New_York"));
-        Assert.assertEquals("22:15:30 Eastern Standard Time", d1.toTimeString("UTC", "America/New_York"));
+        Assertions.assertEquals("четвер, 1 січня 1976 р. о 06:15:30 за східноєвропейським стандартним часом", d1.toString("uk-UA", "Europe/Kyiv"));
+        Assertions.assertEquals("Thursday, January 1, 1976 at 6:15:30 AM Eastern European Standard Time", d1.toString("en-US", "Europe/Kyiv"));
+        Assertions.assertEquals("1976 Jan 1, Thu 06:15:30 Eastern European Time", d1.toString("UTC", "Europe/Kyiv"));
+        Assertions.assertEquals("Wednesday, December 31, 1975 at 10:15:30 PM Eastern Standard Time", d1.toString("en-US", "America/New_York"));
+        Assertions.assertEquals("1975 Dec 31, Wed 22:15:30 Eastern Standard Time", d1.toString("GMT", "America/New_York"));
+        Assertions.assertEquals("1975 Dec 31, Wed 22:15:30 Eastern Standard Time", d1.toString("UTC", "America/New_York"));
+
+        Assertions.assertEquals(d1.toUTCString("UTC"), d1.toUTCString());
+        Assertions.assertEquals("четвер, 1 січня 1976 р., 03:15:30", d1.toUTCString("uk-UA"));
+        Assertions.assertEquals("Thursday, January 1, 1976, 3:15:30 AM", d1.toUTCString("en-US"));
+
+        Assertions.assertEquals("1976-01-01T03:15:30.567Z", d1.toJSON());
+        Assertions.assertEquals("1976-01-01T03:15:30.567Z", d1.toISOString());
+
+        Assertions.assertEquals("1976-01-01 06:15:30", d1.toLocaleString("UTC", "Europe/Kyiv"));
+        Assertions.assertEquals("01.01.76, 06:15:30", d1.toLocaleString("uk-UA", "Europe/Kyiv"));
+        Assertions.assertEquals("1975-12-31 22:15:30", d1.toLocaleString("UTC", "America/New_York"));
+        Assertions.assertEquals("12/31/75, 10:15:30 PM", d1.toLocaleString("en-US", "America/New_York"));
+
+        Assertions.assertEquals("1976 Jan 1, Thu", d1.toDateString("UTC", "Europe/Kyiv"));
+        Assertions.assertEquals("четвер, 1 січня 1976 р.", d1.toDateString("uk-UA", "Europe/Kyiv"));
+        Assertions.assertEquals("1975 Dec 31, Wed", d1.toDateString("UTC", "America/New_York"));
+        Assertions.assertEquals("Wednesday, December 31, 1975", d1.toDateString("en-US", "America/New_York"));
+
+        Assertions.assertEquals("06:15:30", d1.toLocaleTimeString("uk-UA", "Europe/Kyiv"));
+        Assertions.assertEquals("06:15:30", d1.toLocaleTimeString("UTC", "Europe/Kyiv"));
+        Assertions.assertEquals("10:15:30 PM", d1.toLocaleTimeString("en-US", "America/New_York"));
+        Assertions.assertEquals("22:15:30", d1.toLocaleTimeString("UTC", "America/New_York"));
+
+        Assertions.assertEquals("06:15:30 за східноєвропейським стандартним часом", d1.toTimeString("uk-UA", "Europe/Kyiv"));
+        Assertions.assertEquals("06:15:30 Eastern European Time", d1.toTimeString("UTC", "Europe/Kyiv"));
+        Assertions.assertEquals("10:15:30 PM Eastern Standard Time", d1.toTimeString("en-US", "America/New_York"));
+        Assertions.assertEquals("22:15:30 Eastern Standard Time", d1.toTimeString("UTC", "America/New_York"));
     }
 
     @Test
     public void testNow() {
-        Assertions.assertThat(TbDate.now()).isCloseTo(Instant.now().toEpochMilli(), Offset.offset(1000L));
+        assertThat(TbDate.now()).isCloseTo(Instant.now().toEpochMilli(), Offset.offset(1000L));
     }
 
     private void testResultChangeDateTime(TbDate d) {
         int localOffset = ZoneId.systemDefault().getRules().getOffset(d.getInstant()).getTotalSeconds();
         TbDateTestEntity tbDateTestEntity = new TbDateTestEntity(d.getFullYear(), d.getMonth(), d.getDate(), (d.getHours() - (localOffset/60/60)));
-        Assert.assertEquals(tbDateTestEntity.getYear(), d.getUTCFullYear());
-        Assert.assertEquals(tbDateTestEntity.getMonth(), d.getUTCMonth());
-        Assert.assertEquals(tbDateTestEntity.getDate(), d.getUTCDate());
-        Assert.assertEquals(tbDateTestEntity.getHours(), d.getUTCHours());
-        Assert.assertEquals(d.getMinutes(), d.getUTCMinutes());
-        Assert.assertEquals(d.getSeconds(), d.getUTCSeconds());
-        Assert.assertEquals(d.getMilliseconds(), d.getUTCMilliseconds());
+        Assertions.assertEquals(tbDateTestEntity.getYear(), d.getUTCFullYear());
+        Assertions.assertEquals(tbDateTestEntity.getMonth(), d.getUTCMonth());
+        Assertions.assertEquals(tbDateTestEntity.getDate(), d.getUTCDate());
+        Assertions.assertEquals(tbDateTestEntity.getHours(), d.getUTCHours());
+        Assertions.assertEquals(d.getMinutes(), d.getUTCMinutes());
+        Assertions.assertEquals(d.getSeconds(), d.getUTCSeconds());
+        Assertions.assertEquals(d.getMilliseconds(), d.getUTCMilliseconds());
     }
 
     @Test
@@ -883,7 +882,7 @@ class TbDateTest {
         String stringDateUTC = "2023-09-06T01:04:05.345Z";
         TbDate expectedDate = new TbDate(stringDateUTC);
         String serializedTbDate = JacksonUtil.toJsonNode(JacksonUtil.toString(Map.of("date", expectedDate))).get("date").asText();
-        Assert.assertNotNull(serializedTbDate);
-        Assert.assertEquals(expectedDate.toString(), serializedTbDate);
+        Assertions.assertNotNull(serializedTbDate);
+        Assertions.assertEquals(expectedDate.toString(), serializedTbDate);
     }
 }
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..b4e7e7411d 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
@@ -17,10 +17,10 @@ package org.thingsboard.script.api.tbel;
 
 import com.google.common.primitives.Bytes;
 import lombok.extern.slf4j.Slf4j;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
 import org.mvel2.ExecutionContext;
 import org.mvel2.ParserContext;
 import org.mvel2.SandboxedParserConfiguration;
@@ -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;
@@ -59,7 +57,7 @@ public class TbUtilsTest {
     private final double doubleValRev = -2.7208640774822924E205;
 
 
-    @Before
+    @BeforeEach
     public void before() {
         SandboxedParserConfiguration parserConfig = ParserContext.enableSandboxedMode();
         parserConfig.addImport("JSON", TbJson.class);
@@ -72,76 +70,76 @@ public class TbUtilsTest {
             log.error("Cannot register functions", e);
         }
         ctx = new ExecutionContext(parserConfig);
-        Assert.assertNotNull(ctx);
+        Assertions.assertNotNull(ctx);
     }
 
-    @After
+    @AfterEach
     public void after() {
         ctx.stop();
     }
 
     @Test
     public void parseHexToInt() {
-        Assert.assertEquals(0xAB, TbUtils.parseHexToInt("AB"));
-
-        Assert.assertEquals(0xABBA, TbUtils.parseHexToInt("ABBA", true));
-        Assert.assertEquals(0xBAAB, TbUtils.parseHexToInt("ABBA", false));
-        Assert.assertEquals(0xAABBCC, TbUtils.parseHexToInt("AABBCC", true));
-        Assert.assertEquals(0xAABBCC, TbUtils.parseHexToInt("CCBBAA", false));
-        Assert.assertEquals(0xAABBCCDD, TbUtils.parseHexToInt("AABBCCDD", true));
-        Assert.assertEquals(0xAABBCCDD, TbUtils.parseHexToInt("DDCCBBAA", false));
-        Assert.assertEquals(0xDDCCBBAA, TbUtils.parseHexToInt("DDCCBBAA", true));
-        Assert.assertEquals(0xDDCCBBAA, TbUtils.parseHexToInt("AABBCCDD", false));
+        Assertions.assertEquals(0xAB, TbUtils.parseHexToInt("AB"));
+
+        Assertions.assertEquals(0xABBA, TbUtils.parseHexToInt("ABBA", true));
+        Assertions.assertEquals(0xBAAB, TbUtils.parseHexToInt("ABBA", false));
+        Assertions.assertEquals(0xAABBCC, TbUtils.parseHexToInt("AABBCC", true));
+        Assertions.assertEquals(0xAABBCC, TbUtils.parseHexToInt("CCBBAA", false));
+        Assertions.assertEquals(0xAABBCCDD, TbUtils.parseHexToInt("AABBCCDD", true));
+        Assertions.assertEquals(0xAABBCCDD, TbUtils.parseHexToInt("DDCCBBAA", false));
+        Assertions.assertEquals(0xDDCCBBAA, TbUtils.parseHexToInt("DDCCBBAA", true));
+        Assertions.assertEquals(0xDDCCBBAA, TbUtils.parseHexToInt("AABBCCDD", false));
     }
 
     @Test
     public void parseBytesToInt_checkPrimitives() {
         int expected = 257;
         byte[] data = ByteBuffer.allocate(4).putInt(expected).array();
-        Assert.assertEquals(expected, TbUtils.parseBytesToInt(data, 0, 4));
-        Assert.assertEquals(expected, TbUtils.parseBytesToInt(data, 2, 2, true));
-        Assert.assertEquals(1, TbUtils.parseBytesToInt(data, 3, 1, true));
+        Assertions.assertEquals(expected, TbUtils.parseBytesToInt(data, 0, 4));
+        Assertions.assertEquals(expected, TbUtils.parseBytesToInt(data, 2, 2, true));
+        Assertions.assertEquals(1, TbUtils.parseBytesToInt(data, 3, 1, true));
 
         expected = Integer.MAX_VALUE;
         data = ByteBuffer.allocate(4).putInt(expected).array();
-        Assert.assertEquals(expected, TbUtils.parseBytesToInt(data, 0, 4, true));
+        Assertions.assertEquals(expected, TbUtils.parseBytesToInt(data, 0, 4, true));
 
         expected = 0xAABBCCDD;
         data = new byte[]{(byte) 0xAA, (byte) 0xBB, (byte) 0xCC, (byte) 0xDD};
-        Assert.assertEquals(expected, TbUtils.parseBytesToInt(data, 0, 4, true));
+        Assertions.assertEquals(expected, TbUtils.parseBytesToInt(data, 0, 4, true));
         data = new byte[]{(byte) 0xDD, (byte) 0xCC, (byte) 0xBB, (byte) 0xAA};
-        Assert.assertEquals(expected, TbUtils.parseBytesToInt(data, 0, 4, false));
+        Assertions.assertEquals(expected, TbUtils.parseBytesToInt(data, 0, 4, false));
 
         expected = 0xAABBCC;
         data = new byte[]{(byte) 0xAA, (byte) 0xBB, (byte) 0xCC};
-        Assert.assertEquals(expected, TbUtils.parseBytesToInt(data, 0, 3, true));
+        Assertions.assertEquals(expected, TbUtils.parseBytesToInt(data, 0, 3, true));
         data = new byte[]{(byte) 0xCC, (byte) 0xBB, (byte) 0xAA};
-        Assert.assertEquals(expected, TbUtils.parseBytesToInt(data, 0, 3, false));
+        Assertions.assertEquals(expected, TbUtils.parseBytesToInt(data, 0, 3, false));
     }
 
     @Test
     public void parseBytesToInt_checkLists() {
         int expected = 257;
         List<Byte> data = toList(ByteBuffer.allocate(4).putInt(expected).array());
-        Assert.assertEquals(expected, TbUtils.parseBytesToInt(data, 0, 4));
-        Assert.assertEquals(expected, TbUtils.parseBytesToInt(data, 2, 2, true));
-        Assert.assertEquals(1, TbUtils.parseBytesToInt(data, 3, 1, true));
+        Assertions.assertEquals(expected, TbUtils.parseBytesToInt(data, 0, 4));
+        Assertions.assertEquals(expected, TbUtils.parseBytesToInt(data, 2, 2, true));
+        Assertions.assertEquals(1, TbUtils.parseBytesToInt(data, 3, 1, true));
 
         expected = Integer.MAX_VALUE;
         data = toList(ByteBuffer.allocate(4).putInt(expected).array());
-        Assert.assertEquals(expected, TbUtils.parseBytesToInt(data, 0, 4, true));
+        Assertions.assertEquals(expected, TbUtils.parseBytesToInt(data, 0, 4, true));
 
         expected = 0xAABBCCDD;
         data = toList(new byte[]{(byte) 0xAA, (byte) 0xBB, (byte) 0xCC, (byte) 0xDD});
-        Assert.assertEquals(expected, TbUtils.parseBytesToInt(data, 0, 4, true));
+        Assertions.assertEquals(expected, TbUtils.parseBytesToInt(data, 0, 4, true));
         data = toList(new byte[]{(byte) 0xDD, (byte) 0xCC, (byte) 0xBB, (byte) 0xAA});
-        Assert.assertEquals(expected, TbUtils.parseBytesToInt(data, 0, 4, false));
+        Assertions.assertEquals(expected, TbUtils.parseBytesToInt(data, 0, 4, false));
 
         expected = 0xAABBCC;
         data = toList(new byte[]{(byte) 0xAA, (byte) 0xBB, (byte) 0xCC});
-        Assert.assertEquals(expected, TbUtils.parseBytesToInt(data, 0, 3, true));
+        Assertions.assertEquals(expected, TbUtils.parseBytesToInt(data, 0, 3, true));
         data = toList(new byte[]{(byte) 0xCC, (byte) 0xBB, (byte) 0xAA});
-        Assert.assertEquals(expected, TbUtils.parseBytesToInt(data, 0, 3, false));
+        Assertions.assertEquals(expected, TbUtils.parseBytesToInt(data, 0, 3, false));
     }
 
     @Test
@@ -185,7 +183,7 @@ public class TbUtilsTest {
 
         ExecutionHashMap<String, Object> actualMapWithPaths = TbUtils.toFlatMap(ctx, inputMap, excludeList, true);
 
-        Assert.assertEquals(expectedMapWithPath, actualMapWithPaths);
+        Assertions.assertEquals(expectedMapWithPath, actualMapWithPaths);
 
         ExecutionHashMap<String, Object> expectedMapWithoutPaths = new ExecutionHashMap<>(16, ctx);
         expectedMapWithoutPaths.put("timezone", "UTC-5");
@@ -201,153 +199,153 @@ public class TbUtilsTest {
 
         ExecutionHashMap<String, Object> actualMapWithoutPaths = TbUtils.toFlatMap(ctx, inputMap, false);
 
-        Assert.assertEquals(expectedMapWithoutPaths, actualMapWithoutPaths);
+        Assertions.assertEquals(expectedMapWithoutPaths, actualMapWithoutPaths);
     }
 
     @Test
     public void parseInt() {
-        Assert.assertNull(TbUtils.parseInt(null));
-        Assert.assertNull(TbUtils.parseInt(""));
-        Assert.assertNull(TbUtils.parseInt(" "));
+        Assertions.assertNull(TbUtils.parseInt(null));
+        Assertions.assertNull(TbUtils.parseInt(""));
+        Assertions.assertNull(TbUtils.parseInt(" "));
 
-        Assert.assertEquals(java.util.Optional.of(0).get(), TbUtils.parseInt("0"));
-        Assert.assertEquals(java.util.Optional.of(0).get(), TbUtils.parseInt("-0"));
-        Assert.assertEquals(java.util.Optional.of(473).get(), TbUtils.parseInt("473"));
-        Assert.assertEquals(java.util.Optional.of(-255).get(), TbUtils.parseInt("-0xFF"));
-        Assert.assertThrows(NumberFormatException.class, () -> TbUtils.parseInt("FF"));
-        Assert.assertThrows(NumberFormatException.class, () -> TbUtils.parseInt("0xFG"));
+        Assertions.assertEquals(java.util.Optional.of(0).get(), TbUtils.parseInt("0"));
+        Assertions.assertEquals(java.util.Optional.of(0).get(), TbUtils.parseInt("-0"));
+        Assertions.assertEquals(java.util.Optional.of(473).get(), TbUtils.parseInt("473"));
+        Assertions.assertEquals(java.util.Optional.of(-255).get(), TbUtils.parseInt("-0xFF"));
+        Assertions.assertThrows(NumberFormatException.class, () -> TbUtils.parseInt("FF"));
+        Assertions.assertThrows(NumberFormatException.class, () -> TbUtils.parseInt("0xFG"));
 
-        Assert.assertEquals(java.util.Optional.of(102).get(), TbUtils.parseInt("1100110", 2));
-        Assert.assertThrows(NumberFormatException.class, () -> TbUtils.parseInt("1100210", 2));
+        Assertions.assertEquals(java.util.Optional.of(102).get(), TbUtils.parseInt("1100110", 2));
+        Assertions.assertThrows(NumberFormatException.class, () -> TbUtils.parseInt("1100210", 2));
 
-        Assert.assertEquals(java.util.Optional.of(63).get(), TbUtils.parseInt("77", 8));
-        Assert.assertThrows(NumberFormatException.class, () -> TbUtils.parseInt("18", 8));
+        Assertions.assertEquals(java.util.Optional.of(63).get(), TbUtils.parseInt("77", 8));
+        Assertions.assertThrows(NumberFormatException.class, () -> TbUtils.parseInt("18", 8));
 
-        Assert.assertEquals(java.util.Optional.of(-255).get(), TbUtils.parseInt("-FF", 16));
-        Assert.assertThrows(NumberFormatException.class, () -> TbUtils.parseInt("FG", 16));
+        Assertions.assertEquals(java.util.Optional.of(-255).get(), TbUtils.parseInt("-FF", 16));
+        Assertions.assertThrows(NumberFormatException.class, () -> TbUtils.parseInt("FG", 16));
 
 
-        Assert.assertEquals(java.util.Optional.of(Integer.MAX_VALUE).get(), TbUtils.parseInt(Integer.toString(Integer.MAX_VALUE), 10));
-        Assert.assertThrows(NumberFormatException.class, () -> TbUtils.parseInt(BigInteger.valueOf(Integer.MAX_VALUE).add(BigInteger.valueOf(1)).toString(10), 10));
-        Assert.assertEquals(java.util.Optional.of(Integer.MIN_VALUE).get(), TbUtils.parseInt(Integer.toString(Integer.MIN_VALUE), 10));
-        Assert.assertThrows(NumberFormatException.class, () -> TbUtils.parseInt(BigInteger.valueOf(Integer.MIN_VALUE).subtract(BigInteger.valueOf(1)).toString(10), 10));
+        Assertions.assertEquals(java.util.Optional.of(Integer.MAX_VALUE).get(), TbUtils.parseInt(Integer.toString(Integer.MAX_VALUE), 10));
+        Assertions.assertThrows(NumberFormatException.class, () -> TbUtils.parseInt(BigInteger.valueOf(Integer.MAX_VALUE).add(BigInteger.valueOf(1)).toString(10), 10));
+        Assertions.assertEquals(java.util.Optional.of(Integer.MIN_VALUE).get(), TbUtils.parseInt(Integer.toString(Integer.MIN_VALUE), 10));
+        Assertions.assertThrows(NumberFormatException.class, () -> TbUtils.parseInt(BigInteger.valueOf(Integer.MIN_VALUE).subtract(BigInteger.valueOf(1)).toString(10), 10));
 
-        Assert.assertEquals(java.util.Optional.of(506070563).get(), TbUtils.parseInt("KonaIn", 30));
-        Assert.assertThrows(NumberFormatException.class, () -> TbUtils.parseInt("KonaIn", 10));
+        Assertions.assertEquals(java.util.Optional.of(506070563).get(), TbUtils.parseInt("KonaIn", 30));
+        Assertions.assertThrows(NumberFormatException.class, () -> TbUtils.parseInt("KonaIn", 10));
     }
 
     @Test
     public void parseFloat() {
-        Assert.assertEquals(java.util.Optional.of(floatVal).get(), TbUtils.parseFloat(floatValStr));
+        Assertions.assertEquals(java.util.Optional.of(floatVal).get(), TbUtils.parseFloat(floatValStr));
     }
 
     @Test
     public void toFixedFloat() {
         float actualF = TbUtils.toFixed(floatVal, 3);
-        Assert.assertEquals(1, Float.compare(floatVal, actualF));
-        Assert.assertEquals(0, Float.compare(29.298f, actualF));
+        Assertions.assertEquals(1, Float.compare(floatVal, actualF));
+        Assertions.assertEquals(0, Float.compare(29.298f, actualF));
     }
 
     @Test
     public void parseHexToFloat() {
-        Assert.assertEquals(0, Float.compare(floatVal, TbUtils.parseHexToFloat(intValHex)));
-        Assert.assertEquals(0, Float.compare(floatValRev, TbUtils.parseHexToFloat(intValHex, false)));
-        Assert.assertEquals(0, Float.compare(floatVal, TbUtils.parseBigEndianHexToFloat(intValHex)));
-        Assert.assertEquals(0, Float.compare(floatVal, TbUtils.parseLittleEndianHexToFloat(floatValHexRev)));
+        Assertions.assertEquals(0, Float.compare(floatVal, TbUtils.parseHexToFloat(intValHex)));
+        Assertions.assertEquals(0, Float.compare(floatValRev, TbUtils.parseHexToFloat(intValHex, false)));
+        Assertions.assertEquals(0, Float.compare(floatVal, TbUtils.parseBigEndianHexToFloat(intValHex)));
+        Assertions.assertEquals(0, Float.compare(floatVal, TbUtils.parseLittleEndianHexToFloat(floatValHexRev)));
     }
 
     @Test
     public void arseBytesToFloat() {
         byte[] floatValByte = {65, -22, 98, -52};
-        Assert.assertEquals(0, Float.compare(floatVal, TbUtils.parseBytesToFloat(floatValByte, 0)));
-        Assert.assertEquals(0, Float.compare(floatValRev, TbUtils.parseBytesToFloat(floatValByte, 0, false)));
+        Assertions.assertEquals(0, Float.compare(floatVal, TbUtils.parseBytesToFloat(floatValByte, 0)));
+        Assertions.assertEquals(0, Float.compare(floatValRev, TbUtils.parseBytesToFloat(floatValByte, 0, false)));
 
         List <Byte> floatVaList = Bytes.asList(floatValByte);
-        Assert.assertEquals(0, Float.compare(floatVal, TbUtils.parseBytesToFloat(floatVaList, 0)));
-        Assert.assertEquals(0, Float.compare(floatValRev, TbUtils.parseBytesToFloat(floatVaList, 0, false)));
+        Assertions.assertEquals(0, Float.compare(floatVal, TbUtils.parseBytesToFloat(floatVaList, 0)));
+        Assertions.assertEquals(0, Float.compare(floatValRev, TbUtils.parseBytesToFloat(floatVaList, 0, false)));
     }
 
     @Test
     public void parseLong() {
-        Assert.assertNull(TbUtils.parseLong(null));
-        Assert.assertNull(TbUtils.parseLong(""));
-        Assert.assertNull(TbUtils.parseLong(" "));
+        Assertions.assertNull(TbUtils.parseLong(null));
+        Assertions.assertNull(TbUtils.parseLong(""));
+        Assertions.assertNull(TbUtils.parseLong(" "));
 
-        Assert.assertEquals(java.util.Optional.of(0L).get(), TbUtils.parseLong("0"));
-        Assert.assertEquals(java.util.Optional.of(0L).get(), TbUtils.parseLong("-0"));
-        Assert.assertEquals(java.util.Optional.of(473L).get(), TbUtils.parseLong("473"));
-        Assert.assertEquals(java.util.Optional.of(-65535L).get(), TbUtils.parseLong("-0xFFFF"));
-        Assert.assertThrows(NumberFormatException.class, () -> TbUtils.parseLong("FFFFFFFF"));
-        Assert.assertThrows(NumberFormatException.class, () -> TbUtils.parseLong("0xFGFFFFFF"));
+        Assertions.assertEquals(java.util.Optional.of(0L).get(), TbUtils.parseLong("0"));
+        Assertions.assertEquals(java.util.Optional.of(0L).get(), TbUtils.parseLong("-0"));
+        Assertions.assertEquals(java.util.Optional.of(473L).get(), TbUtils.parseLong("473"));
+        Assertions.assertEquals(java.util.Optional.of(-65535L).get(), TbUtils.parseLong("-0xFFFF"));
+        Assertions.assertThrows(NumberFormatException.class, () -> TbUtils.parseLong("FFFFFFFF"));
+        Assertions.assertThrows(NumberFormatException.class, () -> TbUtils.parseLong("0xFGFFFFFF"));
 
-        Assert.assertEquals(java.util.Optional.of(13158L).get(), TbUtils.parseLong("11001101100110", 2));
-        Assert.assertThrows(NumberFormatException.class, () -> TbUtils.parseLong("11001101100210", 2));
+        Assertions.assertEquals(java.util.Optional.of(13158L).get(), TbUtils.parseLong("11001101100110", 2));
+        Assertions.assertThrows(NumberFormatException.class, () -> TbUtils.parseLong("11001101100210", 2));
 
-        Assert.assertEquals(java.util.Optional.of(9223372036854775807L).get(), TbUtils.parseLong("777777777777777777777", 8));
-        Assert.assertThrows(NumberFormatException.class, () -> TbUtils.parseLong("1787", 8));
+        Assertions.assertEquals(java.util.Optional.of(9223372036854775807L).get(), TbUtils.parseLong("777777777777777777777", 8));
+        Assertions.assertThrows(NumberFormatException.class, () -> TbUtils.parseLong("1787", 8));
 
-        Assert.assertEquals(java.util.Optional.of(-255L).get(), TbUtils.parseLong("-FF", 16));
-        Assert.assertThrows(NumberFormatException.class, () -> TbUtils.parseLong("FG", 16));
+        Assertions.assertEquals(java.util.Optional.of(-255L).get(), TbUtils.parseLong("-FF", 16));
+        Assertions.assertThrows(NumberFormatException.class, () -> TbUtils.parseLong("FG", 16));
 
 
-        Assert.assertEquals(java.util.Optional.of(Long.MAX_VALUE).get(), TbUtils.parseLong(Long.toString(Long.MAX_VALUE), 10));
-        Assert.assertThrows(NumberFormatException.class, () -> TbUtils.parseLong(BigInteger.valueOf(Long.MAX_VALUE).add(BigInteger.valueOf(1)).toString(10), 10));
-        Assert.assertEquals(java.util.Optional.of(Long.MIN_VALUE).get(), TbUtils.parseLong(Long.toString(Long.MIN_VALUE), 10));
-        Assert.assertThrows(NumberFormatException.class, () -> TbUtils.parseLong(BigInteger.valueOf(Long.MIN_VALUE).subtract(BigInteger.valueOf(1)).toString(10), 10));
+        Assertions.assertEquals(java.util.Optional.of(Long.MAX_VALUE).get(), TbUtils.parseLong(Long.toString(Long.MAX_VALUE), 10));
+        Assertions.assertThrows(NumberFormatException.class, () -> TbUtils.parseLong(BigInteger.valueOf(Long.MAX_VALUE).add(BigInteger.valueOf(1)).toString(10), 10));
+        Assertions.assertEquals(java.util.Optional.of(Long.MIN_VALUE).get(), TbUtils.parseLong(Long.toString(Long.MIN_VALUE), 10));
+        Assertions.assertThrows(NumberFormatException.class, () -> TbUtils.parseLong(BigInteger.valueOf(Long.MIN_VALUE).subtract(BigInteger.valueOf(1)).toString(10), 10));
 
-        Assert.assertEquals(java.util.Optional.of(218840926543L).get(), TbUtils.parseLong("KonaLong", 27));
-        Assert.assertThrows(NumberFormatException.class, () -> TbUtils.parseLong("KonaLong", 10));
+        Assertions.assertEquals(java.util.Optional.of(218840926543L).get(), TbUtils.parseLong("KonaLong", 27));
+        Assertions.assertThrows(NumberFormatException.class, () -> TbUtils.parseLong("KonaLong", 10));
     }
 
     @Test
     public void parseHexToLong() {
-        Assert.assertEquals(longVal, TbUtils.parseHexToLong(longValHex));
-        Assert.assertEquals(longVal, TbUtils.parseHexToLong(longValHexRev, false));
-        Assert.assertEquals(longVal, TbUtils.parseBigEndianHexToLong(longValHex));
-        Assert.assertEquals(longVal, TbUtils.parseLittleEndianHexToLong(longValHexRev));
+        Assertions.assertEquals(longVal, TbUtils.parseHexToLong(longValHex));
+        Assertions.assertEquals(longVal, TbUtils.parseHexToLong(longValHexRev, false));
+        Assertions.assertEquals(longVal, TbUtils.parseBigEndianHexToLong(longValHex));
+        Assertions.assertEquals(longVal, TbUtils.parseLittleEndianHexToLong(longValHexRev));
     }
 
     @Test
     public void parseBytesToLong() {
         byte[] longValByte = {64, -101, 4, -79, 12, -78, -107, -22};
-        Assert.assertEquals(longVal, TbUtils.parseBytesToLong(longValByte, 0, 8));
+        Assertions.assertEquals(longVal, TbUtils.parseBytesToLong(longValByte, 0, 8));
         Bytes.reverse(longValByte);
-        Assert.assertEquals(longVal, TbUtils.parseBytesToLong(longValByte, 0, 8, false));
+        Assertions.assertEquals(longVal, TbUtils.parseBytesToLong(longValByte, 0, 8, false));
 
         List <Byte> longVaList = Bytes.asList(longValByte);
-        Assert.assertEquals(longVal, TbUtils.parseBytesToLong(longVaList, 0, 8, false));
-        Assert.assertEquals(longValRev, TbUtils.parseBytesToLong(longVaList, 0, 8));
+        Assertions.assertEquals(longVal, TbUtils.parseBytesToLong(longVaList, 0, 8, false));
+        Assertions.assertEquals(longValRev, TbUtils.parseBytesToLong(longVaList, 0, 8));
     }
 
     @Test
     public void parsDouble() {
-        Assert.assertEquals(java.util.Optional.of(doubleVal).get(), TbUtils.parseDouble(doubleValStr));
+        Assertions.assertEquals(java.util.Optional.of(doubleVal).get(), TbUtils.parseDouble(doubleValStr));
     }
 
     @Test
     public void toFixedDouble() {
         double actualD = TbUtils.toFixed(doubleVal, 3);
-        Assert.assertEquals(-1, Double.compare(doubleVal, actualD));
-        Assert.assertEquals(0, Double.compare(1729.173, actualD));
+        Assertions.assertEquals(-1, Double.compare(doubleVal, actualD));
+        Assertions.assertEquals(0, Double.compare(1729.173, actualD));
     }
 
     @Test
     public void parseHexToDouble() {
-        Assert.assertEquals(0, Double.compare(doubleVal, TbUtils.parseHexToDouble(longValHex)));
-        Assert.assertEquals(0, Double.compare(doubleValRev, TbUtils.parseHexToDouble(longValHex, false)));
-        Assert.assertEquals(0, Double.compare(doubleVal, TbUtils.parseBigEndianHexToDouble(longValHex)));
-        Assert.assertEquals(0, Double.compare(doubleVal, TbUtils.parseLittleEndianHexToDouble(longValHexRev)));
+        Assertions.assertEquals(0, Double.compare(doubleVal, TbUtils.parseHexToDouble(longValHex)));
+        Assertions.assertEquals(0, Double.compare(doubleValRev, TbUtils.parseHexToDouble(longValHex, false)));
+        Assertions.assertEquals(0, Double.compare(doubleVal, TbUtils.parseBigEndianHexToDouble(longValHex)));
+        Assertions.assertEquals(0, Double.compare(doubleVal, TbUtils.parseLittleEndianHexToDouble(longValHexRev)));
     }
 
     @Test
     public void parseBytesToDouble() {
         byte[] doubleValByte = {64, -101, 4, -79, 12, -78, -107, -22};
-        Assert.assertEquals(0, Double.compare(doubleVal, TbUtils.parseBytesToDouble(doubleValByte, 0)));
-        Assert.assertEquals(0, Double.compare(doubleValRev, TbUtils.parseBytesToDouble(doubleValByte, 0, false)));
+        Assertions.assertEquals(0, Double.compare(doubleVal, TbUtils.parseBytesToDouble(doubleValByte, 0)));
+        Assertions.assertEquals(0, Double.compare(doubleValRev, TbUtils.parseBytesToDouble(doubleValByte, 0, false)));
 
         List <Byte> doubleVaList = Bytes.asList(doubleValByte);
-        Assert.assertEquals(0, Double.compare(doubleVal, TbUtils.parseBytesToDouble(doubleVaList, 0)));
-        Assert.assertEquals(0, Double.compare(doubleValRev, TbUtils.parseBytesToDouble(doubleVaList, 0, false)));
+        Assertions.assertEquals(0, Double.compare(doubleVal, TbUtils.parseBytesToDouble(doubleVaList, 0)));
+        Assertions.assertEquals(0, Double.compare(doubleValRev, TbUtils.parseBytesToDouble(doubleVaList, 0, false)));
     }
 
     @Test
@@ -357,7 +355,7 @@ public class TbUtilsTest {
         expectedJson.put("hello", "world");
         List<Byte> expectedBytes = TbUtils.stringToBytes(ctx, expectedStr);
         Object actualJson =  TbUtils.decodeToJson(ctx, expectedBytes);
-        Assert.assertEquals(expectedJson,actualJson);
+        Assertions.assertEquals(expectedJson,actualJson);
     }
     @Test
     public void parseStringDecodeToJson() throws IOException {
@@ -365,7 +363,7 @@ public class TbUtilsTest {
         ExecutionHashMap<String, Object> expectedJson = new ExecutionHashMap<>(1, ctx);
         expectedJson.put("hello", "world");
         Object actualJson =  TbUtils.decodeToJson(ctx, expectedStr);
-        Assert.assertEquals(expectedJson,actualJson);
+        Assertions.assertEquals(expectedJson,actualJson);
     }
 
     @Test
@@ -375,15 +373,15 @@ public class TbUtilsTest {
         byte[] arrayBytes = {119, 111, 114, 108, 100};
         List<Byte> expectedBytes = Bytes.asList(arrayBytes);
         List<Byte> actualBytes = TbUtils.stringToBytes(ctx, ((ExecutionHashMap) inputJson).get("hello"));
-        Assert.assertEquals(expectedBytes, actualBytes);
+        Assertions.assertEquals(expectedBytes, actualBytes);
         actualBytes = TbUtils.stringToBytes(ctx, ((ExecutionHashMap) inputJson).get("hello"), "UTF-8");
-        Assert.assertEquals(expectedBytes, actualBytes);
+        Assertions.assertEquals(expectedBytes, actualBytes);
 
         expectedStr = "{\"hello\": 1234}";
         inputJson = TbUtils.decodeToJson(ctx, expectedStr);
         Object finalInputJson = inputJson;
-        Assert.assertThrows(IllegalAccessException.class, () -> TbUtils.stringToBytes(ctx, ((ExecutionHashMap) finalInputJson).get("hello")));
-        Assert.assertThrows(IllegalAccessException.class, () -> TbUtils.stringToBytes(ctx, ((ExecutionHashMap) finalInputJson).get("hello"), "UTF-8"));
+        Assertions.assertThrows(IllegalAccessException.class, () -> TbUtils.stringToBytes(ctx, ((ExecutionHashMap) finalInputJson).get("hello")));
+        Assertions.assertThrows(IllegalAccessException.class, () -> TbUtils.stringToBytes(ctx, ((ExecutionHashMap) finalInputJson).get("hello"), "UTF-8"));
     }
 
     @Test
@@ -396,13 +394,13 @@ public class TbUtilsTest {
         for (Byte element : arrayBytes) {
             listBytes.add(element);
         }
-        Assert.assertEquals(expected, TbUtils.bytesToString(listBytes));
+        Assertions.assertEquals(expected, TbUtils.bytesToString(listBytes));
 
         ArrayList<Object> listMix = new ArrayList<>(arrayMix.length);
         for (Object element : arrayMix) {
             listMix.add(element);
         }
-        Assert.assertEquals(expected, TbUtils.bytesToString(listMix));
+        Assertions.assertEquals(expected, TbUtils.bytesToString(listMix));
     }
 
     @Test
@@ -411,34 +409,34 @@ public class TbUtilsTest {
         listHex.add("0xFG");
         try {
             TbUtils.bytesToString(listHex);
-            Assert.fail("Should throw NumberFormatException");
+            Assertions.fail("Should throw NumberFormatException");
         } catch (NumberFormatException e) {
-            Assert.assertTrue(e.getMessage().contains("Failed radix: [16] for value: \"FG\"!"));
+            Assertions.assertTrue(e.getMessage().contains("Failed radix: [16] for value: \"FG\"!"));
         }
         listHex.add(0, "1F");
         try {
             TbUtils.bytesToString(listHex);
-            Assert.fail("Should throw NumberFormatException");
+            Assertions.fail("Should throw NumberFormatException");
         } catch (NumberFormatException e) {
-            Assert.assertTrue(e.getMessage().contains("Failed radix: [10] for value: \"1F\"!"));
+            Assertions.assertTrue(e.getMessage().contains("Failed radix: [10] for value: \"1F\"!"));
         }
 
         List<String> listIntString = new ArrayList<>();
         listIntString.add("-129");
         try {
             TbUtils.bytesToString(listIntString);
-            Assert.fail("Should throw NumberFormatException");
+            Assertions.fail("Should throw NumberFormatException");
         } catch (NumberFormatException e) {
-            Assert.assertTrue(e.getMessage().contains("The value '-129' could not be correctly converted to a byte. " +
+            Assertions.assertTrue(e.getMessage().contains("The value '-129' could not be correctly converted to a byte. " +
                     "Integer to byte conversion requires the use of only 8 bits (with a range of min/max = -128/255)!"));
         }
 
         listIntString.add(0, "256");
         try {
             TbUtils.bytesToString(listIntString);
-            Assert.fail("Should throw NumberFormatException");
+            Assertions.fail("Should throw NumberFormatException");
         } catch (NumberFormatException e) {
-            Assert.assertTrue(e.getMessage().contains("The value '256' could not be correctly converted to a byte. " +
+            Assertions.assertTrue(e.getMessage().contains("The value '256' could not be correctly converted to a byte. " +
                     "Integer to byte conversion requires the use of only 8 bits (with a range of min/max = -128/255)!"));
         }
 
@@ -446,18 +444,18 @@ public class TbUtilsTest {
         listIntBytes.add(-129);
         try {
             TbUtils.bytesToString(listIntBytes);
-            Assert.fail("Should throw NumberFormatException");
+            Assertions.fail("Should throw NumberFormatException");
         } catch (NumberFormatException e) {
-            Assert.assertTrue(e.getMessage().contains("The value '-129' could not be correctly converted to a byte. " +
+            Assertions.assertTrue(e.getMessage().contains("The value '-129' could not be correctly converted to a byte. " +
                     "Integer to byte conversion requires the use of only 8 bits (with a range of min/max = -128/255)!"));
         }
 
         listIntBytes.add(0, 256);
         try {
             TbUtils.bytesToString(listIntBytes);
-            Assert.fail("Should throw NumberFormatException");
+            Assertions.fail("Should throw NumberFormatException");
         } catch (NumberFormatException e) {
-            Assert.assertTrue(e.getMessage().contains("The value '256' could not be correctly converted to a byte. " +
+            Assertions.assertTrue(e.getMessage().contains("The value '256' could not be correctly converted to a byte. " +
                     "Integer to byte conversion requires the use of only 8 bits (with a range of min/max = -128/255)!"));
         }
 
@@ -467,14 +465,23 @@ public class TbUtilsTest {
         listObjects.add(listStringObjects);
         try {
             TbUtils.bytesToString(listObjects);
-            Assert.fail("Should throw NumberFormatException");
+            Assertions.fail("Should throw NumberFormatException");
         } catch (NumberFormatException e) {
-            Assert.assertTrue(e.getMessage().contains("The value '[0xFD]' could not be correctly converted to a byte. " +
+            Assertions.assertTrue(e.getMessage().contains("The value '[0xFD]' could not be correctly converted to a byte. " +
                     "Must be a HexDecimal/String/Integer/Byte format !"));
         }
     }
 
-
+    @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);
+        Assertions.assertEquals(uriEncodeExpected, uriEncodeActual);
+
+        String uriDecodeActual = TbUtils.decodeURI(uriEncodeActual);
+        Assertions.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/script/script-api/src/test/resources/junit-platform.properties b/common/script/script-api/src/test/resources/junit-platform.properties
new file mode 100644
index 0000000000..f2ed301920
--- /dev/null
+++ b/common/script/script-api/src/test/resources/junit-platform.properties
@@ -0,0 +1,3 @@
+junit.jupiter.execution.parallel.enabled = true
+junit.jupiter.execution.parallel.mode.default = concurrent
+junit.jupiter.execution.parallel.mode.classes.default = concurrent
diff --git a/common/script/script-api/src/test/resources/logback-test.xml b/common/script/script-api/src/test/resources/logback-test.xml
new file mode 100644
index 0000000000..52f2a77588
--- /dev/null
+++ b/common/script/script-api/src/test/resources/logback-test.xml
@@ -0,0 +1,14 @@
+<?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>
+
+    <root level="INFO">
+        <appender-ref ref="console"/>
+    </root>
+
+</configuration>
diff --git a/common/stats/pom.xml b/common/stats/pom.xml
index 672731852e..23c507cc43 100644
--- a/common/stats/pom.xml
+++ b/common/stats/pom.xml
@@ -22,7 +22,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.6.3-SNAPSHOT</version>
+        <version>3.7.0-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>
@@ -76,11 +76,6 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.awaitility</groupId>
             <artifactId>awaitility</artifactId>
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 a6ec01d089..ca97792186 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,12 +19,13 @@ 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 jakarta.annotation.PostConstruct;
+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;
 import org.thingsboard.server.common.data.StringUtils;
 
-import javax.annotation.PostConstruct;
 import java.util.concurrent.atomic.AtomicInteger;
 
 @Service
@@ -61,12 +62,11 @@ public class DefaultStatsFactory implements StatsFactory {
 
 
     @Override
-    public StatsCounter createStatsCounter(String key, String statsName) {
+    public StatsCounter createStatsCounter(String key, String statsName, String... otherTags) {
+        String[] tags = getTags(statsName, 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
         );
     }
@@ -105,6 +105,24 @@ public class DefaultStatsFactory implements StatsFactory {
         return timerBuilder.register(meterRegistry);
     }
 
+    @Override
+    public StatsTimer createTimer(StatsType type, String name, String... tags) {
+        return new StatsTimer(name, Timer.builder(type.getName())
+                .tags(getTags(name, tags))
+                .register(meterRegistry));
+    }
+
+    private static String[] getTags(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 tags;
+    }
+
     private static class StubCounter implements Counter {
         @Override
         public void increment(double amount) {
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..a6cc4aa1d4 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,7 @@ public interface StatsFactory {
     MessagesStats createMessagesStats(String key);
 
     Timer createTimer(String key, String... tags);
+
+    StatsTimer createTimer(StatsType type, String name, String... tags);
+
 }
diff --git a/common/stats/src/main/java/org/thingsboard/server/common/stats/StatsTimer.java b/common/stats/src/main/java/org/thingsboard/server/common/stats/StatsTimer.java
new file mode 100644
index 0000000000..ca74444619
--- /dev/null
+++ b/common/stats/src/main/java/org/thingsboard/server/common/stats/StatsTimer.java
@@ -0,0 +1,55 @@
+/**
+ * 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.stats;
+
+import io.micrometer.core.instrument.Timer;
+import lombok.Getter;
+
+import java.util.concurrent.TimeUnit;
+
+public class StatsTimer {
+
+    @Getter
+    private final String name;
+    private final Timer timer;
+
+    private int count;
+    private long totalTime;
+
+    public StatsTimer(String name, Timer micrometerTimer) {
+        this.name = name;
+        this.timer = micrometerTimer;
+    }
+
+    public  void record(long timeMs) {
+        count++;
+        totalTime += timeMs;
+        timer.record(timeMs, TimeUnit.MILLISECONDS);
+    }
+
+    public double getAvg() {
+        if (count == 0) {
+            return 0.0;
+        }
+        return (double) totalTime / count;
+    }
+
+    public  void reset() {
+        count = 0;
+        totalTime = 0;
+    }
+
+}
diff --git a/common/stats/src/main/java/org/thingsboard/server/common/stats/StatsType.java b/common/stats/src/main/java/org/thingsboard/server/common/stats/StatsType.java
index 318f0418de..6c854ac8d6 100644
--- a/common/stats/src/main/java/org/thingsboard/server/common/stats/StatsType.java
+++ b/common/stats/src/main/java/org/thingsboard/server/common/stats/StatsType.java
@@ -16,7 +16,12 @@
 package org.thingsboard.server.common.stats;
 
 public enum StatsType {
-    RULE_ENGINE("ruleEngine"), CORE("core"), TRANSPORT("transport"), JS_INVOKE("jsInvoke"), RATE_EXECUTOR("rateExecutor");
+    RULE_ENGINE("ruleEngine"),
+    CORE("core"),
+    TRANSPORT("transport"),
+    JS_INVOKE("jsInvoke"),
+    RATE_EXECUTOR("rateExecutor"),
+    HOUSEKEEPER("housekeeper");
 
     private String name;
 
diff --git a/common/transport/coap/pom.xml b/common/transport/coap/pom.xml
index 8e9d5ba0db..48bd1cfe9c 100644
--- a/common/transport/coap/pom.xml
+++ b/common/transport/coap/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard.common</groupId>
-        <version>3.6.3-SNAPSHOT</version>
+        <version>3.7.0-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.common.transport</groupId>
@@ -81,11 +81,6 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.awaitility</groupId>
             <artifactId>awaitility</artifactId>
diff --git a/common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/CoapTransportResource.java b/common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/CoapTransportResource.java
index 2528c0992e..ebc52fc034 100644
--- a/common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/CoapTransportResource.java
+++ b/common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/CoapTransportResource.java
@@ -19,7 +19,6 @@ import com.google.gson.JsonParseException;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.californium.core.coap.CoAP;
 import org.eclipse.californium.core.coap.Request;
-import org.eclipse.californium.core.coap.Response;
 import org.eclipse.californium.core.network.Exchange;
 import org.eclipse.californium.core.observe.ObserveRelation;
 import org.eclipse.californium.core.server.resources.CoapExchange;
@@ -27,6 +26,8 @@ import org.eclipse.californium.core.server.resources.Resource;
 import org.eclipse.californium.core.server.resources.ResourceObserver;
 import org.thingsboard.server.coapserver.CoapServerService;
 import org.thingsboard.server.coapserver.TbCoapDtlsSessionInfo;
+import org.thingsboard.server.common.adaptor.AdaptorException;
+import org.thingsboard.server.common.adaptor.JsonConverter;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.DeviceTransportType;
@@ -35,13 +36,11 @@ import org.thingsboard.server.common.data.TransportPayloadType;
 import org.thingsboard.server.common.data.security.DeviceTokenCredentials;
 import org.thingsboard.server.common.msg.session.FeatureType;
 import org.thingsboard.server.common.transport.TransportServiceCallback;
-import org.thingsboard.server.common.adaptor.AdaptorException;
-import org.thingsboard.server.common.adaptor.JsonConverter;
 import org.thingsboard.server.common.transport.auth.ValidateDeviceCredentialsResponse;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.transport.coap.callback.CoapDeviceAuthCallback;
 import org.thingsboard.server.transport.coap.callback.CoapNoOpCallback;
-import org.thingsboard.server.transport.coap.callback.CoapOkCallback;
+import org.thingsboard.server.transport.coap.callback.CoapResponseCodeCallback;
 import org.thingsboard.server.transport.coap.callback.GetAttributesSyncSessionCallback;
 import org.thingsboard.server.transport.coap.callback.ToServerRpcSyncSessionCallback;
 import org.thingsboard.server.transport.coap.client.CoapClientContext;
@@ -54,7 +53,6 @@ import java.util.Random;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
 
 import static org.eclipse.californium.elements.DtlsEndpointContext.KEY_SESSION_ID;
 
@@ -84,30 +82,6 @@ public class CoapTransportResource extends AbstractCoapTransportResource {
         ctx.getScheduler().scheduleAtFixedRate(clients::reportActivity, new Random().nextInt((int) sessionReportTimeout), sessionReportTimeout, TimeUnit.MILLISECONDS);
     }
 
-    /*
-     * Overwritten method from CoapResource to be able to manage our own observe notification counters.
-     */
-    @Override
-    public void checkObserveRelation(Exchange exchange, Response response) {
-        String token = getTokenFromRequest(exchange.getRequest());
-        final ObserveRelation relation = exchange.getRelation();
-        if (relation == null || relation.isCanceled()) {
-            return; // because request did not try to establish a relation
-        }
-        if (response.getCode().isSuccess()) {
-            if (!relation.isEstablished()) {
-                relation.setEstablished();
-                addObserveRelation(relation);
-            }
-            AtomicInteger state = clients.getNotificationCounterByToken(token);
-            if (state != null) {
-                response.getOptions().setObserve(state.getAndIncrement());
-            } else {
-                response.getOptions().removeObserve();
-            }
-        } // ObserveLayer takes care of the else case
-    }
-
     @Override
     protected void processHandleGet(CoapExchange exchange) {
         Optional<FeatureType> featureType = getFeatureType(exchange.advanced().getRequest());
@@ -278,7 +252,7 @@ public class CoapTransportResource extends AbstractCoapTransportResource {
         UUID sessionId = toSessionId(sessionInfo);
         transportService.process(sessionInfo, clientState.getAdaptor().convertToPostAttributes(sessionId, request,
                 clientState.getConfiguration().getAttributesMsgDescriptor()),
-                new CoapOkCallback(exchange, CoAP.ResponseCode.CREATED, CoAP.ResponseCode.INTERNAL_SERVER_ERROR));
+                new CoapResponseCodeCallback(exchange, CoAP.ResponseCode.CREATED, CoAP.ResponseCode.INTERNAL_SERVER_ERROR));
     }
 
     private void handlePostTelemetryRequest(TbCoapClientState clientState, CoapExchange exchange, Request request) throws AdaptorException {
@@ -286,7 +260,7 @@ public class CoapTransportResource extends AbstractCoapTransportResource {
         UUID sessionId = toSessionId(sessionInfo);
         transportService.process(sessionInfo, clientState.getAdaptor().convertToPostTelemetry(sessionId, request,
                 clientState.getConfiguration().getTelemetryMsgDescriptor()),
-                new CoapOkCallback(exchange, CoAP.ResponseCode.CREATED, CoAP.ResponseCode.INTERNAL_SERVER_ERROR));
+                new CoapResponseCodeCallback(exchange, CoAP.ResponseCode.CREATED, CoAP.ResponseCode.INTERNAL_SERVER_ERROR));
     }
 
     private void handleClaimRequest(TbCoapClientState clientState, CoapExchange exchange, Request request) throws AdaptorException {
@@ -294,7 +268,7 @@ public class CoapTransportResource extends AbstractCoapTransportResource {
         UUID sessionId = toSessionId(sessionInfo);
         transportService.process(sessionInfo,
                 clientState.getAdaptor().convertToClaimDevice(sessionId, request, sessionInfo),
-                new CoapOkCallback(exchange, CoAP.ResponseCode.CREATED, CoAP.ResponseCode.INTERNAL_SERVER_ERROR));
+                new CoapResponseCodeCallback(exchange, CoAP.ResponseCode.CREATED, CoAP.ResponseCode.INTERNAL_SERVER_ERROR));
     }
 
     private void handleAttributeSubscribeRequest(TbCoapClientState clientState, CoapExchange exchange, Request request) {
@@ -320,7 +294,7 @@ public class CoapTransportResource extends AbstractCoapTransportResource {
         UUID sessionId = toSessionId(session);
         transportService.process(session,
                 clientState.getAdaptor().convertToDeviceRpcResponse(sessionId, request, clientState.getConfiguration().getRpcResponseMsgDescriptor()),
-                new CoapOkCallback(exchange, CoAP.ResponseCode.CREATED, CoAP.ResponseCode.INTERNAL_SERVER_ERROR));
+                new CoapResponseCodeCallback(exchange, CoAP.ResponseCode.CREATED, CoAP.ResponseCode.INTERNAL_SERVER_ERROR));
     }
 
     private void handleRpcSubscribeRequest(TbCoapClientState clientState, CoapExchange exchange, Request request) {
diff --git a/common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/CoapTransportService.java b/common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/CoapTransportService.java
index da7d7f353b..ada19e2ccb 100644
--- a/common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/CoapTransportService.java
+++ b/common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/CoapTransportService.java
@@ -27,8 +27,8 @@ import org.thingsboard.server.common.data.TbTransportService;
 import org.thingsboard.server.common.data.ota.OtaPackageType;
 import org.thingsboard.server.transport.coap.efento.CoapEfentoTransportResource;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import java.net.UnknownHostException;
 
 @Service("CoapTransportService")
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/coap/src/main/java/org/thingsboard/server/transport/coap/callback/CoapResponseCallback.java b/common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/callback/CoapResponseCallback.java
new file mode 100644
index 0000000000..c0baf62bc1
--- /dev/null
+++ b/common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/callback/CoapResponseCallback.java
@@ -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.
+ */
+package org.thingsboard.server.transport.coap.callback;
+
+import org.eclipse.californium.core.coap.Response;
+import org.eclipse.californium.core.server.resources.CoapExchange;
+import org.thingsboard.server.common.transport.TransportServiceCallback;
+
+public class CoapResponseCallback implements TransportServiceCallback<Void> {
+
+    protected final CoapExchange exchange;
+    protected final Response onSuccessResponse;
+    protected final Response onFailureResponse;
+
+    public CoapResponseCallback(CoapExchange exchange, Response onSuccessResponse, Response onFailureResponse) {
+        this.exchange = exchange;
+        this.onSuccessResponse = onSuccessResponse;
+        this.onFailureResponse = onFailureResponse;
+    }
+
+    /**
+     * @param msg
+     */
+    @Override
+    public void onSuccess(Void msg) {
+        this.onSuccessResponse.setConfirmable(isConRequest());
+        exchange.respond(this.onSuccessResponse);
+    }
+
+    /**
+     * @param e
+     */
+    @Override
+    public void onError(Throwable e) {
+        exchange.respond(onFailureResponse);
+    }
+
+    protected boolean isConRequest() {
+        return exchange.advanced().getRequest().isConfirmable();
+    }
+}
diff --git a/common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/callback/CoapOkCallback.java b/common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/callback/CoapResponseCodeCallback.java
similarity index 88%
rename from common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/callback/CoapOkCallback.java
rename to common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/callback/CoapResponseCodeCallback.java
index a45821d9d6..21293395ea 100644
--- a/common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/callback/CoapOkCallback.java
+++ b/common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/callback/CoapResponseCodeCallback.java
@@ -20,13 +20,13 @@ import org.eclipse.californium.core.coap.Response;
 import org.eclipse.californium.core.server.resources.CoapExchange;
 import org.thingsboard.server.common.transport.TransportServiceCallback;
 
-public class CoapOkCallback implements TransportServiceCallback<Void> {
+public class CoapResponseCodeCallback implements TransportServiceCallback<Void> {
 
     protected final CoapExchange exchange;
     protected final CoAP.ResponseCode onSuccessResponse;
     protected final CoAP.ResponseCode onFailureResponse;
 
-    public CoapOkCallback(CoapExchange exchange, CoAP.ResponseCode onSuccessResponse, CoAP.ResponseCode onFailureResponse) {
+    public CoapResponseCodeCallback(CoapExchange exchange, CoAP.ResponseCode onSuccessResponse, CoAP.ResponseCode onFailureResponse) {
         this.exchange = exchange;
         this.onSuccessResponse = onSuccessResponse;
         this.onFailureResponse = onFailureResponse;
diff --git a/common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/client/CoapClientContext.java b/common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/client/CoapClientContext.java
index ffd37ead0a..f13e58b20b 100644
--- a/common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/client/CoapClientContext.java
+++ b/common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/client/CoapClientContext.java
@@ -18,10 +18,10 @@ package org.thingsboard.server.transport.coap.client;
 import org.eclipse.californium.core.observe.ObserveRelation;
 import org.eclipse.californium.core.server.resources.CoapExchange;
 import org.thingsboard.server.common.data.DeviceProfile;
-import org.thingsboard.server.transport.coap.CoapSessionMsgType;
 import org.thingsboard.server.common.adaptor.AdaptorException;
 import org.thingsboard.server.common.transport.auth.ValidateDeviceCredentialsResponse;
 import org.thingsboard.server.gen.transport.TransportProtos;
+import org.thingsboard.server.transport.coap.CoapSessionMsgType;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
diff --git a/common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/client/DefaultCoapClientContext.java b/common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/client/DefaultCoapClientContext.java
index eaf105ee48..8dafc18a88 100644
--- a/common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/client/DefaultCoapClientContext.java
+++ b/common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/client/DefaultCoapClientContext.java
@@ -26,6 +26,7 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.coapserver.CoapServerContext;
+import org.thingsboard.server.common.adaptor.AdaptorException;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.DeviceProfile;
@@ -45,7 +46,6 @@ import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
 import org.thingsboard.server.common.data.rpc.RpcStatus;
 import org.thingsboard.server.common.msg.session.FeatureType;
-import org.thingsboard.server.transport.coap.CoapSessionMsgType;
 import org.thingsboard.server.common.transport.DeviceDeletedEvent;
 import org.thingsboard.server.common.transport.DeviceProfileUpdatedEvent;
 import org.thingsboard.server.common.transport.DeviceUpdatedEvent;
@@ -53,18 +53,19 @@ import org.thingsboard.server.common.transport.SessionMsgListener;
 import org.thingsboard.server.common.transport.TransportDeviceProfileCache;
 import org.thingsboard.server.common.transport.TransportService;
 import org.thingsboard.server.common.transport.TransportServiceCallback;
-import org.thingsboard.server.common.adaptor.AdaptorException;
 import org.thingsboard.server.common.transport.auth.SessionInfoCreator;
 import org.thingsboard.server.common.transport.auth.ValidateDeviceCredentialsResponse;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.queue.discovery.PartitionService;
+import org.thingsboard.server.transport.coap.CoapSessionMsgType;
 import org.thingsboard.server.transport.coap.CoapTransportContext;
 import org.thingsboard.server.transport.coap.TbCoapMessageObserver;
 import org.thingsboard.server.transport.coap.TransportConfigurationContainer;
 import org.thingsboard.server.transport.coap.adaptors.CoapTransportAdaptor;
 import org.thingsboard.server.transport.coap.callback.AbstractSyncSessionCallback;
 import org.thingsboard.server.transport.coap.callback.CoapNoOpCallback;
-import org.thingsboard.server.transport.coap.callback.CoapOkCallback;
+import org.thingsboard.server.transport.coap.callback.CoapResponseCallback;
+import org.thingsboard.server.transport.coap.callback.CoapResponseCodeCallback;
 
 import java.util.Optional;
 import java.util.UUID;
@@ -329,9 +330,14 @@ public class DefaultCoapClientContext implements CoapClientContext {
                             TransportProtos.GetAttributeRequestMsg.newBuilder().setOnlyShared(true).build(),
                             new CoapNoOpCallback(exchange));
                 } else {
+                    Response response = new Response(CoAP.ResponseCode.VALID);
+                    if (state.getRpc() == null) {
+                        state.setRpc(new TbCoapObservationState(exchange, token));
+                    }
+                    response.getOptions().setObserve(state.getRpc().getObserveCounter().getAndIncrement());
                     transportService.process(state.getSession(),
                             TransportProtos.SubscribeToRPCMsg.getDefaultInstance(),
-                            new CoapOkCallback(exchange, CoAP.ResponseCode.VALID, CoAP.ResponseCode.INTERNAL_SERVER_ERROR)
+                            new CoapResponseCallback(exchange, response,  new Response(CoAP.ResponseCode.INTERNAL_SERVER_ERROR))
                     );
                 }
             }
@@ -479,6 +485,7 @@ public class DefaultCoapClientContext implements CoapClientContext {
             if (attrs != null) {
                 try {
                     Response response = state.getAdaptor().convertToPublish(msg);
+                    response.getOptions().setObserve(attrs.getObserveCounter().getAndIncrement());
                     respond(attrs.getExchange(), response, state.getContentFormat());
                 } catch (AdaptorException e) {
                     log.trace("Failed to reply due to error", e);
@@ -509,6 +516,7 @@ public class DefaultCoapClientContext implements CoapClientContext {
                     boolean conRequest = AbstractSyncSessionCallback.isConRequest(state.getAttrs());
                     int requestId = getNextMsgId();
                     Response response = state.getAdaptor().convertToPublish(msg);
+                    response.getOptions().setObserve(attrs.getObserveCounter().getAndIncrement());
                     response.setConfirmable(conRequest);
                     response.setMID(requestId);
                     if (conRequest) {
@@ -573,6 +581,7 @@ public class DefaultCoapClientContext implements CoapClientContext {
             int requestId = getNextMsgId();
             try {
                 Response response = state.getAdaptor().convertToPublish(msg, state.getConfiguration().getRpcRequestDynamicMessageBuilder());
+                response.getOptions().setObserve(state.getRpc().getObserveCounter().getAndIncrement());
                 response.setConfirmable(conRequest);
                 response.setMID(requestId);
                 if (conRequest) {
@@ -809,7 +818,7 @@ public class DefaultCoapClientContext implements CoapClientContext {
             state.setRpc(null);
             transportService.process(state.getSession(),
                     TransportProtos.SubscribeToRPCMsg.newBuilder().setUnsubscribe(true).build(),
-                    new CoapOkCallback(exchange, CoAP.ResponseCode.DELETED, CoAP.ResponseCode.INTERNAL_SERVER_ERROR));
+                    new CoapResponseCodeCallback(exchange, CoAP.ResponseCode.DELETED, CoAP.ResponseCode.INTERNAL_SERVER_ERROR));
             if (state.getAttrs() == null) {
                 closeAndCleanup(state);
             }
@@ -823,7 +832,7 @@ public class DefaultCoapClientContext implements CoapClientContext {
             state.setAttrs(null);
             transportService.process(state.getSession(),
                     TransportProtos.SubscribeToAttributeUpdatesMsg.newBuilder().setUnsubscribe(true).build(),
-                    new CoapOkCallback(exchange, CoAP.ResponseCode.DELETED, CoAP.ResponseCode.INTERNAL_SERVER_ERROR));
+                    new CoapResponseCodeCallback(exchange, CoAP.ResponseCode.DELETED, CoAP.ResponseCode.INTERNAL_SERVER_ERROR));
             if (state.getRpc() == null) {
                 closeAndCleanup(state);
             }
diff --git a/common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/efento/CoapEfentoTransportResource.java b/common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/efento/CoapEfentoTransportResource.java
index 722b10fc86..370c03c27f 100644
--- a/common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/efento/CoapEfentoTransportResource.java
+++ b/common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/efento/CoapEfentoTransportResource.java
@@ -28,6 +28,7 @@ import org.eclipse.californium.core.network.Exchange;
 import org.eclipse.californium.core.server.resources.CoapExchange;
 import org.eclipse.californium.core.server.resources.Resource;
 import org.springframework.util.CollectionUtils;
+import org.thingsboard.server.common.adaptor.ProtoConverter;
 import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.DeviceTransportType;
 import org.thingsboard.server.common.data.device.profile.CoapDeviceProfileTransportConfiguration;
@@ -35,6 +36,7 @@ import org.thingsboard.server.common.data.device.profile.DeviceProfileTransportC
 import org.thingsboard.server.common.data.device.profile.EfentoCoapDeviceTypeConfiguration;
 import org.thingsboard.server.common.adaptor.AdaptorException;
 import org.thingsboard.server.common.adaptor.ProtoConverter;
+import org.thingsboard.server.common.adaptor.AdaptorException;
 import org.thingsboard.server.common.transport.auth.SessionInfoCreator;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.gen.transport.coap.ConfigProtos;
diff --git a/common/transport/coap/src/test/resources/junit-platform.properties b/common/transport/coap/src/test/resources/junit-platform.properties
new file mode 100644
index 0000000000..f2ed301920
--- /dev/null
+++ b/common/transport/coap/src/test/resources/junit-platform.properties
@@ -0,0 +1,3 @@
+junit.jupiter.execution.parallel.enabled = true
+junit.jupiter.execution.parallel.mode.default = concurrent
+junit.jupiter.execution.parallel.mode.classes.default = concurrent
diff --git a/common/transport/coap/src/test/resources/logback-test.xml b/common/transport/coap/src/test/resources/logback-test.xml
new file mode 100644
index 0000000000..52f2a77588
--- /dev/null
+++ b/common/transport/coap/src/test/resources/logback-test.xml
@@ -0,0 +1,14 @@
+<?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>
+
+    <root level="INFO">
+        <appender-ref ref="console"/>
+    </root>
+
+</configuration>
diff --git a/common/transport/http/pom.xml b/common/transport/http/pom.xml
index a2038a2299..e27f7cbc1b 100644
--- a/common/transport/http/pom.xml
+++ b/common/transport/http/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard.common</groupId>
-        <version>3.6.3-SNAPSHOT</version>
+        <version>3.7.0-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.common.transport</groupId>
@@ -66,11 +66,6 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.awaitility</groupId>
             <artifactId>awaitility</artifactId>
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 faca435fdf..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,9 +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.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,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;
@@ -53,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;
@@ -64,7 +68,7 @@ import org.thingsboard.server.gen.transport.TransportProtos.ToServerRpcRequestMs
 import org.thingsboard.server.gen.transport.TransportProtos.ToServerRpcResponseMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ValidateDeviceTokenRequestMsg;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
@@ -127,22 +131,21 @@ public class DeviceApiController implements TbTransportService {
     @Autowired
     private HttpTransportContext transportContext;
 
-    @ApiOperation(value = "Get attributes (getDeviceAttributes)",
-            notes = "Returns all attributes that belong to device. "
+    @Operation(summary = "Get attributes (getDeviceAttributes)",
+            description = "Returns all attributes that belong to device. "
                     + "Use optional 'clientKeys' and/or 'sharedKeys' parameter to return specific attributes. "
                     + "\n Example of the result: "
                     + MARKDOWN_CODE_BLOCK_START
                     + ATTRIBUTE_PAYLOAD_EXAMPLE
                     + MARKDOWN_CODE_BLOCK_END
-                    + REQUIRE_ACCESS_TOKEN,
-            produces = MediaType.APPLICATION_JSON_VALUE)
-    @RequestMapping(value = "/{deviceToken}/attributes", method = RequestMethod.GET, produces = "application/json")
+                    + REQUIRE_ACCESS_TOKEN)
+    @RequestMapping(value = "/{deviceToken}/attributes", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
     public DeferredResult<ResponseEntity> getDeviceAttributes(
-            @ApiParam(value = ACCESS_TOKEN_PARAM_DESCRIPTION, required = true, defaultValue = "YOUR_DEVICE_ACCESS_TOKEN")
+            @Parameter(description = ACCESS_TOKEN_PARAM_DESCRIPTION, required = true, schema = @Schema(defaultValue = "YOUR_DEVICE_ACCESS_TOKEN"))
             @PathVariable("deviceToken") String deviceToken,
-            @ApiParam(value = "Comma separated key names for attribute with client scope", required = true, defaultValue = "state")
+            @Parameter(description = "Comma separated key names for attribute with client scope", required = true , schema = @Schema(defaultValue = "state"))
             @RequestParam(value = "clientKeys", required = false, defaultValue = "") String clientKeys,
-            @ApiParam(value = "Comma separated key names for attribute with shared scope", required = true, defaultValue = "configuration")
+            @Parameter(description = "Comma separated key names for attribute with shared scope", required = true , schema = @Schema(defaultValue = "configuration"))
             @RequestParam(value = "sharedKeys", required = false, defaultValue = "") String sharedKeys) {
         DeferredResult<ResponseEntity> responseWriter = new DeferredResult<>();
         transportContext.getTransportService().process(DeviceTransportType.DEFAULT, ValidateDeviceTokenRequestMsg.newBuilder().setToken(deviceToken).build(),
@@ -165,53 +168,51 @@ public class DeviceApiController implements TbTransportService {
         return responseWriter;
     }
 
-    @ApiOperation(value = "Post attributes (postDeviceAttributes)",
-            notes = "Post client attribute updates on behalf of device. "
+    @Operation(summary = "Post attributes (postDeviceAttributes)",
+            description = "Post client attribute updates on behalf of device. "
                     + "\n Example of the request: "
                     + MARKDOWN_CODE_BLOCK_START
                     + ATTRIBUTE_PAYLOAD_EXAMPLE
                     + MARKDOWN_CODE_BLOCK_END
-                    + REQUIRE_ACCESS_TOKEN,
-            produces = MediaType.APPLICATION_JSON_VALUE)
+                    + REQUIRE_ACCESS_TOKEN)
     @RequestMapping(value = "/{deviceToken}/attributes", method = RequestMethod.POST)
     public DeferredResult<ResponseEntity> postDeviceAttributes(
-            @ApiParam(value = ACCESS_TOKEN_PARAM_DESCRIPTION, required = true, defaultValue = "YOUR_DEVICE_ACCESS_TOKEN")
+            @Parameter(description = ACCESS_TOKEN_PARAM_DESCRIPTION, required = true , schema = @Schema(defaultValue = "YOUR_DEVICE_ACCESS_TOKEN"))
             @PathVariable("deviceToken") String deviceToken,
-            @ApiParam(value = "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;
     }
 
-    @ApiOperation(value = "Post time-series data (postTelemetry)",
-            notes = "Post time-series data on behalf of device. "
+    @Operation(summary = "Post time-series data (postTelemetry)",
+            description = "Post time-series data on behalf of device. "
                     + "\n Example of the request: "
                     + TS_PAYLOAD
-                    + REQUIRE_ACCESS_TOKEN,
-            produces = MediaType.APPLICATION_JSON_VALUE)
+                    + REQUIRE_ACCESS_TOKEN)
     @RequestMapping(value = "/{deviceToken}/telemetry", method = RequestMethod.POST)
     public DeferredResult<ResponseEntity> postTelemetry(
-            @ApiParam(value = ACCESS_TOKEN_PARAM_DESCRIPTION, required = true, defaultValue = "YOUR_DEVICE_ACCESS_TOKEN")
+            @Parameter(description = ACCESS_TOKEN_PARAM_DESCRIPTION, required = true , schema = @Schema(defaultValue = "YOUR_DEVICE_ACCESS_TOKEN"))
             @PathVariable("deviceToken") String deviceToken,
             @RequestBody String json, HttpServletRequest request) {
         DeferredResult<ResponseEntity> responseWriter = new DeferredResult<ResponseEntity>();
         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;
     }
 
-    @ApiOperation(value = "Save claiming information (claimDevice)",
-            notes = "Saves the information required for user to claim the device. " +
+    @Operation(summary = "Save claiming information (claimDevice)",
+            description = "Saves the information required for user to claim the device. " +
                     "See more info about claiming in the corresponding 'Claiming devices' platform documentation."
                     + "\n Example of the request payload: "
                     + MARKDOWN_CODE_BLOCK_START
@@ -219,11 +220,10 @@ 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,
-            produces = MediaType.APPLICATION_JSON_VALUE)
+                    + REQUIRE_ACCESS_TOKEN)
     @RequestMapping(value = "/{deviceToken}/claim", method = RequestMethod.POST)
     public DeferredResult<ResponseEntity> claimDevice(
-            @ApiParam(value = ACCESS_TOKEN_PARAM_DESCRIPTION, required = true, defaultValue = "YOUR_DEVICE_ACCESS_TOKEN")
+            @Parameter(description = ACCESS_TOKEN_PARAM_DESCRIPTION, required = true , schema = @Schema(defaultValue = "YOUR_DEVICE_ACCESS_TOKEN"))
             @PathVariable("deviceToken") String deviceToken,
             @RequestBody(required = false) String json) {
         DeferredResult<ResponseEntity> responseWriter = new DeferredResult<>();
@@ -237,17 +237,16 @@ public class DeviceApiController implements TbTransportService {
         return responseWriter;
     }
 
-    @ApiOperation(value = "Subscribe to RPC commands (subscribeToCommands) (Deprecated)",
-            notes = "Subscribes to RPC commands using http long polling. " +
+    @Operation(summary = "Subscribe to RPC commands (subscribeToCommands) (Deprecated)",
+            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,
-            produces = MediaType.APPLICATION_JSON_VALUE)
-    @RequestMapping(value = "/{deviceToken}/rpc", method = RequestMethod.GET, produces = "application/json")
+                    REQUIRE_ACCESS_TOKEN)
+    @RequestMapping(value = "/{deviceToken}/rpc", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
     public DeferredResult<ResponseEntity> subscribeToCommands(
-            @ApiParam(value = ACCESS_TOKEN_PARAM_DESCRIPTION, required = true, defaultValue = "YOUR_DEVICE_ACCESS_TOKEN")
+            @Parameter(description = ACCESS_TOKEN_PARAM_DESCRIPTION, required = true , schema = @Schema(defaultValue = "YOUR_DEVICE_ACCESS_TOKEN"))
             @PathVariable("deviceToken") String deviceToken,
-            @ApiParam(value = "Optional timeout of the long poll. Typically less then 60 seconds, since limited on the server side.")
+            @Parameter(description = "Optional timeout of the long poll. Typically less then 60 seconds, since limited on the server side.")
             @RequestParam(value = "timeout", required = false, defaultValue = "0") long timeout) {
         DeferredResult<ResponseEntity> responseWriter = new DeferredResult<>();
         transportContext.getTransportService().process(DeviceTransportType.DEFAULT, ValidateDeviceTokenRequestMsg.newBuilder().setToken(deviceToken).build(),
@@ -263,17 +262,16 @@ public class DeviceApiController implements TbTransportService {
         return responseWriter;
     }
 
-    @ApiOperation(value = "Reply to RPC commands (replyToCommand)",
-            notes = "Replies to server originated RPC command identified by 'requestId' parameter. The response is arbitrary JSON.\n\n" +
-                    REQUIRE_ACCESS_TOKEN,
-            produces = MediaType.APPLICATION_JSON_VALUE)
+    @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)
     @RequestMapping(value = "/{deviceToken}/rpc/{requestId}", method = RequestMethod.POST)
     public DeferredResult<ResponseEntity> replyToCommand(
-            @ApiParam(value = ACCESS_TOKEN_PARAM_DESCRIPTION, required = true, defaultValue = "YOUR_DEVICE_ACCESS_TOKEN")
+            @Parameter(description = ACCESS_TOKEN_PARAM_DESCRIPTION, required = true , schema = @Schema(defaultValue = "YOUR_DEVICE_ACCESS_TOKEN"))
             @PathVariable("deviceToken") String deviceToken,
-            @ApiParam(value = "RPC request id from the incoming RPC request", required = true, defaultValue = "123")
+            @Parameter(description = "RPC request id from the incoming RPC request", required = true , schema = @Schema(defaultValue = "123"))
             @PathVariable("requestId") Integer requestId,
-            @ApiParam(value = "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(),
@@ -284,8 +282,8 @@ public class DeviceApiController implements TbTransportService {
         return responseWriter;
     }
 
-    @ApiOperation(value = "Send the RPC command (postRpcRequest)",
-            notes = "Send the RPC request to server. The request payload is a JSON document that contains 'method' and 'params'. For example:" +
+    @Operation(summary = "Send the RPC command (postRpcRequest)",
+            description = "Send the RPC request to server. The request payload is a JSON document that contains 'method' and 'params'. For example:" +
                     MARKDOWN_CODE_BLOCK_START +
                     "{\"method\": \"sumOnServer\", \"params\":{\"a\":2, \"b\":2}}" +
                     MARKDOWN_CODE_BLOCK_END +
@@ -293,18 +291,17 @@ public class DeviceApiController implements TbTransportService {
                     MARKDOWN_CODE_BLOCK_START +
                     "{\"result\": 4}" +
                     MARKDOWN_CODE_BLOCK_END +
-                    REQUIRE_ACCESS_TOKEN,
-            produces = MediaType.APPLICATION_JSON_VALUE)
+                    REQUIRE_ACCESS_TOKEN)
     @RequestMapping(value = "/{deviceToken}/rpc", method = RequestMethod.POST)
     public DeferredResult<ResponseEntity> postRpcRequest(
-            @ApiParam(value = ACCESS_TOKEN_PARAM_DESCRIPTION, required = true, defaultValue = "YOUR_DEVICE_ACCESS_TOKEN")
+            @Parameter(description = ACCESS_TOKEN_PARAM_DESCRIPTION, required = true , schema = @Schema(defaultValue = "YOUR_DEVICE_ACCESS_TOKEN"))
             @PathVariable("deviceToken") String deviceToken,
-            @ApiParam(value = "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),
@@ -317,17 +314,16 @@ public class DeviceApiController implements TbTransportService {
         return responseWriter;
     }
 
-    @ApiOperation(value = "Subscribe to attribute updates (subscribeToAttributes) (Deprecated)",
-            notes = "Subscribes to client and shared scope attribute updates using http long polling. " +
+    @Operation(summary = "Subscribe to attribute updates (subscribeToAttributes) (Deprecated)",
+            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,
-            produces = MediaType.APPLICATION_JSON_VALUE)
-    @RequestMapping(value = "/{deviceToken}/attributes/updates", method = RequestMethod.GET, produces = "application/json")
+                    REQUIRE_ACCESS_TOKEN)
+    @RequestMapping(value = "/{deviceToken}/attributes/updates", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
     public DeferredResult<ResponseEntity> subscribeToAttributes(
-            @ApiParam(value = ACCESS_TOKEN_PARAM_DESCRIPTION, required = true, defaultValue = "YOUR_DEVICE_ACCESS_TOKEN")
+            @Parameter(description = ACCESS_TOKEN_PARAM_DESCRIPTION, required = true , schema = @Schema(defaultValue = "YOUR_DEVICE_ACCESS_TOKEN"))
             @PathVariable("deviceToken") String deviceToken,
-            @ApiParam(value = "Optional timeout of the long poll. Typically less then 60 seconds, since limited on the server side.")
+            @Parameter(description = "Optional timeout of the long poll. Typically less then 60 seconds, since limited on the server side.")
             @RequestParam(value = "timeout", required = false, defaultValue = "0") long timeout) {
         DeferredResult<ResponseEntity> responseWriter = new DeferredResult<>();
         transportContext.getTransportService().process(DeviceTransportType.DEFAULT, ValidateDeviceTokenRequestMsg.newBuilder().setToken(deviceToken).build(),
@@ -343,8 +339,8 @@ public class DeviceApiController implements TbTransportService {
         return responseWriter;
     }
 
-    @ApiOperation(value = "Get Device Firmware (getFirmware)",
-            notes = "Downloads the current firmware package." +
+    @Operation(summary = "Get Device Firmware (getFirmware)",
+            description = "Downloads the current firmware package." +
                     "When the platform initiates firmware update, " +
                     "it informs the device by updating the 'fw_title', 'fw_version', 'fw_checksum' and 'fw_checksum_algorithm' shared attributes." +
                     "The 'fw_title' and 'fw_version' parameters must be supplied in this request to double-check " +
@@ -353,25 +349,24 @@ 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,
-            produces = MediaType.APPLICATION_JSON_VALUE)
+                    REQUIRE_ACCESS_TOKEN)
     @RequestMapping(value = "/{deviceToken}/firmware", method = RequestMethod.GET)
     public DeferredResult<ResponseEntity> getFirmware(
-            @ApiParam(value = ACCESS_TOKEN_PARAM_DESCRIPTION, required = true, defaultValue = "YOUR_DEVICE_ACCESS_TOKEN")
+            @Parameter(description = ACCESS_TOKEN_PARAM_DESCRIPTION, required = true , schema = @Schema(defaultValue = "YOUR_DEVICE_ACCESS_TOKEN"))
             @PathVariable("deviceToken") String deviceToken,
-            @ApiParam(value = "Title of the firmware, corresponds to the value of 'fw_title' attribute.", required = true)
+            @Parameter(description = "Title of the firmware, corresponds to the value of 'fw_title' attribute.", required = true)
             @RequestParam(value = "title") String title,
-            @ApiParam(value = "Version of the firmware, corresponds to the value of 'fw_version' attribute.", required = true)
+            @Parameter(description = "Version of the firmware, corresponds to the value of 'fw_version' attribute.", required = true)
             @RequestParam(value = "version") String version,
-            @ApiParam(value = "Size of the chunk. Optional. Omit to download the entire file without chunks.")
+            @Parameter(description = "Size of the chunk. Optional. Omit to download the entire file without chunks.")
             @RequestParam(value = "size", required = false, defaultValue = "0") int size,
-            @ApiParam(value = "Index of the chunk. Optional. Omit to download the entire file without chunks.")
+            @Parameter(description = "Index of the chunk. Optional. Omit to download the entire file without chunks.")
             @RequestParam(value = "chunk", required = false, defaultValue = "0") int chunk) {
         return getOtaPackageCallback(deviceToken, title, version, size, chunk, OtaPackageType.FIRMWARE);
     }
 
-    @ApiOperation(value = "Get Device Software (getSoftware)",
-            notes = "Downloads the current software package." +
+    @Operation(summary = "Get Device Software (getSoftware)",
+            description = "Downloads the current software package." +
                     "When the platform initiates software update, " +
                     "it informs the device by updating the 'sw_title', 'sw_version', 'sw_checksum' and 'sw_checksum_algorithm' shared attributes." +
                     "The 'sw_title' and 'sw_version' parameters must be supplied in this request to double-check " +
@@ -380,25 +375,24 @@ 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,
-            produces = MediaType.APPLICATION_JSON_VALUE)
+                    REQUIRE_ACCESS_TOKEN)
     @RequestMapping(value = "/{deviceToken}/software", method = RequestMethod.GET)
     public DeferredResult<ResponseEntity> getSoftware(
-            @ApiParam(value = ACCESS_TOKEN_PARAM_DESCRIPTION, required = true, defaultValue = "YOUR_DEVICE_ACCESS_TOKEN")
+            @Parameter(description = ACCESS_TOKEN_PARAM_DESCRIPTION, required = true , schema = @Schema(defaultValue = "YOUR_DEVICE_ACCESS_TOKEN"))
             @PathVariable("deviceToken") String deviceToken,
-            @ApiParam(value = "Title of the software, corresponds to the value of 'sw_title' attribute.", required = true)
+            @Parameter(description = "Title of the software, corresponds to the value of 'sw_title' attribute.", required = true)
             @RequestParam(value = "title") String title,
-            @ApiParam(value = "Version of the software, corresponds to the value of 'sw_version' attribute.", required = true)
+            @Parameter(description = "Version of the software, corresponds to the value of 'sw_version' attribute.", required = true)
             @RequestParam(value = "version") String version,
-            @ApiParam(value = "Size of the chunk. Optional. Omit to download the entire file without using  chunks.")
+            @Parameter(description = "Size of the chunk. Optional. Omit to download the entire file without using  chunks.")
             @RequestParam(value = "size", required = false, defaultValue = "0") int size,
-            @ApiParam(value = "Index of the chunk. Optional. Omit to download the entire file without using chunks.")
+            @Parameter(description = "Index of the chunk. Optional. Omit to download the entire file without using chunks.")
             @RequestParam(value = "chunk", required = false, defaultValue = "0") int chunk) {
         return getOtaPackageCallback(deviceToken, title, version, size, chunk, OtaPackageType.SOFTWARE);
     }
 
-    @ApiOperation(value = "Provision new device (provisionDevice)",
-            notes = "Exchange the provision request to the device credentials. " +
+    @Operation(summary = "Provision new device (provisionDevice)",
+            description = "Exchange the provision request to the device credentials. " +
                     "See more info about provisioning in the corresponding 'Device provisioning' platform documentation." +
                     "Requires valid JSON request with the following format: " +
                     MARKDOWN_CODE_BLOCK_START +
@@ -415,12 +409,10 @@ public class DeviceApiController implements TbTransportService {
                     "  \"credentialsType\":\"ACCESS_TOKEN\",\n" +
                     "  \"credentialsValue\":\"DEVICE_ACCESS_TOKEN\",\n" +
                     "  \"status\":\"SUCCESS\"\n" +
-                    "}" + MARKDOWN_CODE_BLOCK_END
-            ,
-            produces = MediaType.APPLICATION_JSON_VALUE)
+                    "}" + MARKDOWN_CODE_BLOCK_END)
     @RequestMapping(value = "/provision", method = RequestMethod.POST)
     public DeferredResult<ResponseEntity> provisionDevice(
-            @ApiParam(value = "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),
@@ -438,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()) {
@@ -465,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));
@@ -484,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) {
@@ -510,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())
@@ -525,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/junit-platform.properties b/common/transport/http/src/test/resources/junit-platform.properties
new file mode 100644
index 0000000000..f2ed301920
--- /dev/null
+++ b/common/transport/http/src/test/resources/junit-platform.properties
@@ -0,0 +1,3 @@
+junit.jupiter.execution.parallel.enabled = true
+junit.jupiter.execution.parallel.mode.default = concurrent
+junit.jupiter.execution.parallel.mode.classes.default = concurrent
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/pom.xml b/common/transport/lwm2m/pom.xml
index 530000f95e..0ec3492c99 100644
--- a/common/transport/lwm2m/pom.xml
+++ b/common/transport/lwm2m/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard.common</groupId>
-        <version>3.6.3-SNAPSHOT</version>
+        <version>3.7.0-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.common.transport</groupId>
@@ -89,16 +89,6 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-inline</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.awaitility</groupId>
             <artifactId>awaitility</artifactId>
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/bootstrap/LwM2MTransportBootstrapService.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/bootstrap/LwM2MTransportBootstrapService.java
index a9166b0bf1..c8e8baa30a 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/bootstrap/LwM2MTransportBootstrapService.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/bootstrap/LwM2MTransportBootstrapService.java
@@ -15,13 +15,20 @@
  */
 package org.thingsboard.server.transport.lwm2m.bootstrap;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.eclipse.californium.elements.config.Configuration;
 import org.eclipse.californium.scandium.config.DtlsConfig;
-import org.eclipse.californium.scandium.config.DtlsConnectorConfig;
+import org.eclipse.leshan.core.endpoint.Protocol;
 import org.eclipse.leshan.server.bootstrap.BootstrapSessionManager;
-import org.eclipse.leshan.server.californium.bootstrap.LeshanBootstrapServer;
-import org.eclipse.leshan.server.californium.bootstrap.LeshanBootstrapServerBuilder;
+import org.eclipse.leshan.server.bootstrap.LeshanBootstrapServer;
+import org.eclipse.leshan.server.bootstrap.LeshanBootstrapServerBuilder;
+import org.eclipse.leshan.server.californium.bootstrap.LwM2mBootstrapPskStore;
+import org.eclipse.leshan.server.californium.bootstrap.endpoint.CaliforniumBootstrapServerEndpointsProvider;
+import org.eclipse.leshan.server.californium.bootstrap.endpoint.coap.CoapBootstrapServerProtocolProvider;
+import org.eclipse.leshan.server.californium.bootstrap.endpoint.coaps.CoapsBootstrapServerProtocolProvider;
 import org.springframework.stereotype.Component;
 import org.thingsboard.server.common.transport.TransportService;
 import org.thingsboard.server.common.transport.config.ssl.SslCredentials;
@@ -33,20 +40,16 @@ import org.thingsboard.server.transport.lwm2m.bootstrap.store.LwM2MInMemoryBoots
 import org.thingsboard.server.transport.lwm2m.config.LwM2MTransportBootstrapConfig;
 import org.thingsboard.server.transport.lwm2m.config.LwM2MTransportServerConfig;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import java.net.InetSocketAddress;
 import java.security.cert.X509Certificate;
 
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
-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.californium.scandium.config.DtlsConfig.DTLS_RECOMMENDED_CURVES_ONLY;
 import static org.eclipse.californium.scandium.config.DtlsConfig.DTLS_RETRANSMISSION_TIMEOUT;
-import static org.eclipse.californium.scandium.config.DtlsConfig.DTLS_ROLE;
-import static org.eclipse.californium.scandium.config.DtlsConfig.DtlsRole.SERVER_ONLY;
 import static org.thingsboard.server.transport.lwm2m.server.DefaultLwM2mTransportService.PSK_CIPHER_SUITES;
 import static org.thingsboard.server.transport.lwm2m.server.DefaultLwM2mTransportService.RPK_OR_X509_CIPHER_SUITES;
 import static org.thingsboard.server.transport.lwm2m.server.LwM2MNetworkConfig.getCoapConfig;
+import static org.thingsboard.server.transport.lwm2m.utils.LwM2MTransportUtil.setDtlsConnectorConfigCidLength;
 
 @Slf4j
 @Component
@@ -83,25 +86,57 @@ public class LwM2MTransportBootstrapService {
 
     public LeshanBootstrapServer getLhBootstrapServer() {
         LeshanBootstrapServerBuilder builder = new LeshanBootstrapServerBuilder();
-        builder.setLocalAddress(bootstrapConfig.getHost(), bootstrapConfig.getPort());
-        builder.setLocalSecureAddress(bootstrapConfig.getSecureHost(), bootstrapConfig.getSecurePort());
 
-        /* Create CoAP Config */
-        builder.setCoapConfig(getCoapConfig(bootstrapConfig.getPort(), bootstrapConfig.getSecurePort(), serverConfig));
+        // Create Californium Endpoints Provider:
+        // ------------------
+        // Create Server Endpoints Provider
+        CaliforniumBootstrapServerEndpointsProvider.Builder endpointsBuilder = new CaliforniumBootstrapServerEndpointsProvider.Builder(
+                // Add coap Protocol support
+                new CoapBootstrapServerProtocolProvider(),
+
+                // Add coaps/dtls protocol support
+                new CoapsBootstrapServerProtocolProvider(c -> {
+                    if (this.bootstrapConfig.getSslCredentials() != null) {
+                        c.setAdvancedCertificateVerifier(certificateVerifier);
+                        c.setAsList(DtlsConfig.DTLS_CIPHER_SUITES, RPK_OR_X509_CIPHER_SUITES);
+                    } else {
+                        log.info("Unable to load X509 files for LWM2MServer");
+                        LwM2mBootstrapPskStore lwM2mBsPskStore = new LwM2mBootstrapPskStore(lwM2MBootstrapSecurityStore);
+                        c.setAdvancedPskStore(lwM2mBsPskStore);
+                        c.setAsList(DtlsConfig.DTLS_CIPHER_SUITES, PSK_CIPHER_SUITES);
+                    }
+                }));
+
+
+        // Create Californium Configuration
+        Configuration serverCoapConfig = endpointsBuilder.createDefaultConfiguration();
+        getCoapConfig(serverCoapConfig, bootstrapConfig.getPort(), bootstrapConfig.getSecurePort(),serverConfig);
+        serverCoapConfig.setTransient(DtlsConfig.DTLS_RECOMMENDED_CIPHER_SUITES_ONLY);
+        serverCoapConfig.set(DtlsConfig.DTLS_RECOMMENDED_CIPHER_SUITES_ONLY, serverConfig.isRecommendedCiphers());
+        serverCoapConfig.setTransient(DtlsConfig.DTLS_CONNECTION_ID_LENGTH);
+        serverCoapConfig.set(DTLS_RECOMMENDED_CURVES_ONLY, serverConfig.isRecommendedSupportedGroups());
+        serverCoapConfig.setTransient(DTLS_RETRANSMISSION_TIMEOUT);
+        serverCoapConfig.set(DTLS_RETRANSMISSION_TIMEOUT, serverConfig.getDtlsRetransmissionTimeout(), MILLISECONDS);
+
+        if (serverConfig.getDtlsCidLength() != null) {
+            setDtlsConnectorConfigCidLength( serverCoapConfig, serverConfig.getDtlsCidLength());
+        }
+
+        /* Create DTLS Config */
+        this.setServerWithCredentials(builder);
 
+        // Set Californium Configuration
+        endpointsBuilder.setConfiguration(serverCoapConfig);
+        serverConfig.setCoapConfig(serverCoapConfig);
 
-        /* Create and Set DTLS Config */
-        DtlsConnectorConfig.Builder dtlsConfig = new DtlsConnectorConfig.Builder(getCoapConfig(bootstrapConfig.getPort(), bootstrapConfig.getSecurePort(), serverConfig));
 
-        dtlsConfig.set(DTLS_RECOMMENDED_CURVES_ONLY, serverConfig.isRecommendedSupportedGroups());
-        dtlsConfig.set(DTLS_RECOMMENDED_CIPHER_SUITES_ONLY, serverConfig.isRecommendedCiphers());
-        dtlsConfig.set(DTLS_RETRANSMISSION_TIMEOUT, serverConfig.getDtlsRetransmissionTimeout(), MILLISECONDS);
-        dtlsConfig.set(DTLS_CONNECTION_ID_LENGTH, serverConfig.getDtlsConnectionIdLength());
-        dtlsConfig.set(DTLS_ROLE, SERVER_ONLY);
-        setServerWithCredentials(builder, dtlsConfig);
+        // Create CoAP endpoint
+        InetSocketAddress coapAddr = new InetSocketAddress(bootstrapConfig.getHost(), bootstrapConfig.getPort());
+        endpointsBuilder.addEndpoint(coapAddr, Protocol.COAP);
 
-        /* Set DTLS Config */
-        builder.setDtlsConfig(dtlsConfig);
+        // Create CoAP over DTLS endpoint
+        InetSocketAddress coapsAddr = new InetSocketAddress(bootstrapConfig.getSecureHost(), bootstrapConfig.getSecurePort());
+        endpointsBuilder.addEndpoint(coapsAddr, Protocol.COAPS);
 
         /* Set securityStore with new ConfigStore */
         builder.setConfigStore(lwM2MInMemoryBootstrapConfigStore);
@@ -114,22 +149,19 @@ public class LwM2MTransportBootstrapService {
         builder.setSessionManager(sessionManager);
 
         /* Create BootstrapServer */
+        builder.setEndpointsProviders(endpointsBuilder.build());
         return builder.build();
     }
 
-    private void setServerWithCredentials(LeshanBootstrapServerBuilder builder, DtlsConnectorConfig.Builder dtlsConfig) {
+    private void setServerWithCredentials(LeshanBootstrapServerBuilder builder) {
         if (this.bootstrapConfig.getSslCredentials() != null) {
             SslCredentials sslCredentials = this.bootstrapConfig.getSslCredentials();
             builder.setPublicKey(sslCredentials.getPublicKey());
             builder.setPrivateKey(sslCredentials.getPrivateKey());
             builder.setCertificateChain(sslCredentials.getCertificateChain());
-            dtlsConfig.setAdvancedCertificateVerifier(certificateVerifier);
-            dtlsConfig.setAsList(DtlsConfig.DTLS_CIPHER_SUITES, RPK_OR_X509_CIPHER_SUITES);
         } else {
             /* by default trust all */
             builder.setTrustedCertificates(new X509Certificate[0]);
-            log.info("Unable to load X509 files for BootStrap Server");
-            dtlsConfig.setAsList(DtlsConfig.DTLS_CIPHER_SUITES, PSK_CIPHER_SUITES);
         }
     }
 }
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/bootstrap/secure/LwM2mDefaultBootstrapSessionManager.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/bootstrap/secure/LwM2mDefaultBootstrapSessionManager.java
index 0d75cfd441..6891765788 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/bootstrap/secure/LwM2mDefaultBootstrapSessionManager.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/bootstrap/secure/LwM2mDefaultBootstrapSessionManager.java
@@ -16,10 +16,13 @@
 package org.thingsboard.server.transport.lwm2m.bootstrap.secure;
 
 import lombok.extern.slf4j.Slf4j;
+import org.eclipse.leshan.core.peer.IpPeer;
+import org.eclipse.leshan.core.peer.LwM2mPeer;
+import org.eclipse.leshan.core.peer.PskIdentity;
+import org.eclipse.leshan.core.peer.X509Identity;
 import org.eclipse.leshan.core.request.BootstrapDownlinkRequest;
 import org.eclipse.leshan.core.request.BootstrapFinishRequest;
 import org.eclipse.leshan.core.request.BootstrapRequest;
-import org.eclipse.leshan.core.request.Identity;
 import org.eclipse.leshan.core.response.LwM2mResponse;
 import org.eclipse.leshan.server.bootstrap.BootstrapConfigStore;
 import org.eclipse.leshan.server.bootstrap.BootstrapFailureCause;
@@ -39,6 +42,7 @@ import org.thingsboard.server.transport.lwm2m.bootstrap.store.LwM2MBootstrapSecu
 import org.thingsboard.server.transport.lwm2m.bootstrap.store.LwM2MBootstrapTaskProvider;
 import org.thingsboard.server.transport.lwm2m.server.client.LwM2MAuthException;
 
+import java.net.URI;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
@@ -63,7 +67,7 @@ public class LwM2mDefaultBootstrapSessionManager extends DefaultBootstrapSession
      * @param bsSecurityStore the {@link BootstrapSecurityStore} used by default {@link SecurityChecker}.
      */
     public LwM2mDefaultBootstrapSessionManager(BootstrapSecurityStore bsSecurityStore, BootstrapConfigStore configStore, TransportService transportService) {
-        this(bsSecurityStore, new SecurityChecker(), new LwM2MBootstrapConfigStoreTaskProvider(configStore),
+        this(bsSecurityStore, configStore, new SecurityChecker(), new LwM2MBootstrapConfigStoreTaskProvider(configStore),
                 new StandardBootstrapModelProvider());
         this.transportService = transportService;
     }
@@ -74,9 +78,9 @@ public class LwM2mDefaultBootstrapSessionManager extends DefaultBootstrapSession
      * @param bsSecurityStore the {@link BootstrapSecurityStore} used by {@link SecurityChecker}.
      * @param securityChecker used to accept or refuse new {@link BootstrapSession}.
      */
-    public LwM2mDefaultBootstrapSessionManager(BootstrapSecurityStore bsSecurityStore, SecurityChecker securityChecker,
+    public LwM2mDefaultBootstrapSessionManager(BootstrapSecurityStore bsSecurityStore, BootstrapConfigStore configStore, SecurityChecker securityChecker,
                                                LwM2MBootstrapTaskProvider tasksProvider, LwM2mBootstrapModelProvider modelProvider) {
-        super(bsSecurityStore, securityChecker, tasksProvider, modelProvider);
+        super(bsSecurityStore, configStore);
         this.bsSecurityStore = bsSecurityStore;
         this.securityChecker = securityChecker;
         this.tasksProvider = tasksProvider;
@@ -84,23 +88,24 @@ public class LwM2mDefaultBootstrapSessionManager extends DefaultBootstrapSession
     }
 
     @Override
-    public BootstrapSession begin(BootstrapRequest request, Identity clientIdentity) {
-        boolean authorized = true;
+    public BootstrapSession begin(BootstrapRequest request, LwM2mPeer sender, URI endpointUsed) {
+        boolean authorized = sender.getIdentity().isSecure();
         Iterator<SecurityInfo> securityInfos = null;
-        try {
+          try {
             if (bsSecurityStore != null && securityChecker != null) {
-                if (clientIdentity.isPSK()) {
-                    SecurityInfo securityInfo = bsSecurityStore.getByIdentity(clientIdentity.getPskIdentity());
+                if (((IpPeer) sender).isPSK()) {
+                    SecurityInfo securityInfo = bsSecurityStore.getByIdentity(((PskIdentity) sender.getIdentity()).getPskIdentity());
                     securityInfos = Collections.singletonList(securityInfo).iterator();
-                } else if (!clientIdentity.isX509()) {
+                }
+                else if (!((IpPeer) sender).isX509()) {
                     securityInfos = bsSecurityStore.getAllByEndpoint(request.getEndpointName());
                 }
-                authorized = this.checkSecurityInfo(request.getEndpointName(), clientIdentity, securityInfos);
+                authorized = this.checkSecurityInfo(request.getEndpointName(), sender, securityInfos);
             }
         } catch (LwM2MAuthException e) {
             authorized = false;
         }
-        DefaultBootstrapSession session = new DefaultBootstrapSession(request, clientIdentity, authorized);
+        DefaultBootstrapSession session = new DefaultBootstrapSession(request, sender, authorized, null, endpointUsed);
         if (authorized) {
             try {
                 this.tasksProvider.put(session.getEndpoint());
@@ -239,9 +244,9 @@ public class LwM2mDefaultBootstrapSessionManager extends DefaultBootstrapSession
         transportService.log(((LwM2MBootstrapSecurityStore) bsSecurityStore).getSessionByEndpoint(endpointName), logMsg);
     }
 
-    private boolean checkSecurityInfo(String endpoint, Identity clientIdentity, Iterator<SecurityInfo> securityInfos) {
-        if (clientIdentity.isX509()) {
-            return clientIdentity.getX509CommonName().equals(endpoint)
+    private boolean checkSecurityInfo(String endpoint, LwM2mPeer clientIdentity, Iterator<SecurityInfo> securityInfos) {
+        if (((IpPeer) clientIdentity).isX509()) {
+            return ((X509Identity)clientIdentity.getIdentity()).getX509CommonName().equals(endpoint)
                     & ((LwM2MBootstrapSecurityStore) bsSecurityStore).getBootstrapConfigByEndpoint(endpoint) != null;
         } else {
             return securityChecker.checkSecurityInfos(endpoint, clientIdentity, securityInfos);
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/bootstrap/secure/TbLwM2MDtlsBootstrapCertificateVerifier.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/bootstrap/secure/TbLwM2MDtlsBootstrapCertificateVerifier.java
index b2a06a0102..b341b09b70 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/bootstrap/secure/TbLwM2MDtlsBootstrapCertificateVerifier.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/bootstrap/secure/TbLwM2MDtlsBootstrapCertificateVerifier.java
@@ -41,7 +41,7 @@ import org.thingsboard.server.transport.lwm2m.config.LwM2MTransportServerConfig;
 import org.thingsboard.server.transport.lwm2m.secure.TbLwM2MSecurityInfo;
 import org.thingsboard.server.transport.lwm2m.server.client.LwM2MAuthException;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import javax.security.auth.x500.X500Principal;
 import java.net.InetSocketAddress;
 import java.security.PublicKey;
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/bootstrap/store/LwM2MBootstrapConfigStoreTaskProvider.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/bootstrap/store/LwM2MBootstrapConfigStoreTaskProvider.java
index d3f6428ba9..47c34ae2af 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/bootstrap/store/LwM2MBootstrapConfigStoreTaskProvider.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/bootstrap/store/LwM2MBootstrapConfigStoreTaskProvider.java
@@ -50,7 +50,7 @@ import java.util.stream.Collectors;
 
 import static org.eclipse.leshan.core.model.ResourceModel.Type.OPAQUE;
 import static org.eclipse.leshan.server.bootstrap.BootstrapUtil.toWriteRequest;
-import static org.thingsboard.server.transport.lwm2m.utils.LwM2MTransportUtil.BOOTSTRAP_DEFAULT_SHORT_ID;
+import static org.thingsboard.server.transport.lwm2m.utils.LwM2MTransportUtil.BOOTSTRAP_DEFAULT_SHORT_ID_0;
 
 @Slf4j
 public class LwM2MBootstrapConfigStoreTaskProvider implements LwM2MBootstrapTaskProvider {
@@ -76,7 +76,8 @@ public class LwM2MBootstrapConfigStoreTaskProvider implements LwM2MBootstrapTask
 
     @Override
     public Tasks getTasks(BootstrapSession session, List<LwM2mResponse> previousResponse) {
-        BootstrapConfig config = store.get(session.getEndpoint(), session.getIdentity(), session);
+//        BootstrapConfig config = store.get(session.getEndpoint(), session.getClientTransportData().getIdentity(), session);
+        BootstrapConfig config = store.get(session);
         if (config == null) {
             return null;
         }
@@ -105,7 +106,7 @@ public class LwM2MBootstrapConfigStoreTaskProvider implements LwM2MBootstrapTask
                                 "Bootstrap Discover return error {} : to continue bootstrap session without autoIdForSecurityObject mode. {}",
                                 discoverResponse, session);
                     }
-                    if (this.lwM2MBootstrapSessionClients.get(session.getEndpoint()).getSecurityInstances().get(BOOTSTRAP_DEFAULT_SHORT_ID) == null) {
+                    if (this.lwM2MBootstrapSessionClients.get(session.getEndpoint()).getSecurityInstances().get(BOOTSTRAP_DEFAULT_SHORT_ID_0) == null) {
                         log.error(
                                 "Unable to find bootstrap server instance in Security Object (0) in response {}: unable to continue bootstrap session with autoIdForSecurityObject mode. {}",
                                 discoverResponse, session);
@@ -150,7 +151,7 @@ public class LwM2MBootstrapConfigStoreTaskProvider implements LwM2MBootstrapTask
      * The values ID:0 and ID:65535 values MUST NOT be used for identifying the LwM2M Server.
      * "Short Server ID":
      * - Link Instance (lwm2m Server) hase linkParams with key = "ssid" value = "shortId" (ver lvm2m = 1.1).
-     * - Link Instance (bootstrap Server) hase not linkParams with key = "ssid" (ver lvm2m = 1.1).
+     * - Link Instance (bootstrap Server) hase not linkParams with key = "ssid" (ver lvm2m = 1.0).
      */
     protected void findSecurityInstanceId(Link[] objectLinks, String endpoint) {
         log.info("Object after discover: [{}]", objectLinks);
@@ -159,17 +160,17 @@ public class LwM2MBootstrapConfigStoreTaskProvider implements LwM2MBootstrapTask
                 try {
                     LwM2mPath path = new LwM2mPath(link.getUriReference());
                     if (path.isObjectInstance()) {
-                        if (link.getLinkParams().containsKey("ssid")) {
-                            int serverId = Integer.parseInt(link.getLinkParams().get("ssid").getUnquoted());
+                        if (link.getAttributes().get("ssid") != null) {
+                            int serverId = Integer.parseInt(link.getAttributes().get("ssid").getCoreLinkValue());
                             if (!lwM2MBootstrapSessionClients.get(endpoint).getSecurityInstances().containsKey(serverId)) {
                                 lwM2MBootstrapSessionClients.get(endpoint).getSecurityInstances().put(serverId, path.getObjectInstanceId());
                             } else {
                                 log.error("Invalid lwm2mSecurityInstance by [{}]", path.getObjectInstanceId());
                             }
-                            lwM2MBootstrapSessionClients.get(endpoint).getSecurityInstances().put(Integer.valueOf(link.getLinkParams().get("ssid").getUnquoted()), path.getObjectInstanceId());
+                            lwM2MBootstrapSessionClients.get(endpoint).getSecurityInstances().put(serverId, path.getObjectInstanceId());
                         } else {
                             if (!this.lwM2MBootstrapSessionClients.get(endpoint).getSecurityInstances().containsKey(0)) {
-                                this.lwM2MBootstrapSessionClients.get(endpoint).getSecurityInstances().put(BOOTSTRAP_DEFAULT_SHORT_ID, path.getObjectInstanceId());
+                                this.lwM2MBootstrapSessionClients.get(endpoint).getSecurityInstances().put(BOOTSTRAP_DEFAULT_SHORT_ID_0, path.getObjectInstanceId());
                             } else {
                                 log.error("Invalid bootstrapSecurityInstance by [{}]", path.getObjectInstanceId());
                             }
@@ -221,7 +222,7 @@ public class LwM2MBootstrapConfigStoreTaskProvider implements LwM2MBootstrapTask
             LwM2mPath path = new LwM2mPath(link.getUriReference());
             if (!path.isRoot() && path.getObjectId() < 3) {
                 if (path.isObject()) {
-                    String ver = link.getLinkParams().get("ver") != null ? link.getLinkParams().get("ver").getUnquoted() : "1.0";
+                    String ver = link.getAttributes().get("ver") != null ? link.getAttributes().get("ver").getCoreLinkValue() : "1.0";
                     this.supportedObjects.put(path.getObjectId(), ver);
                 }
             }
@@ -243,7 +244,7 @@ public class LwM2MBootstrapConfigStoreTaskProvider implements LwM2MBootstrapTask
         Integer bootstrapServerIdNew = null;
         // handle security
         int lwm2mSecurityInstanceId = 0;
-        int bootstrapSecurityInstanceId = this.lwM2MBootstrapSessionClients.get(endpoint).getSecurityInstances().get(BOOTSTRAP_DEFAULT_SHORT_ID);
+        int bootstrapSecurityInstanceId = this.lwM2MBootstrapSessionClients.get(endpoint).getSecurityInstances().get(BOOTSTRAP_DEFAULT_SHORT_ID_0);
         for (BootstrapConfig.ServerSecurity security : new TreeMap<>(bootstrapConfig.security).values()) {
             if (security.bootstrapServer) {
                 requestsWrite.add(toWriteRequest(bootstrapSecurityInstanceId, security, contentFormat));
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/bootstrap/store/LwM2MBootstrapSecurityStore.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/bootstrap/store/LwM2MBootstrapSecurityStore.java
index 38633a7b59..4dcbb908d1 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/bootstrap/store/LwM2MBootstrapSecurityStore.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/bootstrap/store/LwM2MBootstrapSecurityStore.java
@@ -16,6 +16,7 @@
 package org.thingsboard.server.transport.lwm2m.bootstrap.store;
 
 import lombok.extern.slf4j.Slf4j;
+import org.eclipse.leshan.core.peer.OscoreIdentity;
 import org.eclipse.leshan.server.bootstrap.BootstrapConfig;
 import org.eclipse.leshan.server.bootstrap.EditableBootstrapConfigStore;
 import org.eclipse.leshan.server.bootstrap.InvalidConfigurationException;
@@ -98,6 +99,11 @@ public class LwM2MBootstrapSecurityStore implements BootstrapSecurityStore {
         }
     }
 
+    @Override
+    public SecurityInfo getByOscoreIdentity(OscoreIdentity oscoreIdentity) {
+        return null;
+    }
+
     public TbLwM2MSecurityInfo getX509ByEndpoint(String endPoint) {
             TbLwM2MSecurityInfo store = lwM2MCredentialsSecurityInfoValidator.getEndpointSecurityInfoByCredentialsId(endPoint, BOOTSTRAP);
             this.addValueToStore(store, store.getEndpoint());
@@ -210,4 +216,4 @@ public class LwM2MBootstrapSecurityStore implements BootstrapSecurityStore {
         }
         return securityInfo;
     }
-}
\ No newline at end of file
+}
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/bootstrap/store/LwM2MConfigurationChecker.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/bootstrap/store/LwM2MConfigurationChecker.java
index d7204eb4ac..12283f2aff 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/bootstrap/store/LwM2MConfigurationChecker.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/bootstrap/store/LwM2MConfigurationChecker.java
@@ -58,17 +58,25 @@ public class LwM2MConfigurationChecker extends ConfigurationChecker {
         for (Map.Entry<Integer, BootstrapConfig.ServerConfig> e : config.servers.entrySet()) {
             BootstrapConfig.ServerConfig srvCfg = e.getValue();
 
-            // shortId checks
-            if (srvCfg.shortId == 0) {
-                throw new InvalidConfigurationException("short ID must not be 0");
-            }
-
             // look for security entry
             BootstrapConfig.ServerSecurity security = getSecurityEntry(config, srvCfg.shortId);
-
             if (security == null) {
                 throw new InvalidConfigurationException("no security entry for server instance: " + e.getKey());
             }
+            // BS Server
+            if (security.bootstrapServer && srvCfg.shortId != 0) {
+                throw new InvalidConfigurationException("short ID must be 0");
+            }
+
+            // LwM2M Server
+            /**
+             * This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client.
+             * This Resource MUST be set when the Bootstrap-Server Resource has false value.
+             * Specific ID:0 and ID:65535 values MUST NOT be used for identifying the LwM2M Server (Section 6.3 of the LwM2M version 1.0 specification).
+             */
+            if (!security.bootstrapServer && (srvCfg.shortId < 1 && srvCfg.shortId > 65534 )) {
+                throw new InvalidConfigurationException("Specific ID:0 and ID:65535 values MUST NOT be used for identifying the LwM2M Server");
+            }
         }
     }
 
@@ -81,4 +89,4 @@ public class LwM2MConfigurationChecker extends ConfigurationChecker {
         return null;
     }
 
-}
\ No newline at end of file
+}
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/bootstrap/store/LwM2MInMemoryBootstrapConfigStore.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/bootstrap/store/LwM2MInMemoryBootstrapConfigStore.java
index a9a5954b9f..c8fd776f87 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/bootstrap/store/LwM2MInMemoryBootstrapConfigStore.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/bootstrap/store/LwM2MInMemoryBootstrapConfigStore.java
@@ -16,9 +16,7 @@
 package org.thingsboard.server.transport.lwm2m.bootstrap.store;
 
 import lombok.extern.slf4j.Slf4j;
-import org.eclipse.leshan.core.request.Identity;
 import org.eclipse.leshan.server.bootstrap.BootstrapConfig;
-import org.eclipse.leshan.server.bootstrap.BootstrapSession;
 import org.eclipse.leshan.server.bootstrap.ConfigurationChecker;
 import org.eclipse.leshan.server.bootstrap.InMemoryBootstrapConfigStore;
 import org.eclipse.leshan.server.bootstrap.InvalidConfigurationException;
@@ -39,8 +37,8 @@ public class LwM2MInMemoryBootstrapConfigStore extends InMemoryBootstrapConfigSt
     private final Lock writeLock = readWriteLock.writeLock();
     protected final ConfigurationChecker configChecker = new LwM2MConfigurationChecker();
 
-    @Override
-    public BootstrapConfig get(String endpoint, Identity deviceIdentity, BootstrapSession session) {
+
+    public BootstrapConfig get(String endpoint) {
         return bootstrapByEndpoint.get(endpoint);
     }
 
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/config/LwM2MTransportServerConfig.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/config/LwM2MTransportServerConfig.java
index dc2e9f6d45..03c4730313 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/config/LwM2MTransportServerConfig.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/config/LwM2MTransportServerConfig.java
@@ -18,6 +18,7 @@ package org.thingsboard.server.transport.lwm2m.config;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
+import org.eclipse.californium.elements.config.Configuration;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
@@ -42,8 +43,8 @@ public class LwM2MTransportServerConfig implements LwM2MSecureServerConfig {
     private int dtlsRetransmissionTimeout;
 
     @Getter
-    @Value("${transport.lwm2m.dtls.connection_id_length:6}")
-    private Integer dtlsConnectionIdLength;
+    @Value("${transport.lwm2m.dtls.connection_id_length:}")
+    private Integer dtlsCidLength;
 
     @Getter
     @Value("${transport.lwm2m.timeout:}")
@@ -109,6 +110,10 @@ public class LwM2MTransportServerConfig implements LwM2MSecureServerConfig {
     @Setter
     private List<TbProperty> networkConfig;
 
+    @Getter
+    @Setter
+    private Configuration coapConfig;
+
     @Bean
     @ConfigurationProperties(prefix = "transport.lwm2m.server.security.credentials")
     public SslCredentialsConfig lwm2mServerCredentials() {
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/secure/LwM2mCredentialsSecurityInfoValidator.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/secure/LwM2mCredentialsSecurityInfoValidator.java
index 6f034130ce..a44c6adb6e 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/secure/LwM2mCredentialsSecurityInfoValidator.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/secure/LwM2mCredentialsSecurityInfoValidator.java
@@ -74,7 +74,7 @@ public class LwM2mCredentialsSecurityInfoValidator {
 
                     @Override
                     public void onError(Throwable e) {
-                        log.trace("[{}] [{}] Failed to process credentials ", credentialsId, e);
+                        log.info("[{}] [{}] Failed to process credentials ", credentialsId, e);
                         TbLwM2MSecurityInfo result = new TbLwM2MSecurityInfo();
                         result.setEndpoint(credentialsId);
                         resultSecurityStore[0] = result;
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/secure/TbLwM2MAuthorizer.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/secure/TbLwM2MAuthorizer.java
index d4e83da006..21f85c2e1f 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/secure/TbLwM2MAuthorizer.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/secure/TbLwM2MAuthorizer.java
@@ -18,9 +18,11 @@ package org.thingsboard.server.transport.lwm2m.secure;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.leshan.core.SecurityMode;
-import org.eclipse.leshan.core.request.Identity;
+import org.eclipse.leshan.core.peer.LwM2mPeer;
+import org.eclipse.leshan.core.peer.X509Identity;
 import org.eclipse.leshan.core.request.UplinkRequest;
 import org.eclipse.leshan.server.registration.Registration;
+import org.eclipse.leshan.server.security.Authorization;
 import org.eclipse.leshan.server.security.Authorizer;
 import org.eclipse.leshan.server.security.SecurityChecker;
 import org.eclipse.leshan.server.security.SecurityInfo;
@@ -45,38 +47,30 @@ public class TbLwM2MAuthorizer implements Authorizer {
     private final LwM2mClientContext clientContext;
 
     @Override
-    public Registration isAuthorized(UplinkRequest<?> request, Registration registration, Identity senderIdentity) {
-        if (senderIdentity.isX509()) {
-            TbX509DtlsSessionInfo sessionInfo = sessionStorage.get(registration.getEndpoint());
-            if (sessionInfo != null) {
-                if (sessionInfo.getX509CommonName().endsWith(senderIdentity.getX509CommonName())) {
-                    clientContext.registerClient(registration, sessionInfo.getCredentials());
+    public Authorization isAuthorized(UplinkRequest<?> request, Registration registration, LwM2mPeer sender) {
+        SecurityInfo expectedSecurityInfo = null;
+        if (securityStore != null) expectedSecurityInfo = securityStore.getByEndpoint(registration.getEndpoint());
+        if (securityChecker.checkSecurityInfo(registration.getEndpoint(), sender, expectedSecurityInfo)) {
+            if (sender.getIdentity() instanceof X509Identity) {
+                TbX509DtlsSessionInfo sessionInfo = sessionStorage.get(registration.getEndpoint());
+                if (sessionInfo != null) {
                     // X509 certificate is valid and matches endpoint.
-                    return registration;
-                } else {
-                    // X509 certificate is not valid.
-                    return null;
+                    clientContext.registerClient(registration, sessionInfo.getCredentials());
                 }
             }
-            // If session info is not found, this may be the trusted certificate, so we still need to check all other options below.
-        }
-        SecurityInfo expectedSecurityInfo;
             try {
-                expectedSecurityInfo = securityStore.getByEndpoint(registration.getEndpoint());
                 if (expectedSecurityInfo != null && expectedSecurityInfo.usePSK() && expectedSecurityInfo.getEndpoint().equals(SecurityMode.NO_SEC.toString())
-                        && expectedSecurityInfo.getIdentity().equals(SecurityMode.NO_SEC.toString())
+                        && expectedSecurityInfo.getPskIdentity().equals(SecurityMode.NO_SEC.toString())
                         && Arrays.equals(SecurityMode.NO_SEC.toString().getBytes(), expectedSecurityInfo.getPreSharedKey())) {
-                    expectedSecurityInfo = null;
+                    return Authorization.declined();
                 }
             } catch (LwM2MAuthException e) {
                 log.info("Registration failed: FORBIDDEN, endpointId: [{}]", registration.getEndpoint());
-                return null;
+                return Authorization.declined();
             }
-        if (securityChecker.checkSecurityInfo(registration.getEndpoint(), senderIdentity, expectedSecurityInfo)) {
-            return registration;
+            return Authorization.approved();
         } else {
-            securityStore.remove(registration.getEndpoint(), registration.getId());
-            return null;
+            return Authorization.declined();
         }
     }
 }
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/secure/TbLwM2MDtlsCertificateVerifier.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/secure/TbLwM2MDtlsCertificateVerifier.java
index 296ffff53b..64ab50ca3b 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/secure/TbLwM2MDtlsCertificateVerifier.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/secure/TbLwM2MDtlsCertificateVerifier.java
@@ -47,7 +47,7 @@ import org.thingsboard.server.transport.lwm2m.server.client.LwM2MAuthException;
 import org.thingsboard.server.transport.lwm2m.server.store.TbLwM2MDtlsSessionStore;
 import org.thingsboard.server.transport.lwm2m.server.store.TbMainSecurityStore;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import javax.security.auth.x500.X500Principal;
 import java.net.InetSocketAddress;
 import java.security.PublicKey;
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/AbstractLwM2mTransportResource.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/AbstractLwM2mTransportResource.java
index 540e036514..30aca171d0 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/AbstractLwM2mTransportResource.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/AbstractLwM2mTransportResource.java
@@ -18,12 +18,13 @@ package org.thingsboard.server.transport.lwm2m.server;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.californium.core.server.resources.CoapExchange;
 import org.eclipse.leshan.core.californium.LwM2mCoapResource;
+import org.eclipse.leshan.core.californium.identity.IdentityHandlerProvider;
 
 @Slf4j
 public abstract class AbstractLwM2mTransportResource extends LwM2mCoapResource {
 
     public AbstractLwM2mTransportResource(String name) {
-        super(name);
+        super(name, new IdentityHandlerProvider());
     }
 
     @Override
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/DefaultLwM2mTransportService.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/DefaultLwM2mTransportService.java
index 7d54e97cde..4bf9859b16 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/DefaultLwM2mTransportService.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/DefaultLwM2mTransportService.java
@@ -15,16 +15,22 @@
  */
 package org.thingsboard.server.transport.lwm2m.server;
 
+import jakarta.annotation.PreDestroy;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.eclipse.californium.elements.config.Configuration;
 import org.eclipse.californium.scandium.config.DtlsConfig;
-import org.eclipse.californium.scandium.config.DtlsConnectorConfig;
 import org.eclipse.californium.scandium.dtls.cipher.CipherSuite;
+import org.eclipse.leshan.core.endpoint.Protocol;
 import org.eclipse.leshan.core.node.codec.DefaultLwM2mDecoder;
 import org.eclipse.leshan.core.node.codec.DefaultLwM2mEncoder;
-import org.eclipse.leshan.server.californium.LeshanServer;
-import org.eclipse.leshan.server.californium.LeshanServerBuilder;
-import org.eclipse.leshan.server.californium.registration.CaliforniumRegistrationStore;
+import org.eclipse.leshan.server.LeshanServer;
+import org.eclipse.leshan.server.LeshanServerBuilder;
+import org.eclipse.leshan.server.californium.LwM2mPskStore;
+import org.eclipse.leshan.server.californium.endpoint.CaliforniumServerEndpointsProvider;
+import org.eclipse.leshan.server.californium.endpoint.coap.CoapServerProtocolProvider;
+import org.eclipse.leshan.server.californium.endpoint.coaps.CoapsServerProtocolProvider;
+import org.eclipse.leshan.server.registration.RegistrationStore;
 import org.springframework.context.annotation.DependsOn;
 import org.springframework.stereotype.Component;
 import org.thingsboard.server.cache.ota.OtaPackageDataCache;
@@ -37,14 +43,11 @@ import org.thingsboard.server.transport.lwm2m.secure.TbLwM2MAuthorizer;
 import org.thingsboard.server.transport.lwm2m.secure.TbLwM2MDtlsCertificateVerifier;
 import org.thingsboard.server.transport.lwm2m.server.store.TbSecurityStore;
 import org.thingsboard.server.transport.lwm2m.server.uplink.LwM2mUplinkMsgHandler;
-import org.thingsboard.server.transport.lwm2m.utils.LwM2mValueConverterImpl;
 
-import javax.annotation.PreDestroy;
+import java.net.InetSocketAddress;
 import java.security.cert.X509Certificate;
 
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
-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.californium.scandium.config.DtlsConfig.DTLS_RECOMMENDED_CURVES_ONLY;
 import static org.eclipse.californium.scandium.config.DtlsConfig.DTLS_RETRANSMISSION_TIMEOUT;
 import static org.eclipse.californium.scandium.config.DtlsConfig.DTLS_ROLE;
@@ -55,6 +58,7 @@ import static org.eclipse.californium.scandium.dtls.cipher.CipherSuite.TLS_PSK_W
 import static org.eclipse.californium.scandium.dtls.cipher.CipherSuite.TLS_PSK_WITH_AES_128_CCM_8;
 import static org.thingsboard.server.transport.lwm2m.server.LwM2MNetworkConfig.getCoapConfig;
 import static org.thingsboard.server.transport.lwm2m.server.ota.DefaultLwM2MOtaUpdateService.FIRMWARE_UPDATE_COAP_RESOURCE;
+import static org.thingsboard.server.transport.lwm2m.utils.LwM2MTransportUtil.setDtlsConnectorConfigCidLength;
 
 @Slf4j
 @Component
@@ -70,7 +74,7 @@ public class DefaultLwM2mTransportService implements LwM2MTransportService {
     private final LwM2MTransportServerConfig config;
     private final OtaPackageDataCache otaPackageDataCache;
     private final LwM2mUplinkMsgHandler handler;
-    private final CaliforniumRegistrationStore registrationStore;
+    private final RegistrationStore registrationStore;
     private final TbSecurityStore securityStore;
     private final TbLwM2MDtlsCertificateVerifier certificateVerifier;
     private final TbLwM2MAuthorizer authorizer;
@@ -88,8 +92,7 @@ public class DefaultLwM2mTransportService implements LwM2MTransportService {
          * nameFile = "BC68JAR01A09_TO_BC68JAR01A10.bin"
          * "coap://host:port/{path}/{token}/{nameFile}"
          */
-        LwM2mTransportCoapResource otaCoapResource = new LwM2mTransportCoapResource(otaPackageDataCache, FIRMWARE_UPDATE_COAP_RESOURCE);
-        this.server.coap().getServer().add(otaCoapResource);
+        new LwM2mTransportCoapResource(otaPackageDataCache, FIRMWARE_UPDATE_COAP_RESOURCE);
         this.context.setServer(server);
         this.startLhServer();
     }
@@ -118,55 +121,90 @@ public class DefaultLwM2mTransportService implements LwM2MTransportService {
 
     private LeshanServer getLhServer() {
         LeshanServerBuilder builder = new LeshanServerBuilder();
-        builder.setLocalAddress(config.getHost(), config.getPort());
-        builder.setLocalSecureAddress(config.getSecureHost(), config.getSecurePort());
-        builder.setDecoder(new DefaultLwM2mDecoder());
-        /* Use a magic converter to support bad type send by the UI. */
-        builder.setEncoder(new DefaultLwM2mEncoder(LwM2mValueConverterImpl.getInstance()));
-
-        /* Create CoAP Config */
-        builder.setCoapConfig(getCoapConfig(config.getPort(), config.getSecurePort(), config));
 
         /* Define model provider (Create Models )*/
         builder.setObjectModelProvider(modelProvider);
 
+
         /* Set securityStore with new registrationStore */
         builder.setSecurityStore(securityStore);
         builder.setRegistrationStore(registrationStore);
 
+
+        // Create Californium Endpoints Provider:
+        // ------------------
+        // Create Server Endpoints Provider
+        CaliforniumServerEndpointsProvider.Builder endpointsBuilder = new CaliforniumServerEndpointsProvider.Builder(
+                // Add coap Protocol support
+                new CoapServerProtocolProvider(),
+
+                // Add coaps/dtls protocol support
+                new CoapsServerProtocolProvider(c -> {
+                    if (this.config.getSslCredentials() != null) {
+                        c.setAdvancedCertificateVerifier(certificateVerifier);
+                        c.setAsList(DtlsConfig.DTLS_CIPHER_SUITES, RPK_OR_X509_CIPHER_SUITES);
+                    } else {
+                        log.info("Unable to load X509 files for LWM2MServer");
+                        LwM2mPskStore lwM2mPskStore = new LwM2mPskStore(securityStore, registrationStore);
+                        c.setAdvancedPskStore(lwM2mPskStore);
+                        c.setAsList(DtlsConfig.DTLS_CIPHER_SUITES, PSK_CIPHER_SUITES);
+                    }
+                }));
+
+        // Create Californium Configuration
+        Configuration serverCoapConfig = endpointsBuilder.createDefaultConfiguration();
+        getCoapConfig(serverCoapConfig, config.getPort(), config.getSecurePort(), config);
+
+        // Set some DTLS stuff
+
+        serverCoapConfig.setTransient(DTLS_RECOMMENDED_CURVES_ONLY);
+        serverCoapConfig.set(DTLS_RECOMMENDED_CURVES_ONLY, config.isRecommendedSupportedGroups());
+
+        serverCoapConfig.setTransient(DtlsConfig.DTLS_RECOMMENDED_CIPHER_SUITES_ONLY);
+        serverCoapConfig.set(DtlsConfig.DTLS_RECOMMENDED_CIPHER_SUITES_ONLY, config.isRecommendedCiphers());
+
+        serverCoapConfig.set(DTLS_RETRANSMISSION_TIMEOUT, config.getDtlsRetransmissionTimeout(), MILLISECONDS);
+        serverCoapConfig.set(DTLS_ROLE, SERVER_ONLY);
+        serverCoapConfig.setTransient(DtlsConfig.DTLS_CONNECTION_ID_LENGTH);
+
+        if (config.getDtlsCidLength() != null) {
+            setDtlsConnectorConfigCidLength( serverCoapConfig, config.getDtlsCidLength());
+        }
+
         /* Create DTLS Config */
-        DtlsConnectorConfig.Builder dtlsConfig = new DtlsConnectorConfig.Builder(getCoapConfig(config.getPort(), config.getSecurePort(), config));
+        this.setServerWithCredentials(builder);
+        // Set Californium Configuration
+        endpointsBuilder.setConfiguration(serverCoapConfig);
+
+
+        // Create CoAP endpoint
+        InetSocketAddress coapAddr = new InetSocketAddress(config.getHost(), config.getPort());
+        endpointsBuilder.addEndpoint(coapAddr, Protocol.COAP);
 
-        dtlsConfig.set(DTLS_RECOMMENDED_CURVES_ONLY, config.isRecommendedSupportedGroups());
-        dtlsConfig.set(DTLS_RECOMMENDED_CIPHER_SUITES_ONLY, config.isRecommendedCiphers());
-        dtlsConfig.set(DTLS_RETRANSMISSION_TIMEOUT, config.getDtlsRetransmissionTimeout(), MILLISECONDS);
-        dtlsConfig.set(DTLS_CONNECTION_ID_LENGTH, config.getDtlsConnectionIdLength());
-        dtlsConfig.set(DTLS_ROLE, SERVER_ONLY);
+        // Create CoAP over DTLS endpoint
+        InetSocketAddress coapsAddr = new InetSocketAddress(config.getSecureHost(), config.getSecurePort());
+        endpointsBuilder.addEndpoint(coapsAddr, Protocol.COAPS);
 
-        /*  Create credentials */
-        this.setServerWithCredentials(builder, dtlsConfig);
 
-        /* Set DTLS Config */
-        builder.setDtlsConfig(dtlsConfig);
+        builder.setDecoder(new DefaultLwM2mDecoder(true));
+        builder.setEncoder(new DefaultLwM2mEncoder(true));
 
-        /* Create LWM2M server */
+        // Create LWM2M server
+        builder.setEndpointsProviders(endpointsBuilder.build());
         return builder.build();
     }
 
-    private void setServerWithCredentials(LeshanServerBuilder builder, DtlsConnectorConfig.Builder dtlsConfig) {
+    private void setServerWithCredentials(LeshanServerBuilder builder) {
+//    private void setServerWithCredentials(LeshanServerBuilder builder) {
         if (this.config.getSslCredentials() != null) {
             SslCredentials sslCredentials = this.config.getSslCredentials();
             builder.setPublicKey(sslCredentials.getPublicKey());
             builder.setPrivateKey(sslCredentials.getPrivateKey());
             builder.setCertificateChain(sslCredentials.getCertificateChain());
-            dtlsConfig.setAdvancedCertificateVerifier(certificateVerifier);
             builder.setAuthorizer(authorizer);
-            dtlsConfig.setAsList(DtlsConfig.DTLS_CIPHER_SUITES, RPK_OR_X509_CIPHER_SUITES);
         } else {
             /* by default trust all */
             builder.setTrustedCertificates(new X509Certificate[0]);
-            log.info("Unable to load X509 files for LWM2MServer");
-            dtlsConfig.setAsList(DtlsConfig.DTLS_CIPHER_SUITES, PSK_CIPHER_SUITES);
         }
     }
 
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/LwM2MNetworkConfig.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/LwM2MNetworkConfig.java
index 1b9c2d1e1e..554f13904d 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/LwM2MNetworkConfig.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/LwM2MNetworkConfig.java
@@ -27,8 +27,7 @@ import static org.eclipse.californium.core.config.CoapConfig.DEFAULT_BLOCKWISE_S
 
 public class LwM2MNetworkConfig {
 
-    public static Configuration getCoapConfig(Integer serverPortNoSec, Integer serverSecurePort, LwM2MTransportServerConfig config) {
-        Configuration coapConfig = new Configuration();
+    public static Configuration getCoapConfig(Configuration coapConfig, Integer serverPortNoSec, Integer serverSecurePort, LwM2MTransportServerConfig config) {
         coapConfig.set(CoapConfig.COAP_PORT, serverPortNoSec);
         coapConfig.set(CoapConfig.COAP_SECURE_PORT, serverSecurePort);
         /**
@@ -107,4 +106,4 @@ public class LwM2MNetworkConfig {
 
         return coapConfig;
     }
-}
\ No newline at end of file
+}
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/LwM2mServerListener.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/LwM2mServerListener.java
index 3642236dae..b59914e2ac 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/LwM2mServerListener.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/LwM2mServerListener.java
@@ -16,7 +16,7 @@
 package org.thingsboard.server.transport.lwm2m.server;
 
 import lombok.extern.slf4j.Slf4j;
-import org.eclipse.leshan.core.node.LwM2mNode;
+import org.eclipse.leshan.core.node.TimestampedLwM2mNodes;
 import org.eclipse.leshan.core.observation.CompositeObservation;
 import org.eclipse.leshan.core.observation.Observation;
 import org.eclipse.leshan.core.observation.SingleObservation;
@@ -32,7 +32,6 @@ import org.eclipse.leshan.server.send.SendListener;
 import org.thingsboard.server.transport.lwm2m.server.uplink.LwM2mUplinkMsgHandler;
 
 import java.util.Collection;
-import java.util.Map;
 
 import static org.thingsboard.server.transport.lwm2m.utils.LwM2MTransportUtil.convertObjectIdToVersionedId;
 
@@ -94,9 +93,10 @@ public class LwM2mServerListener {
 
         @Override
         public void cancelled(Observation observation) {
-            //TODO: should be able to use CompositeObservation
-            log.trace("Canceled Observation {}.", ((SingleObservation)observation).getPath());
-        }
+            log.trace("Canceled Observation [RegistrationId:{}: {}].", observation.getRegistrationId(), observation instanceof SingleObservation ?
+                    "SingleObservation: " + ((SingleObservation) observation).getPath() :
+                    "CompositeObservation: " + ((CompositeObservation) observation).getPaths());
+       }
 
         @Override
         public void onResponse(SingleObservation observation, Registration registration, ObserveResponse response) {
@@ -107,31 +107,40 @@ public class LwM2mServerListener {
 
         @Override
         public void onResponse(CompositeObservation observation, Registration registration, ObserveCompositeResponse response) {
-            throw new RuntimeException("Not implemented yet!");
+            log.trace("Update Composite Observation [{}: {}].", observation.getRegistrationId(), observation.getPaths());
+            service.onUpdateValueAfterReadCompositeResponse(registration, response);
         }
 
         @Override
         public void onError(Observation observation, Registration registration, Exception error) {
             if (error != null) {
-                //TODO: should be able to use CompositeObservation
-                log.debug("Unable to handle notification of [{}:{}] [{}]", observation.getRegistrationId(), ((SingleObservation)observation).getPath(), error.getMessage());
+                var path = observation instanceof SingleObservation ? "Single Observation Cancel: " + ((SingleObservation) observation).getPath() : "Composite Observation Cancel: " + ((CompositeObservation) observation).getPaths();
+                var msgError = path + ": " + error.getMessage();
+                log.trace("Unable to handle notification [RegistrationId:{}]: [{}].", observation.getRegistrationId(), msgError);
+                service.onErrorObservation(registration, msgError);
             }
         }
 
         @Override
         public void newObservation(Observation observation, Registration registration) {
-            //TODO: should be able to use CompositeObservation
-            log.trace("Successful start newObservation {}.", ((SingleObservation)observation).getPath());
+            log.trace("Successful start newObservation  [RegistrationId:{}: {}].", observation.getRegistrationId(), observation instanceof SingleObservation ?
+                    "Single: " + ((SingleObservation) observation).getPath() :
+                    "Composite: " + ((CompositeObservation) observation).getPaths());
         }
     };
 
     public final SendListener sendListener = new SendListener() {
 
         @Override
-        public void dataReceived(Registration registration, Map<String, LwM2mNode> map, SendRequest sendRequest) {
+        public void dataReceived(Registration registration, TimestampedLwM2mNodes data, SendRequest request) {
             if (registration != null) {
-                service.onUpdateValueWithSendRequest(registration, sendRequest);
+                service.onUpdateValueWithSendRequest(registration, request);
             }
         }
+
+        @Override
+        public void onError(Registration registration, String errorMessage, Exception error) {
+
+        }
     };
 }
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/LwM2mTransportContext.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/LwM2mTransportContext.java
index 87adfe48c3..b4f27e9a06 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/LwM2mTransportContext.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/LwM2mTransportContext.java
@@ -17,7 +17,7 @@ package org.thingsboard.server.transport.lwm2m.server;
 
 import lombok.Getter;
 import lombok.Setter;
-import org.eclipse.leshan.server.californium.LeshanServer;
+import org.eclipse.leshan.server.LeshanServer;
 import org.springframework.stereotype.Component;
 import org.thingsboard.server.common.transport.TransportContext;
 import org.thingsboard.server.queue.util.TbLwM2mTransportComponent;
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 0ef81e1b1c..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
@@ -16,10 +16,10 @@
 package org.thingsboard.server.transport.lwm2m.server;
 
 import com.google.gson.JsonParser;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.eclipse.leshan.core.model.DDFFileParser;
-import org.eclipse.leshan.core.model.DefaultDDFFileValidator;
 import org.eclipse.leshan.core.model.InvalidDDFFileException;
 import org.eclipse.leshan.core.model.ObjectModel;
 import org.eclipse.leshan.core.model.ResourceModel;
@@ -34,8 +34,6 @@ import org.thingsboard.server.gen.transport.TransportProtos.PostTelemetryMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.SessionInfoProto;
 import org.thingsboard.server.queue.util.TbLwM2mTransportComponent;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -52,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();
@@ -233,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/LwM2mVersionedModelProvider.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/LwM2mVersionedModelProvider.java
index 310ecfe70d..3e407bdfc9 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/LwM2mVersionedModelProvider.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/LwM2mVersionedModelProvider.java
@@ -16,7 +16,7 @@
 package org.thingsboard.server.transport.lwm2m.server;
 
 import lombok.extern.slf4j.Slf4j;
-import org.eclipse.leshan.core.model.DefaultDDFFileValidator;
+import org.eclipse.leshan.core.LwM2m;
 import org.eclipse.leshan.core.model.LwM2mModel;
 import org.eclipse.leshan.core.model.ObjectModel;
 import org.eclipse.leshan.core.model.ResourceModel;
@@ -107,7 +107,7 @@ public class LwM2mVersionedModelProvider implements LwM2mModelProvider {
 
         @Override
         public ObjectModel getObjectModel(int objectId) {
-            String version = registration.getSupportedVersion(objectId);
+            String version = String.valueOf(registration.getSupportedVersion(objectId));
             if (version != null) {
                 return this.getObjectModelDynamic(objectId, version);
             }
@@ -116,10 +116,10 @@ public class LwM2mVersionedModelProvider implements LwM2mModelProvider {
 
         @Override
         public Collection<ObjectModel> getObjectModels() {
-            Map<Integer, String> supportedObjects = this.registration.getSupportedObject();
+            Map<Integer, LwM2m.Version> supportedObjects = this.registration.getSupportedObject();
             Collection<ObjectModel> result = new ArrayList<>(supportedObjects.size());
-            for (Map.Entry<Integer, String> supportedObject : supportedObjects.entrySet()) {
-                ObjectModel objectModel = this.getObjectModelDynamic(supportedObject.getKey(), supportedObject.getValue());
+            for (Map.Entry<Integer, LwM2m.Version> supportedObject : supportedObjects.entrySet()) {
+                ObjectModel objectModel = this.getObjectModelDynamic(supportedObject.getKey(), String.valueOf(supportedObject.getValue()));
                 if (objectModel != null) {
                     result.add(objectModel);
                 }
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 e421371184..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
@@ -20,7 +20,8 @@ import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.extern.slf4j.Slf4j;
-import org.eclipse.leshan.core.link.LinkParamValue;
+import org.eclipse.leshan.core.LwM2m;
+import org.eclipse.leshan.core.link.attributes.Attribute;
 import org.eclipse.leshan.core.model.ObjectModel;
 import org.eclipse.leshan.core.model.ResourceModel;
 import org.eclipse.leshan.core.node.LwM2mMultipleResource;
@@ -228,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));
@@ -256,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()
@@ -270,8 +271,8 @@ public class LwM2mClient {
     }
 
     public ResourceModel getResourceModel(String pathIdVer, LwM2mModelProvider modelProvider) {
-        LwM2mPath pathIds = new LwM2mPath(fromVersionedIdToObjectId(pathIdVer));
-        String verSupportedObject = registration.getSupportedObject().get(pathIds.getObjectId());
+        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)
                 .getResourceModel(pathIds.getObjectId(), pathIds.getResourceId()) : null;
@@ -288,8 +289,8 @@ public class LwM2mClient {
 
     public ObjectModel getObjectModel(String pathIdVer, LwM2mModelProvider modelProvider) {
         try {
-            LwM2mPath pathIds = new LwM2mPath(fromVersionedIdToObjectId(pathIdVer));
-            String verSupportedObject = registration.getSupportedObject().get(pathIds.getObjectId());
+            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)
                     .getObjectModel(pathIds.getObjectId()) : null;
@@ -308,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;
@@ -328,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;
@@ -369,13 +370,13 @@ public class LwM2mClient {
     }
 
     public String isValidObjectVersion(String path) {
-        LwM2mPath pathIds = new LwM2mPath(fromVersionedIdToObjectId(path));
-        String verSupportedObject = registration.getSupportedObject().get(pathIds.getObjectId());
+        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());
         } else {
             String verRez = getVerFromPathIdVerOrId(path);
-            if (verRez == null || !verRez.equals(verSupportedObject)) {
+            if (verRez == null || !verRez.equals(verSupportedObject.toString())) {
                 return String.format("Specified resource id %s is not valid version! Must be version: %s", path, verSupportedObject);
             }
         }
@@ -389,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);
@@ -409,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);
     }
@@ -432,16 +433,12 @@ public class LwM2mClient {
     private static Set<ContentFormat> clientSupportContentFormat(Registration registration) {
         Set<ContentFormat> contentFormats = new HashSet<>();
         contentFormats.add(ContentFormat.DEFAULT);
-        LinkParamValue ct = Arrays.stream(registration.getObjectLinks())
+        Attribute ct = Arrays.stream(registration.getObjectLinks())
                 .filter(link -> link.getUriReference().equals("/"))
                 .findFirst()
-                .map(link -> link.getLinkParams().get("ct")).orElse(null);
+                .map(link -> link.getAttributes().get("ct")).orElse(null);
         if (ct != null) {
-            Set<ContentFormat> codes = Stream.of(ct.getUnquoted().replaceAll("\"", "").split(" ", -1))
-                    .map(String::trim)
-                    .map(Integer::parseInt)
-                    .map(ContentFormat::fromCode)
-                    .collect(Collectors.toSet());
+            Set codes = Stream.of(ct.getValue()).collect(Collectors.toSet());
             contentFormats.addAll(codes);
         }
         return contentFormats;
@@ -459,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/client/LwM2mClientContextImpl.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/client/LwM2mClientContextImpl.java
index 18e27ba568..4f35489250 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/client/LwM2mClientContextImpl.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/client/LwM2mClientContextImpl.java
@@ -415,9 +415,6 @@ public class LwM2mClientContextImpl implements LwM2mClientContext {
             var clientProfile = getProfile(client.getProfileId());
             profileSettings = clientProfile.getClientLwM2mSettings();
             powerMode = profileSettings.getPowerMode();
-            if (powerMode == null) {
-                powerMode = PowerMode.DRX;
-            }
         }
         if (powerMode == null || PowerMode.DRX.equals(powerMode) || otaUpdateService.isOtaDownloading(client)) {
             return true;
@@ -464,9 +461,6 @@ public class LwM2mClientContextImpl implements LwM2mClientContext {
             var clientProfile = getProfile(client.getProfileId());
             profileSettings = clientProfile.getClientLwM2mSettings();
             powerMode = profileSettings.getPowerMode();
-            if (powerMode == null) {
-                powerMode = PowerMode.DRX;
-            }
         }
         if (powerMode == null || PowerMode.DRX.equals(powerMode)) {
             client.updateLastUplinkTime();
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/downlink/DefaultLwM2mDownlinkMsgHandler.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/downlink/DefaultLwM2mDownlinkMsgHandler.java
index cf7cc3c2f5..af127dba88 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/downlink/DefaultLwM2mDownlinkMsgHandler.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/downlink/DefaultLwM2mDownlinkMsgHandler.java
@@ -15,12 +15,15 @@
  */
 package org.thingsboard.server.transport.lwm2m.server.downlink;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.leshan.core.LwM2m;
-import org.eclipse.leshan.core.attributes.Attribute;
-import org.eclipse.leshan.core.attributes.AttributeSet;
 import org.eclipse.leshan.core.link.Link;
+import org.eclipse.leshan.core.link.lwm2m.attributes.LwM2mAttribute;
+import org.eclipse.leshan.core.link.lwm2m.attributes.LwM2mAttributeModel;
+import org.eclipse.leshan.core.link.lwm2m.attributes.LwM2mAttributeSet;
 import org.eclipse.leshan.core.model.LwM2mModel;
 import org.eclipse.leshan.core.model.ObjectModel;
 import org.eclipse.leshan.core.model.ResourceModel;
@@ -28,6 +31,7 @@ import org.eclipse.leshan.core.node.LwM2mObjectInstance;
 import org.eclipse.leshan.core.node.LwM2mPath;
 import org.eclipse.leshan.core.node.LwM2mResource;
 import org.eclipse.leshan.core.node.ObjectLink;
+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.request.CompositeDownlinkRequest;
@@ -37,6 +41,7 @@ import org.eclipse.leshan.core.request.DeleteRequest;
 import org.eclipse.leshan.core.request.DiscoverRequest;
 import org.eclipse.leshan.core.request.DownlinkRequest;
 import org.eclipse.leshan.core.request.ExecuteRequest;
+import org.eclipse.leshan.core.request.ObserveCompositeRequest;
 import org.eclipse.leshan.core.request.ObserveRequest;
 import org.eclipse.leshan.core.request.ReadCompositeRequest;
 import org.eclipse.leshan.core.request.ReadRequest;
@@ -52,6 +57,7 @@ import org.eclipse.leshan.core.response.DeleteResponse;
 import org.eclipse.leshan.core.response.DiscoverResponse;
 import org.eclipse.leshan.core.response.ExecuteResponse;
 import org.eclipse.leshan.core.response.LwM2mResponse;
+import org.eclipse.leshan.core.response.ObserveCompositeResponse;
 import org.eclipse.leshan.core.response.ObserveResponse;
 import org.eclipse.leshan.core.response.ReadCompositeResponse;
 import org.eclipse.leshan.core.response.ReadResponse;
@@ -63,6 +69,8 @@ import org.eclipse.leshan.server.model.LwM2mModelProvider;
 import org.eclipse.leshan.server.registration.Registration;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.device.profile.lwm2m.ObjectAttributes;
+import org.thingsboard.server.common.data.exception.ThingsboardErrorCode;
+import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.queue.util.TbLwM2mTransportComponent;
 import org.thingsboard.server.transport.lwm2m.config.LwM2MTransportServerConfig;
 import org.thingsboard.server.transport.lwm2m.server.LwM2mTransportContext;
@@ -70,31 +78,43 @@ import org.thingsboard.server.transport.lwm2m.server.LwM2mVersionedModelProvider
 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.common.LwM2MExecutorAwareService;
+import org.thingsboard.server.transport.lwm2m.server.downlink.composite.TbLwM2MCancelObserveCompositeRequest;
+import org.thingsboard.server.transport.lwm2m.server.downlink.composite.TbLwM2MObserveCompositeRequest;
 import org.thingsboard.server.transport.lwm2m.server.downlink.composite.TbLwM2MReadCompositeRequest;
 import org.thingsboard.server.transport.lwm2m.server.log.LwM2MTelemetryLogService;
 import org.thingsboard.server.transport.lwm2m.server.rpc.composite.RpcWriteCompositeRequest;
 import org.thingsboard.server.transport.lwm2m.utils.LwM2mValueConverterImpl;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Date;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
+import java.util.TreeSet;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
-import static org.eclipse.leshan.core.attributes.Attribute.GREATER_THAN;
-import static org.eclipse.leshan.core.attributes.Attribute.LESSER_THAN;
-import static org.eclipse.leshan.core.attributes.Attribute.MAXIMUM_PERIOD;
-import static org.eclipse.leshan.core.attributes.Attribute.MINIMUM_PERIOD;
-import static org.eclipse.leshan.core.attributes.Attribute.STEP;
+import static org.eclipse.leshan.core.link.lwm2m.attributes.LwM2mAttributes.DIMENSION;
+import static org.eclipse.leshan.core.link.lwm2m.attributes.LwM2mAttributes.ENABLER_VERSION;
+import static org.eclipse.leshan.core.link.lwm2m.attributes.LwM2mAttributes.EVALUATE_MAXIMUM_PERIOD;
+import static org.eclipse.leshan.core.link.lwm2m.attributes.LwM2mAttributes.EVALUATE_MINIMUM_PERIOD;
+import static org.eclipse.leshan.core.link.lwm2m.attributes.LwM2mAttributes.GREATER_THAN;
+import static org.eclipse.leshan.core.link.lwm2m.attributes.LwM2mAttributes.LESSER_THAN;
+import static org.eclipse.leshan.core.link.lwm2m.attributes.LwM2mAttributes.MAXIMUM_PERIOD;
+import static org.eclipse.leshan.core.link.lwm2m.attributes.LwM2mAttributes.MINIMUM_PERIOD;
+import static org.eclipse.leshan.core.link.lwm2m.attributes.LwM2mAttributes.OBJECT_VERSION;
+import static org.eclipse.leshan.core.link.lwm2m.attributes.LwM2mAttributes.SERVER_URI;
+import static org.eclipse.leshan.core.link.lwm2m.attributes.LwM2mAttributes.SHORT_SERVER_ID;
+import static org.eclipse.leshan.core.link.lwm2m.attributes.LwM2mAttributes.STEP;
 import static org.eclipse.leshan.core.model.ResourceModel.Type.OBJLNK;
 import static org.eclipse.leshan.core.model.ResourceModel.Type.OPAQUE;
 import static org.thingsboard.server.transport.lwm2m.utils.LwM2MTransportUtil.convertMultiResourceValuesFromRpcBody;
@@ -148,8 +168,9 @@ public class DefaultLwM2mDownlinkMsgHandler extends LwM2MExecutorAwareService im
 
     @Override
     public void sendReadCompositeRequest(LwM2mClient client, TbLwM2MReadCompositeRequest request,
-                                         DownlinkRequestCallback<ReadCompositeRequest, ReadCompositeResponse> callback, ContentFormat compositeContentFormat) {
+                                         DownlinkRequestCallback<ReadCompositeRequest, ReadCompositeResponse> callback) {
         try {
+            ContentFormat compositeContentFormat = this.findFirstContentFormatForComposite(client.getClientSupportContentFormats());
             ReadCompositeRequest downlink = new ReadCompositeRequest(compositeContentFormat, compositeContentFormat, request.getObjectIds());
             sendCompositeRequest(client, downlink, this.config.getTimeout(), callback);
         } catch (InvalidRequestException e) {
@@ -162,23 +183,19 @@ public class DefaultLwM2mDownlinkMsgHandler extends LwM2MExecutorAwareService im
         try {
             validateVersionedId(client, request);
             LwM2mPath resultIds = new LwM2mPath(request.getObjectId());
-            Set<Observation> observations = context.getServer().getObservationService().getObservations(client.getRegistration());
-            //TODO: should be able to use CompositeObservation
-            if (observations.stream().noneMatch(observation -> ((SingleObservation)observation).getPath().equals(resultIds))) {
-                ObserveRequest downlink;
-                ContentFormat contentFormat = getReadRequestContentFormat(client, request, modelProvider);
-                if (resultIds.isResource()) {
-                    downlink = new ObserveRequest(contentFormat, resultIds.getObjectId(), resultIds.getObjectInstanceId(), resultIds.getResourceId());
-                } else if (resultIds.isObjectInstance()) {
-                    downlink = new ObserveRequest(contentFormat, resultIds.getObjectId(), resultIds.getObjectInstanceId());
-                } else {
-                    downlink = new ObserveRequest(contentFormat, resultIds.getObjectId());
-                }
-                log.info("[{}] Send observation: {}.", client.getEndpoint(), request.getVersionedId());
-                sendSimpleRequest(client, downlink, request.getTimeout(), callback);
+            ObserveRequest downlink;
+            ContentFormat contentFormat = getReadRequestContentFormat(client, request, modelProvider);
+            if (resultIds.isResourceInstance()) {
+                downlink = new ObserveRequest(contentFormat, resultIds.getObjectId(), resultIds.getObjectInstanceId(), resultIds.getResourceId(), resultIds.getResourceInstanceId());
+            } else if (resultIds.isResource()) {
+                downlink = new ObserveRequest(contentFormat, resultIds.getObjectId(), resultIds.getObjectInstanceId(), resultIds.getResourceId());
+            } else if (resultIds.isObjectInstance()) {
+                downlink = new ObserveRequest(contentFormat, resultIds.getObjectId(), resultIds.getObjectInstanceId());
             } else {
-                callback.onValidationError(resultIds.toString(), "Observation is already registered!");
+                downlink = new ObserveRequest(contentFormat, resultIds.getObjectId());
             }
+            log.info("[{}] Send observation: {}.", client.getEndpoint(), request.getVersionedId());
+            sendSimpleRequest(client, downlink, request.getTimeout(), callback);
         } catch (InvalidRequestException e) {
             callback.onValidationError(request.toString(), e.getMessage());
         }
@@ -187,14 +204,90 @@ public class DefaultLwM2mDownlinkMsgHandler extends LwM2MExecutorAwareService im
     @Override
     public void sendObserveAllRequest(LwM2mClient client, TbLwM2MObserveAllRequest request, DownlinkRequestCallback<TbLwM2MObserveAllRequest, Set<String>> callback) {
         Set<Observation> observations = context.getServer().getObservationService().getObservations(client.getRegistration());
-        //TODO: should be able to use CompositeObservation
-        Set<String> paths = observations.stream().map(observation -> ((SingleObservation)observation).getPath().toString()).collect(Collectors.toUnmodifiableSet());
+        Set<String> paths = new LinkedHashSet<>();
+        observations.stream().forEach(observation -> {
+            if (observation instanceof SingleObservation) {
+                paths.add("SingleObservation:" + ((SingleObservation) observation).getPath().toString());
+            } else {
+                List<LwM2mPath> listPath = ((CompositeObservation) observation).getPaths();
+                List<String> pathsComposite =  listPath.stream().map(lwM2mPath -> (lwM2mPath.toString())).collect(Collectors.toList());
+                Set <String> pathsCompositeSort = new TreeSet<>();
+                if (pathsComposite.size() == 1) {
+                    pathsCompositeSort.add("CompositeObservation: [" + pathsComposite.get(0) + "]");
+                } else if (pathsComposite.size() > 1) {
+                    List <String> sort = new LinkedList<>();
+                    sort.addAll(pathsComposite);
+                    sort.set(0, "CompositeObservation: [" + sort.get(0));
+                    sort.set(pathsComposite.size()-1, sort.get(pathsComposite.size()-1) + "]");
+                    pathsCompositeSort = new LinkedHashSet<>(sort);
+                }
+                paths.addAll(pathsCompositeSort);
+            }
+
+        });
         callback.onSuccess(request, paths);
     }
 
+    /**
+     * if resource (SingleObservation or in CompositeObservation) is already registered - return BAD REQUEST
+     */
     @Override
-    public void sendDiscoverAllRequest(LwM2mClient client, TbLwM2MDiscoverAllRequest request, DownlinkRequestCallback<TbLwM2MDiscoverAllRequest, List<Link>> callback) {
-        callback.onSuccess(request, Arrays.asList(client.getRegistration().getSortedObjectLinks()));
+    public void sendObserveCompositeRequest(LwM2mClient client, TbLwM2MObserveCompositeRequest request, DownlinkRequestCallback<ObserveCompositeRequest,
+            ObserveCompositeResponse> callback) {
+        try {
+            log.trace("[{}] Send Composite observation: [{}].", client.getEndpoint(), request.getObjectIds());
+            ContentFormat compositeContentFormat = this.findFirstContentFormatForComposite(client.getClientSupportContentFormats());
+            ObserveCompositeRequest downlink = new ObserveCompositeRequest(compositeContentFormat, compositeContentFormat, request.getObjectIds());
+            sendCompositeRequest(client, downlink, this.config.getTimeout(), callback);
+        } catch (InvalidRequestException e) {
+            callback.onValidationError(request.toString(), e.getMessage());
+        }
+    }
+
+    @Override
+    public void sendCancelObserveCompositeRequest(LwM2mClient client, TbLwM2MCancelObserveCompositeRequest request, DownlinkRequestCallback<TbLwM2MCancelObserveCompositeRequest, Integer> callback) {
+        try {
+            Set<Observation> observations = context.getServer().getObservationService().getObservations(client.getRegistration());
+            List<LwM2mPath> listPath = LwM2mPath.getLwM2mPathList(Arrays.asList(request.getObjectIds()));
+            Optional<Observation> observationOpt = Optional.ofNullable(observations.stream().filter(observation -> observation instanceof CompositeObservation && ((CompositeObservation) observation).getPaths().equals(listPath)).findFirst().orElse(null));
+            int cnt = 0;
+            if (observationOpt.isPresent()) {
+                cnt = context.getServer().getObservationService().cancelCompositeObservations(client.getRegistration(), request.getObjectIds());
+                callback.onSuccess(request, cnt);
+            } else {
+                Set<String> lwPaths = new HashSet<>();
+                for (Observation obs : observations) {
+                    LwM2mPath lwPathObs = ((SingleObservation) obs).getPath();
+                    for (LwM2mPath nodePath : listPath) {
+                        String validNodePath = validatePathObserveCancelAny(nodePath, lwPathObs, client);
+                        if (validNodePath != null) lwPaths.add(validNodePath);
+                    }
+                };
+                for (String nodePath : lwPaths) {
+                    cnt += context.getServer().getObservationService().cancelObservations(client.getRegistration(), nodePath);
+                }
+            }
+            callback.onSuccess(request, cnt);
+        } catch (ThingsboardException e){
+            callback.onValidationError(request.toString(), e.getMessage());
+        }
+    }
+
+    private String validatePathObserveCancelAny(LwM2mPath nodePath, LwM2mPath lwPathObs, LwM2mClient client) throws ThingsboardException {
+        if (nodePath.equals(lwPathObs) || lwPathObs.startWith(nodePath)) {    // nodePath = "3",     lwPathObs = "3/0/9": cancel for tne all lwPathObs
+            return lwPathObs.toString();
+        } else if (!nodePath.equals(lwPathObs) && nodePath.startWith(lwPathObs)) {
+            String errorMsg = String.format(
+                    "Unexpected error: There is registration with Endpoint %s for observation path [%s], that includes this observation path [%s]",
+                    client.getRegistration().getEndpoint(), lwPathObs, nodePath);
+            throw new ThingsboardException(errorMsg, ThingsboardErrorCode.BAD_REQUEST_PARAMS);
+        }
+        return null;
+    }
+
+    @Override
+    public void sendDiscoverAllRequest(LwM2mClient client, TbLwM2MDiscoverAllRequest request, DownlinkRequestCallback<TbLwM2MDiscoverAllRequest, List<String>> callback) {
+        callback.onSuccess(request, Arrays.stream(client.getRegistration().getSortedObjectLinks()).map(Link::toCoreLinkFormat).collect(Collectors.toList()));
     }
 
     @Override
@@ -242,13 +335,28 @@ public class DefaultLwM2mDownlinkMsgHandler extends LwM2MExecutorAwareService im
 
     @Override
     public void sendCancelObserveRequest(LwM2mClient client, TbLwM2MCancelObserveRequest request, DownlinkRequestCallback<TbLwM2MCancelObserveRequest, Integer> callback) {
-        validateVersionedId(client, request);
-        int observeCancelCnt = context.getServer().getObservationService().cancelObservations(client.getRegistration(), request.getObjectId());
-        callback.onSuccess(request, observeCancelCnt);
+        try{
+            validateVersionedId(client, request);
+            Set<Observation> observations = context.getServer().getObservationService().getObservations(client.getRegistration());
+            int observeCancelCnt = 0;
+            Set<String> lwPaths = new HashSet<>();
+            for (Observation obs : observations) {
+                LwM2mPath lwPathObs = ((SingleObservation) obs).getPath();
+                LwM2mPath nodePath = new LwM2mPath(request.getObjectId());
+                String validNodePath = validatePathObserveCancelAny(nodePath, lwPathObs, client);
+                if (validNodePath != null) lwPaths.add(validNodePath);
+            };
+            for (String nodePath : lwPaths) {
+                observeCancelCnt += context.getServer().getObservationService().cancelObservations(client.getRegistration(), nodePath);
+            }
+            callback.onSuccess(request, observeCancelCnt);
+        } catch (ThingsboardException e){
+            callback.onValidationError(request.toString(), e.getMessage());
+        }
     }
 
     @Override
-    public void sendCancelAllRequest(LwM2mClient client, TbLwM2MCancelAllRequest request, DownlinkRequestCallback<TbLwM2MCancelAllRequest, Integer> callback) {
+    public void sendCancelObserveAllRequest(LwM2mClient client, TbLwM2MCancelAllRequest request, DownlinkRequestCallback<TbLwM2MCancelAllRequest, Integer> callback) {
         int observeCancelCnt = context.getServer().getObservationService().cancelObservations(client.getRegistration());
         callback.onSuccess(request, observeCancelCnt);
     }
@@ -278,20 +386,40 @@ public class DefaultLwM2mDownlinkMsgHandler extends LwM2MExecutorAwareService im
             if (request.getAttributes() == null) {
                 throw new IllegalArgumentException("Attributes to write are not specified!");
             }
-            ObjectAttributes params = request.getAttributes();
-            List<Attribute> attributes = new LinkedList<>();
-            addAttribute(attributes, MAXIMUM_PERIOD, params.getPmax());
-            addAttribute(attributes, MINIMUM_PERIOD, params.getPmin());
-            addAttribute(attributes, GREATER_THAN, params.getGt());
-            addAttribute(attributes, LESSER_THAN, params.getLt());
-            addAttribute(attributes, STEP, params.getSt());
-            AttributeSet attributeSet = new AttributeSet(attributes);
-            sendSimpleRequest(client, new WriteAttributesRequest(request.getObjectId(), attributeSet), request.getTimeout(), callback);
+            sendSimpleRequest(client, new WriteAttributesRequest(request.getObjectId(), getAttributesSet(request.getAttributes())), request.getTimeout(), callback);
         } catch (InvalidRequestException e) {
             callback.onValidationError(request.toString(), e.getMessage());
         }
     }
 
+    private LwM2mAttributeSet getAttributesSet(ObjectAttributes params) {
+        List<LwM2mAttribute<?>> attributes = new LinkedList<>();
+        /**
+         * Only: AttributeClass.NOTIFICATION -> RW
+         */
+        addAttribute(attributes, MAXIMUM_PERIOD, params.getPmax());
+        addAttribute(attributes, MINIMUM_PERIOD, params.getPmin());
+        addAttribute(attributes, GREATER_THAN, params.getGt());
+        addAttribute(attributes, LESSER_THAN, params.getLt());
+        addAttribute(attributes, STEP, params.getSt());
+        addAttribute(attributes, EVALUATE_MAXIMUM_PERIOD, params.getEpmax());
+        addAttribute(attributes, EVALUATE_MINIMUM_PERIOD, params.getEpmin());
+        /**
+         * Only:  AttributeClass.PROPERTIES -> R
+         */
+        addAttribute(attributes, DIMENSION, params.getDim());                        // Attachment.RESOURCE
+        addAttribute(attributes, SHORT_SERVER_ID, params.getSsid());              // Attachment.OBJECT_INSTANCE
+        addAttribute(attributes, SERVER_URI, params.getUri());                          // Attachment.OBJECT_INSTANCE
+        if (params.getLwm2m() != null) {
+            addAttribute(attributes, ENABLER_VERSION, params.getLwm2m());   // attachment.ROOT
+        }
+        if (params.getVer() != null) {
+            addAttribute(attributes, OBJECT_VERSION, params.getVer());          // Attachment.OBJECT
+        }
+
+       return  new LwM2mAttributeSet(attributes);
+    }
+
     @Override
     public void sendWriteReplaceRequest(LwM2mClient client, TbLwM2MWriteReplaceRequest request, DownlinkRequestCallback<WriteRequest, WriteResponse> callback) {
         LwM2mPath resultIds = new LwM2mPath(request.getObjectId());
@@ -338,9 +466,10 @@ public class DefaultLwM2mDownlinkMsgHandler extends LwM2MExecutorAwareService im
 
     @Override
     public void sendWriteCompositeRequest(LwM2mClient client, RpcWriteCompositeRequest rpcWriteCompositeRequest,
-                                          DownlinkRequestCallback<WriteCompositeRequest, WriteCompositeResponse> callback, ContentFormat contentFormatComposite) {
+                                          DownlinkRequestCallback<WriteCompositeRequest, WriteCompositeResponse> callback) {
         try {
-            WriteCompositeRequest downlink = new WriteCompositeRequest(contentFormatComposite, rpcWriteCompositeRequest.getNodes());
+            ContentFormat compositeContentFormat = this.findFirstContentFormatForComposite(client.getClientSupportContentFormats());
+            WriteCompositeRequest downlink = new WriteCompositeRequest(compositeContentFormat, rpcWriteCompositeRequest.getNodes());
             //TODO: replace config.getTimeout();
             sendWriteCompositeRequest(client, downlink, this.config.getTimeout(), callback);
         } catch (InvalidRequestException e) {
@@ -570,17 +699,18 @@ public class DefaultLwM2mDownlinkMsgHandler extends LwM2MExecutorAwareService im
         }
     }
 
-    private static <T> void addAttribute(List<Attribute> attributes, String attributeName, T value) {
-        addAttribute(attributes, attributeName, value, null, null);
+    private static <T> void addAttribute(List<LwM2mAttribute<?>> attributes, LwM2mAttributeModel<T> attribute, T value) {
+        addAttribute(attributes, attribute, value, null, null);
     }
 
-    private static <T> void addAttribute(List<Attribute> attributes, String attributeName, T value, Function<T, ?> converter) {
-        addAttribute(attributes, attributeName, value, null, converter);
+    private static <T> void addAttribute(List<LwM2mAttribute<?>> attributes,  LwM2mAttributeModel<T> attribute, T value, Function<T, ?> converter) {
+        addAttribute(attributes, attribute, value, null, converter);
     }
 
-    private static <T> void addAttribute(List<Attribute> attributes, String attributeName, T value, Predicate<T> filter, Function<T, ?> converter) {
+    private static <T> void addAttribute(List<LwM2mAttribute<?>> attributes,  LwM2mAttributeModel<T> attributeName, T value, Predicate<T> filter, Function<T, ?> converter) {
         if (value != null && ((filter == null) || filter.test(value))) {
-            attributes.add(new Attribute(attributeName, converter != null ? converter.apply(value) : value));
+            T valueConvert = (T)  converter != null ?  (T) converter.apply(value) : value;
+            attributes.add(new LwM2mAttribute<>(attributeName, valueConvert));
         }
     }
 
@@ -620,7 +750,7 @@ public class DefaultLwM2mDownlinkMsgHandler extends LwM2MExecutorAwareService im
                 } else if (OPAQUE.equals(resourceModel.type)) {
                     return ContentFormat.OPAQUE;
                 } else {
-                    return findFirst(client.getClientSupportContentFormats(), client.getDefaultContentFormat(), ContentFormat.CBOR, ContentFormat.SENML_CBOR, ContentFormat.SENML_JSON);
+                    return findFirstContentFormatForComp(client.getClientSupportContentFormats(), client.getDefaultContentFormat(), ContentFormat.CBOR, ContentFormat.SENML_CBOR, ContentFormat.SENML_JSON);
                 }
             } else {
                 return getContentFormatForComplex(client);
@@ -634,7 +764,7 @@ public class DefaultLwM2mDownlinkMsgHandler extends LwM2MExecutorAwareService im
         if (LwM2m.LwM2mVersion.V1_0.equals(client.getRegistration().getLwM2mVersion())) {
             return ContentFormat.TLV;
         } else if (LwM2m.LwM2mVersion.V1_1.equals(client.getRegistration().getLwM2mVersion())) {
-            ContentFormat result = findFirst(client.getClientSupportContentFormats(), null, ContentFormat.SENML_CBOR, ContentFormat.SENML_JSON, ContentFormat.TLV, ContentFormat.JSON);
+            ContentFormat result = findFirstContentFormatForComp(client.getClientSupportContentFormats(), null, ContentFormat.SENML_CBOR, ContentFormat.SENML_JSON, ContentFormat.TLV, ContentFormat.JSON);
             if (result != null) {
                 return result;
             } else {
@@ -644,16 +774,6 @@ public class DefaultLwM2mDownlinkMsgHandler extends LwM2MExecutorAwareService im
             throw new RuntimeException("The version " + client.getRegistration().getLwM2mVersion() + " is not supported!");
         }
     }
-
-    private static ContentFormat findFirst(Set<ContentFormat> supported, ContentFormat defaultValue, ContentFormat... desiredFormats) {
-        for (ContentFormat contentFormat : desiredFormats) {
-            if (supported.contains(contentFormat)) {
-                return contentFormat;
-            }
-        }
-        return defaultValue;
-    }
-
     private <R> String toString(R request) {
         try {
             return request != null ? request.toString() : "";
@@ -662,4 +782,38 @@ public class DefaultLwM2mDownlinkMsgHandler extends LwM2MExecutorAwareService im
             return request.getClass().getSimpleName();
         }
     }
+
+    private ContentFormat findFirstContentFormatForComposite (Set<?> clientSupportContentFormats) {
+        ContentFormat contentFormat = findFirstContentFormatForComp(clientSupportContentFormats, null, ContentFormat.SENML_JSON, ContentFormat.SENML_CBOR);
+        if (contentFormat != null) {
+            return contentFormat;
+        } else {
+            throw new RuntimeException("This device does not support Composite Operation");
+        }
+    }
+    private static ContentFormat findFirstContentFormatForComp(Set<?> clientSupportContentFormats, ContentFormat defaultValue, ContentFormat... desiredFormats) {
+        AtomicReference<ContentFormat> compositeContentFormat = new AtomicReference<>();
+        clientSupportContentFormats.forEach(c -> {
+            if (c instanceof Collection) {
+                for (ContentFormat contentFormat : desiredFormats) {
+                    if (((Collection<?>) c).contains(contentFormat)) {
+                        compositeContentFormat.set(contentFormat);
+                        break;
+                    }
+                }
+            } else if (compositeContentFormat.get() == null && c instanceof ContentFormat) {
+                compositeContentFormat.set(Arrays.stream(desiredFormats).filter(f -> f.equals(c)).findFirst().get());
+            }
+        });
+        return compositeContentFormat.get() != null ? compositeContentFormat.get() : defaultValue;
+    }
+
+    private static <T> boolean containsObserveComposite(List<T> l1, List<T> l2) {
+        for (T elem : l1) {
+            if (l2.contains(elem)) {
+                return true;
+            }
+        }
+        return false;
+    }
 }
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/downlink/LwM2mDownlinkMsgHandler.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/downlink/LwM2mDownlinkMsgHandler.java
index e48169e788..50d91ccb7f 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/downlink/LwM2mDownlinkMsgHandler.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/downlink/LwM2mDownlinkMsgHandler.java
@@ -15,12 +15,11 @@
  */
 package org.thingsboard.server.transport.lwm2m.server.downlink;
 
-import org.eclipse.leshan.core.link.Link;
-import org.eclipse.leshan.core.request.ContentFormat;
 import org.eclipse.leshan.core.request.CreateRequest;
 import org.eclipse.leshan.core.request.DeleteRequest;
 import org.eclipse.leshan.core.request.DiscoverRequest;
 import org.eclipse.leshan.core.request.ExecuteRequest;
+import org.eclipse.leshan.core.request.ObserveCompositeRequest;
 import org.eclipse.leshan.core.request.ObserveRequest;
 import org.eclipse.leshan.core.request.ReadCompositeRequest;
 import org.eclipse.leshan.core.request.ReadRequest;
@@ -31,6 +30,7 @@ import org.eclipse.leshan.core.response.CreateResponse;
 import org.eclipse.leshan.core.response.DeleteResponse;
 import org.eclipse.leshan.core.response.DiscoverResponse;
 import org.eclipse.leshan.core.response.ExecuteResponse;
+import org.eclipse.leshan.core.response.ObserveCompositeResponse;
 import org.eclipse.leshan.core.response.ObserveResponse;
 import org.eclipse.leshan.core.response.ReadCompositeResponse;
 import org.eclipse.leshan.core.response.ReadResponse;
@@ -38,6 +38,8 @@ import org.eclipse.leshan.core.response.WriteAttributesResponse;
 import org.eclipse.leshan.core.response.WriteCompositeResponse;
 import org.eclipse.leshan.core.response.WriteResponse;
 import org.thingsboard.server.transport.lwm2m.server.client.LwM2mClient;
+import org.thingsboard.server.transport.lwm2m.server.downlink.composite.TbLwM2MCancelObserveCompositeRequest;
+import org.thingsboard.server.transport.lwm2m.server.downlink.composite.TbLwM2MObserveCompositeRequest;
 import org.thingsboard.server.transport.lwm2m.server.downlink.composite.TbLwM2MReadCompositeRequest;
 import org.thingsboard.server.transport.lwm2m.server.rpc.composite.RpcWriteCompositeRequest;
 
@@ -48,7 +50,7 @@ public interface LwM2mDownlinkMsgHandler {
 
     void sendReadRequest(LwM2mClient client, TbLwM2MReadRequest request, DownlinkRequestCallback<ReadRequest, ReadResponse> callback);
 
-    void sendReadCompositeRequest(LwM2mClient client, TbLwM2MReadCompositeRequest request, DownlinkRequestCallback<ReadCompositeRequest, ReadCompositeResponse> callback, ContentFormat contentFormatComposite);
+    void sendReadCompositeRequest(LwM2mClient client, TbLwM2MReadCompositeRequest request, DownlinkRequestCallback<ReadCompositeRequest, ReadCompositeResponse> callback);
 
     void sendObserveRequest(LwM2mClient client, TbLwM2MObserveRequest request, DownlinkRequestCallback<ObserveRequest, ObserveResponse> callback);
 
@@ -60,17 +62,21 @@ public interface LwM2mDownlinkMsgHandler {
 
     void sendCancelObserveRequest(LwM2mClient client, TbLwM2MCancelObserveRequest request, DownlinkRequestCallback<TbLwM2MCancelObserveRequest, Integer> callback);
 
-    void sendCancelAllRequest(LwM2mClient client, TbLwM2MCancelAllRequest request, DownlinkRequestCallback<TbLwM2MCancelAllRequest, Integer> callback);
+    void sendCancelObserveAllRequest(LwM2mClient client, TbLwM2MCancelAllRequest request, DownlinkRequestCallback<TbLwM2MCancelAllRequest, Integer> callback);
+
+    void sendObserveCompositeRequest(LwM2mClient client, TbLwM2MObserveCompositeRequest request, DownlinkRequestCallback<ObserveCompositeRequest, ObserveCompositeResponse> callback);
+
+    void sendCancelObserveCompositeRequest(LwM2mClient client, TbLwM2MCancelObserveCompositeRequest request, DownlinkRequestCallback<TbLwM2MCancelObserveCompositeRequest, Integer> callback);
 
     void sendDiscoverRequest(LwM2mClient client, TbLwM2MDiscoverRequest request, DownlinkRequestCallback<DiscoverRequest, DiscoverResponse> callback);
 
-    void sendDiscoverAllRequest(LwM2mClient client, TbLwM2MDiscoverAllRequest request, DownlinkRequestCallback<TbLwM2MDiscoverAllRequest, List<Link>> callback);
+    void sendDiscoverAllRequest(LwM2mClient client, TbLwM2MDiscoverAllRequest request, DownlinkRequestCallback<TbLwM2MDiscoverAllRequest, List<String>> callback);
 
     void sendWriteAttributesRequest(LwM2mClient client, TbLwM2MWriteAttributesRequest request, DownlinkRequestCallback<WriteAttributesRequest, WriteAttributesResponse> callback);
 
     void sendWriteReplaceRequest(LwM2mClient client, TbLwM2MWriteReplaceRequest request, DownlinkRequestCallback<WriteRequest, WriteResponse> callback);
 
-    void sendWriteCompositeRequest(LwM2mClient client, RpcWriteCompositeRequest nodes, DownlinkRequestCallback<WriteCompositeRequest, WriteCompositeResponse> callback, ContentFormat contentFormatComposite);
+    void sendWriteCompositeRequest(LwM2mClient client, RpcWriteCompositeRequest nodes, DownlinkRequestCallback<WriteCompositeRequest, WriteCompositeResponse> callback);
 
     void sendWriteUpdateRequest(LwM2mClient client, TbLwM2MWriteUpdateRequest request, DownlinkRequestCallback<WriteRequest, WriteResponse> callback);
 
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/downlink/composite/TbLwM2MCancelObserveCompositeCallback.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/downlink/composite/TbLwM2MCancelObserveCompositeCallback.java
new file mode 100644
index 0000000000..eb0f73be8f
--- /dev/null
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/downlink/composite/TbLwM2MCancelObserveCompositeCallback.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.transport.lwm2m.server.downlink.composite;
+
+import lombok.extern.slf4j.Slf4j;
+import org.thingsboard.server.transport.lwm2m.server.client.LwM2mClient;
+import org.thingsboard.server.transport.lwm2m.server.downlink.AbstractTbLwM2MRequestCallback;
+import org.thingsboard.server.transport.lwm2m.server.log.LwM2MTelemetryLogService;
+
+import static org.thingsboard.server.transport.lwm2m.utils.LwM2MTransportUtil.LOG_LWM2M_INFO;
+
+@Slf4j
+public class TbLwM2MCancelObserveCompositeCallback extends AbstractTbLwM2MRequestCallback<TbLwM2MCancelObserveCompositeRequest, Integer> {
+
+    private final String [] versionedIds;
+
+    public TbLwM2MCancelObserveCompositeCallback(LwM2MTelemetryLogService logService, LwM2mClient client, String [] versionedIds) {
+        super(logService, client);
+        this.versionedIds = versionedIds;
+    }
+
+    @Override
+    public void onSuccess(TbLwM2MCancelObserveCompositeRequest request, Integer canceledSubscriptionsCount) {
+        log.trace("[{}] Cancel composite observation of [{}] successful: {}", client.getEndpoint(),  this.versionedIds, canceledSubscriptionsCount);
+        logService.log(client, String.format("[%s]: Cancel Composite Observe for [%s] successful. Result: [%s]", LOG_LWM2M_INFO, this.versionedIds, canceledSubscriptionsCount));
+    }
+}
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/downlink/composite/TbLwM2MCancelObserveCompositeRequest.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/downlink/composite/TbLwM2MCancelObserveCompositeRequest.java
new file mode 100644
index 0000000000..5ff8e4dacf
--- /dev/null
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/downlink/composite/TbLwM2MCancelObserveCompositeRequest.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.transport.lwm2m.server.downlink.composite;
+
+import lombok.Builder;
+import org.thingsboard.server.transport.lwm2m.server.LwM2MOperationType;
+
+public class TbLwM2MCancelObserveCompositeRequest extends AbstractTbLwM2MTargetedDownlinkCompositeRequest {
+
+    @Builder
+    private TbLwM2MCancelObserveCompositeRequest(String [] versionedIds, long timeout) {
+        super(versionedIds, timeout);
+    }
+
+    @Override
+    public LwM2MOperationType getType() {
+        return LwM2MOperationType.OBSERVE_COMPOSITE_CANCEL;
+    }
+}
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/downlink/composite/TbLwM2MObserveCompositeCallback.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/downlink/composite/TbLwM2MObserveCompositeCallback.java
new file mode 100644
index 0000000000..2d76ef36da
--- /dev/null
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/downlink/composite/TbLwM2MObserveCompositeCallback.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.transport.lwm2m.server.downlink.composite;
+
+import lombok.extern.slf4j.Slf4j;
+import org.eclipse.leshan.core.request.ObserveCompositeRequest;
+import org.eclipse.leshan.core.response.ObserveCompositeResponse;
+import org.thingsboard.server.transport.lwm2m.server.client.LwM2mClient;
+import org.thingsboard.server.transport.lwm2m.server.downlink.TbLwM2MUplinkTargetedCallback;
+import org.thingsboard.server.transport.lwm2m.server.log.LwM2MTelemetryLogService;
+import org.thingsboard.server.transport.lwm2m.server.uplink.LwM2mUplinkMsgHandler;
+
+@Slf4j
+public class TbLwM2MObserveCompositeCallback extends TbLwM2MUplinkTargetedCallback<ObserveCompositeRequest, ObserveCompositeResponse> {
+
+    public TbLwM2MObserveCompositeCallback(LwM2mUplinkMsgHandler handler, LwM2MTelemetryLogService logService, LwM2mClient client, String[] versionedIds) {
+        super(handler, logService, client, versionedIds);
+    }
+
+    @Override
+    public void onSuccess(ObserveCompositeRequest request, ObserveCompositeResponse response) {
+        super.onSuccess(request, response);
+        handler.onUpdateValueAfterReadCompositeResponse(client.getRegistration(), response);
+    }
+
+}
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/downlink/composite/TbLwM2MObserveCompositeRequest.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/downlink/composite/TbLwM2MObserveCompositeRequest.java
new file mode 100644
index 0000000000..c604226d69
--- /dev/null
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/downlink/composite/TbLwM2MObserveCompositeRequest.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.transport.lwm2m.server.downlink.composite;
+
+import lombok.Builder;
+import lombok.Getter;
+import org.eclipse.leshan.core.request.ContentFormat;
+import org.eclipse.leshan.core.response.ObserveCompositeResponse;
+import org.thingsboard.server.transport.lwm2m.server.LwM2MOperationType;
+import org.thingsboard.server.transport.lwm2m.server.downlink.HasContentFormat;
+
+import java.util.Optional;
+
+public class TbLwM2MObserveCompositeRequest extends AbstractTbLwM2MTargetedDownlinkCompositeRequest<ObserveCompositeResponse> implements HasContentFormat {
+
+
+    private final Optional<ContentFormat> requestContentFormatOpt;
+
+    @Getter
+    private final ContentFormat responseContentFormat;
+
+    @Builder
+    private TbLwM2MObserveCompositeRequest(String [] versionedIds, long timeout, ContentFormat requestContentFormat, ContentFormat responseContentFormat) {
+        super(versionedIds, timeout);
+        this.requestContentFormatOpt = Optional.ofNullable(requestContentFormat);
+        this.responseContentFormat = responseContentFormat;
+    }
+
+    @Override
+    public LwM2MOperationType getType() {
+        return LwM2MOperationType.OBSERVE_COMPOSITE;
+    }
+
+    @Override
+    public Optional<ContentFormat> getRequestContentFormat() {
+        return this.requestContentFormatOpt;
+    }
+}
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/model/LwM2MModelConfigServiceImpl.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/model/LwM2MModelConfigServiceImpl.java
index f7d517c7be..1e1cc5ddce 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/model/LwM2MModelConfigServiceImpl.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/model/LwM2MModelConfigServiceImpl.java
@@ -38,7 +38,7 @@ import org.thingsboard.server.transport.lwm2m.server.log.LwM2MTelemetryLogServic
 import org.thingsboard.server.transport.lwm2m.server.store.TbLwM2MModelConfigStore;
 import org.thingsboard.server.transport.lwm2m.server.uplink.LwM2mUplinkMsgHandler;
 
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PreDestroy;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/ota/DefaultLwM2MOtaUpdateService.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/ota/DefaultLwM2MOtaUpdateService.java
index 854b483ae8..f9d23383cd 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/ota/DefaultLwM2MOtaUpdateService.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/ota/DefaultLwM2MOtaUpdateService.java
@@ -57,8 +57,8 @@ import org.thingsboard.server.transport.lwm2m.server.ota.software.SoftwareUpdate
 import org.thingsboard.server.transport.lwm2m.server.store.TbLwM2MClientOtaInfoStore;
 import org.thingsboard.server.transport.lwm2m.server.uplink.LwM2mUplinkMsgHandler;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -233,19 +233,19 @@ public class DefaultLwM2MOtaUpdateService extends LwM2MExecutorAwareService impl
 
     @Override
     public void onCurrentFirmwareNameUpdate(LwM2mClient client, String name) {
-        log.debug("[{}] Current fw name: {}", client.getEndpoint(), name);
+        log.trace("[{}] Current fw name: {}", client.getEndpoint(), name);
         getOrInitFwInfo(client).setCurrentName(name);
     }
 
     @Override
     public void onCurrentSoftwareNameUpdate(LwM2mClient client, String name) {
-        log.debug("[{}] Current sw name: {}", client.getEndpoint(), name);
+        log.trace("[{}] Current sw name: {}", client.getEndpoint(), name);
         getOrInitSwInfo(client).setCurrentName(name);
     }
 
     @Override
     public void onFirmwareStrategyUpdate(LwM2mClient client, OtherConfiguration configuration) {
-        log.debug("[{}] Current fw strategy: {}", client.getEndpoint(), configuration.getFwUpdateStrategy());
+        log.trace("[{}] Current fw strategy: {}", client.getEndpoint(), configuration.getFwUpdateStrategy());
         startFirmwareUpdateIfNeeded(client, initFwStrategy(client, configuration));
     }
 
@@ -258,7 +258,7 @@ public class DefaultLwM2MOtaUpdateService extends LwM2MExecutorAwareService impl
 
     @Override
     public void onCurrentSoftwareStrategyUpdate(LwM2mClient client, OtherConfiguration configuration) {
-        log.debug("[{}] Current sw strategy: {}", client.getEndpoint(), configuration.getSwUpdateStrategy());
+        log.trace("[{}] Current sw strategy: {}", client.getEndpoint(), configuration.getSwUpdateStrategy());
         startSoftwareUpdateIfNeeded(client, initSwStrategy(client, configuration));
     }
 
@@ -271,21 +271,21 @@ public class DefaultLwM2MOtaUpdateService extends LwM2MExecutorAwareService impl
 
     @Override
     public void onCurrentFirmwareVersion3Update(LwM2mClient client, String version) {
-        log.debug("[{}] Current fw version(3): {}", client.getEndpoint(), version);
+        log.trace("[{}] Current fw version(3): {}", client.getEndpoint(), version);
         LwM2MClientFwOtaInfo fwInfo = getOrInitFwInfo(client);
         fwInfo.setCurrentVersion3(version);
     }
 
     @Override
     public void onCurrentFirmwareVersionUpdate(LwM2mClient client, String version) {
-        log.debug("[{}] Current fw version(5): {}", client.getEndpoint(), version);
+        log.trace("[{}] Current fw version(5): {}", client.getEndpoint(), version);
         LwM2MClientFwOtaInfo fwInfo = getOrInitFwInfo(client);
         fwInfo.setCurrentVersion(version);
     }
 
     @Override
     public void onCurrentFirmwareStateUpdate(LwM2mClient client, Long stateCode) {
-        log.debug("[{}] Current fw state: {}", client.getEndpoint(), stateCode);
+        log.trace("[{}] Current fw state: {}", client.getEndpoint(), stateCode);
         LwM2MClientFwOtaInfo fwInfo = getOrInitFwInfo(client);
         FirmwareUpdateState state = FirmwareUpdateState.fromStateFwByCode(stateCode.intValue());
         if (FirmwareUpdateState.DOWNLOADED.equals(state)) {
@@ -309,7 +309,7 @@ public class DefaultLwM2MOtaUpdateService extends LwM2MExecutorAwareService impl
 
     @Override
     public void onCurrentFirmwareResultUpdate(LwM2mClient client, Long code) {
-        log.debug("[{}] Current fw result: {}", client.getEndpoint(), code);
+        log.trace("[{}] Current fw result: {}", client.getEndpoint(), code);
         LwM2MClientFwOtaInfo fwInfo = getOrInitFwInfo(client);
         FirmwareUpdateResult result = FirmwareUpdateResult.fromUpdateResultFwByCode(code.intValue());
         Optional<OtaPackageUpdateStatus> status = toOtaPackageUpdateStatus(result);
@@ -338,26 +338,26 @@ public class DefaultLwM2MOtaUpdateService extends LwM2MExecutorAwareService impl
 
     @Override
     public void onCurrentFirmwareDeliveryMethodUpdate(LwM2mClient client, Long value) {
-        log.debug("[{}] Current fw delivery method: {}", client.getEndpoint(), value);
+        log.trace("[{}] Current fw delivery method: {}", client.getEndpoint(), value);
         LwM2MClientFwOtaInfo fwInfo = getOrInitFwInfo(client);
         fwInfo.setDeliveryMethod(value.intValue());
     }
 
     @Override
     public void onCurrentSoftwareVersion3Update(LwM2mClient client, String version) {
-        log.debug("[{}] Current sw version(3): {}", client.getEndpoint(), version);
+        log.trace("[{}] Current sw version(3): {}", client.getEndpoint(), version);
         getOrInitSwInfo(client).setCurrentVersion3(version);
     }
 
     @Override
     public void onCurrentSoftwareVersionUpdate(LwM2mClient client, String version) {
-        log.debug("[{}] Current sw version(9): {}", client.getEndpoint(), version);
+        log.trace("[{}] Current sw version(9): {}", client.getEndpoint(), version);
         getOrInitSwInfo(client).setCurrentVersion(version);
     }
 
     @Override
     public void onCurrentSoftwareStateUpdate(LwM2mClient client, Long stateCode) {
-        log.debug("[{}] Current sw state: {}", client.getEndpoint(), stateCode);
+        log.trace("[{}] Current sw state: {}", client.getEndpoint(), stateCode);
         LwM2MClientSwOtaInfo swInfo = getOrInitSwInfo(client);
         SoftwareUpdateState state = SoftwareUpdateState.fromUpdateStateSwByCode(stateCode.intValue());
         if (SoftwareUpdateState.INITIAL.equals(state)) {
@@ -375,7 +375,7 @@ public class DefaultLwM2MOtaUpdateService extends LwM2MExecutorAwareService impl
 
     @Override
     public void onCurrentSoftwareResultUpdate(LwM2mClient client, Long code) {
-        log.debug("[{}] Current sw result: {}", client.getEndpoint(), code);
+        log.trace("[{}] Current sw result: {}", client.getEndpoint(), code);
         LwM2MClientSwOtaInfo swInfo = getOrInitSwInfo(client);
         SoftwareUpdateResult result = SoftwareUpdateResult.fromUpdateResultSwByCode(code.intValue());
         Optional<OtaPackageUpdateStatus> status = toOtaPackageUpdateStatus(result);
@@ -417,14 +417,14 @@ public class DefaultLwM2MOtaUpdateService extends LwM2MExecutorAwareService impl
     private void startFirmwareUpdateIfNeeded(LwM2mClient client, LwM2MClientFwOtaInfo fwInfo) {
         try {
             if (!fwInfo.isSupported() && fwInfo.isAssigned()) {
-                log.debug("[{}] Fw update is not supported: {}", client.getEndpoint(), fwInfo);
+                log.trace("[{}] Fw update is not supported: {}", client.getEndpoint(), fwInfo);
                 sendStateUpdateToTelemetry(client, fwInfo, OtaPackageUpdateStatus.FAILED, "Client does not support firmware update or profile misconfiguration!");
             } else if (fwInfo.isUpdateRequired()) {
                 if (StringUtils.isNotEmpty(fwInfo.getTargetUrl())) {
-                    log.debug("[{}] Starting update to [{}{}][] using URL: {}", client.getEndpoint(), fwInfo.getTargetName(), fwInfo.getTargetVersion(), fwInfo.getTargetUrl());
+                    log.trace("[{}] Starting update to [{}{}][] using URL: {}", client.getEndpoint(), fwInfo.getTargetName(), fwInfo.getTargetVersion(), fwInfo.getTargetUrl());
                     startUpdateUsingUrl(client, FW_URL_ID, fwInfo.getTargetUrl());
                 } else {
-                    log.debug("[{}] Starting update to [{}{}] using binary", client.getEndpoint(), fwInfo.getTargetName(), fwInfo.getTargetVersion());
+                    log.trace("[{}] Starting update to [{}{}] using binary", client.getEndpoint(), fwInfo.getTargetName(), fwInfo.getTargetVersion());
                     startUpdateUsingBinary(client, fwInfo);
                 }
             } else if (fwInfo.getResult() != null && fwInfo.getResult().getCode() > UPDATE_SUCCESSFULLY.getCode()) {
@@ -440,18 +440,18 @@ public class DefaultLwM2MOtaUpdateService extends LwM2MExecutorAwareService impl
     private void startSoftwareUpdateIfNeeded(LwM2mClient client, LwM2MClientSwOtaInfo swInfo) {
         try {
             if (!swInfo.isSupported() && swInfo.isAssigned()) {
-                log.debug("[{}] Sw update is not supported: {}", client.getEndpoint(), swInfo);
+                log.trace("[{}] Sw update is not supported: {}", client.getEndpoint(), swInfo);
                 sendStateUpdateToTelemetry(client, swInfo, OtaPackageUpdateStatus.FAILED, "Client does not support software update or profile misconfiguration!");
             } else if (swInfo.isUpdateRequired()) {
                 if (SoftwareUpdateState.INSTALLED.equals(swInfo.getUpdateState())) {
-                    log.debug("[{}] Attempt to restore the update state: {}", client.getEndpoint(), swInfo.getUpdateState());
+                    log.trace("[{}] Attempt to restore the update state: {}", client.getEndpoint(), swInfo.getUpdateState());
                     executeSwUninstallForUpdate(client);
                 } else {
                     if (StringUtils.isNotEmpty(swInfo.getTargetUrl())) {
-                        log.debug("[{}] Starting update to [{}{}] using URL: {}", client.getEndpoint(), swInfo.getTargetName(), swInfo.getTargetVersion(), swInfo.getTargetUrl());
+                        log.trace("[{}] Starting update to [{}{}] using URL: {}", client.getEndpoint(), swInfo.getTargetName(), swInfo.getTargetVersion(), swInfo.getTargetUrl());
                         startUpdateUsingUrl(client, SW_PACKAGE_URI_ID, swInfo.getTargetUrl());
                     } else {
-                        log.debug("[{}] Starting update to [{}{}] using binary", client.getEndpoint(), swInfo.getTargetName(), swInfo.getTargetVersion());
+                        log.trace("[{}] Starting update to [{}{}] using binary", client.getEndpoint(), swInfo.getTargetName(), swInfo.getTargetVersion());
                         startUpdateUsingBinary(client, swInfo);
                     }
                 }
@@ -566,18 +566,21 @@ public class DefaultLwM2MOtaUpdateService extends LwM2MExecutorAwareService impl
     }
 
     private void executeFwUpdate(LwM2mClient client) {
-        TbLwM2MExecuteRequest request = TbLwM2MExecuteRequest.builder().versionedId(FW_EXECUTE_ID).timeout(clientContext.getRequestTimeout(client)).build();
-        downlinkHandler.sendExecuteRequest(client, request, new TbLwM2MExecuteCallback(logService, client, FW_EXECUTE_ID));
+        String fwExecuteVerId = convertObjectIdToVersionedId(FW_EXECUTE_ID, client.getRegistration());
+        TbLwM2MExecuteRequest request = TbLwM2MExecuteRequest.builder().versionedId(fwExecuteVerId).timeout(clientContext.getRequestTimeout(client)).build();
+        downlinkHandler.sendExecuteRequest(client, request, new TbLwM2MExecuteCallback(logService, client, fwExecuteVerId));
     }
 
     private void executeSwInstall(LwM2mClient client) {
-        TbLwM2MExecuteRequest request = TbLwM2MExecuteRequest.builder().versionedId(SW_INSTALL_ID).timeout(clientContext.getRequestTimeout(client)).build();
-        downlinkHandler.sendExecuteRequest(client, request, new TbLwM2MExecuteCallback(logService, client, SW_INSTALL_ID));
+        String swInstallVerId = convertObjectIdToVersionedId(SW_INSTALL_ID, client.getRegistration());
+        TbLwM2MExecuteRequest request = TbLwM2MExecuteRequest.builder().versionedId(swInstallVerId).timeout(clientContext.getRequestTimeout(client)).build();
+        downlinkHandler.sendExecuteRequest(client, request, new TbLwM2MExecuteCallback(logService, client, swInstallVerId));
     }
 
     private void executeSwUninstallForUpdate(LwM2mClient client) {
-        TbLwM2MExecuteRequest request = TbLwM2MExecuteRequest.builder().versionedId(SW_UN_INSTALL_ID).params("1").timeout(clientContext.getRequestTimeout(client)).build();
-        downlinkHandler.sendExecuteRequest(client, request, new TbLwM2MExecuteCallback(logService, client, SW_INSTALL_ID));
+        String swInInstallVerId = convertObjectIdToVersionedId(SW_UN_INSTALL_ID, client.getRegistration());
+        TbLwM2MExecuteRequest request = TbLwM2MExecuteRequest.builder().versionedId(swInInstallVerId).params("1").timeout(clientContext.getRequestTimeout(client)).build();
+        downlinkHandler.sendExecuteRequest(client, request, new TbLwM2MExecuteCallback(logService, client, swInInstallVerId));
     }
 
     private Optional<String> getAttributeValue(List<TransportProtos.TsKvProto> attrs, String keyName) {
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/rpc/DefaultLwM2MRpcRequestHandler.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/rpc/DefaultLwM2MRpcRequestHandler.java
index b0b24fe611..0fff841685 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/rpc/DefaultLwM2MRpcRequestHandler.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/rpc/DefaultLwM2MRpcRequestHandler.java
@@ -23,7 +23,6 @@ import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.eclipse.leshan.core.ResponseCode;
 import org.eclipse.leshan.core.model.ResourceModel;
 import org.eclipse.leshan.core.node.LwM2mPath;
-import org.eclipse.leshan.core.request.ContentFormat;
 import org.eclipse.leshan.server.model.LwM2mModelProvider;
 import org.springframework.stereotype.Service;
 import org.thingsboard.common.util.JacksonUtil;
@@ -59,10 +58,16 @@ import org.thingsboard.server.transport.lwm2m.server.downlink.TbLwM2MWriteAttrib
 import org.thingsboard.server.transport.lwm2m.server.downlink.TbLwM2MWriteReplaceRequest;
 import org.thingsboard.server.transport.lwm2m.server.downlink.TbLwM2MWriteResponseCallback;
 import org.thingsboard.server.transport.lwm2m.server.downlink.TbLwM2MWriteUpdateRequest;
+import org.thingsboard.server.transport.lwm2m.server.downlink.composite.TbLwM2MObserveCompositeCallback;
+import org.thingsboard.server.transport.lwm2m.server.downlink.composite.TbLwM2MCancelObserveCompositeCallback;
+import org.thingsboard.server.transport.lwm2m.server.downlink.composite.TbLwM2MCancelObserveCompositeRequest;
+import org.thingsboard.server.transport.lwm2m.server.downlink.composite.TbLwM2MObserveCompositeRequest;
 import org.thingsboard.server.transport.lwm2m.server.downlink.composite.TbLwM2MReadCompositeCallback;
 import org.thingsboard.server.transport.lwm2m.server.downlink.composite.TbLwM2MReadCompositeRequest;
 import org.thingsboard.server.transport.lwm2m.server.downlink.composite.TbLwM2MWriteResponseCompositeCallback;
 import org.thingsboard.server.transport.lwm2m.server.log.LwM2MTelemetryLogService;
+import org.thingsboard.server.transport.lwm2m.server.rpc.composite.RpcCancelObserveCompositeCallback;
+import org.thingsboard.server.transport.lwm2m.server.rpc.composite.RpcObserveResponseCompositeCallback;
 import org.thingsboard.server.transport.lwm2m.server.rpc.composite.RpcReadCompositeRequest;
 import org.thingsboard.server.transport.lwm2m.server.rpc.composite.RpcReadResponseCompositeCallback;
 import org.thingsboard.server.transport.lwm2m.server.rpc.composite.RpcWriteCompositeRequest;
@@ -75,6 +80,7 @@ import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 
 import static org.thingsboard.server.transport.lwm2m.utils.LwM2MTransportUtil.convertMultiResourceValuesFromRpcBody;
+import static org.thingsboard.server.transport.lwm2m.utils.LwM2MTransportUtil.convertValueByTypeResource;
 import static org.thingsboard.server.transport.lwm2m.utils.LwM2MTransportUtil.fromVersionedIdToObjectId;
 
 @Slf4j
@@ -155,22 +161,22 @@ public class DefaultLwM2MRpcRequestHandler implements LwM2MRpcRequestHandler {
                             throw new IllegalArgumentException("Unsupported operation: " + operationType.name());
                     }
                 } else if (operationType.isComposite()) {
-                    ContentFormat contentFormatComposite = this.getCompositeContentFormat(client);
-                    if (contentFormatComposite != null) {
                         switch (operationType) {
                             case READ_COMPOSITE:
-                                sendReadCompositeRequest(client, rpcRequest, contentFormatComposite);
+                                sendReadCompositeRequest(client, rpcRequest);
                                 break;
                             case WRITE_COMPOSITE:
-                                sendWriteCompositeRequest(client, rpcRequest, contentFormatComposite);
+                                sendWriteCompositeRequest(client, rpcRequest);
+                                break;
+                             case OBSERVE_COMPOSITE:
+                                 sendObserveCompositeRequest(client, rpcRequest);
+                                break;
+                             case OBSERVE_COMPOSITE_CANCEL:
+                                 sendCancelObserveCompositeRequest(client, rpcRequest);
                                 break;
                             default:
                                 throw new IllegalArgumentException("Unsupported operation: " + operationType.name());
                         }
-                    } else {
-                        this.sendErrorRpcResponse(sessionInfo, rpcRequest.getRequestId(),
-                                ResponseCode.INTERNAL_SERVER_ERROR, "This device does not support Composite Operation");
-                    }
                 } else {
                     switch (operationType) {
                         case OBSERVE_CANCEL_ALL:
@@ -202,12 +208,12 @@ public class DefaultLwM2MRpcRequestHandler implements LwM2MRpcRequestHandler {
         downlinkHandler.sendReadRequest(client, request, rpcCallback);
     }
 
-    private void sendReadCompositeRequest(LwM2mClient client, TransportProtos.ToDeviceRpcRequestMsg requestMsg, ContentFormat contentFormatComposite) {
+    private void sendReadCompositeRequest(LwM2mClient client, TransportProtos.ToDeviceRpcRequestMsg requestMsg) {
         String[] versionedIds = getIdsFromParameters(client, requestMsg);
         TbLwM2MReadCompositeRequest request = TbLwM2MReadCompositeRequest.builder().versionedIds(versionedIds).timeout(clientContext.getRequestTimeout(client)).build();
         var mainCallback = new TbLwM2MReadCompositeCallback(uplinkHandler, logService, client, versionedIds);
         var rpcCallback = new RpcReadResponseCompositeCallback(transportService, client, requestMsg, mainCallback);
-        downlinkHandler.sendReadCompositeRequest(client, request, rpcCallback, contentFormatComposite);
+        downlinkHandler.sendReadCompositeRequest(client, request, rpcCallback);
     }
 
     private void sendObserveRequest(LwM2mClient client, TransportProtos.ToDeviceRpcRequestMsg requestMsg, String versionedId) {
@@ -243,7 +249,7 @@ public class DefaultLwM2MRpcRequestHandler implements LwM2MRpcRequestHandler {
 
     private void sendWriteAttributesRequest(LwM2mClient client, TransportProtos.ToDeviceRpcRequestMsg requestMsg, String versionedId) {
         RpcWriteAttributesRequest requestBody = JacksonUtil.fromString(requestMsg.getParams(), RpcWriteAttributesRequest.class);
-        TbLwM2MWriteAttributesRequest request = TbLwM2MWriteAttributesRequest.builder().versionedId(versionedId)
+         TbLwM2MWriteAttributesRequest request = TbLwM2MWriteAttributesRequest.builder().versionedId(versionedId)
                 .attributes(requestBody.getAttributes())
                 .timeout(clientContext.getRequestTimeout(client)).build();
         var mainCallback = new TbLwM2MWriteAttributesCallback(logService, client, versionedId);
@@ -298,54 +304,89 @@ public class DefaultLwM2MRpcRequestHandler implements LwM2MRpcRequestHandler {
      * nodes.put("/1/0/2", 100);
      * nodes.put("/5/0/1", "coap://localhost:5685");
      */
-    private void sendWriteCompositeRequest(LwM2mClient client, TransportProtos.ToDeviceRpcRequestMsg requestMsg, ContentFormat contentFormatComposite) {
+    private void sendWriteCompositeRequest(LwM2mClient client, TransportProtos.ToDeviceRpcRequestMsg requestMsg) {
         RpcWriteCompositeRequest rpcWriteCompositeRequest = JacksonUtil.fromString(requestMsg.getParams(), RpcWriteCompositeRequest.class);
-        Map<String, Object> validNodes = validateNodes(client, rpcWriteCompositeRequest.getNodes());
+        Map<String, Object> validNodes = validateCompositesNodes(client, rpcWriteCompositeRequest.getNodes());
         if (validNodes.size() > 0) {
             rpcWriteCompositeRequest.setNodes(validNodes);
             var mainCallback = new TbLwM2MWriteResponseCompositeCallback(uplinkHandler, logService, client, null);
             var rpcCallback = new RpcEmptyResponseCallback<>(transportService, client, requestMsg, mainCallback);
-            downlinkHandler.sendWriteCompositeRequest(client, rpcWriteCompositeRequest, rpcCallback, contentFormatComposite);
+            downlinkHandler.sendWriteCompositeRequest(client, rpcWriteCompositeRequest, rpcCallback);
         } else {
             throw new IllegalArgumentException(String.format("nodes: %s is not validate value", rpcWriteCompositeRequest.getNodes().toString()));
         }
     }
 
-    private Map<String, Object> validateNodes(LwM2mClient client, Map<String, Object> nodes) {
+    private Map<String, Object> validateCompositesNodes(LwM2mClient client, Map<String, Object> nodes) {
         Map<String, Object> newNodes = new LinkedHashMap<>();
         nodes.forEach((key, value) -> {
-            String versionedId;
+            String versionedId = null;
+            LwM2mPath path = null;
             try {
-                LwM2mPath path = new LwM2mPath(fromVersionedIdToObjectId(key));
-                if (path.isResource() || path.isResourceInstance()) {
-                    versionedId = key;
-                }
-                else {
-                    throw new IllegalArgumentException(String.format("nodes: %s is not validate value. " +
-                            "The WriteComposite operation is only used for SingleResources or/and ResourceInstance.", nodes.toString()));
-                }
+                path = new LwM2mPath(fromVersionedIdToObjectId(key));
             } catch (Exception e) {
                 versionedId = clientContext.getObjectIdByKeyNameFromProfile(client, key);
             }
-            // validate value. Must be only primitive, not JsonObject or JsonArray
-            try {
-                JsonElement element = JsonUtils.parse(value.toString());
-                if (!element.isJsonNull() && !element.isJsonPrimitive()) {
+
+            if (versionedId == null) {
+                if (path.isResourceInstance()) {
+                    setValueToCompositeNodes(client, newNodes, nodes, key, value.toString());
+                } else if (path.isResource()) {
+                    validateResource(client, newNodes, nodes, key , value);
+                } else if (path.isObjectInstance() && value instanceof Map<?, ?>) {
+                    ((Map) value).forEach((k, v) -> {
+                        validateResource(client, newNodes, nodes, validateResourceId (key, k.toString(), nodes), v);
+                    });
+                } else {
                     throw new IllegalArgumentException(String.format("nodes: %s is not validate value. " +
-                            "The WriteComposite operation is only used for SingleResources or/and ResourceInstance.", nodes.toString()));
-                }
-                else if (versionedId != null) {
-                    newNodes.put(fromVersionedIdToObjectId(versionedId), value);
-                }
-            } catch (JsonSyntaxException jse) {
-                if (versionedId != null) {
-                    newNodes.put(fromVersionedIdToObjectId(versionedId), value);
+                            "The WriteComposite operation is only used for SingleResources or/and ResourceInstance.", nodes));
                 }
+            } else {
+                setValueToCompositeNodes(client, newNodes, nodes, versionedId, value.toString());
             }
         });
         return newNodes;
     }
 
+    private void validateResource(LwM2mClient client, Map newNodes, Map nodes, String resourceId , Object value) {
+        if (value instanceof Map<?, ?>) {
+            ((Map<?, ?>) value).forEach((k, v) -> {
+                setValueToCompositeNodes(client, newNodes, nodes, validateResourceId (resourceId, k.toString(), nodes), v.toString());
+            });
+        } else {
+            setValueToCompositeNodes(client, newNodes, nodes, resourceId, value.toString());
+        }
+    }
+
+    private String validateResourceId (String key, String id, Map nodes) {
+        try {
+            Integer.parseInt(id);
+            return key + "/" + id;
+        } catch (NumberFormatException e) {
+            throw new IllegalArgumentException(String.format("nodes: %s is not validate value. " +
+                    "The WriteComposite operation is only used for SingleResources or/and ResourceInstance.", nodes.toString()));
+        }
+    }
+
+    private void setValueToCompositeNodes (LwM2mClient client, Map newNodes, Map nodes, String versionedId , String value) {
+        // validate value. Must be only primitive, not JsonObject or JsonArray
+        try {
+            JsonElement element = JsonUtils.parse(value);
+            if (!element.isJsonNull() && !element.isJsonPrimitive()) {
+                throw new IllegalArgumentException(String.format("nodes: %s is not validate value. " +
+                        "The WriteComposite operation is only used for SingleResources or/and ResourceInstance.", nodes.toString()));
+            }
+            // convert value from JsonPrimitive() to resource/ResourceInstance type
+            ResourceModel resourceModel = client.getResourceModel(versionedId, modelProvider);
+            Object newValue = convertValueByTypeResource(value, resourceModel.type,  versionedId);
+
+            // add new value after convert
+            newNodes.put(fromVersionedIdToObjectId(versionedId), newValue);
+        } catch (JsonSyntaxException jse) {
+            newNodes.put(fromVersionedIdToObjectId(versionedId), value);
+        }
+    }
+
     private void sendCancelObserveRequest(LwM2mClient client, TransportProtos.ToDeviceRpcRequestMsg requestMsg, String versionedId) {
         TbLwM2MCancelObserveRequest downlink = TbLwM2MCancelObserveRequest.builder().versionedId(versionedId).timeout(clientContext.getRequestTimeout(client)).build();
         var mainCallback = new TbLwM2MCancelObserveCallback(logService, client, versionedId);
@@ -353,6 +394,25 @@ public class DefaultLwM2MRpcRequestHandler implements LwM2MRpcRequestHandler {
         downlinkHandler.sendCancelObserveRequest(client, downlink, rpcCallback);
     }
 
+
+    private void sendObserveCompositeRequest(LwM2mClient client, TransportProtos.ToDeviceRpcRequestMsg requestMsg) {
+        String[] versionedIds = getIdsFromParameters(client, requestMsg);
+        TbLwM2MObserveCompositeRequest request = TbLwM2MObserveCompositeRequest.builder().versionedIds(versionedIds).timeout(clientContext.getRequestTimeout(client)).build();
+        var mainCallback = new TbLwM2MObserveCompositeCallback(uplinkHandler, logService, client, versionedIds);
+        var rpcCallback = new RpcObserveResponseCompositeCallback(transportService, client, requestMsg, mainCallback);
+        downlinkHandler.sendObserveCompositeRequest(client, request, rpcCallback);
+    }
+
+    private void sendCancelObserveCompositeRequest(LwM2mClient client, TransportProtos.ToDeviceRpcRequestMsg requestMsg) {
+        String[] versionedIds = getIdsFromParameters(client, requestMsg);
+        TbLwM2MCancelObserveCompositeRequest request = TbLwM2MCancelObserveCompositeRequest.builder().versionedIds(versionedIds).timeout(clientContext.getRequestTimeout(client)).build();
+        var mainCallback = new TbLwM2MCancelObserveCompositeCallback(logService, client, versionedIds);
+        var rpcCallback = new RpcCancelObserveCompositeCallback(transportService, client, requestMsg, mainCallback);
+        downlinkHandler.sendCancelObserveCompositeRequest(client, request, rpcCallback);
+    }
+
+
+
     private void sendDeleteRequest(LwM2mClient client, TransportProtos.ToDeviceRpcRequestMsg requestMsg, String versionedId) {
         TbLwM2MDeleteRequest downlink = TbLwM2MDeleteRequest.builder().versionedId(versionedId).timeout(clientContext.getRequestTimeout(client)).build();
         var mainCallback = new TbLwM2MDeleteCallback(logService, client, versionedId);
@@ -364,7 +424,7 @@ public class DefaultLwM2MRpcRequestHandler implements LwM2MRpcRequestHandler {
         TbLwM2MCancelAllRequest downlink = TbLwM2MCancelAllRequest.builder().timeout(clientContext.getRequestTimeout(client)).build();
         var mainCallback = new TbLwM2MCancelAllObserveCallback(logService, client);
         var rpcCallback = new RpcCancelAllObserveCallback(transportService, client, requestMsg, mainCallback);
-        downlinkHandler.sendCancelAllRequest(client, downlink, rpcCallback);
+        downlinkHandler.sendCancelObserveAllRequest(client, downlink, rpcCallback);
     }
 
     private String getIdFromParameters(LwM2mClient client, LwM2MRpcRequestHeader header) {
@@ -412,16 +472,4 @@ public class DefaultLwM2MRpcRequestHandler implements LwM2MRpcRequestHandler {
     public void onToServerRpcResponse(TransportProtos.ToServerRpcResponseMsg toServerResponse) {
         log.info("[{}] toServerRpcResponse", toServerResponse);
     }
-
-    private ContentFormat getCompositeContentFormat(LwM2mClient client) {
-        if (client.getClientSupportContentFormats().contains(ContentFormat.SENML_JSON)) {
-            return ContentFormat.SENML_JSON;
-        }
-        else if (client.getClientSupportContentFormats().contains(ContentFormat.SENML_CBOR)) {
-            return ContentFormat.SENML_CBOR;
-        }
-        else {
-            return null;
-        }
-    }
 }
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/rpc/RpcDiscoverCallback.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/rpc/RpcDiscoverCallback.java
index 2103d2d542..e953397066 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/rpc/RpcDiscoverCallback.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/rpc/RpcDiscoverCallback.java
@@ -35,7 +35,7 @@ public class RpcDiscoverCallback extends RpcLwM2MDownlinkCallback<DiscoverReques
     }
 
     protected Optional<String> serializeSuccessfulResponse(DiscoverResponse response) {
-        return Optional.of(serializer.serialize(response.getObjectLinks()));
+        return Optional.of(serializer.serializeCoreLinkFormat(response.getObjectLinks()));
     }
 
 }
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/rpc/composite/RpcCancelObserveCompositeCallback.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/rpc/composite/RpcCancelObserveCompositeCallback.java
new file mode 100644
index 0000000000..ba29f4a1e2
--- /dev/null
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/rpc/composite/RpcCancelObserveCompositeCallback.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.transport.lwm2m.server.rpc.composite;
+
+import org.eclipse.leshan.core.ResponseCode;
+import org.thingsboard.server.common.transport.TransportService;
+import org.thingsboard.server.gen.transport.TransportProtos;
+import org.thingsboard.server.transport.lwm2m.server.client.LwM2mClient;
+import org.thingsboard.server.transport.lwm2m.server.downlink.DownlinkRequestCallback;
+import org.thingsboard.server.transport.lwm2m.server.downlink.composite.TbLwM2MCancelObserveCompositeRequest;
+import org.thingsboard.server.transport.lwm2m.server.rpc.LwM2MRpcResponseBody;
+import org.thingsboard.server.transport.lwm2m.server.rpc.RpcDownlinkRequestCallbackProxy;
+
+public class RpcCancelObserveCompositeCallback extends RpcDownlinkRequestCallbackProxy<TbLwM2MCancelObserveCompositeRequest, Integer> {
+
+    public RpcCancelObserveCompositeCallback(TransportService transportService, LwM2mClient client, TransportProtos.ToDeviceRpcRequestMsg requestMsg, DownlinkRequestCallback<TbLwM2MCancelObserveCompositeRequest, Integer> callback) {
+        super(transportService, client, requestMsg, callback);
+    }
+
+    @Override
+    protected void sendRpcReplyOnSuccess(Integer response) {
+        reply(LwM2MRpcResponseBody.builder().result(ResponseCode.CONTENT.getName()).value(response.toString()).build());
+    }
+}
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/rpc/composite/RpcObserveResponseCompositeCallback.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/rpc/composite/RpcObserveResponseCompositeCallback.java
new file mode 100644
index 0000000000..f0688dcc4f
--- /dev/null
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/rpc/composite/RpcObserveResponseCompositeCallback.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.transport.lwm2m.server.rpc.composite;
+
+import org.eclipse.leshan.core.request.LwM2mRequest;
+import org.eclipse.leshan.core.response.ObserveCompositeResponse;
+import org.thingsboard.server.common.transport.TransportService;
+import org.thingsboard.server.gen.transport.TransportProtos;
+import org.thingsboard.server.transport.lwm2m.server.client.LwM2mClient;
+import org.thingsboard.server.transport.lwm2m.server.downlink.DownlinkRequestCallback;
+import org.thingsboard.server.transport.lwm2m.server.rpc.RpcLwM2MDownlinkCallback;
+
+import java.util.Optional;
+
+import static org.thingsboard.server.transport.lwm2m.utils.LwM2MTransportUtil.contentToString;
+
+public class RpcObserveResponseCompositeCallback<R extends LwM2mRequest<T>, T extends ObserveCompositeResponse> extends RpcLwM2MDownlinkCallback<R, T> {
+
+    public RpcObserveResponseCompositeCallback(TransportService transportService, LwM2mClient client, TransportProtos.ToDeviceRpcRequestMsg requestMsg, DownlinkRequestCallback<R, T> callback) {
+        super(transportService, client, requestMsg, callback);
+    }
+
+    @Override
+    protected Optional<String> serializeSuccessfulResponse(T response) {
+        return contentToString(response.getContent());
+    }
+}
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
new file mode 100644
index 0000000000..138d0d6af8
--- /dev/null
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbInMemoryRegistrationStore.java
@@ -0,0 +1,619 @@
+/**
+ * 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.server.store;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import lombok.extern.slf4j.Slf4j;
+import org.eclipse.californium.core.coap.Token;
+import org.eclipse.californium.core.network.RandomTokenGenerator;
+import org.eclipse.californium.core.network.TokenGenerator;
+import org.eclipse.californium.core.network.TokenGenerator.Scope;
+import org.eclipse.leshan.core.Destroyable;
+import org.eclipse.leshan.core.Startable;
+import org.eclipse.leshan.core.Stoppable;
+import org.eclipse.leshan.core.model.ObjectModel;
+import org.eclipse.leshan.core.model.ResourceModel;
+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.ObservationIdentifier;
+import org.eclipse.leshan.core.observation.SingleObservation;
+import org.eclipse.leshan.core.peer.LwM2mIdentity;
+import org.eclipse.leshan.core.request.ContentFormat;
+import org.eclipse.leshan.core.util.NamedThreadFactory;
+import org.eclipse.leshan.server.registration.Deregistration;
+import org.eclipse.leshan.server.registration.ExpirationListener;
+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.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.server.transport.lwm2m.config.LwM2MTransportServerConfig;
+import org.thingsboard.server.transport.lwm2m.server.LwM2mVersionedModelProvider;
+
+import java.net.InetSocketAddress;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+
+import static org.eclipse.leshan.core.californium.ObserveUtil.CTX_CF_OBERSATION;
+import static org.eclipse.leshan.core.californium.ObserveUtil.extractSerializedObservation;
+
+@Slf4j
+public class TbInMemoryRegistrationStore implements RegistrationStore, Startable, Stoppable, Destroyable {
+
+    // Data structure
+    private final Map<String /* end-point */, Registration> regsByEp = new HashMap<>();
+    private final Map<InetSocketAddress, Registration> regsByAddr = new HashMap<>();
+    private final Map<String /* reg-id */, Registration> regsByRegId = new HashMap<>();
+    private final Map<LwM2mIdentity, Registration> regsByIdentity = new HashMap<>();
+    private final Map<ObservationIdentifier, Observation> obsByToken = new HashMap<>();
+    private final Map<String, Set<ObservationIdentifier>> tokensByRegId = new HashMap<>();
+
+    private final ReadWriteLock lock = new ReentrantReadWriteLock();
+
+    // Listener use to notify when a registration expires
+    private ExpirationListener expirationListener;
+
+    private final ScheduledExecutorService schedExecutor;
+    private ScheduledFuture<?> cleanerTask;
+    private boolean started = false;
+    private final long cleanPeriod; // in seconds
+
+    private final LwM2MTransportServerConfig config;
+
+    private final LwM2mVersionedModelProvider modelProvider;
+
+    private TokenGenerator tokenGenerator;
+
+    public TbInMemoryRegistrationStore() {
+        this(null, 2, null); // default clean period : 2s
+    }
+
+    public TbInMemoryRegistrationStore(LwM2MTransportServerConfig config, long cleanPeriodInSec, LwM2mVersionedModelProvider modelProvider) {
+        this(config, Executors.newScheduledThreadPool(1,
+                        new NamedThreadFactory(String.format("TbInMemoryRegistrationStore Cleaner (%ds)", cleanPeriodInSec))),
+                cleanPeriodInSec, modelProvider);
+    }
+
+    public TbInMemoryRegistrationStore(LwM2MTransportServerConfig config, ScheduledExecutorService schedExecutor, long cleanPeriodInSec, LwM2mVersionedModelProvider modelProvider) {
+        this.schedExecutor = schedExecutor;
+        this.cleanPeriod = cleanPeriodInSec;
+        this.modelProvider = modelProvider;
+        this.config =  config;
+    }
+
+    /* *************** Leshan Registration API **************** */
+
+    @Override
+    public Deregistration addRegistration(Registration registration) {
+        try {
+            lock.writeLock().lock();
+
+            Registration registrationRemoved = regsByEp.put(registration.getEndpoint(), registration);
+            regsByRegId.put(registration.getId(), registration);
+            regsByIdentity.put(registration.getClientTransportData().getIdentity(), registration);
+            // If a registration is already associated to this address we don't care as we only want to keep the most
+            // recent binding.
+            regsByAddr.put(registration.getSocketAddress(), registration);
+            if (registrationRemoved != null) {
+                Collection<Observation> observationsRemoved = unsafeRemoveAllObservations(registrationRemoved.getId());
+                if (!registrationRemoved.getSocketAddress().equals(registration.getSocketAddress())) {
+                    removeFromMap(regsByAddr, registrationRemoved.getSocketAddress(), registrationRemoved);
+                }
+                if (!registrationRemoved.getId().equals(registration.getId())) {
+                    removeFromMap(regsByRegId, registrationRemoved.getId(), registrationRemoved);
+                }
+                if (!registrationRemoved.getClientTransportData().getIdentity()
+                        .equals(registration.getClientTransportData().getIdentity())) {
+                    removeFromMap(regsByIdentity, registrationRemoved.getClientTransportData().getIdentity(),
+                            registrationRemoved);
+                }
+                return new Deregistration(registrationRemoved, observationsRemoved);
+            }
+        } finally {
+            lock.writeLock().unlock();
+        }
+        return null;
+    }
+
+    @Override
+    public UpdatedRegistration updateRegistration(RegistrationUpdate update) {
+        log.trace("updateRegistration [{}]", update);
+        try {
+            lock.writeLock().lock();
+
+            Registration registration = getRegistration(update.getRegistrationId());
+            if (registration == null) {
+                return null;
+            } else {
+                Registration updatedRegistration = update.update(registration);
+                regsByEp.put(updatedRegistration.getEndpoint(), updatedRegistration);
+                // If registration is already associated to this address we don't care as we only want to keep the most
+                // recent binding.
+                regsByAddr.put(updatedRegistration.getSocketAddress(), updatedRegistration);
+                if (!registration.getSocketAddress().equals(updatedRegistration.getSocketAddress())) {
+                    removeFromMap(regsByAddr, registration.getSocketAddress(), registration);
+                }
+                regsByIdentity.put(updatedRegistration.getClientTransportData().getIdentity(), updatedRegistration);
+                if (!registration.getClientTransportData().getIdentity()
+                        .equals(updatedRegistration.getClientTransportData().getIdentity())) {
+                    removeFromMap(regsByIdentity, registration.getClientTransportData().getIdentity(), registration);
+                }
+
+                regsByRegId.put(updatedRegistration.getId(), updatedRegistration);
+
+                return new UpdatedRegistration(registration, updatedRegistration);
+            }
+        } finally {
+            lock.writeLock().unlock();
+        }
+    }
+
+    @Override
+    public Registration getRegistration(String registrationId) {
+        try {
+            lock.readLock().lock();
+            return regsByRegId.get(registrationId);
+        } finally {
+            lock.readLock().unlock();
+        }
+    }
+
+    @Override
+    public Registration getRegistrationByEndpoint(String endpoint) {
+        try {
+            lock.readLock().lock();
+            return regsByEp.get(endpoint);
+        } finally {
+            lock.readLock().unlock();
+        }
+    }
+
+    @Override
+    public Registration getRegistrationByAdress(InetSocketAddress address) {
+        try {
+            lock.readLock().lock();
+            return regsByAddr.get(address);
+        } finally {
+            lock.readLock().unlock();
+        }
+    }
+
+    @Override
+    public Registration getRegistrationByIdentity(LwM2mIdentity identity) {
+        try {
+            lock.readLock().lock();
+            return regsByIdentity.get(identity);
+        } finally {
+            lock.readLock().unlock();
+        }
+    }
+
+    @Override
+    public Iterator<Registration> getAllRegistrations() {
+        try {
+            lock.readLock().lock();
+            return new ArrayList<>(regsByEp.values()).iterator();
+        } finally {
+            lock.readLock().unlock();
+        }
+    }
+
+    @Override
+    public Deregistration removeRegistration(String registrationId) {
+        try {
+            lock.writeLock().lock();
+
+            Registration registration = getRegistration(registrationId);
+            if (registration != null) {
+                Collection<Observation> observationsRemoved = unsafeRemoveAllObservations(registration.getId());
+                regsByEp.remove(registration.getEndpoint());
+                removeFromMap(regsByAddr, registration.getSocketAddress(), registration);
+                removeFromMap(regsByRegId, registration.getId(), registration);
+                removeFromMap(regsByIdentity, registration.getClientTransportData().getIdentity(), registration);
+                return new Deregistration(registration, observationsRemoved);
+            }
+            return null;
+        } finally {
+            lock.writeLock().unlock();
+        }
+    }
+
+    /* *************** Leshan Observation API **************** */
+
+    @Override
+    public Collection<Observation> addObservation(String registrationId, Observation observation, boolean addIfAbsent) {
+        List<Observation> removed = new ArrayList<>();
+        try {
+            lock.writeLock().lock();
+
+            if (!regsByRegId.containsKey(registrationId)) {
+                throw new IllegalStateException(String.format(
+                        "can not add observation %s there is no registration with id %s", observation, registrationId));
+            }
+
+            if (observation instanceof SingleObservation) {
+                if (validateObserveResource(((SingleObservation)observation).getPath(), registrationId)) {
+                    updateSingleObservation(registrationId, (SingleObservation) observation, addIfAbsent, removed);
+                        // cancel existing observations for the same path and registration id.
+                    cancelObservation (observation, registrationId, removed);
+                }
+            } else {
+                ContentFormat ct = ((CompositeObservation) observation).getResponseContentFormat();
+                Map<String, String> ctx = observation.getContext();
+                String serializedObservation = extractSerializedObservation(observation);
+                JsonNode nodeSerObs = JacksonUtil.toJsonNode(serializedObservation);
+                ((CompositeObservation)observation).getPaths().forEach(path -> {
+                    if (validateObserveResource(path, registrationId)) {
+                        String serializedObs = createSerializedSingleObservation(nodeSerObs, path.toString());
+                        Observation singleObservation = createSingleObservation(registrationId, path, ct, ctx, serializedObs, getTokenGenerator());
+                        updateSingleObservation(registrationId, (SingleObservation) singleObservation, addIfAbsent, removed);
+                        // cancel existing observations for the same path and registration id.
+                        cancelObservation (singleObservation, registrationId, removed);
+                    }
+                });
+            }
+
+        } finally {
+            lock.writeLock().unlock();
+        }
+
+        return removed;
+    }
+
+    private boolean validateObserveResource(LwM2mPath path, String registrationId){
+        // check if the resource is readable.
+        if (path.isResource() || path.isResourceInstance()) {
+            ObjectModel objectModel = modelProvider.getObjectModel(getRegistration(registrationId)).getObjectModel(path.getObjectId());
+            ResourceModel resourceModel = objectModel == null ? null : objectModel.resources.get(path.getResourceId());
+            if (resourceModel == null) {
+                return false;
+            } else if (!resourceModel.operations.isReadable()) {
+                return false;
+            } else if (path.isResourceInstance() && !resourceModel.multiple) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    private void updateSingleObservation (String registrationId, SingleObservation observation, boolean addIfAbsent, List<Observation> removed) {
+            // Absorption by existing Observations
+
+
+        Observation previousObservation = null;
+        SingleObservation existingObservation = null;
+
+        ObservationIdentifier id = observation.getId();
+        if (addIfAbsent) {
+            if (!obsByToken.containsKey(id)) {
+                existingObservation = validateByAbsorptionExistingObservations(observation);
+                if (existingObservation == null) {
+                    obsByToken.put(id, observation);
+                } else if (!existingObservation.getPath().equals(observation.getPath())){
+                    obsByToken.put(id, observation);
+                    previousObservation = obsByToken.get(existingObservation.getId());
+                }
+            }
+        } else {
+            previousObservation = obsByToken.put(id, observation);
+        }
+        if (!tokensByRegId.containsKey(registrationId)) {
+            tokensByRegId.put(registrationId, new HashSet<ObservationIdentifier>());
+        }
+
+        if (existingObservation == null || !existingObservation.getPath().equals(observation.getPath())) {
+            tokensByRegId.get(registrationId).add(id);
+        }
+
+        // log any collisions
+        if (addIfAbsent && previousObservation != null) {
+            if (!existingObservation.getPath().equals(observation.getPath())) {
+                removed.add(previousObservation);
+                log.warn("Token collision ? observation [{}] will be replaced by observation [{}], that this observation  includes input observation [{}]!",
+                        previousObservation, observation, observation);
+            } else {
+                log.warn("Token collision ? existing observation [{}] includes input observation [{}]",
+                        existingObservation, observation);
+            }
+        }
+    }
+
+    private SingleObservation validateByAbsorptionExistingObservations (SingleObservation observation) {
+        LwM2mPath pathObservation = observation.getPath();
+        AtomicReference<SingleObservation> result = new AtomicReference<>();
+        obsByToken.values().stream().forEach(obs -> {
+            LwM2mPath pathObs = ((SingleObservation)obs).getPath();
+            if ((!pathObservation.equals(pathObs) && pathObs.startWith(pathObservation)) ||        // pathObs = "3/0/9"-> pathObservation = "3"
+                    (pathObservation.equals(pathObs) && !observation.getId().equals(obs.getId()))) {
+               result.set((SingleObservation)obs);
+            } else if (!pathObservation.equals(pathObs) && pathObservation.startWith(pathObs)) {    // pathObs = "3" -> pathObservation = "3/0/9"
+                result.set(observation);
+            }
+        });
+        return result.get();
+    }
+
+    private TokenGenerator getTokenGenerator(){
+        if (this.tokenGenerator == null) {
+            this.tokenGenerator = new RandomTokenGenerator(config.getCoapConfig());
+        }
+        return this.tokenGenerator;
+    }
+
+    public static SingleObservation createSingleObservation(String registrationId, LwM2mPath target, ContentFormat ct,
+                                                Map<String, String> ctx, String serializedObservation, TokenGenerator tokenGenerator) {
+        Token token = tokenGenerator.createToken(Scope.SHORT_TERM);
+        Map<String, String>  protocolData = Collections.emptyMap();
+        if (serializedObservation != null) {
+            protocolData = new HashMap<>();
+            protocolData.put(CTX_CF_OBERSATION, serializedObservation);
+        }
+        return new SingleObservation(new ObservationIdentifier(token.getBytes()), registrationId, target, ct, ctx, protocolData);
+    }
+
+    public static String createSerializedSingleObservation(JsonNode nodeSerObs, String path){
+        if (nodeSerObs.has("context")){
+            ((ObjectNode) nodeSerObs.get("context")).put("leshan-path", path + "\n");
+            return JacksonUtil.toString(nodeSerObs);
+        }
+        return null;
+    }
+
+    @Override
+    public Observation removeObservation(String registrationId, ObservationIdentifier observationId) {
+        try {
+            lock.writeLock().lock();
+            Observation observation = unsafeGetObservation(observationId);
+            if (observation != null && registrationId.equals(observation.getRegistrationId())) {
+                unsafeRemoveObservation(observationId);
+                return observation;
+            }
+            return null;
+        } finally {
+            lock.writeLock().unlock();
+        }
+    }
+
+    @Override
+    public Observation getObservation(String registrationId, ObservationIdentifier observationId) {
+        try {
+            lock.readLock().lock();
+            Observation observation = unsafeGetObservation(observationId);
+            if (observation != null && registrationId.equals(observation.getRegistrationId())) {
+                return observation;
+            }
+            return null;
+        } finally {
+            lock.readLock().unlock();
+        }
+    }
+
+    @Override
+    public Observation getObservation(ObservationIdentifier observationId) {
+        try {
+            lock.readLock().lock();
+            Observation observation = unsafeGetObservation(observationId);
+            if (observation != null) {
+                return observation;
+            }
+            return null;
+        } finally {
+            lock.readLock().unlock();
+        }
+    }
+
+    /**
+     * Prepare for Cancel one Observation
+     * @param registrationId
+     * @return
+     */
+    @Override
+    public Collection<Observation> getObservations(String registrationId) {
+        try {
+            lock.readLock().lock();
+            return unsafeGetObservations(registrationId);
+        } finally {
+            lock.readLock().unlock();
+        }
+    }
+
+    /**
+     * CancelAllObservation
+     * @param registrationId
+     * @return
+     */
+
+    @Override
+    public Collection<Observation> removeObservations(String registrationId) {
+        try {
+            lock.writeLock().lock();
+            return unsafeRemoveAllObservations(registrationId);
+        } finally {
+            lock.writeLock().unlock();
+        }
+    }
+
+    /* *************** Observation utility functions **************** */
+
+    private Observation unsafeGetObservation(ObservationIdentifier token) {
+        Observation obs = obsByToken.get(token);
+        return obs;
+    }
+
+    private void cancelObservation (Observation observation, String registrationId, List<Observation> removed) {
+        for (Observation obs : unsafeGetObservations(registrationId)) {
+            cancelExistingObservation(observation, obs, removed);
+        }
+    }
+
+    private void cancelExistingObservation(Observation observation, Observation obs, List<Observation> removed) {
+        LwM2mPath pathObservation = ((SingleObservation)observation).getPath();
+        LwM2mPath pathObs = ((SingleObservation)obs).getPath();
+        if ((!pathObservation.equals(pathObs) && pathObs.startWith(pathObservation)) ||        // pathObservation = "3", pathObs = "3/0/9"
+             (pathObservation.equals(pathObs) && !observation.getId().equals(obs.getId()))) {
+            unsafeRemoveObservation(obs.getId());
+            removed.add(obs);
+        } else if (!pathObservation.equals(pathObs) && pathObservation.startWith(pathObs)) {    // pathObservation = "3/0/9", pathObs = "3"
+            unsafeRemoveObservation(observation.getId());
+        }
+    }
+
+    private void unsafeRemoveObservation(ObservationIdentifier observationId) {
+        Observation removed = obsByToken.remove(observationId);
+        if (removed != null) {
+            String registrationId = removed.getRegistrationId();
+            Set<ObservationIdentifier> tokens = tokensByRegId.get(registrationId);
+            tokens.remove(observationId);
+            if (tokens.isEmpty()) {
+                tokensByRegId.remove(registrationId);
+            }
+        }
+    }
+
+
+    /**
+     * CancelAllObservation
+     * @param registrationId
+     * @return
+     */
+    private Collection<Observation> unsafeRemoveAllObservations(String registrationId) {
+        Collection<Observation> removed = new ArrayList<>();
+        Set<ObservationIdentifier> ids = tokensByRegId.get(registrationId);
+        if (ids != null) {
+            for (ObservationIdentifier id : ids) {
+                Observation observationRemoved = obsByToken.remove(id);
+                if (observationRemoved != null) {
+                    removed.add(observationRemoved);
+                }
+            }
+        }
+        tokensByRegId.remove(registrationId);
+        return removed;
+    }
+
+    private Collection<Observation> unsafeGetObservations(String registrationId) {
+        Collection<Observation> result = new ArrayList<>();
+        Set<ObservationIdentifier> ids = tokensByRegId.get(registrationId);
+        if (ids != null) {
+            for (ObservationIdentifier id : ids) {
+                Observation obs = unsafeGetObservation(id);
+                if (obs != null) {
+                    result.add(obs);
+                }
+            }
+        }
+        return result;
+    }
+    /* *************** Expiration handling **************** */
+
+    @Override
+    public void setExpirationListener(ExpirationListener listener) {
+        this.expirationListener = listener;
+    }
+
+    /**
+     * start the registration store, will start regular cleanup of dead registrations.
+     */
+    @Override
+    public synchronized void start() {
+        if (!started) {
+            started = true;
+            cleanerTask = schedExecutor.scheduleAtFixedRate(new TbInMemoryRegistrationStore.Cleaner(), cleanPeriod, cleanPeriod, TimeUnit.SECONDS);
+        }
+    }
+
+    /**
+     * Stop the underlying cleanup of the registrations.
+     */
+    @Override
+    public synchronized void stop() {
+        if (started) {
+            started = false;
+            if (cleanerTask != null) {
+                cleanerTask.cancel(false);
+                cleanerTask = null;
+            }
+        }
+    }
+
+    /**
+     * Destroy "cleanup" scheduler.
+     */
+    @Override
+    public synchronized void destroy() {
+        started = false;
+        schedExecutor.shutdownNow();
+        try {
+            schedExecutor.awaitTermination(5, TimeUnit.SECONDS);
+        } catch (InterruptedException e) {
+            log.warn("Destroying InMemoryRegistrationStore was interrupted.", e);
+        }
+    }
+
+    private class Cleaner implements Runnable {
+
+        @Override
+        public void run() {
+            try {
+                Collection<Registration> allRegs = new ArrayList<>();
+                try {
+                    lock.readLock().lock();
+                    allRegs.addAll(regsByEp.values());
+                } finally {
+                    lock.readLock().unlock();
+                }
+
+                for (Registration reg : allRegs) {
+                    if (!reg.isAlive()) {
+                        // force de-registration
+                        Deregistration removedRegistration = removeRegistration(reg.getId());
+                        expirationListener.registrationExpired(removedRegistration.getRegistration(),
+                                removedRegistration.getObservations());
+                    }
+                }
+            } catch (Exception e) {
+                log.warn("Unexpected Exception while registration cleaning", e);
+            }
+        }
+    }
+
+    // boolean remove(Object key, Object value) exist only since java8
+    // So this method is here only while we want to support java 7
+    protected <K, V> boolean removeFromMap(Map<K, V> map, K key, V value) {
+        if (map.containsKey(key) && Objects.equals(map.get(key), value)) {
+            map.remove(key);
+            return true;
+        } else
+            return false;
+    }
+}
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbInMemorySecurityStore.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbInMemorySecurityStore.java
index f18648d2fc..2fe952ac53 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbInMemorySecurityStore.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbInMemorySecurityStore.java
@@ -16,6 +16,7 @@
 package org.thingsboard.server.transport.lwm2m.server.store;
 
 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.thingsboard.server.transport.lwm2m.secure.TbLwM2MSecurityInfo;
@@ -83,25 +84,30 @@ public class TbInMemorySecurityStore implements TbEditableSecurityStore {
         }
     }
 
+    @Override
+    public SecurityInfo getByOscoreIdentity(OscoreIdentity oscoreIdentity) {
+        return null;
+    }
+
     @Override
     public void put(TbLwM2MSecurityInfo tbSecurityInfo) throws NonUniqueSecurityInfoException {
         writeLock.lock();
         try {
             String identity = null;
             if (tbSecurityInfo.getSecurityInfo() != null) {
-                identity = tbSecurityInfo.getSecurityInfo().getIdentity();
+                identity = tbSecurityInfo.getSecurityInfo().getPskIdentity();
                 if (identity != null) {
                     TbLwM2MSecurityInfo infoByIdentity = securityByIdentity.get(identity);
                     if (infoByIdentity != null && !tbSecurityInfo.getSecurityInfo().getEndpoint().equals(infoByIdentity.getEndpoint())) {
                         throw new NonUniqueSecurityInfoException("PSK Identity " + identity + " is already used");
                     }
-                    securityByIdentity.put(tbSecurityInfo.getSecurityInfo().getIdentity(), tbSecurityInfo);
+                    securityByIdentity.put(tbSecurityInfo.getSecurityInfo().getPskIdentity(), tbSecurityInfo);
                 }
             }
 
             TbLwM2MSecurityInfo previous = securityByEp.put(tbSecurityInfo.getEndpoint(), tbSecurityInfo);
             if (previous != null && previous.getSecurityInfo() != null) {
-                String previousIdentity = previous.getSecurityInfo().getIdentity();
+                String previousIdentity = previous.getSecurityInfo().getPskIdentity();
                 if (previousIdentity != null && !previousIdentity.equals(identity)) {
                     securityByIdentity.remove(previousIdentity);
                 }
@@ -116,8 +122,8 @@ public class TbInMemorySecurityStore implements TbEditableSecurityStore {
         writeLock.lock();
         try {
             TbLwM2MSecurityInfo securityInfo = securityByEp.remove(endpoint);
-            if (securityInfo != null && securityInfo.getSecurityInfo() != null && securityInfo.getSecurityInfo().getIdentity() != null) {
-                securityByIdentity.remove(securityInfo.getSecurityInfo().getIdentity());
+            if (securityInfo != null && securityInfo.getSecurityInfo() != null && securityInfo.getSecurityInfo().getPskIdentity() != null) {
+                securityByIdentity.remove(securityInfo.getSecurityInfo().getPskIdentity());
             }
         } finally {
             writeLock.unlock();
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbLwM2MDtlsSessionRedisStore.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbLwM2MDtlsSessionRedisStore.java
index e92abb0178..a3c56a39d8 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbLwM2MDtlsSessionRedisStore.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbLwM2MDtlsSessionRedisStore.java
@@ -15,25 +15,23 @@
  */
 package org.thingsboard.server.transport.lwm2m.server.store;
 
-import org.nustaq.serialization.FSTConfiguration;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.thingsboard.server.common.data.JavaSerDesUtil;
 import org.thingsboard.server.transport.lwm2m.secure.TbX509DtlsSessionInfo;
 
 public class TbLwM2MDtlsSessionRedisStore implements TbLwM2MDtlsSessionStore {
 
     private static final String SESSION_EP = "SESSION#EP#";
     private final RedisConnectionFactory connectionFactory;
-    private final FSTConfiguration serializer;
 
     public TbLwM2MDtlsSessionRedisStore(RedisConnectionFactory redisConnectionFactory) {
         this.connectionFactory = redisConnectionFactory;
-        this.serializer = FSTConfiguration.createDefaultConfiguration();
     }
 
     @Override
     public void put(String endpoint, TbX509DtlsSessionInfo msg) {
         try (var c = connectionFactory.getConnection()) {
-            var serializedMsg = serializer.asByteArray(msg);
+            var serializedMsg = JavaSerDesUtil.encode(msg);
             if (serializedMsg != null) {
                 c.set(getKey(endpoint), serializedMsg);
             } else {
@@ -47,7 +45,7 @@ public class TbLwM2MDtlsSessionRedisStore implements TbLwM2MDtlsSessionStore {
         try (var c = connectionFactory.getConnection()) {
             var data = c.get(getKey(endpoint));
             if (data != null) {
-                return (TbX509DtlsSessionInfo) serializer.asObject(data);
+                return JavaSerDesUtil.decode(data);
             } else {
                 return null;
             }
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 23c7a57dd6..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
@@ -15,25 +15,34 @@
  */
 package org.thingsboard.server.transport.lwm2m.server.store;
 
+import com.fasterxml.jackson.databind.JsonNode;
+import lombok.extern.slf4j.Slf4j;
 import org.eclipse.californium.core.coap.Token;
-import org.eclipse.californium.core.observe.ObservationStoreException;
-import org.eclipse.californium.elements.EndpointContext;
+import org.eclipse.californium.core.network.RandomTokenGenerator;
+import org.eclipse.californium.core.network.TokenGenerator;
+import org.eclipse.californium.core.network.serialization.UdpDataParser;
+import org.eclipse.californium.core.network.serialization.UdpDataSerializer;
 import org.eclipse.leshan.core.Destroyable;
 import org.eclipse.leshan.core.Startable;
 import org.eclipse.leshan.core.Stoppable;
-import org.eclipse.leshan.core.californium.ObserveUtil;
+import org.eclipse.leshan.core.model.ObjectModel;
+import org.eclipse.leshan.core.model.ResourceModel;
+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.ObservationIdentifier;
 import org.eclipse.leshan.core.observation.SingleObservation;
-import org.eclipse.leshan.core.request.Identity;
+import org.eclipse.leshan.core.peer.LwM2mIdentity;
+import org.eclipse.leshan.core.request.ContentFormat;
 import org.eclipse.leshan.core.util.NamedThreadFactory;
 import org.eclipse.leshan.core.util.Validate;
-import org.eclipse.leshan.server.californium.registration.CaliforniumRegistrationStore;
 import org.eclipse.leshan.server.redis.RedisRegistrationStore;
 import org.eclipse.leshan.server.redis.serialization.ObservationSerDes;
 import org.eclipse.leshan.server.redis.serialization.RegistrationSerDes;
 import org.eclipse.leshan.server.registration.Deregistration;
 import org.eclipse.leshan.server.registration.ExpirationListener;
 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;
@@ -44,7 +53,9 @@ import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.data.redis.core.Cursor;
 import org.springframework.data.redis.core.ScanOptions;
 import org.springframework.integration.redis.util.RedisLockRegistry;
-import org.thingsboard.server.transport.lwm2m.server.store.util.LwM2MIdentitySerDes;
+import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.server.transport.lwm2m.config.LwM2MTransportServerConfig;
+import org.thingsboard.server.transport.lwm2m.server.LwM2mVersionedModelProvider;
 
 import java.net.InetSocketAddress;
 import java.util.ArrayList;
@@ -54,16 +65,22 @@ import java.util.Collections;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.concurrent.locks.Lock;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.eclipse.leshan.core.californium.ObserveUtil.extractSerializedObservation;
+import static org.thingsboard.server.transport.lwm2m.server.store.TbInMemoryRegistrationStore.createSerializedSingleObservation;
+import static org.thingsboard.server.transport.lwm2m.server.store.TbInMemoryRegistrationStore.createSingleObservation;
 
-public class TbLwM2mRedisRegistrationStore implements CaliforniumRegistrationStore, Startable, Stoppable, Destroyable {
+@Slf4j
+public class TbLwM2mRedisRegistrationStore implements RegistrationStore, Startable, Stoppable, Destroyable {
     /** Default time in seconds between 2 cleaning tasks (used to remove expired registration). */
     public static final long DEFAULT_CLEAN_PERIOD = 60;
     public static final int DEFAULT_CLEAN_LIMIT = 500;
@@ -73,16 +90,21 @@ public class TbLwM2mRedisRegistrationStore implements CaliforniumRegistrationSto
     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)
     private static final String LOCK_EP = "LOCK:EP:";
     private static final byte[] OBS_TKN = "OBS:TKN:".getBytes(UTF_8);
+    private static final byte[] OBS_TKN_GET_ALL = "OBS:TKN:*".getBytes(UTF_8);
     private static final String OBS_TKNS_REGID_IDX = "TKNS:REGID:"; // secondary index (token list by registration)
     private static final byte[] EXP_EP = "EXP:EP".getBytes(UTF_8); // a sorted set used for registration expiration
     // (expiration date, Endpoint)
 
+    private final RegistrationSerDes registrationSerDes = new RegistrationSerDes();
+    private final ObservationSerDes observationSerDes = new ObservationSerDes();
+    private final org.eclipse.leshan.server.californium.observation.ObservationSerDes observationSerDesCoap =
+            new org.eclipse.leshan.server.californium.observation.ObservationSerDes(new UdpDataParser(), new UdpDataSerializer());
     private final RedisConnectionFactory connectionFactory;
 
     // Listener use to notify when a registration expires
@@ -98,30 +120,31 @@ public class TbLwM2mRedisRegistrationStore implements CaliforniumRegistrationSto
 
     private final RedisLockRegistry redisLock;
 
-    public TbLwM2mRedisRegistrationStore(RedisConnectionFactory connectionFactory) {
-        this(connectionFactory, DEFAULT_CLEAN_PERIOD, DEFAULT_GRACE_PERIOD, DEFAULT_CLEAN_LIMIT); // default clean period 60s
-    }
+    private final LwM2MTransportServerConfig config;
+    private TokenGenerator tokenGenerator;
 
-    public TbLwM2mRedisRegistrationStore(RedisConnectionFactory connectionFactory, long cleanPeriodInSec, long lifetimeGracePeriodInSec, int cleanLimit) {
-        this(connectionFactory, Executors.newScheduledThreadPool(1,
-                new NamedThreadFactory(String.format("RedisRegistrationStore Cleaner (%ds)", cleanPeriodInSec))),
-                cleanPeriodInSec, lifetimeGracePeriodInSec, cleanLimit);
+    private final LwM2mVersionedModelProvider modelProvider;
+
+    public TbLwM2mRedisRegistrationStore(LwM2MTransportServerConfig config, RedisConnectionFactory connectionFactory, LwM2mVersionedModelProvider modelProvider) {
+        this(config, connectionFactory, DEFAULT_CLEAN_PERIOD, DEFAULT_GRACE_PERIOD, DEFAULT_CLEAN_LIMIT, modelProvider); // default clean period 60s
     }
 
-    public TbLwM2mRedisRegistrationStore(RedisConnectionFactory connectionFactory, ScheduledExecutorService schedExecutor, long cleanPeriodInSec,
-                                         long lifetimeGracePeriodInSec, int cleanLimit) {
-        this(connectionFactory, schedExecutor, cleanPeriodInSec, lifetimeGracePeriodInSec, cleanLimit,
-                new RedisLockRegistry(connectionFactory, "Registration"));
+    public TbLwM2mRedisRegistrationStore(LwM2MTransportServerConfig config, RedisConnectionFactory connectionFactory, long cleanPeriodInSec, long lifetimeGracePeriodInSec, int cleanLimit, LwM2mVersionedModelProvider modelProvider) {
+        this(config, connectionFactory, Executors.newScheduledThreadPool(1,
+                new NamedThreadFactory(String.format("RedisRegistrationStore Cleaner (%ds)", cleanPeriodInSec))),
+                cleanPeriodInSec, lifetimeGracePeriodInSec, cleanLimit, modelProvider);
     }
 
-    public TbLwM2mRedisRegistrationStore(RedisConnectionFactory connectionFactory, ScheduledExecutorService schedExecutor, long cleanPeriodInSec,
-                                         long lifetimeGracePeriodInSec, int cleanLimit, RedisLockRegistry lockRegistry) {
+    public TbLwM2mRedisRegistrationStore(LwM2MTransportServerConfig config, RedisConnectionFactory connectionFactory, ScheduledExecutorService schedExecutor, long cleanPeriodInSec,
+                                         long lifetimeGracePeriodInSec, int cleanLimit, LwM2mVersionedModelProvider modelProvider) {
         this.connectionFactory = connectionFactory;
         this.schedExecutor = schedExecutor;
         this.cleanPeriod = cleanPeriodInSec;
         this.cleanLimit = cleanLimit;
         this.gracePeriod = lifetimeGracePeriodInSec;
-        this.redisLock = lockRegistry;
+        this.redisLock = new RedisLockRegistry(connectionFactory, "Registration");
+        this.config = config;
+        this.modelProvider = modelProvider;
     }
 
     /* *************** Redis Key utility function **************** */
@@ -165,7 +188,7 @@ public class TbLwM2mRedisRegistrationStore implements CaliforniumRegistrationSto
                 connection.set(regid_idx, registration.getEndpoint().getBytes(UTF_8));
                 byte[] addr_idx = toRegAddrKey(registration.getSocketAddress());
                 connection.set(addr_idx, registration.getEndpoint().getBytes(UTF_8));
-                byte[] identity_idx = toRegIdentityKey(registration.getIdentity());
+                byte[] identity_idx = toRegIdentityKey(registration.getClientTransportData().getIdentity());
                 connection.set(identity_idx, registration.getEndpoint().getBytes(UTF_8));
 
                 // Add or update expiration
@@ -179,7 +202,7 @@ public class TbLwM2mRedisRegistrationStore implements CaliforniumRegistrationSto
                     if (!oldRegistration.getSocketAddress().equals(registration.getSocketAddress())) {
                         removeAddrIndex(connection, oldRegistration);
                     }
-                    if (registrationsHaveDifferentIdentities(oldRegistration, registration)) {
+                    if (!oldRegistration.getClientTransportData().getIdentity().equals(registration.getClientTransportData().getIdentity())) {
                         removeIdentityIndex(connection, oldRegistration);
                     }
                     // remove old observation
@@ -199,6 +222,7 @@ public class TbLwM2mRedisRegistrationStore implements CaliforniumRegistrationSto
 
     @Override
     public UpdatedRegistration updateRegistration(RegistrationUpdate update) {
+        log.trace("updateRegistration [{}]", update);
         Lock lock = null;
         try (var connection = connectionFactory.getConnection()) {
 
@@ -237,7 +261,7 @@ public class TbLwM2mRedisRegistrationStore implements CaliforniumRegistrationSto
                 if (!r.getSocketAddress().equals(updatedRegistration.getSocketAddress())) {
                     removeAddrIndex(connection, r);
                 }
-                if (registrationsHaveDifferentIdentities(r, updatedRegistration)) {
+                if (!r.getClientTransportData().getIdentity().equals(updatedRegistration.getClientTransportData().getIdentity())) {
                     removeIdentityIndex(connection, r);
                 }
 
@@ -257,6 +281,18 @@ public class TbLwM2mRedisRegistrationStore implements CaliforniumRegistrationSto
             return getRegistration(connection, registrationId);
         }
     }
+    private Registration getRegistration(RedisConnection connection, String registrationId) {
+        byte[] ep = connection.get(toRegIdKey(registrationId));
+        if (ep == null) {
+            return null;
+        }
+        byte[] data = connection.get(toEndpointKey(ep));
+        if (data == null) {
+            return null;
+        }
+
+        return deserializeReg(data);
+    }
 
     @Override
     public Registration getRegistrationByEndpoint(String endpoint) {
@@ -287,7 +323,7 @@ public class TbLwM2mRedisRegistrationStore implements CaliforniumRegistrationSto
     }
 
     @Override
-    public Registration getRegistrationByIdentity(Identity identity) {
+    public Registration getRegistrationByIdentity(LwM2mIdentity identity) {
         Validate.notNull(identity);
         try (var connection = connectionFactory.getConnection()) {
             byte[] ep = connection.get(toRegIdentityKey(identity));
@@ -333,6 +369,7 @@ public class TbLwM2mRedisRegistrationStore implements CaliforniumRegistrationSto
         }
     }
 
+
     private Deregistration removeRegistration(RedisConnection connection, String registrationId, boolean removeOnlyIfNotAlive) {
         // fetch the client ep by registration ID index
         byte[] ep = connection.get(toRegIdKey(registrationId));
@@ -377,7 +414,7 @@ public class TbLwM2mRedisRegistrationStore implements CaliforniumRegistrationSto
     }
 
     private void removeIdentityIndex(RedisConnection connection, Registration r) {
-        removeSecondaryIndex(connection, toRegIdentityKey(r.getIdentity()), r.getEndpoint());
+        removeSecondaryIndex(connection, toRegIdentityKey(r.getClientTransportData().getIdentity()), r.getEndpoint());
     }
 
     //TODO: JedisCluster didn't implement Transaction, maybe should use some advanced key creation strategies
@@ -408,12 +445,6 @@ public class TbLwM2mRedisRegistrationStore implements CaliforniumRegistrationSto
         connection.zRem(EXP_EP, registration.getEndpoint().getBytes(UTF_8));
     }
 
-    private boolean registrationsHaveDifferentIdentities(Registration first, Registration second){
-        var first_identity_string = LwM2MIdentitySerDes.serialize(first.getIdentity()).toString();
-        var second_identity_string = LwM2MIdentitySerDes.serialize(second.getIdentity()).toString();
-        return !first_identity_string.equals(second_identity_string);
-    }
-
     private byte[] toRegIdKey(String registrationId) {
         return toKey(REG_EP_REGID_IDX, registrationId);
     }
@@ -422,8 +453,8 @@ public class TbLwM2mRedisRegistrationStore implements CaliforniumRegistrationSto
         return toKey(REG_EP_ADDR_IDX, addr.getAddress().toString() + ":" + addr.getPort());
     }
 
-    private byte[] toRegIdentityKey(Identity identity) {
-        return toKey(REG_EP_IDENTITY, LwM2MIdentitySerDes.serialize(identity).toString());
+    private byte[] toRegIdentityKey(LwM2mIdentity identity) {
+        return toKey(REG_EP_IDENTITY, identity.toString());
     }
 
     private byte[] toEndpointKey(String endpoint) {
@@ -435,11 +466,11 @@ public class TbLwM2mRedisRegistrationStore implements CaliforniumRegistrationSto
     }
 
     private byte[] serializeReg(Registration registration) {
-        return RegistrationSerDes.bSerialize(registration);
+        return registrationSerDes.bSerialize(registration);
     }
 
     private Registration deserializeReg(byte[] data) {
-        return RegistrationSerDes.deserialize(data);
+        return registrationSerDes.deserialize(data);
     }
 
     /* *************** Leshan Observation API **************** */
@@ -448,15 +479,17 @@ public class TbLwM2mRedisRegistrationStore implements CaliforniumRegistrationSto
      * The observation is not persisted here, it is done by the Californium layer (in the implementation of the
      * org.eclipse.californium.core.observe.ObservationStore#add method)
      */
+
     @Override
-    public Collection<Observation> addObservation(String registrationId, Observation observation) {
+    public Collection<Observation> addObservation(String registrationId, Observation observation, boolean addIfAbsent) {
         List<Observation> removed = new ArrayList<>();
         try (var connection = connectionFactory.getConnection()) {
 
             // fetch the client ep by registration ID index
-            byte[] ep = connection.get(toRegIdKey(registrationId));
+            byte[] ep = connection.commands().get(toRegIdKey(registrationId));
             if (ep == null) {
-                return null;
+                throw new IllegalStateException(String.format(
+                        "can not add observation %s there is no registration with id %s", observation, registrationId));
             }
 
             Lock lock = null;
@@ -465,17 +498,27 @@ public class TbLwM2mRedisRegistrationStore implements CaliforniumRegistrationSto
             try {
                 lock = redisLock.obtain(lockKey);
                 lock.lock();
-
-                // cancel existing observations for the same path and registration id.
-                for (Observation obs : getObservations(connection, registrationId)) {
-                    //TODO: should be able to use CompositeObservation
-                    if (((SingleObservation)observation).getPath().equals(((SingleObservation)obs).getPath())
-                            && !Arrays.equals(observation.getId(), obs.getId())) {
-                        removed.add(obs);
-                        unsafeRemoveObservation(connection, registrationId, obs.getId());
+                if (observation instanceof SingleObservation) {
+                    if (validateObserveResource(((SingleObservation)observation).getPath(), registrationId)) {
+                        updateSingleObservation(registrationId, (SingleObservation)observation, addIfAbsent, removed, connection);
+                        // cancel existing observations for the same path and registration id.
+                        cancelObservation(observation, registrationId, removed, connection);
                     }
+                } else {
+                    ContentFormat ct = ((CompositeObservation) observation).getResponseContentFormat();
+                    Map<String, String> ctx = observation.getContext();
+                    String serializedObservation = extractSerializedObservation(observation);
+                    JsonNode nodeSerObs = JacksonUtil.toJsonNode(serializedObservation);
+                    ((CompositeObservation)observation).getPaths().forEach(path -> {
+                        if (validateObserveResource(path, registrationId)) {
+                            String serializedObs = createSerializedSingleObservation(nodeSerObs, path.toString());
+                            SingleObservation singleObservation = createSingleObservation(registrationId, path, ct, ctx, serializedObs, getTokenGenerator());
+                            updateSingleObservation(registrationId, singleObservation, addIfAbsent, removed, connection);
+                                // cancel existing observations for the same path and registration id.
+                            cancelObservation (singleObservation, registrationId, removed, connection);
+                        }
+                    });
                 }
-
             } finally {
                 if (lock != null) {
                     lock.unlock();
@@ -485,7 +528,89 @@ public class TbLwM2mRedisRegistrationStore implements CaliforniumRegistrationSto
         return removed;
     }
 
+    private boolean validateObserveResource(LwM2mPath path, String registrationId){
+        // check if the resource is readable.
+        if (path.isResource() || path.isResourceInstance()) {
+            ObjectModel objectModel = modelProvider.getObjectModel(getRegistration(registrationId)).getObjectModel(path.getObjectId());
+            ResourceModel resourceModel = objectModel == null ? null : objectModel.resources.get(path.getResourceId());
+            if (resourceModel == null) {
+                return false;
+            } else if (!resourceModel.operations.isReadable()) {
+                return false;
+            } else if (path.isResourceInstance() && !resourceModel.multiple) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    private void updateSingleObservation (String registrationId, SingleObservation observation, boolean addIfAbsent,
+                                          List<Observation> removed, RedisConnection connection) {
+
+        // Add and Get previous observation
+        byte[] previousValue;
+        byte[] key = toKey(OBS_TKN, observation.getId().getBytes());
+        byte[] serializeObs = serializeObs(observation);
+        // we analyze the present previous value
+        SingleObservation existingObservation = null;
+
+        if (addIfAbsent){
+            previousValue = connection.stringCommands().get(key);
+            if (previousValue == null) {
+                existingObservation = validateByAbsorptionExistingObservations(observation, connection);
+                if (existingObservation == null){
+                    connection.stringCommands().set(key, serializeObs);
+                } else if(!existingObservation.getPath().equals(observation.getPath())) {
+                    connection.stringCommands().set(key, serializeObs);
+                    previousValue = serializeObs(existingObservation);
+                }
+            }
+        } else {
+            previousValue = connection.stringCommands().getSet(key, serializeObs);
+        }
+
+        // secondary index to get the list by registrationId
+        connection.listCommands().lPush(toKey(OBS_TKNS_REGID_IDX, registrationId), observation.getId().getBytes());
+
+        // log any collisions
+        if (addIfAbsent && previousValue != null) {
+            if (!existingObservation.getPath().equals(observation.getPath())) {
+                Observation previousObservation = deserializeObs(previousValue);
+                removed.add(previousObservation);
+                LOG.warn("Token collision ? observation [{}] will be replaced by observation [{}], that this observation  includes input observation [{}]!",
+                        previousObservation, observation, observation);
+            } else {
+                LOG.warn("Token collision ? existing observation [{}] includes input observation [{}]",
+                        existingObservation, observation);
+            }
+        }
+    }
+
+    @Override
+    public Collection<Observation> getObservations(String registrationId) {
+        try (var connection = connectionFactory.getConnection()) {
+            return getObservations(connection, registrationId);
+        }
+    }
+    @Override
+    public Observation getObservation(String registrationId, ObservationIdentifier observationId) {
+        return getObservations(registrationId).stream().filter(
+                o -> o.getId().getAsHexString().equals(observationId.getAsHexString())).findFirst().get();
+    }
+
     @Override
+    public Observation getObservation(ObservationIdentifier observationId) {
+        try (var connection = connectionFactory.getConnection()) {
+            byte[] observationValue = connection.get(toKey(OBS_TKN, observationId.getBytes()));
+            return deserializeObs(observationValue);
+        }
+    }
+
+    @Override
+    public Observation removeObservation(String registrationId, ObservationIdentifier observationId) {
+        return removeObservation(registrationId, observationId.getBytes());
+    }
+
     public Observation removeObservation(String registrationId, byte[] observationId) {
         try (var connection = connectionFactory.getConnection()) {
 
@@ -502,7 +627,7 @@ public class TbLwM2mRedisRegistrationStore implements CaliforniumRegistrationSto
                 lock = redisLock.obtain(lockKey);
                 lock.lock();
 
-                Observation observation = build(get(new Token(observationId)));
+                Observation observation = get(new Token(observationId));
                 if (observation != null && registrationId.equals(observation.getRegistrationId())) {
                     unsafeRemoveObservation(connection, registrationId, observationId);
                     return observation;
@@ -517,152 +642,62 @@ public class TbLwM2mRedisRegistrationStore implements CaliforniumRegistrationSto
         }
     }
 
-    @Override
-    public Observation getObservation(String registrationId, byte[] observationId) {
-        return build(get(new Token(observationId)));
-    }
-
-    @Override
-    public Collection<Observation> getObservations(String registrationId) {
-        try (var connection = connectionFactory.getConnection()) {
-            return getObservations(connection, registrationId);
-        }
-    }
 
     private Collection<Observation> getObservations(RedisConnection connection, String registrationId) {
         Collection<Observation> result = new ArrayList<>();
-        for (byte[] token : connection.lRange(toKey(OBS_TKNS_REGID_IDX, registrationId), 0, -1)) {
-            byte[] obs = connection.get(toKey(OBS_TKN, token));
+        for (byte[] token : connection.listCommands().lRange(toKey(OBS_TKNS_REGID_IDX, registrationId), 0, -1)) {
+            byte[] obs = connection.stringCommands().get(toKey(OBS_TKN, token));
             if (obs != null) {
-                result.add(build(deserializeObs(obs)));
+                result.add(deserializeObs(obs));
             }
         }
         return result;
     }
 
-    @Override
-    public Collection<Observation> removeObservations(String registrationId) {
-        try (var connection = connectionFactory.getConnection()) {
-            // check registration exists
-            Registration registration = getRegistration(connection, registrationId);
-            if (registration == null)
-                return Collections.emptyList();
-
-            // get endpoint and create lock
-            String endpoint = registration.getEndpoint();
-            Lock lock = null;
-            String lockKey = toLockKey(endpoint);
-            try {
-                lock = redisLock.obtain(lockKey);
-                lock.lock();
-                return unsafeRemoveAllObservations(connection, registrationId);
-            } finally {
-                if (lock != null) {
-                    lock.unlock();
-                }
+    private SingleObservation validateByAbsorptionExistingObservations(SingleObservation observation, RedisConnection connection) {
+        LwM2mPath pathObservation = observation.getPath();
+        AtomicReference<SingleObservation> result = new AtomicReference<>();
+        Collection<Observation> observations = getObservations(connection, observation.getRegistrationId());
+        observations.stream().forEach(obs -> {
+            LwM2mPath pathObs = ((SingleObservation)obs).getPath();
+            if ((!pathObservation.equals(pathObs) && pathObs.startWith(pathObservation)) ||        // pathObs = "3/0/9"-> pathObservation = "3"
+                    (pathObservation.equals(pathObs) && !observation.getId().equals(obs.getId()))) {
+                result.set((SingleObservation)obs);
+            } else if (!pathObservation.equals(pathObs) && pathObservation.startWith(pathObs)) {    // pathObs = "3" -> pathObservation = "3/0/9"
+                result.set(observation);
             }
-        }
-    }
+        });
+        return result.get();
 
-    /* *************** Californium ObservationStore API **************** */
 
-    @Override
-    public org.eclipse.californium.core.observe.Observation putIfAbsent(Token token,
-                                                                        org.eclipse.californium.core.observe.Observation obs) throws ObservationStoreException {
-        return add(obs, true);
     }
 
-    @Override
-    public org.eclipse.californium.core.observe.Observation put(Token token,
-                                                                org.eclipse.californium.core.observe.Observation obs) throws ObservationStoreException {
-        return add(obs, false);
-    }
-
-    private org.eclipse.californium.core.observe.Observation add(org.eclipse.californium.core.observe.Observation obs, boolean ifAbsent) throws ObservationStoreException {
-        String endpoint = ObserveUtil.validateCoapObservation(obs);
-        org.eclipse.californium.core.observe.Observation previousObservation = null;
-
-        try (var connection = connectionFactory.getConnection()) {
-            Lock lock = null;
-            String lockKey = toLockKey(endpoint);
-            try {
-                lock = redisLock.obtain(lockKey);
-                lock.lock();
-
-                String registrationId = ObserveUtil.extractRegistrationId(obs);
-                if (!connection.exists(toRegIdKey(registrationId)))
-                    throw new ObservationStoreException("no registration for this Id");
-                byte[] key = toKey(OBS_TKN, obs.getRequest().getToken().getBytes());
-                byte[] serializeObs = serializeObs(obs);
-                byte[] previousValue;
-                if (ifAbsent) {
-                    previousValue = connection.get(key);
-                    if (previousValue == null || previousValue.length == 0) {
-                        connection.set(key, serializeObs);
-                    } else {
-                        return deserializeObs(previousValue);
-                    }
-                } else {
-                    previousValue = connection.getSet(key, serializeObs);
-                }
-
-                // secondary index to get the list by registrationId
-                connection.lPush(toKey(OBS_TKNS_REGID_IDX, registrationId), obs.getRequest().getToken().getBytes());
-
-                // log any collisions
-                if (previousValue != null && previousValue.length != 0) {
-                    previousObservation = deserializeObs(previousValue);
-                    LOG.warn(
-                            "Token collision ? observation from request [{}] will be replaced by observation from request [{}] ",
-                            previousObservation.getRequest(), obs.getRequest());
-                }
-            } finally {
-                if (lock != null) {
-                    lock.unlock();
-                }
-            }
-        }
-        return previousObservation;
-    }
 
     @Override
-    public void remove(Token token) {
+    public Collection<Observation> removeObservations(String registrationId) {
         try (var connection = connectionFactory.getConnection()) {
-            byte[] tokenKey = toKey(OBS_TKN, token.getBytes());
-
-            // fetch the observation by token
-            byte[] serializedObs = connection.get(tokenKey);
-            if (serializedObs == null)
-                return;
-
-            org.eclipse.californium.core.observe.Observation obs = deserializeObs(serializedObs);
-            String registrationId = ObserveUtil.extractRegistrationId(obs);
+            // check registration exists
             Registration registration = getRegistration(connection, registrationId);
-            if (registration == null) {
-                LOG.warn("Unable to remove observation {}, registration {} does not exist anymore", obs.getRequest(),
-                        registrationId);
-                return;
-            }
+            if (registration == null)
+                return Collections.emptyList();
 
+            // get endpoint and create lock
             String endpoint = registration.getEndpoint();
             Lock lock = null;
             String lockKey = toLockKey(endpoint);
             try {
                 lock = redisLock.obtain(lockKey);
                 lock.lock();
-
-                unsafeRemoveObservation(connection, registrationId, token.getBytes());
+                return unsafeRemoveAllObservations(connection, registrationId);
             } finally {
                 if (lock != null) {
                     lock.unlock();
                 }
             }
         }
-
     }
 
-    @Override
-    public org.eclipse.californium.core.observe.Observation get(Token token) {
+    public Observation get(Token token) {
         try (var connection = connectionFactory.getConnection()) {
             byte[] obs = connection.get(toKey(OBS_TKN, token.getBytes()));
             if (obs == null) {
@@ -675,22 +710,16 @@ public class TbLwM2mRedisRegistrationStore implements CaliforniumRegistrationSto
 
     /* *************** Observation utility functions **************** */
 
-    private Registration getRegistration(RedisConnection connection, String registrationId) {
-        byte[] ep = connection.get(toRegIdKey(registrationId));
-        if (ep == null) {
-            return null;
-        }
-        byte[] data = connection.get(toEndpointKey(ep));
-        if (data == null) {
-            return null;
+    private TokenGenerator getTokenGenerator(){
+        if (this.tokenGenerator == null) {
+            this.tokenGenerator = new RandomTokenGenerator(config.getCoapConfig());
         }
-
-        return deserializeReg(data);
+        return this.tokenGenerator;
     }
 
     private void unsafeRemoveObservation(RedisConnection connection, String registrationId, byte[] observationId) {
-        if (connection.del(toKey(OBS_TKN, observationId)) > 0L) {
-            connection.lRem(toKey(OBS_TKNS_REGID_IDX, registrationId), 0, observationId);
+        if (connection.commands().del(toKey(OBS_TKN, observationId)) > 0L) {
+            connection.listCommands().lRem(toKey(OBS_TKNS_REGID_IDX, registrationId), 0, observationId);
         }
     }
 
@@ -702,7 +731,7 @@ public class TbLwM2mRedisRegistrationStore implements CaliforniumRegistrationSto
         for (byte[] token : connection.lRange(regIdKey, 0, -1)) {
             byte[] obs = connection.get(toKey(OBS_TKN, token));
             if (obs != null) {
-                removed.add(build(deserializeObs(obs)));
+                removed.add(deserializeObs(obs));
             }
             connection.del(toKey(OBS_TKN, token));
         }
@@ -711,24 +740,30 @@ public class TbLwM2mRedisRegistrationStore implements CaliforniumRegistrationSto
         return removed;
     }
 
-    @Override
-    public void setContext(Token token, EndpointContext correlationContext) {
-        // In Leshan we always set context when we send the request, so this should not be needed to implement this.
+    private byte[] serializeObs(Observation obs) {
+        return observationSerDes.serialize(obs);
     }
 
-    private byte[] serializeObs(org.eclipse.californium.core.observe.Observation obs) {
-        return ObservationSerDes.serialize(obs);
+    private void cancelObservation(Observation observation, String registrationId, List<Observation> removed, RedisConnection connection) {
+        for (Observation obs : getObservations(connection, registrationId)) {
+            cancelExistingObservation(connection, observation, obs, removed);
+        }
     }
 
-    private org.eclipse.californium.core.observe.Observation deserializeObs(byte[] data) {
-        return ObservationSerDes.deserialize(data);
+    private void cancelExistingObservation(RedisConnection connection, Observation observation, Observation obs, List<Observation> removed) {
+        LwM2mPath pathObservation = ((SingleObservation)observation).getPath();
+        LwM2mPath pathObs = ((SingleObservation)obs).getPath();
+        if ((!pathObservation.equals(pathObs) && pathObs.startWith(pathObservation)) ||        // pathObservation = "3", pathObs = "3/0/9"
+                (pathObservation.equals(pathObs) && !observation.getId().equals(obs.getId()))) {
+            unsafeRemoveObservation(connection, obs.getRegistrationId(), obs.getId().getBytes());
+            removed.add(obs);
+        } else if (!pathObservation.equals(pathObs) && pathObservation.startWith(pathObs)) {    // pathObservation = "3/0/9", pathObs = "3"
+            unsafeRemoveObservation(connection, obs.getRegistrationId(), observation.getId().getBytes());
+        }
     }
 
-    private Observation build(org.eclipse.californium.core.observe.Observation cfObs) {
-        if (cfObs == null)
-            return null;
-
-        return ObserveUtil.createLwM2mObservation(cfObs.getRequest());
+    private Observation deserializeObs(byte[] data) {
+        return data == null ? null : observationSerDes.deserialize(data);
     }
 
     /* *************** Expiration handling **************** */
@@ -799,7 +834,6 @@ public class TbLwM2mRedisRegistrationStore implements CaliforniumRegistrationSto
         expirationListener = listener;
     }
 
-    @Override
     public void setExecutor(ScheduledExecutorService executor) {
         // TODO should we reuse californium executor ?
     }
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 e97b36a617..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,29 +15,35 @@
  */
 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.nustaq.serialization.FSTConfiguration;
+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#";
     private static final String PSKID_SEC = "PSKID#SEC";
 
     private final RedisConnectionFactory connectionFactory;
-    private final FSTConfiguration serializer;
     private final RedisLockRegistry redisLock;
 
     public TbLwM2mRedisSecurityStore(RedisConnectionFactory connectionFactory) {
         this.connectionFactory = connectionFactory;
         redisLock = new RedisLockRegistry(connectionFactory, "Security");
-        serializer = FSTConfiguration.createDefaultConfiguration();
     }
 
     @Override
@@ -50,12 +56,31 @@ public class TbLwM2mRedisSecurityStore implements TbEditableSecurityStore {
             if (data == null || data.length == 0) {
                 return null;
             } else {
-                if (SecurityMode.NO_SEC.equals(((TbLwM2MSecurityInfo) serializer.asObject(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) serializer.asObject(data)).getSecurityInfo();
+                } else {
+
+                    // 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 {
@@ -79,7 +104,7 @@ public class TbLwM2mRedisSecurityStore implements TbEditableSecurityStore {
                 if (data == null || data.length == 0) {
                     return null;
                 } else {
-                    return ((TbLwM2MSecurityInfo) serializer.asObject(data)).getSecurityInfo();
+                    return ((TbLwM2MSecurityInfo) JavaSerDesUtil.decode(data)).getSecurityInfo();
                 }
             }
         } finally {
@@ -89,29 +114,39 @@ public class TbLwM2mRedisSecurityStore implements TbEditableSecurityStore {
         }
     }
 
+    @Override
+    public SecurityInfo getByOscoreIdentity(OscoreIdentity oscoreIdentity) {
+        return null;
+    }
+
     @Override
     public void put(TbLwM2MSecurityInfo tbSecurityInfo) throws NonUniqueSecurityInfoException {
         SecurityInfo info = tbSecurityInfo.getSecurityInfo();
-        byte[] tbSecurityInfoSerialized = serializer.asByteArray(tbSecurityInfo);
+        byte[] tbSecurityInfoSerialized = JavaSerDesUtil.encode(tbSecurityInfo);
         Lock lock = null;
         try (var connection = connectionFactory.getConnection()) {
             lock = redisLock.obtain(tbSecurityInfo.getEndpoint());
             lock.lock();
-            if (info != null && info.getIdentity() != null) {
-                byte[] oldEndpointBytes = connection.hGet(PSKID_SEC.getBytes(), info.getIdentity().getBytes());
+            if (info != null && info.getPskIdentity() != null) {
+                byte[] oldEndpointBytes = connection.hGet(PSKID_SEC.getBytes(), info.getPskIdentity().getBytes());
                 if (oldEndpointBytes != null) {
                     String oldEndpoint = new String(oldEndpointBytes);
                     if (!oldEndpoint.equals(info.getEndpoint())) {
-                        throw new NonUniqueSecurityInfoException("PSK Identity " + info.getIdentity() + " is already used");
+                        throw new NonUniqueSecurityInfoException("PSK Identity " + info.getPskIdentity() + " is already used");
                     }
-                    connection.hSet(PSKID_SEC.getBytes(), info.getIdentity().getBytes(), info.getEndpoint().getBytes());
+                    connection.hSet(PSKID_SEC.getBytes(), info.getPskIdentity().getBytes(), info.getEndpoint().getBytes());
                 }
             }
 
             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) serializer.asObject(previousData)).getSecurityInfo().getIdentity();
-                if (previousIdentity != null && !previousIdentity.equals(info.getIdentity())) {
+                String previousIdentity = ((TbLwM2MSecurityInfo) JavaSerDesUtil.decode(previousData)).getSecurityInfo().getPskIdentity();
+                if (previousIdentity != null && !previousIdentity.equals(info.getPskIdentity())) {
                     connection.hDel(PSKID_SEC.getBytes(), previousIdentity.getBytes());
                 }
             }
@@ -130,7 +165,7 @@ public class TbLwM2mRedisSecurityStore implements TbEditableSecurityStore {
             lock.lock();
             byte[] data = connection.get((SEC_EP + endpoint).getBytes());
             if (data != null && data.length > 0) {
-                return (TbLwM2MSecurityInfo) serializer.asObject(data);
+                return JavaSerDesUtil.decode(data);
             } else {
                 return null;
             }
@@ -149,9 +184,9 @@ public class TbLwM2mRedisSecurityStore implements TbEditableSecurityStore {
             lock.lock();
             byte[] data = connection.get((SEC_EP + endpoint).getBytes());
             if (data != null && data.length > 0) {
-                SecurityInfo info = ((TbLwM2MSecurityInfo) serializer.asObject(data)).getSecurityInfo();
-                if (info != null && info.getIdentity() != null) {
-                    connection.hDel(PSKID_SEC.getBytes(), info.getIdentity().getBytes());
+                SecurityInfo info = ((TbLwM2MSecurityInfo) JavaSerDesUtil.decode(data)).getSecurityInfo();
+                if (info != null && info.getPskIdentity() != null) {
+                    connection.hDel(PSKID_SEC.getBytes(), info.getPskIdentity().getBytes());
                 }
                 connection.del((SEC_EP + endpoint).getBytes());
             }
@@ -165,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/TbLwM2mSecurityStore.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbLwM2mSecurityStore.java
index 5b14332f1e..7976582785 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbLwM2mSecurityStore.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbLwM2mSecurityStore.java
@@ -17,6 +17,7 @@ package org.thingsboard.server.transport.lwm2m.server.store;
 
 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.thingsboard.server.transport.lwm2m.secure.LwM2mCredentialsSecurityInfoValidator;
@@ -60,7 +61,7 @@ public class TbLwM2mSecurityStore implements TbMainSecurityStore {
         if (securityInfo == null) {
             securityInfo = fetchAndPutSecurityInfo(endpoint);
         } else if (securityInfo.usePSK() && securityInfo.getEndpoint().equals(SecurityMode.NO_SEC.toString())
-                && securityInfo.getIdentity().equals(SecurityMode.NO_SEC.toString())
+                && securityInfo.getPskIdentity().equals(SecurityMode.NO_SEC.toString())
                 && Arrays.equals(SecurityMode.NO_SEC.toString().getBytes(), securityInfo.getPreSharedKey())) {
             return null;
         }
@@ -81,6 +82,11 @@ public class TbLwM2mSecurityStore implements TbMainSecurityStore {
         return securityInfo;
     }
 
+    @Override
+    public SecurityInfo getByOscoreIdentity(OscoreIdentity oscoreIdentity) {
+        return null;
+    }
+
     public SecurityInfo fetchAndPutSecurityInfo(String credentialsId) {
         TbLwM2MSecurityInfo securityInfo = validator.getEndpointSecurityInfoByCredentialsId(credentialsId, CLIENT);
         doPut(securityInfo);
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbLwM2mStoreFactory.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbLwM2mStoreFactory.java
index 188d78ee05..77755abb33 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbLwM2mStoreFactory.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbLwM2mStoreFactory.java
@@ -16,8 +16,8 @@
 package org.thingsboard.server.transport.lwm2m.server.store;
 
 import lombok.RequiredArgsConstructor;
-import org.eclipse.leshan.server.californium.registration.CaliforniumRegistrationStore;
-import org.eclipse.leshan.server.californium.registration.InMemoryRegistrationStore;
+import lombok.extern.slf4j.Slf4j;
+import org.eclipse.leshan.server.registration.RegistrationStore;
 import org.springframework.context.annotation.Bean;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.stereotype.Component;
@@ -25,9 +25,11 @@ import org.thingsboard.server.cache.TBRedisCacheConfiguration;
 import org.thingsboard.server.queue.util.TbLwM2mTransportComponent;
 import org.thingsboard.server.transport.lwm2m.config.LwM2MTransportServerConfig;
 import org.thingsboard.server.transport.lwm2m.secure.LwM2mCredentialsSecurityInfoValidator;
+import org.thingsboard.server.transport.lwm2m.server.LwM2mVersionedModelProvider;
 
 import java.util.Optional;
 
+@Slf4j
 @Component
 @TbLwM2mTransportComponent
 @RequiredArgsConstructor
@@ -36,11 +38,13 @@ public class TbLwM2mStoreFactory {
     private final Optional<TBRedisCacheConfiguration> redisConfiguration;
     private final LwM2MTransportServerConfig config;
     private final LwM2mCredentialsSecurityInfoValidator validator;
+    private final LwM2mVersionedModelProvider modelProvider;
 
     @Bean
-    private CaliforniumRegistrationStore registrationStore() {
+    private RegistrationStore registrationStore() {
         return redisConfiguration.isPresent() ?
-                new TbLwM2mRedisRegistrationStore(getConnectionFactory()) : new InMemoryRegistrationStore(config.getCleanPeriodInSec());
+                new TbLwM2mRedisRegistrationStore(config, getConnectionFactory(), modelProvider) :
+                new TbInMemoryRegistrationStore(config, config.getCleanPeriodInSec(), modelProvider);
     }
 
     @Bean
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 b62dae0efa..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,9 +15,12 @@
  */
 package org.thingsboard.server.transport.lwm2m.server.store.util;
 
-import com.eclipsesource.json.Json;
-import com.eclipsesource.json.JsonObject;
-import com.eclipsesource.json.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;
@@ -36,103 +39,116 @@ 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 = Json.object();
-        o.add("nodeId", client.getNodeId());
-        o.add("endpoint", client.getEndpoint());
+        JsonObject o =  new JsonObject();
+        o.addProperty("nodeId", client.getNodeId());
+        o.addProperty("endpoint", client.getEndpoint());
 
-        JsonObject resources = Json.object();
+        JsonObject resources = new JsonObject();
         client.getResources().forEach((k, v) -> {
-            JsonObject resourceValue = Json.object();
+            JsonObject resourceValue = new JsonObject();
             resourceValue.add("lwM2mResource", serialize(v.getLwM2mResource()));
             resourceValue.add("resourceModel", serialize(v.getResourceModel()));
             resources.add(k, resourceValue);
         });
         o.add("resources", resources);
-        JsonObject sharedAttributes = Json.object();
+        JsonObject sharedAttributes = new JsonObject();
 
         for (Map.Entry<String, TransportProtos.TsKvProto> entry : client.getSharedAttributes().entrySet()) {
-            sharedAttributes.add(entry.getKey(), JsonFormat.printer().print(entry.getValue()));
+            sharedAttributes.addProperty(entry.getKey(), JsonFormat.printer().print(entry.getValue()));
         }
 
         o.add("sharedAttributes", sharedAttributes);
-        JsonObject keyTsLatestMap = Json.object();
+        JsonObject keyTsLatestMap = new JsonObject();
         client.getKeyTsLatestMap().forEach((k, v) -> {
-            keyTsLatestMap.add(k, v.get());
+            keyTsLatestMap.addProperty(k, v.get());
         });
         o.add("keyTsLatestMap", keyTsLatestMap);
 
-        o.add("state", client.getState().toString());
+        o.addProperty("state", client.getState().toString());
 
         if (client.getSession() != null) {
-            o.add("session", JsonFormat.printer().print(client.getSession()));
+            o.addProperty("session", JsonFormat.printer().print(client.getSession()));
         }
         if (client.getTenantId() != null) {
-            o.add("tenantId", client.getTenantId().toString());
+            o.addProperty("tenantId", client.getTenantId().toString());
         }
         if (client.getDeviceId() != null) {
-            o.add("deviceId", client.getDeviceId().toString());
+            o.addProperty("deviceId", client.getDeviceId().toString());
         }
         if (client.getProfileId() != null) {
-            o.add("profileId", client.getProfileId().toString());
+            o.addProperty("profileId", client.getProfileId().toString());
         }
         if (client.getPowerMode() != null) {
-            o.add("powerMode", client.getPowerMode().toString());
+            o.addProperty("powerMode", client.getPowerMode().toString());
         }
         if (client.getEdrxCycle() != null) {
-            o.add("edrxCycle", client.getEdrxCycle());
+            o.addProperty("edrxCycle", client.getEdrxCycle());
         }
         if (client.getPsmActivityTimer() != null) {
-            o.add("psmActivityTimer", client.getPsmActivityTimer());
+            o.addProperty("psmActivityTimer", client.getPsmActivityTimer());
         }
         if (client.getPagingTransmissionWindow() != null) {
-            o.add("pagingTransmissionWindow", client.getPagingTransmissionWindow());
+            o.addProperty("pagingTransmissionWindow", client.getPagingTransmissionWindow());
         }
         if (client.getRegistration() != null) {
-            o.add("registration", RegistrationSerDes.jSerialize(client.getRegistration()));
+            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.add("asleep", client.isAsleep());
-        o.add("lastUplinkTime", client.getLastUplinkTime());
+        o.addProperty("asleep", client.isAsleep());
+        o.addProperty("lastUplinkTime", client.getLastUplinkTime());
 
         Field firstEdrxDownlink = LwM2mClient.class.getDeclaredField("firstEdrxDownlink");
         firstEdrxDownlink.setAccessible(true);
-        o.add("firstEdrxDownlink", (boolean) firstEdrxDownlink.get(client));
-        o.add("retryAttempts", client.getRetryAttempts().get());
+        o.addProperty("firstEdrxDownlink", (boolean) firstEdrxDownlink.get(client));
+        o.addProperty("retryAttempts", client.getRetryAttempts().get());
 
         if (client.getLastSentRpcId() != null) {
-            o.add("lastSentRpcId", client.getLastSentRpcId().toString());
+            o.addProperty("lastSentRpcId", client.getLastSentRpcId().toString());
         }
 
         return o.toString().getBytes();
     }
 
     private static JsonObject serialize(LwM2mResource resource) {
-        JsonObject o = Json.object();
-        o.add("id", resource.getId());
-        o.add("type", resource.getType().toString());
+        JsonObject o = new JsonObject();
+        o.addProperty("id", resource.getId());
+        o.addProperty("type", resource.getType().toString());
         if (resource.isMultiInstances()) {
-            o.add("multiInstances", true);
-            JsonObject instances = Json.object();
+            o.addProperty("multiInstances", true);
+            JsonObject instances = new JsonObject();
             resource.getInstances().forEach((id, in) -> {
-                JsonObject instance = Json.object();
-                instance.add("id", in.getId());
+                JsonObject instance = new JsonObject();
+                instance.addProperty("id", in.getId());
                 addValue(instance, in.getType(), in.getValue());
                 instances.add(id.toString(), instance);
             });
             o.add("instances", instances);
         } else {
-            o.add("multiInstances", false);
+            o.addProperty("multiInstances", false);
             addValue(o, resource.getType(), resource.getValue());
         }
 
@@ -140,95 +156,97 @@ public class LwM2MClientSerDes {
     }
 
     private static LwM2mResource parseLwM2mResource(JsonObject o) {
-        boolean multiInstances = o.get("multiInstances").asBoolean();
-        int id = o.get("id").asInt();
-        ResourceModel.Type type = ResourceModel.Type.valueOf(o.get("type").asString());
+        boolean multiInstances = o.get("multiInstances").getAsBoolean();
+        int id = o.get("id").getAsInt();
+        ResourceModel.Type type = ResourceModel.Type.valueOf(o.get("type").getAsString());
         if (multiInstances) {
             Map<Integer, Object> instances = new HashMap<>();
-            o.get("instances").asObject().forEach(entry -> {
-                instances.put(Integer.valueOf(entry.getName()), 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, 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.asLong();
+                return value.getAsInt();
             case FLOAT:
-                return value.asDouble();
+                return value.getAsDouble();
             case BOOLEAN:
-                return value.asBoolean();
+                return value.getAsBoolean();
             case OPAQUE:
-                return Base64.getDecoder().decode(value.asString());
+                return Base64.getDecoder().decode(value.getAsString());
             case STRING:
-                return value.asString();
+                return value.getAsString();
             case TIME:
-                return new Date(value.asLong());
+                return Instant.ofEpochMilli(value.getAsLong());
             case OBJLNK:
-                return ObjectLink.decodeFromString(value.asString());
+                return ObjectLink.decodeFromString(value.getAsString());
             case UNSIGNED_INTEGER:
-                return ULong.valueOf(value.asString());
+                return ULong.valueOf(value.getAsString());
             default:
                 throw new LwM2mNodeException(String.format("Type %s is not supported", type.name()));
         }
     }
 
     private static JsonObject serialize(ResourceModel resourceModel) {
-        JsonObject o = Json.object();
-        o.add("id", resourceModel.id);
-        o.add("name", resourceModel.name);
-        o.add("operations", resourceModel.operations.toString());
-        o.add("multiple", resourceModel.multiple);
-        o.add("mandatory", resourceModel.mandatory);
-        o.add("type", resourceModel.type.toString());
-        o.add("rangeEnumeration", resourceModel.rangeEnumeration);
-        o.add("units", resourceModel.units);
-        o.add("description", resourceModel.description);
+        JsonObject o = new JsonObject();
+        o.addProperty("id", resourceModel.id);
+        o.addProperty("name", resourceModel.name);
+        o.addProperty("operations", resourceModel.operations.toString());
+        o.addProperty("multiple", resourceModel.multiple);
+        o.addProperty("mandatory", resourceModel.mandatory);
+        o.addProperty("type", resourceModel.type.toString());
+        o.addProperty("rangeEnumeration", resourceModel.rangeEnumeration);
+        o.addProperty("units", resourceModel.units);
+        o.addProperty("description", resourceModel.description);
         return o;
     }
 
     private static ResourceModel parseResourceModel(JsonObject o) {
-        Integer id = o.get("id").asInt();
-        String name = o.get("name").asString();
-        ResourceModel.Operations operations = ResourceModel.Operations.valueOf(o.get("operations").asString());
-        Boolean multiple = o.get("multiple").asBoolean();
-        Boolean mandatory = o.get("mandatory").asBoolean();
-        ResourceModel.Type type = ResourceModel.Type.valueOf(o.get("type").asString());
-        String rangeEnumeration = o.get("rangeEnumeration").asString();
-        String units = o.get("units").asString();
-        String description = o.get("description").asString();
+        Integer id = o.get("id").getAsInt();
+        String name = o.get("name").getAsString();
+        ResourceModel.Operations operations = ResourceModel.Operations.valueOf(o.get("operations").getAsString());
+        Boolean multiple = o.get("multiple").getAsBoolean();
+        Boolean mandatory = o.get("mandatory").getAsBoolean();
+        ResourceModel.Type type = ResourceModel.Type.valueOf(o.get("type").getAsString());
+        String rangeEnumeration = o.get("rangeEnumeration").getAsString();
+        String units = o.get("units").getAsString();
+        String description = o.get("description").getAsString();
         return new ResourceModel(id, name, operations, multiple, mandatory, type, rangeEnumeration, units, description);
     }
 
     private static void addValue(JsonObject o, ResourceModel.Type type, Object value) {
         switch (type) {
             case INTEGER:
-                o.add(VALUE, (Long) value);
+                o.addProperty(VALUE, (Long) value);
                 break;
             case FLOAT:
-                o.add(VALUE, (Double) value);
+                o.addProperty(VALUE, (Double) value);
                 break;
             case BOOLEAN:
-                o.add(VALUE, (Boolean) value);
+                o.addProperty(VALUE, (Boolean) value);
                 break;
             case OPAQUE:
-                o.add(VALUE, Base64.getEncoder().encodeToString((byte[]) value));
+                o.addProperty(VALUE, Base64.getEncoder().encodeToString((byte[]) value));
                 break;
             case STRING:
-                o.add(VALUE, (String) value);
+                o.addProperty(VALUE, String.valueOf(value));
                 break;
             case TIME:
-                o.add(VALUE, ((Date) value).getTime());
+                o.addProperty(VALUE, ((Date) value).getTime());
                 break;
             case OBJLNK:
-                o.add(VALUE, ((ObjectLink) value).encodeToString());
+                o.addProperty(VALUE, ((ObjectLink) value).encodeToString());
                 break;
             case UNSIGNED_INTEGER:
-                o.add(VALUE, value.toString());
+                o.addProperty(VALUE, Integer.toUnsignedString((int)value));
                 break;
             default:
                 throw new LwM2mNodeException(String.format("Type %s is not supported", type.name()));
@@ -237,110 +255,110 @@ public class LwM2MClientSerDes {
 
     @SneakyThrows
     public static LwM2mClient deserialize(byte[] data) {
-        JsonObject o = Json.parse(new String(data)).asObject();
-        LwM2mClient lwM2mClient = new LwM2mClient(o.get("nodeId").asString(), o.get("endpoint").asString());
+        JsonObject o = JsonParser.parseString(new String(data)).getAsJsonObject();
+        LwM2mClient lwM2mClient = new LwM2mClient(o.get("nodeId").getAsString(), o.get("endpoint").getAsString());
 
-        o.get("resources").asObject().forEach(entry -> {
-            JsonObject resource = entry.getValue().asObject();
-            LwM2mResource lwM2mResource = parseLwM2mResource(resource.get("lwM2mResource").asObject());
-            ResourceModel resourceModel = parseResourceModel(resource.get("resourceModel").asObject());
+        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(entry.getName(), resourceValue);
+            lwM2mClient.getResources().put(String.valueOf(lwM2mResource.getId()), resourceValue);
         });
 
-        for (JsonObject.Member entry : o.get("sharedAttributes").asObject()) {
+        for (Entry<String, JsonElement> entry : o.get("sharedAttributes").getAsJsonObject().entrySet()) {
             TransportProtos.TsKvProto.Builder builder = TransportProtos.TsKvProto.newBuilder();
-            JsonFormat.parser().merge(entry.getValue().asString(), builder);
-            lwM2mClient.getSharedAttributes().put(entry.getName(), builder.build());
+            JsonFormat.parser().merge(entry.getValue().getAsString(), builder);
+            lwM2mClient.getSharedAttributes().put(entry.getKey(), builder.build());
         }
 
-        o.get("keyTsLatestMap").asObject().forEach(entry -> {
-            lwM2mClient.getKeyTsLatestMap().put(entry.getName(), new AtomicLong(entry.getValue().asLong()));
+        o.get("keyTsLatestMap").getAsJsonObject().entrySet().forEach(entry -> {
+            lwM2mClient.getKeyTsLatestMap().put(entry.getKey(), new AtomicLong(entry.getValue().getAsLong()));
         });
 
-        lwM2mClient.setState(LwM2MClientState.valueOf(o.get("state").asString()));
+        lwM2mClient.setState(LwM2MClientState.valueOf(o.get("state").getAsString()));
 
         Class<LwM2mClient> lwM2mClientClass = LwM2mClient.class;
 
-        JsonValue session = o.get("session");
+        JsonElement session = o.get("session");
         if (session != null) {
             TransportProtos.SessionInfoProto.Builder builder = TransportProtos.SessionInfoProto.newBuilder();
-            JsonFormat.parser().merge(session.asString(), builder);
+            JsonFormat.parser().merge(session.getAsString(), builder);
 
             Field sessionField = lwM2mClientClass.getDeclaredField("session");
             sessionField.setAccessible(true);
             sessionField.set(lwM2mClient, builder.build());
         }
 
-        JsonValue tenantId = o.get("tenantId");
+        JsonElement tenantId = o.get("tenantId");
         if (tenantId != null) {
             Field tenantIdField = lwM2mClientClass.getDeclaredField("tenantId");
             tenantIdField.setAccessible(true);
-            tenantIdField.set(lwM2mClient, new TenantId(UUID.fromString(tenantId.asString())));
+            tenantIdField.set(lwM2mClient, new TenantId(UUID.fromString(tenantId.getAsString())));
         }
 
-        JsonValue deviceId = o.get("deviceId");
+        JsonElement deviceId = o.get("deviceId");
         if (tenantId != null) {
             Field deviceIdField = lwM2mClientClass.getDeclaredField("deviceId");
             deviceIdField.setAccessible(true);
-            deviceIdField.set(lwM2mClient, UUID.fromString(deviceId.asString()));
+            deviceIdField.set(lwM2mClient, UUID.fromString(deviceId.getAsString()));
         }
 
-        JsonValue profileId = o.get("profileId");
+        JsonElement profileId = o.get("profileId");
         if (tenantId != null) {
             Field profileIdField = lwM2mClientClass.getDeclaredField("profileId");
             profileIdField.setAccessible(true);
-            profileIdField.set(lwM2mClient, UUID.fromString(profileId.asString()));
+            profileIdField.set(lwM2mClient, UUID.fromString(profileId.getAsString()));
         }
 
-        JsonValue powerMode = o.get("powerMode");
+        JsonElement powerMode = o.get("powerMode");
         if (powerMode != null) {
             Field powerModeField = lwM2mClientClass.getDeclaredField("powerMode");
             powerModeField.setAccessible(true);
-            powerModeField.set(lwM2mClient, PowerMode.valueOf(powerMode.asString()));
+            powerModeField.set(lwM2mClient, PowerMode.valueOf(powerMode.getAsString()));
         }
 
-        JsonValue edrxCycle = o.get("edrxCycle");
+        JsonElement edrxCycle = o.get("edrxCycle");
         if (edrxCycle != null) {
             Field edrxCycleField = lwM2mClientClass.getDeclaredField("edrxCycle");
             edrxCycleField.setAccessible(true);
-            edrxCycleField.set(lwM2mClient, edrxCycle.asLong());
+            edrxCycleField.set(lwM2mClient, edrxCycle.getAsLong());
         }
 
-        JsonValue psmActivityTimer = o.get("psmActivityTimer");
+        JsonElement psmActivityTimer = o.get("psmActivityTimer");
         if (psmActivityTimer != null) {
             Field psmActivityTimerField = lwM2mClientClass.getDeclaredField("psmActivityTimer");
             psmActivityTimerField.setAccessible(true);
-            psmActivityTimerField.set(lwM2mClient, psmActivityTimer.asLong());
+            psmActivityTimerField.set(lwM2mClient, psmActivityTimer.getAsLong());
         }
 
-        JsonValue pagingTransmissionWindow = o.get("pagingTransmissionWindow");
+        JsonElement pagingTransmissionWindow = o.get("pagingTransmissionWindow");
         if (pagingTransmissionWindow != null) {
             Field pagingTransmissionWindowField = lwM2mClientClass.getDeclaredField("pagingTransmissionWindow");
             pagingTransmissionWindowField.setAccessible(true);
-            pagingTransmissionWindowField.set(lwM2mClient, pagingTransmissionWindow.asLong());
+            pagingTransmissionWindowField.set(lwM2mClient, pagingTransmissionWindow.getAsLong());
         }
 
-        JsonValue registration = o.get("registration");
+        JsonElement registration = o.get("registration");
         if (registration != null) {
-            lwM2mClient.setRegistration(RegistrationSerDes.deserialize(registration.asObject()));
+            lwM2mClient.setRegistration(registrationSerDes.deserialize(toJsonNode(registration.getAsString())));
         }
 
-        lwM2mClient.setAsleep(o.get("asleep").asBoolean());
+        lwM2mClient.setAsleep(o.get("asleep").getAsBoolean());
 
         Field lastUplinkTimeField = lwM2mClientClass.getDeclaredField("lastUplinkTime");
         lastUplinkTimeField.setAccessible(true);
-        lastUplinkTimeField.setLong(lwM2mClient, o.get("lastUplinkTime").asLong());
+        lastUplinkTimeField.setLong(lwM2mClient, o.get("lastUplinkTime").getAsLong());
 
         Field firstEdrxDownlinkField = lwM2mClientClass.getDeclaredField("firstEdrxDownlink");
         firstEdrxDownlinkField.setAccessible(true);
-        firstEdrxDownlinkField.setBoolean(lwM2mClient, o.get("firstEdrxDownlink").asBoolean());
+        firstEdrxDownlinkField.setBoolean(lwM2mClient, o.get("firstEdrxDownlink").getAsBoolean());
 
-        lwM2mClient.getRetryAttempts().set(o.get("retryAttempts").asInt());
+        lwM2mClient.getRetryAttempts().set(o.get("retryAttempts").getAsInt());
 
-        JsonValue lastSentRpcId = o.get("lastSentRpcId");
+        JsonElement lastSentRpcId = o.get("lastSentRpcId");
         if (lastSentRpcId != null) {
-            lwM2mClient.setLastSentRpcId(UUID.fromString(lastSentRpcId.asString()));
+            lwM2mClient.setLastSentRpcId(UUID.fromString(lastSentRpcId.getAsString()));
         }
 
         return lwM2mClient;
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/util/LwM2MIdentitySerDes.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/util/LwM2MIdentitySerDes.java
deleted file mode 100644
index 4ffbfd82bb..0000000000
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/util/LwM2MIdentitySerDes.java
+++ /dev/null
@@ -1,63 +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.server.store.util;
-
-import com.eclipsesource.json.Json;
-import com.eclipsesource.json.JsonObject;
-import org.apache.commons.lang3.NotImplementedException;
-import org.eclipse.leshan.core.request.Identity;
-import org.eclipse.leshan.core.util.Hex;
-
-import java.security.PublicKey;
-
-public class LwM2MIdentitySerDes {
-
-    private static final String KEY_ADDRESS = "address";
-    private static final String KEY_PORT = "port";
-    private static final String KEY_ID = "id";
-    private static final String KEY_CN = "cn";
-    private static final String KEY_RPK = "rpk";
-    protected static final String KEY_LWM2MIDENTITY_TYPE = "type";
-    protected static final String LWM2MIDENTITY_TYPE_UNSECURE = "unsecure";
-    protected static final String LWM2MIDENTITY_TYPE_PSK = "psk";
-    protected static final String LWM2MIDENTITY_TYPE_X509 = "x509";
-    protected static final String LWM2MIDENTITY_TYPE_RPK = "rpk";
-
-    public static JsonObject serialize(Identity identity) {
-        JsonObject o = Json.object();
-
-        if (identity.isPSK()) {
-            o.set(KEY_LWM2MIDENTITY_TYPE, LWM2MIDENTITY_TYPE_PSK);
-            o.set(KEY_ID, identity.getPskIdentity());
-        } else if (identity.isRPK()) {
-            o.set(KEY_LWM2MIDENTITY_TYPE, LWM2MIDENTITY_TYPE_RPK);
-            PublicKey publicKey = identity.getRawPublicKey();
-            o.set(KEY_RPK, Hex.encodeHexString(publicKey.getEncoded()));
-        } else if (identity.isX509()) {
-            o.set(KEY_LWM2MIDENTITY_TYPE, LWM2MIDENTITY_TYPE_X509);
-            o.set(KEY_CN, identity.getX509CommonName());
-        } else {
-            o.set(KEY_LWM2MIDENTITY_TYPE, LWM2MIDENTITY_TYPE_UNSECURE);
-            o.set(KEY_ADDRESS, identity.getPeerAddress().getHostString());
-            o.set(KEY_PORT, identity.getPeerAddress().getPort());
-        }
-        return o;
-    }
-
-    public static Identity deserialize(JsonObject peer) {
-        throw new NotImplementedException();
-    }
-}
\ No newline at end of file
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/uplink/DefaultLwM2mUplinkMsgHandler.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/uplink/DefaultLwM2mUplinkMsgHandler.java
index 69064d5ff8..fc95bb3728 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/uplink/DefaultLwM2mUplinkMsgHandler.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/uplink/DefaultLwM2mUplinkMsgHandler.java
@@ -20,6 +20,8 @@ import com.google.gson.GsonBuilder;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.reflect.TypeToken;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -100,8 +102,6 @@ import org.thingsboard.server.transport.lwm2m.server.store.TbLwM2mSecurityStore;
 import org.thingsboard.server.transport.lwm2m.utils.LwM2MTransportUtil;
 import org.thingsboard.server.transport.lwm2m.utils.LwM2mValueConverterImpl;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -341,6 +341,8 @@ public class DefaultLwM2mUplinkMsgHandler extends LwM2MExecutorAwareService impl
                     } else if (v instanceof LwM2mResource) {
                         this.updateResourcesValue(lwM2MClient, (LwM2mResource) v, k.toString(), Mode.UPDATE, responseCode);
                     }
+                } else {
+                    this.onErrorObservation(registration, k + ": value in composite response is null");
                 }
             });
             clientContext.update(lwM2MClient);
@@ -348,6 +350,12 @@ public class DefaultLwM2mUplinkMsgHandler extends LwM2MExecutorAwareService impl
         }
     }
 
+    public void onErrorObservation(Registration registration, String errorMsg) {
+        LwM2mClient lwM2MClient = this.clientContext.getClientByEndpoint(registration.getEndpoint());
+        logService.log(lwM2MClient, LOG_LWM2M_ERROR + ": " + errorMsg);
+    }
+
+
     /**
      * Sending updated value to thingsboard from SendListener.dataReceived: object, instance, SingleResource or MultipleResource
      *
@@ -356,7 +364,7 @@ public class DefaultLwM2mUplinkMsgHandler extends LwM2MExecutorAwareService impl
      */
     @Override
     public void onUpdateValueWithSendRequest(Registration registration, SendRequest sendRequest) {
-        for(var entry : sendRequest.getNodes().entrySet()) {
+        for(var entry : sendRequest.getTimestampedNodes().getNodes().entrySet()) {
             LwM2mPath path = entry.getKey();
             LwM2mNode node = entry.getValue();
             LwM2mClient lwM2MClient = clientContext.getClientByEndpoint(registration.getEndpoint());
@@ -480,7 +488,7 @@ public class DefaultLwM2mUplinkMsgHandler extends LwM2MExecutorAwareService impl
             CountDownLatch latch = new CountDownLatch(targetIds.size());
             targetIds.forEach(versionedId -> sendReadRequest(lwM2MClient, versionedId,
                     new TbLwM2MLatchCallback<>(latch, new TbLwM2MReadCallback(this, logService, lwM2MClient, versionedId))));
-            latch.await();
+            latch.await(config.getTimeout(), TimeUnit.MILLISECONDS);
         } catch (InterruptedException e) {
             log.error("[{}] Failed to await Read requests!", lwM2MClient.getEndpoint(), e);
         } catch (Exception e) {
@@ -498,7 +506,7 @@ public class DefaultLwM2mUplinkMsgHandler extends LwM2MExecutorAwareService impl
             targetIds.forEach(targetId -> sendObserveRequest(lwM2MClient, targetId,
                     new TbLwM2MLatchCallback<>(latch, new TbLwM2MObserveCallback(this, logService, lwM2MClient, targetId))));
 
-            latch.await();
+            latch.await(config.getTimeout(), TimeUnit.MILLISECONDS);
         } catch (InterruptedException e) {
             log.error("[{}] Failed to await Observe requests!", lwM2MClient.getEndpoint(), e);
         } catch (Exception e) {
@@ -557,7 +565,7 @@ public class DefaultLwM2mUplinkMsgHandler extends LwM2MExecutorAwareService impl
     private void updateObjectInstanceResourceValue(LwM2mClient client, LwM2mObjectInstance lwM2mObjectInstance, String pathIdVer, int code) {
         LwM2mPath pathIds = new LwM2mPath(fromVersionedIdToObjectId(pathIdVer));
         lwM2mObjectInstance.getResources().forEach((resourceId, resource) -> {
-            String pathRez = pathIds.toString() + "/" + resourceId;
+            String pathRez = pathIdVer + "/" + resourceId;
             this.updateResourcesValue(client, resource, pathRez, Mode.UPDATE, code);
         });
     }
@@ -600,7 +608,7 @@ public class DefaultLwM2mUplinkMsgHandler extends LwM2MExecutorAwareService impl
                 otaService.onCurrentSoftwareResultUpdate(lwM2MClient, (Long) lwM2mResource.getValue());
             }
             if (ResponseCode.BAD_REQUEST.getCode() > code) {
-                this.updateAttrTelemetry(registration, Collections.singleton(path));
+                this.updateAttrTelemetry(registration, path);
             }
         } else {
             log.error("Fail update path [{}] Resource [{}]", path, lwM2mResource);
@@ -617,9 +625,12 @@ public class DefaultLwM2mUplinkMsgHandler extends LwM2MExecutorAwareService impl
      *
      * @param registration - Registration LwM2M Client
      */
-    private void updateAttrTelemetry(Registration registration, Set<String> paths) {
+    public void updateAttrTelemetry(Registration registration, String path) {
         try {
-            ResultsAddKeyValueProto results = this.getParametersFromProfile(registration, paths);
+            ResultsAddKeyValueProto results = this.getParametersFromProfile(registration, path);
+            if (path.equals("/3_1.2/0/9")) {
+                log.info("UpdateTelemetry paths [{}] key: [{}] value [{}]", path, results.getResultTelemetries().get(0).getKey(), results.getResultTelemetries().get(0).getLongV());
+            }
             SessionInfoProto sessionInfo = this.getSessionInfoOrCloseSession(registration);
             if (results != null && sessionInfo != null) {
                 if (results.getResultAttributes().size() > 0) {
@@ -669,13 +680,13 @@ public class DefaultLwM2mUplinkMsgHandler extends LwM2MExecutorAwareService impl
      * @param registration - Registration LwM2M Client
      * @param path         -
      */
-    private ResultsAddKeyValueProto getParametersFromProfile(Registration registration, Set<String> path) {
-        if (path != null && path.size() > 0) {
+    private ResultsAddKeyValueProto getParametersFromProfile(Registration registration, String path) {
+        if (!path.isEmpty()) {
             ResultsAddKeyValueProto results = new ResultsAddKeyValueProto();
             var profile = clientContext.getProfile(registration);
             List<TransportProtos.KeyValueProto> resultAttributes = new ArrayList<>();
             profile.getObserveAttr().getAttribute().forEach(pathIdVer -> {
-                if (path.contains(pathIdVer)) {
+                if (path.equals(pathIdVer)) {
                     TransportProtos.KeyValueProto kvAttr = this.getKvToThingsBoard(pathIdVer, registration);
                     if (kvAttr != null) {
                         resultAttributes.add(kvAttr);
@@ -777,7 +788,7 @@ public class DefaultLwM2mUplinkMsgHandler extends LwM2MExecutorAwareService impl
                 this.updateResourcesValue(client, (LwM2mResource) v, k.toString(), Mode.REPLACE, code);
             } else {
                 LwM2mResourceInstance resourceInstance = (LwM2mResourceInstance) v;
-                LwM2mMultipleResource multipleResource = new LwM2mMultipleResource(v.getId(), resourceInstance.getType(), resourceInstance);
+                LwM2mMultipleResource multipleResource = new LwM2mMultipleResource(((LwM2mResourceInstance) v).getId(), resourceInstance.getType(), resourceInstance);
                 this.updateResourcesValue(client, multipleResource, k.toString(), Mode.REPLACE, code);
             }
         });
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/uplink/LwM2mUplinkMsgHandler.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/uplink/LwM2mUplinkMsgHandler.java
index d3259669d8..65c7fb9654 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/uplink/LwM2mUplinkMsgHandler.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/uplink/LwM2mUplinkMsgHandler.java
@@ -47,6 +47,7 @@ public interface LwM2mUplinkMsgHandler {
     void onUpdateValueAfterReadResponse(Registration registration, String path, ReadResponse response);
 
     void onUpdateValueAfterReadCompositeResponse(Registration registration, ReadCompositeResponse response);
+    void onErrorObservation(Registration registration, String errorMsg);
 
     void onUpdateValueWithSendRequest(Registration registration, SendRequest sendRequest);
 
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/utils/LwM2MTransportUtil.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/utils/LwM2MTransportUtil.java
index 7ed6e40194..db8398cd57 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/utils/LwM2MTransportUtil.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/utils/LwM2MTransportUtil.java
@@ -15,11 +15,9 @@
  */
 package org.thingsboard.server.transport.lwm2m.utils;
 
-import com.fasterxml.jackson.core.type.TypeReference;
 import com.google.gson.JsonElement;
 import lombok.extern.slf4j.Slf4j;
-import org.eclipse.leshan.core.attributes.Attribute;
-import org.eclipse.leshan.core.attributes.AttributeSet;
+import org.eclipse.californium.elements.config.Configuration;
 import org.eclipse.leshan.core.model.LwM2mModel;
 import org.eclipse.leshan.core.model.ObjectLoader;
 import org.eclipse.leshan.core.model.ObjectModel;
@@ -30,8 +28,6 @@ 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.node.codec.CodecException;
-import org.eclipse.leshan.core.request.SimpleDownlinkRequest;
-import org.eclipse.leshan.core.request.WriteAttributesRequest;
 import org.eclipse.leshan.core.util.Hex;
 import org.eclipse.leshan.server.registration.Registration;
 import org.thingsboard.common.util.JacksonUtil;
@@ -52,9 +48,7 @@ import org.thingsboard.server.transport.lwm2m.server.ota.firmware.FirmwareUpdate
 import org.thingsboard.server.transport.lwm2m.server.ota.firmware.FirmwareUpdateState;
 import org.thingsboard.server.transport.lwm2m.server.ota.software.SoftwareUpdateResult;
 import org.thingsboard.server.transport.lwm2m.server.ota.software.SoftwareUpdateState;
-import org.thingsboard.server.transport.lwm2m.server.uplink.LwM2mUplinkMsgHandler;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
@@ -62,13 +56,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
-import static org.eclipse.leshan.core.attributes.Attribute.DIMENSION;
-import static org.eclipse.leshan.core.attributes.Attribute.GREATER_THAN;
-import static org.eclipse.leshan.core.attributes.Attribute.LESSER_THAN;
-import static org.eclipse.leshan.core.attributes.Attribute.MAXIMUM_PERIOD;
-import static org.eclipse.leshan.core.attributes.Attribute.MINIMUM_PERIOD;
-import static org.eclipse.leshan.core.attributes.Attribute.OBJECT_VERSION;
-import static org.eclipse.leshan.core.attributes.Attribute.STEP;
+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.core.model.ResourceModel.Type.BOOLEAN;
 import static org.eclipse.leshan.core.model.ResourceModel.Type.FLOAT;
 import static org.eclipse.leshan.core.model.ResourceModel.Type.INTEGER;
@@ -83,6 +72,7 @@ import static org.thingsboard.server.transport.lwm2m.server.ota.DefaultLwM2MOtaU
 import static org.thingsboard.server.transport.lwm2m.server.ota.DefaultLwM2MOtaUpdateService.SW_RESULT_ID;
 import static org.thingsboard.server.transport.lwm2m.server.ota.DefaultLwM2MOtaUpdateService.SW_STATE_ID;
 
+
 @Slf4j
 public class LwM2MTransportUtil {
 
@@ -92,7 +82,7 @@ public class LwM2MTransportUtil {
     public static final String LOG_LWM2M_INFO = "info";
     public static final String LOG_LWM2M_ERROR = "error";
     public static final String LOG_LWM2M_WARN = "warn";
-    public static final int BOOTSTRAP_DEFAULT_SHORT_ID = 0;
+    public static final int BOOTSTRAP_DEFAULT_SHORT_ID_0 = 0;
 
     public enum LwM2MClientStrategy {
         CLIENT_STRATEGY_1(1, "Read only resources marked as observation"),
@@ -235,7 +225,10 @@ public class LwM2MTransportUtil {
     }
 
     public static String convertObjectIdToVersionedId(String path, Registration registration) {
-        String ver = registration.getSupportedObject().get(new LwM2mPath(path).getObjectId());
+        String ver = String.valueOf(registration.getSupportedObject().get(new LwM2mPath(path).getObjectId()));
+        return convertObjectIdToVerId(path, ver);
+    }
+    public static String convertObjectIdToVerId(String path, String ver) {
         ver = ver != null ? ver : TbLwM2mVersion.VERSION_1_0.getVersion().toString();
         try {
             String[] keyArray = path.split(LWM2M_SEPARATOR_PATH);
@@ -258,60 +251,6 @@ public class LwM2MTransportUtil {
         }
     }
 
-    /**
-     * As example:
-     * a)Write-Attributes/3/0/9?pmin=1 means the Battery Level value will be notified
-     * to the Server with a minimum interval of 1sec;
-     * this value is set at theResource level.
-     * b)Write-Attributes/3/0/9?pmin means the Battery Level will be notified
-     * to the Server with a minimum value (pmin) given by the default one
-     * (resource 2 of Object Server ID=1),
-     * or with another value if this Attribute has been set at another level
-     * (Object or Object Instance: see section5.1.1).
-     * c)Write-Attributes/3/0?pmin=10 means that all Resources of Instance 0 of the Object ‘Device (ID:3)’
-     * will be notified to the Server with a minimum interval of 10 sec;
-     * this value is set at the Object Instance level.
-     * d)Write-Attributes /3/0/9?gt=45&st=10 means the Battery Level will be notified to the Server
-     * when:
-     * a.old value is 20 and new value is 35 due to step condition
-     * b.old value is 45 and new value is 50 due to gt condition
-     * c.old value is 50 and new value is 40 due to both gt and step conditions
-     * d.old value is 35 and new value is 20 due to step conditione)
-     * Write-Attributes /3/0/9?lt=20&gt=85&st=10 means the Battery Level will be notified to the Server
-     * when:
-     * a.old value is 17 and new value is 24 due to lt condition
-     * b.old value is 75 and new value is 90 due to both gt and step conditions
-     * String uriQueries = "pmin=10&pmax=60";
-     * AttributeSet attributes = AttributeSet.parse(uriQueries);
-     * WriteAttributesRequest request = new WriteAttributesRequest(target, attributes);
-     * Attribute gt = new Attribute(GREATER_THAN, Double.valueOf("45"));
-     * Attribute st = new Attribute(LESSER_THAN, Double.valueOf("10"));
-     * Attribute pmax = new Attribute(MAXIMUM_PERIOD, "60");
-     * Attribute [] attrs = {gt, st};
-     */
-    public static SimpleDownlinkRequest createWriteAttributeRequest(String target, Object params, LwM2mUplinkMsgHandler serviceImpl) {
-        AttributeSet attrSet = new AttributeSet(createWriteAttributes(params, serviceImpl, target));
-        return attrSet.getAttributes().size() > 0 ? new WriteAttributesRequest(target, attrSet) : null;
-    }
-
-    private static Attribute[] createWriteAttributes(Object params, LwM2mUplinkMsgHandler serviceImpl, String target) {
-        List<Attribute> attributeLists = new ArrayList<>();
-        Map<String, Object> map = JacksonUtil.convertValue(params, new TypeReference<>() {
-        });
-        map.forEach((k, v) -> {
-            if (StringUtils.trimToNull(v.toString()) != null) {
-                Object attrValue = convertWriteAttributes(k, v, serviceImpl, target);
-                if (attrValue != null) {
-                    Attribute attribute = createAttribute(k, attrValue);
-                    if (attribute != null) {
-                        attributeLists.add(new Attribute(k, attrValue));
-                    }
-                }
-            }
-        });
-        return attributeLists.toArray(Attribute[]::new);
-    }
-
     /**
      * "UNSIGNED_INTEGER":  // Number -> Integer Example:
      * Alarm Timestamp [32-bit unsigned integer]
@@ -360,45 +299,14 @@ public class LwM2MTransportUtil {
     public static Map<Integer, Object> convertMultiResourceValuesFromJson(JsonElement newValProto, ResourceModel.Type type, String versionedId) {
         Map<Integer, Object> newValues = new HashMap<>();
         newValProto.getAsJsonObject().entrySet().forEach((obj) -> {
-            newValues.put(Integer.valueOf(obj.getKey()), LwM2mValueConverterImpl.getInstance().convertValue(obj.getValue().getAsString(),
-                    STRING, type, new LwM2mPath(fromVersionedIdToObjectId(versionedId))));
+            newValues.put(Integer.valueOf(obj.getKey()), convertValueByTypeResource (obj.getValue().getAsString(), type,  versionedId));
         });
         return newValues;
     }
 
-    public static Object convertWriteAttributes(String type, Object value, LwM2mUplinkMsgHandler serviceImpl, String target) {
-        switch (type) {
-            /** Integer [0:255]; */
-            case DIMENSION:
-                Long dim = (Long) serviceImpl.getConverter().convertValue(value, equalsResourceTypeGetSimpleName(value), INTEGER, new LwM2mPath(target));
-                return dim >= 0 && dim <= 255 ? dim : null;
-            /**String;*/
-            case OBJECT_VERSION:
-                return serviceImpl.getConverter().convertValue(value, equalsResourceTypeGetSimpleName(value), STRING, new LwM2mPath(target));
-            /**INTEGER */
-            case MINIMUM_PERIOD:
-            case MAXIMUM_PERIOD:
-                return serviceImpl.getConverter().convertValue(value, equalsResourceTypeGetSimpleName(value), INTEGER, new LwM2mPath(target));
-            /**Float; */
-            case GREATER_THAN:
-            case LESSER_THAN:
-            case STEP:
-                if (value.getClass().getSimpleName().equals("String")) {
-                    value = Double.valueOf((String) value);
-                }
-                return serviceImpl.getConverter().convertValue(value, equalsResourceTypeGetSimpleName(value), FLOAT, new LwM2mPath(target));
-            default:
-                return null;
-        }
-    }
-
-    private static Attribute createAttribute(String key, Object attrValue) {
-        try {
-            return new Attribute(key, attrValue);
-        } catch (Exception e) {
-            log.error("CreateAttribute, not valid parameter key: [{}], attrValue: [{}], error: [{}]", key, attrValue, e.getMessage());
-            return null;
-        }
+    public static Object convertValueByTypeResource (String value, ResourceModel.Type type,  String versionedId) {
+        return LwM2mValueConverterImpl.getInstance().convertValue(value,
+                STRING, type, new LwM2mPath(fromVersionedIdToObjectId(versionedId)));
     }
 
     /**
@@ -520,4 +428,15 @@ public class LwM2MTransportUtil {
         }
         return newValueStr.equals(oldValueStr);
     }
+
+    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);
+        }
+    }
 }
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/utils/LwM2mValueConverterImpl.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/utils/LwM2mValueConverterImpl.java
index eb01c7d2a4..3125ae63f5 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/utils/LwM2mValueConverterImpl.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/utils/LwM2mValueConverterImpl.java
@@ -15,7 +15,6 @@
  */
 package org.thingsboard.server.transport.lwm2m.utils;
 
-import com.google.api.client.util.Base64;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.leshan.core.model.ResourceModel.Type;
 import org.eclipse.leshan.core.node.LwM2mPath;
@@ -28,6 +27,7 @@ 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;
@@ -172,7 +172,7 @@ public class LwM2mValueConverterImpl implements LwM2mValueConverter {
                         return Hex.decodeHex(((String)value).toCharArray());
                     } catch (IllegalArgumentException e) {
                         try {
-                            return Base64.decodeBase64(((String) value).getBytes());
+                            return Base64.getDecoder().decode(((String) value).getBytes());
                         } catch (IllegalArgumentException ea) {
                             throw new CodecException("Unable to convert hexastring or base64 [%s] to byte array for resource %s",
                                     value, resourcePath);
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 23293c7b7a..0000000000
--- a/common/transport/lwm2m/src/test/java/org/thingsboard/server/transport/lwm2m/bootstrap/LwM2MTransportBootstrapServiceTest.java
+++ /dev/null
@@ -1,105 +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.eclipse.leshan.server.californium.LeshanServer;
-import org.eclipse.leshan.server.californium.bootstrap.LeshanBootstrapServer;
-import org.eclipse.leshan.server.californium.registration.CaliforniumRegistrationStore;
-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.cache.ota.OtaPackageDataCache;
-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 org.thingsboard.server.transport.lwm2m.secure.TbLwM2MAuthorizer;
-import org.thingsboard.server.transport.lwm2m.secure.TbLwM2MDtlsCertificateVerifier;
-import org.thingsboard.server.transport.lwm2m.server.store.TbSecurityStore;
-import org.thingsboard.server.transport.lwm2m.server.uplink.LwM2mUplinkMsgHandler;
-
-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;
-
-
-    @Test
-    public void getLHServer_creates_ConnectionIdGenerator_when_connection_id_length_not_null(){
-        final Integer CONNECTION_ID_LENGTH = 6;
-        when(serverConfig.getDtlsConnectionIdLength()).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);
-    }
-
-    @Test
-    public void getLHServer_creates_no_ConnectionIdGenerator_when_connection_id_length_is_null(){
-        when(serverConfig.getDtlsConnectionIdLength()).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/config/LwM2MTransportServerConfigTest.java b/common/transport/lwm2m/src/test/java/org/thingsboard/server/transport/lwm2m/config/LwM2MTransportServerConfigTest.java
deleted file mode 100644
index 7e657dd932..0000000000
--- a/common/transport/lwm2m/src/test/java/org/thingsboard/server/transport/lwm2m/config/LwM2MTransportServerConfigTest.java
+++ /dev/null
@@ -1,61 +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.config;
-
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.test.context.SpringBootContextLoader;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.TestPropertySource;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
-import org.thingsboard.server.common.transport.config.ssl.SslCredentialsConfig;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-@ExtendWith(SpringExtension.class)
-@EnableConfigurationProperties(value = LwM2MTransportServerConfig.class)
-@ContextConfiguration(classes = {LwM2MTransportServerConfig.class}, loader = SpringBootContextLoader.class)
-@TestPropertySource(properties = {
-        "transport.sessions.report_timeout=10",
-        "transport.lwm2m.security.recommended_ciphers=true",
-        "transport.lwm2m.security.recommended_supported_groups=true",
-        "transport.lwm2m.downlink_pool_size=10",
-        "transport.lwm2m.uplink_pool_size=10",
-        "transport.lwm2m.ota_pool_size=10",
-        "transport.lwm2m.clean_period_in_sec=2",
-        "transport.lwm2m.dtls.connection_id_length="
-
-})
-class LwM2MTransportServerConfigTest {
-
-    @MockBean(name = "lwm2mServerCredentials")
-    private SslCredentialsConfig credentialsConfig;
-
-    @MockBean(name = "lwm2mTrustCredentials")
-    private SslCredentialsConfig trustCredentialsConfig;
-
-    @Autowired
-    private LwM2MTransportServerConfig serverConfig;
-
-    @Test
-    void getDtlsConnectionIdLength_return_null_is_property_is_empty() {
-        // note: transport.lwm2m.dtls.connect_id_length is set in TestPropertySource
-        assertThat(serverConfig.getDtlsConnectionIdLength()).isNull();
-    }
-}
\ No newline at end of file
diff --git a/common/transport/lwm2m/src/test/java/org/thingsboard/server/transport/lwm2m/server/DefaultLwM2mTransportServiceTest.java b/common/transport/lwm2m/src/test/java/org/thingsboard/server/transport/lwm2m/server/DefaultLwM2mTransportServiceTest.java
deleted file mode 100644
index 92f60ebb8e..0000000000
--- a/common/transport/lwm2m/src/test/java/org/thingsboard/server/transport/lwm2m/server/DefaultLwM2mTransportServiceTest.java
+++ /dev/null
@@ -1,109 +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.server;
-
-import org.eclipse.californium.core.network.CoapEndpoint;
-import org.eclipse.californium.scandium.config.DtlsConnectorConfig;
-import org.eclipse.leshan.server.californium.LeshanServer;
-import org.eclipse.leshan.server.californium.registration.CaliforniumRegistrationStore;
-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.cache.ota.OtaPackageDataCache;
-import org.thingsboard.server.transport.lwm2m.config.LwM2MTransportServerConfig;
-import org.thingsboard.server.transport.lwm2m.secure.TbLwM2MAuthorizer;
-import org.thingsboard.server.transport.lwm2m.secure.TbLwM2MDtlsCertificateVerifier;
-import org.thingsboard.server.transport.lwm2m.server.store.TbSecurityStore;
-import org.thingsboard.server.transport.lwm2m.server.uplink.LwM2mUplinkMsgHandler;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.BDDMockito.when;
-
-@ExtendWith(MockitoExtension.class)
-public class DefaultLwM2mTransportServiceTest {
-
-    @Mock
-    private LwM2mTransportContext context;
-
-    @Mock
-    private LwM2MTransportServerConfig config;
-    @Mock
-    private OtaPackageDataCache otaPackageDataCache;
-    @Mock
-    private LwM2mUplinkMsgHandler handler;
-    @Mock
-    private CaliforniumRegistrationStore registrationStore;
-    @Mock
-    private TbSecurityStore securityStore;
-    @Mock
-    private TbLwM2MDtlsCertificateVerifier certificateVerifier;
-    @Mock
-    private TbLwM2MAuthorizer authorizer;
-    @Mock
-    private LwM2mVersionedModelProvider modelProvider;
-
-
-    @Test
-    public void getLHServer_creates_ConnectionIdGenerator_when_connection_id_length_not_null(){
-        final Integer CONNECTION_ID_LENGTH = 6;
-        when(config.getDtlsConnectionIdLength()).thenReturn(CONNECTION_ID_LENGTH);
-        var lwm2mService = createLwM2MService();
-
-        LeshanServer server = ReflectionTestUtils.invokeMethod(lwm2mService, "getLhServer");
-
-        assertThat(server).isNotNull();
-        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);
-    }
-
-    @Test
-    public void getLHServer_creates_no_ConnectionIdGenerator_when_connection_id_length_is_null(){
-        when(config.getDtlsConnectionIdLength()).thenReturn(null);
-        var lwm2mService = createLwM2MService();
-
-        LeshanServer server = ReflectionTestUtils.invokeMethod(lwm2mService, "getLhServer");
-
-        assertThat(server).isNotNull();
-        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 DefaultLwM2mTransportService createLwM2MService() {
-        setDefaultConfigVariables();
-        return new DefaultLwM2mTransportService(context, config, otaPackageDataCache, handler, registrationStore,
-                securityStore, certificateVerifier, authorizer, modelProvider);
-    }
-
-    private void setDefaultConfigVariables(){
-        when(config.getPort()).thenReturn(5683);
-        when(config.getSecurePort()).thenReturn(5684);
-        when(config.isRecommendedCiphers()).thenReturn(false);
-        when(config.getDtlsRetransmissionTimeout()).thenReturn(9000);
-    }
-
-
-}
\ No newline at end of file
diff --git a/common/transport/lwm2m/src/test/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
similarity index 80%
rename from common/transport/lwm2m/src/test/org/thingsboard/server/transport/lwm2m/server/client/LwM2mClientTest.java
rename to common/transport/lwm2m/src/test/java/org/thingsboard/server/transport/lwm2m/server/client/LwM2mClientTest.java
index e4cdf7a0ed..7d4d795738 100644
--- a/common/transport/lwm2m/src/test/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,10 +15,11 @@
  */
 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.request.Identity;
+import org.eclipse.leshan.core.peer.IpPeer;
 import org.eclipse.leshan.server.registration.Registration;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Assertions;
 
 import java.net.InetSocketAddress;
@@ -29,7 +30,8 @@ public class LwM2mClientTest {
     public void setRegistration() {
         LwM2mClient client = new LwM2mClient("nodeId", "testEndpoint");
         Registration registration = new Registration
-                .Builder("test", "testEndpoint", Identity.unsecure(new InetSocketAddress(1000)))
+                .Builder("testId", "testEndpoint", new IpPeer(new InetSocketAddress(1000)),
+                        EndpointUriUtil.createUri("coap://localhost:5685"))
                 .objectLinks(new Link[0])
                 .build();
 
diff --git a/common/transport/lwm2m/src/test/java/org/thingsboard/server/transport/lwm2m/server/store/TbLwM2mRedisRegistrationStoreTest.java b/common/transport/lwm2m/src/test/java/org/thingsboard/server/transport/lwm2m/server/store/TbLwM2mRedisRegistrationStoreTest.java
deleted file mode 100644
index e09f2205b7..0000000000
--- a/common/transport/lwm2m/src/test/java/org/thingsboard/server/transport/lwm2m/server/store/TbLwM2mRedisRegistrationStoreTest.java
+++ /dev/null
@@ -1,265 +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.server.store;
-
-import org.eclipse.leshan.core.link.Link;
-import org.eclipse.leshan.core.request.Identity;
-import org.eclipse.leshan.core.util.NamedThreadFactory;
-import org.eclipse.leshan.server.redis.serialization.RegistrationSerDes;
-import org.eclipse.leshan.server.registration.Registration;
-import org.eclipse.leshan.server.registration.RegistrationUpdate;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.junit.jupiter.MockitoExtension;
-import org.springframework.data.redis.connection.RedisConnection;
-import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.integration.redis.util.RedisLockRegistry;
-import org.springframework.test.util.ReflectionTestUtils;
-
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.UnknownHostException;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.locks.Lock;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.lenient;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.thingsboard.server.transport.lwm2m.server.store.TbLwM2mRedisRegistrationStore.DEFAULT_CLEAN_LIMIT;
-import static org.thingsboard.server.transport.lwm2m.server.store.TbLwM2mRedisRegistrationStore.DEFAULT_CLEAN_PERIOD;
-import static org.thingsboard.server.transport.lwm2m.server.store.TbLwM2mRedisRegistrationStore.DEFAULT_GRACE_PERIOD;
-
-
-@ExtendWith(MockitoExtension.class)
-class TbLwM2mRedisRegistrationStoreTest {
-
-    RedisConnectionFactory connectionFactory;
-    RedisConnection connection;
-    RedisLockRegistry lockRegistry;
-
-    TbLwM2mRedisRegistrationStore registrationStore;
-
-    @BeforeEach
-    void setUp() {
-        lockRegistry = mock(RedisLockRegistry.class);
-        lenient().when(lockRegistry.obtain(any())).thenReturn(mock(Lock.class));
-        connection = mock(RedisConnection.class);
-        //when(connection.set(any(byte[].class), any(byte[].class))).
-        connectionFactory = mock(RedisConnectionFactory.class);
-        lenient().when(connectionFactory.getConnection()).thenReturn(connection);
-        ScheduledExecutorService executorService = Executors.newScheduledThreadPool(1,
-                new NamedThreadFactory(String.format("RedisRegistrationStore Cleaner (%ds)", DEFAULT_CLEAN_PERIOD)));
-        registrationStore = new TbLwM2mRedisRegistrationStore(connectionFactory, executorService,
-                DEFAULT_CLEAN_PERIOD, DEFAULT_GRACE_PERIOD, DEFAULT_CLEAN_LIMIT, lockRegistry);
-    }
-
-    @Test
-    void testAddRegistrationWithNoOldRegistration() {
-        setOldRegistration(null);
-        Registration registration = buildRegistration();
-
-        assertThat(registrationStore.addRegistration(registration)).isNull();
-
-        byte[] endpoint = registration.getEndpoint().getBytes(UTF_8);
-        verify(connection, times(1)).set(getRegIdKey(registration), endpoint);
-        verify(connection, times(1)).set(getRegAddrKey(registration), endpoint);
-        verify(connection, times(1)).set(getRegIdentityKey(registration), endpoint);
-        verify(connection, times(3)).set(any(byte[].class), any(byte[].class));
-        verify(connection, times(0)).del(any(byte[].class));
-    }
-
-    @Test
-    void testAddRegistrationWithOldRegistrationEqualToCurrent(){
-        var oldRegistration = buildRegistration();
-        setOldRegistration(oldRegistration);
-        Registration registration = buildRegistration();
-
-        var deregistration = registrationStore.addRegistration(registration);
-
-        assertThat(deregistration.getRegistration()).isEqualTo(oldRegistration);
-
-        byte[] endpoint = registration.getEndpoint().getBytes(UTF_8);
-        verify(connection, times(1)).set(getRegIdKey(registration), endpoint);
-        verify(connection, times(1)).set(getRegAddrKey(registration), endpoint);
-        verify(connection, times(1)).set(getRegIdentityKey(registration), endpoint);
-        verify(connection, times(3)).set(any(byte[].class), any(byte[].class));
-        verify(connection, times(1)).del(getTknsRegIdKey(oldRegistration));
-        verify(connection, times(1)).del(any(byte[].class));
-    }
-
-    @Test
-    void testAddRegistrationRemovesIndexes(){
-        var oldRegistration = buildRegistration(Identity.unsecure(getTestAddress(1234)));
-        setOldRegistration(oldRegistration);
-        var registration = buildRegistration(Identity.unsecure(getTestAddress(2345)));
-
-        var deregistration = registrationStore.addRegistration(registration);
-
-        assertThat(deregistration.getRegistration()).isEqualTo(oldRegistration);
-        byte[] endpoint = registration.getEndpoint().getBytes(UTF_8);
-        verify(connection, times(1)).set(getRegIdKey(registration), endpoint);
-        verify(connection, times(1)).set(getRegAddrKey(registration), endpoint);
-        verify(connection, times(1)).set(getRegIdentityKey(registration), endpoint);
-        verify(connection, times(3)).set(any(byte[].class), any(byte[].class));
-        verify(connection, times(1)).del(getRegAddrKey(oldRegistration));
-        verify(connection, times(1)).del(getRegIdentityKey(oldRegistration));
-        verify(connection, times(1)).del(getTknsRegIdKey(oldRegistration));
-        verify(connection, times(3)).del(any(byte[].class));
-    }
-
-    @Test
-    void testUpdateRegistrationWhenNoRegistrationFound() {
-        setOldRegistration(null);
-        Registration registration = buildRegistration();
-        RegistrationUpdate update = createUpdateFromRegistration(registration);
-
-        assertThat(registrationStore.updateRegistration(update)).isNull();
-
-        verify(connection, times(1)).get(getRegIdKey(registration));
-        verify(connection, times(1)).get(any(byte[].class));
-        verify(connection, times(0)).del(any(byte[].class));
-    }
-
-    @Test
-    void testUpdateRegistrationWithSameRegistration() {
-        Registration registration = buildRegistration();
-        setOldRegistration(registration);
-        RegistrationUpdate update = createUpdateFromRegistration(registration);
-
-        assertThat(registrationStore.updateRegistration(update)).isNotNull();
-
-        var endpoint = registration.getEndpoint().getBytes(UTF_8);
-        // check registration and addressIndex here updated
-        verify(connection, times(1)).set(eq(getEndpointKey(endpoint)), any(byte[].class));
-        verify(connection, times(1)).set(getRegAddrKey(registration), endpoint);
-        verify(connection, times(2)).set(any(byte[].class), any(byte[].class));
-        verify(connection, times(0)).del(any(byte[].class));
-    }
-
-    @Test
-    void testUpdateRegistrationWithRegistrationFromSecureIdentitiesWithDifferentAddress() {
-        Registration oldRegistration = buildRegistration(Identity.psk(getTestAddress(1234), "my:psk"));
-        setOldRegistration(oldRegistration);
-        Registration newRegistration = buildRegistration(Identity.psk(getTestAddress(2345), "my:psk"));
-        RegistrationUpdate update = createUpdateFromRegistration(newRegistration);
-        assertThat(oldRegistration.getEndpoint()).isEqualTo(newRegistration.getEndpoint());
-
-        assertThat(registrationStore.updateRegistration(update)).isNotNull();
-
-        var endpoint = newRegistration.getEndpoint().getBytes(UTF_8);
-        // check registration and addressIndex here updated
-        verify(connection, times(1)).set(eq(getEndpointKey(endpoint)), any(byte[].class));
-        verify(connection, times(1)).set(getRegAddrKey(newRegistration), endpoint);
-        // check old AddrIndex has been removed
-        verify(connection, times(1)).del(getRegAddrKey(oldRegistration));
-        // check identityIndex has not been removed
-        verify(connection, times(0)).del(getRegIdentityKey(oldRegistration));
-        // check only one key (AddrIndex) in total was removed
-        verify(connection, times(1)).del(any(byte[].class));
-    }
-
-    @Test
-    void testGetRegistrationByIdentityReturnsRegistrationForSecureIdentityWithDifferentAddress() {
-        Registration registration = buildRegistration(Identity.psk(getTestAddress(1234), "my:psk"));
-        setOldRegistration(registration);
-        Identity sameIdentityWithDifferentAddress = Identity.psk(getTestAddress(2345), "my:psk");
-
-        Registration retrievedRegistration = registrationStore.getRegistrationByIdentity(sameIdentityWithDifferentAddress);
-
-        assertThat(retrievedRegistration).isEqualTo(registration);
-    }
-
-    private void setOldRegistration(Registration oldRegistration){
-        byte[] serializedRegistration = null;
-        if (oldRegistration != null){
-            byte[] endpoint = oldRegistration.getEndpoint().getBytes(UTF_8);
-            // set the AddrIndex
-            byte[] regAddrKey = getRegAddrKey(oldRegistration);
-            lenient().when(connection.get(eq(regAddrKey))).thenReturn(endpoint);
-            // set the IdentityIndex
-            byte[] regIdentityKey = getRegIdentityKey(oldRegistration);
-            lenient().when(connection.get(eq(regIdentityKey))).thenReturn(endpoint);
-            // set the IdIndex
-            byte[] regIdKey = getRegIdKey(oldRegistration);
-            lenient().when(connection.get(eq(regIdKey))).thenReturn(endpoint);
-            // set the registration
-            serializedRegistration = RegistrationSerDes.bSerialize(oldRegistration);
-            lenient().when(connection.get(eq(getEndpointKey(endpoint)))).thenReturn(serializedRegistration);
-        }
-        lenient().when(connection.getSet(any(byte[].class), any(byte[].class))).thenReturn(serializedRegistration);
-    }
-
-    private byte[] getRegAddrKey(Registration registration){
-        return ReflectionTestUtils.invokeMethod(registrationStore, "toRegAddrKey", registration.getSocketAddress());
-    }
-
-    private byte[] getRegIdentityKey(Registration registration){
-        return ReflectionTestUtils.invokeMethod(registrationStore, "toRegIdentityKey", registration.getIdentity());
-    }
-
-    private byte[] getRegIdKey(Registration registration){
-        return ReflectionTestUtils.invokeMethod(registrationStore, "toRegIdKey", registration.getId());
-    }
-
-    private byte[] getEndpointKey(byte[] endpoint){
-        return ReflectionTestUtils.invokeMethod(registrationStore, "toEndpointKey", endpoint);
-    }
-
-    private byte[] getTknsRegIdKey(Registration registration){
-        return ReflectionTestUtils.invokeMethod(registrationStore, "toKey", "TKNS:REGID:", registration.getId());
-    }
-
-    private static Registration buildRegistration() {
-        return buildRegistration(Identity.psk(getTestAddress(), "my:psk"));
-    }
-
-    private static Registration buildRegistration(Identity identity){
-        return new Registration.Builder("my_reg_id", "abcde", identity)
-                .objectLinks(new Link[]{})
-                .build();
-    }
-
-    private static RegistrationUpdate createUpdateFromRegistration(Registration registration){
-        return new RegistrationUpdate(
-                registration.getId(),
-                registration.getIdentity(),
-                registration.getLifeTimeInSec(),
-                registration.getSmsNumber(),
-                registration.getBindingMode(),
-                registration.getObjectLinks(),
-                registration.getAdditionalRegistrationAttributes()
-        );
-    }
-
-    private static InetSocketAddress getTestAddress() {
-        return getTestAddress(5684);
-    }
-
-    private static InetSocketAddress getTestAddress(int port) {
-        try {
-            return new InetSocketAddress(InetAddress.getByName("1.2.3.4"), port);
-        } catch (UnknownHostException e) {
-            throw new AssertionError("Cannot create test address");
-        }
-    }
-}
\ No newline at end of file
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
new file mode 100644
index 0000000000..6b17225538
--- /dev/null
+++ b/common/transport/lwm2m/src/test/java/org/thingsboard/server/transport/lwm2m/server/store/util/LwM2MClientSerDesTest.java
@@ -0,0 +1,163 @@
+/**
+ * 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.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.jupiter.api.Test;
+import org.thingsboard.server.common.data.TbResource;
+import org.thingsboard.server.common.data.device.data.PowerMode;
+import org.thingsboard.server.common.data.id.CustomerId;
+import org.thingsboard.server.common.data.id.DeviceId;
+import org.thingsboard.server.common.data.id.DeviceProfileId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.transport.TransportResourceCache;
+import org.thingsboard.server.common.transport.auth.TransportDeviceInfo;
+import org.thingsboard.server.common.transport.auth.ValidateDeviceCredentialsResponse;
+import org.thingsboard.server.gen.transport.TransportProtos;
+import org.thingsboard.server.transport.lwm2m.server.LwM2mTransportContext;
+import org.thingsboard.server.transport.lwm2m.server.LwM2mTransportServerHelper;
+import org.thingsboard.server.transport.lwm2m.server.LwM2mVersionedModelProvider;
+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.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;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+public class LwM2MClientSerDesTest {
+
+    @Test
+    public void serializeDeserialize() throws Exception {
+        LwM2mClient client = new LwM2mClient("nodeId", "endpoint");
+
+        TransportDeviceInfo tdi = new TransportDeviceInfo();
+        tdi.setPowerMode(PowerMode.PSM);
+        tdi.setPsmActivityTimer(10000L);
+        tdi.setPagingTransmissionWindow(2000L);
+        tdi.setEdrxCycle(3000L);
+        tdi.setTenantId(TenantId.fromUUID(UUID.randomUUID()));
+        tdi.setCustomerId(new CustomerId(UUID.randomUUID()));
+        tdi.setDeviceId(new DeviceId(UUID.randomUUID()));
+        tdi.setDeviceProfileId(new DeviceProfileId(UUID.randomUUID()));
+        tdi.setDeviceName("testDevice");
+        tdi.setDeviceType("testType");
+        ValidateDeviceCredentialsResponse credentialsResponse = ValidateDeviceCredentialsResponse.builder()
+                .deviceInfo(tdi)
+                .build();
+
+        client.init(credentialsResponse, UUID.randomUUID());
+
+        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);
+        client.getSharedAttributes().put("key1", TransportProtos.TsKvProto.newBuilder().setTs(0).setKv(TransportProtos.KeyValueProto.newBuilder().setStringV("test").build()).build());
+        client.getSharedAttributes().put("key2", TransportProtos.TsKvProto.newBuilder().setTs(1).setKv(TransportProtos.KeyValueProto.newBuilder().setDoubleV(1.02).build()).build());
+
+        TransportResourceCache resourceCache = mock(TransportResourceCache.class);
+        LwM2mTransportContext context = mock(LwM2mTransportContext.class);
+        LwM2mClientContext clientContext = mock(LwM2mClientContext.class);
+
+        var provider = new LwM2mVersionedModelProvider(clientContext, new LwM2mTransportServerHelper(context), context);
+
+        TbResource resource15 = new TbResource();
+        resource15.setData(Files.readAllBytes(Path.of(this.getClass().getClassLoader().getResource("15.xml").toURI())));
+        TbResource resource17 = new TbResource();
+        resource17.setData(Files.readAllBytes(Path.of(this.getClass().getClassLoader().getResource("17.xml").toURI())));
+
+        when(resourceCache.get(any(), any(), eq("15_1.0"))).thenReturn(Optional.of(resource15));
+        when(resourceCache.get(any(), any(), eq("17_1.0"))).thenReturn(Optional.of(resource17));
+        when(context.getTransportResourceCache()).thenReturn(resourceCache);
+        when(clientContext.getClientByEndpoint(any())).thenReturn(client);
+
+        LwM2mResource singleResource = LwM2mSingleResource.newStringResource(15, "testValue");
+        LwM2mResource multipleResource = LwM2mMultipleResource.newStringResource(17, Map.of(0, "testValue", 1, "testValue"));
+        client.saveResourceValue("/15_1.0/0/0", singleResource, provider, WriteRequest.Mode.UPDATE);
+        client.saveResourceValue("/17_1.0/0/0", multipleResource, provider, WriteRequest.Mode.UPDATE);
+
+        byte[] bytes = LwM2MClientSerDes.serialize(client);
+        assertNotNull(bytes);
+
+        LwM2mClient desClient = LwM2MClientSerDes.deserialize(bytes);
+
+        assertEquals(client.getNodeId(), desClient.getNodeId());
+        assertEquals(client.getEndpoint(), desClient.getEndpoint());
+        assertEquals(client.getSharedAttributes(), desClient.getSharedAttributes());
+        assertEquals(client.getKeyTsLatestMap(), desClient.getKeyTsLatestMap());
+        assertEquals(client.getTenantId(), desClient.getTenantId());
+        assertEquals(client.getProfileId(), desClient.getProfileId());
+        assertEquals(client.getDeviceId(), desClient.getDeviceId());
+        assertEquals(client.getState(), desClient.getState());
+        assertEquals(client.getSession(), desClient.getSession());
+        assertEquals(client.getPowerMode(), desClient.getPowerMode());
+        assertEquals(client.getPsmActivityTimer(), desClient.getPsmActivityTimer());
+        assertEquals(client.getPagingTransmissionWindow(), desClient.getPagingTransmissionWindow());
+        assertEquals(client.getEdrxCycle(), desClient.getEdrxCycle());
+        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());
+        assertEquals(client.getClientSupportContentFormats(), desClient.getClientSupportContentFormats());
+        assertEquals(client.getDefaultContentFormat(), desClient.getDefaultContentFormat());
+        assertEquals(client.getRetryAttempts().get(), desClient.getRetryAttempts().get());
+        assertEquals(client.getLastSentRpcId(), desClient.getLastSentRpcId());
+
+        Map<String, ResourceValue> expectedResources = client.getResources();
+        Map<String, ResourceValue> actualResources = desClient.getResources();
+        assertNotNull(actualResources);
+        assertEquals(expectedResources.size(), actualResources.size());
+        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/lwm2m/src/test/java/org/thingsboard/server/transport/lwm2m/server/store/util/LwM2MIdentitySerDesTest.java b/common/transport/lwm2m/src/test/java/org/thingsboard/server/transport/lwm2m/server/store/util/LwM2MIdentitySerDesTest.java
deleted file mode 100644
index c75ed7a195..0000000000
--- a/common/transport/lwm2m/src/test/java/org/thingsboard/server/transport/lwm2m/server/store/util/LwM2MIdentitySerDesTest.java
+++ /dev/null
@@ -1,77 +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.server.store.util;
-
-import com.eclipsesource.json.JsonObject;
-import org.apache.commons.lang3.NotImplementedException;
-import org.eclipse.leshan.core.request.Identity;
-import org.junit.jupiter.api.Test;
-
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.UnknownHostException;
-import java.security.PublicKey;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-class LwM2MIdentitySerDesTest {
-
-    @Test
-    void serializePskIdentity() {
-        assertThat(LwM2MIdentitySerDes.serialize(Identity.psk(getTestAddress(), "my:psk")).toString())
-                .isEqualTo("{\"type\":\"psk\",\"id\":\"my:psk\"}");
-    }
-
-
-    @Test
-    void serializeRpkIdentity() {
-        var public_key = mock(PublicKey.class);
-        when(public_key.getEncoded()).thenReturn(new byte[]{1,2,3,4,5,6,7,8,9});
-
-        assertThat(LwM2MIdentitySerDes.serialize(Identity.rpk(getTestAddress(), public_key)).toString())
-                .isEqualTo("{\"type\":\"rpk\",\"rpk\":\"010203040506070809\"}");
-    }
-
-    @Test
-    void serializeX509Identity() {
-        assertThat(LwM2MIdentitySerDes.serialize(Identity.x509(getTestAddress(), "MyCommonName")).toString())
-                .isEqualTo("{\"type\":\"x509\",\"cn\":\"MyCommonName\"}");
-    }
-
-    @Test
-    void serializeUnsecureIdentity() {
-        assertThat(LwM2MIdentitySerDes.serialize(Identity.unsecure(getTestAddress())).toString())
-                .isEqualTo("{\"type\":\"unsecure\",\"address\":\"1.2.3.4\",\"port\":5684}");
-    }
-    
-
-    @Test
-    void deserialize() {
-        assertThatThrownBy(() -> LwM2MIdentitySerDes.deserialize(mock(JsonObject.class)))
-                .isInstanceOf(NotImplementedException.class);
-    }
-
-    private static InetSocketAddress getTestAddress() {
-        try {
-            return new InetSocketAddress(InetAddress.getByName("1.2.3.4"), 5684);
-        } catch (UnknownHostException e) {
-            throw new AssertionError("Cannot create test address");
-        }
-    }
-}
\ No newline at end of file
diff --git a/common/transport/lwm2m/src/test/org/thingsboard/server/transport/lwm2m/server/store/util/LwM2MClientSerDesTest.java b/common/transport/lwm2m/src/test/org/thingsboard/server/transport/lwm2m/server/store/util/LwM2MClientSerDesTest.java
deleted file mode 100644
index 83181d978a..0000000000
--- a/common/transport/lwm2m/src/test/org/thingsboard/server/transport/lwm2m/server/store/util/LwM2MClientSerDesTest.java
+++ /dev/null
@@ -1,101 +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.server.store.util;
-
-import org.eclipse.leshan.core.link.Link;
-import org.eclipse.leshan.core.request.Identity;
-import org.eclipse.leshan.server.registration.Registration;
-import org.junit.Assert;
-import org.junit.Test;
-import org.thingsboard.server.common.data.device.data.PowerMode;
-import org.thingsboard.server.common.data.id.CustomerId;
-import org.thingsboard.server.common.data.id.DeviceId;
-import org.thingsboard.server.common.data.id.DeviceProfileId;
-import org.thingsboard.server.common.data.id.TenantId;
-import org.thingsboard.server.common.transport.auth.TransportDeviceInfo;
-import org.thingsboard.server.common.transport.auth.ValidateDeviceCredentialsResponse;
-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 java.net.InetSocketAddress;
-import java.util.UUID;
-
-public class LwM2MClientSerDesTest {
-
-    @Test
-    public void serializeDeserialize() {
-        LwM2mClient client = new LwM2mClient("nodeId", "testEndpoint");
-
-        TransportDeviceInfo tdi = new TransportDeviceInfo();
-        tdi.setPowerMode(PowerMode.PSM);
-        tdi.setPsmActivityTimer(10000L);
-        tdi.setPagingTransmissionWindow(2000L);
-        tdi.setEdrxCycle(3000L);
-        tdi.setTenantId(TenantId.fromUUID(UUID.randomUUID()));
-        tdi.setCustomerId(new CustomerId(UUID.randomUUID()));
-        tdi.setDeviceId(new DeviceId(UUID.randomUUID()));
-        tdi.setDeviceProfileId(new DeviceProfileId(UUID.randomUUID()));
-        tdi.setDeviceName("testDevice");
-        tdi.setDeviceType("testType");
-        ValidateDeviceCredentialsResponse credentialsResponse = ValidateDeviceCredentialsResponse.builder()
-                .deviceInfo(tdi)
-                .build();
-
-        client.init(credentialsResponse, UUID.randomUUID());
-
-        Registration registration =
-                new Registration.Builder("test", "testEndpoint", Identity
-                        .unsecure(new InetSocketAddress(1000)))
-                        .supportedContentFormats()
-                        .objectLinks(new Link[]{new Link("/")})
-                        .build();
-
-        client.setRegistration(registration);
-        client.setState(LwM2MClientState.REGISTERED);
-
-        client.getSharedAttributes().put("key1", TransportProtos.TsKvProto.newBuilder().setTs(0).setKv(TransportProtos.KeyValueProto.newBuilder().setStringV("test").build()).build());
-        client.getSharedAttributes().put("key2", TransportProtos.TsKvProto.newBuilder().setTs(1).setKv(TransportProtos.KeyValueProto.newBuilder().setDoubleV(1.02).build()).build());
-
-        byte[] bytes = LwM2MClientSerDes.serialize(client);
-        Assert.assertNotNull(bytes);
-
-        LwM2mClient desClient = LwM2MClientSerDes.deserialize(bytes);
-
-        Assert.assertEquals(client.getNodeId(), desClient.getNodeId());
-        Assert.assertEquals(client.getEndpoint(), desClient.getEndpoint());
-        Assert.assertEquals(client.getResources(), desClient.getResources());
-        Assert.assertEquals(client.getSharedAttributes(), desClient.getSharedAttributes());
-        Assert.assertEquals(client.getKeyTsLatestMap(), desClient.getKeyTsLatestMap());
-        Assert.assertEquals(client.getTenantId(), desClient.getTenantId());
-        Assert.assertEquals(client.getProfileId(), desClient.getProfileId());
-        Assert.assertEquals(client.getDeviceId(), desClient.getDeviceId());
-        Assert.assertEquals(client.getState(), desClient.getState());
-        Assert.assertEquals(client.getSession(), desClient.getSession());
-        Assert.assertEquals(client.getPowerMode(), desClient.getPowerMode());
-        Assert.assertEquals(client.getPsmActivityTimer(), desClient.getPsmActivityTimer());
-        Assert.assertEquals(client.getPagingTransmissionWindow(), desClient.getPagingTransmissionWindow());
-        Assert.assertEquals(client.getEdrxCycle(), desClient.getEdrxCycle());
-        Assert.assertEquals(client.getRegistration(), desClient.getRegistration());
-        Assert.assertEquals(client.isAsleep(), desClient.isAsleep());
-        Assert.assertEquals(client.getLastUplinkTime(), desClient.getLastUplinkTime());
-        Assert.assertEquals(client.getSleepTask(), desClient.getSleepTask());
-        Assert.assertEquals(client.getClientSupportContentFormats(), desClient.getClientSupportContentFormats());
-        Assert.assertEquals(client.getDefaultContentFormat(), desClient.getDefaultContentFormat());
-        Assert.assertEquals(client.getRetryAttempts().get(), desClient.getRetryAttempts().get());
-        Assert.assertEquals(client.getLastSentRpcId(), desClient.getLastSentRpcId());
-    }
-}
\ No newline at end of file
diff --git a/common/transport/lwm2m/src/test/resources/15.xml b/common/transport/lwm2m/src/test/resources/15.xml
new file mode 100644
index 0000000000..11c018b3ac
--- /dev/null
+++ b/common/transport/lwm2m/src/test/resources/15.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LWM2M>
+    <Object ObjectType="MODefinition">
+        <Name>Test 15</Name>
+        <Description1></Description1>
+        <ObjectID>15</ObjectID>
+        <ObjectURN>urn:oma:lwm2m:oma:15:1.0</ObjectURN>
+        <LWM2MVersion>1.0</LWM2MVersion>
+        <ObjectVersion>1.0</ObjectVersion>
+        <MultipleInstances>Multiple</MultipleInstances>
+        <Mandatory>Optional</Mandatory>
+        <Resources>
+            <Item ID="0">
+                <Name>Test</Name>
+                <Operations>R</Operations>
+                <MultipleInstances>Single</MultipleInstances>
+                <Mandatory>Mandatory</Mandatory>
+                <Type>String</Type>
+                <RangeEnumeration></RangeEnumeration>
+                <Units></Units>
+                <Description></Description>
+            </Item>
+        </Resources>
+        <Description2></Description2>
+    </Object>
+</LWM2M>
diff --git a/common/transport/lwm2m/src/test/resources/17.xml b/common/transport/lwm2m/src/test/resources/17.xml
new file mode 100644
index 0000000000..8417c66fb4
--- /dev/null
+++ b/common/transport/lwm2m/src/test/resources/17.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LWM2M>
+    <Object ObjectType="MODefinition">
+        <Name>Test 17</Name>
+        <Description1></Description1>
+        <ObjectID>17</ObjectID>
+        <ObjectURN>urn:oma:lwm2m:oma:17:1.0</ObjectURN>
+        <LWM2MVersion>1.0</LWM2MVersion>
+        <ObjectVersion>1.0</ObjectVersion>
+        <MultipleInstances>Multiple</MultipleInstances>
+        <Mandatory>Mandatory</Mandatory>
+        <Resources>
+            <Item ID="0">
+                <Name>Test</Name>
+                <Operations>R</Operations>
+                <MultipleInstances>Multiple</MultipleInstances>
+                <Mandatory>Optional</Mandatory>
+                <Type>String</Type>
+                <RangeEnumeration></RangeEnumeration>
+                <Units></Units>
+                <Description></Description>
+            </Item>
+        </Resources>
+        <Description2></Description2>
+    </Object>
+</LWM2M>
diff --git a/common/transport/lwm2m/src/test/resources/junit-platform.properties b/common/transport/lwm2m/src/test/resources/junit-platform.properties
new file mode 100644
index 0000000000..f2ed301920
--- /dev/null
+++ b/common/transport/lwm2m/src/test/resources/junit-platform.properties
@@ -0,0 +1,3 @@
+junit.jupiter.execution.parallel.enabled = true
+junit.jupiter.execution.parallel.mode.default = concurrent
+junit.jupiter.execution.parallel.mode.classes.default = concurrent
diff --git a/common/transport/lwm2m/src/test/resources/logback-test.xml b/common/transport/lwm2m/src/test/resources/logback-test.xml
new file mode 100644
index 0000000000..52f2a77588
--- /dev/null
+++ b/common/transport/lwm2m/src/test/resources/logback-test.xml
@@ -0,0 +1,14 @@
+<?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>
+
+    <root level="INFO">
+        <appender-ref ref="console"/>
+    </root>
+
+</configuration>
diff --git a/common/transport/mqtt/pom.xml b/common/transport/mqtt/pom.xml
index f8d1999a2a..952b94ea2f 100644
--- a/common/transport/mqtt/pom.xml
+++ b/common/transport/mqtt/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard.common</groupId>
-        <version>3.6.3-SNAPSHOT</version>
+        <version>3.7.0-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.common.transport</groupId>
@@ -87,11 +87,6 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.awaitility</groupId>
             <artifactId>awaitility</artifactId>
diff --git a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportContext.java b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportContext.java
index 617c00d9b7..e035b2a861 100644
--- a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportContext.java
+++ b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportContext.java
@@ -27,7 +27,7 @@ import org.thingsboard.server.common.transport.TransportContext;
 import org.thingsboard.server.transport.mqtt.adaptors.JsonMqttAdaptor;
 import org.thingsboard.server.transport.mqtt.adaptors.ProtoMqttAdaptor;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import java.net.InetSocketAddress;
 import java.util.concurrent.atomic.AtomicInteger;
 
diff --git a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportHandler.java b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportHandler.java
index 8360111a54..b48cb39ca0 100644
--- a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportHandler.java
+++ b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportHandler.java
@@ -45,6 +45,7 @@ import io.netty.util.concurrent.GenericFutureListener;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.leshan.core.ResponseCode;
 import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.server.common.adaptor.AdaptorException;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.DeviceProfile;
@@ -64,7 +65,6 @@ import org.thingsboard.server.common.msg.tools.TbRateLimitsException;
 import org.thingsboard.server.common.transport.SessionMsgListener;
 import org.thingsboard.server.common.transport.TransportService;
 import org.thingsboard.server.common.transport.TransportServiceCallback;
-import org.thingsboard.server.common.adaptor.AdaptorException;
 import org.thingsboard.server.common.transport.auth.SessionInfoCreator;
 import org.thingsboard.server.common.transport.auth.TransportDeviceInfo;
 import org.thingsboard.server.common.transport.auth.ValidateDeviceCredentialsResponse;
@@ -323,6 +323,9 @@ public class MqttTransportHandler extends ChannelInboundHandlerAdapter implement
                 if (checkConnected(ctx, msg)) {
                     ctx.writeAndFlush(new MqttMessage(new MqttFixedHeader(PINGRESP, false, AT_MOST_ONCE, false, 0)));
                     transportService.recordActivity(deviceSessionCtx.getSessionInfo());
+                    if (gatewaySessionHandler != null) {
+                        gatewaySessionHandler.onGatewayPing();
+                    }
                 }
                 break;
             case DISCONNECT:
@@ -1080,12 +1083,15 @@ public class MqttTransportHandler extends ChannelInboundHandlerAdapter implement
         try {
             JsonNode infoNode = context.getMapper().readTree(device.getAdditionalInfo());
             if (infoNode != null) {
-                JsonNode gatewayNode = infoNode.get("gateway");
+                JsonNode gatewayNode = infoNode.get(DataConstants.GATEWAY_PARAMETER);
                 if (gatewayNode != null && gatewayNode.asBoolean()) {
-                    gatewaySessionHandler = new GatewaySessionHandler(deviceSessionCtx, sessionId);
-                    if (infoNode.has(DefaultTransportService.OVERWRITE_ACTIVITY_TIME) && infoNode.get(DefaultTransportService.OVERWRITE_ACTIVITY_TIME).isBoolean()) {
-                        sessionMetaData.setOverwriteActivityTime(infoNode.get(DefaultTransportService.OVERWRITE_ACTIVITY_TIME).asBoolean());
+                    boolean overwriteDevicesActivity = false;
+                    if (infoNode.has(DataConstants.OVERWRITE_ACTIVITY_TIME_PARAMETER)
+                            && infoNode.get(DataConstants.OVERWRITE_ACTIVITY_TIME_PARAMETER).isBoolean()) {
+                        overwriteDevicesActivity = infoNode.get(DataConstants.OVERWRITE_ACTIVITY_TIME_PARAMETER).asBoolean();
+                        sessionMetaData.setOverwriteActivityTime(overwriteDevicesActivity);
                     }
+                    gatewaySessionHandler = new GatewaySessionHandler(deviceSessionCtx, sessionId, overwriteDevicesActivity);
                 }
             }
         } catch (IOException e) {
@@ -1099,7 +1105,7 @@ public class MqttTransportHandler extends ChannelInboundHandlerAdapter implement
                 SparkplugTopic sparkplugTopicNode = validatedSparkplugTopicConnectedNode(connectMessage);
                 if (sparkplugTopicNode != null) {
                     SparkplugBProto.Payload sparkplugBProtoNode = SparkplugBProto.Payload.parseFrom(connectMessage.payload().willMessageInBytes());
-                    sparkplugSessionHandler = new SparkplugNodeSessionHandler(this, deviceSessionCtx, sessionId, sparkplugTopicNode);
+                    sparkplugSessionHandler = new SparkplugNodeSessionHandler(this, deviceSessionCtx, sessionId, true, sparkplugTopicNode);
                     sparkplugSessionHandler.onAttributesTelemetryProto(0, sparkplugBProtoNode, sparkplugTopicNode);
                     sessionMetaData.setOverwriteActivityTime(true);
                 } else {
@@ -1354,6 +1360,9 @@ public class MqttTransportHandler extends ChannelInboundHandlerAdapter implement
     @Override
     public void onDeviceUpdate(TransportProtos.SessionInfoProto sessionInfo, Device device, Optional<DeviceProfile> deviceProfileOpt) {
         deviceSessionCtx.onDeviceUpdate(sessionInfo, device, deviceProfileOpt);
+        if (gatewaySessionHandler != null) {
+            gatewaySessionHandler.onDeviceUpdate(sessionInfo, device, deviceProfileOpt);
+        }
     }
 
     @Override
diff --git a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportService.java b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportService.java
index c412672d34..fe91657f15 100644
--- a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportService.java
+++ b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportService.java
@@ -31,8 +31,8 @@ import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.TbTransportService;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import java.net.InetSocketAddress;
 
 /**
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/AbstractGatewaySessionHandler.java b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/AbstractGatewaySessionHandler.java
index 1cb391b1f4..d033774e93 100644
--- a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/AbstractGatewaySessionHandler.java
+++ b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/AbstractGatewaySessionHandler.java
@@ -16,6 +16,7 @@
 package org.thingsboard.server.transport.mqtt.session;
 
 
+import com.fasterxml.jackson.databind.JsonNode;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
@@ -32,17 +33,21 @@ import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.mqtt.MqttMessage;
 import io.netty.handler.codec.mqtt.MqttPublishMessage;
+import lombok.Getter;
+import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ConcurrentReferenceHashMap;
+import org.thingsboard.server.common.adaptor.AdaptorException;
+import org.thingsboard.server.common.adaptor.JsonConverter;
+import org.thingsboard.server.common.adaptor.ProtoConverter;
 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.StringUtils;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.transport.TransportService;
 import org.thingsboard.server.common.transport.TransportServiceCallback;
-import org.thingsboard.server.common.adaptor.AdaptorException;
-import org.thingsboard.server.common.adaptor.JsonConverter;
-import org.thingsboard.server.common.adaptor.ProtoConverter;
 import org.thingsboard.server.common.transport.auth.GetOrCreateDeviceFromGatewayResponse;
 import org.thingsboard.server.common.transport.auth.TransportDeviceInfo;
 import org.thingsboard.server.gen.transport.TransportApiProtos;
@@ -57,13 +62,14 @@ import org.thingsboard.server.transport.mqtt.adaptors.ProtoMqttAdaptor;
 import org.thingsboard.server.transport.mqtt.util.ReturnCode;
 import org.thingsboard.server.transport.mqtt.util.sparkplug.SparkplugConnectionState;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
@@ -101,7 +107,11 @@ public abstract class AbstractGatewaySessionHandler<T extends AbstractGatewayDev
     protected final ChannelHandlerContext channel;
     protected final DeviceSessionCtx deviceSessionCtx;
 
-    public AbstractGatewaySessionHandler(DeviceSessionCtx deviceSessionCtx, UUID sessionId) {
+    @Getter
+    @Setter
+    private boolean overwriteDevicesActivity = false;
+
+    public AbstractGatewaySessionHandler(DeviceSessionCtx deviceSessionCtx, UUID sessionId, boolean overwriteDevicesActivity) {
         this.context = deviceSessionCtx.getContext();
         this.transportService = context.getTransportService();
         this.deviceSessionCtx = deviceSessionCtx;
@@ -112,6 +122,7 @@ public abstract class AbstractGatewaySessionHandler<T extends AbstractGatewayDev
         this.deviceCreationLockMap = createWeakMap();
         this.mqttQoSMap = deviceSessionCtx.getMqttQoSMap();
         this.channel = deviceSessionCtx.getChannel();
+        this.overwriteDevicesActivity = overwriteDevicesActivity;
     }
 
     ConcurrentReferenceHashMap<String, Lock> createWeakMap() {
@@ -164,6 +175,12 @@ public abstract class AbstractGatewaySessionHandler<T extends AbstractGatewayDev
         }
     }
 
+    public void onGatewayPing() {
+        if (overwriteDevicesActivity) {
+            devices.forEach((deviceName, deviceSessionCtx) -> transportService.recordActivity(deviceSessionCtx.getSessionInfo()));
+        }
+    }
+
     public void onDevicesDisconnect() {
         devices.forEach(this::deregisterSession);
     }
@@ -221,6 +238,14 @@ public abstract class AbstractGatewaySessionHandler<T extends AbstractGatewayDev
         }, context.getExecutor());
     }
 
+    public void onDeviceUpdate(TransportProtos.SessionInfoProto sessionInfo, Device device, Optional<DeviceProfile> deviceProfileOpt) {
+        log.trace("[{}][{}] onDeviceUpdate: [{}]", gateway.getTenantId(), gateway.getDeviceId(), device);
+        JsonNode deviceAdditionalInfo = device.getAdditionalInfo();
+        if (deviceAdditionalInfo.has(DataConstants.GATEWAY_PARAMETER) && deviceAdditionalInfo.has(DataConstants.OVERWRITE_ACTIVITY_TIME_PARAMETER)) {
+            overwriteDevicesActivity = deviceAdditionalInfo.get(DataConstants.OVERWRITE_ACTIVITY_TIME_PARAMETER).asBoolean();
+        }
+    }
+
     ListenableFuture<T> onDeviceConnect(String deviceName, String deviceType) {
         T result = devices.get(deviceName);
         if (result == null) {
diff --git a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/GatewaySessionHandler.java b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/GatewaySessionHandler.java
index 9ccc88aa82..9aa228afff 100644
--- a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/GatewaySessionHandler.java
+++ b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/GatewaySessionHandler.java
@@ -25,10 +25,10 @@ import java.util.UUID;
 /**
  * Created by nickAS21 on 26.12.22
  */
-public class GatewaySessionHandler extends AbstractGatewaySessionHandler {
+public class GatewaySessionHandler extends AbstractGatewaySessionHandler<GatewayDeviceSessionContext> {
 
-    public GatewaySessionHandler(DeviceSessionCtx deviceSessionCtx, UUID sessionId) {
-        super(deviceSessionCtx, sessionId);
+    public GatewaySessionHandler(DeviceSessionCtx deviceSessionCtx, UUID sessionId, boolean overwriteDevicesActivity) {
+        super(deviceSessionCtx, sessionId, overwriteDevicesActivity);
     }
 
     public void onDeviceConnect(MqttPublishMessage mqttMsg) throws AdaptorException {
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 d4f2364d79..1f389fced1 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
@@ -43,7 +43,7 @@ import org.thingsboard.server.transport.mqtt.MqttTransportHandler;
 import org.thingsboard.server.transport.mqtt.util.sparkplug.MetricDataType;
 import org.thingsboard.server.transport.mqtt.util.sparkplug.SparkplugTopic;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -73,8 +73,8 @@ public class SparkplugNodeSessionHandler extends AbstractGatewaySessionHandler<S
     private final MqttTransportHandler parent;
 
     public SparkplugNodeSessionHandler(MqttTransportHandler parent, DeviceSessionCtx deviceSessionCtx, UUID sessionId,
-                                       SparkplugTopic sparkplugTopicNode) {
-        super(deviceSessionCtx, sessionId);
+                                       boolean overwriteDevicesActivity, SparkplugTopic sparkplugTopicNode) {
+        super(deviceSessionCtx, sessionId, overwriteDevicesActivity);
         this.parent = parent;
         this.sparkplugTopicNode = sparkplugTopicNode;
         this.nodeBirthMetrics = new ConcurrentHashMap<>();
@@ -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/mqtt/src/test/java/org/thingsboard/server/transport/mqtt/MqttTransportHandlerTest.java b/common/transport/mqtt/src/test/java/org/thingsboard/server/transport/mqtt/MqttTransportHandlerTest.java
index 31b3df5689..250c33441c 100644
--- a/common/transport/mqtt/src/test/java/org/thingsboard/server/transport/mqtt/MqttTransportHandlerTest.java
+++ b/common/transport/mqtt/src/test/java/org/thingsboard/server/transport/mqtt/MqttTransportHandlerTest.java
@@ -28,13 +28,14 @@ import io.netty.handler.codec.mqtt.MqttPublishVariableHeader;
 import io.netty.handler.codec.mqtt.MqttQoS;
 import io.netty.handler.ssl.SslHandler;
 import lombok.extern.slf4j.Slf4j;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.Spy;
 import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.thingsboard.common.util.ThingsBoardThreadFactory;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.DeviceProfile;
@@ -58,16 +59,17 @@ import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static org.assertj.core.api.Assertions.fail;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.empty;
 import static org.hamcrest.Matchers.greaterThan;
 import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.fail;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.BDDMockito.willDoNothing;
 import static org.mockito.BDDMockito.willReturn;
+import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
@@ -75,7 +77,7 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 @Slf4j
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class MqttTransportHandlerTest {
 
     public static final int MSG_QUEUE_LIMIT = 10;
@@ -96,17 +98,17 @@ public class MqttTransportHandlerTest {
     @Spy
     TransportService transportService;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
 
-        willReturn(MSG_QUEUE_LIMIT).given(context).getMessageQueueSizePerDeviceLimit();
-        willReturn(transportService).given(context).getTransportService();
+        lenient().doReturn(MSG_QUEUE_LIMIT).when(context).getMessageQueueSizePerDeviceLimit();
+        lenient().doReturn(transportService).when(context).getTransportService();
 
         handler = spy(new MqttTransportHandler(context, sslHandler));
-        willReturn(IP_ADDR).given(handler).getAddress(any());
+        lenient().doReturn(IP_ADDR).when(handler).getAddress(any());
     }
 
-    @After
+    @AfterEach
     public void tearDown() {
         if (executor != null) {
             executor.shutdownNow();
diff --git a/common/transport/mqtt/src/test/java/org/thingsboard/server/transport/mqtt/session/GatewaySessionHandlerTest.java b/common/transport/mqtt/src/test/java/org/thingsboard/server/transport/mqtt/session/GatewaySessionHandlerTest.java
index bd1ddd2d54..158acc2ce2 100644
--- a/common/transport/mqtt/src/test/java/org/thingsboard/server/transport/mqtt/session/GatewaySessionHandlerTest.java
+++ b/common/transport/mqtt/src/test/java/org/thingsboard/server/transport/mqtt/session/GatewaySessionHandlerTest.java
@@ -15,15 +15,101 @@
  */
 package org.thingsboard.server.transport.mqtt.session;
 
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.util.ConcurrentReferenceHashMap;
+import org.thingsboard.server.common.data.id.CustomerId;
+import org.thingsboard.server.common.data.id.DeviceId;
+import org.thingsboard.server.common.data.id.DeviceProfileId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.transport.TransportService;
+import org.thingsboard.server.common.transport.auth.TransportDeviceInfo;
+import org.thingsboard.server.transport.mqtt.MqttTransportContext;
+
+import java.lang.reflect.Field;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.BDDMockito.willCallRealMethod;
+import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.doNothing;
 
+@ExtendWith(MockitoExtension.class)
 public class GatewaySessionHandlerTest {
 
+    @Mock
+    private TransportService transportService;
+
+    @Mock
+    private DeviceSessionCtx deviceSessionCtx;
+
+    @Mock
+    private MqttTransportContext transportContext;
+
+    private GatewaySessionHandler handler;
+
+    @BeforeEach
+    public void setup() {
+        lenient().when(deviceSessionCtx.getSessionId()).thenReturn(UUID.randomUUID());
+        lenient().doNothing().when(transportService).recordActivity(any());
+        lenient().when(transportContext.getTransportService()).thenReturn(transportService);
+        lenient().when(deviceSessionCtx.getContext()).thenReturn(transportContext);
+        handler = new GatewaySessionHandler(deviceSessionCtx, UUID.randomUUID(), true);
+        lenient().when(handler.getNodeId()).thenReturn("nodeId");
+    }
+
+    @Test
+    public void shouldRecordActivityWhenOnGatewayPing() throws Exception {
+        // Given
+        ConcurrentHashMap<String, GatewayDeviceSessionContext> devices = new ConcurrentHashMap<>();
+        TransportDeviceInfo deviceInfo = new TransportDeviceInfo();
+        deviceInfo.setDeviceId(new DeviceId(UUID.randomUUID()));
+        deviceInfo.setTenantId(new TenantId(UUID.randomUUID()));
+        deviceInfo.setCustomerId(new CustomerId(UUID.randomUUID()));
+        deviceInfo.setDeviceName("device1");
+        deviceInfo.setDeviceType("default");
+        deviceInfo.setDeviceProfileId(new DeviceProfileId(UUID.randomUUID()));
+        deviceInfo.setAdditionalInfo("{\"gateway\": true, \"overwriteDeviceActivity\": true}");
+        lenient().when(deviceSessionCtx.getDeviceInfo()).thenReturn(deviceInfo);
+        GatewayDeviceSessionContext gatewayDeviceSessionContext = new GatewayDeviceSessionContext(handler, deviceInfo, null, null, transportService);
+        devices.put("device1", gatewayDeviceSessionContext);
+        lenient().when(handler.getNodeId()).thenReturn("nodeId");
+        Field devicesField = AbstractGatewaySessionHandler.class.getDeclaredField("devices");
+        devicesField.setAccessible(true);
+        devicesField.set(handler, devices);
+
+        // When
+        handler.onGatewayPing();
+
+        // Then
+        verify(transportService).recordActivity(gatewayDeviceSessionContext.getSessionInfo());
+    }
+
+    @Test
+    public void shouldNotRecordActivityWhenNoDevicesOnGatewayPing() throws Exception {
+        // Given
+        ConcurrentHashMap<String, GatewayDeviceSessionContext> devices = new ConcurrentHashMap<>();
+        Field devicesField = AbstractGatewaySessionHandler.class.getDeclaredField("devices");
+        devicesField.setAccessible(true);
+        devicesField.set(handler, devices);
+
+        // When
+        handler.onGatewayPing();
+
+        // Then
+        verify(transportService, never()).recordActivity(any());
+    }
+
     @Test
     public void givenGatewaySessionHandler_WhenCreateWeakMap_thenConcurrentReferenceHashMapClass() {
         GatewaySessionHandler gsh = mock(GatewaySessionHandler.class);
diff --git a/common/transport/mqtt/src/test/java/org/thingsboard/server/transport/mqtt/util/MqttTopicFilterFactoryTest.java b/common/transport/mqtt/src/test/java/org/thingsboard/server/transport/mqtt/util/MqttTopicFilterFactoryTest.java
index b8dee2e65c..89d6eb1f18 100644
--- a/common/transport/mqtt/src/test/java/org/thingsboard/server/transport/mqtt/util/MqttTopicFilterFactoryTest.java
+++ b/common/transport/mqtt/src/test/java/org/thingsboard/server/transport/mqtt/util/MqttTopicFilterFactoryTest.java
@@ -15,16 +15,16 @@
  */
 package org.thingsboard.server.transport.mqtt.util;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 import javax.script.ScriptException;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class MqttTopicFilterFactoryTest {
 
     private static String TEST_STR_1 = "Sensor/Temperature/House/48";
diff --git a/common/transport/mqtt/src/test/resources/junit-platform.properties b/common/transport/mqtt/src/test/resources/junit-platform.properties
new file mode 100644
index 0000000000..f2ed301920
--- /dev/null
+++ b/common/transport/mqtt/src/test/resources/junit-platform.properties
@@ -0,0 +1,3 @@
+junit.jupiter.execution.parallel.enabled = true
+junit.jupiter.execution.parallel.mode.default = concurrent
+junit.jupiter.execution.parallel.mode.classes.default = concurrent
diff --git a/common/transport/mqtt/src/test/resources/logback-test.xml b/common/transport/mqtt/src/test/resources/logback-test.xml
new file mode 100644
index 0000000000..52f2a77588
--- /dev/null
+++ b/common/transport/mqtt/src/test/resources/logback-test.xml
@@ -0,0 +1,14 @@
+<?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>
+
+    <root level="INFO">
+        <appender-ref ref="console"/>
+    </root>
+
+</configuration>
diff --git a/common/transport/pom.xml b/common/transport/pom.xml
index 8bb5073638..0c5c7a02c9 100644
--- a/common/transport/pom.xml
+++ b/common/transport/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.6.3-SNAPSHOT</version>
+        <version>3.7.0-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>
diff --git a/common/transport/snmp/pom.xml b/common/transport/snmp/pom.xml
index 04273222f2..8ad570fceb 100644
--- a/common/transport/snmp/pom.xml
+++ b/common/transport/snmp/pom.xml
@@ -21,7 +21,7 @@
 
     <parent>
         <groupId>org.thingsboard.common</groupId>
-        <version>3.6.3-SNAPSHOT</version>
+        <version>3.7.0-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
 
diff --git a/common/transport/snmp/src/main/java/org/thingsboard/server/transport/snmp/service/ProtoTransportEntityService.java b/common/transport/snmp/src/main/java/org/thingsboard/server/transport/snmp/service/ProtoTransportEntityService.java
index 062da40a1e..3882a08b20 100644
--- a/common/transport/snmp/src/main/java/org/thingsboard/server/transport/snmp/service/ProtoTransportEntityService.java
+++ b/common/transport/snmp/src/main/java/org/thingsboard/server/transport/snmp/service/ProtoTransportEntityService.java
@@ -17,6 +17,7 @@ package org.thingsboard.server.transport.snmp.service;
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.device.data.DeviceData;
 import org.thingsboard.server.common.data.device.data.DeviceTransportConfiguration;
@@ -24,8 +25,8 @@ import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
 import org.thingsboard.server.common.data.security.DeviceCredentials;
 import org.thingsboard.server.common.transport.TransportService;
+import org.thingsboard.server.common.util.ProtoUtils;
 import org.thingsboard.server.gen.transport.TransportProtos;
-import org.thingsboard.server.queue.util.DataDecodingEncodingService;
 import org.thingsboard.server.queue.util.TbSnmpTransportComponent;
 
 import java.util.UUID;
@@ -35,7 +36,6 @@ import java.util.UUID;
 @RequiredArgsConstructor
 public class ProtoTransportEntityService {
     private final TransportService transportService;
-    private final DataDecodingEncodingService dataDecodingEncodingService;
 
     public Device getDeviceById(DeviceId id) {
         TransportProtos.GetDeviceResponseMsg deviceProto = transportService.getDevice(TransportProtos.GetDeviceRequestMsg.newBuilder()
@@ -55,9 +55,8 @@ public class ProtoTransportEntityService {
         device.setId(id);
         device.setDeviceProfileId(deviceProfileId);
 
-        DeviceTransportConfiguration deviceTransportConfiguration = (DeviceTransportConfiguration) dataDecodingEncodingService.decode(
-                deviceProto.getDeviceTransportConfiguration().toByteArray()
-        ).orElseThrow(() -> new IllegalStateException("Can't find device transport configuration"));
+        DeviceTransportConfiguration deviceTransportConfiguration = JacksonUtil.fromBytes(
+                deviceProto.getDeviceTransportConfiguration().toByteArray(), DeviceTransportConfiguration.class);
 
         DeviceData deviceData = new DeviceData();
         deviceData.setTransportConfiguration(deviceTransportConfiguration);
@@ -74,8 +73,11 @@ public class ProtoTransportEntityService {
                         .build()
         );
 
-        return (DeviceCredentials) dataDecodingEncodingService.decode(deviceCredentialsResponse.getDeviceCredentialsData().toByteArray())
-                .orElseThrow(() -> new IllegalArgumentException("Device credentials not found"));
+        if (deviceCredentialsResponse.hasDeviceCredentialsData()) {
+            return ProtoUtils.fromProto(deviceCredentialsResponse.getDeviceCredentialsData());
+        } else {
+            throw new IllegalArgumentException("Device credentials not found");
+        }
     }
 
     public TransportProtos.GetSnmpDevicesResponseMsg getSnmpDevicesIds(int page, int pageSize) {
diff --git a/common/transport/snmp/src/main/java/org/thingsboard/server/transport/snmp/service/SnmpTransportService.java b/common/transport/snmp/src/main/java/org/thingsboard/server/transport/snmp/service/SnmpTransportService.java
index 3dc293b70b..12008c10b5 100644
--- a/common/transport/snmp/src/main/java/org/thingsboard/server/transport/snmp/service/SnmpTransportService.java
+++ b/common/transport/snmp/src/main/java/org/thingsboard/server/transport/snmp/service/SnmpTransportService.java
@@ -65,8 +65,8 @@ import org.thingsboard.server.transport.snmp.SnmpTransportContext;
 import org.thingsboard.server.transport.snmp.session.DeviceSessionContext;
 import org.thingsboard.server.transport.snmp.session.ScheduledTask;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/common/transport/snmp/src/test/resources/junit-platform.properties b/common/transport/snmp/src/test/resources/junit-platform.properties
new file mode 100644
index 0000000000..f2ed301920
--- /dev/null
+++ b/common/transport/snmp/src/test/resources/junit-platform.properties
@@ -0,0 +1,3 @@
+junit.jupiter.execution.parallel.enabled = true
+junit.jupiter.execution.parallel.mode.default = concurrent
+junit.jupiter.execution.parallel.mode.classes.default = concurrent
diff --git a/common/transport/snmp/src/test/resources/logback-test.xml b/common/transport/snmp/src/test/resources/logback-test.xml
new file mode 100644
index 0000000000..52f2a77588
--- /dev/null
+++ b/common/transport/snmp/src/test/resources/logback-test.xml
@@ -0,0 +1,14 @@
+<?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>
+
+    <root level="INFO">
+        <appender-ref ref="console"/>
+    </root>
+
+</configuration>
diff --git a/common/transport/transport-api/pom.xml b/common/transport/transport-api/pom.xml
index 95624663dd..20d0f6e5d2 100644
--- a/common/transport/transport-api/pom.xml
+++ b/common/transport/transport-api/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard.common</groupId>
-        <version>3.6.3-SNAPSHOT</version>
+        <version>3.7.0-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.common.transport</groupId>
@@ -85,11 +85,6 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.awaitility</groupId>
             <artifactId>awaitility</artifactId>
@@ -127,21 +122,12 @@
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-jdk15on</artifactId>
+            <artifactId>bcprov-jdk18on</artifactId>
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcpkix-jdk15on</artifactId>
+            <artifactId>bcpkix-jdk18on</artifactId>
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.xolstice.maven.plugins</groupId>
-                <artifactId>protobuf-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>
diff --git a/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/TransportContext.java b/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/TransportContext.java
index cd96c478be..b0c085b2e9 100644
--- a/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/TransportContext.java
+++ b/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/TransportContext.java
@@ -26,8 +26,8 @@ import org.thingsboard.server.common.transport.limits.TransportRateLimitService;
 import org.thingsboard.server.queue.discovery.TbServiceInfoProvider;
 import org.thingsboard.server.queue.scheduler.SchedulerComponent;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import java.util.concurrent.ExecutorService;
 
 /**
diff --git a/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/TransportDeviceProfileCache.java b/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/TransportDeviceProfileCache.java
index b977f442b4..cdd9983bb8 100644
--- a/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/TransportDeviceProfileCache.java
+++ b/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/TransportDeviceProfileCache.java
@@ -15,19 +15,19 @@
  */
 package org.thingsboard.server.common.transport;
 
-import com.google.protobuf.ByteString;
 import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
+import org.thingsboard.server.gen.transport.TransportProtos;
 
 public interface TransportDeviceProfileCache {
 
-    DeviceProfile getOrCreate(DeviceProfileId id, ByteString profileBody);
+    DeviceProfile getOrCreate(DeviceProfileId id, TransportProtos.DeviceProfileProto proto);
 
     DeviceProfile get(DeviceProfileId id);
 
     void put(DeviceProfile profile);
 
-    DeviceProfile put(ByteString profileBody);
+    DeviceProfile put(TransportProtos.DeviceProfileProto proto);
 
     void evict(DeviceProfileId id);
 
diff --git a/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/TransportTenantProfileCache.java b/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/TransportTenantProfileCache.java
index 429cb1d225..5b29a12ccb 100644
--- a/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/TransportTenantProfileCache.java
+++ b/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/TransportTenantProfileCache.java
@@ -15,11 +15,11 @@
  */
 package org.thingsboard.server.common.transport;
 
-import com.google.protobuf.ByteString;
 import org.thingsboard.server.common.data.TenantProfile;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.TenantProfileId;
 import org.thingsboard.server.common.transport.profile.TenantProfileUpdateResult;
+import org.thingsboard.server.gen.transport.TransportProtos;
 
 import java.util.Set;
 
@@ -27,7 +27,7 @@ public interface TransportTenantProfileCache {
 
     TenantProfile get(TenantId tenantId);
 
-    TenantProfileUpdateResult put(ByteString profileBody);
+    TenantProfileUpdateResult put(TransportProtos.TenantProfileProto proto);
 
     boolean put(TenantId tenantId, TenantProfileId profileId);
 
diff --git a/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/config/ssl/SslCredentialsConfig.java b/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/config/ssl/SslCredentialsConfig.java
index 06aefa6209..c758d707fc 100644
--- a/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/config/ssl/SslCredentialsConfig.java
+++ b/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/config/ssl/SslCredentialsConfig.java
@@ -18,7 +18,7 @@ package org.thingsboard.server.common.transport.config.ssl;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 @Slf4j
 @Data
diff --git a/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/DefaultTransportDeviceProfileCache.java b/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/DefaultTransportDeviceProfileCache.java
index 9aa1704b8f..3be046a6a5 100644
--- a/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/DefaultTransportDeviceProfileCache.java
+++ b/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/DefaultTransportDeviceProfileCache.java
@@ -15,7 +15,6 @@
  */
 package org.thingsboard.server.common.transport.service;
 
-import com.google.protobuf.ByteString;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
@@ -25,11 +24,10 @@ import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
 import org.thingsboard.server.common.transport.TransportDeviceProfileCache;
 import org.thingsboard.server.common.transport.TransportService;
+import org.thingsboard.server.common.util.ProtoUtils;
 import org.thingsboard.server.gen.transport.TransportProtos;
-import org.thingsboard.server.queue.util.DataDecodingEncodingService;
 import org.thingsboard.server.queue.util.TbTransportComponent;
 
-import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.locks.Lock;
@@ -42,7 +40,6 @@ public class DefaultTransportDeviceProfileCache implements TransportDeviceProfil
 
     private final Lock deviceProfileFetchLock = new ReentrantLock();
     private final ConcurrentMap<DeviceProfileId, DeviceProfile> deviceProfiles = new ConcurrentHashMap<>();
-    private final DataDecodingEncodingService dataDecodingEncodingService;
 
     private TransportService transportService;
 
@@ -52,19 +49,12 @@ public class DefaultTransportDeviceProfileCache implements TransportDeviceProfil
         this.transportService = transportService;
     }
 
-    public DefaultTransportDeviceProfileCache(DataDecodingEncodingService dataDecodingEncodingService) {
-        this.dataDecodingEncodingService = dataDecodingEncodingService;
-    }
-
     @Override
-    public DeviceProfile getOrCreate(DeviceProfileId id, ByteString profileBody) {
+    public DeviceProfile getOrCreate(DeviceProfileId id, TransportProtos.DeviceProfileProto proto) {
         DeviceProfile profile = deviceProfiles.get(id);
         if (profile == null) {
-            Optional<DeviceProfile> deviceProfile = dataDecodingEncodingService.decode(profileBody.toByteArray());
-            if (deviceProfile.isPresent()) {
-                profile = deviceProfile.get();
-                deviceProfiles.put(id, profile);
-            }
+            profile = ProtoUtils.fromProto(proto);
+            deviceProfiles.put(id, profile);
         }
         return profile;
     }
@@ -80,14 +70,10 @@ public class DefaultTransportDeviceProfileCache implements TransportDeviceProfil
     }
 
     @Override
-    public DeviceProfile put(ByteString profileBody) {
-        Optional<DeviceProfile> deviceProfile = dataDecodingEncodingService.decode(profileBody.toByteArray());
-        if (deviceProfile.isPresent()) {
-            put(deviceProfile.get());
-            return deviceProfile.get();
-        } else {
-            return null;
-        }
+    public DeviceProfile put(TransportProtos.DeviceProfileProto proto) {
+        DeviceProfile deviceProfile = ProtoUtils.fromProto(proto);
+        put(deviceProfile);
+        return deviceProfile;
     }
 
     @Override
@@ -107,14 +93,8 @@ public class DefaultTransportDeviceProfileCache implements TransportDeviceProfil
                         .setEntityIdLSB(id.getId().getLeastSignificantBits())
                         .build();
                 TransportProtos.GetEntityProfileResponseMsg entityProfileMsg = transportService.getEntityProfile(msg);
-                Optional<DeviceProfile> profileOpt = dataDecodingEncodingService.decode(entityProfileMsg.getData().toByteArray());
-                if (profileOpt.isPresent()) {
-                    profile = profileOpt.get();
-                    this.put(profile);
-                } else {
-                    log.warn("[{}] Can't find device profile: {}", id, entityProfileMsg.getData());
-                    throw new RuntimeException("Can't find device profile!");
-                }
+                profile = ProtoUtils.fromProto(entityProfileMsg.getDeviceProfile());
+                this.put(profile);
             } finally {
                 deviceProfileFetchLock.unlock();
             }
diff --git a/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/DefaultTransportResourceCache.java b/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/DefaultTransportResourceCache.java
index b30e8e3ccc..b25be27c8a 100644
--- a/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/DefaultTransportResourceCache.java
+++ b/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/DefaultTransportResourceCache.java
@@ -16,6 +16,7 @@
 package org.thingsboard.server.common.transport.service;
 
 import lombok.Data;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
@@ -24,8 +25,8 @@ import org.thingsboard.server.common.data.TbResource;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.transport.TransportResourceCache;
 import org.thingsboard.server.common.transport.TransportService;
+import org.thingsboard.server.common.util.ProtoUtils;
 import org.thingsboard.server.gen.transport.TransportProtos;
-import org.thingsboard.server.queue.util.DataDecodingEncodingService;
 import org.thingsboard.server.queue.util.TbTransportComponent;
 
 import java.util.Optional;
@@ -39,19 +40,15 @@ import java.util.concurrent.locks.ReentrantLock;
 @Slf4j
 @Component
 @TbTransportComponent
+@RequiredArgsConstructor
 public class DefaultTransportResourceCache implements TransportResourceCache {
 
     private final Lock resourceFetchLock = new ReentrantLock();
     private final ConcurrentMap<ResourceCompositeKey, TbResource> resources = new ConcurrentHashMap<>();
     private final Set<ResourceCompositeKey> keys = ConcurrentHashMap.newKeySet();
-    private final DataDecodingEncodingService dataDecodingEncodingService;
+    @Lazy
     private final TransportService transportService;
 
-    public DefaultTransportResourceCache(DataDecodingEncodingService dataDecodingEncodingService, @Lazy TransportService transportService) {
-        this.dataDecodingEncodingService = dataDecodingEncodingService;
-        this.transportService = transportService;
-    }
-
     @Override
     public Optional<TbResource> get(TenantId tenantId, ResourceType resourceType, String resourceKey) {
         ResourceCompositeKey compositeKey = new ResourceCompositeKey(tenantId, resourceType, resourceKey);
@@ -92,9 +89,8 @@ public class DefaultTransportResourceCache implements TransportResourceCache {
                 .setResourceKey(compositeKey.resourceKey);
         TransportProtos.GetResourceResponseMsg responseMsg = transportService.getResource(builder.build());
 
-        Optional<TbResource> optionalResource = dataDecodingEncodingService.decode(responseMsg.getResource().toByteArray());
-        if (optionalResource.isPresent()) {
-            TbResource resource = optionalResource.get();
+        if (responseMsg.hasResource()) {
+            TbResource resource = ProtoUtils.fromProto(responseMsg.getResource());
             resources.put(new ResourceCompositeKey(resource.getTenantId(), resource.getResourceType(), resource.getResourceKey()), resource);
             return resource;
         }
diff --git a/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/DefaultTransportService.java b/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/DefaultTransportService.java
index 4aa989ed25..41886bd88a 100644
--- a/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/DefaultTransportService.java
+++ b/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/DefaultTransportService.java
@@ -15,12 +15,12 @@
  */
 package org.thingsboard.server.common.transport.service;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
-import com.google.protobuf.ByteString;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -80,6 +80,7 @@ import org.thingsboard.server.common.transport.limits.EntityLimitKey;
 import org.thingsboard.server.common.transport.limits.EntityLimitsCache;
 import org.thingsboard.server.common.transport.limits.TransportRateLimitService;
 import org.thingsboard.server.common.transport.util.JsonUtils;
+import org.thingsboard.server.common.util.ProtoUtils;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.gen.transport.TransportProtos.ProvisionDeviceRequestMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ProvisionDeviceResponseMsg;
@@ -103,11 +104,10 @@ import org.thingsboard.server.queue.provider.TbQueueProducerProvider;
 import org.thingsboard.server.queue.provider.TbTransportQueueFactory;
 import org.thingsboard.server.queue.scheduler.SchedulerComponent;
 import org.thingsboard.server.queue.util.AfterStartUp;
-import org.thingsboard.server.queue.util.DataDecodingEncodingService;
 import org.thingsboard.server.queue.util.TbTransportComponent;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -132,7 +132,6 @@ import java.util.stream.Collectors;
 @TbTransportComponent
 public class DefaultTransportService extends TransportActivityManager implements TransportService {
 
-    public static final String OVERWRITE_ACTIVITY_TIME = "overwriteActivityTime";
     public static final TransportProtos.SessionEventMsg SESSION_EVENT_MSG_OPEN = TransportProtos.SessionEventMsg.newBuilder()
             .setSessionType(TransportProtos.SessionType.ASYNC)
             .setEvent(TransportProtos.SessionEvent.OPEN).build();
@@ -154,7 +153,6 @@ public class DefaultTransportService extends TransportActivityManager implements
     @Value("${transport.stats.enabled:false}")
     private boolean statsEnabled;
 
-
     @Autowired
     @Lazy
     private TbApiUsageReportClient apiUsageClient;
@@ -172,7 +170,7 @@ public class DefaultTransportService extends TransportActivityManager implements
     private final TransportTenantProfileCache tenantProfileCache;
 
     private final TransportRateLimitService rateLimitService;
-    private final DataDecodingEncodingService dataDecodingEncodingService;
+    private final SchedulerComponent scheduler;
     private final ApplicationEventPublisher eventPublisher;
     private final TransportResourceCache transportResourceCache;
     private final NotificationRuleProcessor notificationRuleProcessor;
@@ -203,7 +201,7 @@ public class DefaultTransportService extends TransportActivityManager implements
                                    TransportDeviceProfileCache deviceProfileCache,
                                    TransportTenantProfileCache tenantProfileCache,
                                    TransportRateLimitService rateLimitService,
-                                   DataDecodingEncodingService dataDecodingEncodingService, SchedulerComponent scheduler, TransportResourceCache transportResourceCache,
+                                   SchedulerComponent scheduler, TransportResourceCache transportResourceCache,
                                    ApplicationEventPublisher eventPublisher, NotificationRuleProcessor notificationRuleProcessor,
                                    EntityLimitsCache entityLimitsCache) {
         this.partitionService = partitionService;
@@ -215,7 +213,6 @@ public class DefaultTransportService extends TransportActivityManager implements
         this.deviceProfileCache = deviceProfileCache;
         this.tenantProfileCache = tenantProfileCache;
         this.rateLimitService = rateLimitService;
-        this.dataDecodingEncodingService = dataDecodingEncodingService;
         this.scheduler = scheduler;
         this.transportResourceCache = transportResourceCache;
         this.eventPublisher = eventPublisher;
@@ -417,9 +414,8 @@ public class DefaultTransportService extends TransportActivityManager implements
                 result.credentials(msg.getCredentialsBody());
                 TransportDeviceInfo tdi = getTransportDeviceInfo(msg.getDeviceInfo());
                 result.deviceInfo(tdi);
-                ByteString profileBody = msg.getProfileBody();
-                if (!profileBody.isEmpty()) {
-                    DeviceProfile profile = deviceProfileCache.getOrCreate(tdi.getDeviceProfileId(), profileBody);
+                if (msg.hasDeviceProfile()) {
+                    DeviceProfile profile = deviceProfileCache.getOrCreate(tdi.getDeviceProfileId(), msg.getDeviceProfile());
                     result.deviceProfile(profile);
                 }
             }
@@ -451,9 +447,8 @@ public class DefaultTransportService extends TransportActivityManager implements
                 result.credentials(msg.getCredentialsBody());
                 TransportDeviceInfo tdi = getTransportDeviceInfo(msg.getDeviceInfo());
                 result.deviceInfo(tdi);
-                ByteString profileBody = msg.getProfileBody();
-                if (!profileBody.isEmpty()) {
-                    DeviceProfile profile = deviceProfileCache.getOrCreate(tdi.getDeviceProfileId(), profileBody);
+                if (msg.hasDeviceProfile()) {
+                    DeviceProfile profile = deviceProfileCache.getOrCreate(tdi.getDeviceProfileId(), msg.getDeviceProfile());
                     if (transportType != DeviceTransportType.DEFAULT
                             && profile != null && profile.getTransportType() != DeviceTransportType.DEFAULT && profile.getTransportType() != transportType) {
                         log.debug("[{}] Device profile [{}] has different transport type: {}, expected: {}", tdi.getDeviceId(), tdi.getDeviceProfileId(), profile.getTransportType(), transportType);
@@ -467,7 +462,6 @@ public class DefaultTransportService extends TransportActivityManager implements
         AsyncCallbackTemplate.withCallback(response, callback::onSuccess, callback::onError, transportCallbackExecutor);
     }
 
-
     @Override
     public void process(TenantId tenantId, TransportProtos.GetOrCreateDeviceFromGatewayRequestMsg requestMsg, TransportServiceCallback<GetOrCreateDeviceFromGatewayResponse> callback) {
         TbProtoQueueMsg<TransportApiRequestMsg> protoMsg = new TbProtoQueueMsg<>(UUID.randomUUID(), TransportApiRequestMsg.newBuilder().setGetOrCreateDeviceRequestMsg(requestMsg).build());
@@ -482,9 +476,8 @@ public class DefaultTransportService extends TransportActivityManager implements
                 if (msg.hasDeviceInfo()) {
                     TransportDeviceInfo tdi = getTransportDeviceInfo(msg.getDeviceInfo());
                     result.deviceInfo(tdi);
-                    ByteString profileBody = msg.getProfileBody();
-                    if (!profileBody.isEmpty()) {
-                        result.deviceProfile(deviceProfileCache.getOrCreate(tdi.getDeviceProfileId(), profileBody));
+                    if (msg.hasDeviceProfile()) {
+                        result.deviceProfile(deviceProfileCache.getOrCreate(tdi.getDeviceProfileId(), msg.getDeviceProfile()));
                     }
                 } else if (TransportProtos.TransportApiRequestErrorCode.ENTITY_LIMIT.equals(msg.getError())) {
                     entityLimitsCache.put(key, true);
@@ -925,37 +918,7 @@ public class DefaultTransportService extends TransportActivityManager implements
         } else {
             log.trace("Processing broadcast notification: {}", toSessionMsg);
             if (toSessionMsg.hasEntityUpdateMsg()) {
-                TransportProtos.EntityUpdateMsg msg = toSessionMsg.getEntityUpdateMsg();
-                EntityType entityType = EntityType.valueOf(msg.getEntityType());
-                if (EntityType.DEVICE_PROFILE.equals(entityType)) {
-                    DeviceProfile deviceProfile = deviceProfileCache.put(msg.getData());
-                    if (deviceProfile != null) {
-                        log.debug("On device profile update: {}", deviceProfile);
-                        onProfileUpdate(deviceProfile);
-                    }
-                } else if (EntityType.TENANT_PROFILE.equals(entityType)) {
-                    rateLimitService.update(tenantProfileCache.put(msg.getData()));
-                } else if (EntityType.TENANT.equals(entityType)) {
-                    Optional<Tenant> profileOpt = dataDecodingEncodingService.decode(msg.getData().toByteArray());
-                    if (profileOpt.isPresent()) {
-                        Tenant tenant = profileOpt.get();
-                        boolean updated = tenantProfileCache.put(tenant.getId(), tenant.getTenantProfileId());
-                        partitionService.evictTenantInfo(tenant.getId());
-                        if (updated) {
-                            rateLimitService.update(tenant.getId());
-                        }
-                    }
-                } else if (EntityType.API_USAGE_STATE.equals(entityType)) {
-                    Optional<ApiUsageState> stateOpt = dataDecodingEncodingService.decode(msg.getData().toByteArray());
-                    if (stateOpt.isPresent()) {
-                        ApiUsageState apiUsageState = stateOpt.get();
-                        rateLimitService.update(apiUsageState.getTenantId(), apiUsageState.isTransportEnabled());
-                        //TODO: if transport is disabled, we should close all sessions and not to check credentials.
-                    }
-                } else if (EntityType.DEVICE.equals(entityType)) {
-                    Optional<Device> deviceOpt = dataDecodingEncodingService.decode(msg.getData().toByteArray());
-                    deviceOpt.ifPresent(this::onDeviceUpdate);
-                }
+                onEntityUpdate(toSessionMsg.getEntityUpdateMsg());
             } else if (toSessionMsg.hasEntityDeleteMsg()) {
                 TransportProtos.EntityDeleteMsg msg = toSessionMsg.getEntityDeleteMsg();
                 EntityType entityType = EntityType.valueOf(msg.getEntityType());
@@ -1026,6 +989,37 @@ public class DefaultTransportService extends TransportActivityManager implements
         eventPublisher.publishEvent(new DeviceProfileUpdatedEvent(deviceProfile));
     }
 
+    private void onEntityUpdate(TransportProtos.EntityUpdateMsg msg) {
+        switch (msg.getEntityUpdateCase()) {
+            case DEVICEPROFILE:
+                DeviceProfile deviceProfile = deviceProfileCache.put(msg.getDeviceProfile());
+                log.debug("On device profile update: {}", deviceProfile);
+                onProfileUpdate(deviceProfile);
+                break;
+            case TENANTPROFILE:
+                rateLimitService.update(tenantProfileCache.put(msg.getTenantProfile()));
+                break;
+            case TENANT:
+                Tenant tenant = ProtoUtils.fromProto(msg.getTenant());
+                boolean updated = tenantProfileCache.put(tenant.getId(), tenant.getTenantProfileId());
+                partitionService.evictTenantInfo(tenant.getId());
+                if (updated) {
+                    rateLimitService.update(tenant.getId());
+                }
+                break;
+            case APIUSAGESTATE:
+                ApiUsageState apiUsageState = ProtoUtils.fromProto(msg.getApiUsageState());
+                rateLimitService.update(apiUsageState.getTenantId(), apiUsageState.isTransportEnabled());
+                //TODO: if transport is disabled, we should close all sessions and not to check credentials.
+                break;
+            case DEVICE:
+                onDeviceUpdate(ProtoUtils.fromProto(msg.getDevice()));
+                break;
+            default:
+                log.warn("UNKNOWN entity update type: [{}]", msg.getEntityUpdateCase());
+        }
+    }
+
     private void onDeviceUpdate(Device device) {
         long deviceIdMSB = device.getId().getId().getMostSignificantBits();
         long deviceIdLSB = device.getId().getId().getLeastSignificantBits();
@@ -1047,11 +1041,12 @@ public class DefaultTransportService extends TransportActivityManager implements
                         .setDeviceProfileIdLSB(deviceProfileIdLSB)
                         .setDeviceName(device.getName())
                         .setDeviceType(device.getType()).build();
-                if (device.getAdditionalInfo().has("gateway")
-                        && device.getAdditionalInfo().get("gateway").asBoolean()
-                        && device.getAdditionalInfo().has(OVERWRITE_ACTIVITY_TIME)
-                        && device.getAdditionalInfo().get(OVERWRITE_ACTIVITY_TIME).isBoolean()) {
-                    md.setOverwriteActivityTime(device.getAdditionalInfo().get(OVERWRITE_ACTIVITY_TIME).asBoolean());
+                JsonNode deviceAdditionalInfo = device.getAdditionalInfo();
+                if (deviceAdditionalInfo.has(DataConstants.GATEWAY_PARAMETER)
+                        && deviceAdditionalInfo.get(DataConstants.GATEWAY_PARAMETER).asBoolean()
+                        && deviceAdditionalInfo.has(DataConstants.OVERWRITE_ACTIVITY_TIME_PARAMETER)
+                        && deviceAdditionalInfo.get(DataConstants.OVERWRITE_ACTIVITY_TIME_PARAMETER).isBoolean()) {
+                    md.setOverwriteActivityTime(deviceAdditionalInfo.get(DataConstants.OVERWRITE_ACTIVITY_TIME_PARAMETER).asBoolean());
                 }
                 md.setSessionInfo(newSessionInfo);
                 transportCallbackExecutor.submit(() -> md.getListener().onDeviceUpdate(newSessionInfo, device, Optional.ofNullable(newDeviceProfile)));
diff --git a/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/DefaultTransportTenantProfileCache.java b/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/DefaultTransportTenantProfileCache.java
index c97d986344..b15b75de25 100644
--- a/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/DefaultTransportTenantProfileCache.java
+++ b/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/DefaultTransportTenantProfileCache.java
@@ -15,7 +15,6 @@
  */
 package org.thingsboard.server.common.transport.service;
 
-import com.google.protobuf.ByteString;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
@@ -29,12 +28,11 @@ import org.thingsboard.server.common.transport.TransportService;
 import org.thingsboard.server.common.transport.TransportTenantProfileCache;
 import org.thingsboard.server.common.transport.limits.TransportRateLimitService;
 import org.thingsboard.server.common.transport.profile.TenantProfileUpdateResult;
+import org.thingsboard.server.common.util.ProtoUtils;
 import org.thingsboard.server.gen.transport.TransportProtos;
-import org.thingsboard.server.queue.util.DataDecodingEncodingService;
 import org.thingsboard.server.queue.util.TbTransportComponent;
 
 import java.util.Collections;
-import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
@@ -50,7 +48,6 @@ public class DefaultTransportTenantProfileCache implements TransportTenantProfil
     private final ConcurrentMap<TenantProfileId, TenantProfile> profiles = new ConcurrentHashMap<>();
     private final ConcurrentMap<TenantId, TenantProfileId> tenantIds = new ConcurrentHashMap<>();
     private final ConcurrentMap<TenantProfileId, Set<TenantId>> tenantProfileIds = new ConcurrentHashMap<>();
-    private final DataDecodingEncodingService dataDecodingEncodingService;
 
     private TransportRateLimitService rateLimitService;
     private TransportService transportService;
@@ -67,28 +64,18 @@ public class DefaultTransportTenantProfileCache implements TransportTenantProfil
         this.transportService = transportService;
     }
 
-    public DefaultTransportTenantProfileCache(DataDecodingEncodingService dataDecodingEncodingService) {
-        this.dataDecodingEncodingService = dataDecodingEncodingService;
-    }
-
     @Override
     public TenantProfile get(TenantId tenantId) {
         return getTenantProfile(tenantId);
     }
 
     @Override
-    public TenantProfileUpdateResult put(ByteString profileBody) {
-        Optional<TenantProfile> profileOpt = dataDecodingEncodingService.decode(profileBody.toByteArray());
-        if (profileOpt.isPresent()) {
-            TenantProfile newProfile = profileOpt.get();
-            log.trace("[{}] put: {}", newProfile.getId(), newProfile);
-            profiles.put(newProfile.getId(), newProfile);
-            Set<TenantId> affectedTenants = tenantProfileIds.get(newProfile.getId());
-            return new TenantProfileUpdateResult(newProfile, affectedTenants != null ? affectedTenants : Collections.emptySet());
-        } else {
-            log.warn("Failed to decode profile: {}", profileBody.toString());
-            return new TenantProfileUpdateResult(null, Collections.emptySet());
-        }
+    public TenantProfileUpdateResult put(TransportProtos.TenantProfileProto proto) {
+        TenantProfile profile = ProtoUtils.fromProto(proto);
+        log.trace("[{}] put: {}", profile.getId(), profile);
+        profiles.put(profile.getId(), profile);
+        Set<TenantId> affectedTenants = tenantProfileIds.get(profile.getId());
+        return new TenantProfileUpdateResult(profile, affectedTenants != null ? affectedTenants : Collections.emptySet());
     }
 
     @Override
@@ -135,23 +122,17 @@ public class DefaultTransportTenantProfileCache implements TransportTenantProfil
                             .setEntityIdLSB(tenantId.getId().getLeastSignificantBits())
                             .build();
                     TransportProtos.GetEntityProfileResponseMsg entityProfileMsg = transportService.getEntityProfile(msg);
-                    Optional<TenantProfile> profileOpt = dataDecodingEncodingService.decode(entityProfileMsg.getData().toByteArray());
-                    if (profileOpt.isPresent()) {
-                        profile = profileOpt.get();
-                        TenantProfile existingProfile = profiles.get(profile.getId());
-                        if (existingProfile != null) {
-                            profile = existingProfile;
-                        } else {
-                            profiles.put(profile.getId(), profile);
-                        }
-                        tenantProfileIds.computeIfAbsent(profile.getId(), id -> ConcurrentHashMap.newKeySet()).add(tenantId);
-                        tenantIds.put(tenantId, profile.getId());
+                    profile = ProtoUtils.fromProto(entityProfileMsg.getTenantProfile());
+                    TenantProfile existingProfile = profiles.get(profile.getId());
+                    if (existingProfile != null) {
+                        profile = existingProfile;
                     } else {
-                        log.warn("[{}] Can't decode tenant profile: {}", tenantId, entityProfileMsg.getData());
-                        throw new RuntimeException("Can't decode tenant profile!");
+                        profiles.put(profile.getId(), profile);
                     }
-                    Optional<ApiUsageState> apiStateOpt = dataDecodingEncodingService.decode(entityProfileMsg.getApiState().toByteArray());
-                    apiStateOpt.ifPresent(apiUsageState -> rateLimitService.update(tenantId, apiUsageState.isTransportEnabled()));
+                    tenantProfileIds.computeIfAbsent(profile.getId(), id -> ConcurrentHashMap.newKeySet()).add(tenantId);
+                    tenantIds.put(tenantId, profile.getId());
+                    ApiUsageState apiUsageState = ProtoUtils.fromProto(entityProfileMsg.getApiState());
+                    rateLimitService.update(tenantId, apiUsageState.isTransportEnabled());
                 }
             } finally {
                 tenantProfileFetchLock.unlock();
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/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/util/SslUtil.java b/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/util/SslUtil.java
index 8c75821c0d..0e02d1e161 100644
--- a/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/util/SslUtil.java
+++ b/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/util/SslUtil.java
@@ -16,13 +16,11 @@
 package org.thingsboard.server.common.transport.util;
 
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.codec.binary.Base64;
 import org.bouncycastle.asn1.x500.RDN;
 import org.bouncycastle.asn1.x500.X500Name;
 import org.bouncycastle.asn1.x500.style.BCStyle;
 import org.bouncycastle.asn1.x500.style.IETFUtils;
 import org.bouncycastle.cert.jcajce.JcaX509CertificateHolder;
-import org.springframework.util.Base64Utils;
 import org.thingsboard.server.common.msg.EncryptionUtil;
 
 import java.io.ByteArrayInputStream;
@@ -31,6 +29,8 @@ import java.security.cert.Certificate;
 import java.security.cert.CertificateEncodingException;
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
+import java.util.Base64;
+
 
 /**
  * @author Valerii Sosliuk
@@ -43,7 +43,7 @@ public class SslUtil {
 
     public static String getCertificateString(Certificate cert)
             throws CertificateEncodingException {
-        return EncryptionUtil.certTrimNewLines(Base64Utils.encodeToString(cert.getEncoded()));
+        return EncryptionUtil.certTrimNewLines(Base64.getEncoder().encodeToString(cert.getEncoded()));
     }
 
     public static String getCertificateChainString(Certificate[] chain)
@@ -52,7 +52,7 @@ public class SslUtil {
         String end = "-----END CERTIFICATE-----";
         StringBuilder stringBuilder = new StringBuilder();
         for (Certificate cert: chain) {
-            stringBuilder.append(begin).append(EncryptionUtil.certTrimNewLines(Base64Utils.encodeToString(cert.getEncoded()))).append(end).append("\n");
+            stringBuilder.append(begin).append(EncryptionUtil.certTrimNewLines(Base64.getEncoder().encodeToString(cert.getEncoded()))).append(end).append("\n");
         }
         return stringBuilder.toString();
     }
@@ -64,7 +64,7 @@ public class SslUtil {
                 fileContent = fileContent.replace("-----BEGIN CERTIFICATE-----", "")
                         .replace("-----END CERTIFICATE-----", "")
                         .replaceAll("\\s", "");
-                byte[] decoded = Base64.decodeBase64(fileContent);
+                byte[] decoded = Base64.getDecoder().decode(fileContent);
                 CertificateFactory certFactory = CertificateFactory.getInstance("X.509");
                 try (InputStream inStream = new ByteArrayInputStream(decoded)) {
                     certificate = (X509Certificate) certFactory.generateCertificate(inStream);
diff --git a/common/transport/transport-api/src/test/resources/junit-platform.properties b/common/transport/transport-api/src/test/resources/junit-platform.properties
new file mode 100644
index 0000000000..f2ed301920
--- /dev/null
+++ b/common/transport/transport-api/src/test/resources/junit-platform.properties
@@ -0,0 +1,3 @@
+junit.jupiter.execution.parallel.enabled = true
+junit.jupiter.execution.parallel.mode.default = concurrent
+junit.jupiter.execution.parallel.mode.classes.default = concurrent
diff --git a/common/transport/transport-api/src/test/resources/logback-test.xml b/common/transport/transport-api/src/test/resources/logback-test.xml
new file mode 100644
index 0000000000..52f2a77588
--- /dev/null
+++ b/common/transport/transport-api/src/test/resources/logback-test.xml
@@ -0,0 +1,14 @@
+<?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>
+
+    <root level="INFO">
+        <appender-ref ref="console"/>
+    </root>
+
+</configuration>
diff --git a/common/util/pom.xml b/common/util/pom.xml
index 2086afa27c..c4cee40e0d 100644
--- a/common/util/pom.xml
+++ b/common/util/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.6.3-SNAPSHOT</version>
+        <version>3.7.0-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>
@@ -38,11 +38,11 @@
     <dependencies>
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-jdk15on</artifactId>
+            <artifactId>bcprov-jdk18on</artifactId>
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcpkix-jdk15on</artifactId>
+            <artifactId>bcpkix-jdk18on</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
@@ -54,8 +54,8 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
@@ -82,11 +82,6 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.awaitility</groupId>
             <artifactId>awaitility</artifactId>
@@ -104,6 +99,10 @@
             <groupId>com.fasterxml.jackson.datatype</groupId>
             <artifactId>jackson-datatype-jsr310</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jdk8</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/common/util/src/main/java/org/thingsboard/common/util/AbstractListeningExecutor.java b/common/util/src/main/java/org/thingsboard/common/util/AbstractListeningExecutor.java
index 5b69ed3042..7f8df67ce9 100644
--- a/common/util/src/main/java/org/thingsboard/common/util/AbstractListeningExecutor.java
+++ b/common/util/src/main/java/org/thingsboard/common/util/AbstractListeningExecutor.java
@@ -19,8 +19,8 @@ import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.ListeningExecutorService;
 import com.google.common.util.concurrent.MoreExecutors;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import java.util.concurrent.Callable;
 
 /**
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 53c3860dde..ff5716a361 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
@@ -28,8 +28,11 @@ import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.fasterxml.jackson.databind.type.CollectionType;
+import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
 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;
 
@@ -37,6 +40,8 @@ import java.io.File;
 import java.io.IOException;
 import java.io.Reader;
 import java.io.Writer;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -50,24 +55,33 @@ 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();
+    public static final ObjectMapper OBJECT_MAPPER = JsonMapper.builder()
+            .addModule(new Jdk8Module())
+            .build();
     public static final ObjectMapper PRETTY_SORTED_JSON_MAPPER = JsonMapper.builder()
+            .addModule(new Jdk8Module())
             .enable(SerializationFeature.INDENT_OUTPUT)
             .configure(SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS, true)
             .configure(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY, true)
             .build();
     public static ObjectMapper ALLOW_UNQUOTED_FIELD_NAMES_MAPPER = JsonMapper.builder()
+            .addModule(new Jdk8Module())
             .configure(JsonWriteFeature.QUOTE_FIELD_NAMES.mappedFeature(), false)
             .configure(JsonParser.Feature.ALLOW_UNQUOTED_FIELD_NAMES, true)
             .build();
     public static final ObjectMapper IGNORE_UNKNOWN_PROPERTIES_JSON_MAPPER = JsonMapper.builder()
+            .addModule(new Jdk8Module())
             .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
             .build();
 
     public static ObjectMapper getObjectMapperWithJavaTimeModule() {
-        return new ObjectMapper().registerModule(new JavaTimeModule());
+        return JsonMapper.builder()
+                .addModule(new Jdk8Module())
+                .addModule(new JavaTimeModule())
+                .build();
     }
 
     public static <T> T convertValue(Object fromValue, Class<T> toValueType) {
@@ -121,6 +135,14 @@ public class JacksonUtil {
     public static <T> T fromBytes(byte[] bytes, Class<T> clazz) {
         try {
             return bytes != null ? OBJECT_MAPPER.readValue(bytes, clazz) : null;
+        } catch (IOException e) {
+            throw new IllegalArgumentException("The given byte[] value cannot be transformed to Json object:" + Arrays.toString(bytes), e);
+        }
+    }
+
+    public static <T> T fromBytes(byte[] bytes, TypeReference<T> valueTypeRef) {
+        try {
+            return bytes != null ? OBJECT_MAPPER.readValue(bytes, valueTypeRef) : null;
         } catch (IOException e) {
             throw new IllegalArgumentException("The given string value cannot be transformed to Json object: " + Arrays.toString(bytes), e);
         }
@@ -142,6 +164,15 @@ public class JacksonUtil {
         }
     }
 
+    public static String writeValueAsString(Object value) {
+        try {
+            return OBJECT_MAPPER.writeValueAsString(value);
+        } catch (JsonProcessingException e) {
+            throw new IllegalArgumentException("The given Json object value: "
+                    + value + " cannot be transformed to a String", e);
+        }
+    }
+
     public static String toPrettyString(Object o) {
         try {
             return PRETTY_SORTED_JSON_MAPPER.writeValueAsString(o);
@@ -150,6 +181,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);
@@ -173,6 +218,38 @@ public class JacksonUtil {
         }
     }
 
+    public static <T> T readValue(String file, CollectionType clazz) {
+        try {
+            return OBJECT_MAPPER.readValue(file, clazz);
+        } catch (IOException e) {
+            throw new IllegalArgumentException("Can't read file: " + file, e);
+        }
+    }
+
+    public static <T> T readValue(File file, TypeReference<T> clazz) {
+        try {
+            return OBJECT_MAPPER.readValue(file, clazz);
+        } catch (IOException e) {
+            throw new IllegalArgumentException("Can't read file: " + file, e);
+        }
+    }
+
+    public static <T> T readValue(File file, Class<T> clazz) {
+        try {
+            return OBJECT_MAPPER.readValue(file, clazz);
+        } catch (IOException e) {
+            throw new IllegalArgumentException("Can't read file: " + file, e);
+        }
+    }
+
+    public static JsonNode toJsonNode(Path file) {
+        try {
+            return OBJECT_MAPPER.readTree(Files.readAllBytes(file));
+        } catch (IOException e) {
+            throw new IllegalArgumentException("Can't read file: " + file, e);
+        }
+    }
+
     public static JsonNode toJsonNode(File value) {
         try {
             return value != null ? OBJECT_MAPPER.readTree(value) : null;
@@ -216,7 +293,6 @@ public class JacksonUtil {
         }
     }
 
-
     public static JsonNode getSafely(JsonNode node, String... path) {
         if (node == null) {
             return null;
@@ -231,6 +307,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 d58f203956..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
@@ -29,12 +29,17 @@ import org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter;
 import org.bouncycastle.openssl.jcajce.JcePEMDecryptorProviderBuilder;
 import org.bouncycastle.operator.InputDecryptorProvider;
 import org.bouncycastle.pkcs.PKCS8EncryptedPrivateKeyInfo;
+import org.bouncycastle.pkcs.PKCSException;
 import org.bouncycastle.pkcs.jcajce.JcePKCSPBEInputDecryptorProviderBuilder;
 import org.thingsboard.server.common.data.StringUtils;
 
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.Reader;
 import java.io.StringReader;
 import java.security.PrivateKey;
 import java.security.Security;
+import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
 import java.util.ArrayList;
 import java.util.List;
@@ -57,9 +62,18 @@ public class SslUtil {
 
     @SneakyThrows
     public static List<X509Certificate> readCertFile(String fileContent) {
+        return readCertFile(new StringReader(fileContent));
+    }
+
+    @SneakyThrows
+    public static List<X509Certificate> readCertFileByPath(String filePath) {
+        return readCertFile( new FileReader(filePath));
+    }
+
+    private static List<X509Certificate> readCertFile(Reader reader) throws IOException, CertificateException {
         List<X509Certificate> certificates = new ArrayList<>();
         JcaX509CertificateConverter certConverter = new JcaX509CertificateConverter();
-        try (PEMParser pemParser = new PEMParser(new StringReader(fileContent))) {
+        try (PEMParser pemParser = new PEMParser(reader)) {
             Object object;
             while ((object = pemParser.readObject()) != null) {
                 if (object instanceof X509CertificateHolder) {
@@ -73,33 +87,51 @@ public class SslUtil {
 
     @SneakyThrows
     public static PrivateKey readPrivateKey(String fileContent, String passStr) {
-        char[] password = StringUtils.isEmpty(passStr) ? EMPTY_PASS : passStr.toCharArray();
+        if (StringUtils.isNotEmpty(fileContent)) {
+            StringReader reader = new StringReader(fileContent);
+            return readPrivateKey(reader, passStr);
+        }
+        return null;
+    }
 
+    @SneakyThrows
+    public static PrivateKey readPrivateKeyByFilePath(String filePath, String passStr) {
+        if (StringUtils.isNotEmpty(filePath)) {
+            FileReader fileReader = new FileReader(filePath);
+            return readPrivateKey(fileReader, passStr);
+        }
+        return null;
+    }
+
+    private static PrivateKey readPrivateKey(Reader reader, String passStr) throws IOException, PKCSException {
+        char[] password = getPassword(passStr);
         PrivateKey privateKey = null;
         JcaPEMKeyConverter keyConverter = new JcaPEMKeyConverter();
-        if (StringUtils.isNotEmpty(fileContent)) {
-            try (PEMParser pemParser = new PEMParser(new StringReader(fileContent))) {
-                Object object;
-                while ((object = pemParser.readObject()) != null) {
-                    if (object instanceof PEMEncryptedKeyPair) {
-                        PEMDecryptorProvider decProv = new JcePEMDecryptorProviderBuilder().build(password);
-                        privateKey = keyConverter.getKeyPair(((PEMEncryptedKeyPair) object).decryptKeyPair(decProv)).getPrivate();
-                        break;
-                    } else if (object instanceof PKCS8EncryptedPrivateKeyInfo) {
-                        InputDecryptorProvider decProv =
-                                new JcePKCSPBEInputDecryptorProviderBuilder().setProvider(DEFAULT_PROVIDER).build(password);
-                        privateKey = keyConverter.getPrivateKey(((PKCS8EncryptedPrivateKeyInfo) object).decryptPrivateKeyInfo(decProv));
-                        break;
-                    } else if (object instanceof PEMKeyPair) {
-                        privateKey = keyConverter.getKeyPair((PEMKeyPair) object).getPrivate();
-                        break;
-                    } else if (object instanceof PrivateKeyInfo) {
-                        privateKey = keyConverter.getPrivateKey((PrivateKeyInfo) object);
-                    }
+        try (PEMParser pemParser = new PEMParser(reader)) {
+            Object object;
+            while ((object = pemParser.readObject()) != null) {
+                if (object instanceof PEMEncryptedKeyPair) {
+                    PEMDecryptorProvider decProv = new JcePEMDecryptorProviderBuilder().build(password);
+                    privateKey = keyConverter.getKeyPair(((PEMEncryptedKeyPair) object).decryptKeyPair(decProv)).getPrivate();
+                    break;
+                } else if (object instanceof PKCS8EncryptedPrivateKeyInfo) {
+                    InputDecryptorProvider decProv =
+                            new JcePKCSPBEInputDecryptorProviderBuilder().setProvider(DEFAULT_PROVIDER).build(password);
+                    privateKey = keyConverter.getPrivateKey(((PKCS8EncryptedPrivateKeyInfo) object).decryptPrivateKeyInfo(decProv));
+                    break;
+                } else if (object instanceof PEMKeyPair) {
+                    privateKey = keyConverter.getKeyPair((PEMKeyPair) object).getPrivate();
+                    break;
+                } else if (object instanceof PrivateKeyInfo) {
+                    privateKey = keyConverter.getPrivateKey((PrivateKeyInfo) object);
                 }
             }
         }
         return privateKey;
     }
 
+    public static char[] getPassword(String passStr) {
+        return StringUtils.isEmpty(passStr) ? EMPTY_PASS : passStr.toCharArray();
+    }
+
 }
diff --git a/common/util/src/main/java/org/thingsboard/common/util/ThingsBoardThreadFactory.java b/common/util/src/main/java/org/thingsboard/common/util/ThingsBoardThreadFactory.java
index de097cfd6c..4d0876bf8e 100644
--- a/common/util/src/main/java/org/thingsboard/common/util/ThingsBoardThreadFactory.java
+++ b/common/util/src/main/java/org/thingsboard/common/util/ThingsBoardThreadFactory.java
@@ -51,6 +51,11 @@ public class ThingsBoardThreadFactory implements ThreadFactory {
         Thread.currentThread().setName(name);
     }
 
+    public static void addThreadNamePrefix(String prefix) {
+        String name = Thread.currentThread().getName();
+        name = prefix + "-" + name;
+        Thread.currentThread().setName(name);
+    }
 
     @Override
     public Thread newThread(Runnable r) {
diff --git a/common/util/src/test/java/org/thingsboard/common/util/ExceptionUtilTest.java b/common/util/src/test/java/org/thingsboard/common/util/ExceptionUtilTest.java
index 3908ad6eb7..68a275987d 100644
--- a/common/util/src/test/java/org/thingsboard/common/util/ExceptionUtilTest.java
+++ b/common/util/src/test/java/org/thingsboard/common/util/ExceptionUtilTest.java
@@ -28,7 +28,7 @@ class ExceptionUtilTest {
     @Test
     void givenRootCause_whenLookupExceptionInCause_thenReturnRootCauseAndNoStackOverflow() {
         Exception e = cause;
-        for (int i = 0; i <= 16384; i++) {
+        for (int i = 0; i <= 8000; i++) {
             e = new Exception(e);
         }
         assertThat(ExceptionUtil.lookupExceptionInCause(e, RuntimeException.class)).isSameAs(cause);
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..d6b63c5864 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
@@ -17,13 +17,20 @@ package org.thingsboard.common.util;
 
 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.api.Test;
+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;
 
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
 import java.util.UUID;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class JacksonUtilTest {
 
     @Test
@@ -32,8 +39,8 @@ public class JacksonUtilTest {
         JsonNode actualResult = JacksonUtil.toJsonNode(data, JacksonUtil.ALLOW_UNQUOTED_FIELD_NAMES_MAPPER); // should be: {"data": 123}
         ObjectNode expectedResult = JacksonUtil.newObjectNode();
         expectedResult.put("data", 123); // {"data": 123}
-        Assert.assertEquals(expectedResult, actualResult);
-        Assert.assertThrows(IllegalArgumentException.class, () -> JacksonUtil.toJsonNode(data)); // syntax exception due to missing quotes in the field name!
+        Assertions.assertEquals(expectedResult, actualResult);
+        Assertions.assertThrows(IllegalArgumentException.class, () -> JacksonUtil.toJsonNode(data)); // syntax exception due to missing quotes in the field name!
     }
 
     @Test
@@ -45,14 +52,34 @@ public class JacksonUtilTest {
         String serializedAsset = JacksonUtil.toString(asset);
         JsonNode jsonNode = JacksonUtil.toJsonNode(serializedAsset);
         // case: add new field to serialized Asset string and check for backward compatibility with original Asset object
-        Assert.assertNotNull(jsonNode);
+        Assertions.assertNotNull(jsonNode);
         ((ObjectNode) jsonNode).put("test", (String) null);
         serializedAsset = JacksonUtil.toString(jsonNode);
         // deserialize with FAIL_ON_UNKNOWN_PROPERTIES = false
         Asset result = JacksonUtil.fromString(serializedAsset, Asset.class, true);
-        Assert.assertNotNull(result);
-        Assert.assertEquals(asset.getId(), result.getId());
-        Assert.assertEquals(asset.getName(), result.getName());
-        Assert.assertEquals(asset.getType(), result.getType());
+        Assertions.assertNotNull(result);
+        Assertions.assertEquals(asset.getId(), result.getId());
+        Assertions.assertEquals(asset.getName(), result.getName());
+        Assertions.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));
     }
-}
+
+    @Test
+    public void optionalMappingJDK8ModuleTest() {
+        // To address the issue: Java 8 optional type `java.util.Optional` not supported by default: add Module "com.fasterxml.jackson.datatype:jackson-datatype-jdk8" to enable handling
+        assertThat(JacksonUtil.writeValueAsString(Optional.of("hello"))).isEqualTo("\"hello\"");
+        assertThat(JacksonUtil.writeValueAsString(List.of(Optional.of("abc")))).isEqualTo("[\"abc\"]");
+        assertThat(JacksonUtil.writeValueAsString(Set.of(Optional.empty()))).isEqualTo("[null]");
+    }
+
+}
\ No newline at end of file
diff --git a/common/util/src/test/java/org/thingsboard/common/util/LinkedHashMapRemoveEldestTest.java b/common/util/src/test/java/org/thingsboard/common/util/LinkedHashMapRemoveEldestTest.java
index e61b9ec2d8..e52dd895a0 100644
--- a/common/util/src/test/java/org/thingsboard/common/util/LinkedHashMapRemoveEldestTest.java
+++ b/common/util/src/test/java/org/thingsboard/common/util/LinkedHashMapRemoveEldestTest.java
@@ -16,7 +16,7 @@
 package org.thingsboard.common.util;
 
 import org.hamcrest.Matchers;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.LinkedHashMap;
 
diff --git a/common/util/src/test/resources/junit-platform.properties b/common/util/src/test/resources/junit-platform.properties
new file mode 100644
index 0000000000..f2ed301920
--- /dev/null
+++ b/common/util/src/test/resources/junit-platform.properties
@@ -0,0 +1,3 @@
+junit.jupiter.execution.parallel.enabled = true
+junit.jupiter.execution.parallel.mode.default = concurrent
+junit.jupiter.execution.parallel.mode.classes.default = concurrent
diff --git a/common/util/src/test/resources/logback-test.xml b/common/util/src/test/resources/logback-test.xml
new file mode 100644
index 0000000000..52f2a77588
--- /dev/null
+++ b/common/util/src/test/resources/logback-test.xml
@@ -0,0 +1,14 @@
+<?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>
+
+    <root level="INFO">
+        <appender-ref ref="console"/>
+    </root>
+
+</configuration>
diff --git a/common/version-control/pom.xml b/common/version-control/pom.xml
index 1c8c7d3b26..cce6e00501 100644
--- a/common/version-control/pom.xml
+++ b/common/version-control/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.6.3-SNAPSHOT</version>
+        <version>3.7.0-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>
@@ -62,8 +62,8 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
@@ -102,11 +102,6 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.awaitility</groupId>
             <artifactId>awaitility</artifactId>
diff --git a/common/version-control/src/main/java/org/thingsboard/server/service/sync/vc/DefaultClusterVersionControlService.java b/common/version-control/src/main/java/org/thingsboard/server/service/sync/vc/DefaultClusterVersionControlService.java
index 1d6688cebc..edf998dc8e 100644
--- a/common/version-control/src/main/java/org/thingsboard/server/service/sync/vc/DefaultClusterVersionControlService.java
+++ b/common/version-control/src/main/java/org/thingsboard/server/service/sync/vc/DefaultClusterVersionControlService.java
@@ -37,12 +37,12 @@ import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.common.data.page.SortOrder;
-import org.thingsboard.server.common.data.sync.vc.RepositorySettings;
 import org.thingsboard.server.common.data.sync.vc.VersionCreationResult;
 import org.thingsboard.server.common.data.sync.vc.VersionedEntityInfo;
 import org.thingsboard.server.common.data.util.CollectionsUtil;
 import org.thingsboard.server.common.msg.queue.ServiceType;
 import org.thingsboard.server.common.msg.queue.TopicPartitionInfo;
+import org.thingsboard.server.common.util.ProtoUtils;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.gen.transport.TransportProtos.AddMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.BranchInfoProto;
@@ -68,17 +68,16 @@ import org.thingsboard.server.gen.transport.TransportProtos.VersionedEntityInfoP
 import org.thingsboard.server.queue.TbQueueConsumer;
 import org.thingsboard.server.queue.TbQueueProducer;
 import org.thingsboard.server.queue.common.TbProtoQueueMsg;
-import org.thingsboard.server.queue.discovery.TopicService;
 import org.thingsboard.server.queue.discovery.PartitionService;
 import org.thingsboard.server.queue.discovery.TbApplicationEventListener;
+import org.thingsboard.server.queue.discovery.TopicService;
 import org.thingsboard.server.queue.discovery.event.PartitionChangeEvent;
 import org.thingsboard.server.queue.provider.TbQueueProducerProvider;
 import org.thingsboard.server.queue.provider.TbVersionControlQueueFactory;
-import org.thingsboard.server.queue.util.DataDecodingEncodingService;
 import org.thingsboard.server.queue.util.TbVersionControlComponent;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -109,7 +108,6 @@ public class DefaultClusterVersionControlService extends TbApplicationEventListe
     private final PartitionService partitionService;
     private final TbQueueProducerProvider producerProvider;
     private final TbVersionControlQueueFactory queueFactory;
-    private final DataDecodingEncodingService encodingService;
     private final GitRepositoryService vcService;
     private final TopicService topicService;
 
@@ -197,7 +195,7 @@ public class DefaultClusterVersionControlService extends TbApplicationEventListe
                 }
                 for (TbProtoQueueMsg<ToVersionControlServiceMsg> msgWrapper : msgs) {
                     ToVersionControlServiceMsg msg = msgWrapper.getValue();
-                    var ctx = new VersionControlRequestCtx(msg, msg.hasClearRepositoryRequest() ? null : getEntitiesVersionControlSettings(msg));
+                    var ctx = new VersionControlRequestCtx(msg, msg.hasClearRepositoryRequest() ? null : ProtoUtils.fromProto(msg.getVcSettings()));
                     long startTs = System.currentTimeMillis();
                     log.trace("[{}][{}] RECEIVED task: {}", ctx.getTenantId(), ctx.getRequestId(), msg);
                     int threadIdx = Math.abs(ctx.getTenantId().hashCode() % ioPoolSize);
@@ -553,16 +551,6 @@ public class DefaultClusterVersionControlService extends TbApplicationEventListe
         producer.send(tpi, new TbProtoQueueMsg<>(UUID.randomUUID(), msg), null);
     }
 
-    private RepositorySettings getEntitiesVersionControlSettings(ToVersionControlServiceMsg msg) {
-        Optional<RepositorySettings> settingsOpt = encodingService.decode(msg.getVcSettings().toByteArray());
-        if (settingsOpt.isPresent()) {
-            return settingsOpt.get();
-        } else {
-            log.warn("Failed to parse VC settings: {}", msg.getVcSettings());
-            throw new RuntimeException("Failed to parse vc settings!");
-        }
-    }
-
     private String getRelativePath(EntityType entityType, String entityId) {
         String path = entityType.name().toLowerCase();
         if (entityId != null) {
diff --git a/common/version-control/src/main/java/org/thingsboard/server/service/sync/vc/DefaultGitRepositoryService.java b/common/version-control/src/main/java/org/thingsboard/server/service/sync/vc/DefaultGitRepositoryService.java
index 24d23c60a1..46f4f83a04 100644
--- a/common/version-control/src/main/java/org/thingsboard/server/service/sync/vc/DefaultGitRepositoryService.java
+++ b/common/version-control/src/main/java/org/thingsboard/server/service/sync/vc/DefaultGitRepositoryService.java
@@ -36,7 +36,7 @@ import org.thingsboard.server.common.data.sync.vc.VersionCreationResult;
 import org.thingsboard.server.common.data.sync.vc.VersionedEntityInfo;
 import org.thingsboard.server.service.sync.vc.GitRepository.Diff;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -157,12 +157,10 @@ public class DefaultGitRepositoryService implements GitRepositoryService {
 
     @Override
     public void fetch(TenantId tenantId) throws GitAPIException {
-        var repository = repositories.get(tenantId);
-        if (repository != null) {
-            log.debug("[{}] Fetching tenant repository.", tenantId);
-            repository.fetch();
-            log.debug("[{}] Fetched tenant repository.", tenantId);
-        }
+        var repository = checkRepository(tenantId);
+        log.debug("[{}] Fetching tenant repository.", tenantId);
+        repository.fetch();
+        log.debug("[{}] Fetched tenant repository.", tenantId);
     }
 
     @Override
@@ -195,8 +193,17 @@ public class DefaultGitRepositoryService implements GitRepositoryService {
     }
 
     private GitRepository checkRepository(TenantId tenantId) {
-        return Optional.ofNullable(repositories.get(tenantId))
+        GitRepository gitRepository = Optional.ofNullable(repositories.get(tenantId))
                 .orElseThrow(() -> new IllegalStateException("Repository is not initialized"));
+
+        if (!Files.exists(Path.of(gitRepository.getDirectory()))) {
+            try {
+                return cloneRepository(tenantId, gitRepository.getSettings());
+            } catch (Exception e) {
+                throw new IllegalStateException("Could not initialize the repository: " + e.getMessage(), e);
+            }
+        }
+        return gitRepository;
     }
 
     @Override
@@ -229,17 +236,7 @@ public class DefaultGitRepositoryService implements GitRepositoryService {
         testRepository(tenantId, settings);
 
         clearRepository(tenantId);
-        log.debug("[{}] Init tenant repository started.", tenantId);
-        Path repositoryDirectory = Path.of(repositoriesFolder, tenantId.getId().toString());
-        GitRepository repository;
-        if (Files.exists(repositoryDirectory)) {
-            FileUtils.forceDelete(repositoryDirectory.toFile());
-        }
-
-        Files.createDirectories(repositoryDirectory);
-        repository = GitRepository.clone(settings, repositoryDirectory.toFile());
-        repositories.put(tenantId, repository);
-        log.debug("[{}] Init tenant repository completed.", tenantId);
+        cloneRepository(tenantId, settings);
     }
 
     @Override
@@ -276,4 +273,18 @@ public class DefaultGitRepositoryService implements GitRepositoryService {
         String entityId = StringUtils.substringBetween(path, "/", ".json");
         return EntityIdFactory.getByTypeAndUuid(entityType, entityId);
     }
+
+    private GitRepository cloneRepository(TenantId tenantId, RepositorySettings settings) throws Exception {
+        log.debug("[{}] Init tenant repository started.", tenantId);
+        Path repositoryDirectory = Path.of(repositoriesFolder, tenantId.getId().toString());
+
+        if (Files.exists(repositoryDirectory)) {
+            FileUtils.forceDelete(repositoryDirectory.toFile());
+        }
+        Files.createDirectories(repositoryDirectory);
+        GitRepository repository = GitRepository.clone(settings, repositoryDirectory.toFile());
+        repositories.put(tenantId, repository);
+        log.debug("[{}] Init tenant repository completed.", tenantId);
+        return repository;
+    }
 }
diff --git a/dao/pom.xml b/dao/pom.xml
index f473dff3bf..061c130a69 100644
--- a/dao/pom.xml
+++ b/dao/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.6.3-SNAPSHOT</version>
+        <version>3.7.0-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <artifactId>dao</artifactId>
@@ -81,7 +81,7 @@
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcpkix-jdk15on</artifactId>
+            <artifactId>bcpkix-jdk18on</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -113,8 +113,8 @@
             <artifactId>commons-lang3</artifactId>
         </dependency>
         <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-collections4</artifactId>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
@@ -126,7 +126,7 @@
         </dependency>
         <dependency>
             <groupId>org.glassfish</groupId>
-            <artifactId>javax.el</artifactId>
+            <artifactId>jakarta.el</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
@@ -153,6 +153,12 @@
             <groupId>com.datastax.oss</groupId>
             <artifactId>java-driver-query-builder</artifactId>
         </dependency>
+        <dependency> <!--need for datastax-->
+            <groupId>io.netty</groupId>
+            <artifactId>netty-transport-native-epoll</artifactId>
+            <classifier>linux-x86_64</classifier>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>io.dropwizard.metrics</groupId>
             <artifactId>metrics-jmx</artifactId>
@@ -184,7 +190,7 @@
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-jdk15on</artifactId>
+            <artifactId>bcprov-jdk18on</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -216,7 +222,7 @@
         </dependency>
         <dependency>
             <groupId>org.elasticsearch.client</groupId>
-            <artifactId>rest</artifactId>
+            <artifactId>elasticsearch-rest-client</artifactId>
         </dependency>
         <dependency>
             <groupId>org.eclipse.leshan</groupId>
@@ -232,7 +238,7 @@
         </dependency>
         <dependency>
             <groupId>io.hypersistence</groupId>
-            <artifactId>hypersistence-utils-hibernate-55</artifactId>
+            <artifactId>hypersistence-utils-hibernate-63</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.xmlgraphics</groupId>
diff --git a/dao/src/main/java/org/thingsboard/server/dao/Dao.java b/dao/src/main/java/org/thingsboard/server/dao/Dao.java
index 8d408945fa..e7290cdced 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/Dao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/Dao.java
@@ -43,6 +43,8 @@ public interface Dao<T> {
 
     void removeAllByIds(Collection<UUID> ids);
 
+    List<UUID> findIdsByTenantIdAndIdOffset(TenantId tenantId, UUID idOffset, int limit);
+
     default EntityType getEntityType() { return null; }
 
 }
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..01a72ea58c 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/DaoUtil.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/DaoUtil.java
@@ -18,6 +18,7 @@ package org.thingsboard.server.dao;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Slice;
 import org.springframework.util.CollectionUtils;
 import org.thingsboard.server.common.data.EntityInfo;
 import org.thingsboard.server.common.data.EntitySubtype;
@@ -51,16 +52,33 @@ public abstract class DaoUtil {
         return new PageData<>(data, page.getTotalPages(), page.getTotalElements(), page.hasNext());
     }
 
-    public static <T> PageData<T> pageToPageData(Page<T> page) {
-        return new PageData<>(page.getContent(), page.getTotalPages(), page.getTotalElements(), page.hasNext());
+    public static <T> PageData<T> pageToPageData(Slice<T> slice) {
+        int totalPages;
+        long totalElements;
+        if (slice instanceof Page<T> page) {
+            totalPages = page.getTotalPages();
+            totalElements = page.getTotalElements();
+        } else {
+            totalPages = 0;
+            totalElements = 0;
+        }
+        return new PageData<>(slice.getContent(), totalPages, totalElements, slice.hasNext());
     }
 
     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 +86,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/SqlTimeseriesDaoConfig.java b/dao/src/main/java/org/thingsboard/server/dao/SqlTimeseriesDaoConfig.java
index b85ada6f93..9cf9532aea 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/SqlTimeseriesDaoConfig.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/SqlTimeseriesDaoConfig.java
@@ -16,6 +16,7 @@
 package org.thingsboard.server.dao;
 
 import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
@@ -24,10 +25,10 @@ import org.thingsboard.server.dao.util.TbAutoConfiguration;
 
 @Configuration
 @TbAutoConfiguration
+@ComponentScan({"org.thingsboard.server.dao.sqlts.dictionary"})
 @EnableJpaRepositories({"org.thingsboard.server.dao.sqlts.dictionary"})
 @EntityScan({"org.thingsboard.server.dao.model.sqlts.dictionary"})
 @EnableTransactionManagement
-@SqlTsOrTsLatestAnyDao
 public class SqlTimeseriesDaoConfig {
 
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/ThingsboardPostgreSQLDialect.java b/dao/src/main/java/org/thingsboard/server/dao/ThingsboardPostgreSQLDialect.java
index ebfe2b63c3..5da1c32616 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/ThingsboardPostgreSQLDialect.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/ThingsboardPostgreSQLDialect.java
@@ -15,12 +15,26 @@
  */
 package org.thingsboard.server.dao;
 
-import org.hibernate.dialect.function.SQLFunctionTemplate;
-import org.hibernate.type.BooleanType;
+import lombok.extern.slf4j.Slf4j;
+import org.hibernate.boot.model.FunctionContributions;
+import org.hibernate.dialect.PostgreSQLDialect;
+import org.hibernate.query.sqm.function.SqmFunctionRegistry;
+import org.hibernate.type.BasicTypeRegistry;
+import org.hibernate.type.StandardBasicTypes;
 
-public class ThingsboardPostgreSQLDialect extends org.hibernate.dialect.PostgreSQL10Dialect {
-    public ThingsboardPostgreSQLDialect() {
-        super();
-        registerFunction("ilike", new SQLFunctionTemplate(BooleanType.INSTANCE, "(?1 ILIKE ?2)"));
+@Slf4j
+public class ThingsboardPostgreSQLDialect extends PostgreSQLDialect {
+
+    @Override
+    public void initializeFunctionRegistry(FunctionContributions functionContributions) {
+        log.trace("initializeFunctionRegistry [{}]", functionContributions);
+        super.initializeFunctionRegistry(functionContributions);
+        BasicTypeRegistry basicTypeRegistry = functionContributions.getTypeConfiguration().getBasicTypeRegistry();
+        SqmFunctionRegistry functionRegistry = functionContributions.getFunctionRegistry();
+
+        functionRegistry.registerPattern(
+                "ilike",
+                "(?1::text ILIKE ?2::text)",
+                basicTypeRegistry.resolve(StandardBasicTypes.BOOLEAN));
     }
 }
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..570256e98c 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
@@ -38,6 +38,7 @@ import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.common.data.query.AlarmCountQuery;
 import org.thingsboard.server.common.data.query.AlarmData;
 import org.thingsboard.server.common.data.query.AlarmDataQuery;
+import org.thingsboard.server.common.data.util.TbPair;
 import org.thingsboard.server.dao.Dao;
 
 import java.util.Collection;
@@ -80,11 +81,15 @@ public interface AlarmDao extends Dao<Alarm> {
 
     PageData<AlarmId> findAlarmIdsByAssigneeId(TenantId tenantId, UUID userId, PageLink pageLink);
 
+    PageData<TbPair<UUID, Long>> findAlarmIdsByOriginatorId(TenantId tenantId, EntityId originatorId, long createdTimeOffset, AlarmId idOffset, int limit);
+
     void createEntityAlarmRecord(EntityAlarm entityAlarm);
 
     List<EntityAlarm> findEntityAlarmRecords(TenantId tenantId, AlarmId id);
 
-    void deleteEntityAlarmRecords(TenantId tenantId, EntityId entityId);
+    List<EntityAlarm> findEntityAlarmRecordsByEntityId(TenantId tenantId, EntityId entityId);
+
+    int deleteEntityAlarmRecords(TenantId tenantId, EntityId entityId);
 
     void deleteEntityAlarmRecordsByTenantId(TenantId tenantId);
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/alarm/AlarmTypesRedisCache.java b/dao/src/main/java/org/thingsboard/server/dao/alarm/AlarmTypesRedisCache.java
index f9eae33dc5..a58d13471c 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/alarm/AlarmTypesRedisCache.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/alarm/AlarmTypesRedisCache.java
@@ -15,13 +15,14 @@
  */
 package org.thingsboard.server.dao.alarm;
 
+import com.fasterxml.jackson.core.type.TypeReference;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.cache.CacheSpecsMap;
 import org.thingsboard.server.cache.RedisTbTransactionalCache;
 import org.thingsboard.server.cache.TBRedisCacheConfiguration;
-import org.thingsboard.server.cache.TbFSTRedisSerializer;
+import org.thingsboard.server.cache.TbTypedJsonRedisSerializer;
 import org.thingsboard.server.common.data.CacheConstants;
 import org.thingsboard.server.common.data.EntitySubtype;
 import org.thingsboard.server.common.data.id.TenantId;
@@ -32,6 +33,6 @@ import org.thingsboard.server.common.data.page.PageData;
 public class AlarmTypesRedisCache extends RedisTbTransactionalCache<TenantId, PageData<EntitySubtype>> {
 
     public AlarmTypesRedisCache(TBRedisCacheConfiguration configuration, CacheSpecsMap cacheSpecsMap, RedisConnectionFactory connectionFactory) {
-        super(CacheConstants.ALARM_TYPES_CACHE, cacheSpecsMap, connectionFactory, configuration, new TbFSTRedisSerializer<>());
+        super(CacheConstants.ALARM_TYPES_CACHE, cacheSpecsMap, connectionFactory, configuration, new TbTypedJsonRedisSerializer<>(new TypeReference<>() {}));
     }
 }
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..f0fc18c827 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
@@ -58,6 +58,7 @@ import org.thingsboard.server.common.data.relation.EntityRelation;
 import org.thingsboard.server.common.data.relation.EntityRelationsQuery;
 import org.thingsboard.server.common.data.relation.EntitySearchDirection;
 import org.thingsboard.server.common.data.relation.RelationsSearchParameters;
+import org.thingsboard.server.common.data.util.TbPair;
 import org.thingsboard.server.dao.entity.AbstractCachedEntityService;
 import org.thingsboard.server.dao.entity.EntityService;
 import org.thingsboard.server.dao.eventsourcing.ActionEntityEvent;
@@ -75,6 +76,7 @@ import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
+import java.util.UUID;
 import java.util.concurrent.ExecutionException;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -169,7 +171,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);
     }
@@ -183,17 +185,23 @@ public class BaseAlarmService extends AbstractCachedEntityService<TenantId, Page
     @Override
     @Transactional
     public AlarmApiCallResult delAlarm(TenantId tenantId, AlarmId alarmId, boolean checkAndDeleteAlarmType) {
-        log.debug("Deleting Alarm Id: {}", alarmId);
         AlarmInfo alarm = alarmDao.findAlarmInfoById(tenantId, alarmId.getId());
+        return deleteAlarm(tenantId, alarm, checkAndDeleteAlarmType);
+    }
+
+    private AlarmApiCallResult deleteAlarm(TenantId tenantId, AlarmInfo alarm, boolean deleteAlarmTypes) {
         if (alarm == null) {
             return AlarmApiCallResult.builder().successful(false).build();
         } else {
+            log.debug("[{}][{}] Executing deleteAlarm [{}]", tenantId, alarm.getOriginator(), alarm.getId());
             var propagationIds = getPropagationEntityIdsList(alarm);
-            deleteEntityRelations(tenantId, alarm.getId());
             alarmDao.removeById(tenantId, alarm.getUuidId());
-            eventPublisher.publishEvent(DeleteEntityEvent.builder().tenantId(tenantId)
-                    .entityId(alarmId).entity(alarm).build());
-            if (checkAndDeleteAlarmType) {
+            eventPublisher.publishEvent(DeleteEntityEvent.builder()
+                    .tenantId(tenantId)
+                    .entityId(alarm.getId())
+                    .entity(alarm)
+                    .build());
+            if (deleteAlarmTypes) {
                 delAlarmTypes(tenantId, Collections.singleton(alarm.getType()));
             }
             return AlarmApiCallResult.builder().alarm(alarm).deleted(true).successful(true).propagatedEntitiesList(propagationIds).build();
@@ -261,21 +269,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 +310,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 List<TbPair<UUID, Long>> findAlarmIdsByOriginatorId(TenantId tenantId, EntityId originatorId, long createdTimeOffset, AlarmId idOffset, int limit) {
+        log.trace("[{}] Executing findAlarmIdsByOriginatorIdAndIdOffset [{}][{}]", tenantId, originatorId, idOffset);
+        return alarmDao.findAlarmIdsByOriginatorId(tenantId, originatorId, createdTimeOffset, idOffset, limit).getData();
+    }
+
     @Override
     public AlarmSeverity findHighestAlarmSeverity(TenantId tenantId, EntityId entityId, AlarmSearchStatus alarmSearchStatus,
                                                   AlarmStatus alarmStatus, String assigneeId) {
@@ -323,9 +337,9 @@ public class BaseAlarmService extends AbstractCachedEntityService<TenantId, Page
     }
 
     @Override
-    public void deleteEntityAlarmRelations(TenantId tenantId, EntityId entityId) {
+    public int deleteEntityAlarmRecords(TenantId tenantId, EntityId entityId) {
         log.trace("Executing deleteEntityAlarms [{}]", entityId);
-        alarmDao.deleteEntityAlarmRecords(tenantId, entityId);
+        return alarmDao.deleteEntityAlarmRecords(tenantId, entityId);
     }
 
     @Override
@@ -336,14 +350,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/AssetProfileRedisCache.java b/dao/src/main/java/org/thingsboard/server/dao/asset/AssetProfileRedisCache.java
index 3f7ac6232e..625bc16d43 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/asset/AssetProfileRedisCache.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/asset/AssetProfileRedisCache.java
@@ -21,7 +21,7 @@ import org.springframework.stereotype.Service;
 import org.thingsboard.server.cache.CacheSpecsMap;
 import org.thingsboard.server.cache.RedisTbTransactionalCache;
 import org.thingsboard.server.cache.TBRedisCacheConfiguration;
-import org.thingsboard.server.cache.TbFSTRedisSerializer;
+import org.thingsboard.server.cache.TbJsonRedisSerializer;
 import org.thingsboard.server.common.data.CacheConstants;
 import org.thingsboard.server.common.data.asset.AssetProfile;
 
@@ -30,6 +30,6 @@ import org.thingsboard.server.common.data.asset.AssetProfile;
 public class AssetProfileRedisCache extends RedisTbTransactionalCache<AssetProfileCacheKey, AssetProfile> {
 
     public AssetProfileRedisCache(TBRedisCacheConfiguration configuration, CacheSpecsMap cacheSpecsMap, RedisConnectionFactory connectionFactory) {
-        super(CacheConstants.ASSET_PROFILE_CACHE, cacheSpecsMap, connectionFactory, configuration, new TbFSTRedisSerializer<>());
+        super(CacheConstants.ASSET_PROFILE_CACHE, cacheSpecsMap, connectionFactory, configuration, new TbJsonRedisSerializer<>(AssetProfile.class));
     }
 }
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 a79b70bb7b..6848c58d5c 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,21 +124,17 @@ 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));
     }
 
-    @Override
-    public AssetProfile saveAssetProfile(AssetProfile assetProfile, boolean doValidate) {
-        return doSaveAssetProfile(assetProfile, doValidate);
-    }
-
     @Override
     public AssetProfile saveAssetProfile(AssetProfile assetProfile) {
-        return doSaveAssetProfile(assetProfile, true);
+        return saveAssetProfile(assetProfile, true, true);
     }
 
-    private AssetProfile doSaveAssetProfile(AssetProfile assetProfile, boolean doValidate) {
+    @Override
+    public AssetProfile saveAssetProfile(AssetProfile assetProfile, boolean doValidate, boolean publishSaveEvent) {
         log.trace("Executing saveAssetProfile [{}]", assetProfile);
         AssetProfile oldAssetProfile = null;
         if (doValidate) {
@@ -152,8 +148,10 @@ public class AssetProfileServiceImpl extends AbstractCachedEntityService<AssetPr
             savedAssetProfile = assetProfileDao.saveAndFlush(assetProfile.getTenantId(), assetProfile);
             publishEvictEvent(new AssetProfileEvictEvent(savedAssetProfile.getTenantId(), savedAssetProfile.getName(),
                     oldAssetProfile != null ? oldAssetProfile.getName() : null, savedAssetProfile.getId(), savedAssetProfile.isDefault()));
-            eventPublisher.publishEvent(SaveEntityEvent.builder().tenantId(savedAssetProfile.getTenantId()).entityId(savedAssetProfile.getId())
-                    .created(oldAssetProfile == null).build());
+            if (publishSaveEvent) {
+                eventPublisher.publishEvent(SaveEntityEvent.builder().tenantId(savedAssetProfile.getTenantId()).entity(savedAssetProfile)
+                        .entityId(savedAssetProfile.getId()).created(oldAssetProfile == null).build());
+            }
         } catch (Exception t) {
             handleEvictEvent(new AssetProfileEvictEvent(assetProfile.getTenantId(), assetProfile.getName(),
                     oldAssetProfile != null ? oldAssetProfile.getName() : null, null, assetProfile.isDefault()));
@@ -181,18 +179,26 @@ 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);
-        AssetProfile assetProfile = assetProfileDao.findById(tenantId, assetProfileId.getId());
-        if (assetProfile != null && assetProfile.isDefault()) {
+        Validator.validateId(assetProfileId, id -> INCORRECT_ASSET_PROFILE_ID + id);
+        deleteEntity(tenantId, assetProfileId, false);
+    }
+
+    @Override
+    @Transactional
+    public void deleteEntity(TenantId tenantId, EntityId id, boolean force) {
+        AssetProfile assetProfile = assetProfileDao.findById(tenantId, id.getId());
+        if (assetProfile == null) {
+            return;
+        }
+        if (!force && assetProfile.isDefault()) {
             throw new DataValidationException("Deletion of Default Asset Profile is prohibited!");
         }
-        this.removeAssetProfile(tenantId, assetProfile);
+        removeAssetProfile(tenantId, assetProfile);
     }
 
     private void removeAssetProfile(TenantId tenantId, AssetProfile assetProfile) {
         AssetProfileId assetProfileId = assetProfile.getId();
         try {
-            deleteEntityRelations(tenantId, assetProfileId);
             assetProfileDao.removeById(tenantId, assetProfileId.getId());
             publishEvictEvent(new AssetProfileEvictEvent(assetProfile.getTenantId(), assetProfile.getName(),
                     null, assetProfile.getId(), assetProfile.isDefault()));
@@ -210,7 +216,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);
     }
@@ -218,7 +224,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);
     }
@@ -229,7 +235,7 @@ public class AssetProfileServiceImpl extends AbstractCachedEntityService<AssetPr
         AssetProfile assetProfile = findAssetProfileByName(tenantId, name, false);
         if (assetProfile == null) {
             try {
-                assetProfile = this.doCreateDefaultAssetProfile(tenantId, name, name.equals("default"));
+                assetProfile = this.doCreateDefaultAssetProfile(tenantId, name, name.equals("default"), true);
             } catch (DataValidationException e) {
                 if (ASSET_PROFILE_WITH_SUCH_NAME_ALREADY_EXISTS.equals(e.getMessage())) {
                     assetProfile = findAssetProfileByName(tenantId, name, false);
@@ -244,23 +250,23 @@ public class AssetProfileServiceImpl extends AbstractCachedEntityService<AssetPr
     @Override
     public AssetProfile createDefaultAssetProfile(TenantId tenantId) {
         log.trace("Executing createDefaultAssetProfile tenantId [{}]", tenantId);
-        return doCreateDefaultAssetProfile(tenantId, "default", true);
+        return doCreateDefaultAssetProfile(tenantId, "default", true, false);
     }
 
-    private AssetProfile doCreateDefaultAssetProfile(TenantId tenantId, String profileName, boolean defaultProfile) {
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+    private AssetProfile doCreateDefaultAssetProfile(TenantId tenantId, String profileName, boolean defaultProfile, boolean publishSaveEvent) {
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         AssetProfile assetProfile = new AssetProfile();
         assetProfile.setTenantId(tenantId);
         assetProfile.setDefault(defaultProfile);
         assetProfile.setName(profileName);
         assetProfile.setDescription("Default asset profile");
-        return saveAssetProfile(assetProfile);
+        return saveAssetProfile(assetProfile, true, publishSaveEvent);
     }
 
     @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);
     }
@@ -268,14 +274,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);
@@ -301,19 +307,18 @@ 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);
     }
 
     @Override
-    public Optional<HasId<?>> findEntity(TenantId tenantId, EntityId entityId) {
-        return Optional.ofNullable(findAssetProfileById(tenantId, new AssetProfileId(entityId.getId())));
+    public void deleteByTenantId(TenantId tenantId) {
+        deleteAssetProfilesByTenantId(tenantId);
     }
 
     @Override
-    @Transactional
-    public void deleteEntity(TenantId tenantId, EntityId id) {
-        deleteAssetProfile(tenantId, (AssetProfileId) id);
+    public Optional<HasId<?>> findEntity(TenantId tenantId, EntityId entityId) {
+        return Optional.ofNullable(findAssetProfileById(tenantId, new AssetProfileId(entityId.getId())));
     }
 
     @Override
@@ -324,7 +329,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/AssetRedisCache.java b/dao/src/main/java/org/thingsboard/server/dao/asset/AssetRedisCache.java
index 995cb3c9b3..d732d4b9f4 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/asset/AssetRedisCache.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/asset/AssetRedisCache.java
@@ -21,7 +21,7 @@ import org.springframework.stereotype.Service;
 import org.thingsboard.server.cache.CacheSpecsMap;
 import org.thingsboard.server.cache.RedisTbTransactionalCache;
 import org.thingsboard.server.cache.TBRedisCacheConfiguration;
-import org.thingsboard.server.cache.TbFSTRedisSerializer;
+import org.thingsboard.server.cache.TbJsonRedisSerializer;
 import org.thingsboard.server.common.data.CacheConstants;
 import org.thingsboard.server.common.data.asset.Asset;
 
@@ -30,6 +30,6 @@ import org.thingsboard.server.common.data.asset.Asset;
 public class AssetRedisCache extends RedisTbTransactionalCache<AssetCacheKey, Asset> {
 
     public AssetRedisCache(TBRedisCacheConfiguration configuration, CacheSpecsMap cacheSpecsMap, RedisConnectionFactory connectionFactory) {
-        super(CacheConstants.ASSET_CACHE, cacheSpecsMap, connectionFactory, configuration, new TbFSTRedisSerializer<>());
+        super(CacheConstants.ASSET_CACHE, cacheSpecsMap, connectionFactory, configuration, new TbJsonRedisSerializer<>(Asset.class));
     }
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/asset/AssetTypeFilter.java b/dao/src/main/java/org/thingsboard/server/dao/asset/AssetTypeFilter.java
index bb8e3f3af5..805ad029f7 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/asset/AssetTypeFilter.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/asset/AssetTypeFilter.java
@@ -17,7 +17,7 @@ package org.thingsboard.server.dao.asset;
 
 import lombok.Data;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import java.util.List;
 
 /**
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 7220a3acdb..d491956b25 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,44 +102,40 @@ 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);
     }
 
-    @Override
-    public Asset saveAsset(Asset asset, boolean doValidate) {
-        return doSaveAsset(asset, doValidate);
-    }
-
     @Override
     public Asset saveAsset(Asset asset) {
-        return doSaveAsset(asset, true);
+        return saveAsset(asset, true);
     }
 
-    private Asset doSaveAsset(Asset asset, boolean doValidate) {
+    @Override
+    public Asset saveAsset(Asset asset, boolean doValidate) {
         log.trace("Executing saveAsset [{}]", asset);
         Asset oldAsset = null;
         if (doValidate) {
@@ -203,20 +198,26 @@ public class BaseAssetService extends AbstractCachedEntityService<AssetCacheKey,
     @Override
     @Transactional
     public void deleteAsset(TenantId tenantId, AssetId assetId) {
-        validateId(assetId, INCORRECT_ASSET_ID + assetId);
-        if (entityViewService.existsByTenantIdAndEntityId(tenantId, assetId)) {
+        validateId(assetId, id -> INCORRECT_ASSET_ID + id);
+        deleteEntity(tenantId, assetId, false);
+    }
+
+    @Override
+    @Transactional
+    public void deleteEntity(TenantId tenantId, EntityId id, boolean force) {
+        if (!force && entityViewService.existsByTenantIdAndEntityId(tenantId, id)) {
             throw new DataValidationException("Can't delete asset that has entity views!");
         }
 
-        Asset asset = assetDao.findById(tenantId, assetId.getId());
-        alarmService.deleteEntityAlarmRelations(tenantId, assetId);
+        Asset asset = assetDao.findById(tenantId, id.getId());
+        if (asset == null) {
+            return;
+        }
         deleteAsset(tenantId, asset);
     }
 
     private void deleteAsset(TenantId tenantId, Asset asset) {
         log.trace("Executing deleteAsset [{}]", asset.getId());
-        relationService.deleteEntityRelations(tenantId, asset.getId());
-
         assetDao.removeById(tenantId, asset.getUuidId());
 
         publishEvictEvent(new AssetCacheEvictEvent(asset.getTenantId(), asset.getName(), null));
@@ -227,7 +228,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);
     }
@@ -235,7 +236,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);
     }
@@ -243,8 +244,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);
     }
@@ -252,8 +253,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);
     }
@@ -261,8 +262,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);
     }
@@ -270,23 +271,28 @@ 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 void deleteByTenantId(TenantId tenantId) {
+        deleteAssetsByTenantId(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);
     }
@@ -294,8 +300,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);
     }
@@ -303,9 +309,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);
     }
@@ -313,9 +319,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);
     }
@@ -323,9 +329,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);
     }
@@ -333,17 +339,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);
     }
 
@@ -375,7 +381,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());
     }
 
@@ -424,8 +430,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);
     }
@@ -433,9 +439,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);
     }
@@ -476,12 +482,6 @@ public class BaseAssetService extends AbstractCachedEntityService<AssetCacheKey,
         return assetDao.countByTenantId(tenantId);
     }
 
-    @Override
-    @Transactional
-    public void deleteEntity(TenantId tenantId, EntityId id) {
-        deleteAsset(tenantId, (AssetId) id);
-    }
-
     @Override
     public EntityType getEntityType() {
         return EntityType.ASSET;
diff --git a/dao/src/main/java/org/thingsboard/server/dao/attributes/AttributeCacheKey.java b/dao/src/main/java/org/thingsboard/server/dao/attributes/AttributeCacheKey.java
index f0af5f77e1..cabf433425 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/attributes/AttributeCacheKey.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/attributes/AttributeCacheKey.java
@@ -18,6 +18,7 @@ package org.thingsboard.server.dao.attributes;
 import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
+import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.id.EntityId;
 
 import java.io.Serializable;
@@ -28,7 +29,7 @@ import java.io.Serializable;
 public class AttributeCacheKey implements Serializable {
     private static final long serialVersionUID = 2013369077925351881L;
 
-    private final String scope;
+    private final AttributeScope scope;
     private final EntityId entityId;
     private final String key;
 
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 f8e76b11e4..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
@@ -15,6 +15,7 @@
  */
 package org.thingsboard.server.dao.attributes;
 
+import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.kv.AttributeKvEntry;
 import org.thingsboard.server.dao.exception.IncorrectParameterException;
@@ -25,9 +26,15 @@ import java.util.List;
 
 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(), uuid -> "Incorrect id " + uuid);
+        Validator.checkNotNull(scope, "Incorrect scope " + scope);
     }
 
     public static void validate(List<AttributeKvEntry> kvEntries,  boolean valueNoXssValidation) {
diff --git a/dao/src/main/java/org/thingsboard/server/dao/attributes/AttributesDao.java b/dao/src/main/java/org/thingsboard/server/dao/attributes/AttributesDao.java
index 08a9419885..64ca5d9dd9 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/attributes/AttributesDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/attributes/AttributesDao.java
@@ -16,7 +16,8 @@
 package org.thingsboard.server.dao.attributes;
 
 import com.google.common.util.concurrent.ListenableFuture;
-import org.thingsboard.server.common.data.EntityType;
+import org.apache.commons.lang3.tuple.Pair;
+import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.TenantId;
@@ -31,19 +32,22 @@ import java.util.Optional;
  */
 public interface AttributesDao {
 
-    Optional<AttributeKvEntry> find(TenantId tenantId, EntityId entityId, String attributeType, String attributeKey);
+    Optional<AttributeKvEntry> find(TenantId tenantId, EntityId entityId, AttributeScope attributeScope, String attributeKey);
 
-    List<AttributeKvEntry> find(TenantId tenantId, EntityId entityId, String attributeType, Collection<String> attributeKey);
+    List<AttributeKvEntry> find(TenantId tenantId, EntityId entityId, AttributeScope attributeScope, Collection<String> attributeKey);
 
-    List<AttributeKvEntry> findAll(TenantId tenantId, EntityId entityId, String attributeType);
+    List<AttributeKvEntry> findAll(TenantId tenantId, EntityId entityId, AttributeScope attributeScope);
 
-    ListenableFuture<String> save(TenantId tenantId, EntityId entityId, String attributeType, AttributeKvEntry attribute);
+    ListenableFuture<String> save(TenantId tenantId, EntityId entityId, AttributeScope attributeScope, AttributeKvEntry attribute);
 
-    List<ListenableFuture<String>> removeAll(TenantId tenantId, EntityId entityId, String attributeType, List<String> keys);
+    List<ListenableFuture<String>> removeAll(TenantId tenantId, EntityId entityId, AttributeScope attributeScope, List<String> keys);
 
     List<String> findAllKeysByDeviceProfileId(TenantId tenantId, DeviceProfileId deviceProfileId);
 
-    List<String> findAllKeysByEntityIds(TenantId tenantId, EntityType entityType, List<EntityId> entityIds);
+    List<String> findAllKeysByEntityIds(TenantId tenantId, List<EntityId> entityIds);
+
+    List<String> findAllKeysByEntityIdsAndAttributeType(TenantId tenantId, List<EntityId> entityIds, String attributeType);
+
+    List<Pair<AttributeScope, String>> removeAllByEntityId(TenantId tenantId, EntityId entityId);
 
-    List<String> findAllKeysByEntityIdsAndAttributeType(TenantId tenantId, EntityType entityType, List<EntityId> entityIds, String attributeType);
 }
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 342cb26485..1b1f2d005d 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
@@ -18,10 +18,12 @@ package org.thingsboard.server.dao.attributes;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.tuple.Pair;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Service;
+import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
@@ -57,19 +59,39 @@ 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, 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, k -> "Incorrect attribute key " + k));
         return Futures.immediateFuture(attributesDao.find(tenantId, entityId, scope, attributeKeys));
     }
 
     @Override
     public ListenableFuture<List<AttributeKvEntry>> findAll(TenantId tenantId, EntityId entityId, String scope) {
+        validate(entityId, scope);
+        return Futures.immediateFuture(attributesDao.findAll(tenantId, entityId, AttributeScope.valueOf(scope)));
+    }
+
+    @Override
+    public ListenableFuture<List<AttributeKvEntry>> findAll(TenantId tenantId, EntityId entityId, AttributeScope scope) {
         validate(entityId, scope);
         return Futures.immediateFuture(attributesDao.findAll(tenantId, entityId, scope));
     }
@@ -81,20 +103,32 @@ public class BaseAttributesService implements AttributesService {
 
     @Override
     public List<String> findAllKeysByEntityIds(TenantId tenantId, EntityType entityType, List<EntityId> entityIds) {
-        return attributesDao.findAllKeysByEntityIds(tenantId, entityType, entityIds);
+        return attributesDao.findAllKeysByEntityIds(tenantId, entityIds);
+    }
+
+    @Override
+    public List<String> findAllKeysByEntityIds(TenantId tenantId, List<EntityId> entityIds) {
+        return attributesDao.findAllKeysByEntityIds(tenantId, entityIds);
     }
 
     @Override
-    public List<String> findAllKeysByEntityIds(TenantId tenantId, EntityType entityType, List<EntityId> entityIds, String scope) {
+    public List<String> findAllKeysByEntityIds(TenantId tenantId, List<EntityId> entityIds, String scope) {
         if (StringUtils.isEmpty(scope)) {
-            return attributesDao.findAllKeysByEntityIds(tenantId, entityType, entityIds);
+            return attributesDao.findAllKeysByEntityIds(tenantId, entityIds);
         } else {
-            return attributesDao.findAllKeysByEntityIdsAndAttributeType(tenantId, entityType, entityIds, scope);
+            return attributesDao.findAllKeysByEntityIdsAndAttributeType(tenantId, entityIds, scope);
         }
     }
 
     @Override
     public ListenableFuture<String> save(TenantId tenantId, EntityId entityId, String scope, AttributeKvEntry attribute) {
+        validate(entityId, scope);
+        AttributeUtils.validate(attribute, valueNoXssValidation);
+        return attributesDao.save(tenantId, entityId, AttributeScope.valueOf(scope), attribute);
+    }
+
+    @Override
+    public ListenableFuture<String> save(TenantId tenantId, EntityId entityId, AttributeScope scope, AttributeKvEntry attribute) {
         validate(entityId, scope);
         AttributeUtils.validate(attribute, valueNoXssValidation);
         return attributesDao.save(tenantId, entityId, scope, attribute);
@@ -102,6 +136,14 @@ public class BaseAttributesService implements AttributesService {
 
     @Override
     public ListenableFuture<List<String>> save(TenantId tenantId, EntityId entityId, String scope, List<AttributeKvEntry> attributes) {
+        validate(entityId, scope);
+        AttributeUtils.validate(attributes, valueNoXssValidation);
+        List<ListenableFuture<String>> saveFutures = attributes.stream().map(attribute -> attributesDao.save(tenantId, entityId, AttributeScope.valueOf(scope), attribute)).collect(Collectors.toList());
+        return Futures.allAsList(saveFutures);
+    }
+
+    @Override
+    public ListenableFuture<List<String>> save(TenantId tenantId, EntityId entityId, AttributeScope scope, List<AttributeKvEntry> attributes) {
         validate(entityId, scope);
         AttributeUtils.validate(attributes, valueNoXssValidation);
         List<ListenableFuture<String>> saveFutures = attributes.stream().map(attribute -> attributesDao.save(tenantId, entityId, scope, attribute)).collect(Collectors.toList());
@@ -110,7 +152,20 @@ public class BaseAttributesService implements AttributesService {
 
     @Override
     public ListenableFuture<List<String>> removeAll(TenantId tenantId, EntityId entityId, String scope, List<String> attributeKeys) {
+        validate(entityId, scope);
+        return Futures.allAsList(attributesDao.removeAll(tenantId, entityId, AttributeScope.valueOf(scope), attributeKeys));
+    }
+
+    @Override
+    public ListenableFuture<List<String>> removeAll(TenantId tenantId, EntityId entityId, AttributeScope scope, List<String> attributeKeys) {
         validate(entityId, scope);
         return Futures.allAsList(attributesDao.removeAll(tenantId, entityId, scope, attributeKeys));
     }
+
+    @Override
+    public int removeAllByEntityId(TenantId tenantId, EntityId entityId) {
+        List<Pair<AttributeScope, String>> deleted = attributesDao.removeAllByEntityId(tenantId, entityId);
+        return deleted.size();
+    }
+
 }
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 1666015a48..f51bc6f0b8 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
@@ -19,13 +19,16 @@ import com.google.common.util.concurrent.Futures;
 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 lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.tuple.Pair;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.cache.TbCacheValueWrapper;
 import org.thingsboard.server.cache.TbTransactionalCache;
+import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
@@ -38,7 +41,6 @@ import org.thingsboard.server.dao.cache.CacheExecutorService;
 import org.thingsboard.server.dao.service.Validator;
 import org.thingsboard.server.dao.sql.JpaExecutorService;
 
-import javax.annotation.PostConstruct;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -110,18 +112,23 @@ public class CachedAttributesService implements AttributesService {
 
     @Override
     public ListenableFuture<Optional<AttributeKvEntry>> find(TenantId tenantId, EntityId entityId, String scope, String attributeKey) {
+        return 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);
-
-        AttributeCacheKey attributeCacheKey = new AttributeCacheKey(scope, entityId, attributeKey);
-        TbCacheValueWrapper<AttributeKvEntry> cachedAttributeValue = cache.get(attributeCacheKey);
-        if (cachedAttributeValue != null) {
-            hitCounter.increment();
-            AttributeKvEntry cachedAttributeKvEntry = cachedAttributeValue.get();
-            return Futures.immediateFuture(Optional.ofNullable(cachedAttributeKvEntry));
-        } else {
-            missCounter.increment();
-            return cacheExecutor.submit(() -> {
+        Validator.validateString(attributeKey, k -> "Incorrect attribute key " + k);
+
+        return cacheExecutor.submit(() -> {
+            AttributeCacheKey attributeCacheKey = new AttributeCacheKey(scope, entityId, attributeKey);
+            TbCacheValueWrapper<AttributeKvEntry> cachedAttributeValue = cache.get(attributeCacheKey);
+            if (cachedAttributeValue != null) {
+                hitCounter.increment();
+                AttributeKvEntry cachedAttributeKvEntry = cachedAttributeValue.get();
+                return Optional.ofNullable(cachedAttributeKvEntry);
+            } else {
+                missCounter.increment();
                 var cacheTransaction = cache.newTransactionForKey(attributeCacheKey);
                 try {
                     Optional<AttributeKvEntry> result = attributesDao.find(tenantId, entityId, scope, attributeKey);
@@ -133,64 +140,69 @@ public class CachedAttributesService implements AttributesService {
                     log.debug("Could not find attribute from cache: [{}] [{}] [{}]", entityId, scope, attributeKey, e);
                     throw e;
                 }
-            });
-        }
+            }
+        });
     }
 
     @Override
     public ListenableFuture<List<AttributeKvEntry>> find(TenantId tenantId, EntityId entityId, String scope, final Collection<String> attributeKeysNonUnique) {
+        return find(tenantId, entityId, AttributeScope.valueOf(scope), attributeKeysNonUnique);
+    }
+
+    @Override
+    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)),
                 wrappedCachedAttributes -> {
 
-        List<AttributeKvEntry> cachedAttributes = wrappedCachedAttributes.values().stream()
-                .map(TbCacheValueWrapper::get)
-                .filter(Objects::nonNull)
-                .collect(Collectors.toList());
-        if (wrappedCachedAttributes.size() == attributeKeys.size()) {
-            log.trace("[{}][{}] Found all attributes from cache: {}", entityId, scope, attributeKeys);
-            return Futures.immediateFuture(cachedAttributes);
-        }
-
-        Set<String> notFoundAttributeKeys = new HashSet<>(attributeKeys);
-        notFoundAttributeKeys.removeAll(wrappedCachedAttributes.keySet());
-
-        List<AttributeCacheKey> notFoundKeys = notFoundAttributeKeys.stream().map(k -> new AttributeCacheKey(scope, entityId, k)).collect(Collectors.toList());
-
-        // DB call should run in DB executor, not in cache-related executor
-        return jpaExecutorService.submit(() -> {
-            var cacheTransaction = cache.newTransactionForKeys(notFoundKeys);
-            try {
-                log.trace("[{}][{}] Lookup attributes from db: {}", entityId, scope, notFoundAttributeKeys);
-                List<AttributeKvEntry> result = attributesDao.find(tenantId, entityId, scope, notFoundAttributeKeys);
-                for (AttributeKvEntry foundInDbAttribute : result) {
-                    AttributeCacheKey attributeCacheKey = new AttributeCacheKey(scope, entityId, foundInDbAttribute.getKey());
-                    cacheTransaction.putIfAbsent(attributeCacheKey, foundInDbAttribute);
-                    notFoundAttributeKeys.remove(foundInDbAttribute.getKey());
-                }
-                for (String key : notFoundAttributeKeys) {
-                    cacheTransaction.putIfAbsent(new AttributeCacheKey(scope, entityId, key), null);
-                }
-                List<AttributeKvEntry> mergedAttributes = new ArrayList<>(cachedAttributes);
-                mergedAttributes.addAll(result);
-                cacheTransaction.commit();
-                log.trace("[{}][{}] Commit cache transaction: {}", entityId, scope, notFoundAttributeKeys);
-                return mergedAttributes;
-            } catch (Throwable e) {
-                cacheTransaction.rollback();
-                log.debug("Could not find attributes from cache: [{}] [{}] [{}]", entityId, scope, notFoundAttributeKeys, e);
-                throw e;
-            }
-        });
-
-        }, MoreExecutors.directExecutor()); // cacheExecutor analyse and returns results or submit to DB executor
+                    List<AttributeKvEntry> cachedAttributes = wrappedCachedAttributes.values().stream()
+                            .map(TbCacheValueWrapper::get)
+                            .filter(Objects::nonNull)
+                            .collect(Collectors.toList());
+                    if (wrappedCachedAttributes.size() == attributeKeys.size()) {
+                        log.trace("[{}][{}] Found all attributes from cache: {}", entityId, scope, attributeKeys);
+                        return Futures.immediateFuture(cachedAttributes);
+                    }
+
+                    Set<String> notFoundAttributeKeys = new HashSet<>(attributeKeys);
+                    notFoundAttributeKeys.removeAll(wrappedCachedAttributes.keySet());
+
+                    List<AttributeCacheKey> notFoundKeys = notFoundAttributeKeys.stream().map(k -> new AttributeCacheKey(scope, entityId, k)).collect(Collectors.toList());
+
+                    // DB call should run in DB executor, not in cache-related executor
+                    return jpaExecutorService.submit(() -> {
+                        var cacheTransaction = cache.newTransactionForKeys(notFoundKeys);
+                        try {
+                            log.trace("[{}][{}] Lookup attributes from db: {}", entityId, scope, notFoundAttributeKeys);
+                            List<AttributeKvEntry> result = attributesDao.find(tenantId, entityId, scope, notFoundAttributeKeys);
+                            for (AttributeKvEntry foundInDbAttribute : result) {
+                                AttributeCacheKey attributeCacheKey = new AttributeCacheKey(scope, entityId, foundInDbAttribute.getKey());
+                                cacheTransaction.putIfAbsent(attributeCacheKey, foundInDbAttribute);
+                                notFoundAttributeKeys.remove(foundInDbAttribute.getKey());
+                            }
+                            for (String key : notFoundAttributeKeys) {
+                                cacheTransaction.putIfAbsent(new AttributeCacheKey(scope, entityId, key), null);
+                            }
+                            List<AttributeKvEntry> mergedAttributes = new ArrayList<>(cachedAttributes);
+                            mergedAttributes.addAll(result);
+                            cacheTransaction.commit();
+                            log.trace("[{}][{}] Commit cache transaction: {}", entityId, scope, notFoundAttributeKeys);
+                            return mergedAttributes;
+                        } catch (Throwable e) {
+                            cacheTransaction.rollback();
+                            log.debug("Could not find attributes from cache: [{}] [{}] [{}]", entityId, scope, notFoundAttributeKeys, e);
+                            throw e;
+                        }
+                    });
+
+                }, MoreExecutors.directExecutor()); // cacheExecutor analyse and returns results or submit to DB executor
     }
 
-    private Map<String, TbCacheValueWrapper<AttributeKvEntry>> findCachedAttributes(EntityId entityId, String scope, Collection<String> attributeKeys) {
+    private Map<String, TbCacheValueWrapper<AttributeKvEntry>> findCachedAttributes(EntityId entityId, AttributeScope scope, Collection<String> attributeKeys) {
         Map<String, TbCacheValueWrapper<AttributeKvEntry>> cachedAttributes = new HashMap<>();
         for (String attributeKey : attributeKeys) {
             var cachedAttributeValue = cache.get(new AttributeCacheKey(scope, entityId, attributeKey));
@@ -206,8 +218,14 @@ public class CachedAttributesService implements AttributesService {
 
     @Override
     public ListenableFuture<List<AttributeKvEntry>> findAll(TenantId tenantId, EntityId entityId, String scope) {
+        return findAll(tenantId, entityId, AttributeScope.valueOf(scope));
+    }
+
+    @Override
+    public ListenableFuture<List<AttributeKvEntry>> findAll(TenantId tenantId, EntityId entityId, AttributeScope scope) {
         validate(entityId, scope);
-        return Futures.immediateFuture(attributesDao.findAll(tenantId, entityId, scope));
+        // We can`t watch on cache because the keys are unknown.
+        return jpaExecutorService.submit(() -> attributesDao.findAll(tenantId, entityId, scope));
     }
 
     @Override
@@ -217,20 +235,30 @@ public class CachedAttributesService implements AttributesService {
 
     @Override
     public List<String> findAllKeysByEntityIds(TenantId tenantId, EntityType entityType, List<EntityId> entityIds) {
-        return attributesDao.findAllKeysByEntityIds(tenantId, entityType, entityIds);
+        return findAllKeysByEntityIds(tenantId, entityIds);
     }
 
     @Override
-    public List<String> findAllKeysByEntityIds(TenantId tenantId, EntityType entityType, List<EntityId> entityIds, String scope) {
+    public List<String> findAllKeysByEntityIds(TenantId tenantId, List<EntityId> entityIds) {
+        return attributesDao.findAllKeysByEntityIds(tenantId, entityIds);
+    }
+
+    @Override
+    public List<String> findAllKeysByEntityIds(TenantId tenantId, List<EntityId> entityIds, String scope) {
         if (StringUtils.isEmpty(scope)) {
-            return attributesDao.findAllKeysByEntityIds(tenantId, entityType, entityIds);
+            return attributesDao.findAllKeysByEntityIds(tenantId, entityIds);
         } else {
-            return attributesDao.findAllKeysByEntityIdsAndAttributeType(tenantId, entityType, entityIds, scope);
+            return attributesDao.findAllKeysByEntityIdsAndAttributeType(tenantId, entityIds, scope);
         }
     }
 
     @Override
     public ListenableFuture<String> save(TenantId tenantId, EntityId entityId, String scope, AttributeKvEntry attribute) {
+        return save(tenantId, entityId, AttributeScope.valueOf(scope), attribute);
+    }
+
+    @Override
+    public ListenableFuture<String> save(TenantId tenantId, EntityId entityId, AttributeScope scope, AttributeKvEntry attribute) {
         validate(entityId, scope);
         AttributeUtils.validate(attribute, valueNoXssValidation);
         ListenableFuture<String> future = attributesDao.save(tenantId, entityId, scope, attribute);
@@ -239,6 +267,11 @@ public class CachedAttributesService implements AttributesService {
 
     @Override
     public ListenableFuture<List<String>> save(TenantId tenantId, EntityId entityId, String scope, List<AttributeKvEntry> attributes) {
+        return save(tenantId, entityId, AttributeScope.valueOf(scope), attributes);
+    }
+
+    @Override
+    public ListenableFuture<List<String>> save(TenantId tenantId, EntityId entityId, AttributeScope scope, List<AttributeKvEntry> attributes) {
         validate(entityId, scope);
         AttributeUtils.validate(attributes, valueNoXssValidation);
 
@@ -251,7 +284,7 @@ public class CachedAttributesService implements AttributesService {
         return Futures.allAsList(futures);
     }
 
-    private String evict(EntityId entityId, String scope, AttributeKvEntry attribute, String key) {
+    private String evict(EntityId entityId, AttributeScope scope, AttributeKvEntry attribute, String key) {
         log.trace("[{}][{}][{}] Before cache evict: {}", entityId, scope, key, attribute);
         cache.evictOrPut(new AttributeCacheKey(scope, entityId, key), attribute);
         log.trace("[{}][{}][{}] after cache evict.", entityId, scope, key);
@@ -260,6 +293,11 @@ public class CachedAttributesService implements AttributesService {
 
     @Override
     public ListenableFuture<List<String>> removeAll(TenantId tenantId, EntityId entityId, String scope, List<String> attributeKeys) {
+        return removeAll(tenantId, entityId, AttributeScope.valueOf(scope), attributeKeys);
+    }
+
+    @Override
+    public ListenableFuture<List<String>> removeAll(TenantId tenantId, EntityId entityId, AttributeScope scope, List<String> attributeKeys) {
         validate(entityId, scope);
         List<ListenableFuture<String>> futures = attributesDao.removeAll(tenantId, entityId, scope, attributeKeys);
         return Futures.allAsList(futures.stream().map(future -> Futures.transform(future, key -> {
@@ -268,4 +306,17 @@ public class CachedAttributesService implements AttributesService {
         }, cacheExecutor)).collect(Collectors.toList()));
     }
 
+    @Override
+    public int removeAllByEntityId(TenantId tenantId, EntityId entityId) {
+        List<Pair<AttributeScope, String>> result = attributesDao.removeAllByEntityId(tenantId, entityId);
+        result.forEach(deleted -> {
+            AttributeScope scope = deleted.getKey();
+            String key = deleted.getValue();
+            if (scope != null && key != null) {
+                cache.evict(new AttributeCacheKey(scope, entityId, key));
+            }
+        });
+        return result.size();
+    }
+
 }
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/audit/sink/ElasticsearchAuditLogSink.java b/dao/src/main/java/org/thingsboard/server/dao/audit/sink/ElasticsearchAuditLogSink.java
index f2dc272848..5d143ef009 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/audit/sink/ElasticsearchAuditLogSink.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/audit/sink/ElasticsearchAuditLogSink.java
@@ -25,6 +25,7 @@ import org.apache.http.client.CredentialsProvider;
 import org.apache.http.entity.ContentType;
 import org.apache.http.impl.client.BasicCredentialsProvider;
 import org.apache.http.nio.entity.NStringEntity;
+import org.elasticsearch.client.Request;
 import org.elasticsearch.client.Response;
 import org.elasticsearch.client.ResponseListener;
 import org.elasticsearch.client.RestClient;
@@ -39,8 +40,8 @@ import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.audit.AuditLog;
 import org.thingsboard.server.common.data.id.TenantId;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.Collections;
@@ -124,12 +125,10 @@ public class ElasticsearchAuditLogSink implements AuditLogSink {
                 jsonContent,
                 ContentType.APPLICATION_JSON);
 
-        restClient.performRequestAsync(
-                HttpMethod.POST.name(),
-                String.format("/%s/%s", getIndexName(auditLogEntry.getTenantId()), INDEX_TYPE),
-                Collections.emptyMap(),
-                entity,
-                responseListener);
+        Request request = new Request(HttpMethod.POST.name(),String.format("/%s/%s", getIndexName(auditLogEntry.getTenantId()), INDEX_TYPE));
+        request.setEntity(entity);
+
+        restClient.performRequestAsync(request, responseListener);
     }
 
     private String createElasticJsonRecord(AuditLog auditLog) {
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..e5f84b5e2c 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,10 +126,21 @@ 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);
+        deleteEntity(tenantId, customerId, false);
+    }
+
+    @Transactional
+    @Override
+    public void deleteEntity(TenantId tenantId, EntityId id, boolean force) {
+        CustomerId customerId = (CustomerId) id;
         Customer customer = findCustomerById(tenantId, customerId);
         if (customer == null) {
-            throw new IncorrectParameterException("Unable to delete non-existent customer.");
+            if (force) {
+                return;
+            } else {
+                throw new IncorrectParameterException("Unable to delete non-existent customer.");
+            }
         }
         dashboardService.unassignCustomerDashboards(tenantId, customerId);
         entityViewService.unassignCustomerEntityViews(customer.getTenantId(), customerId);
@@ -137,7 +148,6 @@ public class CustomerServiceImpl extends AbstractEntityService implements Custom
         deviceService.unassignCustomerDevices(customer.getTenantId(), customerId);
         edgeService.unassignCustomerEdges(customer.getTenantId(), customerId);
         userService.deleteCustomerUsers(customer.getTenantId(), customerId);
-        deleteEntityRelations(tenantId, customerId);
         apiUsageStateService.deleteApiUsageStateByEntityId(customerId);
         customerDao.removeById(tenantId, customerId.getId());
         countService.publishCountEntityEvictEvent(tenantId, EntityType.CUSTOMER);
@@ -147,7 +157,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 +179,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,10 +187,15 @@ 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);
     }
 
+    @Override
+    public void deleteByTenantId(TenantId tenantId) {
+        deleteCustomersByTenantId(tenantId);
+    }
+
     private PaginatedRemover<TenantId, Customer> customersByTenantRemover =
             new PaginatedRemover<TenantId, Customer>() {
 
@@ -200,12 +215,6 @@ public class CustomerServiceImpl extends AbstractEntityService implements Custom
         return Optional.ofNullable(findCustomerById(tenantId, new CustomerId(entityId.getId())));
     }
 
-    @Transactional
-    @Override
-    public void deleteEntity(TenantId tenantId, EntityId id) {
-        deleteCustomer(tenantId, (CustomerId) id);
-    }
-
     @Override
     public long countByTenantId(TenantId tenantId) {
         return customerDao.countByTenantId(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 b60f356b0b..167ae51fc3 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,21 +137,17 @@ 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());
     }
 
-    @Override
-    public Dashboard saveDashboard(Dashboard dashboard, boolean doValidate) {
-        return doSaveDashboard(dashboard, doValidate);
-    }
-
     @Override
     public Dashboard saveDashboard(Dashboard dashboard) {
-        return doSaveDashboard(dashboard, true);
+        return saveDashboard(dashboard, true);
     }
 
-    private Dashboard doSaveDashboard(Dashboard dashboard, boolean doValidate) {
+    @Override
+    public Dashboard saveDashboard(Dashboard dashboard, boolean doValidate) {
         log.trace("Executing saveDashboard [{}]", dashboard);
         if (doValidate) {
             dashboardValidator.validate(dashboard, DashboardInfo::getTenantId);
@@ -233,8 +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);
-        deleteEntityRelations(tenantId, dashboardId);
+        Validator.validateId(dashboardId, id -> INCORRECT_DASHBOARD_ID + id);
         try {
             dashboardDao.removeById(tenantId, dashboardId.getId());
             publishEvictEvent(new DashboardTitleEvictEvent(dashboardId));
@@ -250,10 +245,16 @@ public class DashboardServiceImpl extends AbstractEntityService implements Dashb
         }
     }
 
+    @Override
+    @Transactional
+    public void deleteEntity(TenantId tenantId, EntityId id, boolean force) {
+        deleteDashboard(tenantId, (DashboardId) id);
+    }
+
     @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);
     }
@@ -261,7 +262,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);
     }
@@ -269,15 +270,20 @@ 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 void deleteByTenantId(TenantId tenantId) {
+        deleteDashboardsByTenantId(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);
     }
@@ -285,8 +291,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);
     }
@@ -294,7 +300,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!");
@@ -305,7 +311,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!");
@@ -355,8 +361,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);
     }
@@ -394,12 +400,6 @@ public class DashboardServiceImpl extends AbstractEntityService implements Dashb
         return dashboardDao.countByTenantId(tenantId);
     }
 
-    @Override
-    @Transactional
-    public void deleteEntity(TenantId tenantId, EntityId id) {
-        deleteDashboard(tenantId, (DashboardId) id);
-    }
-
     @Override
     public EntityType getEntityType() {
         return EntityType.DASHBOARD;
diff --git a/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardTitlesRedisCache.java b/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardTitlesRedisCache.java
index daa28e7ba0..4ef5cf269d 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardTitlesRedisCache.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardTitlesRedisCache.java
@@ -21,7 +21,7 @@ import org.springframework.stereotype.Service;
 import org.thingsboard.server.cache.CacheSpecsMap;
 import org.thingsboard.server.cache.RedisTbTransactionalCache;
 import org.thingsboard.server.cache.TBRedisCacheConfiguration;
-import org.thingsboard.server.cache.TbFSTRedisSerializer;
+import org.thingsboard.server.cache.TbJsonRedisSerializer;
 import org.thingsboard.server.common.data.CacheConstants;
 import org.thingsboard.server.common.data.id.DashboardId;
 
@@ -30,6 +30,6 @@ import org.thingsboard.server.common.data.id.DashboardId;
 public class DashboardTitlesRedisCache extends RedisTbTransactionalCache<DashboardId, String> {
 
     public DashboardTitlesRedisCache(TBRedisCacheConfiguration configuration, CacheSpecsMap cacheSpecsMap, RedisConnectionFactory connectionFactory) {
-        super(CacheConstants.DASHBOARD_TITLES_CACHE, cacheSpecsMap, connectionFactory, configuration, new TbFSTRedisSerializer<>());
+        super(CacheConstants.DASHBOARD_TITLES_CACHE, cacheSpecsMap, connectionFactory, configuration, new TbJsonRedisSerializer<>(String.class));
     }
 }
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/DeviceCredentialsRedisCache.java b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsRedisCache.java
index 080c383701..060b55707a 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsRedisCache.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsRedisCache.java
@@ -21,7 +21,7 @@ import org.springframework.stereotype.Service;
 import org.thingsboard.server.cache.CacheSpecsMap;
 import org.thingsboard.server.cache.RedisTbTransactionalCache;
 import org.thingsboard.server.cache.TBRedisCacheConfiguration;
-import org.thingsboard.server.cache.TbFSTRedisSerializer;
+import org.thingsboard.server.cache.TbJsonRedisSerializer;
 import org.thingsboard.server.common.data.CacheConstants;
 import org.thingsboard.server.common.data.security.DeviceCredentials;
 
@@ -30,6 +30,6 @@ import org.thingsboard.server.common.data.security.DeviceCredentials;
 public class DeviceCredentialsRedisCache extends RedisTbTransactionalCache<String, DeviceCredentials> {
 
     public DeviceCredentialsRedisCache(TBRedisCacheConfiguration configuration, CacheSpecsMap cacheSpecsMap, RedisConnectionFactory connectionFactory) {
-        super(CacheConstants.DEVICE_CREDENTIALS_CACHE, cacheSpecsMap, connectionFactory, configuration, new TbFSTRedisSerializer<>());
+        super(CacheConstants.DEVICE_CREDENTIALS_CACHE, cacheSpecsMap, connectionFactory, configuration, new TbJsonRedisSerializer<>(DeviceCredentials.class));
     }
 }
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 3a6e58109c..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
@@ -110,7 +110,7 @@ public class DeviceCredentialsServiceImpl extends AbstractCachedEntityService<St
             var value = deviceCredentialsDao.saveAndFlush(tenantId, deviceCredentials);
             publishEvictEvent(new DeviceCredentialsEvictEvent(value.getCredentialsId(), oldDeviceCredentials != null ? oldDeviceCredentials.getCredentialsId() : null));
             if (oldDeviceCredentials != null) {
-                eventPublisher.publishEvent(ActionEntityEvent.builder().tenantId(tenantId).entityId(value.getDeviceId()).actionType(ActionType.CREDENTIALS_UPDATED).build());
+                eventPublisher.publishEvent(ActionEntityEvent.builder().tenantId(tenantId).entity(value).entityId(value.getDeviceId()).actionType(ActionType.CREDENTIALS_UPDATED).build());
             }
             return value;
         } catch (Exception t) {
diff --git a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceProfileRedisCache.java b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceProfileRedisCache.java
index cf867dfa27..eafcc5d166 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceProfileRedisCache.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceProfileRedisCache.java
@@ -15,21 +15,39 @@
  */
 package org.thingsboard.server.dao.device;
 
+import com.google.protobuf.InvalidProtocolBufferException;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.serializer.SerializationException;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.cache.CacheSpecsMap;
 import org.thingsboard.server.cache.RedisTbTransactionalCache;
 import org.thingsboard.server.cache.TBRedisCacheConfiguration;
-import org.thingsboard.server.cache.TbFSTRedisSerializer;
+import org.thingsboard.server.cache.TbRedisSerializer;
 import org.thingsboard.server.common.data.CacheConstants;
 import org.thingsboard.server.common.data.DeviceProfile;
+import org.thingsboard.server.common.util.ProtoUtils;
+import org.thingsboard.server.gen.transport.TransportProtos;
 
 @ConditionalOnProperty(prefix = "cache", value = "type", havingValue = "redis")
 @Service("DeviceProfileCache")
 public class DeviceProfileRedisCache extends RedisTbTransactionalCache<DeviceProfileCacheKey, DeviceProfile> {
 
     public DeviceProfileRedisCache(TBRedisCacheConfiguration configuration, CacheSpecsMap cacheSpecsMap, RedisConnectionFactory connectionFactory) {
-        super(CacheConstants.DEVICE_PROFILE_CACHE, cacheSpecsMap, connectionFactory, configuration, new TbFSTRedisSerializer<>());
+        super(CacheConstants.DEVICE_PROFILE_CACHE, cacheSpecsMap, connectionFactory, configuration, new TbRedisSerializer<DeviceProfileCacheKey, DeviceProfile>() {
+            @Override
+            public byte[] serialize(DeviceProfile deviceProfile) throws SerializationException {
+                return ProtoUtils.toProto(deviceProfile).toByteArray();
+            }
+
+            @Override
+            public DeviceProfile deserialize(DeviceProfileCacheKey key, byte[] bytes) throws SerializationException {
+                try {
+                    return ProtoUtils.fromProto(TransportProtos.DeviceProfileProto.parseFrom(bytes));
+                } catch (InvalidProtocolBufferException e) {
+                    throw new SerializationException(e.getMessage());
+                }
+            }
+        });
     }
 }
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 403df3e822..7a0f7a56c4 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
@@ -18,7 +18,6 @@ package org.thingsboard.server.dao.device;
 import lombok.extern.slf4j.Slf4j;
 import org.hibernate.exception.ConstraintViolationException;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.event.TransactionalEventListener;
@@ -47,7 +46,6 @@ import org.thingsboard.server.dao.entity.AbstractCachedEntityService;
 import org.thingsboard.server.dao.eventsourcing.DeleteEntityEvent;
 import org.thingsboard.server.dao.eventsourcing.SaveEntityEvent;
 import org.thingsboard.server.dao.exception.DataValidationException;
-import org.thingsboard.server.dao.queue.QueueService;
 import org.thingsboard.server.dao.resource.ImageService;
 import org.thingsboard.server.dao.service.DataValidator;
 import org.thingsboard.server.dao.service.PaginatedRemover;
@@ -91,10 +89,6 @@ public class DeviceProfileServiceImpl extends AbstractCachedEntityService<Device
     @Autowired
     private DataValidator<DeviceProfile> deviceProfileValidator;
 
-    @Lazy
-    @Autowired
-    private QueueService queueService;
-
     @Autowired
     private ImageService imageService;
 
@@ -126,7 +120,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 +133,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 +141,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,21 +149,17 @@ 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));
     }
 
-    @Override
-    public DeviceProfile saveDeviceProfile(DeviceProfile deviceProfile, boolean doValidate) {
-        return doSaveDeviceProfile(deviceProfile, doValidate);
-    }
-
     @Override
     public DeviceProfile saveDeviceProfile(DeviceProfile deviceProfile) {
-        return doSaveDeviceProfile(deviceProfile, true);
+        return saveDeviceProfile(deviceProfile, true, true);
     }
 
-    private DeviceProfile doSaveDeviceProfile(DeviceProfile deviceProfile, boolean doValidate) {
+    @Override
+    public DeviceProfile saveDeviceProfile(DeviceProfile deviceProfile, boolean doValidate, boolean publishSaveEvent) {
         log.trace("Executing saveDeviceProfile [{}]", deviceProfile);
         if (deviceProfile.getProfileData() != null && deviceProfile.getProfileData().getProvisionConfiguration() instanceof X509CertificateChainProvisionConfiguration) {
             X509CertificateChainProvisionConfiguration x509Configuration = (X509CertificateChainProvisionConfiguration) deviceProfile.getProfileData().getProvisionConfiguration();
@@ -190,8 +180,10 @@ public class DeviceProfileServiceImpl extends AbstractCachedEntityService<Device
             publishEvictEvent(new DeviceProfileEvictEvent(savedDeviceProfile.getTenantId(), savedDeviceProfile.getName(),
                     oldDeviceProfile != null ? oldDeviceProfile.getName() : null, savedDeviceProfile.getId(), savedDeviceProfile.isDefault(),
                     oldDeviceProfile != null ? oldDeviceProfile.getProvisionDeviceKey() : null));
-            eventPublisher.publishEvent(SaveEntityEvent.builder().tenantId(savedDeviceProfile.getTenantId())
-                    .entityId(savedDeviceProfile.getId()).created(oldDeviceProfile == null).build());
+            if (publishSaveEvent) {
+                eventPublisher.publishEvent(SaveEntityEvent.builder().tenantId(savedDeviceProfile.getTenantId()).entityId(savedDeviceProfile.getId())
+                        .entity(savedDeviceProfile).oldEntity(oldDeviceProfile).created(oldDeviceProfile == null).build());
+            }
         } catch (Exception t) {
             handleEvictEvent(new DeviceProfileEvictEvent(deviceProfile.getTenantId(), deviceProfile.getName(),
                     oldDeviceProfile != null ? oldDeviceProfile.getName() : null, null, deviceProfile.isDefault(),
@@ -224,23 +216,31 @@ 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);
-        DeviceProfile deviceProfile = deviceProfileDao.findById(tenantId, deviceProfileId.getId());
-        if (deviceProfile != null && deviceProfile.isDefault()) {
+        validateId(deviceProfileId, id -> INCORRECT_DEVICE_PROFILE_ID + id);
+        deleteEntity(tenantId, deviceProfileId, false);
+    }
+
+    @Override
+    @Transactional
+    public void deleteEntity(TenantId tenantId, EntityId id, boolean force) {
+        DeviceProfile deviceProfile = deviceProfileDao.findById(tenantId, id.getId());
+        if (deviceProfile == null) {
+            return;
+        }
+        if (!force && deviceProfile.isDefault()) {
             throw new DataValidationException("Deletion of Default Device Profile is prohibited!");
         }
-        this.removeDeviceProfile(tenantId, deviceProfile);
+        removeDeviceProfile(tenantId, deviceProfile);
     }
 
     private void removeDeviceProfile(TenantId tenantId, DeviceProfile deviceProfile) {
         DeviceProfileId deviceProfileId = deviceProfile.getId();
         try {
-            deleteEntityRelations(tenantId, deviceProfileId);
             deviceProfileDao.removeById(tenantId, deviceProfileId.getId());
             publishEvictEvent(new DeviceProfileEvictEvent(deviceProfile.getTenantId(), deviceProfile.getName(),
                     null, deviceProfile.getId(), deviceProfile.isDefault(),
                     deviceProfile.getProvisionDeviceKey()));
-            eventPublisher.publishEvent(DeleteEntityEvent.builder().tenantId(tenantId).entityId(deviceProfileId).build());
+            eventPublisher.publishEvent(DeleteEntityEvent.builder().tenantId(tenantId).entityId(deviceProfileId).entity(deviceProfile).build());
         } catch (Exception t) {
             ConstraintViolationException e = extractConstraintViolationException(t).orElse(null);
             if (e != null && e.getConstraintName() != null && e.getConstraintName().equalsIgnoreCase("fk_device_profile")) {
@@ -254,7 +254,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);
     }
@@ -262,7 +262,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);
     }
@@ -273,7 +273,7 @@ public class DeviceProfileServiceImpl extends AbstractCachedEntityService<Device
         DeviceProfile deviceProfile = findDeviceProfileByName(tenantId, name, false);
         if (deviceProfile == null) {
             try {
-                deviceProfile = this.doCreateDefaultDeviceProfile(tenantId, name, name.equals("default"));
+                deviceProfile = this.doCreateDefaultDeviceProfile(tenantId, name, name.equals("default"), true);
             } catch (DataValidationException e) {
                 if (DEVICE_PROFILE_WITH_SUCH_NAME_ALREADY_EXISTS.equals(e.getMessage())) {
                     deviceProfile = findDeviceProfileByName(tenantId, name, false);
@@ -288,11 +288,11 @@ public class DeviceProfileServiceImpl extends AbstractCachedEntityService<Device
     @Override
     public DeviceProfile createDefaultDeviceProfile(TenantId tenantId) {
         log.trace("Executing createDefaultDeviceProfile tenantId [{}]", tenantId);
-        return doCreateDefaultDeviceProfile(tenantId, "default", true);
+        return doCreateDefaultDeviceProfile(tenantId, "default", true, false);
     }
 
-    private DeviceProfile doCreateDefaultDeviceProfile(TenantId tenantId, String profileName, boolean defaultProfile) {
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+    private DeviceProfile doCreateDefaultDeviceProfile(TenantId tenantId, String profileName, boolean defaultProfile, boolean publishSaveEvent) {
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         DeviceProfile deviceProfile = new DeviceProfile();
         deviceProfile.setTenantId(tenantId);
         deviceProfile.setDefault(defaultProfile);
@@ -309,13 +309,13 @@ public class DeviceProfileServiceImpl extends AbstractCachedEntityService<Device
         deviceProfileData.setTransportConfiguration(transportConfiguration);
         deviceProfileData.setProvisionConfiguration(provisionConfiguration);
         deviceProfile.setProfileData(deviceProfileData);
-        return saveDeviceProfile(deviceProfile);
+        return saveDeviceProfile(deviceProfile, true, publishSaveEvent);
     }
 
     @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);
     }
@@ -323,14 +323,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);
@@ -356,19 +356,18 @@ 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);
     }
 
     @Override
-    public Optional<HasId<?>> findEntity(TenantId tenantId, EntityId entityId) {
-        return Optional.ofNullable(findDeviceProfileById(tenantId, new DeviceProfileId(entityId.getId())));
+    public void deleteByTenantId(TenantId tenantId) {
+        deleteDeviceProfilesByTenantId(tenantId);
     }
 
     @Override
-    @Transactional
-    public void deleteEntity(TenantId tenantId, EntityId id) {
-        deleteDeviceProfile(tenantId, (DeviceProfileId) id);
+    public Optional<HasId<?>> findEntity(TenantId tenantId, EntityId entityId) {
+        return Optional.ofNullable(findDeviceProfileById(tenantId, new DeviceProfileId(entityId.getId())));
     }
 
     @Override
@@ -379,7 +378,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 14d232ab89..a616c14a69 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
@@ -38,6 +38,7 @@ import org.thingsboard.server.common.data.EntitySubtype;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.EntityView;
 import org.thingsboard.server.common.data.StringUtils;
+import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.common.data.audit.ActionType;
 import org.thingsboard.server.common.data.device.DeviceSearchQuery;
 import org.thingsboard.server.common.data.device.credentials.BasicMqttCredentials;
@@ -77,6 +78,7 @@ import org.thingsboard.server.dao.exception.DataValidationException;
 import org.thingsboard.server.dao.exception.IncorrectParameterException;
 import org.thingsboard.server.dao.service.DataValidator;
 import org.thingsboard.server.dao.service.PaginatedRemover;
+import org.thingsboard.server.dao.tenant.TenantService;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -112,6 +114,9 @@ public class DeviceServiceImpl extends AbstractCachedEntityService<DeviceCacheKe
     @Autowired
     private EventService eventService;
 
+    @Autowired
+    private TenantService tenantService;
+
     @Autowired
     private DataValidator<Device> deviceValidator;
 
@@ -121,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);
@@ -141,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 {
@@ -152,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);
     }
@@ -234,14 +239,14 @@ public class DeviceServiceImpl extends AbstractCachedEntityService<DeviceCacheKe
             }
             device.setType(deviceProfile.getName());
             device.setDeviceData(syncDeviceData(deviceProfile, device.getDeviceData()));
-            Device result = deviceDao.saveAndFlush(device.getTenantId(), device);
+            Device savedDevice = deviceDao.saveAndFlush(device.getTenantId(), device);
             publishEvictEvent(deviceCacheEvictEvent);
             if (device.getId() == null) {
-                countService.publishCountEntityEvictEvent(result.getTenantId(), EntityType.DEVICE);
+                countService.publishCountEntityEvictEvent(savedDevice.getTenantId(), EntityType.DEVICE);
             }
-            eventPublisher.publishEvent(SaveEntityEvent.builder().tenantId(result.getTenantId())
-                    .entityId(result.getId()).created(device.getId() == null).build());
-            return result;
+            eventPublisher.publishEvent(SaveEntityEvent.builder().tenantId(savedDevice.getTenantId()).entityId(savedDevice.getId())
+                    .entity(savedDevice).oldEntity(oldDevice).created(device.getId() == null).build());
+            return savedDevice;
         } catch (Exception t) {
             handleEvictEvent(deviceCacheEvictEvent);
             checkConstraintViolation(t,
@@ -316,45 +321,50 @@ public class DeviceServiceImpl extends AbstractCachedEntityService<DeviceCacheKe
     @Transactional
     @Override
     public void deleteDevice(final TenantId tenantId, final DeviceId deviceId) {
-        validateId(deviceId, INCORRECT_DEVICE_ID + deviceId);
-        if (entityViewService.existsByTenantIdAndEntityId(tenantId, deviceId)) {
+        validateId(deviceId, id -> INCORRECT_DEVICE_ID + id);
+        deleteEntity(tenantId, deviceId, false);
+    }
+
+    @Override
+    @Transactional
+    public void deleteEntity(TenantId tenantId, EntityId id, boolean force) {
+        if (!force && entityViewService.existsByTenantIdAndEntityId(tenantId, id)) {
             throw new DataValidationException("Can't delete device that has entity views!");
         }
 
-        Device device = deviceDao.findById(tenantId, deviceId.getId());
-        alarmService.deleteEntityAlarmRelations(tenantId, deviceId);
+        Device device = deviceDao.findById(tenantId, id.getId());
+        if (device == null) {
+            return;
+        }
         deleteDevice(tenantId, device);
     }
 
     private void deleteDevice(TenantId tenantId, Device device) {
         log.trace("Executing deleteDevice [{}]", device.getId());
         deviceCredentialsService.deleteDeviceCredentialsByDeviceId(tenantId, device.getId());
-        relationService.deleteEntityRelations(tenantId, device.getId());
-
         deviceDao.removeById(tenantId, device.getUuidId());
 
         DeviceCacheEvictEvent deviceCacheEvictEvent = new DeviceCacheEvictEvent(device.getTenantId(), device.getId(), device.getName(), null);
         publishEvictEvent(deviceCacheEvictEvent);
         countService.publishCountEntityEvictEvent(tenantId, EntityType.DEVICE);
-        eventPublisher.publishEvent(DeleteEntityEvent.builder().tenantId(tenantId).entityId(device.getId()).build());
+        eventPublisher.publishEvent(DeleteEntityEvent.builder().tenantId(tenantId).entityId(device.getId()).entity(device).build());
     }
 
     @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);
     }
 
-
     @Override
     public PageData<DeviceInfo> findDeviceInfosByFilter(DeviceInfoFilter filter, PageLink pageLink) {
         log.trace("Executing findDeviceInfosByFilter, filter [{}], pageLink [{}]", filter, pageLink);
         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);
 
@@ -370,8 +380,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);
     }
@@ -383,8 +393,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);
     }
@@ -392,30 +402,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));
     }
 
@@ -423,15 +433,21 @@ 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);
     }
 
+    @Transactional
+    @Override
+    public void deleteByTenantId(TenantId tenantId) {
+        deleteDevicesByTenantId(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);
     }
@@ -439,9 +455,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);
     }
@@ -449,9 +465,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));
     }
@@ -459,9 +475,9 @@ 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);
-        customerDeviceUnasigner.removeEntities(tenantId, customerId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        validateId(customerId, id -> INCORRECT_CUSTOMER_ID + id);
+        customerDevicesRemover.removeEntities(tenantId, customerId);
     }
 
     @Override
@@ -486,7 +502,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());
     }
 
@@ -494,16 +510,16 @@ public class DeviceServiceImpl extends AbstractCachedEntityService<DeviceCacheKe
     @Override
     public Device assignDeviceToTenant(TenantId tenantId, Device device) {
         log.trace("Executing assignDeviceToTenant [{}][{}]", tenantId, device);
-        List<EntityView> entityViews = entityViewService.findEntityViewsByTenantIdAndEntityId(device.getTenantId(), device.getId());
+        TenantId oldTenantId = device.getTenantId();
+        Tenant oldTenant = tenantService.findTenantById(oldTenantId);
+        List<EntityView> entityViews = entityViewService.findEntityViewsByTenantIdAndEntityId(oldTenantId, device.getId());
         if (!CollectionUtils.isEmpty(entityViews)) {
             throw new DataValidationException("Can't assign device that has entity views to another tenant!");
         }
 
-        eventService.removeEvents(device.getTenantId(), device.getId());
+        eventService.removeEvents(oldTenantId, device.getId());
 
-        relationService.removeRelations(device.getTenantId(), device.getId());
-
-        TenantId oldTenantId = device.getTenantId();
+        relationService.removeRelations(oldTenantId, device.getId());
 
         device.setTenantId(tenantId);
         device.setCustomerId(null);
@@ -518,6 +534,9 @@ public class DeviceServiceImpl extends AbstractCachedEntityService<DeviceCacheKe
         publishEvictEvent(oldTenantEvent);
         publishEvictEvent(newTenantEvent);
 
+        eventPublisher.publishEvent(ActionEntityEvent.builder().tenantId(tenantId).entity(savedDevice)
+                .entityId(savedDevice.getId()).body(JacksonUtil.toString(oldTenant)).actionType(ActionType.ASSIGNED_TO_TENANT).build());
+
         return savedDevice;
     }
 
@@ -619,8 +638,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);
     }
@@ -628,9 +647,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);
     }
@@ -640,12 +659,6 @@ public class DeviceServiceImpl extends AbstractCachedEntityService<DeviceCacheKe
         return deviceDao.countByTenantId(tenantId);
     }
 
-    @Override
-    @Transactional
-    public void deleteEntity(TenantId tenantId, EntityId id) {
-        deleteDevice(tenantId, (DeviceId) id);
-    }
-
     private final PaginatedRemover<TenantId, Device> tenantDevicesRemover = new PaginatedRemover<>() {
 
         @Override
@@ -659,7 +672,7 @@ public class DeviceServiceImpl extends AbstractCachedEntityService<DeviceCacheKe
         }
     };
 
-    private final PaginatedRemover<CustomerId, Device> customerDeviceUnasigner = new PaginatedRemover<CustomerId, Device>() {
+    private final PaginatedRemover<CustomerId, Device> customerDevicesRemover = new PaginatedRemover<>() {
 
         @Override
         protected PageData<Device> findEntities(TenantId tenantId, CustomerId id, PageLink pageLink) {
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/util/DataDecodingEncodingService.java b/dao/src/main/java/org/thingsboard/server/dao/dictionary/KeyDictionaryDao.java
similarity index 76%
rename from common/queue/src/main/java/org/thingsboard/server/queue/util/DataDecodingEncodingService.java
rename to dao/src/main/java/org/thingsboard/server/dao/dictionary/KeyDictionaryDao.java
index b699006018..7ba7a947c0 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/util/DataDecodingEncodingService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/dictionary/KeyDictionaryDao.java
@@ -13,15 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.thingsboard.server.queue.util;
+package org.thingsboard.server.dao.dictionary;
 
-import java.util.Optional;
 
-public interface DataDecodingEncodingService {
+public interface KeyDictionaryDao {
 
-    <T> Optional<T> decode(byte[] byteArray);
+    Integer getOrSaveKeyId(String strKey);
 
-    <T> byte[] encode(T msq);
+    String getKey(Integer keyId);
 
 }
-
diff --git a/dao/src/main/java/org/thingsboard/server/dao/edge/BaseEdgeEventService.java b/dao/src/main/java/org/thingsboard/server/dao/edge/BaseEdgeEventService.java
index 4d1e126c49..274b0154a5 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/edge/BaseEdgeEventService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/edge/BaseEdgeEventService.java
@@ -15,10 +15,17 @@
  */
 package org.thingsboard.server.dao.edge;
 
+import com.google.common.util.concurrent.FutureCallback;
+import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
-import lombok.AllArgsConstructor;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.jetbrains.annotations.NotNull;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Service;
+import org.thingsboard.common.util.ThingsBoardThreadFactory;
 import org.thingsboard.server.cache.limits.RateLimitService;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.edge.EdgeEvent;
@@ -28,17 +35,37 @@ import org.thingsboard.server.common.data.limit.LimitedApi;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.TimePageLink;
 import org.thingsboard.server.common.msg.tools.TbRateLimitsException;
+import org.thingsboard.server.dao.eventsourcing.SaveEntityEvent;
 import org.thingsboard.server.dao.service.DataValidator;
 
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
 @Service
 @Slf4j
-@AllArgsConstructor
+@RequiredArgsConstructor
 public class BaseEdgeEventService implements EdgeEventService {
 
     private final EdgeEventDao edgeEventDao;
     private final RateLimitService rateLimitService;
     private final DataValidator<EdgeEvent> edgeEventValidator;
 
+    private final ApplicationEventPublisher eventPublisher;
+
+    private ExecutorService edgeEventExecutor;
+
+    @PostConstruct
+    public void initExecutor() {
+        edgeEventExecutor = Executors.newSingleThreadExecutor(ThingsBoardThreadFactory.forName("edge-event-service"));
+    }
+
+    @PreDestroy
+    public void shutdownExecutor() {
+        if (edgeEventExecutor != null) {
+            edgeEventExecutor.shutdown();
+        }
+    }
+
     @Override
     public ListenableFuture<Void> saveAsync(EdgeEvent edgeEvent) {
         if (!rateLimitService.checkRateLimit(LimitedApi.EDGE_EVENTS, edgeEvent.getTenantId())) {
@@ -48,7 +75,21 @@ public class BaseEdgeEventService implements EdgeEventService {
             throw new TbRateLimitsException(EntityType.EDGE);
         }
         edgeEventValidator.validate(edgeEvent, EdgeEvent::getTenantId);
-        return edgeEventDao.saveAsync(edgeEvent);
+
+        ListenableFuture<Void> saveFuture = edgeEventDao.saveAsync(edgeEvent);
+
+        Futures.addCallback(saveFuture, new FutureCallback<>() {
+            @Override
+            public void onSuccess(Void result) {
+                eventPublisher.publishEvent(SaveEntityEvent.builder().tenantId(edgeEvent.getTenantId())
+                        .entity(edgeEvent).entityId(edgeEvent.getEdgeId()).build());
+            }
+
+            @Override
+            public void onFailure(@NotNull Throwable throwable) {}
+        }, edgeEventExecutor);
+
+        return saveFuture;
     }
 
     @Override
diff --git a/dao/src/main/java/org/thingsboard/server/dao/edge/EdgeRedisCache.java b/dao/src/main/java/org/thingsboard/server/dao/edge/EdgeRedisCache.java
index b91fa82165..f1502e9ad7 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/edge/EdgeRedisCache.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/edge/EdgeRedisCache.java
@@ -21,7 +21,7 @@ import org.springframework.stereotype.Service;
 import org.thingsboard.server.cache.CacheSpecsMap;
 import org.thingsboard.server.cache.RedisTbTransactionalCache;
 import org.thingsboard.server.cache.TBRedisCacheConfiguration;
-import org.thingsboard.server.cache.TbFSTRedisSerializer;
+import org.thingsboard.server.cache.TbJsonRedisSerializer;
 import org.thingsboard.server.common.data.CacheConstants;
 import org.thingsboard.server.common.data.edge.Edge;
 
@@ -30,6 +30,6 @@ import org.thingsboard.server.common.data.edge.Edge;
 public class EdgeRedisCache extends RedisTbTransactionalCache<EdgeCacheKey, Edge> {
 
     public EdgeRedisCache(TBRedisCacheConfiguration configuration, CacheSpecsMap cacheSpecsMap, RedisConnectionFactory connectionFactory) {
-        super(CacheConstants.EDGE_CACHE, cacheSpecsMap, connectionFactory, configuration, new TbFSTRedisSerializer<>());
+        super(CacheConstants.EDGE_CACHE, cacheSpecsMap, connectionFactory, configuration, new TbJsonRedisSerializer<>(Edge.class));
     }
 }
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 9655a2d8e4..66cf74ba9c 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;
@@ -60,6 +61,8 @@ import org.thingsboard.server.common.data.rule.RuleNode;
 import org.thingsboard.server.dao.attributes.AttributesService;
 import org.thingsboard.server.dao.entity.AbstractCachedEntityService;
 import org.thingsboard.server.dao.eventsourcing.ActionEntityEvent;
+import org.thingsboard.server.dao.eventsourcing.DeleteEntityEvent;
+import org.thingsboard.server.dao.eventsourcing.SaveEntityEvent;
 import org.thingsboard.server.dao.exception.DataValidationException;
 import org.thingsboard.server.dao.relation.RelationService;
 import org.thingsboard.server.dao.rule.RuleChainService;
@@ -69,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 javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -136,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);
@@ -176,8 +178,10 @@ public class EdgeServiceImpl extends AbstractCachedEntityService<EdgeCacheKey, E
         Edge oldEdge = edgeValidator.validate(edge, Edge::getTenantId);
         EdgeCacheEvictEvent evictEvent = new EdgeCacheEvictEvent(edge.getTenantId(), edge.getName(), oldEdge != null ? oldEdge.getName() : null);
         try {
-            var savedEdge = edgeDao.save(edge.getTenantId(), edge);
+            Edge savedEdge = edgeDao.save(edge.getTenantId(), edge);
             publishEvictEvent(evictEvent);
+            eventPublisher.publishEvent(SaveEntityEvent.builder().tenantId(savedEdge.getTenantId())
+                    .entityId(savedEdge.getId()).entity(savedEdge).created(edge.getId() == null).build());
             return savedEdge;
         } catch (Exception t) {
             handleEvictEvent(evictEvent);
@@ -217,21 +221,28 @@ 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());
-
-        deleteEntityRelations(tenantId, edgeId);
-
+        if (edge == null) {
+            return;
+        }
         edgeDao.removeById(tenantId, edgeId.getId());
 
+        eventPublisher.publishEvent(DeleteEntityEvent.builder().tenantId(tenantId).entityId(edgeId).build());
         publishEvictEvent(new EdgeCacheEvictEvent(edge.getTenantId(), edge.getName(), null));
     }
 
+    @Override
+    @Transactional
+    public void deleteEntity(TenantId tenantId, EntityId id, boolean force) {
+        deleteEdge(tenantId, (EdgeId) id);
+    }
+
     @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);
     }
@@ -239,8 +250,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);
     }
@@ -248,8 +259,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);
     }
@@ -257,7 +268,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);
     }
@@ -265,23 +276,28 @@ 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 void deleteByTenantId(TenantId tenantId) {
+        deleteEdgesByTenantId(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);
     }
@@ -289,9 +305,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);
     }
@@ -299,8 +315,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);
     }
@@ -308,9 +324,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);
     }
@@ -318,9 +334,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));
     }
@@ -328,8 +344,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);
     }
 
@@ -349,7 +365,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) {
@@ -365,7 +381,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 -> {
@@ -395,7 +411,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);
     }
@@ -403,13 +419,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) {
@@ -422,7 +438,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) {
@@ -508,7 +524,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 =
@@ -517,8 +533,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)) {
@@ -544,7 +559,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/AbstractEntityService.java b/dao/src/main/java/org/thingsboard/server/dao/entity/AbstractEntityService.java
index 0baa497cbf..6b88f19699 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/entity/AbstractEntityService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/entity/AbstractEntityService.java
@@ -31,6 +31,7 @@ import org.thingsboard.server.dao.alarm.AlarmService;
 import org.thingsboard.server.dao.edge.EdgeService;
 import org.thingsboard.server.dao.entityview.EntityViewService;
 import org.thingsboard.server.dao.exception.DataValidationException;
+import org.thingsboard.server.dao.housekeeper.CleanUpService;
 import org.thingsboard.server.dao.relation.RelationService;
 
 import java.util.Collections;
@@ -63,6 +64,10 @@ public abstract class AbstractEntityService {
     @Autowired(required = false)
     protected EdgeService edgeService;
 
+    @Autowired
+    @Lazy
+    protected CleanUpService cleanUpService;
+
     protected void createRelation(TenantId tenantId, EntityRelation relation) {
         log.debug("Creating relation: {}", relation);
         relationService.saveRelation(tenantId, relation);
@@ -73,11 +78,6 @@ public abstract class AbstractEntityService {
         relationService.deleteRelation(tenantId, relation);
     }
 
-    protected void deleteEntityRelations(TenantId tenantId, EntityId entityId) {
-        relationService.deleteEntityRelations(tenantId, entityId);
-        alarmService.deleteEntityAlarmRelations(tenantId, entityId);
-    }
-
     protected static Optional<ConstraintViolationException> extractConstraintViolationException(Exception t) {
         if (t instanceof ConstraintViolationException) {
             return Optional.of((ConstraintViolationException) t);
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..364d3a12f3 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,32 +15,29 @@
  */
 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;
+import java.util.Optional;
 
 @Service
 @RequiredArgsConstructor
 @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)) {
@@ -52,7 +49,8 @@ public class DefaultEntityServiceRegistry implements EntityServiceRegistry {
 
     @Override
     public EntityDaoService getServiceByEntityType(EntityType entityType) {
-        return entityDaoServicesMap.get(entityType);
+        return Optional.ofNullable(entityDaoServicesMap.get(entityType))
+                .orElseThrow(() -> new IllegalArgumentException("Unsupported entity type " + entityType));
     }
 
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/entity/EntityDaoRegistry.java b/dao/src/main/java/org/thingsboard/server/dao/entity/EntityDaoRegistry.java
new file mode 100644
index 0000000000..7b2f2d42c1
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/entity/EntityDaoRegistry.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.dao.entity;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.thingsboard.server.common.data.EntityType;
+import org.thingsboard.server.dao.Dao;
+
+import java.util.EnumMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+@Slf4j
+public class EntityDaoRegistry {
+
+    private final Map<EntityType, Dao<?>> daos = new EnumMap<>(EntityType.class);
+
+    private EntityDaoRegistry(List<Dao<?>> daos) {
+        daos.forEach(dao -> {
+            EntityType entityType = dao.getEntityType();
+            if (entityType != null) {
+                this.daos.put(entityType, dao);
+            }
+        });
+    }
+
+    @SuppressWarnings("unchecked")
+    public <T> Dao<T> getDao(EntityType entityType) {
+        Dao<T> dao = (Dao<T>) daos.get(entityType);
+        if (dao == null) {
+            throw new IllegalArgumentException("Missing dao for entity type " + entityType);
+        }
+        return dao;
+    }
+
+}
diff --git a/dao/src/main/java/org/thingsboard/server/dao/entity/count/EntityCountRedisCache.java b/dao/src/main/java/org/thingsboard/server/dao/entity/count/EntityCountRedisCache.java
index 85be824c1d..e4b19696da 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/entity/count/EntityCountRedisCache.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/entity/count/EntityCountRedisCache.java
@@ -21,7 +21,7 @@ import org.springframework.stereotype.Service;
 import org.thingsboard.server.cache.CacheSpecsMap;
 import org.thingsboard.server.cache.RedisTbTransactionalCache;
 import org.thingsboard.server.cache.TBRedisCacheConfiguration;
-import org.thingsboard.server.cache.TbFSTRedisSerializer;
+import org.thingsboard.server.cache.TbJsonRedisSerializer;
 import org.thingsboard.server.common.data.CacheConstants;
 import org.thingsboard.server.dao.entity.EntityCountCacheKey;
 
@@ -30,6 +30,6 @@ import org.thingsboard.server.dao.entity.EntityCountCacheKey;
 public class EntityCountRedisCache extends RedisTbTransactionalCache<EntityCountCacheKey, Long> {
 
     public EntityCountRedisCache(TBRedisCacheConfiguration configuration, CacheSpecsMap cacheSpecsMap, RedisConnectionFactory connectionFactory) {
-        super(CacheConstants.ENTITY_COUNT_CACHE, cacheSpecsMap, connectionFactory, configuration, new TbFSTRedisSerializer<>());
+        super(CacheConstants.ENTITY_COUNT_CACHE, cacheSpecsMap, connectionFactory, configuration, new TbJsonRedisSerializer<>(Long.class));
     }
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/entityview/EntityViewRedisCache.java b/dao/src/main/java/org/thingsboard/server/dao/entityview/EntityViewRedisCache.java
index 120850a0ea..8ce7f84b75 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/entityview/EntityViewRedisCache.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/entityview/EntityViewRedisCache.java
@@ -21,7 +21,7 @@ import org.springframework.stereotype.Service;
 import org.thingsboard.server.cache.CacheSpecsMap;
 import org.thingsboard.server.cache.RedisTbTransactionalCache;
 import org.thingsboard.server.cache.TBRedisCacheConfiguration;
-import org.thingsboard.server.cache.TbFSTRedisSerializer;
+import org.thingsboard.server.cache.TbJsonRedisSerializer;
 import org.thingsboard.server.common.data.CacheConstants;
 
 @ConditionalOnProperty(prefix = "cache", value = "type", havingValue = "redis")
@@ -29,6 +29,6 @@ import org.thingsboard.server.common.data.CacheConstants;
 public class EntityViewRedisCache extends RedisTbTransactionalCache<EntityViewCacheKey, EntityViewCacheValue> {
 
     public EntityViewRedisCache(TBRedisCacheConfiguration configuration, CacheSpecsMap cacheSpecsMap, RedisConnectionFactory connectionFactory) {
-        super(CacheConstants.ENTITY_VIEW_CACHE, cacheSpecsMap, connectionFactory, configuration, new TbFSTRedisSerializer<>());
+        super(CacheConstants.ENTITY_VIEW_CACHE, cacheSpecsMap, connectionFactory, configuration, new TbJsonRedisSerializer<>(EntityViewCacheValue.class));
     }
 }
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 ed962ce84c..e56055b614 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
@@ -52,7 +52,7 @@ import org.thingsboard.server.dao.service.DataValidator;
 import org.thingsboard.server.dao.service.PaginatedRemover;
 import org.thingsboard.server.dao.sql.JpaExecutorService;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -101,17 +101,13 @@ public class EntityViewServiceImpl extends AbstractCachedEntityService<EntityVie
         cache.evict(keys);
     }
 
-    @Override
-    public EntityView saveEntityView(EntityView entityView, boolean doValidate) {
-        return doSaveEntityView(entityView, doValidate);
-    }
-
     @Override
     public EntityView saveEntityView(EntityView entityView) {
-        return doSaveEntityView(entityView, true);
+        return saveEntityView(entityView, true);
     }
 
-    private EntityView doSaveEntityView(EntityView entityView, boolean doValidate) {
+    @Override
+    public EntityView saveEntityView(EntityView entityView, boolean doValidate) {
         log.trace("Executing save entity view [{}]", entityView);
         EntityView old = null;
         if (doValidate) {
@@ -149,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());
     }
 
@@ -169,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);
@@ -178,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);
@@ -188,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);
     }
@@ -196,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);
     }
@@ -204,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);
     }
 
@@ -224,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);
@@ -235,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);
@@ -246,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);
     }
@@ -258,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);
     }
@@ -295,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()),
@@ -313,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()),
@@ -330,25 +326,38 @@ 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);
-        deleteEntityRelations(tenantId, entityViewId);
+        validateId(entityViewId, id -> INCORRECT_ENTITY_VIEW_ID + id);
         EntityView entityView = entityViewDao.findById(tenantId, entityViewId.getId());
+        if (entityView == null) {
+            return;
+        }
         entityViewDao.removeById(tenantId, entityViewId.getId());
         publishEvictEvent(new EntityViewEvictEvent(entityView.getTenantId(), entityView.getId(), entityView.getEntityId(), null, entityView.getName(), null));
         eventPublisher.publishEvent(DeleteEntityEvent.builder().tenantId(tenantId).entityId(entityViewId).build());
     }
 
+    @Override
+    @Transactional
+    public void deleteEntity(TenantId tenantId, EntityId id, boolean force) {
+        deleteEntityView(tenantId, (EntityViewId) id);
+    }
+
     @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 void deleteByTenantId(TenantId tenantId) {
+        deleteEntityViewsByTenantId(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 -> {
@@ -406,8 +415,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);
     }
@@ -415,9 +424,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/eventsourcing/ActionEntityEvent.java b/dao/src/main/java/org/thingsboard/server/dao/eventsourcing/ActionEntityEvent.java
index d3728fab0a..2489cd2eab 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/eventsourcing/ActionEntityEvent.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/eventsourcing/ActionEntityEvent.java
@@ -24,10 +24,11 @@ import org.thingsboard.server.common.data.id.TenantId;
 
 @Data
 @Builder
-public class ActionEntityEvent {
+public class ActionEntityEvent<T> {
     private final TenantId tenantId;
-    private final EdgeId edgeId;
+    private final T entity;
     private final EntityId entityId;
+    private final EdgeId edgeId;
     private final String body;
     private final ActionType actionType;
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/eventsourcing/DeleteEntityEvent.java b/dao/src/main/java/org/thingsboard/server/dao/eventsourcing/DeleteEntityEvent.java
index ea6909c42b..fbae8541e3 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/eventsourcing/DeleteEntityEvent.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/eventsourcing/DeleteEntityEvent.java
@@ -27,6 +27,7 @@ public class DeleteEntityEvent<T> {
     private final TenantId tenantId;
     private final EntityId entityId;
     private final T entity;
+    private final String body;
 
     @Builder.Default
     private final long ts = System.currentTimeMillis();
diff --git a/dao/src/main/java/org/thingsboard/server/dao/housekeeper/CleanUpService.java b/dao/src/main/java/org/thingsboard/server/dao/housekeeper/CleanUpService.java
new file mode 100644
index 0000000000..d64e6ea536
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/housekeeper/CleanUpService.java
@@ -0,0 +1,91 @@
+/**
+ * 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.housekeeper;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.event.TransactionalEventListener;
+import org.thingsboard.server.common.data.EntityType;
+import org.thingsboard.server.common.data.User;
+import org.thingsboard.server.common.data.housekeeper.HousekeeperTask;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.msg.housekeeper.HousekeeperClient;
+import org.thingsboard.server.dao.eventsourcing.DeleteEntityEvent;
+import org.thingsboard.server.dao.relation.RelationService;
+
+import java.util.EnumSet;
+import java.util.Optional;
+import java.util.Set;
+
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class CleanUpService {
+
+    private final Optional<HousekeeperClient> housekeeperClient;
+    private final RelationService relationService;
+
+    private final Set<EntityType> skippedEntities = EnumSet.of(
+            EntityType.ALARM, EntityType.QUEUE, EntityType.TB_RESOURCE, EntityType.OTA_PACKAGE,
+            EntityType.NOTIFICATION_REQUEST, EntityType.NOTIFICATION_TEMPLATE,
+            EntityType.NOTIFICATION_TARGET, EntityType.NOTIFICATION_RULE
+    );
+
+    @TransactionalEventListener(fallbackExecution = true) // after transaction commit
+    @Transactional(propagation = Propagation.NOT_SUPPORTED)
+    public void handleEntityDeletionEvent(DeleteEntityEvent<?> event) {
+        TenantId tenantId = event.getTenantId();
+        EntityId entityId = event.getEntityId();
+        EntityType entityType = entityId.getEntityType();
+        try {
+            log.trace("[{}][{}][{}] Handling entity deletion event", tenantId, entityType, entityId.getId());
+            if (!skippedEntities.contains(entityType)) {
+                cleanUpRelatedData(tenantId, entityId);
+            }
+            if (entityType == EntityType.USER) {
+                submitTask(HousekeeperTask.unassignAlarms((User) event.getEntity()));
+            }
+        } catch (Throwable e) {
+            log.error("[{}][{}][{}] Failed to handle entity deletion event", tenantId, entityType, entityId.getId(), e);
+        }
+    }
+
+    public void cleanUpRelatedData(TenantId tenantId, EntityId entityId) {
+        log.debug("[{}][{}][{}] Cleaning up related data", tenantId, entityId.getEntityType(), entityId.getId());
+        relationService.deleteEntityRelations(tenantId, entityId);
+        submitTask(HousekeeperTask.deleteAttributes(tenantId, entityId));
+        submitTask(HousekeeperTask.deleteTelemetry(tenantId, entityId));
+        submitTask(HousekeeperTask.deleteEvents(tenantId, entityId));
+        submitTask(HousekeeperTask.deleteAlarms(tenantId, entityId));
+    }
+
+    public void removeTenantEntities(TenantId tenantId, EntityType... entityTypes) {
+        for (EntityType entityType : entityTypes) {
+            submitTask(HousekeeperTask.deleteTenantEntities(tenantId, entityType));
+        }
+    }
+
+    private void submitTask(HousekeeperTask task) {
+        housekeeperClient.ifPresent(housekeeperClient -> {
+            housekeeperClient.submitTask(task);
+        });
+    }
+
+}
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/BaseSqlEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/BaseSqlEntity.java
index f74585ab5f..fd349828e2 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/BaseSqlEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/BaseSqlEntity.java
@@ -24,9 +24,9 @@ import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.UUIDBased;
 import org.thingsboard.server.dao.DaoUtil;
 
-import javax.persistence.Column;
-import javax.persistence.Id;
-import javax.persistence.MappedSuperclass;
+import jakarta.persistence.Column;
+import jakarta.persistence.Id;
+import jakarta.persistence.MappedSuperclass;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
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/AbstractAlarmCommentEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AbstractAlarmCommentEntity.java
index 290b1c20d8..50fe1f7636 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AbstractAlarmCommentEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AbstractAlarmCommentEntity.java
@@ -16,10 +16,11 @@
 package org.thingsboard.server.dao.model.sql;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import jakarta.persistence.Column;
+import jakarta.persistence.Convert;
+import jakarta.persistence.MappedSuperclass;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.hibernate.annotations.Type;
-import org.hibernate.annotations.TypeDef;
 import org.thingsboard.server.common.data.alarm.AlarmComment;
 import org.thingsboard.server.common.data.alarm.AlarmCommentType;
 import org.thingsboard.server.common.data.id.AlarmCommentId;
@@ -28,10 +29,8 @@ import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.dao.model.BaseEntity;
 import org.thingsboard.server.dao.model.BaseSqlEntity;
 import org.thingsboard.server.dao.model.ModelConstants;
-import org.thingsboard.server.dao.util.mapping.JsonStringType;
+import org.thingsboard.server.dao.util.mapping.JsonConverter;
 
-import javax.persistence.Column;
-import javax.persistence.MappedSuperclass;
 import java.util.UUID;
 
 import static org.thingsboard.server.dao.model.ModelConstants.ALARM_COMMENT_ALARM_ID;
@@ -40,7 +39,6 @@ import static org.thingsboard.server.dao.model.ModelConstants.ALARM_COMMENT_TYPE
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TypeDef(name = "json", typeClass = JsonStringType.class)
 @MappedSuperclass
 public abstract class AbstractAlarmCommentEntity<T extends AlarmComment> extends BaseSqlEntity<T> implements BaseEntity<T> {
 
@@ -53,7 +51,7 @@ public abstract class AbstractAlarmCommentEntity<T extends AlarmComment> extends
     @Column(name = ALARM_COMMENT_TYPE)
     private AlarmCommentType type;
 
-    @Type(type = "json")
+    @Convert(converter = JsonConverter.class)
     @Column(name = ALARM_COMMENT_COMMENT)
     private JsonNode comment;
 
@@ -84,6 +82,7 @@ public abstract class AbstractAlarmCommentEntity<T extends AlarmComment> extends
         this.type = alarmCommentEntity.getType();
         this.comment = alarmCommentEntity.getComment();
     }
+
     protected AlarmComment toAlarmComment() {
         AlarmComment alarmComment = new AlarmComment(new AlarmCommentId(id));
         alarmComment.setCreatedTime(createdTime);
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AbstractAlarmEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AbstractAlarmEntity.java
index f8cbedc8bd..9a3fde455f 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AbstractAlarmEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AbstractAlarmEntity.java
@@ -16,10 +16,13 @@
 package org.thingsboard.server.dao.model.sql;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import jakarta.persistence.Column;
+import jakarta.persistence.Convert;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.MappedSuperclass;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.hibernate.annotations.Type;
-import org.hibernate.annotations.TypeDef;
 import org.springframework.util.CollectionUtils;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.StringUtils;
@@ -33,12 +36,8 @@ import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.dao.model.BaseEntity;
 import org.thingsboard.server.dao.model.BaseSqlEntity;
 import org.thingsboard.server.dao.model.ModelConstants;
-import org.thingsboard.server.dao.util.mapping.JsonStringType;
+import org.thingsboard.server.dao.util.mapping.JsonConverter;
 
-import javax.persistence.Column;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.MappedSuperclass;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.UUID;
@@ -64,7 +63,6 @@ import static org.thingsboard.server.dao.model.ModelConstants.ALARM_TYPE_PROPERT
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TypeDef(name = "json", typeClass = JsonStringType.class)
 @MappedSuperclass
 public abstract class AbstractAlarmEntity<T extends Alarm> extends BaseSqlEntity<T> implements BaseEntity<T> {
 
@@ -87,7 +85,6 @@ public abstract class AbstractAlarmEntity<T extends Alarm> extends BaseSqlEntity
     @Column(name = ALARM_SEVERITY_PROPERTY)
     private AlarmSeverity severity;
 
-    @Type(type="pg-uuid")
     @Column(name = ALARM_ASSIGNEE_ID_PROPERTY)
     private UUID assigneeId;
 
@@ -112,7 +109,7 @@ public abstract class AbstractAlarmEntity<T extends Alarm> extends BaseSqlEntity
     @Column(name = ALARM_ASSIGN_TS_PROPERTY)
     private Long assignTs;
 
-    @Type(type = "json")
+    @Convert(converter = JsonConverter.class)
     @Column(name = ModelConstants.ALARM_DETAILS_PROPERTY)
     private JsonNode details;
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AbstractAssetEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AbstractAssetEntity.java
index 9be5930e99..4c488b3917 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AbstractAssetEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AbstractAssetEntity.java
@@ -16,10 +16,11 @@
 package org.thingsboard.server.dao.model.sql;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import jakarta.persistence.Column;
+import jakarta.persistence.Convert;
+import jakarta.persistence.MappedSuperclass;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.hibernate.annotations.Type;
-import org.hibernate.annotations.TypeDef;
 import org.thingsboard.server.common.data.asset.Asset;
 import org.thingsboard.server.common.data.id.AssetId;
 import org.thingsboard.server.common.data.id.AssetProfileId;
@@ -27,10 +28,8 @@ import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.dao.model.BaseSqlEntity;
 import org.thingsboard.server.dao.model.ModelConstants;
-import org.thingsboard.server.dao.util.mapping.JsonStringType;
+import org.thingsboard.server.dao.util.mapping.JsonConverter;
 
-import javax.persistence.Column;
-import javax.persistence.MappedSuperclass;
 import java.util.UUID;
 
 import static org.thingsboard.server.dao.model.ModelConstants.ASSET_CUSTOMER_ID_PROPERTY;
@@ -42,7 +41,6 @@ import static org.thingsboard.server.dao.model.ModelConstants.EXTERNAL_ID_PROPER
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TypeDef(name = "json", typeClass = JsonStringType.class)
 @MappedSuperclass
 public abstract class AbstractAssetEntity<T extends Asset> extends BaseSqlEntity<T> {
 
@@ -61,7 +59,7 @@ public abstract class AbstractAssetEntity<T extends Asset> extends BaseSqlEntity
     @Column(name = ASSET_LABEL_PROPERTY)
     private String label;
 
-    @Type(type = "json")
+    @Convert(converter = JsonConverter.class)
     @Column(name = ModelConstants.ASSET_ADDITIONAL_INFO_PROPERTY)
     private JsonNode additionalInfo;
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AbstractDeviceEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AbstractDeviceEntity.java
index 18694b9aac..1c0f47d062 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AbstractDeviceEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AbstractDeviceEntity.java
@@ -17,11 +17,13 @@ package org.thingsboard.server.dao.model.sql;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import jakarta.persistence.Column;
+import jakarta.persistence.Convert;
+import jakarta.persistence.MappedSuperclass;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.hibernate.annotations.Type;
-import org.hibernate.annotations.TypeDef;
-import org.hibernate.annotations.TypeDefs;
+import org.hibernate.annotations.JdbcType;
+import org.hibernate.dialect.PostgreSQLJsonPGObjectJsonbType;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.device.data.DeviceData;
@@ -32,19 +34,12 @@ import org.thingsboard.server.common.data.id.OtaPackageId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.dao.model.BaseSqlEntity;
 import org.thingsboard.server.dao.model.ModelConstants;
-import org.thingsboard.server.dao.util.mapping.JsonBinaryType;
-import org.thingsboard.server.dao.util.mapping.JsonStringType;
+import org.thingsboard.server.dao.util.mapping.JsonConverter;
 
-import javax.persistence.Column;
-import javax.persistence.MappedSuperclass;
 import java.util.UUID;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TypeDefs({
-        @TypeDef(name = "json", typeClass = JsonStringType.class),
-        @TypeDef(name = "jsonb", typeClass = JsonBinaryType.class)
-})
 @MappedSuperclass
 public abstract class AbstractDeviceEntity<T extends Device> extends BaseSqlEntity<T> {
 
@@ -63,7 +58,7 @@ public abstract class AbstractDeviceEntity<T extends Device> extends BaseSqlEnti
     @Column(name = ModelConstants.DEVICE_LABEL_PROPERTY)
     private String label;
 
-    @Type(type = "json")
+    @Convert(converter = JsonConverter.class)
     @Column(name = ModelConstants.DEVICE_ADDITIONAL_INFO_PROPERTY)
     private JsonNode additionalInfo;
 
@@ -76,7 +71,8 @@ public abstract class AbstractDeviceEntity<T extends Device> extends BaseSqlEnti
     @Column(name = ModelConstants.DEVICE_SOFTWARE_ID_PROPERTY, columnDefinition = "uuid")
     private UUID softwareId;
 
-    @Type(type = "jsonb")
+    @Convert(converter = JsonConverter.class)
+    @JdbcType(PostgreSQLJsonPGObjectJsonbType.class)
     @Column(name = ModelConstants.DEVICE_DEVICE_DATA_PROPERTY, columnDefinition = "jsonb")
     private JsonNode deviceData;
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AbstractEdgeEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AbstractEdgeEntity.java
index 3812c3edf6..19907c8182 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AbstractEdgeEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AbstractEdgeEntity.java
@@ -16,10 +16,11 @@
 package org.thingsboard.server.dao.model.sql;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import jakarta.persistence.Column;
+import jakarta.persistence.Convert;
+import jakarta.persistence.MappedSuperclass;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.hibernate.annotations.Type;
-import org.hibernate.annotations.TypeDef;
 import org.thingsboard.server.common.data.edge.Edge;
 import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.EdgeId;
@@ -27,10 +28,8 @@ import org.thingsboard.server.common.data.id.RuleChainId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.dao.model.BaseSqlEntity;
 import org.thingsboard.server.dao.model.ModelConstants;
-import org.thingsboard.server.dao.util.mapping.JsonStringType;
+import org.thingsboard.server.dao.util.mapping.JsonConverter;
 
-import javax.persistence.Column;
-import javax.persistence.MappedSuperclass;
 import java.util.UUID;
 
 import static org.thingsboard.server.dao.model.ModelConstants.EDGE_CUSTOMER_ID_PROPERTY;
@@ -44,7 +43,6 @@ import static org.thingsboard.server.dao.model.ModelConstants.EDGE_TYPE_PROPERTY
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TypeDef(name = "json", typeClass = JsonStringType.class)
 @MappedSuperclass
 public abstract class AbstractEdgeEntity<T extends Edge> extends BaseSqlEntity<T> {
 
@@ -72,7 +70,7 @@ public abstract class AbstractEdgeEntity<T extends Edge> extends BaseSqlEntity<T
     @Column(name = EDGE_SECRET_PROPERTY)
     private String secret;
 
-    @Type(type = "json")
+    @Convert(converter = JsonConverter.class)
     @Column(name = ModelConstants.EDGE_ADDITIONAL_INFO_PROPERTY)
     private JsonNode additionalInfo;
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AbstractEntityViewEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AbstractEntityViewEntity.java
index d77a336d9a..c094c65b56 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AbstractEntityViewEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AbstractEntityViewEntity.java
@@ -16,11 +16,14 @@
 package org.thingsboard.server.dao.model.sql;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import jakarta.persistence.Column;
+import jakarta.persistence.Convert;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.MappedSuperclass;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;
-import org.hibernate.annotations.Type;
-import org.hibernate.annotations.TypeDef;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.EntityView;
@@ -31,12 +34,8 @@ import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.objects.TelemetryEntityView;
 import org.thingsboard.server.dao.model.BaseSqlEntity;
 import org.thingsboard.server.dao.model.ModelConstants;
-import org.thingsboard.server.dao.util.mapping.JsonStringType;
+import org.thingsboard.server.dao.util.mapping.JsonConverter;
 
-import javax.persistence.Column;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.MappedSuperclass;
 import java.util.UUID;
 
 import static org.thingsboard.server.dao.model.ModelConstants.ENTITY_TYPE_PROPERTY;
@@ -47,7 +46,6 @@ import static org.thingsboard.server.dao.model.ModelConstants.ENTITY_TYPE_PROPER
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TypeDef(name = "json", typeClass = JsonStringType.class)
 @MappedSuperclass
 @Slf4j
 public abstract class AbstractEntityViewEntity<T extends EntityView> extends BaseSqlEntity<T> {
@@ -80,7 +78,7 @@ public abstract class AbstractEntityViewEntity<T extends EntityView> extends Bas
     @Column(name = ModelConstants.ENTITY_VIEW_END_TS_PROPERTY)
     private long endTs;
 
-    @Type(type = "json")
+    @Convert(converter = JsonConverter.class)
     @Column(name = ModelConstants.ENTITY_VIEW_ADDITIONAL_INFO_PROPERTY)
     private JsonNode additionalInfo;
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AbstractTenantEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AbstractTenantEntity.java
index ce2e86790f..845a196569 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AbstractTenantEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AbstractTenantEntity.java
@@ -16,24 +16,22 @@
 package org.thingsboard.server.dao.model.sql;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import jakarta.persistence.Column;
+import jakarta.persistence.Convert;
+import jakarta.persistence.MappedSuperclass;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.hibernate.annotations.Type;
-import org.hibernate.annotations.TypeDef;
 import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.TenantProfileId;
 import org.thingsboard.server.dao.model.BaseSqlEntity;
 import org.thingsboard.server.dao.model.ModelConstants;
-import org.thingsboard.server.dao.util.mapping.JsonStringType;
+import org.thingsboard.server.dao.util.mapping.JsonConverter;
 
-import javax.persistence.Column;
-import javax.persistence.MappedSuperclass;
 import java.util.UUID;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TypeDef(name = "json", typeClass = JsonStringType.class)
 @MappedSuperclass
 public abstract class AbstractTenantEntity<T extends Tenant> extends BaseSqlEntity<T> {
 
@@ -67,7 +65,7 @@ public abstract class AbstractTenantEntity<T extends Tenant> extends BaseSqlEnti
     @Column(name = ModelConstants.EMAIL_PROPERTY)
     private String email;
 
-    @Type(type = "json")
+    @Convert(converter = JsonConverter.class)
     @Column(name = ModelConstants.TENANT_ADDITIONAL_INFO_PROPERTY)
     private JsonNode additionalInfo;
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AbstractTsKvEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AbstractTsKvEntity.java
index 18655417ad..a0a4664829 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AbstractTsKvEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AbstractTsKvEntity.java
@@ -15,6 +15,10 @@
  */
 package org.thingsboard.server.dao.model.sql;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.Id;
+import jakarta.persistence.MappedSuperclass;
+import jakarta.persistence.Transient;
 import lombok.Data;
 import org.thingsboard.server.common.data.kv.AggTsKvEntry;
 import org.thingsboard.server.common.data.kv.BasicTsKvEntry;
@@ -27,10 +31,6 @@ import org.thingsboard.server.common.data.kv.StringDataEntry;
 import org.thingsboard.server.common.data.kv.TsKvEntry;
 import org.thingsboard.server.dao.model.ToData;
 
-import javax.persistence.Column;
-import javax.persistence.Id;
-import javax.persistence.MappedSuperclass;
-import javax.persistence.Transient;
 import java.util.UUID;
 
 import static org.thingsboard.server.dao.model.ModelConstants.BOOLEAN_VALUE_COLUMN;
@@ -59,7 +59,6 @@ public abstract class AbstractTsKvEntity implements ToData<TsKvEntry> {
     @Column(name = KEY_COLUMN)
     protected int key;
 
-    @Id
     @Column(name = TS_COLUMN)
     protected Long ts;
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AbstractWidgetTypeEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AbstractWidgetTypeEntity.java
index 6387d52011..ea26b60cab 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AbstractWidgetTypeEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AbstractWidgetTypeEntity.java
@@ -24,8 +24,8 @@ import org.thingsboard.server.dao.model.BaseEntity;
 import org.thingsboard.server.dao.model.BaseSqlEntity;
 import org.thingsboard.server.dao.model.ModelConstants;
 
-import javax.persistence.Column;
-import javax.persistence.MappedSuperclass;
+import jakarta.persistence.Column;
+import jakarta.persistence.MappedSuperclass;
 import java.util.UUID;
 
 @Data
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AdminSettingsEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AdminSettingsEntity.java
index 3cfa18f9c2..6a3db6b7a9 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AdminSettingsEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AdminSettingsEntity.java
@@ -16,31 +16,29 @@
 package org.thingsboard.server.dao.model.sql;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import jakarta.persistence.Column;
+import jakarta.persistence.Convert;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.hibernate.annotations.Type;
-import org.hibernate.annotations.TypeDef;
 import org.thingsboard.server.common.data.AdminSettings;
 import org.thingsboard.server.common.data.id.AdminSettingsId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.dao.model.BaseEntity;
 import org.thingsboard.server.dao.model.BaseSqlEntity;
 import org.thingsboard.server.dao.model.ModelConstants;
-import org.thingsboard.server.dao.util.mapping.JsonStringType;
+import org.thingsboard.server.dao.util.mapping.JsonConverter;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
 import java.util.UUID;
 
-import static org.thingsboard.server.dao.model.ModelConstants.ADMIN_SETTINGS_TABLE_NAME;
 import static org.thingsboard.server.dao.model.ModelConstants.ADMIN_SETTINGS_JSON_VALUE_PROPERTY;
 import static org.thingsboard.server.dao.model.ModelConstants.ADMIN_SETTINGS_KEY_PROPERTY;
+import static org.thingsboard.server.dao.model.ModelConstants.ADMIN_SETTINGS_TABLE_NAME;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Entity
-@TypeDef(name = "json", typeClass = JsonStringType.class)
 @Table(name = ADMIN_SETTINGS_TABLE_NAME)
 public final class AdminSettingsEntity extends BaseSqlEntity<AdminSettings> implements BaseEntity<AdminSettings> {
 
@@ -50,7 +48,7 @@ public final class AdminSettingsEntity extends BaseSqlEntity<AdminSettings> impl
     @Column(name = ADMIN_SETTINGS_KEY_PROPERTY)
     private String key;
 
-    @Type(type = "json")
+    @Convert(converter = JsonConverter.class)
     @Column(name = ADMIN_SETTINGS_JSON_VALUE_PROPERTY)
     private JsonNode jsonValue;
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AlarmCommentEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AlarmCommentEntity.java
index 1f0373d035..be95c15529 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AlarmCommentEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AlarmCommentEntity.java
@@ -15,25 +15,20 @@
  */
 package org.thingsboard.server.dao.model.sql;
 
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.hibernate.annotations.TypeDef;
 import org.thingsboard.server.common.data.alarm.AlarmComment;
 import org.thingsboard.server.common.data.alarm.AlarmCommentInfo;
-import org.thingsboard.server.dao.util.mapping.JsonStringType;
-
-import javax.persistence.Entity;
-import javax.persistence.Table;
 
 import static org.thingsboard.server.dao.model.ModelConstants.ALARM_COMMENT_TABLE_NAME;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Entity
-@TypeDef(name = "json", typeClass = JsonStringType.class)
 @Table(name = ALARM_COMMENT_TABLE_NAME)
-
-public class AlarmCommentEntity extends AbstractAlarmCommentEntity<AlarmComment>  {
+public class AlarmCommentEntity extends AbstractAlarmCommentEntity<AlarmComment> {
 
     public AlarmCommentEntity() {
         super();
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AlarmEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AlarmEntity.java
index f19901faeb..8f0f92652c 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AlarmEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AlarmEntity.java
@@ -15,22 +15,18 @@
  */
 package org.thingsboard.server.dao.model.sql;
 
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.hibernate.annotations.TypeDef;
 import org.thingsboard.server.common.data.alarm.Alarm;
 import org.thingsboard.server.common.data.alarm.AlarmInfo;
-import org.thingsboard.server.dao.util.mapping.JsonStringType;
-
-import javax.persistence.Entity;
-import javax.persistence.Table;
 
 import static org.thingsboard.server.dao.model.ModelConstants.ALARM_TABLE_NAME;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Entity
-@TypeDef(name = "json", typeClass = JsonStringType.class)
 @Table(name = ALARM_TABLE_NAME)
 public final class AlarmEntity extends AbstractAlarmEntity<Alarm> {
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AlarmInfoEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AlarmInfoEntity.java
index a8c1ba4603..942d9cbe75 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AlarmInfoEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AlarmInfoEntity.java
@@ -21,9 +21,9 @@ import org.thingsboard.server.common.data.alarm.AlarmAssignee;
 import org.thingsboard.server.common.data.alarm.AlarmInfo;
 import org.thingsboard.server.common.data.id.UserId;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import static org.thingsboard.server.dao.model.ModelConstants.ALARM_ASSIGNEE_EMAIL_PROPERTY;
 import static org.thingsboard.server.dao.model.ModelConstants.ALARM_ASSIGNEE_FIRST_NAME_PROPERTY;
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/ApiUsageStateEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/ApiUsageStateEntity.java
index cfa467eaaf..43b99dd7ac 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/ApiUsageStateEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/ApiUsageStateEntity.java
@@ -15,9 +15,13 @@
  */
 package org.thingsboard.server.dao.model.sql;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.Table;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.hibernate.annotations.TypeDef;
 import org.thingsboard.server.common.data.ApiUsageState;
 import org.thingsboard.server.common.data.ApiUsageStateValue;
 import org.thingsboard.server.common.data.id.ApiUsageStateId;
@@ -26,13 +30,7 @@ import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.dao.model.BaseEntity;
 import org.thingsboard.server.dao.model.BaseSqlEntity;
 import org.thingsboard.server.dao.model.ModelConstants;
-import org.thingsboard.server.dao.util.mapping.JsonStringType;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.Table;
 import java.util.UUID;
 
 /**
@@ -41,7 +39,6 @@ import java.util.UUID;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Entity
-@TypeDef(name = "json", typeClass = JsonStringType.class)
 @Table(name = ModelConstants.API_USAGE_STATE_TABLE_NAME)
 public class ApiUsageStateEntity extends BaseSqlEntity<ApiUsageState> implements BaseEntity<ApiUsageState> {
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AssetEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AssetEntity.java
index c221b07024..734ee2f656 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AssetEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AssetEntity.java
@@ -15,21 +15,17 @@
  */
 package org.thingsboard.server.dao.model.sql;
 
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.hibernate.annotations.TypeDef;
 import org.thingsboard.server.common.data.asset.Asset;
-import org.thingsboard.server.dao.util.mapping.JsonStringType;
-
-import javax.persistence.Entity;
-import javax.persistence.Table;
 
 import static org.thingsboard.server.dao.model.ModelConstants.ASSET_TABLE_NAME;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Entity
-@TypeDef(name = "json", typeClass = JsonStringType.class)
 @Table(name = ASSET_TABLE_NAME)
 public final class AssetEntity extends AbstractAssetEntity<Asset> {
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AssetProfileEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AssetProfileEntity.java
index bb6c7dfe04..d035db07a7 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AssetProfileEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AssetProfileEntity.java
@@ -25,9 +25,9 @@ import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.dao.model.BaseSqlEntity;
 import org.thingsboard.server.dao.model.ModelConstants;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import java.util.UUID;
 
 @Data
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AttributeKvCompositeKey.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AttributeKvCompositeKey.java
index 5a327db03b..e11574c4fa 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AttributeKvCompositeKey.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AttributeKvCompositeKey.java
@@ -15,35 +15,28 @@
  */
 package org.thingsboard.server.dao.model.sql;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.thingsboard.server.common.data.EntityType;
 
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
 import java.io.Serializable;
 import java.util.UUID;
 
 import static org.thingsboard.server.dao.model.ModelConstants.ATTRIBUTE_KEY_COLUMN;
 import static org.thingsboard.server.dao.model.ModelConstants.ATTRIBUTE_TYPE_COLUMN;
 import static org.thingsboard.server.dao.model.ModelConstants.ENTITY_ID_COLUMN;
-import static org.thingsboard.server.dao.model.ModelConstants.ENTITY_TYPE_COLUMN;
 
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 @Embeddable
 public class AttributeKvCompositeKey implements Serializable {
-    @Enumerated(EnumType.STRING)
-    @Column(name = ENTITY_TYPE_COLUMN)
-    private EntityType entityType;
     @Column(name = ENTITY_ID_COLUMN, columnDefinition = "uuid")
     private UUID entityId;
     @Column(name = ATTRIBUTE_TYPE_COLUMN)
-    private String attributeType;
+    private int attributeType;
     @Column(name = ATTRIBUTE_KEY_COLUMN)
-    private String attributeKey;
+    private int attributeKey;
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AttributeKvEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AttributeKvEntity.java
index e23fea2212..03aa0f98ad 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AttributeKvEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AttributeKvEntity.java
@@ -26,10 +26,11 @@ import org.thingsboard.server.common.data.kv.LongDataEntry;
 import org.thingsboard.server.common.data.kv.StringDataEntry;
 import org.thingsboard.server.dao.model.ToData;
 
-import javax.persistence.Column;
-import javax.persistence.EmbeddedId;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.EmbeddedId;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
+import jakarta.persistence.Transient;
 import java.io.Serializable;
 
 import static org.thingsboard.server.dao.model.ModelConstants.BOOLEAN_VALUE_COLUMN;
@@ -65,19 +66,22 @@ public class AttributeKvEntity implements ToData<AttributeKvEntry>, Serializable
     @Column(name = LAST_UPDATE_TS_COLUMN)
     private Long lastUpdateTs;
 
+    @Transient
+    protected String strKey;
+
     @Override
     public AttributeKvEntry toData() {
         KvEntry kvEntry = null;
         if (strValue != null) {
-            kvEntry = new StringDataEntry(id.getAttributeKey(), strValue);
+            kvEntry = new StringDataEntry(strKey, strValue);
         } else if (booleanValue != null) {
-            kvEntry = new BooleanDataEntry(id.getAttributeKey(), booleanValue);
+            kvEntry = new BooleanDataEntry(strKey, booleanValue);
         } else if (doubleValue != null) {
-            kvEntry = new DoubleDataEntry(id.getAttributeKey(), doubleValue);
+            kvEntry = new DoubleDataEntry(strKey, doubleValue);
         } else if (longValue != null) {
-            kvEntry = new LongDataEntry(id.getAttributeKey(), longValue);
+            kvEntry = new LongDataEntry(strKey, longValue);
         } else if (jsonValue != null) {
-            kvEntry = new JsonDataEntry(id.getAttributeKey(), jsonValue);
+            kvEntry = new JsonDataEntry(strKey, jsonValue);
         }
 
         return new BaseAttributeKvEntry(kvEntry, lastUpdateTs);
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AuditLogEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AuditLogEntity.java
index 383d5d266b..1e878e9dc5 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AuditLogEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AuditLogEntity.java
@@ -16,10 +16,14 @@
 package org.thingsboard.server.dao.model.sql;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import jakarta.persistence.Column;
+import jakarta.persistence.Convert;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.Table;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.hibernate.annotations.Type;
-import org.hibernate.annotations.TypeDef;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.audit.ActionStatus;
 import org.thingsboard.server.common.data.audit.ActionType;
@@ -32,13 +36,8 @@ import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.dao.model.BaseEntity;
 import org.thingsboard.server.dao.model.BaseSqlEntity;
 import org.thingsboard.server.dao.model.ModelConstants;
-import org.thingsboard.server.dao.util.mapping.JsonStringType;
+import org.thingsboard.server.dao.util.mapping.JsonConverter;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.Table;
 import java.util.UUID;
 
 import static org.thingsboard.server.dao.model.ModelConstants.AUDIT_LOG_ACTION_DATA_PROPERTY;
@@ -56,7 +55,6 @@ import static org.thingsboard.server.dao.model.ModelConstants.AUDIT_LOG_USER_NAM
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Entity
-@TypeDef(name = "json", typeClass = JsonStringType.class)
 @Table(name = ModelConstants.AUDIT_LOG_TABLE_NAME)
 public class AuditLogEntity extends BaseSqlEntity<AuditLog> implements BaseEntity<AuditLog> {
 
@@ -86,7 +84,7 @@ public class AuditLogEntity extends BaseSqlEntity<AuditLog> implements BaseEntit
     @Column(name = AUDIT_LOG_ACTION_TYPE_PROPERTY)
     private ActionType actionType;
 
-    @Type(type = "json")
+    @Convert(converter = JsonConverter.class)
     @Column(name = AUDIT_LOG_ACTION_DATA_PROPERTY)
     private JsonNode actionData;
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/ComponentDescriptorEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/ComponentDescriptorEntity.java
index 8938fc5ad4..597ac9e5cc 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/ComponentDescriptorEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/ComponentDescriptorEntity.java
@@ -16,10 +16,14 @@
 package org.thingsboard.server.dao.model.sql;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import jakarta.persistence.Column;
+import jakarta.persistence.Convert;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.Table;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.hibernate.annotations.Type;
-import org.hibernate.annotations.TypeDef;
 import org.thingsboard.server.common.data.id.ComponentDescriptorId;
 import org.thingsboard.server.common.data.plugin.ComponentClusteringMode;
 import org.thingsboard.server.common.data.plugin.ComponentDescriptor;
@@ -27,18 +31,11 @@ import org.thingsboard.server.common.data.plugin.ComponentScope;
 import org.thingsboard.server.common.data.plugin.ComponentType;
 import org.thingsboard.server.dao.model.BaseSqlEntity;
 import org.thingsboard.server.dao.model.ModelConstants;
-import org.thingsboard.server.dao.util.mapping.JsonStringType;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.Table;
+import org.thingsboard.server.dao.util.mapping.JsonConverter;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Entity
-@TypeDef(name = "json", typeClass = JsonStringType.class)
 @Table(name = ModelConstants.COMPONENT_DESCRIPTOR_TABLE_NAME)
 public class ComponentDescriptorEntity extends BaseSqlEntity<ComponentDescriptor> {
 
@@ -60,7 +57,7 @@ public class ComponentDescriptorEntity extends BaseSqlEntity<ComponentDescriptor
     @Column(name = ModelConstants.COMPONENT_DESCRIPTOR_CLASS_PROPERTY, unique = true)
     private String clazz;
 
-    @Type(type = "json")
+    @Convert(converter = JsonConverter.class)
     @Column(name = ModelConstants.COMPONENT_DESCRIPTOR_CONFIGURATION_DESCRIPTOR_PROPERTY)
     private JsonNode configurationDescriptor;
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/CustomerEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/CustomerEntity.java
index cb88943410..4c447b20d3 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/CustomerEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/CustomerEntity.java
@@ -16,38 +16,36 @@
 package org.thingsboard.server.dao.model.sql;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import jakarta.persistence.Column;
+import jakarta.persistence.Convert;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.hibernate.annotations.Type;
-import org.hibernate.annotations.TypeDef;
 import org.thingsboard.server.common.data.Customer;
 import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.dao.model.BaseSqlEntity;
 import org.thingsboard.server.dao.model.ModelConstants;
-import org.thingsboard.server.dao.util.mapping.JsonStringType;
+import org.thingsboard.server.dao.util.mapping.JsonConverter;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
 import java.util.UUID;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Entity
-@TypeDef(name = "json", typeClass = JsonStringType.class)
 @Table(name = ModelConstants.CUSTOMER_TABLE_NAME)
 public final class CustomerEntity extends BaseSqlEntity<Customer> {
 
     @Column(name = ModelConstants.CUSTOMER_TENANT_ID_PROPERTY)
     private UUID tenantId;
-    
+
     @Column(name = ModelConstants.CUSTOMER_TITLE_PROPERTY)
     private String title;
 
     @Column(name = ModelConstants.COUNTRY_PROPERTY)
     private String country;
-    
+
     @Column(name = ModelConstants.STATE_PROPERTY)
     private String state;
 
@@ -69,7 +67,7 @@ public final class CustomerEntity extends BaseSqlEntity<Customer> {
     @Column(name = ModelConstants.EMAIL_PROPERTY)
     private String email;
 
-    @Type(type = "json")
+    @Convert(converter = JsonConverter.class)
     @Column(name = ModelConstants.CUSTOMER_ADDITIONAL_INFO_PROPERTY)
     private JsonNode additionalInfo;
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardEntity.java
index fa2e60775c..e5f4723699 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardEntity.java
@@ -17,11 +17,13 @@ package org.thingsboard.server.dao.model.sql;
 
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.JsonNode;
+import jakarta.persistence.Column;
+import jakarta.persistence.Convert;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;
-import org.hibernate.annotations.Type;
-import org.hibernate.annotations.TypeDef;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.Dashboard;
 import org.thingsboard.server.common.data.ShortCustomerInfo;
@@ -30,11 +32,8 @@ import org.thingsboard.server.common.data.id.DashboardId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.dao.model.BaseSqlEntity;
 import org.thingsboard.server.dao.model.ModelConstants;
-import org.thingsboard.server.dao.util.mapping.JsonStringType;
+import org.thingsboard.server.dao.util.mapping.JsonConverter;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
 import java.util.HashSet;
 import java.util.UUID;
 
@@ -42,7 +41,6 @@ import java.util.UUID;
 @Slf4j
 @EqualsAndHashCode(callSuper = true)
 @Entity
-@TypeDef(name = "json", typeClass = JsonStringType.class)
 @Table(name = ModelConstants.DASHBOARD_TABLE_NAME)
 public final class DashboardEntity extends BaseSqlEntity<Dashboard> {
 
@@ -67,7 +65,7 @@ public final class DashboardEntity extends BaseSqlEntity<Dashboard> {
     @Column(name = ModelConstants.DASHBOARD_MOBILE_ORDER_PROPERTY)
     private Integer mobileOrder;
 
-    @Type(type = "json")
+    @Convert(converter = JsonConverter.class)
     @Column(name = ModelConstants.DASHBOARD_CONFIGURATION_PROPERTY)
     private JsonNode configuration;
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardInfoEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardInfoEntity.java
index f0487362bc..067ad635df 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardInfoEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardInfoEntity.java
@@ -16,6 +16,9 @@
 package org.thingsboard.server.dao.model.sql;
 
 import com.fasterxml.jackson.databind.JavaType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;
@@ -28,9 +31,6 @@ import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.dao.model.BaseSqlEntity;
 import org.thingsboard.server.dao.model.ModelConstants;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
 import java.util.HashSet;
 import java.util.UUID;
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceCredentialsEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceCredentialsEntity.java
index 16f0b08397..34a98f1c28 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceCredentialsEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceCredentialsEntity.java
@@ -25,11 +25,11 @@ import org.thingsboard.server.dao.model.BaseEntity;
 import org.thingsboard.server.dao.model.BaseSqlEntity;
 import org.thingsboard.server.dao.model.ModelConstants;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.Table;
 import java.util.UUID;
 
 @Data
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceEntity.java
index 446d14af82..ad1a5a6bb9 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceEntity.java
@@ -15,25 +15,16 @@
  */
 package org.thingsboard.server.dao.model.sql;
 
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.hibernate.annotations.TypeDef;
-import org.hibernate.annotations.TypeDefs;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.dao.model.ModelConstants;
-import org.thingsboard.server.dao.util.mapping.JsonBinaryType;
-import org.thingsboard.server.dao.util.mapping.JsonStringType;
-
-import javax.persistence.Entity;
-import javax.persistence.Table;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Entity
-@TypeDefs({
-        @TypeDef(name = "json", typeClass = JsonStringType.class),
-        @TypeDef(name = "jsonb", typeClass = JsonBinaryType.class)
-})
 @Table(name = ModelConstants.DEVICE_TABLE_NAME)
 public final class DeviceEntity extends AbstractDeviceEntity<Device> {
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceInfoEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceInfoEntity.java
index eba64598bb..d4bb8709cf 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceInfoEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceInfoEntity.java
@@ -21,9 +21,9 @@ import org.hibernate.annotations.Immutable;
 import org.thingsboard.server.common.data.DeviceInfo;
 import org.thingsboard.server.dao.model.ModelConstants;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceProfileEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceProfileEntity.java
index 35998ce435..09f0b181c2 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceProfileEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceProfileEntity.java
@@ -17,10 +17,16 @@ package org.thingsboard.server.dao.model.sql;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import jakarta.persistence.Column;
+import jakarta.persistence.Convert;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.Table;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.hibernate.annotations.Type;
-import org.hibernate.annotations.TypeDef;
+import org.hibernate.annotations.JdbcType;
+import org.hibernate.dialect.PostgreSQLJsonPGObjectJsonbType;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.DeviceProfileProvisionType;
@@ -34,19 +40,13 @@ import org.thingsboard.server.common.data.id.RuleChainId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.dao.model.BaseSqlEntity;
 import org.thingsboard.server.dao.model.ModelConstants;
-import org.thingsboard.server.dao.util.mapping.JsonBinaryType;
+import org.thingsboard.server.dao.util.mapping.JsonConverter;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.Table;
 import java.util.UUID;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Entity
-@TypeDef(name = "jsonb", typeClass = JsonBinaryType.class)
 @Table(name = ModelConstants.DEVICE_PROFILE_TABLE_NAME)
 public final class DeviceProfileEntity extends BaseSqlEntity<DeviceProfile> {
 
@@ -86,7 +86,8 @@ public final class DeviceProfileEntity extends BaseSqlEntity<DeviceProfile> {
     @Column(name = ModelConstants.DEVICE_PROFILE_DEFAULT_QUEUE_NAME_PROPERTY)
     private String defaultQueueName;
 
-    @Type(type = "jsonb")
+    @Convert(converter = JsonConverter.class)
+    @JdbcType(PostgreSQLJsonPGObjectJsonbType.class)
     @Column(name = ModelConstants.DEVICE_PROFILE_PROFILE_DATA_PROPERTY, columnDefinition = "jsonb")
     private JsonNode profileData;
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/EdgeEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/EdgeEntity.java
index 35640c721f..40d830eb2c 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/EdgeEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/EdgeEntity.java
@@ -15,21 +15,17 @@
  */
 package org.thingsboard.server.dao.model.sql;
 
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.hibernate.annotations.TypeDef;
 import org.thingsboard.server.common.data.edge.Edge;
-import org.thingsboard.server.dao.util.mapping.JsonStringType;
-
-import javax.persistence.Entity;
-import javax.persistence.Table;
 
 import static org.thingsboard.server.dao.model.ModelConstants.EDGE_TABLE_NAME;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Entity
-@TypeDef(name = "json", typeClass = JsonStringType.class)
 @Table(name = EDGE_TABLE_NAME)
 public class EdgeEntity extends AbstractEdgeEntity<Edge> {
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/EdgeEventEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/EdgeEventEntity.java
index cbac5c526d..1489a40a27 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/EdgeEventEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/EdgeEventEntity.java
@@ -16,11 +16,15 @@
 package org.thingsboard.server.dao.model.sql;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import jakarta.persistence.Column;
+import jakarta.persistence.Convert;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.Table;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
-import org.hibernate.annotations.Type;
-import org.hibernate.annotations.TypeDef;
 import org.thingsboard.server.common.data.edge.EdgeEvent;
 import org.thingsboard.server.common.data.edge.EdgeEventActionType;
 import org.thingsboard.server.common.data.edge.EdgeEventType;
@@ -29,21 +33,16 @@ import org.thingsboard.server.common.data.id.EdgeId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.dao.model.BaseEntity;
 import org.thingsboard.server.dao.model.BaseSqlEntity;
-import org.thingsboard.server.dao.util.mapping.JsonStringType;
+import org.thingsboard.server.dao.util.mapping.JsonConverter;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.Table;
 import java.util.UUID;
 
 import static org.thingsboard.server.dao.model.ModelConstants.EDGE_EVENT_ACTION_PROPERTY;
 import static org.thingsboard.server.dao.model.ModelConstants.EDGE_EVENT_BODY_PROPERTY;
-import static org.thingsboard.server.dao.model.ModelConstants.EDGE_EVENT_TABLE_NAME;
 import static org.thingsboard.server.dao.model.ModelConstants.EDGE_EVENT_EDGE_ID_PROPERTY;
 import static org.thingsboard.server.dao.model.ModelConstants.EDGE_EVENT_ENTITY_ID_PROPERTY;
 import static org.thingsboard.server.dao.model.ModelConstants.EDGE_EVENT_SEQUENTIAL_ID_PROPERTY;
+import static org.thingsboard.server.dao.model.ModelConstants.EDGE_EVENT_TABLE_NAME;
 import static org.thingsboard.server.dao.model.ModelConstants.EDGE_EVENT_TENANT_ID_PROPERTY;
 import static org.thingsboard.server.dao.model.ModelConstants.EDGE_EVENT_TYPE_PROPERTY;
 import static org.thingsboard.server.dao.model.ModelConstants.EDGE_EVENT_UID_PROPERTY;
@@ -53,7 +52,6 @@ import static org.thingsboard.server.dao.model.ModelConstants.TS_COLUMN;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Entity
-@TypeDef(name = "json", typeClass = JsonStringType.class)
 @Table(name = EDGE_EVENT_TABLE_NAME)
 @NoArgsConstructor
 public class EdgeEventEntity extends BaseSqlEntity<EdgeEvent> implements BaseEntity<EdgeEvent> {
@@ -78,7 +76,7 @@ public class EdgeEventEntity extends BaseSqlEntity<EdgeEvent> implements BaseEnt
     @Column(name = EDGE_EVENT_ACTION_PROPERTY)
     private EdgeEventActionType edgeEventAction;
 
-    @Type(type = "json")
+    @Convert(converter = JsonConverter.class)
     @Column(name = EDGE_EVENT_BODY_PROPERTY)
     private JsonNode entityBody;
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/EntityAlarmCompositeKey.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/EntityAlarmCompositeKey.java
index 916ca9c33f..e35655917c 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/EntityAlarmCompositeKey.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/EntityAlarmCompositeKey.java
@@ -20,7 +20,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.thingsboard.server.common.data.alarm.EntityAlarm;
 
-import javax.persistence.Transient;
+import jakarta.persistence.Transient;
 import java.io.Serializable;
 import java.util.UUID;
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/EntityAlarmEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/EntityAlarmEntity.java
index 979fb3e252..c3b8ccbfe2 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/EntityAlarmEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/EntityAlarmEntity.java
@@ -23,11 +23,11 @@ import org.thingsboard.server.common.data.id.EntityIdFactory;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.dao.model.ToData;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.IdClass;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.IdClass;
+import jakarta.persistence.Table;
 import java.util.UUID;
 
 import static org.thingsboard.server.dao.model.ModelConstants.CREATED_TIME_PROPERTY;
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/EntityViewEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/EntityViewEntity.java
index 0b50bf371f..19b89330e8 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/EntityViewEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/EntityViewEntity.java
@@ -15,20 +15,16 @@
  */
 package org.thingsboard.server.dao.model.sql;
 
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.hibernate.annotations.TypeDef;
 import org.thingsboard.server.common.data.EntityView;
 import org.thingsboard.server.dao.model.ModelConstants;
-import org.thingsboard.server.dao.util.mapping.JsonStringType;
-
-import javax.persistence.Entity;
-import javax.persistence.Table;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Entity
-@TypeDef(name = "json", typeClass = JsonStringType.class)
 @Table(name = ModelConstants.ENTITY_VIEW_TABLE_NAME)
 public class EntityViewEntity extends AbstractEntityViewEntity<EntityView> {
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/ErrorEventEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/ErrorEventEntity.java
index c05e1faf96..ee63728be0 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/ErrorEventEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/ErrorEventEntity.java
@@ -22,9 +22,9 @@ import org.thingsboard.server.common.data.event.ErrorEvent;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.dao.model.BaseEntity;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import static org.thingsboard.server.dao.model.ModelConstants.ERROR_EVENT_TABLE_NAME;
 import static org.thingsboard.server.dao.model.ModelConstants.EVENT_ERROR_COLUMN_NAME;
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/EventEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/EventEntity.java
index 44566ab2b3..5cd5f59eb2 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/EventEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/EventEntity.java
@@ -21,9 +21,9 @@ import org.thingsboard.server.common.data.event.Event;
 import org.thingsboard.server.dao.model.BaseEntity;
 import org.thingsboard.server.dao.model.ModelConstants;
 
-import javax.persistence.Column;
-import javax.persistence.Id;
-import javax.persistence.MappedSuperclass;
+import jakarta.persistence.Column;
+import jakarta.persistence.Id;
+import jakarta.persistence.MappedSuperclass;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/LifecycleEventEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/LifecycleEventEntity.java
index dbeb519175..ef7c6a5d1a 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/LifecycleEventEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/LifecycleEventEntity.java
@@ -22,9 +22,9 @@ import org.thingsboard.server.common.data.event.LifecycleEvent;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.dao.model.BaseEntity;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import static org.thingsboard.server.dao.model.ModelConstants.EVENT_ERROR_COLUMN_NAME;
 import static org.thingsboard.server.dao.model.ModelConstants.EVENT_SUCCESS_COLUMN_NAME;
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 82c0ee0ab9..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
@@ -16,33 +16,32 @@
 package org.thingsboard.server.dao.model.sql;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import jakarta.persistence.Column;
+import jakarta.persistence.Convert;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.Table;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.Formula;
-import org.hibernate.annotations.Type;
-import org.hibernate.annotations.TypeDef;
 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;
 import org.thingsboard.server.dao.model.BaseSqlEntity;
 import org.thingsboard.server.dao.model.ModelConstants;
-import org.thingsboard.server.dao.util.mapping.JsonStringType;
+import org.thingsboard.server.dao.util.mapping.JsonConverter;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.Table;
 import java.util.UUID;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Entity
-@TypeDef(name = "json", typeClass = JsonStringType.class)
 @Table(name = ModelConstants.NOTIFICATION_TABLE_NAME)
 public class NotificationEntity extends BaseSqlEntity<Notification> {
 
@@ -56,17 +55,21 @@ 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;
 
     @Column(name = ModelConstants.NOTIFICATION_TEXT_PROPERTY, nullable = false)
     private String text;
 
-    @Type(type = "json")
+    @Convert(converter = JsonConverter.class)
     @Column(name = ModelConstants.NOTIFICATION_ADDITIONAL_CONFIG_PROPERTY)
     private JsonNode additionalConfig;
 
-    @Type(type = "json")
+    @Convert(converter = JsonConverter.class)
     @Formula("(SELECT r.info FROM notification_request r WHERE r.id = request_id)")
     private JsonNode info;
 
@@ -82,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());
@@ -97,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/NotificationRequestEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/NotificationRequestEntity.java
index a35dd3509a..5476c629d2 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/NotificationRequestEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/NotificationRequestEntity.java
@@ -16,10 +16,14 @@
 package org.thingsboard.server.dao.model.sql;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import jakarta.persistence.Column;
+import jakarta.persistence.Convert;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.Table;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.hibernate.annotations.Type;
-import org.hibernate.annotations.TypeDef;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.id.EntityIdFactory;
 import org.thingsboard.server.common.data.id.NotificationRequestId;
@@ -33,19 +37,13 @@ import org.thingsboard.server.common.data.notification.info.NotificationInfo;
 import org.thingsboard.server.common.data.notification.template.NotificationTemplate;
 import org.thingsboard.server.dao.model.BaseSqlEntity;
 import org.thingsboard.server.dao.model.ModelConstants;
-import org.thingsboard.server.dao.util.mapping.JsonStringType;
+import org.thingsboard.server.dao.util.mapping.JsonConverter;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.Table;
 import java.util.UUID;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Entity
-@TypeDef(name = "json", typeClass = JsonStringType.class)
 @Table(name = ModelConstants.NOTIFICATION_REQUEST_TABLE_NAME)
 public class NotificationRequestEntity extends BaseSqlEntity<NotificationRequest> {
 
@@ -58,15 +56,15 @@ public class NotificationRequestEntity extends BaseSqlEntity<NotificationRequest
     @Column(name = ModelConstants.NOTIFICATION_REQUEST_TEMPLATE_ID_PROPERTY)
     private UUID templateId;
 
-    @Type(type = "json")
+    @Convert(converter = JsonConverter.class)
     @Column(name = ModelConstants.NOTIFICATION_REQUEST_TEMPLATE_PROPERTY)
     private JsonNode template;
 
-    @Type(type = "json")
+    @Convert(converter = JsonConverter.class)
     @Column(name = ModelConstants.NOTIFICATION_REQUEST_INFO_PROPERTY)
     private JsonNode info;
 
-    @Type(type = "json")
+    @Convert(converter = JsonConverter.class)
     @Column(name = ModelConstants.NOTIFICATION_REQUEST_ADDITIONAL_CONFIG_PROPERTY)
     private JsonNode additionalConfig;
 
@@ -84,7 +82,7 @@ public class NotificationRequestEntity extends BaseSqlEntity<NotificationRequest
     @Column(name = ModelConstants.NOTIFICATION_REQUEST_STATUS_PROPERTY)
     private NotificationRequestStatus status;
 
-    @Type(type = "json")
+    @Convert(converter = JsonConverter.class)
     @Column(name = ModelConstants.NOTIFICATION_REQUEST_STATS_PROPERTY)
     private JsonNode stats;
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/NotificationRuleEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/NotificationRuleEntity.java
index 72a6d8ce60..7e949b8a66 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/NotificationRuleEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/NotificationRuleEntity.java
@@ -16,10 +16,14 @@
 package org.thingsboard.server.dao.model.sql;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import jakarta.persistence.Column;
+import jakarta.persistence.Convert;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.Table;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.hibernate.annotations.Type;
-import org.hibernate.annotations.TypeDef;
 import org.thingsboard.server.common.data.id.NotificationRuleId;
 import org.thingsboard.server.common.data.id.NotificationTemplateId;
 import org.thingsboard.server.common.data.notification.rule.NotificationRule;
@@ -29,18 +33,13 @@ import org.thingsboard.server.common.data.notification.rule.trigger.config.Notif
 import org.thingsboard.server.common.data.notification.rule.trigger.config.NotificationRuleTriggerType;
 import org.thingsboard.server.dao.model.BaseSqlEntity;
 import org.thingsboard.server.dao.model.ModelConstants;
-import org.thingsboard.server.dao.util.mapping.JsonStringType;
+import org.thingsboard.server.dao.util.mapping.JsonConverter;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.Table;
 import java.util.UUID;
 
-@Data @EqualsAndHashCode(callSuper = true)
+@Data
+@EqualsAndHashCode(callSuper = true)
 @Entity
-@TypeDef(name = "json", typeClass = JsonStringType.class)
 @Table(name = ModelConstants.NOTIFICATION_RULE_TABLE_NAME)
 public class NotificationRuleEntity extends BaseSqlEntity<NotificationRule> {
 
@@ -60,15 +59,15 @@ public class NotificationRuleEntity extends BaseSqlEntity<NotificationRule> {
     @Column(name = ModelConstants.NOTIFICATION_RULE_TRIGGER_TYPE_PROPERTY, nullable = false)
     private NotificationRuleTriggerType triggerType;
 
-    @Type(type = "json")
+    @Convert(converter = JsonConverter.class)
     @Column(name = ModelConstants.NOTIFICATION_RULE_TRIGGER_CONFIG_PROPERTY, nullable = false)
     private JsonNode triggerConfig;
 
-    @Type(type = "json")
+    @Convert(converter = JsonConverter.class)
     @Column(name = ModelConstants.NOTIFICATION_RULE_RECIPIENTS_CONFIG_PROPERTY, nullable = false)
     private JsonNode recipientsConfig;
 
-    @Type(type = "json")
+    @Convert(converter = JsonConverter.class)
     @Column(name = ModelConstants.NOTIFICATION_RULE_ADDITIONAL_CONFIG_PROPERTY)
     private JsonNode additionalConfig;
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/NotificationTargetEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/NotificationTargetEntity.java
index 21b117e503..a189f2bd54 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/NotificationTargetEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/NotificationTargetEntity.java
@@ -16,26 +16,24 @@
 package org.thingsboard.server.dao.model.sql;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import jakarta.persistence.Column;
+import jakarta.persistence.Convert;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.hibernate.annotations.Type;
-import org.hibernate.annotations.TypeDef;
 import org.thingsboard.server.common.data.id.NotificationTargetId;
 import org.thingsboard.server.common.data.notification.targets.NotificationTarget;
 import org.thingsboard.server.common.data.notification.targets.NotificationTargetConfig;
 import org.thingsboard.server.dao.model.BaseSqlEntity;
 import org.thingsboard.server.dao.model.ModelConstants;
-import org.thingsboard.server.dao.util.mapping.JsonStringType;
+import org.thingsboard.server.dao.util.mapping.JsonConverter;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
 import java.util.UUID;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Entity
-@TypeDef(name = "json", typeClass = JsonStringType.class)
 @Table(name = ModelConstants.NOTIFICATION_TARGET_TABLE_NAME)
 public class NotificationTargetEntity extends BaseSqlEntity<NotificationTarget> {
 
@@ -45,7 +43,7 @@ public class NotificationTargetEntity extends BaseSqlEntity<NotificationTarget>
     @Column(name = ModelConstants.NAME_PROPERTY, nullable = false)
     private String name;
 
-    @Type(type = "json")
+    @Convert(converter = JsonConverter.class)
     @Column(name = ModelConstants.NOTIFICATION_TARGET_CONFIGURATION_PROPERTY, nullable = false)
     private JsonNode configuration;
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/NotificationTemplateEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/NotificationTemplateEntity.java
index a83b5ea0a6..c52ff8b913 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/NotificationTemplateEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/NotificationTemplateEntity.java
@@ -16,29 +16,27 @@
 package org.thingsboard.server.dao.model.sql;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import jakarta.persistence.Column;
+import jakarta.persistence.Convert;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.Table;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.hibernate.annotations.Type;
-import org.hibernate.annotations.TypeDef;
 import org.thingsboard.server.common.data.id.NotificationTemplateId;
 import org.thingsboard.server.common.data.notification.NotificationType;
 import org.thingsboard.server.common.data.notification.template.NotificationTemplate;
 import org.thingsboard.server.common.data.notification.template.NotificationTemplateConfig;
 import org.thingsboard.server.dao.model.BaseSqlEntity;
 import org.thingsboard.server.dao.model.ModelConstants;
-import org.thingsboard.server.dao.util.mapping.JsonStringType;
+import org.thingsboard.server.dao.util.mapping.JsonConverter;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.Table;
 import java.util.UUID;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Entity
-@TypeDef(name = "json", typeClass = JsonStringType.class)
 @Table(name = ModelConstants.NOTIFICATION_TEMPLATE_TABLE_NAME)
 public class NotificationTemplateEntity extends BaseSqlEntity<NotificationTemplate> {
 
@@ -52,7 +50,7 @@ public class NotificationTemplateEntity extends BaseSqlEntity<NotificationTempla
     @Column(name = ModelConstants.NOTIFICATION_TEMPLATE_NOTIFICATION_TYPE_PROPERTY, nullable = false)
     private NotificationType notificationType;
 
-    @Type(type = "json")
+    @Convert(converter = JsonConverter.class)
     @Column(name = ModelConstants.NOTIFICATION_TEMPLATE_CONFIGURATION_PROPERTY, nullable = false)
     private JsonNode configuration;
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/OAuth2ClientRegistrationTemplateEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/OAuth2ClientRegistrationTemplateEntity.java
index 08382f0345..5fe16c7287 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/OAuth2ClientRegistrationTemplateEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/OAuth2ClientRegistrationTemplateEntity.java
@@ -16,10 +16,14 @@
 package org.thingsboard.server.dao.model.sql;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import jakarta.persistence.Column;
+import jakarta.persistence.Convert;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.Table;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.hibernate.annotations.Type;
-import org.hibernate.annotations.TypeDef;
 import org.thingsboard.server.common.data.id.OAuth2ClientRegistrationTemplateId;
 import org.thingsboard.server.common.data.oauth2.MapperType;
 import org.thingsboard.server.common.data.oauth2.OAuth2BasicMapperConfig;
@@ -28,19 +32,13 @@ import org.thingsboard.server.common.data.oauth2.OAuth2MapperConfig;
 import org.thingsboard.server.common.data.oauth2.TenantNameStrategyType;
 import org.thingsboard.server.dao.model.BaseSqlEntity;
 import org.thingsboard.server.dao.model.ModelConstants;
-import org.thingsboard.server.dao.util.mapping.JsonStringType;
+import org.thingsboard.server.dao.util.mapping.JsonConverter;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.Table;
 import java.util.Arrays;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Entity
-@TypeDef(name = "json", typeClass = JsonStringType.class)
 @Table(name = ModelConstants.OAUTH2_CLIENT_REGISTRATION_TEMPLATE_TABLE_NAME)
 public class OAuth2ClientRegistrationTemplateEntity extends BaseSqlEntity<OAuth2ClientRegistrationTemplate> {
 
@@ -89,7 +87,7 @@ public class OAuth2ClientRegistrationTemplateEntity extends BaseSqlEntity<OAuth2
     @Column(name = ModelConstants.OAUTH2_TEMPLATE_HELP_LINK_PROPERTY)
     private String helpLink;
 
-    @Type(type = "json")
+    @Convert(converter = JsonConverter.class)
     @Column(name = ModelConstants.OAUTH2_TEMPLATE_ADDITIONAL_INFO_PROPERTY)
     private JsonNode additionalInfo;
 
@@ -115,7 +113,7 @@ public class OAuth2ClientRegistrationTemplateEntity extends BaseSqlEntity<OAuth2
         this.helpLink = clientRegistrationTemplate.getHelpLink();
         this.additionalInfo = clientRegistrationTemplate.getAdditionalInfo();
         OAuth2MapperConfig mapperConfig = clientRegistrationTemplate.getMapperConfig();
-        if (mapperConfig != null){
+        if (mapperConfig != null) {
             this.type = mapperConfig.getType();
             OAuth2BasicMapperConfig basicConfig = mapperConfig.getBasic();
             if (basicConfig != null) {
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/OAuth2DomainEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/OAuth2DomainEntity.java
index 740a9b945b..7841a11378 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/OAuth2DomainEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/OAuth2DomainEntity.java
@@ -24,11 +24,11 @@ import org.thingsboard.server.common.data.oauth2.SchemeType;
 import org.thingsboard.server.dao.model.BaseSqlEntity;
 import org.thingsboard.server.dao.model.ModelConstants;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.Table;
 import java.util.UUID;
 
 @Data
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/OAuth2MobileEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/OAuth2MobileEntity.java
index 6d84435106..78ec508ad0 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/OAuth2MobileEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/OAuth2MobileEntity.java
@@ -23,9 +23,9 @@ import org.thingsboard.server.common.data.oauth2.OAuth2Mobile;
 import org.thingsboard.server.dao.model.BaseSqlEntity;
 import org.thingsboard.server.dao.model.ModelConstants;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import java.util.UUID;
 
 @Data
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 142e7c3828..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
@@ -24,9 +24,9 @@ import org.thingsboard.server.common.data.oauth2.OAuth2Params;
 import org.thingsboard.server.dao.model.BaseSqlEntity;
 import org.thingsboard.server.dao.model.ModelConstants;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import java.util.UUID;
 
 @Data
@@ -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/OAuth2RegistrationEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/OAuth2RegistrationEntity.java
index ab77e42594..45ef7466f9 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/OAuth2RegistrationEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/OAuth2RegistrationEntity.java
@@ -16,10 +16,14 @@
 package org.thingsboard.server.dao.model.sql;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import jakarta.persistence.Column;
+import jakarta.persistence.Convert;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.Table;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.hibernate.annotations.Type;
-import org.hibernate.annotations.TypeDef;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.id.OAuth2ParamsId;
 import org.thingsboard.server.common.data.id.OAuth2RegistrationId;
@@ -32,13 +36,8 @@ import org.thingsboard.server.common.data.oauth2.PlatformType;
 import org.thingsboard.server.common.data.oauth2.TenantNameStrategyType;
 import org.thingsboard.server.dao.model.BaseSqlEntity;
 import org.thingsboard.server.dao.model.ModelConstants;
-import org.thingsboard.server.dao.util.mapping.JsonStringType;
+import org.thingsboard.server.dao.util.mapping.JsonConverter;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.Table;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.UUID;
@@ -47,7 +46,6 @@ import java.util.stream.Collectors;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Entity
-@TypeDef(name = "json", typeClass = JsonStringType.class)
 @Table(name = ModelConstants.OAUTH2_REGISTRATION_TABLE_NAME)
 public class OAuth2RegistrationEntity extends BaseSqlEntity<OAuth2Registration> {
 
@@ -110,7 +108,7 @@ public class OAuth2RegistrationEntity extends BaseSqlEntity<OAuth2Registration>
     @Column(name = ModelConstants.OAUTH2_MAPPER_SEND_TOKEN_PROPERTY)
     private Boolean sendToken;
 
-    @Type(type = "json")
+    @Convert(converter = JsonConverter.class)
     @Column(name = ModelConstants.OAUTH2_ADDITIONAL_INFO_PROPERTY)
     private JsonNode additionalInfo;
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/OtaPackageEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/OtaPackageEntity.java
index 6df3e6b589..0ba7c703a6 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/OtaPackageEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/OtaPackageEntity.java
@@ -16,10 +16,15 @@
 package org.thingsboard.server.dao.model.sql;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import jakarta.persistence.Column;
+import jakarta.persistence.Convert;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.Lob;
+import jakarta.persistence.Table;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.hibernate.annotations.Type;
-import org.hibernate.annotations.TypeDef;
 import org.thingsboard.server.common.data.OtaPackage;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
 import org.thingsboard.server.common.data.id.OtaPackageId;
@@ -28,14 +33,8 @@ import org.thingsboard.server.common.data.ota.ChecksumAlgorithm;
 import org.thingsboard.server.common.data.ota.OtaPackageType;
 import org.thingsboard.server.dao.model.BaseSqlEntity;
 import org.thingsboard.server.dao.model.ModelConstants;
-import org.thingsboard.server.dao.util.mapping.JsonStringType;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.Lob;
-import javax.persistence.Table;
+import org.thingsboard.server.dao.util.mapping.JsonConverter;
+
 import java.nio.ByteBuffer;
 import java.util.UUID;
 
@@ -53,12 +52,10 @@ import static org.thingsboard.server.dao.model.ModelConstants.OTA_PACKAGE_TILE_C
 import static org.thingsboard.server.dao.model.ModelConstants.OTA_PACKAGE_TYPE_COLUMN;
 import static org.thingsboard.server.dao.model.ModelConstants.OTA_PACKAGE_URL_COLUMN;
 import static org.thingsboard.server.dao.model.ModelConstants.OTA_PACKAGE_VERSION_COLUMN;
-import static org.thingsboard.server.dao.model.ModelConstants.SEARCH_TEXT_PROPERTY;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Entity
-@TypeDef(name = "json", typeClass = JsonStringType.class)
 @Table(name = OTA_PACKAGE_TABLE_NAME)
 public class OtaPackageEntity extends BaseSqlEntity<OtaPackage> {
 
@@ -104,7 +101,7 @@ public class OtaPackageEntity extends BaseSqlEntity<OtaPackage> {
     @Column(name = OTA_PACKAGE_DATA_SIZE_COLUMN)
     private Long dataSize;
 
-    @Type(type = "json")
+    @Convert(converter = JsonConverter.class)
     @Column(name = ModelConstants.OTA_PACKAGE_ADDITIONAL_INFO_COLUMN)
     private JsonNode additionalInfo;
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/OtaPackageInfoEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/OtaPackageInfoEntity.java
index 864d8490d8..6e358e5b5a 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/OtaPackageInfoEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/OtaPackageInfoEntity.java
@@ -16,10 +16,15 @@
 package org.thingsboard.server.dao.model.sql;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import jakarta.persistence.Column;
+import jakarta.persistence.Convert;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.Table;
+import jakarta.persistence.Transient;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.hibernate.annotations.Type;
-import org.hibernate.annotations.TypeDef;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.OtaPackageInfo;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
@@ -29,14 +34,8 @@ import org.thingsboard.server.common.data.ota.ChecksumAlgorithm;
 import org.thingsboard.server.common.data.ota.OtaPackageType;
 import org.thingsboard.server.dao.model.BaseSqlEntity;
 import org.thingsboard.server.dao.model.ModelConstants;
-import org.thingsboard.server.dao.util.mapping.JsonStringType;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import org.thingsboard.server.dao.util.mapping.JsonConverter;
+
 import java.util.UUID;
 
 import static org.thingsboard.server.dao.model.ModelConstants.OTA_PACKAGE_CHECKSUM_ALGORITHM_COLUMN;
@@ -52,12 +51,10 @@ import static org.thingsboard.server.dao.model.ModelConstants.OTA_PACKAGE_TILE_C
 import static org.thingsboard.server.dao.model.ModelConstants.OTA_PACKAGE_TYPE_COLUMN;
 import static org.thingsboard.server.dao.model.ModelConstants.OTA_PACKAGE_URL_COLUMN;
 import static org.thingsboard.server.dao.model.ModelConstants.OTA_PACKAGE_VERSION_COLUMN;
-import static org.thingsboard.server.dao.model.ModelConstants.SEARCH_TEXT_PROPERTY;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Entity
-@TypeDef(name = "json", typeClass = JsonStringType.class)
 @Table(name = OTA_PACKAGE_TABLE_NAME)
 public class OtaPackageInfoEntity extends BaseSqlEntity<OtaPackageInfo> {
 
@@ -99,7 +96,7 @@ public class OtaPackageInfoEntity extends BaseSqlEntity<OtaPackageInfo> {
     @Column(name = OTA_PACKAGE_DATA_SIZE_COLUMN)
     private Long dataSize;
 
-    @Type(type = "json")
+    @Convert(converter = JsonConverter.class)
     @Column(name = ModelConstants.OTA_PACKAGE_ADDITIONAL_INFO_COLUMN)
     private JsonNode additionalInfo;
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/QueueEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/QueueEntity.java
index f77cecb872..72716bec12 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/QueueEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/QueueEntity.java
@@ -16,10 +16,12 @@
 package org.thingsboard.server.dao.model.sql;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import jakarta.persistence.Column;
+import jakarta.persistence.Convert;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.hibernate.annotations.Type;
-import org.hibernate.annotations.TypeDef;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.id.QueueId;
 import org.thingsboard.server.common.data.id.TenantId;
@@ -29,17 +31,13 @@ import org.thingsboard.server.common.data.queue.SubmitStrategy;
 import org.thingsboard.server.dao.DaoUtil;
 import org.thingsboard.server.dao.model.BaseSqlEntity;
 import org.thingsboard.server.dao.model.ModelConstants;
-import org.thingsboard.server.dao.util.mapping.JsonStringType;
+import org.thingsboard.server.dao.util.mapping.JsonConverter;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
 import java.util.UUID;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Entity
-@TypeDef(name = "json", typeClass = JsonStringType.class)
 @Table(name = ModelConstants.QUEUE_TABLE_NAME)
 public class QueueEntity extends BaseSqlEntity<Queue> {
 
@@ -63,15 +61,15 @@ public class QueueEntity extends BaseSqlEntity<Queue> {
     @Column(name = ModelConstants.QUEUE_PACK_PROCESSING_TIMEOUT_PROPERTY)
     private long packProcessingTimeout;
 
-    @Type(type = "json")
+    @Convert(converter = JsonConverter.class)
     @Column(name = ModelConstants.QUEUE_SUBMIT_STRATEGY_PROPERTY)
     private JsonNode submitStrategy;
 
-    @Type(type = "json")
+    @Convert(converter = JsonConverter.class)
     @Column(name = ModelConstants.QUEUE_PROCESSING_STRATEGY_PROPERTY)
     private JsonNode processingStrategy;
 
-    @Type(type = "json")
+    @Convert(converter = JsonConverter.class)
     @Column(name = ModelConstants.QUEUE_ADDITIONAL_INFO_PROPERTY)
     private JsonNode additionalInfo;
 
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/model/sql/RelationCompositeKey.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RelationCompositeKey.java
index a0aa83bdaf..79a52462c5 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RelationCompositeKey.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RelationCompositeKey.java
@@ -20,7 +20,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.thingsboard.server.common.data.relation.EntityRelation;
 
-import javax.persistence.Transient;
+import jakarta.persistence.Transient;
 import java.io.Serializable;
 import java.util.UUID;
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RelationEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RelationEntity.java
index b617f24abd..d7d74d4e8d 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RelationEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RelationEntity.java
@@ -16,26 +16,25 @@
 package org.thingsboard.server.dao.model.sql;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import jakarta.persistence.Column;
+import jakarta.persistence.Convert;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.IdClass;
+import jakarta.persistence.Table;
 import lombok.Data;
-import org.hibernate.annotations.Type;
-import org.hibernate.annotations.TypeDef;
 import org.thingsboard.server.common.data.id.EntityIdFactory;
 import org.thingsboard.server.common.data.relation.EntityRelation;
 import org.thingsboard.server.common.data.relation.RelationTypeGroup;
 import org.thingsboard.server.dao.model.ToData;
-import org.thingsboard.server.dao.util.mapping.JsonStringType;
+import org.thingsboard.server.dao.util.mapping.JsonConverter;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.IdClass;
-import javax.persistence.Table;
 import java.util.UUID;
 
 import static org.thingsboard.server.dao.model.ModelConstants.ADDITIONAL_INFO_PROPERTY;
-import static org.thingsboard.server.dao.model.ModelConstants.RELATION_TABLE_NAME;
 import static org.thingsboard.server.dao.model.ModelConstants.RELATION_FROM_ID_PROPERTY;
 import static org.thingsboard.server.dao.model.ModelConstants.RELATION_FROM_TYPE_PROPERTY;
+import static org.thingsboard.server.dao.model.ModelConstants.RELATION_TABLE_NAME;
 import static org.thingsboard.server.dao.model.ModelConstants.RELATION_TO_ID_PROPERTY;
 import static org.thingsboard.server.dao.model.ModelConstants.RELATION_TO_TYPE_PROPERTY;
 import static org.thingsboard.server.dao.model.ModelConstants.RELATION_TYPE_GROUP_PROPERTY;
@@ -43,7 +42,6 @@ import static org.thingsboard.server.dao.model.ModelConstants.RELATION_TYPE_PROP
 
 @Data
 @Entity
-@TypeDef(name = "json", typeClass = JsonStringType.class)
 @Table(name = RELATION_TABLE_NAME)
 @IdClass(RelationCompositeKey.class)
 public final class RelationEntity implements ToData<EntityRelation> {
@@ -72,7 +70,7 @@ public final class RelationEntity implements ToData<EntityRelation> {
     @Column(name = RELATION_TYPE_PROPERTY)
     private String relationType;
 
-    @Type(type = "json")
+    @Convert(converter = JsonConverter.class)
     @Column(name = ADDITIONAL_INFO_PROPERTY)
     private JsonNode additionalInfo;
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RpcEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RpcEntity.java
index a2a4c328f0..1a045e8419 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RpcEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RpcEntity.java
@@ -16,10 +16,14 @@
 package org.thingsboard.server.dao.model.sql;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import jakarta.persistence.Column;
+import jakarta.persistence.Convert;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.Table;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.hibernate.annotations.Type;
-import org.hibernate.annotations.TypeDef;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.RpcId;
 import org.thingsboard.server.common.data.id.TenantId;
@@ -27,13 +31,8 @@ import org.thingsboard.server.common.data.rpc.Rpc;
 import org.thingsboard.server.common.data.rpc.RpcStatus;
 import org.thingsboard.server.dao.model.BaseEntity;
 import org.thingsboard.server.dao.model.BaseSqlEntity;
-import org.thingsboard.server.dao.util.mapping.JsonStringType;
+import org.thingsboard.server.dao.util.mapping.JsonConverter;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.Table;
 import java.util.UUID;
 
 import static org.thingsboard.server.dao.model.ModelConstants.RPC_ADDITIONAL_INFO;
@@ -48,7 +47,6 @@ import static org.thingsboard.server.dao.model.ModelConstants.RPC_TENANT_ID_COLU
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Entity
-@TypeDef(name = "json", typeClass = JsonStringType.class)
 @Table(name = RPC_TABLE_NAME)
 public class RpcEntity extends BaseSqlEntity<Rpc> implements BaseEntity<Rpc> {
 
@@ -61,11 +59,11 @@ public class RpcEntity extends BaseSqlEntity<Rpc> implements BaseEntity<Rpc> {
     @Column(name = RPC_EXPIRATION_TIME)
     private long expirationTime;
 
-    @Type(type = "json")
+    @Convert(converter = JsonConverter.class)
     @Column(name = RPC_REQUEST)
     private JsonNode request;
 
-    @Type(type = "json")
+    @Convert(converter = JsonConverter.class)
     @Column(name = RPC_RESPONSE)
     private JsonNode response;
 
@@ -73,7 +71,7 @@ public class RpcEntity extends BaseSqlEntity<Rpc> implements BaseEntity<Rpc> {
     @Column(name = RPC_STATUS)
     private RpcStatus status;
 
-    @Type(type = "json")
+    @Convert(converter = JsonConverter.class)
     @Column(name = RPC_ADDITIONAL_INFO)
     private JsonNode additionalInfo;
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleChainDebugEventEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleChainDebugEventEntity.java
index 31fc1311fd..107d35e179 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleChainDebugEventEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleChainDebugEventEntity.java
@@ -22,9 +22,9 @@ import org.thingsboard.server.common.data.event.RuleChainDebugEvent;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.dao.model.BaseEntity;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import static org.thingsboard.server.dao.model.ModelConstants.EVENT_ERROR_COLUMN_NAME;
 import static org.thingsboard.server.dao.model.ModelConstants.EVENT_MESSAGE_COLUMN_NAME;
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleChainEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleChainEntity.java
index 1c3aff17ed..8e012ed0d1 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleChainEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleChainEntity.java
@@ -16,10 +16,14 @@
 package org.thingsboard.server.dao.model.sql;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import jakarta.persistence.Column;
+import jakarta.persistence.Convert;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.Table;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.hibernate.annotations.Type;
-import org.hibernate.annotations.TypeDef;
 import org.thingsboard.server.common.data.id.RuleChainId;
 import org.thingsboard.server.common.data.id.RuleNodeId;
 import org.thingsboard.server.common.data.id.TenantId;
@@ -28,19 +32,13 @@ import org.thingsboard.server.common.data.rule.RuleChainType;
 import org.thingsboard.server.dao.DaoUtil;
 import org.thingsboard.server.dao.model.BaseSqlEntity;
 import org.thingsboard.server.dao.model.ModelConstants;
-import org.thingsboard.server.dao.util.mapping.JsonStringType;
+import org.thingsboard.server.dao.util.mapping.JsonConverter;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.Table;
 import java.util.UUID;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Entity
-@TypeDef(name = "json", typeClass = JsonStringType.class)
 @Table(name = ModelConstants.RULE_CHAIN_TABLE_NAME)
 public class RuleChainEntity extends BaseSqlEntity<RuleChain> {
 
@@ -63,11 +61,11 @@ public class RuleChainEntity extends BaseSqlEntity<RuleChain> {
     @Column(name = ModelConstants.DEBUG_MODE)
     private boolean debugMode;
 
-    @Type(type = "json")
+    @Convert(converter = JsonConverter.class)
     @Column(name = ModelConstants.RULE_CHAIN_CONFIGURATION_PROPERTY)
     private JsonNode configuration;
 
-    @Type(type = "json")
+    @Convert(converter = JsonConverter.class)
     @Column(name = ModelConstants.ADDITIONAL_INFO_PROPERTY)
     private JsonNode additionalInfo;
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleNodeDebugEventEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleNodeDebugEventEntity.java
index 0c4dd880fe..772727a226 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleNodeDebugEventEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleNodeDebugEventEntity.java
@@ -23,9 +23,9 @@ import org.thingsboard.server.common.data.id.EntityIdFactory;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.dao.model.BaseEntity;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import java.util.UUID;
 
 import static org.thingsboard.server.dao.model.ModelConstants.EVENT_DATA_COLUMN_NAME;
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleNodeEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleNodeEntity.java
index 69ff029464..bdba4549bb 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleNodeEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleNodeEntity.java
@@ -16,27 +16,25 @@
 package org.thingsboard.server.dao.model.sql;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import jakarta.persistence.Column;
+import jakarta.persistence.Convert;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.hibernate.annotations.Type;
-import org.hibernate.annotations.TypeDef;
 import org.thingsboard.server.common.data.id.RuleChainId;
 import org.thingsboard.server.common.data.id.RuleNodeId;
 import org.thingsboard.server.common.data.rule.RuleNode;
 import org.thingsboard.server.dao.DaoUtil;
 import org.thingsboard.server.dao.model.BaseSqlEntity;
 import org.thingsboard.server.dao.model.ModelConstants;
-import org.thingsboard.server.dao.util.mapping.JsonStringType;
+import org.thingsboard.server.dao.util.mapping.JsonConverter;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
 import java.util.UUID;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Entity
-@TypeDef(name = "json", typeClass = JsonStringType.class)
 @Table(name = ModelConstants.RULE_NODE_TABLE_NAME)
 public class RuleNodeEntity extends BaseSqlEntity<RuleNode> {
 
@@ -52,11 +50,11 @@ public class RuleNodeEntity extends BaseSqlEntity<RuleNode> {
     @Column(name = ModelConstants.RULE_NODE_VERSION_PROPERTY)
     private int configurationVersion;
 
-    @Type(type = "json")
+    @Convert(converter = JsonConverter.class)
     @Column(name = ModelConstants.RULE_NODE_CONFIGURATION_PROPERTY)
     private JsonNode configuration;
 
-    @Type(type = "json")
+    @Convert(converter = JsonConverter.class)
     @Column(name = ModelConstants.ADDITIONAL_INFO_PROPERTY)
     private JsonNode additionalInfo;
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleNodeStateEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleNodeStateEntity.java
index 71576f8521..c64f98a22f 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleNodeStateEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleNodeStateEntity.java
@@ -15,9 +15,11 @@
  */
 package org.thingsboard.server.dao.model.sql;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.hibernate.annotations.TypeDef;
 import org.thingsboard.server.common.data.id.EntityIdFactory;
 import org.thingsboard.server.common.data.id.RuleNodeId;
 import org.thingsboard.server.common.data.id.RuleNodeStateId;
@@ -25,17 +27,12 @@ import org.thingsboard.server.common.data.rule.RuleNodeState;
 import org.thingsboard.server.dao.DaoUtil;
 import org.thingsboard.server.dao.model.BaseSqlEntity;
 import org.thingsboard.server.dao.model.ModelConstants;
-import org.thingsboard.server.dao.util.mapping.JsonStringType;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
 import java.util.UUID;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Entity
-@TypeDef(name = "json", typeClass = JsonStringType.class)
 @Table(name = ModelConstants.RULE_NODE_STATE_TABLE_NAME)
 public class RuleNodeStateEntity extends BaseSqlEntity<RuleNodeState> {
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/StatisticsEventEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/StatisticsEventEntity.java
index 411a71b6e6..23a8bbe796 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/StatisticsEventEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/StatisticsEventEntity.java
@@ -22,9 +22,9 @@ import org.thingsboard.server.common.data.event.StatisticsEvent;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.dao.model.BaseEntity;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import static org.thingsboard.server.dao.model.ModelConstants.EVENT_ERRORS_OCCURRED_COLUMN_NAME;
 import static org.thingsboard.server.dao.model.ModelConstants.EVENT_MESSAGES_PROCESSED_COLUMN_NAME;
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TbResourceEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TbResourceEntity.java
index d0aab42cc4..f507a8661f 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TbResourceEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TbResourceEntity.java
@@ -16,20 +16,21 @@
 package org.thingsboard.server.dao.model.sql;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import jakarta.persistence.Convert;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.Type;
-import org.hibernate.annotations.TypeDef;
 import org.thingsboard.server.common.data.ResourceType;
 import org.thingsboard.server.common.data.TbResource;
 import org.thingsboard.server.common.data.id.TbResourceId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.dao.model.BaseSqlEntity;
-import org.thingsboard.server.dao.util.mapping.JsonStringType;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
+import org.thingsboard.server.dao.util.mapping.JsonConverter;
+
 import java.util.UUID;
 
 import static org.thingsboard.server.dao.model.ModelConstants.EXTERNAL_ID_PROPERTY;
@@ -50,7 +51,6 @@ import static org.thingsboard.server.dao.model.ModelConstants.SEARCH_TEXT_PROPER
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Entity
-@TypeDef(name = "json", typeClass = JsonStringType.class)
 @Table(name = RESOURCE_TABLE_NAME)
 public class TbResourceEntity extends BaseSqlEntity<TbResource> {
 
@@ -78,7 +78,7 @@ public class TbResourceEntity extends BaseSqlEntity<TbResource> {
     @Column(name = RESOURCE_ETAG_COLUMN)
     private String etag;
 
-    @Type(type = "json")
+    @Convert(converter = JsonConverter.class)
     @Column(name = RESOURCE_DESCRIPTOR_COLUMN)
     private JsonNode descriptor;
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TbResourceInfoEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TbResourceInfoEntity.java
index 6acde58fe8..8f525916bf 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TbResourceInfoEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TbResourceInfoEntity.java
@@ -16,21 +16,20 @@
 package org.thingsboard.server.dao.model.sql;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import jakarta.persistence.Convert;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.hibernate.annotations.Type;
-import org.hibernate.annotations.TypeDef;
 import org.thingsboard.server.common.data.ResourceType;
 import org.thingsboard.server.common.data.TbResourceInfo;
 import org.thingsboard.server.common.data.id.TbResourceId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.dao.model.BaseEntity;
 import org.thingsboard.server.dao.model.BaseSqlEntity;
-import org.thingsboard.server.dao.util.mapping.JsonStringType;
+import org.thingsboard.server.dao.util.mapping.JsonConverter;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import java.util.UUID;
 
 import static org.thingsboard.server.dao.model.ModelConstants.EXTERNAL_ID_PROPERTY;
@@ -49,7 +48,6 @@ import static org.thingsboard.server.dao.model.ModelConstants.SEARCH_TEXT_PROPER
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Entity
-@TypeDef(name = "json", typeClass = JsonStringType.class)
 @Table(name = RESOURCE_TABLE_NAME)
 public class TbResourceInfoEntity extends BaseSqlEntity<TbResourceInfo> implements BaseEntity<TbResourceInfo> {
 
@@ -74,7 +72,7 @@ public class TbResourceInfoEntity extends BaseSqlEntity<TbResourceInfo> implemen
     @Column(name = RESOURCE_FILE_NAME_COLUMN)
     private String fileName;
 
-    @Type(type = "json")
+    @Convert(converter = JsonConverter.class)
     @Column(name = RESOURCE_DESCRIPTOR_COLUMN)
     private JsonNode descriptor;
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantEntity.java
index beeaeac5ac..9552f168bf 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantEntity.java
@@ -15,20 +15,16 @@
  */
 package org.thingsboard.server.dao.model.sql;
 
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.hibernate.annotations.TypeDef;
 import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.dao.model.ModelConstants;
-import org.thingsboard.server.dao.util.mapping.JsonStringType;
-
-import javax.persistence.Entity;
-import javax.persistence.Table;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Entity
-@TypeDef(name = "json", typeClass = JsonStringType.class)
 @Table(name = ModelConstants.TENANT_TABLE_NAME)
 public final class TenantEntity extends AbstractTenantEntity<Tenant> {
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantProfileEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantProfileEntity.java
index a721b2e037..4799b0e47d 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantProfileEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantProfileEntity.java
@@ -17,26 +17,25 @@ package org.thingsboard.server.dao.model.sql;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import jakarta.persistence.Column;
+import jakarta.persistence.Convert;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.hibernate.annotations.Type;
-import org.hibernate.annotations.TypeDef;
+import org.hibernate.annotations.JdbcType;
+import org.hibernate.dialect.PostgreSQLJsonPGObjectJsonbType;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.TenantProfile;
 import org.thingsboard.server.common.data.id.TenantProfileId;
 import org.thingsboard.server.common.data.tenant.profile.TenantProfileData;
 import org.thingsboard.server.dao.model.BaseSqlEntity;
 import org.thingsboard.server.dao.model.ModelConstants;
-import org.thingsboard.server.dao.util.mapping.JsonBinaryType;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import org.thingsboard.server.dao.util.mapping.JsonConverter;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Entity
-@TypeDef(name = "jsonb", typeClass = JsonBinaryType.class)
 @Table(name = ModelConstants.TENANT_PROFILE_TABLE_NAME)
 public final class TenantProfileEntity extends BaseSqlEntity<TenantProfile> {
 
@@ -52,8 +51,9 @@ public final class TenantProfileEntity extends BaseSqlEntity<TenantProfile> {
     @Column(name = ModelConstants.TENANT_PROFILE_ISOLATED_TB_RULE_ENGINE)
     private boolean isolatedTbRuleEngine;
 
-    @Type(type = "jsonb")
-    @Column(name = ModelConstants.TENANT_PROFILE_PROFILE_DATA_PROPERTY, columnDefinition = "jsonb")
+    @Convert(converter = JsonConverter.class)
+    @JdbcType(PostgreSQLJsonPGObjectJsonbType.class)
+    @Column(name = ModelConstants.TENANT_PROFILE_PROFILE_DATA_PROPERTY)
     private JsonNode profileData;
 
     public TenantProfileEntity() {
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserAuthSettingsEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserAuthSettingsEntity.java
index 2c798bc60b..31153d7ab1 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserAuthSettingsEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserAuthSettingsEntity.java
@@ -16,11 +16,13 @@
 package org.thingsboard.server.dao.model.sql;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import jakarta.persistence.Column;
+import jakarta.persistence.Convert;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
-import org.hibernate.annotations.Type;
-import org.hibernate.annotations.TypeDef;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.id.UserAuthSettingsId;
 import org.thingsboard.server.common.data.id.UserId;
@@ -29,24 +31,20 @@ import org.thingsboard.server.common.data.security.model.mfa.account.AccountTwoF
 import org.thingsboard.server.dao.model.BaseEntity;
 import org.thingsboard.server.dao.model.BaseSqlEntity;
 import org.thingsboard.server.dao.model.ModelConstants;
-import org.thingsboard.server.dao.util.mapping.JsonStringType;
+import org.thingsboard.server.dao.util.mapping.JsonConverter;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
 import java.util.UUID;
 
 @EqualsAndHashCode(callSuper = true)
 @Data
 @NoArgsConstructor
-@TypeDef(name = "json", typeClass = JsonStringType.class)
 @Entity
 @Table(name = ModelConstants.USER_AUTH_SETTINGS_TABLE_NAME)
 public class UserAuthSettingsEntity extends BaseSqlEntity<UserAuthSettings> implements BaseEntity<UserAuthSettings> {
 
     @Column(name = ModelConstants.USER_AUTH_SETTINGS_USER_ID_PROPERTY, nullable = false, unique = true)
     private UUID userId;
-    @Type(type = "json")
+    @Convert(converter = JsonConverter.class)
     @Column(name = ModelConstants.USER_AUTH_SETTINGS_TWO_FA_SETTINGS)
     private JsonNode twoFaSettings;
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserCredentialsEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserCredentialsEntity.java
index e1ebe1f1b4..e7907921bf 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserCredentialsEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserCredentialsEntity.java
@@ -16,9 +16,9 @@
 package org.thingsboard.server.dao.model.sql;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import jakarta.persistence.Convert;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.hibernate.annotations.Type;
 import org.thingsboard.server.common.data.id.UserCredentialsId;
 import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.security.UserCredentials;
@@ -26,9 +26,11 @@ import org.thingsboard.server.dao.model.BaseEntity;
 import org.thingsboard.server.dao.model.BaseSqlEntity;
 import org.thingsboard.server.dao.model.ModelConstants;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
+import org.thingsboard.server.dao.util.mapping.JsonConverter;
+
 import java.util.UUID;
 
 @Data
@@ -52,7 +54,7 @@ public final class UserCredentialsEntity extends BaseSqlEntity<UserCredentials>
     @Column(name = ModelConstants.USER_CREDENTIALS_RESET_TOKEN_PROPERTY, unique = true)
     private String resetToken;
 
-    @Type(type = "json")
+    @Convert(converter = JsonConverter.class)
     @Column(name = ModelConstants.USER_CREDENTIALS_ADDITIONAL_PROPERTY)
     private JsonNode additionalInfo;
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserEntity.java
index 6df1c9f1cd..abbf64fb08 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserEntity.java
@@ -16,10 +16,14 @@
 package org.thingsboard.server.dao.model.sql;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import jakarta.persistence.Column;
+import jakarta.persistence.Convert;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.Table;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.hibernate.annotations.Type;
-import org.hibernate.annotations.TypeDef;
 import org.thingsboard.server.common.data.User;
 import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.TenantId;
@@ -27,13 +31,8 @@ import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.security.Authority;
 import org.thingsboard.server.dao.model.BaseSqlEntity;
 import org.thingsboard.server.dao.model.ModelConstants;
-import org.thingsboard.server.dao.util.mapping.JsonStringType;
+import org.thingsboard.server.dao.util.mapping.JsonConverter;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.Table;
 import java.util.UUID;
 
 /**
@@ -42,7 +41,6 @@ import java.util.UUID;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Entity
-@TypeDef(name = "json", typeClass = JsonStringType.class)
 @Table(name = ModelConstants.USER_PG_HIBERNATE_TABLE_NAME)
 public class UserEntity extends BaseSqlEntity<User> {
 
@@ -68,7 +66,7 @@ public class UserEntity extends BaseSqlEntity<User> {
     @Column(name = ModelConstants.PHONE_PROPERTY)
     private String phone;
 
-    @Type(type = "json")
+    @Convert(converter = JsonConverter.class)
     @Column(name = ModelConstants.USER_ADDITIONAL_INFO_PROPERTY)
     private JsonNode additionalInfo;
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserSettingsEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserSettingsEntity.java
index fb602343e9..f639fb1c0c 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserSettingsEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserSettingsEntity.java
@@ -16,28 +16,28 @@
 package org.thingsboard.server.dao.model.sql;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import jakarta.persistence.Column;
+import jakarta.persistence.Convert;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.IdClass;
+import jakarta.persistence.Table;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.hibernate.annotations.Type;
-import org.hibernate.annotations.TypeDef;
+import org.hibernate.annotations.JdbcType;
+import org.hibernate.dialect.PostgreSQLJsonPGObjectJsonbType;
 import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.settings.UserSettings;
 import org.thingsboard.server.common.data.settings.UserSettingsCompositeKey;
 import org.thingsboard.server.common.data.settings.UserSettingsType;
 import org.thingsboard.server.dao.model.ModelConstants;
 import org.thingsboard.server.dao.model.ToData;
-import org.thingsboard.server.dao.util.mapping.JsonBinaryType;
+import org.thingsboard.server.dao.util.mapping.JsonConverter;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.IdClass;
-import javax.persistence.Table;
 import java.util.UUID;
 
 @Data
 @NoArgsConstructor
-@TypeDef(name = "jsonb", typeClass = JsonBinaryType.class)
 @Entity
 @Table(name = ModelConstants.USER_SETTINGS_TABLE_NAME)
 @IdClass(UserSettingsCompositeKey.class)
@@ -49,7 +49,8 @@ public class UserSettingsEntity implements ToData<UserSettings> {
     @Id
     @Column(name = ModelConstants.USER_SETTINGS_TYPE_PROPERTY)
     private String type;
-    @Type(type = "jsonb")
+    @Convert(converter = JsonConverter.class)
+    @JdbcType(PostgreSQLJsonPGObjectJsonbType.class)
     @Column(name = ModelConstants.USER_SETTINGS_SETTINGS, columnDefinition = "jsonb")
     private JsonNode settings;
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetTypeDetailsEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetTypeDetailsEntity.java
index 0c66f81905..c2585f7d98 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetTypeDetailsEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetTypeDetailsEntity.java
@@ -17,26 +17,24 @@ package org.thingsboard.server.dao.model.sql;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import io.hypersistence.utils.hibernate.type.array.StringArrayType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Convert;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.Type;
-import org.hibernate.annotations.TypeDef;
 import org.thingsboard.server.common.data.id.WidgetTypeId;
 import org.thingsboard.server.common.data.widget.BaseWidgetType;
 import org.thingsboard.server.common.data.widget.WidgetTypeDetails;
 import org.thingsboard.server.dao.model.ModelConstants;
-import org.thingsboard.server.dao.util.mapping.JsonStringType;
+import org.thingsboard.server.dao.util.mapping.JsonConverter;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
 import java.util.UUID;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Entity
-@TypeDef(name = "json", typeClass = JsonStringType.class)
-@TypeDef(name = "string-array", typeClass = StringArrayType.class)
 @Table(name = ModelConstants.WIDGET_TYPE_TABLE_NAME)
 public class WidgetTypeDetailsEntity extends AbstractWidgetTypeEntity<WidgetTypeDetails> {
 
@@ -46,11 +44,11 @@ public class WidgetTypeDetailsEntity extends AbstractWidgetTypeEntity<WidgetType
     @Column(name = ModelConstants.WIDGET_TYPE_DESCRIPTION_PROPERTY)
     private String description;
 
-    @Type(type="string-array")
+    @Type(StringArrayType.class)
     @Column(name = ModelConstants.WIDGET_TYPE_TAGS_PROPERTY, columnDefinition = "text[]")
     private String[] tags;
 
-    @Type(type="json")
+    @Convert(converter = JsonConverter.class)
     @Column(name = ModelConstants.WIDGET_TYPE_DESCRIPTOR_PROPERTY)
     private JsonNode descriptor;
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetTypeEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetTypeEntity.java
index 7fb214948d..94faabcb96 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetTypeEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetTypeEntity.java
@@ -16,27 +16,24 @@
 package org.thingsboard.server.dao.model.sql;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import jakarta.persistence.Column;
+import jakarta.persistence.Convert;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.hibernate.annotations.Type;
-import org.hibernate.annotations.TypeDef;
 import org.thingsboard.server.common.data.widget.BaseWidgetType;
 import org.thingsboard.server.common.data.widget.WidgetType;
 import org.thingsboard.server.dao.model.ModelConstants;
-import org.thingsboard.server.dao.util.mapping.JsonStringType;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import org.thingsboard.server.dao.util.mapping.JsonConverter;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Entity
-@TypeDef(name = "json", typeClass = JsonStringType.class)
 @Table(name = ModelConstants.WIDGET_TYPE_TABLE_NAME)
 public final class WidgetTypeEntity extends AbstractWidgetTypeEntity<WidgetType> {
 
-    @Type(type="json")
+    @Convert(converter = JsonConverter.class)
     @Column(name = ModelConstants.WIDGET_TYPE_DESCRIPTOR_PROPERTY)
     private JsonNode descriptor;
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetTypeInfoEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetTypeInfoEntity.java
index c334f27342..415bf26ea0 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetTypeInfoEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetTypeInfoEntity.java
@@ -18,22 +18,22 @@ package org.thingsboard.server.dao.model.sql;
 import io.hypersistence.utils.hibernate.type.array.StringArrayType;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.Immutable;
 import org.hibernate.annotations.Type;
-import org.hibernate.annotations.TypeDef;
 import org.thingsboard.server.common.data.widget.BaseWidgetType;
 import org.thingsboard.server.common.data.widget.WidgetTypeInfo;
 import org.thingsboard.server.dao.model.ModelConstants;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import java.util.HashMap;
 import java.util.Map;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Entity
-@TypeDef(name = "string-array", typeClass = StringArrayType.class)
+@Immutable
 @Table(name = ModelConstants.WIDGET_TYPE_INFO_VIEW_TABLE_NAME)
 public class WidgetTypeInfoEntity extends AbstractWidgetTypeEntity<WidgetTypeInfo> {
 
@@ -51,7 +51,7 @@ public class WidgetTypeInfoEntity extends AbstractWidgetTypeEntity<WidgetTypeInf
     @Column(name = ModelConstants.WIDGET_TYPE_DESCRIPTION_PROPERTY)
     private String description;
 
-    @Type(type = "string-array")
+    @Type(StringArrayType.class)
     @Column(name = ModelConstants.WIDGET_TYPE_TAGS_PROPERTY, columnDefinition = "text[]")
     private String[] tags;
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetsBundleEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetsBundleEntity.java
index e351f45791..1edf3bb614 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetsBundleEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetsBundleEntity.java
@@ -24,9 +24,9 @@ import org.thingsboard.server.common.data.widget.WidgetsBundle;
 import org.thingsboard.server.dao.model.BaseSqlEntity;
 import org.thingsboard.server.dao.model.ModelConstants;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import java.util.UUID;
 
 @Data
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetsBundleWidgetCompositeKey.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetsBundleWidgetCompositeKey.java
index a5b0f1d736..7da229a79a 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetsBundleWidgetCompositeKey.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetsBundleWidgetCompositeKey.java
@@ -19,7 +19,7 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.Transient;
+import jakarta.persistence.Transient;
 import java.io.Serializable;
 import java.util.UUID;
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetsBundleWidgetEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetsBundleWidgetEntity.java
index 5ec83716a4..b1e988f255 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetsBundleWidgetEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetsBundleWidgetEntity.java
@@ -21,11 +21,11 @@ import org.thingsboard.server.common.data.id.WidgetsBundleId;
 import org.thingsboard.server.common.data.widget.WidgetsBundleWidget;
 import org.thingsboard.server.dao.model.ToData;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.IdClass;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.IdClass;
+import jakarta.persistence.Table;
 import java.util.UUID;
 
 import static org.thingsboard.server.dao.model.ModelConstants.WIDGETS_BUNDLE_WIDGET_TABLE_NAME;
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sqlts/dictionary/TsKvDictionaryCompositeKey.java b/dao/src/main/java/org/thingsboard/server/dao/model/sqlts/dictionary/KeyDictionaryCompositeKey.java
similarity index 90%
rename from dao/src/main/java/org/thingsboard/server/dao/model/sqlts/dictionary/TsKvDictionaryCompositeKey.java
rename to dao/src/main/java/org/thingsboard/server/dao/model/sqlts/dictionary/KeyDictionaryCompositeKey.java
index 2e32cbb2e0..ca38d65aae 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sqlts/dictionary/TsKvDictionaryCompositeKey.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sqlts/dictionary/KeyDictionaryCompositeKey.java
@@ -19,13 +19,13 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.Transient;
+import jakarta.persistence.Transient;
 import java.io.Serializable;
 
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-public class TsKvDictionaryCompositeKey implements Serializable{
+public class KeyDictionaryCompositeKey implements Serializable{
 
     @Transient
     private static final long serialVersionUID = -4089175869616037523L;
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sqlts/dictionary/TsKvDictionary.java b/dao/src/main/java/org/thingsboard/server/dao/model/sqlts/dictionary/KeyDictionaryEntry.java
similarity index 74%
rename from dao/src/main/java/org/thingsboard/server/dao/model/sqlts/dictionary/TsKvDictionary.java
rename to dao/src/main/java/org/thingsboard/server/dao/model/sqlts/dictionary/KeyDictionaryEntry.java
index 30e3eb6a4a..905127208a 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sqlts/dictionary/TsKvDictionary.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sqlts/dictionary/KeyDictionaryEntry.java
@@ -15,31 +15,29 @@
  */
 package org.thingsboard.server.dao.model.sqlts.dictionary;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.IdClass;
+import jakarta.persistence.Table;
 import lombok.Data;
 import org.hibernate.annotations.Generated;
-import org.hibernate.annotations.GenerationTime;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.IdClass;
-import javax.persistence.Table;
 
 import static org.thingsboard.server.dao.model.ModelConstants.KEY_COLUMN;
 import static org.thingsboard.server.dao.model.ModelConstants.KEY_ID_COLUMN;
 
 @Data
 @Entity
-@Table(name = "ts_kv_dictionary")
-@IdClass(TsKvDictionaryCompositeKey.class)
-public final class TsKvDictionary {
+@Table(name = "key_dictionary")
+@IdClass(KeyDictionaryCompositeKey.class)
+public final class KeyDictionaryEntry {
 
     @Id
     @Column(name = KEY_COLUMN)
     private String key;
 
-    @Column(name = KEY_ID_COLUMN, unique = true, columnDefinition="int")
-    @Generated(GenerationTime.INSERT)
+    @Column(name = KEY_ID_COLUMN, unique = true, columnDefinition = "int")
+    @Generated
     private int keyId;
 
 }
\ No newline at end of file
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sqlts/latest/TsKvLatestCompositeKey.java b/dao/src/main/java/org/thingsboard/server/dao/model/sqlts/latest/TsKvLatestCompositeKey.java
index 9fe3e3a622..58f8ee2867 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sqlts/latest/TsKvLatestCompositeKey.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sqlts/latest/TsKvLatestCompositeKey.java
@@ -19,7 +19,7 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.Transient;
+import jakarta.persistence.Transient;
 import java.io.Serializable;
 import java.util.UUID;
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sqlts/latest/TsKvLatestEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sqlts/latest/TsKvLatestEntity.java
index ec28266db0..0d34bb5195 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sqlts/latest/TsKvLatestEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sqlts/latest/TsKvLatestEntity.java
@@ -15,19 +15,19 @@
  */
 package org.thingsboard.server.dao.model.sqlts.latest;
 
+import jakarta.persistence.ColumnResult;
+import jakarta.persistence.ConstructorResult;
+import jakarta.persistence.Entity;
+import jakarta.persistence.IdClass;
+import jakarta.persistence.NamedNativeQueries;
+import jakarta.persistence.NamedNativeQuery;
+import jakarta.persistence.SqlResultSetMapping;
+import jakarta.persistence.SqlResultSetMappings;
+import jakarta.persistence.Table;
 import lombok.Data;
 import org.thingsboard.server.dao.model.sql.AbstractTsKvEntity;
 import org.thingsboard.server.dao.sqlts.latest.SearchTsKvLatestRepository;
 
-import javax.persistence.ColumnResult;
-import javax.persistence.ConstructorResult;
-import javax.persistence.Entity;
-import javax.persistence.IdClass;
-import javax.persistence.NamedNativeQueries;
-import javax.persistence.NamedNativeQuery;
-import javax.persistence.SqlResultSetMapping;
-import javax.persistence.SqlResultSetMappings;
-import javax.persistence.Table;
 import java.util.UUID;
 
 @Data
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sqlts/timescale/ts/TimescaleTsKvCompositeKey.java b/dao/src/main/java/org/thingsboard/server/dao/model/sqlts/timescale/ts/TimescaleTsKvCompositeKey.java
index dc8d0853e1..be40965d73 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sqlts/timescale/ts/TimescaleTsKvCompositeKey.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sqlts/timescale/ts/TimescaleTsKvCompositeKey.java
@@ -15,11 +15,11 @@
  */
 package org.thingsboard.server.dao.model.sqlts.timescale.ts;
 
+import jakarta.persistence.Transient;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.Transient;
 import java.io.Serializable;
 import java.util.UUID;
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sqlts/timescale/ts/TimescaleTsKvEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sqlts/timescale/ts/TimescaleTsKvEntity.java
index e9e3e1d9cc..34f30db80d 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sqlts/timescale/ts/TimescaleTsKvEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sqlts/timescale/ts/TimescaleTsKvEntity.java
@@ -15,21 +15,20 @@
  */
 package org.thingsboard.server.dao.model.sqlts.timescale.ts;
 
+import jakarta.persistence.ColumnResult;
+import jakarta.persistence.ConstructorResult;
+import jakarta.persistence.Entity;
+import jakarta.persistence.IdClass;
+import jakarta.persistence.NamedNativeQueries;
+import jakarta.persistence.NamedNativeQuery;
+import jakarta.persistence.SqlResultSetMapping;
+import jakarta.persistence.SqlResultSetMappings;
+import jakarta.persistence.Table;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.dao.model.sql.AbstractTsKvEntity;
 
-import javax.persistence.ColumnResult;
-import javax.persistence.ConstructorResult;
-import javax.persistence.Entity;
-import javax.persistence.IdClass;
-import javax.persistence.NamedNativeQueries;
-import javax.persistence.NamedNativeQuery;
-import javax.persistence.SqlResultSetMapping;
-import javax.persistence.SqlResultSetMappings;
-import javax.persistence.Table;
-
 import static org.thingsboard.server.dao.sqlts.timescale.AggregationRepository.FIND_AVG;
 import static org.thingsboard.server.dao.sqlts.timescale.AggregationRepository.FIND_AVG_QUERY;
 import static org.thingsboard.server.dao.sqlts.timescale.AggregationRepository.FIND_COUNT;
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sqlts/ts/TsKvCompositeKey.java b/dao/src/main/java/org/thingsboard/server/dao/model/sqlts/ts/TsKvCompositeKey.java
index c38e71c702..98eed0a603 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sqlts/ts/TsKvCompositeKey.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sqlts/ts/TsKvCompositeKey.java
@@ -19,7 +19,7 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.Transient;
+import jakarta.persistence.Transient;
 import java.io.Serializable;
 import java.util.UUID;
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sqlts/ts/TsKvEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sqlts/ts/TsKvEntity.java
index 5e141813f1..63ae0bf25e 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sqlts/ts/TsKvEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sqlts/ts/TsKvEntity.java
@@ -15,14 +15,13 @@
  */
 package org.thingsboard.server.dao.model.sqlts.ts;
 
+import jakarta.persistence.Entity;
+import jakarta.persistence.IdClass;
+import jakarta.persistence.Table;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.thingsboard.server.dao.model.sql.AbstractTsKvEntity;
 
-import javax.persistence.Entity;
-import javax.persistence.IdClass;
-import javax.persistence.Table;
-
 @EqualsAndHashCode(callSuper = true)
 @Data
 @Entity
diff --git a/dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraAbstractAsyncDao.java b/dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraAbstractAsyncDao.java
index c1aab3fe3e..32cc2e6d02 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraAbstractAsyncDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraAbstractAsyncDao.java
@@ -22,9 +22,9 @@ import com.google.common.util.concurrent.ListenableFuture;
 import org.springframework.beans.factory.annotation.Value;
 import org.thingsboard.common.util.ThingsBoardExecutors;
 
-import javax.annotation.Nullable;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.Nullable;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import java.util.concurrent.ExecutorService;
 
 /**
diff --git a/dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraBufferedRateReadExecutor.java b/dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraBufferedRateReadExecutor.java
index e569745504..d3eb176e61 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraBufferedRateReadExecutor.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraBufferedRateReadExecutor.java
@@ -29,7 +29,7 @@ import org.thingsboard.server.dao.util.AsyncTaskContext;
 import org.thingsboard.server.dao.util.NoSqlAnyDao;
 import org.thingsboard.server.cache.limits.RateLimitService;
 
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PreDestroy;
 
 /**
  * Created by ashvayka on 24.10.18.
diff --git a/dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraBufferedRateWriteExecutor.java b/dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraBufferedRateWriteExecutor.java
index 59fdcac935..8bfdd36501 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraBufferedRateWriteExecutor.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraBufferedRateWriteExecutor.java
@@ -29,7 +29,7 @@ import org.thingsboard.server.dao.util.AsyncTaskContext;
 import org.thingsboard.server.dao.util.NoSqlAnyDao;
 import org.thingsboard.server.cache.limits.RateLimitService;
 
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PreDestroy;
 
 /**
  * Created by ashvayka on 24.10.18.
diff --git a/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationRequestService.java b/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationRequestService.java
index 2ad0a59824..ebeb39ed91 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationRequestService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationRequestService.java
@@ -17,6 +17,7 @@ package org.thingsboard.server.dao.notification;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.id.EntityId;
@@ -31,6 +32,7 @@ import org.thingsboard.server.common.data.notification.NotificationRequestStatus
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.dao.entity.EntityDaoService;
+import org.thingsboard.server.dao.eventsourcing.DeleteEntityEvent;
 import org.thingsboard.server.dao.service.DataValidator;
 
 import java.util.List;
@@ -44,6 +46,8 @@ public class DefaultNotificationRequestService implements NotificationRequestSer
     private final NotificationRequestDao notificationRequestDao;
     private final NotificationDao notificationDao;
 
+    private final ApplicationEventPublisher eventPublisher;
+
     private final NotificationRequestValidator notificationRequestValidator = new NotificationRequestValidator();
 
     @Override
@@ -83,9 +87,20 @@ public class DefaultNotificationRequestService implements NotificationRequestSer
     }
 
     @Override
-    public void deleteNotificationRequest(TenantId tenantId, NotificationRequestId requestId) {
-        notificationRequestDao.removeById(tenantId, requestId.getId());
-        notificationDao.deleteByRequestId(tenantId, requestId);
+    public void deleteNotificationRequest(TenantId tenantId, NotificationRequest request) {
+        notificationRequestDao.removeById(tenantId, request.getUuidId());
+        notificationDao.deleteByRequestId(tenantId, request.getId());
+        eventPublisher.publishEvent(DeleteEntityEvent.builder().tenantId(tenantId).entity(request).entityId(request.getId()).build());
+    }
+
+    @Override
+    public void deleteEntity(TenantId tenantId, EntityId id, boolean force) {
+        if (force) {
+            notificationRequestDao.removeById(tenantId, id.getId());
+        } else {
+            NotificationRequest notificationRequest = findNotificationRequestById(tenantId, (NotificationRequestId) id);
+            deleteNotificationRequest(tenantId, notificationRequest);
+        }
     }
 
     @Override
@@ -104,6 +119,11 @@ public class DefaultNotificationRequestService implements NotificationRequestSer
         notificationRequestDao.removeByTenantId(tenantId);
     }
 
+    @Override
+    public void deleteByTenantId(TenantId tenantId) {
+        deleteNotificationRequestsByTenantId(tenantId);
+    }
+
     @Override
     public Optional<HasId<?>> findEntity(TenantId tenantId, EntityId entityId) {
         return Optional.ofNullable(findNotificationRequestById(tenantId, new NotificationRequestId(entityId.getId())));
@@ -114,7 +134,6 @@ public class DefaultNotificationRequestService implements NotificationRequestSer
         return EntityType.NOTIFICATION_REQUEST;
     }
 
-
     private static class NotificationRequestValidator extends DataValidator<NotificationRequest> {
 
     }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationRuleService.java b/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationRuleService.java
index 909febe6a8..ccf8d83887 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationRuleService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationRuleService.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;
@@ -49,7 +51,10 @@ public class DefaultNotificationRuleService extends AbstractEntityService implem
             }
         }
         try {
-            return notificationRuleDao.saveAndFlush(tenantId, notificationRule);
+            NotificationRule savedRule = notificationRuleDao.saveAndFlush(tenantId, notificationRule);
+            eventPublisher.publishEvent(SaveEntityEvent.builder().tenantId(tenantId).entityId(savedRule.getId())
+                    .created(notificationRule.getId() == null).build());
+            return savedRule;
         } catch (Exception e) {
             checkConstraintViolation(e, Map.of(
                     "uq_notification_rule_name", "Notification rule with such name already exists"
@@ -86,6 +91,12 @@ public class DefaultNotificationRuleService extends AbstractEntityService implem
     @Override
     public void deleteNotificationRuleById(TenantId tenantId, NotificationRuleId id) {
         notificationRuleDao.removeById(tenantId, id.getId());
+        eventPublisher.publishEvent(DeleteEntityEvent.builder().tenantId(tenantId).entityId(id).build());
+    }
+
+    @Override
+    public void deleteEntity(TenantId tenantId, EntityId id, boolean force) {
+        deleteNotificationRuleById(tenantId, (NotificationRuleId) id);
     }
 
     @Override
@@ -94,13 +105,13 @@ public class DefaultNotificationRuleService extends AbstractEntityService implem
     }
 
     @Override
-    public Optional<HasId<?>> findEntity(TenantId tenantId, EntityId entityId) {
-        return Optional.ofNullable(findNotificationRuleById(tenantId, new NotificationRuleId(entityId.getId())));
+    public void deleteByTenantId(TenantId tenantId) {
+        deleteNotificationRulesByTenantId(tenantId);
     }
 
     @Override
-    public void deleteEntity(TenantId tenantId, EntityId id) {
-        deleteNotificationRuleById(tenantId, (NotificationRuleId) id);
+    public Optional<HasId<?>> findEntity(TenantId tenantId, EntityId entityId) {
+        return Optional.ofNullable(findNotificationRuleById(tenantId, new NotificationRuleId(entityId.getId())));
     }
 
     @Override
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 1bdc835b29..10438c484a 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(),
@@ -173,17 +172,15 @@ public class DefaultNotificationSettingsService implements NotificationSettingsS
 
             defaultNotifications.create(tenantId, DefaultNotifications.entitiesLimitForSysadmin, sysAdmins.getId());
             defaultNotifications.create(tenantId, DefaultNotifications.entitiesLimitForTenant, affectedTenantAdmins.getId());
-
             defaultNotifications.create(tenantId, DefaultNotifications.apiFeatureWarningForSysadmin, sysAdmins.getId());
             defaultNotifications.create(tenantId, DefaultNotifications.apiFeatureWarningForTenant, affectedTenantAdmins.getId());
             defaultNotifications.create(tenantId, DefaultNotifications.apiFeatureDisabledForSysadmin, sysAdmins.getId());
             defaultNotifications.create(tenantId, DefaultNotifications.apiFeatureDisabledForTenant, affectedTenantAdmins.getId());
-
             defaultNotifications.create(tenantId, DefaultNotifications.exceededRateLimits, affectedTenantAdmins.getId());
             defaultNotifications.create(tenantId, DefaultNotifications.exceededPerEntityRateLimits, affectedTenantAdmins.getId());
             defaultNotifications.create(tenantId, DefaultNotifications.exceededRateLimitsForSysadmin, sysAdmins.getId());
-
             defaultNotifications.create(tenantId, DefaultNotifications.newPlatformVersion, sysAdmins.getId());
+            defaultNotifications.create(tenantId, DefaultNotifications.taskProcessingFailure, tenantAdmins.getId());
             return;
         }
 
@@ -206,23 +203,23 @@ public class DefaultNotificationSettingsService implements NotificationSettingsS
     @Override
     public void updateDefaultNotificationConfigs(TenantId tenantId) {
         if (tenantId.isSysTenantId()) {
-            if (notificationTemplateService.findNotificationTemplatesByTenantIdAndNotificationTypes(tenantId,
-                    List.of(NotificationType.RATE_LIMITS), new PageLink(1)).getTotalElements() > 0) {
-                return;
-            }
-
             NotificationTarget sysAdmins = notificationTargetService.findNotificationTargetsByTenantIdAndUsersFilterType(tenantId, UsersFilterType.SYSTEM_ADMINISTRATORS).stream()
                     .findFirst().orElseGet(() -> createTarget(tenantId, "System administrators", new SystemAdministratorsFilter(), "All system administrators"));
             NotificationTarget affectedTenantAdmins = notificationTargetService.findNotificationTargetsByTenantIdAndUsersFilterType(tenantId, UsersFilterType.AFFECTED_TENANT_ADMINISTRATORS).stream()
                     .findFirst().orElseGet(() -> createTarget(tenantId, "Affected tenant's administrators", new AffectedTenantAdministratorsFilter(), ""));
 
-            defaultNotifications.create(tenantId, DefaultNotifications.exceededRateLimits, affectedTenantAdmins.getId());
-            defaultNotifications.create(tenantId, DefaultNotifications.exceededPerEntityRateLimits, affectedTenantAdmins.getId());
-            defaultNotifications.create(tenantId, DefaultNotifications.exceededRateLimitsForSysadmin, sysAdmins.getId());
+            if (!isNotificationConfigured(tenantId, NotificationType.RATE_LIMITS)) {
+                defaultNotifications.create(tenantId, DefaultNotifications.exceededRateLimits, affectedTenantAdmins.getId());
+                defaultNotifications.create(tenantId, DefaultNotifications.exceededPerEntityRateLimits, affectedTenantAdmins.getId());
+                defaultNotifications.create(tenantId, DefaultNotifications.exceededRateLimitsForSysadmin, sysAdmins.getId());
+            }
+            if (!isNotificationConfigured(tenantId, NotificationType.TASK_PROCESSING_FAILURE)) {
+                defaultNotifications.create(tenantId, DefaultNotifications.taskProcessingFailure, sysAdmins.getId());
+            }
         } else {
             var requiredNotificationTypes = List.of(NotificationType.EDGE_CONNECTION, NotificationType.EDGE_COMMUNICATION_FAILURE);
             var existingNotificationTypes = notificationTemplateService.findNotificationTemplatesByTenantIdAndNotificationTypes(
-                            tenantId, requiredNotificationTypes, new PageLink(1))
+                            tenantId, requiredNotificationTypes, new PageLink(2))
                     .getData()
                     .stream()
                     .map(NotificationTemplate::getNotificationType)
@@ -252,6 +249,10 @@ public class DefaultNotificationSettingsService implements NotificationSettingsS
         }
     }
 
+    private boolean isNotificationConfigured(TenantId tenantId, NotificationType... notificationTypes) {
+        return notificationTemplateService.countNotificationTemplatesByTenantIdAndNotificationTypes(tenantId, List.of(notificationTypes)) > 0;
+    }
+
     private NotificationTarget createTarget(TenantId tenantId, String name, UsersFilter filter, String description) {
         NotificationTarget target = new NotificationTarget();
         target.setTenantId(tenantId);
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..a6ab6e08ff 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;
@@ -50,7 +52,7 @@ import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-import static org.apache.commons.collections.CollectionUtils.isNotEmpty;
+import static org.apache.commons.collections4.CollectionUtils.isNotEmpty;
 
 @Service
 @Slf4j
@@ -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,22 +185,28 @@ 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<>();
     }
 
     @Override
     public void deleteNotificationTargetById(TenantId tenantId, NotificationTargetId id) {
-        if (notificationRequestDao.existsByTenantIdAndStatusAndTargetId(tenantId, NotificationRequestStatus.SCHEDULED, id)) {
+        deleteEntity(tenantId, id, false);
+    }
+
+    @Override
+    public void deleteEntity(TenantId tenantId, EntityId id, boolean force) {
+        NotificationTargetId targetId = (NotificationTargetId) id;
+        if (!force && notificationRequestDao.existsByTenantIdAndStatusAndTargetId(tenantId, NotificationRequestStatus.SCHEDULED, targetId)) {
             throw new IllegalArgumentException("Recipients group is referenced by scheduled notification request");
         }
-        if (notificationRuleDao.existsByTenantIdAndTargetId(tenantId, id)) {
+        if (!force && notificationRuleDao.existsByTenantIdAndTargetId(tenantId, targetId)) {
             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
@@ -201,6 +214,11 @@ public class DefaultNotificationTargetService extends AbstractEntityService impl
         notificationTargetDao.removeByTenantId(tenantId);
     }
 
+    @Override
+    public void deleteByTenantId(TenantId tenantId) {
+        deleteNotificationTargetsByTenantId(tenantId);
+    }
+
     @Override
     public long countNotificationTargetsByTenantId(TenantId tenantId) {
         return notificationTargetDao.countByTenantId(tenantId);
@@ -211,11 +229,6 @@ public class DefaultNotificationTargetService extends AbstractEntityService impl
         return Optional.ofNullable(findNotificationTargetById(tenantId, new NotificationTargetId(entityId.getId())));
     }
 
-    @Override
-    public void deleteEntity(TenantId tenantId, EntityId id) {
-        deleteNotificationTargetById(tenantId, (NotificationTargetId) id);
-    }
-
     @Override
     public EntityType getEntityType() {
         return EntityType.NOTIFICATION_TARGET;
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..14b9d176df 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"
@@ -69,9 +74,19 @@ public class DefaultNotificationTemplateService extends AbstractEntityService im
         return notificationTemplateDao.findByTenantIdAndNotificationTypesAndPageLink(tenantId, notificationTypes, pageLink);
     }
 
+    @Override
+    public int countNotificationTemplatesByTenantIdAndNotificationTypes(TenantId tenantId, List<NotificationType> notificationTypes) {
+        return notificationTemplateDao.countByTenantIdAndNotificationTypes(tenantId, notificationTypes);
+    }
+
     @Override
     public void deleteNotificationTemplateById(TenantId tenantId, NotificationTemplateId id) {
-        if (notificationRequestDao.existsByTenantIdAndStatusAndTemplateId(tenantId, NotificationRequestStatus.SCHEDULED, id)) {
+        deleteEntity(tenantId, id, false);
+    }
+
+    @Override
+    public void deleteEntity(TenantId tenantId, EntityId id, boolean force) {
+        if (!force && notificationRequestDao.existsByTenantIdAndStatusAndTemplateId(tenantId, NotificationRequestStatus.SCHEDULED, (NotificationTemplateId) id)) {
             throw new IllegalArgumentException("Notification template is referenced by scheduled notification request");
         }
         try {
@@ -82,6 +97,7 @@ public class DefaultNotificationTemplateService extends AbstractEntityService im
             ));
             throw e;
         }
+        eventPublisher.publishEvent(DeleteEntityEvent.builder().tenantId(tenantId).entityId(id).build());
     }
 
     @Override
@@ -90,13 +106,13 @@ public class DefaultNotificationTemplateService extends AbstractEntityService im
     }
 
     @Override
-    public Optional<HasId<?>> findEntity(TenantId tenantId, EntityId entityId) {
-        return Optional.ofNullable(findNotificationTemplateById(tenantId, new NotificationTemplateId(entityId.getId())));
+    public void deleteByTenantId(TenantId tenantId) {
+        deleteNotificationTemplatesByTenantId(tenantId);
     }
 
     @Override
-    public void deleteEntity(TenantId tenantId, EntityId id) {
-        deleteNotificationTemplateById(tenantId, (NotificationTemplateId) id);
+    public Optional<HasId<?>> findEntity(TenantId tenantId, EntityId entityId) {
+        return Optional.ofNullable(findNotificationTemplateById(tenantId, new NotificationTemplateId(entityId.getId())));
     }
 
     @Override
diff --git a/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotifications.java b/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotifications.java
index fd17618bd1..4f617c2b9d 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotifications.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotifications.java
@@ -50,6 +50,7 @@ import org.thingsboard.server.common.data.notification.rule.trigger.config.Notif
 import org.thingsboard.server.common.data.notification.rule.trigger.config.NotificationRuleTriggerType;
 import org.thingsboard.server.common.data.notification.rule.trigger.config.RateLimitsNotificationRuleTriggerConfig;
 import org.thingsboard.server.common.data.notification.rule.trigger.config.RuleEngineComponentLifecycleEventNotificationRuleTriggerConfig;
+import org.thingsboard.server.common.data.notification.rule.trigger.config.TaskProcessingFailureNotificationRuleTriggerConfig;
 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.WebDeliveryMethodNotificationTemplate;
@@ -358,6 +359,19 @@ public class DefaultNotifications {
                     .build())
             .build();
 
+    public static final DefaultNotification taskProcessingFailure = DefaultNotification.builder()
+            .name("Task processing failure notification")
+            .type(NotificationType.TASK_PROCESSING_FAILURE)
+            .subject("Failed to process ${taskType}")
+            .text("Failed to process ${taskDescription} for tenant ${tenantId}: ${error}")
+            .icon("warning").color(YELLOW_COLOR)
+            .rule(DefaultRule.builder()
+                    .name("Task processing failure")
+                    .triggerConfig(TaskProcessingFailureNotificationRuleTriggerConfig.builder().build())
+                    .description("Send notification to system admins when task processing fails")
+                    .build())
+            .build();
+
     public static final DefaultNotification jwtSigningKeyIssue = DefaultNotification.builder()
             .name("JWT Signing Key issue notification")
             .type(NotificationType.GENERAL)
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/notification/NotificationTemplateDao.java b/dao/src/main/java/org/thingsboard/server/dao/notification/NotificationTemplateDao.java
index d9a80ce3f5..136bc4d472 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/notification/NotificationTemplateDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/notification/NotificationTemplateDao.java
@@ -30,6 +30,8 @@ public interface NotificationTemplateDao extends Dao<NotificationTemplate>, Expo
 
     PageData<NotificationTemplate> findByTenantIdAndNotificationTypesAndPageLink(TenantId tenantId, List<NotificationType> notificationTypes, PageLink pageLink);
 
+    int countByTenantIdAndNotificationTypes(TenantId tenantId, List<NotificationType> notificationTypes);
+
     void removeByTenantId(TenantId tenantId);
 
 }
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 e903593e92..5bb7ae163e 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
@@ -16,7 +16,7 @@
 package org.thingsboard.server.dao.oauth2;
 
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.BaseData;
@@ -40,10 +40,11 @@ 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;
 
-import javax.transaction.Transactional;
+import jakarta.transaction.Transactional;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
@@ -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..06c449880d 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));
@@ -218,6 +218,11 @@ public class BaseOtaPackageService extends AbstractCachedEntityService<OtaPackag
         }
     }
 
+    @Override
+    public void deleteEntity(TenantId tenantId, EntityId id, boolean force) {
+        deleteOtaPackage(tenantId, (OtaPackageId) id);
+    }
+
     @Override
     public long sumDataSizeByTenantId(TenantId tenantId) {
         return otaPackageDao.sumDataSizeByTenantId(tenantId);
@@ -226,10 +231,15 @@ 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);
     }
 
+    @Override
+    public void deleteByTenantId(TenantId tenantId) {
+        deleteOtaPackagesByTenantId(tenantId);
+    }
+
     private PaginatedRemover<TenantId, OtaPackageInfo> tenantOtaPackageRemover =
             new PaginatedRemover<>() {
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/ota/OtaPackageRedisCache.java b/dao/src/main/java/org/thingsboard/server/dao/ota/OtaPackageRedisCache.java
index 7d6cf173e4..3b5a8ee5ff 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/ota/OtaPackageRedisCache.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/ota/OtaPackageRedisCache.java
@@ -21,7 +21,7 @@ import org.springframework.stereotype.Service;
 import org.thingsboard.server.cache.CacheSpecsMap;
 import org.thingsboard.server.cache.RedisTbTransactionalCache;
 import org.thingsboard.server.cache.TBRedisCacheConfiguration;
-import org.thingsboard.server.cache.TbFSTRedisSerializer;
+import org.thingsboard.server.cache.TbJsonRedisSerializer;
 import org.thingsboard.server.common.data.CacheConstants;
 import org.thingsboard.server.common.data.OtaPackageInfo;
 
@@ -30,6 +30,6 @@ import org.thingsboard.server.common.data.OtaPackageInfo;
 public class OtaPackageRedisCache extends RedisTbTransactionalCache<OtaPackageCacheKey, OtaPackageInfo> {
 
     public OtaPackageRedisCache(TBRedisCacheConfiguration configuration, CacheSpecsMap cacheSpecsMap, RedisConnectionFactory connectionFactory) {
-        super(CacheConstants.OTA_PACKAGE_CACHE, cacheSpecsMap, connectionFactory, configuration, new TbFSTRedisSerializer<>());
+        super(CacheConstants.OTA_PACKAGE_CACHE, cacheSpecsMap, connectionFactory, configuration, new TbJsonRedisSerializer<>(OtaPackageInfo.class));
     }
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/queue/BaseQueueService.java b/dao/src/main/java/org/thingsboard/server/dao/queue/BaseQueueService.java
index 0755fb1526..e3c1ef68aa 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/queue/BaseQueueService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/queue/BaseQueueService.java
@@ -63,7 +63,7 @@ public class BaseQueueService extends AbstractEntityService implements QueueServ
         queueValidator.validate(queue, Queue::getTenantId);
         Queue savedQueue = queueDao.save(queue.getTenantId(), queue);
         eventPublisher.publishEvent(SaveEntityEvent.builder().tenantId(savedQueue.getTenantId())
-                .entityId(savedQueue.getId()).created(queue.getId() == null).build());
+                .entityId(savedQueue.getId()).entity(savedQueue).created(queue.getId() == null).build());
         return savedQueue;
     }
 
@@ -83,6 +83,11 @@ public class BaseQueueService extends AbstractEntityService implements QueueServ
         }
     }
 
+    @Override
+    public void deleteEntity(TenantId tenantId, EntityId id, boolean force) {
+        deleteQueue(tenantId, (QueueId) id);
+    }
+
     @Override
     public List<Queue> findQueuesByTenantId(TenantId tenantId) {
         log.trace("Executing findQueues, tenantId: [{}]", tenantId);
@@ -126,6 +131,11 @@ public class BaseQueueService extends AbstractEntityService implements QueueServ
         tenantQueuesRemover.removeEntities(tenantId, tenantId);
     }
 
+    @Override
+    public void deleteByTenantId(TenantId tenantId) {
+        deleteQueuesByTenantId(tenantId);
+    }
+
     @Override
     public Optional<HasId<?>> findEntity(TenantId tenantId, EntityId entityId) {
         return Optional.ofNullable(findQueueById(tenantId, new QueueId(entityId.getId())));
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..6352ac1a4c
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/queue/BaseQueueStatsService.java
@@ -0,0 +1,96 @@
+/**
+ * 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 void deleteEntity(TenantId tenantId, EntityId id, boolean force) {
+        queueStatsDao.removeById(tenantId, id.getId());
+    }
+
+    @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/common/dao-api/src/main/java/org/thingsboard/server/dao/housekeeper/HouseKeeperService.java b/dao/src/main/java/org/thingsboard/server/dao/queue/QueueStatsDao.java
similarity index 63%
rename from common/dao-api/src/main/java/org/thingsboard/server/dao/housekeeper/HouseKeeperService.java
rename to dao/src/main/java/org/thingsboard/server/dao/queue/QueueStatsDao.java
index 55b164df52..1c3db8bb54 100644
--- a/common/dao-api/src/main/java/org/thingsboard/server/dao/housekeeper/HouseKeeperService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/queue/QueueStatsDao.java
@@ -13,17 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.thingsboard.server.dao.housekeeper;
+package org.thingsboard.server.dao.queue;
 
-import com.google.common.util.concurrent.ListenableFuture;
-import org.thingsboard.server.common.data.User;
-import org.thingsboard.server.common.data.id.AlarmId;
 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 HouseKeeperService {
+public interface QueueStatsDao extends Dao<QueueStats> {
 
-    ListenableFuture<List<AlarmId>> unassignDeletedUserAlarms(TenantId tenantId, User user, long unassignTs);
+    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 d7e45d427a..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
@@ -52,8 +52,8 @@ import org.thingsboard.server.dao.service.ConstraintValidator;
 import org.thingsboard.server.dao.sql.JpaExecutorService;
 import org.thingsboard.server.dao.sql.relation.JpaRelationQueryExecutorService;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -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/relation/RelationRedisCache.java b/dao/src/main/java/org/thingsboard/server/dao/relation/RelationRedisCache.java
index 0adfc966d7..bd2cb7332d 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/relation/RelationRedisCache.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/relation/RelationRedisCache.java
@@ -21,7 +21,7 @@ import org.springframework.stereotype.Service;
 import org.thingsboard.server.cache.CacheSpecsMap;
 import org.thingsboard.server.cache.RedisTbTransactionalCache;
 import org.thingsboard.server.cache.TBRedisCacheConfiguration;
-import org.thingsboard.server.cache.TbFSTRedisSerializer;
+import org.thingsboard.server.cache.TbJsonRedisSerializer;
 import org.thingsboard.server.common.data.CacheConstants;
 
 @ConditionalOnProperty(prefix = "cache", value = "type", havingValue = "redis")
@@ -29,6 +29,6 @@ import org.thingsboard.server.common.data.CacheConstants;
 public class RelationRedisCache extends RedisTbTransactionalCache<RelationCacheKey, RelationCacheValue> {
 
     public RelationRedisCache(TBRedisCacheConfiguration configuration, CacheSpecsMap cacheSpecsMap, RedisConnectionFactory connectionFactory) {
-        super(CacheConstants.RELATIONS_CACHE, cacheSpecsMap, connectionFactory, configuration, new TbFSTRedisSerializer<>());
+        super(CacheConstants.RELATIONS_CACHE, cacheSpecsMap, connectionFactory, configuration, new TbJsonRedisSerializer<>(RelationCacheValue.class));
     }
 }
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 a29742cc65..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
@@ -20,6 +20,7 @@ import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.base.Strings;
+import jakarta.annotation.PostConstruct;
 import lombok.Data;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
@@ -29,7 +30,6 @@ import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.Base64Utils;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.Dashboard;
 import org.thingsboard.server.common.data.DataConstants;
@@ -60,7 +60,6 @@ import org.thingsboard.server.dao.util.JsonPathProcessingTask;
 import org.thingsboard.server.dao.widget.WidgetTypeDao;
 import org.thingsboard.server.dao.widget.WidgetsBundleDao;
 
-import javax.annotation.PostConstruct;
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;
 import java.util.Collections;
@@ -257,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) {
@@ -432,8 +431,8 @@ public class BaseImageService extends BaseResourceService implements ImageServic
         String mdResourceName = null;
         String mdMediaType;
         if (matches) {
-            mdResourceKey = new String(Base64Utils.decodeFromString(matcher.group(1)), StandardCharsets.UTF_8);
-            mdResourceName = new String(Base64Utils.decodeFromString(matcher.group(2)), StandardCharsets.UTF_8);
+            mdResourceKey = new String(Base64.getDecoder().decode(matcher.group(1)), StandardCharsets.UTF_8);
+            mdResourceName = new String(Base64.getDecoder().decode(matcher.group(2)), StandardCharsets.UTF_8);
             mdMediaType = matcher.group(3);
         } else if (data.startsWith(DataConstants.TB_IMAGE_PREFIX + "data:image/") || (!strict && data.startsWith("data:image/"))) {
             mdMediaType = StringUtils.substringBetween(data, "data:", ";base64");
@@ -623,10 +622,10 @@ public class BaseImageService extends BaseResourceService implements ImageServic
                     ImageDescriptor descriptor = getImageDescriptor(imageInfo, key.isPreview());
                     String tbImagePrefix = "";
                     if (addTbImagePrefix) {
-                        tbImagePrefix = "tb-image:" + Base64Utils.encodeToString(imageInfo.getResourceKey().getBytes(StandardCharsets.UTF_8)) + ":"
-                                + Base64Utils.encodeToString(imageInfo.getName().getBytes(StandardCharsets.UTF_8)) + ";";
+                        tbImagePrefix = "tb-image:" + Base64.getEncoder().encodeToString(imageInfo.getResourceKey().getBytes(StandardCharsets.UTF_8)) + ":"
+                                + Base64.getEncoder().encodeToString(imageInfo.getName().getBytes(StandardCharsets.UTF_8)) + ";";
                     }
-                    return tbImagePrefix + "data:" + descriptor.getMediaType() + ";base64," + Base64Utils.encodeToString(data);
+                    return tbImagePrefix + "data:" + descriptor.getMediaType() + ";base64," + Base64.getEncoder().encodeToString(data);
                 }
             }
         } catch (Exception e) {
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 35e13bff3a..723d0e8861 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
@@ -89,8 +89,8 @@ public class BaseResourceService extends AbstractCachedEntityService<ResourceInf
                 saved = new TbResource(resourceInfo);
             }
             publishEvictEvent(new ResourceInfoEvictEvent(tenantId, resource.getId()));
-            eventPublisher.publishEvent(SaveEntityEvent.builder().tenantId(saved.getTenantId())
-                    .entityId(saved.getId()).created(resource.getId() == null).build());
+            eventPublisher.publishEvent(SaveEntityEvent.builder().tenantId(saved.getTenantId()).entityId(saved.getId())
+                    .entity(saved).created(resource.getId() == null).build());
             return saved;
         } catch (Exception t) {
             publishEvictEvent(new ResourceInfoEvictEvent(tenantId, resource.getId()));
@@ -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,20 +150,25 @@ 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);
         }
+        TbResource resource = findResourceById(tenantId, resourceId);
         resourceDao.removeById(tenantId, resourceId.getId());
-        eventPublisher.publishEvent(DeleteEntityEvent.builder().tenantId(tenantId).entityId(resourceId).build());
+        eventPublisher.publishEvent(DeleteEntityEvent.builder().tenantId(tenantId).entity(resource).entityId(resourceId).build());
     }
 
+    @Override
+    public void deleteEntity(TenantId tenantId, EntityId id, boolean force) {
+        deleteResource(tenantId, (TbResourceId) id, force);
+    }
 
     @Override
     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,46 +176,46 @@ 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);
     }
 
     @Override
-    public Optional<HasId<?>> findEntity(TenantId tenantId, EntityId entityId) {
-        return Optional.ofNullable(findResourceInfoById(tenantId, new TbResourceId(entityId.getId())));
+    public void deleteByTenantId(TenantId tenantId) {
+        deleteResourcesByTenantId(tenantId);
     }
 
     @Override
-    public void deleteEntity(TenantId tenantId, EntityId id) {
-        deleteResource(tenantId, (TbResourceId) id);
+    public Optional<HasId<?>> findEntity(TenantId tenantId, EntityId entityId) {
+        return Optional.ofNullable(findResourceInfoById(tenantId, new TbResourceId(entityId.getId())));
     }
 
     @Override
@@ -237,7 +242,7 @@ public class BaseResourceService extends AbstractCachedEntityService<ResourceInf
 
                 @Override
                 protected void removeEntity(TenantId tenantId, TbResource entity) {
-                    deleteResource(tenantId, new TbResourceId(entity.getUuidId()));
+                    deleteResource(tenantId, entity.getId());
                 }
             };
 
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..c79de9c6ac 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,48 @@ 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 deleteEntity(TenantId tenantId, EntityId id, boolean force) {
+        deleteRpc(tenantId, (RpcId) id);
+    }
+
     @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 void deleteByTenantId(TenantId tenantId) {
+        deleteAllRpcByTenantId(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 +103,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 962e0429df..bebb3891cb 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
@@ -20,7 +20,7 @@ import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.util.concurrent.ListenableFuture;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.hibernate.exception.ConstraintViolationException;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,6 +38,7 @@ 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.page.PageData;
+import org.thingsboard.server.common.data.page.PageDataIterable;
 import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.common.data.plugin.ComponentClusteringMode;
 import org.thingsboard.server.common.data.relation.EntityRelation;
@@ -73,6 +74,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -109,14 +111,22 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
     @Override
     @Transactional
     public RuleChain saveRuleChain(RuleChain ruleChain) {
+        return saveRuleChain(ruleChain, true);
+    }
+
+    @Override
+    @Transactional
+    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);
             }
-            eventPublisher.publishEvent(SaveEntityEvent.builder().tenantId(savedRuleChain.getTenantId())
-                    .entity(savedRuleChain).entityId(savedRuleChain.getId()).created(ruleChain.getId() == null).build());
+            if (publishSaveEvent) {
+                eventPublisher.publishEvent(SaveEntityEvent.builder().tenantId(savedRuleChain.getTenantId())
+                        .entity(savedRuleChain).entityId(savedRuleChain.getId()).created(ruleChain.getId() == null).build());
+            }
             return savedRuleChain;
         } catch (Exception e) {
             checkConstraintViolation(e, "rule_chain_external_id_unq_key", "Rule Chain with such external id already exists!");
@@ -136,6 +146,8 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
             } else if (!previousRootRuleChain.getId().equals(ruleChain.getId())) {
                 previousRootRuleChain.setRoot(false);
                 ruleChainDao.save(tenantId, previousRootRuleChain);
+                eventPublisher.publishEvent(SaveEntityEvent.builder().tenantId(tenantId)
+                        .entityId(previousRootRuleChain.getId()).entity(previousRootRuleChain).created(false).build());
                 setRootAndSave(tenantId, ruleChain);
                 return true;
             }
@@ -146,11 +158,18 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
     private void setRootAndSave(TenantId tenantId, RuleChain ruleChain) {
         ruleChain.setRoot(true);
         ruleChainDao.save(tenantId, ruleChain);
+        eventPublisher.publishEvent(SaveEntityEvent.builder().tenantId(tenantId).entityId(ruleChain.getId()).entity(ruleChain).created(false).build());
     }
 
     @Override
     @Transactional
     public RuleChainUpdateResult saveRuleChainMetaData(TenantId tenantId, RuleChainMetaData ruleChainMetaData, Function<RuleNode, RuleNode> ruleNodeUpdater) {
+        return saveRuleChainMetaData(tenantId, ruleChainMetaData, ruleNodeUpdater, true);
+    }
+
+
+    @Override
+    public RuleChainUpdateResult saveRuleChainMetaData(TenantId tenantId, RuleChainMetaData ruleChainMetaData, Function<RuleNode, RuleNode> ruleNodeUpdater, boolean publishSaveEvent) {
         Validator.validateId(ruleChainMetaData.getRuleChainId(), "Incorrect rule chain id.");
         RuleChain ruleChain = findRuleChainById(tenantId, ruleChainMetaData.getRuleChainId());
         if (ruleChain == null) {
@@ -178,7 +197,6 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
         List<RuleNodeUpdateResult> updatedRuleNodes = new ArrayList<>();
         List<RuleNode> existingRuleNodes = getRuleChainNodes(tenantId, ruleChainMetaData.getRuleChainId());
         for (RuleNode existingNode : existingRuleNodes) {
-            deleteEntityRelations(tenantId, existingNode.getId());
             Integer index = ruleNodeIndexMap.get(existingNode.getId());
             RuleNode newRuleNode = null;
             if (index != null) {
@@ -264,8 +282,9 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
         if (!relations.isEmpty()) {
             relationService.saveRelations(tenantId, relations);
         }
-        eventPublisher.publishEvent(SaveEntityEvent.builder().tenantId(tenantId).entity(ruleChain).entityId(ruleChain.getId()).build());
-
+        if (publishSaveEvent) {
+            eventPublisher.publishEvent(SaveEntityEvent.builder().tenantId(tenantId).entity(ruleChain).entityId(ruleChain.getId()).build());
+        }
         return RuleChainUpdateResult.successful(updatedRuleNodes);
     }
 
@@ -293,11 +312,11 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
             List<EntityRelation> nodeRelations = getRuleNodeRelations(tenantId, node.getId());
             for (EntityRelation nodeRelation : nodeRelations) {
                 String type = nodeRelation.getType();
-                if (nodeRelation.getTo().getEntityType() == EntityType.RULE_NODE) {
+                if (EntityType.RULE_NODE.equals(nodeRelation.getTo().getEntityType())) {
                     RuleNodeId toNodeId = new RuleNodeId(nodeRelation.getTo().getId());
                     int toIndex = ruleNodeIndexMap.get(toNodeId);
                     ruleChainMetaData.addConnectionInfo(fromIndex, toIndex, type);
-                } else if (nodeRelation.getTo().getEntityType() == EntityType.RULE_CHAIN) {
+                } else if (EntityType.RULE_CHAIN.equals(nodeRelation.getTo().getEntityType())) {
                     log.warn("[{}][{}] Unsupported node relation: {}", tenantId, ruleChainId, nodeRelation.getTo());
                 }
             }
@@ -413,37 +432,49 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
     public void deleteRuleChainById(TenantId tenantId, RuleChainId ruleChainId) {
         Validator.validateId(ruleChainId, "Incorrect rule chain id for delete request.");
         RuleChain ruleChain = ruleChainDao.findById(tenantId, ruleChainId.getId());
+
+        List<RuleNode> referencingRuleNodes = getReferencingRuleChainNodes(tenantId, ruleChainId);
+        Set<RuleChainId> referencingRuleChainIds = referencingRuleNodes.stream().map(RuleNode::getRuleChainId).collect(Collectors.toSet());
+
         if (ruleChain != null) {
             if (ruleChain.isRoot()) {
                 throw new DataValidationException("Deletion of Root Tenant Rule Chain is prohibited!");
             }
             if (RuleChainType.EDGE.equals(ruleChain.getType())) {
-                PageLink pageLink = new PageLink(DEFAULT_PAGE_SIZE);
-                PageData<Edge> pageData;
-                do {
-                    pageData = edgeService.findEdgesByTenantIdAndEntityId(tenantId, ruleChainId, pageLink);
-                    if (pageData != null && pageData.getData() != null && !pageData.getData().isEmpty()) {
-                        for (Edge edge : pageData.getData()) {
-                            if (edge.getRootRuleChainId() != null && edge.getRootRuleChainId().equals(ruleChainId)) {
-                                throw new DataValidationException("Can't delete rule chain that is root for edge [" + edge.getName() + "]. Please assign another root rule chain first to the edge!");
-                            }
-                        }
-                        if (pageData.hasNext()) {
-                            pageLink = pageLink.nextPageLink();
-                        }
+                for (Edge edge : new PageDataIterable<>(link -> edgeService.findEdgesByTenantIdAndEntityId(tenantId, ruleChainId, link), DEFAULT_PAGE_SIZE)) {
+                    if (edge.getRootRuleChainId() != null && edge.getRootRuleChainId().equals(ruleChainId)) {
+                        throw new DataValidationException("Can't delete rule chain that is root for edge [" + edge.getName() + "]. Please assign another root rule chain first to the edge!");
                     }
-                } while (pageData != null && pageData.hasNext());
+                }
             }
         }
-        checkRuleNodesAndDelete(tenantId, ruleChainId);
+        checkRuleNodesAndDelete(tenantId, ruleChain, referencingRuleChainIds);
     }
 
+    @Override
+    @Transactional
+    public void deleteEntity(TenantId tenantId, EntityId id, boolean force) {
+        if (force) {
+            RuleChain ruleChain = findRuleChainById(tenantId, (RuleChainId) id);
+            checkRuleNodesAndDelete(tenantId, ruleChain, null);
+        } else {
+            deleteRuleChainById(tenantId, (RuleChainId) id);
+        }
+    }
+
+    @Transactional
     @Override
     public void deleteRuleChainsByTenantId(TenantId tenantId) {
         Validator.validateId(tenantId, "Incorrect tenant id for delete rule chains request.");
         tenantRuleChainsRemover.removeEntities(tenantId, tenantId);
     }
 
+    @Transactional
+    @Override
+    public void deleteByTenantId(TenantId tenantId) {
+        deleteRuleChainsByTenantId(tenantId);
+    }
+
     @Override
     public RuleChainData exportTenantRuleChains(TenantId tenantId, PageLink pageLink) {
         Validator.validateId(tenantId, "Incorrect tenant id for search rule chain request.");
@@ -631,15 +662,15 @@ 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);
     }
 
     @Override
     public RuleChain getEdgeTemplateRootRuleChain(TenantId tenantId) {
-        Validator.validateId(tenantId, "Incorrect tenant id for search request.");
+        Validator.validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         return ruleChainDao.findRootRuleChainByTenantIdAndType(tenantId.getId(), RuleChainType.EDGE);
     }
 
@@ -691,14 +722,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);
@@ -707,7 +738,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, "");
     }
@@ -741,7 +772,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);
     }
@@ -751,11 +782,15 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
         return ruleNodeDao.save(tenantId, ruleNode);
     }
 
-    private void checkRuleNodesAndDelete(TenantId tenantId, RuleChainId ruleChainId) {
+    private void checkRuleNodesAndDelete(TenantId tenantId, RuleChain ruleChain, Set<RuleChainId> referencingRuleChainIds) {
         try {
             entityCountService.publishCountEntityEvictEvent(tenantId, EntityType.RULE_CHAIN);
-            ruleChainDao.removeById(tenantId, ruleChainId.getId());
-            eventPublisher.publishEvent(DeleteEntityEvent.builder().tenantId(tenantId).entityId(ruleChainId).build());
+            ruleChainDao.removeById(tenantId, ruleChain.getUuidId());
+
+            if (referencingRuleChainIds != null) {
+                referencingRuleChainIds.remove(ruleChain.getId());
+            }
+            eventPublisher.publishEvent(DeleteEntityEvent.builder().tenantId(tenantId).entityId(ruleChain.getId()).entity(ruleChain).body(JacksonUtil.toString(referencingRuleChainIds)).build());
         } catch (Exception t) {
             ConstraintViolationException e = extractConstraintViolationException(t).orElse(null);
             if (e != null && e.getConstraintName() != null && e.getConstraintName().equalsIgnoreCase("fk_default_rule_chain_device_profile")) {
@@ -766,15 +801,15 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
                 throw t;
             }
         }
-        deleteRuleNodes(tenantId, ruleChainId);
+        deleteRuleNodes(tenantId, ruleChain.getId());
     }
 
     private void deleteRuleNodes(TenantId tenantId, List<RuleNode> ruleNodes) {
         List<RuleNodeId> ruleNodeIds = ruleNodes.stream().map(RuleNode::getId).collect(Collectors.toList());
-        for (var node : ruleNodes) {
-            deleteEntityRelations(tenantId, node.getId());
-        }
         ruleNodeDao.deleteByIdIn(ruleNodeIds);
+        for (var nodeId : ruleNodeIds) {
+            cleanUpService.cleanUpRelatedData(tenantId, nodeId);
+        }
     }
 
     @Override
@@ -784,7 +819,6 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
         for (EntityRelation relation : nodeRelations) {
             deleteRuleNode(tenantId, relation.getTo());
         }
-        deleteEntityRelations(tenantId, ruleChainId);
     }
 
 
@@ -801,12 +835,6 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
         return ruleChainDao.countByTenantId(tenantId);
     }
 
-    @Override
-    @Transactional
-    public void deleteEntity(TenantId tenantId, EntityId id) {
-        deleteRuleChainById(tenantId, (RuleChainId) id);
-    }
-
     @Override
     public EntityType getEntityType() {
         return EntityType.RULE_CHAIN;
@@ -821,8 +849,8 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
     }
 
     private void deleteRuleNode(TenantId tenantId, EntityId entityId) {
-        deleteEntityRelations(tenantId, entityId);
         ruleNodeDao.removeById(tenantId, entityId.getId());
+        cleanUpService.cleanUpRelatedData(tenantId, entityId);
     }
 
     private final PaginatedRemover<TenantId, RuleChain> tenantRuleChainsRemover =
@@ -835,7 +863,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
 
                 @Override
                 protected void removeEntity(TenantId tenantId, RuleChain entity) {
-                    checkRuleNodesAndDelete(tenantId, entity.getId());
+                    checkRuleNodesAndDelete(tenantId, entity, null);
                 }
             };
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/service/ConstraintValidator.java b/dao/src/main/java/org/thingsboard/server/dao/service/ConstraintValidator.java
index 04ca7d460e..40be2fbd54 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/service/ConstraintValidator.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/service/ConstraintValidator.java
@@ -30,11 +30,11 @@ import org.thingsboard.server.common.data.validation.Length;
 import org.thingsboard.server.common.data.validation.NoXss;
 import org.thingsboard.server.dao.exception.DataValidationException;
 
-import javax.validation.ConstraintViolation;
-import javax.validation.Validation;
-import javax.validation.Validator;
-import javax.validation.constraints.AssertTrue;
-import javax.validation.metadata.ConstraintDescriptor;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
+import jakarta.validation.constraints.AssertTrue;
+import jakarta.validation.metadata.ConstraintDescriptor;
 import java.util.Collection;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -100,7 +100,7 @@ public class ConstraintValidator {
     }
 
     private static ConstraintMapping getCustomConstraintMapping() {
-        ConstraintMapping constraintMapping = new DefaultConstraintMapping();
+        ConstraintMapping constraintMapping = new DefaultConstraintMapping(null);
         constraintMapping.constraintDefinition(NoXss.class).validatedBy(NoXssValidator.class);
         constraintMapping.constraintDefinition(Length.class).validatedBy(StringLengthValidator.class);
         return constraintMapping;
diff --git a/dao/src/main/java/org/thingsboard/server/dao/service/NoXssValidator.java b/dao/src/main/java/org/thingsboard/server/dao/service/NoXssValidator.java
index 3aabeedaca..fd8a19a859 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/service/NoXssValidator.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/service/NoXssValidator.java
@@ -23,8 +23,8 @@ import org.owasp.validator.html.PolicyException;
 import org.owasp.validator.html.ScanException;
 import org.thingsboard.server.common.data.validation.NoXss;
 
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
 import java.util.Optional;
 
 @Slf4j
diff --git a/dao/src/main/java/org/thingsboard/server/dao/service/StringLengthValidator.java b/dao/src/main/java/org/thingsboard/server/dao/service/StringLengthValidator.java
index f471d67794..252af5458a 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/service/StringLengthValidator.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/service/StringLengthValidator.java
@@ -20,8 +20,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.validation.Length;
 
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
 
 @Slf4j
 public class StringLengthValidator implements ConstraintValidator<Length, Object> {
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 77f81d639f..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
@@ -27,6 +27,7 @@ import org.thingsboard.server.dao.exception.IncorrectParameterException;
 
 import java.util.List;
 import java.util.UUID;
+import java.util.function.Function;
 import java.util.regex.Pattern;
 
 public class Validator {
@@ -37,21 +38,35 @@ 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);
         }
     }
 
+    /**
+     * 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 function for exception that applies entityId
+     */
+    public static void validateEntityId(EntityId entityId, Function<EntityId, String> errorMessageFunction) {
+        if (entityId == null || entityId.getId() == null) {
+            throw new IncorrectParameterException(errorMessageFunction.apply(entityId));
+        }
+    }
+
     /**
      * 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()) {
@@ -59,13 +74,25 @@ 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 applies value
+     */
+    public static void validateString(String val, Function<String, String> errorMessageFunction) {
+        if (val == null || val.isEmpty()) {
+            throw new IncorrectParameterException(errorMessageFunction.apply(val));
+        }
+    }
 
     /**
      * 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) {
@@ -77,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);
@@ -117,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/DeviceProfileDataValidator.java b/dao/src/main/java/org/thingsboard/server/dao/service/validator/DeviceProfileDataValidator.java
index 23f3a6bbdb..0a8d78fb86 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/service/validator/DeviceProfileDataValidator.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/service/validator/DeviceProfileDataValidator.java
@@ -23,7 +23,6 @@ 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.springframework.util.Base64Utils;
 import org.springframework.util.CollectionUtils;
 import org.thingsboard.server.common.data.DashboardInfo;
 import org.thingsboard.server.common.data.DeviceProfile;
@@ -64,6 +63,7 @@ import java.security.cert.CertificateEncodingException;
 import java.security.cert.PKIXParameters;
 import java.security.cert.TrustAnchor;
 import java.security.cert.X509Certificate;
+import java.util.Base64;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -327,10 +327,13 @@ public class DeviceProfileDataValidator extends AbstractHasOtaPackageValidator<D
             if (!isBootstrapServerUpdateEnable && serverConfig.isBootstrapServerIs()) {
                 throw new DeviceCredentialsValidationException("Bootstrap config must not include \"Bootstrap Server\". \"Include Bootstrap Server updates\" is " + isBootstrapServerUpdateEnable + ".");
             }
-            String server = serverConfig.isBootstrapServerIs() ? "Bootstrap Server" : "LwM2M Server" + " shortServerId: " + serverConfig.getShortServerId() + ":";
-            if (serverConfig.getShortServerId() < 1 || serverConfig.getShortServerId() > 65534) {
-                throw new DeviceCredentialsValidationException(server + " ShortServerId must not be less than 1 and more than 65534!");
+            if (!serverConfig.isBootstrapServerIs() && (serverConfig.getShortServerId() < 1 || serverConfig.getShortServerId() > 65534)) {
+                throw new DeviceCredentialsValidationException("LwM2M Server ShortServerId must not be less than 1 and more than 65534!");
             }
+           if (serverConfig.isBootstrapServerIs() && !(serverConfig.getShortServerId() == null || serverConfig.getShortServerId() ==0)) {
+                throw new DeviceCredentialsValidationException("Bootstrap Server ShortServerId must be null or '0'!");
+            }
+            String server = serverConfig.isBootstrapServerIs() ? "Bootstrap Server" : "LwM2M Server";
             if (!shortServerIds.add(serverConfig.getShortServerId())) {
                 throw new DeviceCredentialsValidationException(server + " \"Short server Id\" value = " + serverConfig.getShortServerId() + ". This value must be a unique value for all servers!");
             }
@@ -408,6 +411,6 @@ public class DeviceProfileDataValidator extends AbstractHasOtaPackageValidator<D
     }
 
     private String getCertificateString(X509Certificate cert) throws CertificateEncodingException {
-        return EncryptionUtil.certTrimNewLines(Base64Utils.encodeToString(cert.getEncoded()));
+        return EncryptionUtil.certTrimNewLines(Base64.getEncoder().encodeToString(cert.getEncoded()));
     }
 }
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/service/validator/RuleChainDataValidator.java b/dao/src/main/java/org/thingsboard/server/dao/service/validator/RuleChainDataValidator.java
index 222aaa3eeb..9f1eda9528 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/service/validator/RuleChainDataValidator.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/service/validator/RuleChainDataValidator.java
@@ -16,7 +16,7 @@
 package org.thingsboard.server.dao.service.validator;
 
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
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..da0ca9c577 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
@@ -29,7 +29,7 @@ import org.thingsboard.server.dao.service.Validator;
 @Service
 @Slf4j
 public class AdminSettingsServiceImpl implements AdminSettingsService {
-    
+
     @Autowired
     private AdminSettingsDao adminSettingsDao;
 
@@ -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);
-        return  adminSettingsDao.findById(tenantId, adminSettingsId.getId());
+        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);
     }
 
@@ -59,15 +59,15 @@ public class AdminSettingsServiceImpl implements AdminSettingsService {
     public AdminSettings saveAdminSettings(TenantId tenantId, AdminSettings adminSettings) {
         log.trace("Executing saveAdminSettings [{}]", adminSettings);
         adminSettingsValidator.validate(adminSettings, data -> tenantId);
-        if (adminSettings.getKey().equals("mail")){
+        if (adminSettings.getKey().equals("mail")) {
             AdminSettings mailSettings = findAdminSettingsByKey(tenantId, "mail");
             if (mailSettings != null) {
                 JsonNode newJsonValue = adminSettings.getJsonValue();
                 JsonNode oldJsonValue = mailSettings.getJsonValue();
-                if (!newJsonValue.has("password") && oldJsonValue.has("password")){
-                     ((ObjectNode) newJsonValue).put("password", oldJsonValue.get("password").asText());
+                if (!newJsonValue.has("password") && oldJsonValue.has("password")) {
+                    ((ObjectNode) newJsonValue).put("password", oldJsonValue.get("password").asText());
                 }
-                if (!newJsonValue.has("refreshToken") && oldJsonValue.has("refreshToken")){
+                if (!newJsonValue.has("refreshToken") && oldJsonValue.has("refreshToken")) {
                     ((ObjectNode) newJsonValue).put("refreshToken", oldJsonValue.get("refreshToken").asText());
                 }
                 dropTokenIfProviderInfoChanged(newJsonValue, oldJsonValue);
@@ -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);
     }
 
@@ -92,12 +92,12 @@ public class AdminSettingsServiceImpl implements AdminSettingsService {
     }
 
     private void dropTokenIfProviderInfoChanged(JsonNode newJsonValue, JsonNode oldJsonValue) {
-        if (newJsonValue.has("enableOauth2") && newJsonValue.get("enableOauth2").asBoolean()){
+        if (newJsonValue.has("enableOauth2") && newJsonValue.get("enableOauth2").asBoolean()) {
             if (!newJsonValue.get("providerId").equals(oldJsonValue.get("providerId")) ||
                     !newJsonValue.get("clientId").equals(oldJsonValue.get("clientId")) ||
                     !newJsonValue.get("clientSecret").equals(oldJsonValue.get("clientSecret")) ||
                     !newJsonValue.get("redirectUri").equals(oldJsonValue.get("redirectUri")) ||
-                    (newJsonValue.has("providerTenantId") && !newJsonValue.get("providerTenantId").equals(oldJsonValue.get("providerTenantId")))){
+                    (newJsonValue.has("providerTenantId") && !newJsonValue.get("providerTenantId").equals(oldJsonValue.get("providerTenantId")))) {
                 ((ObjectNode) newJsonValue).put("tokenGenerated", false);
                 ((ObjectNode) newJsonValue).remove("refreshToken");
                 ((ObjectNode) newJsonValue).remove("refreshTokenExpires");
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java
index 35a161b94d..973cb4b5b2 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java
@@ -19,16 +19,17 @@ import com.datastax.oss.driver.api.core.uuid.Uuids;
 import com.google.common.collect.Lists;
 import com.google.common.util.concurrent.ListenableFuture;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.transaction.annotation.Transactional;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.dao.Dao;
 import org.thingsboard.server.dao.DaoUtil;
 import org.thingsboard.server.dao.model.BaseEntity;
+import org.thingsboard.server.dao.model.ModelConstants;
 import org.thingsboard.server.dao.util.SqlDao;
 
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
 import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
@@ -43,6 +44,9 @@ public abstract class JpaAbstractDao<E extends BaseEntity<D>, D>
         extends JpaAbstractDaoListeningExecutorService
         implements Dao<D> {
 
+    @Autowired
+    protected JdbcTemplate jdbcTemplate;
+
     protected abstract Class<E> getEntityClass();
 
     protected abstract JpaRepository<E, UUID> getRepository();
@@ -125,4 +129,23 @@ public abstract class JpaAbstractDao<E extends BaseEntity<D>, D>
         return DaoUtil.convertDataList(entities);
     }
 
+    @Override
+    public List<UUID> findIdsByTenantIdAndIdOffset(TenantId tenantId, UUID idOffset, int limit) {
+        String query = "SELECT id FROM " + getEntityType().getTableName() + " WHERE " + getTenantIdColumn() + " = ? ";
+        Object[] params;
+        if (idOffset == null) {
+            params = new Object[]{tenantId.getId(), limit};
+        } else {
+            query += " AND id > ? ";
+            params = new Object[]{tenantId.getId(), idOffset, limit};
+        }
+        query += " ORDER BY id LIMIT ?";
+
+        return jdbcTemplate.queryForList(query, UUID.class, params);
+    }
+
+    protected String getTenantIdColumn() {
+        return ModelConstants.TENANT_ID_COLUMN;
+    }
+
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/JpaPartitionedAbstractDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/JpaPartitionedAbstractDao.java
index a933837f5d..45438a9b51 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/JpaPartitionedAbstractDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/JpaPartitionedAbstractDao.java
@@ -18,8 +18,8 @@ package org.thingsboard.server.dao.sql;
 import org.thingsboard.server.dao.model.BaseEntity;
 import org.thingsboard.server.dao.util.SqlDao;
 
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
 
 @SqlDao
 public abstract class JpaPartitionedAbstractDao<E extends BaseEntity<D>, D> extends JpaAbstractDao<E, D> {
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/ScheduledLogExecutorComponent.java b/dao/src/main/java/org/thingsboard/server/dao/sql/ScheduledLogExecutorComponent.java
index c5952c7f94..5226b5def7 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/ScheduledLogExecutorComponent.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/ScheduledLogExecutorComponent.java
@@ -18,8 +18,8 @@ package org.thingsboard.server.dao.sql;
 import org.springframework.stereotype.Component;
 import org.thingsboard.common.util.ThingsBoardThreadFactory;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
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 655162ef6d..8353334017 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
@@ -17,13 +17,14 @@ package org.thingsboard.server.dao.sql.alarm;
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Slice;
 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.common.data.alarm.AlarmSeverity;
-import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.util.TbPair;
 import org.thingsboard.server.dao.model.sql.AlarmEntity;
 import org.thingsboard.server.dao.model.sql.AlarmInfoEntity;
 
@@ -55,9 +56,9 @@ public interface AlarmRepository extends JpaRepository<AlarmEntity, UUID> {
             "AND ea.entityType = :affectedEntityType " +
             "AND (:startTime IS NULL OR (a.createdTime >= :startTime AND ea.createdTime >= :startTime)) " +
             "AND (:endTime IS NULL OR (a.createdTime <= :endTime AND ea.createdTime <= :endTime)) " +
-            "AND ((:clearFilterEnabled) IS FALSE OR a.cleared = :clearFilter) " +
-            "AND ((:ackFilterEnabled) IS FALSE OR a.acknowledged = :ackFilter) " +
-            "AND (:assigneeId IS NULL OR a.assigneeId = uuid(:assigneeId)) " +
+            "AND ((:clearFilterEnabled) = FALSE OR a.cleared = :clearFilter) " +
+            "AND ((:ackFilterEnabled) = FALSE OR a.acknowledged = :ackFilter) " +
+            "AND (:assigneeId IS NULL OR a.assigneeId = :assigneeId) " +
             "AND (:searchText IS NULL OR (ilike(a.type, CONCAT('%', :searchText, '%')) = true  " +
             "  OR ilike(a.severity, CONCAT('%', :searchText, '%')) = true " +
             "  OR ilike(a.status, CONCAT('%', :searchText, '%')) = true)) "
@@ -72,9 +73,9 @@ public interface AlarmRepository extends JpaRepository<AlarmEntity, UUID> {
                     "AND ea.entityType = :affectedEntityType " +
                     "AND (:startTime IS NULL OR (a.createdTime >= :startTime AND ea.createdTime >= :startTime)) " +
                     "AND (:endTime IS NULL OR (a.createdTime <= :endTime AND ea.createdTime <= :endTime)) " +
-                    "AND ((:clearFilterEnabled) IS FALSE OR a.cleared = :clearFilter) " +
-                    "AND ((:ackFilterEnabled) IS FALSE OR a.acknowledged = :ackFilter) " +
-                    "AND (:assigneeId IS NULL OR a.assigneeId = uuid(:assigneeId)) " +
+                    "AND ((:clearFilterEnabled) = FALSE OR a.cleared = :clearFilter) " +
+                    "AND ((:ackFilterEnabled) = FALSE OR a.acknowledged = :ackFilter) " +
+                    "AND (:assigneeId IS NULL OR a.assigneeId = :assigneeId) " +
                     "AND (:searchText IS NULL OR (ilike(a.type, CONCAT('%', :searchText, '%')) = true " +
                     "  OR ilike(a.severity, CONCAT('%', :searchText, '%')) = true  " +
                     "  OR ilike(a.status, CONCAT('%', :searchText, '%')) = true))")
@@ -87,7 +88,7 @@ public interface AlarmRepository extends JpaRepository<AlarmEntity, UUID> {
                                      @Param("clearFilter") boolean clearFilter,
                                      @Param("ackFilterEnabled") boolean ackFilterEnabled,
                                      @Param("ackFilter") boolean ackFilter,
-                                     @Param("assigneeId") String assigneeId,
+                                     @Param("assigneeId") UUID assigneeId,
                                      @Param("searchText") String searchText,
                                      Pageable pageable);
 
@@ -100,11 +101,13 @@ public interface AlarmRepository extends JpaRepository<AlarmEntity, UUID> {
             "AND ea.entityType = :affectedEntityType " +
             "AND (:startTime IS NULL OR (a.createdTime >= :startTime AND ea.createdTime >= :startTime)) " +
             "AND (:endTime IS NULL OR (a.createdTime <= :endTime AND ea.createdTime <= :endTime)) " +
-            "AND ((:alarmTypes) IS NULL OR a.type IN (:alarmTypes)) " +
-            "AND ((:alarmSeverities) IS NULL OR a.severity IN (:alarmSeverities)) " +
-            "AND ((:clearFilterEnabled) IS FALSE OR a.cleared = :clearFilter) " +
-            "AND ((:ackFilterEnabled) IS FALSE OR a.acknowledged = :ackFilter) " +
-            "AND (:assigneeId IS NULL OR a.assigneeId = uuid(:assigneeId)) " +
+            "AND ((:#{#alarmTypes == null} = true) OR a.type IN (:alarmTypes)) " + //HHH-15968
+            "AND ((:#{#alarmSeverities == null} = true) OR a.severity IN (:alarmSeverities)) " + //HHH-15968
+//            "AND ((:alarmTypes) IS NULL OR a.type IN (:alarmTypes)) " +
+//            "AND ((:alarmSeverities) IS NULL OR a.severity IN (:alarmSeverities)) " +
+            "AND ((:clearFilterEnabled) = FALSE OR a.cleared = :clearFilter) " +
+            "AND ((:ackFilterEnabled) = FALSE OR a.acknowledged = :ackFilter) " +
+            "AND (:assigneeId IS NULL OR a.assigneeId = :assigneeId) " +
             "AND (:searchText IS NULL OR (ilike(a.type, CONCAT('%', :searchText, '%')) = true  " +
             "  OR ilike(a.severity, CONCAT('%', :searchText, '%')) = true " +
             "  OR ilike(a.status, CONCAT('%', :searchText, '%')) = true)) "
@@ -119,11 +122,13 @@ public interface AlarmRepository extends JpaRepository<AlarmEntity, UUID> {
                     "AND ea.entityType = :affectedEntityType " +
                     "AND (:startTime IS NULL OR (a.createdTime >= :startTime AND ea.createdTime >= :startTime)) " +
                     "AND (:endTime IS NULL OR (a.createdTime <= :endTime AND ea.createdTime <= :endTime)) " +
-                    "AND ((:alarmTypes) IS NULL OR a.type IN (:alarmTypes)) " +
-                    "AND ((:alarmSeverities) IS NULL OR a.severity IN (:alarmSeverities)) " +
-                    "AND ((:clearFilterEnabled) IS FALSE OR a.cleared = :clearFilter) " +
-                    "AND ((:ackFilterEnabled) IS FALSE OR a.acknowledged = :ackFilter) " +
-                    "AND (:assigneeId IS NULL OR a.assigneeId = uuid(:assigneeId)) " +
+                    "AND ((:#{#alarmTypes == null} = true) OR a.type IN (:alarmTypes)) " + //HHH-15968
+                    "AND ((:#{#alarmSeverities == null} = true) OR a.severity IN (:alarmSeverities)) " + //HHH-15968
+//                    "AND ((:alarmTypes) IS NULL OR a.type IN (:alarmTypes)) " +
+//                    "AND ((:alarmSeverities) IS NULL OR a.severity IN (:alarmSeverities)) " +
+                    "AND ((:clearFilterEnabled) = FALSE OR a.cleared = :clearFilter) " +
+                    "AND ((:ackFilterEnabled) = FALSE OR a.acknowledged = :ackFilter) " +
+                    "AND (:assigneeId IS NULL OR a.assigneeId = :assigneeId) " +
                     "AND (:searchText IS NULL OR (ilike(a.type, CONCAT('%', :searchText, '%')) = true " +
                     "  OR ilike(a.severity, CONCAT('%', :searchText, '%')) = true  " +
                     "  OR ilike(a.status, CONCAT('%', :searchText, '%')) = true))")
@@ -138,7 +143,7 @@ public interface AlarmRepository extends JpaRepository<AlarmEntity, UUID> {
                                        @Param("clearFilter") boolean clearFilter,
                                        @Param("ackFilterEnabled") boolean ackFilterEnabled,
                                        @Param("ackFilter") boolean ackFilter,
-                                       @Param("assigneeId") String assigneeId,
+                                       @Param("assigneeId") UUID assigneeId,
                                        @Param("searchText") String searchText,
                                        Pageable pageable);
 
@@ -147,9 +152,9 @@ public interface AlarmRepository extends JpaRepository<AlarmEntity, UUID> {
             "WHERE a.tenantId = :tenantId " +
             "AND (:startTime IS NULL OR a.createdTime >= :startTime) " +
             "AND (:endTime IS NULL OR a.createdTime <= :endTime) " +
-            "AND ((:clearFilterEnabled) IS FALSE OR a.cleared = :clearFilter) " +
-            "AND ((:ackFilterEnabled) IS FALSE OR a.acknowledged = :ackFilter) " +
-            "AND (:assigneeId IS NULL OR a.assigneeId = uuid(:assigneeId)) " +
+            "AND ((:clearFilterEnabled) = FALSE OR a.cleared = :clearFilter) " +
+            "AND ((:ackFilterEnabled) = FALSE OR a.acknowledged = :ackFilter) " +
+            "AND (:assigneeId IS NULL OR a.assigneeId = :assigneeId) " +
             "AND (:searchText IS NULL OR (ilike(a.type, CONCAT('%', :searchText, '%')) = true  " +
             "  OR ilike(a.severity, CONCAT('%', :searchText, '%')) = true " +
             "  OR ilike(a.status, CONCAT('%', :searchText, '%')) = true)) ",
@@ -159,9 +164,9 @@ public interface AlarmRepository extends JpaRepository<AlarmEntity, UUID> {
                     "WHERE a.tenantId = :tenantId " +
                     "AND (:startTime IS NULL OR a.createdTime >= :startTime) " +
                     "AND (:endTime IS NULL OR a.createdTime <= :endTime) " +
-                    "AND ((:clearFilterEnabled) IS FALSE OR a.cleared = :clearFilter) " +
-                    "AND ((:ackFilterEnabled) IS FALSE OR a.acknowledged = :ackFilter) " +
-                    "AND (:assigneeId IS NULL OR a.assigneeId = uuid(:assigneeId)) " +
+                    "AND ((:clearFilterEnabled) = FALSE OR a.cleared = :clearFilter) " +
+                    "AND ((:ackFilterEnabled) = FALSE OR a.acknowledged = :ackFilter) " +
+                    "AND (:assigneeId IS NULL OR a.assigneeId = :assigneeId) " +
                     "AND (:searchText IS NULL OR (ilike(a.type, CONCAT('%', :searchText, '%')) = true " +
                     "  OR ilike(a.severity, CONCAT('%', :searchText, '%')) = true  " +
                     "  OR ilike(a.status, CONCAT('%', :searchText, '%')) = true))")
@@ -172,7 +177,7 @@ public interface AlarmRepository extends JpaRepository<AlarmEntity, UUID> {
                                         @Param("clearFilter") boolean clearFilter,
                                         @Param("ackFilterEnabled") boolean ackFilterEnabled,
                                         @Param("ackFilter") boolean ackFilter,
-                                        @Param("assigneeId") String assigneeId,
+                                        @Param("assigneeId") UUID assigneeId,
                                         @Param("searchText") String searchText,
                                         Pageable pageable);
 
@@ -181,11 +186,13 @@ public interface AlarmRepository extends JpaRepository<AlarmEntity, UUID> {
             "WHERE a.tenantId = :tenantId " +
             "AND (:startTime IS NULL OR a.createdTime >= :startTime) " +
             "AND (:endTime IS NULL OR a.createdTime <= :endTime) " +
-            "AND ((:alarmTypes) IS NULL OR a.type IN (:alarmTypes)) " +
-            "AND ((:alarmSeverities) IS NULL OR a.severity IN (:alarmSeverities)) " +
-            "AND ((:clearFilterEnabled) IS FALSE OR a.cleared = :clearFilter) " +
-            "AND ((:ackFilterEnabled) IS FALSE OR a.acknowledged = :ackFilter) " +
-            "AND (:assigneeId IS NULL OR a.assigneeId = uuid(:assigneeId)) " +
+            "AND ((:#{#alarmTypes == null} = true) OR a.type IN (:alarmTypes)) " + //HHH-15968
+            "AND ((:#{#alarmSeverities == null} = true) OR a.severity IN (:alarmSeverities)) " + //HHH-15968
+//            "AND ((:alarmTypes) IS NULL OR a.type IN (:alarmTypes)) " +
+//            "AND ((:alarmSeverities) IS NULL OR a.severity IN (:alarmSeverities)) " +
+            "AND ((:clearFilterEnabled) = FALSE OR a.cleared = :clearFilter) " +
+            "AND ((:ackFilterEnabled) = FALSE OR a.acknowledged = :ackFilter) " +
+            "AND (:assigneeId IS NULL OR a.assigneeId = :assigneeId) " +
             "AND (:searchText IS NULL OR (ilike(a.type, CONCAT('%', :searchText, '%')) = true  " +
             "  OR ilike(a.severity, CONCAT('%', :searchText, '%')) = true " +
             "  OR ilike(a.status, CONCAT('%', :searchText, '%')) = true)) ",
@@ -195,11 +202,13 @@ public interface AlarmRepository extends JpaRepository<AlarmEntity, UUID> {
                     "WHERE a.tenantId = :tenantId " +
                     "AND (:startTime IS NULL OR a.createdTime >= :startTime) " +
                     "AND (:endTime IS NULL OR a.createdTime <= :endTime) " +
-                    "AND ((:alarmTypes) IS NULL OR a.type IN (:alarmTypes)) " +
-                    "AND ((:alarmSeverities) IS NULL OR a.severity IN (:alarmSeverities)) " +
-                    "AND ((:clearFilterEnabled) IS FALSE OR a.cleared = :clearFilter) " +
-                    "AND ((:ackFilterEnabled) IS FALSE OR a.acknowledged = :ackFilter) " +
-                    "AND (:assigneeId IS NULL OR a.assigneeId = uuid(:assigneeId)) " +
+                    "AND ((:#{#alarmTypes == null} = true) OR a.type IN (:alarmTypes)) " + //HHH-15968
+                    "AND ((:#{#alarmSeverities == null} = true) OR a.severity IN (:alarmSeverities)) " + //HHH-15968
+//                    "AND ((:alarmTypes) IS NULL OR a.type IN (:alarmTypes)) " +
+//                    "AND ((:alarmSeverities) IS NULL OR a.severity IN (:alarmSeverities)) " +
+                    "AND ((:clearFilterEnabled) = FALSE OR a.cleared = :clearFilter) " +
+                    "AND ((:ackFilterEnabled) = FALSE OR a.acknowledged = :ackFilter) " +
+                    "AND (:assigneeId IS NULL OR a.assigneeId = :assigneeId) " +
                     "AND (:searchText IS NULL OR (ilike(a.type, CONCAT('%', :searchText, '%')) = true " +
                     "  OR ilike(a.severity, CONCAT('%', :searchText, '%')) = true  " +
                     "  OR ilike(a.status, CONCAT('%', :searchText, '%')) = true))")
@@ -212,7 +221,7 @@ public interface AlarmRepository extends JpaRepository<AlarmEntity, UUID> {
                                           @Param("clearFilter") boolean clearFilter,
                                           @Param("ackFilterEnabled") boolean ackFilterEnabled,
                                           @Param("ackFilter") boolean ackFilter,
-                                          @Param("assigneeId") String assigneeId,
+                                          @Param("assigneeId") UUID assigneeId,
                                           @Param("searchText") String searchText,
                                           Pageable pageable);
 
@@ -221,9 +230,9 @@ public interface AlarmRepository extends JpaRepository<AlarmEntity, UUID> {
             "WHERE a.tenantId = :tenantId AND a.customerId = :customerId " +
             "AND (:startTime IS NULL OR a.createdTime >= :startTime) " +
             "AND (:endTime IS NULL OR a.createdTime <= :endTime) " +
-            "AND ((:clearFilterEnabled) IS FALSE OR a.cleared = :clearFilter) " +
-            "AND ((:ackFilterEnabled) IS FALSE OR a.acknowledged = :ackFilter) " +
-            "AND (:assigneeId IS NULL OR a.assigneeId = uuid(:assigneeId)) " +
+            "AND ((:clearFilterEnabled) = FALSE OR a.cleared = :clearFilter) " +
+            "AND ((:ackFilterEnabled) = FALSE OR a.acknowledged = :ackFilter) " +
+            "AND (:assigneeId IS NULL OR a.assigneeId = :assigneeId) " +
             "AND (:searchText IS NULL OR (ilike(a.type, CONCAT('%', :searchText, '%')) = true  " +
             "  OR ilike(a.severity, CONCAT('%', :searchText, '%')) = true " +
             "  OR ilike(a.status, CONCAT('%', :searchText, '%')) = true)) "
@@ -234,9 +243,9 @@ public interface AlarmRepository extends JpaRepository<AlarmEntity, UUID> {
                     "WHERE a.tenantId = :tenantId AND a.customerId = :customerId " +
                     "AND (:startTime IS NULL OR a.createdTime >= :startTime) " +
                     "AND (:endTime IS NULL OR a.createdTime <= :endTime) " +
-                    "AND ((:clearFilterEnabled) IS FALSE OR a.cleared = :clearFilter) " +
-                    "AND ((:ackFilterEnabled) IS FALSE OR a.acknowledged = :ackFilter) " +
-                    "AND (:assigneeId IS NULL OR a.assigneeId = uuid(:assigneeId)) " +
+                    "AND ((:clearFilterEnabled) = FALSE OR a.cleared = :clearFilter) " +
+                    "AND ((:ackFilterEnabled) = FALSE OR a.acknowledged = :ackFilter) " +
+                    "AND (:assigneeId IS NULL OR a.assigneeId = :assigneeId) " +
                     "AND (:searchText IS NULL OR (ilike(a.type, CONCAT('%', :searchText, '%')) = true " +
                     "  OR ilike(a.severity, CONCAT('%', :searchText, '%')) = true  " +
                     "  OR ilike(a.status, CONCAT('%', :searchText, '%')) = true))")
@@ -248,7 +257,7 @@ public interface AlarmRepository extends JpaRepository<AlarmEntity, UUID> {
                                              @Param("clearFilter") boolean clearFilter,
                                              @Param("ackFilterEnabled") boolean ackFilterEnabled,
                                              @Param("ackFilter") boolean ackFilter,
-                                             @Param("assigneeId") String assigneeId,
+                                             @Param("assigneeId") UUID assigneeId,
                                              @Param("searchText") String searchText,
                                              Pageable pageable);
 
@@ -257,11 +266,13 @@ public interface AlarmRepository extends JpaRepository<AlarmEntity, UUID> {
             "WHERE a.tenantId = :tenantId AND a.customerId = :customerId " +
             "AND (:startTime IS NULL OR a.createdTime >= :startTime) " +
             "AND (:endTime IS NULL OR a.createdTime <= :endTime) " +
-            "AND ((:alarmTypes) IS NULL OR a.type IN (:alarmTypes)) " +
-            "AND ((:alarmSeverities) IS NULL OR a.severity IN (:alarmSeverities)) " +
-            "AND ((:clearFilterEnabled) IS FALSE OR a.cleared = :clearFilter) " +
-            "AND ((:ackFilterEnabled) IS FALSE OR a.acknowledged = :ackFilter) " +
-            "AND (:assigneeId IS NULL OR a.assigneeId = uuid(:assigneeId)) " +
+            "AND ((:#{#alarmTypes == null} = true) OR a.type IN (:alarmTypes)) " + //HHH-15968
+            "AND ((:#{#alarmSeverities == null} = true) OR a.severity IN (:alarmSeverities)) " + //HHH-15968
+//            "AND ((:alarmTypes) IS NULL OR a.type IN (:alarmTypes)) " +
+//            "AND ((:alarmSeverities) IS NULL OR a.severity IN (:alarmSeverities)) " +
+            "AND ((:clearFilterEnabled) = FALSE OR a.cleared = :clearFilter) " +
+            "AND ((:ackFilterEnabled) = FALSE OR a.acknowledged = :ackFilter) " +
+            "AND (:assigneeId IS NULL OR a.assigneeId = :assigneeId) " +
             "AND (:searchText IS NULL OR (ilike(a.type, CONCAT('%', :searchText, '%')) = true  " +
             "  OR ilike(a.severity, CONCAT('%', :searchText, '%')) = true " +
             "  OR ilike(a.status, CONCAT('%', :searchText, '%')) = true)) "
@@ -272,11 +283,13 @@ public interface AlarmRepository extends JpaRepository<AlarmEntity, UUID> {
                     "WHERE a.tenantId = :tenantId AND a.customerId = :customerId " +
                     "AND (:startTime IS NULL OR a.createdTime >= :startTime) " +
                     "AND (:endTime IS NULL OR a.createdTime <= :endTime) " +
-                    "AND ((:alarmTypes) IS NULL OR a.type IN (:alarmTypes)) " +
-                    "AND ((:alarmSeverities) IS NULL OR a.severity IN (:alarmSeverities)) " +
-                    "AND ((:clearFilterEnabled) IS FALSE OR a.cleared = :clearFilter) " +
-                    "AND ((:ackFilterEnabled) IS FALSE OR a.acknowledged = :ackFilter) " +
-                    "AND (:assigneeId IS NULL OR a.assigneeId = uuid(:assigneeId)) " +
+                    "AND ((:#{#alarmTypes == null} = true) OR a.type IN (:alarmTypes)) " + //HHH-15968
+                    "AND ((:#{#alarmSeverities == null} = true) OR a.severity IN (:alarmSeverities)) " + //HHH-15968
+//                    "AND ((:alarmTypes) IS NULL OR a.type IN (:alarmTypes)) " +
+//                    "AND ((:alarmSeverities) IS NULL OR a.severity IN (:alarmSeverities)) " +
+                    "AND ((:clearFilterEnabled) = FALSE OR a.cleared = :clearFilter) " +
+                    "AND ((:ackFilterEnabled) = FALSE OR a.acknowledged = :ackFilter) " +
+                    "AND (:assigneeId IS NULL OR a.assigneeId = :assigneeId) " +
                     "AND (:searchText IS NULL OR (ilike(a.type, CONCAT('%', :searchText, '%')) = true " +
                     "  OR ilike(a.severity, CONCAT('%', :searchText, '%')) = true  " +
                     "  OR ilike(a.status, CONCAT('%', :searchText, '%')) = true))")
@@ -290,7 +303,7 @@ public interface AlarmRepository extends JpaRepository<AlarmEntity, UUID> {
                                                @Param("clearFilter") boolean clearFilter,
                                                @Param("ackFilterEnabled") boolean ackFilterEnabled,
                                                @Param("ackFilter") boolean ackFilter,
-                                               @Param("assigneeId") String assigneeId,
+                                               @Param("assigneeId") UUID assigneeId,
                                                @Param("searchText") String searchText,
                                                Pageable pageable);
 
@@ -300,9 +313,9 @@ public interface AlarmRepository extends JpaRepository<AlarmEntity, UUID> {
             "AND ea.tenantId = :tenantId " +
             "AND ea.entityId = :affectedEntityId " +
             "AND ea.entityType = :affectedEntityType " +
-            "AND ((:clearFilterEnabled) IS FALSE OR a.cleared = :clearFilter) " +
-            "AND ((:ackFilterEnabled) IS FALSE OR a.acknowledged = :ackFilter) " +
-            "AND (:assigneeId IS NULL OR a.assigneeId = uuid(:assigneeId))")
+            "AND ((:clearFilterEnabled) = FALSE OR a.cleared = :clearFilter) " +
+            "AND ((:ackFilterEnabled) = FALSE OR a.acknowledged = :ackFilter) " +
+            "AND (:assigneeId IS NULL OR a.assigneeId = :assigneeId)")
     Set<AlarmSeverity> findAlarmSeverities(@Param("tenantId") UUID tenantId,
                                            @Param("affectedEntityId") UUID affectedEntityId,
                                            @Param("affectedEntityType") String affectedEntityType,
@@ -310,7 +323,7 @@ public interface AlarmRepository extends JpaRepository<AlarmEntity, UUID> {
                                            @Param("clearFilter") boolean clearFilter,
                                            @Param("ackFilterEnabled") boolean ackFilterEnabled,
                                            @Param("ackFilter") boolean ackFilter,
-                                           @Param("assigneeId") String assigneeId);
+                                           @Param("assigneeId") UUID assigneeId);
 
     @Query("SELECT a.id FROM AlarmEntity a WHERE a.tenantId = :tenantId AND a.createdTime < :time AND a.endTs < :time")
     Page<UUID> findAlarmsIdsByEndTsBeforeAndTenantId(@Param("time") Long time, @Param("tenantId") UUID tenantId, Pageable pageable);
@@ -321,6 +334,22 @@ 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);
 
+    // using Slice so that count query is not executed
+    @Query("SELECT new org.thingsboard.server.common.data.util.TbPair(a.id, a.createdTime) " +
+            "FROM AlarmEntity a WHERE a.originatorId = :originatorId " +
+            "AND (a.createdTime > :createdTimeOffset OR " +
+            "(a.createdTime = :createdTimeOffset AND a.id > :idOffset))")
+    Slice<TbPair<UUID, Long>> findAlarmIdsByOriginatorId(@Param("originatorId") UUID originatorId,
+                                                         @Param("createdTimeOffset") long createdTimeOffset,
+                                                         @Param("idOffset") UUID idOffset,
+                                                         Pageable pageable);
+
+    // using Slice so that count query is not executed
+    @Query("SELECT new org.thingsboard.server.common.data.util.TbPair(a.id, a.createdTime) " +
+            "FROM AlarmEntity a WHERE a.originatorId = :originatorId")
+    Slice<TbPair<UUID, Long>> findAlarmIdsByOriginatorId(@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/EntityAlarmRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/EntityAlarmRepository.java
index 8373999758..ccf82e1b5b 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/EntityAlarmRepository.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/EntityAlarmRepository.java
@@ -33,11 +33,13 @@ public interface EntityAlarmRepository extends JpaRepository<EntityAlarmEntity,
     @Transactional
     @Modifying
     @Query("DELETE FROM EntityAlarmEntity e where e.entityId = :entityId")
-    void deleteByEntityId(@Param("entityId") UUID entityId);
+    int deleteByEntityId(@Param("entityId") UUID entityId);
 
     @Transactional
     @Modifying
     @Query("DELETE FROM EntityAlarmEntity a WHERE a.tenantId = :tenantId")
     void deleteByTenantId(@Param("tenantId") UUID tenantId);
 
+    List<EntityAlarmEntity> findAllByEntityId(UUID entityId);
+
 }
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..b0bf2cc666 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
@@ -21,6 +21,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Slice;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
@@ -48,9 +50,11 @@ import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
+import org.thingsboard.server.common.data.page.SortOrder;
 import org.thingsboard.server.common.data.query.AlarmCountQuery;
 import org.thingsboard.server.common.data.query.AlarmData;
 import org.thingsboard.server.common.data.query.AlarmDataQuery;
+import org.thingsboard.server.common.data.util.TbPair;
 import org.thingsboard.server.dao.DaoUtil;
 import org.thingsboard.server.dao.alarm.AlarmDao;
 import org.thingsboard.server.dao.model.ModelConstants;
@@ -69,6 +73,7 @@ import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
 
+import static org.thingsboard.server.common.data.page.SortOrder.Direction.ASC;
 import static org.thingsboard.server.dao.DaoUtil.convertTenantEntityTypesToDto;
 import static org.thingsboard.server.dao.DaoUtil.toPageable;
 
@@ -154,7 +159,7 @@ public class JpaAlarmDao extends JpaAbstractDao<AlarmEntity, Alarm> implements A
                             asf.hasClearFilter() && asf.getClearFilter(),
                             asf.hasAckFilter(),
                             asf.hasAckFilter() && asf.getAckFilter(),
-                            DaoUtil.getStringId(query.getAssigneeId()),
+                            DaoUtil.getId(query.getAssigneeId()),
                             query.getPageLink().getTextSearch(),
                             DaoUtil.toPageable(query.getPageLink())
                     )
@@ -169,7 +174,7 @@ public class JpaAlarmDao extends JpaAbstractDao<AlarmEntity, Alarm> implements A
                             asf.hasClearFilter() && asf.getClearFilter(),
                             asf.hasAckFilter(),
                             asf.hasAckFilter() && asf.getAckFilter(),
-                            DaoUtil.getStringId(query.getAssigneeId()),
+                            DaoUtil.getId(query.getAssigneeId()),
                             query.getPageLink().getTextSearch(),
                             DaoUtil.toPageable(query.getPageLink())
                     )
@@ -191,7 +196,7 @@ public class JpaAlarmDao extends JpaAbstractDao<AlarmEntity, Alarm> implements A
                         asf.hasClearFilter() && asf.getClearFilter(),
                         asf.hasAckFilter(),
                         asf.hasAckFilter() && asf.getAckFilter(),
-                        DaoUtil.getStringId(query.getAssigneeId()),
+                        DaoUtil.getId(query.getAssigneeId()),
                         query.getPageLink().getTextSearch(),
                         DaoUtil.toPageable(query.getPageLink())
                 )
@@ -219,7 +224,7 @@ public class JpaAlarmDao extends JpaAbstractDao<AlarmEntity, Alarm> implements A
                             asf.hasClearFilter() && asf.getClearFilter(),
                             asf.hasAckFilter(),
                             asf.hasAckFilter() && asf.getAckFilter(),
-                            DaoUtil.getStringId(query.getAssigneeId()),
+                            DaoUtil.getId(query.getAssigneeId()),
                             query.getPageLink().getTextSearch(),
                             DaoUtil.toPageable(query.getPageLink())
                     )
@@ -236,7 +241,7 @@ public class JpaAlarmDao extends JpaAbstractDao<AlarmEntity, Alarm> implements A
                             asf.hasClearFilter() && asf.getClearFilter(),
                             asf.hasAckFilter(),
                             asf.hasAckFilter() && asf.getAckFilter(),
-                            DaoUtil.getStringId(query.getAssigneeId()),
+                            DaoUtil.getId(query.getAssigneeId()),
                             query.getPageLink().getTextSearch(),
                             DaoUtil.toPageable(query.getPageLink())
                     )
@@ -262,7 +267,7 @@ public class JpaAlarmDao extends JpaAbstractDao<AlarmEntity, Alarm> implements A
                         asf.hasClearFilter() && asf.getClearFilter(),
                         asf.hasAckFilter(),
                         asf.hasAckFilter() && asf.getAckFilter(),
-                        DaoUtil.getStringId(query.getAssigneeId()),
+                        DaoUtil.getId(query.getAssigneeId()),
                         query.getPageLink().getTextSearch(),
                         DaoUtil.toPageable(query.getPageLink())
                 )
@@ -281,7 +286,7 @@ public class JpaAlarmDao extends JpaAbstractDao<AlarmEntity, Alarm> implements A
                 asf.hasClearFilter() && asf.getClearFilter(),
                 asf.hasAckFilter(),
                 asf.hasAckFilter() && asf.getAckFilter(),
-                assigneeId);
+                StringUtils.isNotBlank(assigneeId) ? UUID.fromString(assigneeId) : null);
     }
 
     @Override
@@ -296,6 +301,18 @@ public class JpaAlarmDao extends JpaAbstractDao<AlarmEntity, Alarm> implements A
                 .mapData(AlarmId::new);
     }
 
+    @Override
+    public PageData<TbPair<UUID, Long>> findAlarmIdsByOriginatorId(TenantId tenantId, EntityId originatorId, long createdTimeOffset, AlarmId idOffset, int limit) {
+        Slice<TbPair<UUID, Long>> result;
+        Pageable pageRequest = toPageable(new PageLink(limit), List.of(SortOrder.of("createdTime", ASC), SortOrder.of("id", ASC)));
+        if (idOffset == null) {
+            result = alarmRepository.findAlarmIdsByOriginatorId(originatorId.getId(), pageRequest);
+        } else {
+            result = alarmRepository.findAlarmIdsByOriginatorId(originatorId.getId(), createdTimeOffset, idOffset.getId(), pageRequest);
+        }
+        return DaoUtil.pageToPageData(result);
+    }
+
     @Override
     public void createEntityAlarmRecord(EntityAlarm entityAlarm) {
         log.debug("Saving entity {}", entityAlarm);
@@ -309,8 +326,13 @@ public class JpaAlarmDao extends JpaAbstractDao<AlarmEntity, Alarm> implements A
     }
 
     @Override
-    public void deleteEntityAlarmRecords(TenantId tenantId, EntityId entityId) {
-        entityAlarmRepository.deleteByEntityId(entityId.getId());
+    public List<EntityAlarm> findEntityAlarmRecordsByEntityId(TenantId tenantId, EntityId entityId) {
+        return DaoUtil.convertDataList(entityAlarmRepository.findAllByEntityId(entityId.getId()));
+    }
+
+    @Override
+    public int deleteEntityAlarmRecords(TenantId tenantId, EntityId entityId) {
+        return entityAlarmRepository.deleteByEntityId(entityId.getId());
     }
 
     @Override
@@ -383,7 +405,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/attributes/AttributeKvInsertRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/AttributeKvInsertRepository.java
index 2c6d4fee5b..856b2be381 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/AttributeKvInsertRepository.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/AttributeKvInsertRepository.java
@@ -43,12 +43,12 @@ public abstract class AttributeKvInsertRepository {
     private static final String EMPTY_STR = "";
 
     private static final String BATCH_UPDATE = "UPDATE attribute_kv SET str_v = ?, long_v = ?, dbl_v = ?, bool_v = ?, json_v =  cast(? AS json), last_update_ts = ? " +
-            "WHERE entity_type = ? and entity_id = ? and attribute_type =? and attribute_key = ?;";
+            "WHERE entity_id = ? and attribute_type =? and attribute_key = ?;";
 
     private static final String INSERT_OR_UPDATE =
-            "INSERT INTO attribute_kv (entity_type, entity_id, attribute_type, attribute_key, str_v, long_v, dbl_v, bool_v, json_v, last_update_ts) " +
-                    "VALUES(?, ?, ?, ?, ?, ?, ?, ?,  cast(? AS json), ?) " +
-                    "ON CONFLICT (entity_type, entity_id, attribute_type, attribute_key) " +
+            "INSERT INTO attribute_kv (entity_id, attribute_type, attribute_key, str_v, long_v, dbl_v, bool_v, json_v, last_update_ts) " +
+                    "VALUES(?, ?, ?, ?, ?, ?, ?,  cast(? AS json), ?) " +
+                    "ON CONFLICT (entity_id, attribute_type, attribute_key) " +
                     "DO UPDATE SET str_v = ?, long_v = ?, dbl_v = ?, bool_v = ?, json_v =  cast(? AS json), last_update_ts = ?;";
 
     @Autowired
@@ -91,10 +91,9 @@ public abstract class AttributeKvInsertRepository {
                         ps.setString(5, replaceNullChars(kvEntity.getJsonValue()));
 
                         ps.setLong(6, kvEntity.getLastUpdateTs());
-                        ps.setString(7, kvEntity.getId().getEntityType().name());
-                        ps.setObject(8, kvEntity.getId().getEntityId());
-                        ps.setString(9, kvEntity.getId().getAttributeType());
-                        ps.setString(10, kvEntity.getId().getAttributeKey());
+                        ps.setObject(7, kvEntity.getId().getEntityId());
+                        ps.setInt(8, kvEntity.getId().getAttributeType());
+                        ps.setInt(9, kvEntity.getId().getAttributeKey());
                     }
 
                     @Override
@@ -121,43 +120,42 @@ public abstract class AttributeKvInsertRepository {
                     @Override
                     public void setValues(PreparedStatement ps, int i) throws SQLException {
                         AttributeKvEntity kvEntity = insertEntities.get(i);
-                        ps.setString(1, kvEntity.getId().getEntityType().name());
-                        ps.setObject(2, kvEntity.getId().getEntityId());
-                        ps.setString(3, kvEntity.getId().getAttributeType());
-                        ps.setString(4, kvEntity.getId().getAttributeKey());
+                        ps.setObject(1, kvEntity.getId().getEntityId());
+                        ps.setInt(2, kvEntity.getId().getAttributeType());
+                        ps.setInt(3, kvEntity.getId().getAttributeKey());
 
-                        ps.setString(5, replaceNullChars(kvEntity.getStrValue()));
-                        ps.setString(11, replaceNullChars(kvEntity.getStrValue()));
+                        ps.setString(4, replaceNullChars(kvEntity.getStrValue()));
+                        ps.setString(10, replaceNullChars(kvEntity.getStrValue()));
 
                         if (kvEntity.getLongValue() != null) {
-                            ps.setLong(6, kvEntity.getLongValue());
-                            ps.setLong(12, kvEntity.getLongValue());
+                            ps.setLong(5, kvEntity.getLongValue());
+                            ps.setLong(11, kvEntity.getLongValue());
                         } else {
-                            ps.setNull(6, Types.BIGINT);
-                            ps.setNull(12, Types.BIGINT);
+                            ps.setNull(5, Types.BIGINT);
+                            ps.setNull(11, Types.BIGINT);
                         }
 
                         if (kvEntity.getDoubleValue() != null) {
-                            ps.setDouble(7, kvEntity.getDoubleValue());
-                            ps.setDouble(13, kvEntity.getDoubleValue());
+                            ps.setDouble(6, kvEntity.getDoubleValue());
+                            ps.setDouble(12, kvEntity.getDoubleValue());
                         } else {
-                            ps.setNull(7, Types.DOUBLE);
-                            ps.setNull(13, Types.DOUBLE);
+                            ps.setNull(6, Types.DOUBLE);
+                            ps.setNull(12, Types.DOUBLE);
                         }
 
                         if (kvEntity.getBooleanValue() != null) {
-                            ps.setBoolean(8, kvEntity.getBooleanValue());
-                            ps.setBoolean(14, kvEntity.getBooleanValue());
+                            ps.setBoolean(7, kvEntity.getBooleanValue());
+                            ps.setBoolean(13, kvEntity.getBooleanValue());
                         } else {
-                            ps.setNull(8, Types.BOOLEAN);
-                            ps.setNull(14, Types.BOOLEAN);
+                            ps.setNull(7, Types.BOOLEAN);
+                            ps.setNull(13, Types.BOOLEAN);
                         }
 
-                        ps.setString(9, replaceNullChars(kvEntity.getJsonValue()));
-                        ps.setString(15, replaceNullChars(kvEntity.getJsonValue()));
+                        ps.setString(8, replaceNullChars(kvEntity.getJsonValue()));
+                        ps.setString(14, replaceNullChars(kvEntity.getJsonValue()));
 
-                        ps.setLong(10, kvEntity.getLastUpdateTs());
-                        ps.setLong(16, kvEntity.getLastUpdateTs());
+                        ps.setLong(9, kvEntity.getLastUpdateTs());
+                        ps.setLong(15, kvEntity.getLastUpdateTs());
                     }
 
                     @Override
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/AttributeKvRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/AttributeKvRepository.java
index 622a3298b9..073dfd7d95 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/AttributeKvRepository.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/AttributeKvRepository.java
@@ -20,7 +20,6 @@ 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.common.data.EntityType;
 import org.thingsboard.server.dao.model.sql.AttributeKvCompositeKey;
 import org.thingsboard.server.dao.model.sql.AttributeKvEntity;
 
@@ -29,41 +28,36 @@ import java.util.UUID;
 
 public interface AttributeKvRepository extends JpaRepository<AttributeKvEntity, AttributeKvCompositeKey> {
 
-    @Query("SELECT a FROM AttributeKvEntity a WHERE a.id.entityType = :entityType " +
-            "AND a.id.entityId = :entityId " +
+    @Query("SELECT a FROM AttributeKvEntity a WHERE a.id.entityId = :entityId " +
             "AND a.id.attributeType = :attributeType")
-    List<AttributeKvEntity> findAllByEntityTypeAndEntityIdAndAttributeType(@Param("entityType") EntityType entityType,
-                                                                           @Param("entityId") UUID entityId,
-                                                                           @Param("attributeType") String attributeType);
+    List<AttributeKvEntity> findAllEntityIdAndAttributeType(@Param("entityId") UUID entityId,
+                                                            @Param("attributeType") int attributeType);
 
     @Transactional
     @Modifying
-    @Query("DELETE FROM AttributeKvEntity a WHERE a.id.entityType = :entityType " +
-            "AND a.id.entityId = :entityId " +
+    @Query("DELETE FROM AttributeKvEntity a WHERE a.id.entityId = :entityId " +
             "AND a.id.attributeType = :attributeType " +
             "AND a.id.attributeKey = :attributeKey")
-    void delete(@Param("entityType") EntityType entityType,
-                @Param("entityId") UUID entityId,
-                @Param("attributeType") String attributeType,
-                @Param("attributeKey") String attributeKey);
+    void delete(@Param("entityId") UUID entityId,
+                @Param("attributeType") int attributeType,
+                @Param("attributeKey") int attributeKey);
 
-    @Query(value = "SELECT DISTINCT attribute_key FROM attribute_kv WHERE entity_type = 'DEVICE' " +
-            "AND entity_id in (SELECT id FROM device WHERE tenant_id = :tenantId and device_profile_id = :deviceProfileId limit 100) ORDER BY attribute_key", nativeQuery = true)
-    List<String> findAllKeysByDeviceProfileId(@Param("tenantId") UUID tenantId,
+    @Query(value = "SELECT DISTINCT attribute_key FROM attribute_kv WHERE " +
+            "entity_id in (SELECT id FROM device WHERE tenant_id = :tenantId and device_profile_id = :deviceProfileId limit 100) ORDER BY attribute_key", nativeQuery = true)
+    List<Integer> findAllKeysByDeviceProfileId(@Param("tenantId") UUID tenantId,
                                               @Param("deviceProfileId") UUID deviceProfileId);
 
-    @Query(value = "SELECT DISTINCT attribute_key FROM attribute_kv WHERE entity_type = 'DEVICE' " +
-            "AND entity_id in (SELECT id FROM device WHERE tenant_id = :tenantId limit 100) ORDER BY attribute_key", nativeQuery = true)
-    List<String> findAllKeysByTenantId(@Param("tenantId") UUID tenantId);
+    @Query(value = "SELECT DISTINCT attribute_key FROM attribute_kv WHERE " +
+            "entity_id in (SELECT id FROM device WHERE tenant_id = :tenantId limit 100) ORDER BY attribute_key", nativeQuery = true)
+    List<Integer> findAllKeysByTenantId(@Param("tenantId") UUID tenantId);
 
-    @Query(value = "SELECT DISTINCT attribute_key FROM attribute_kv WHERE entity_type = :entityType " +
-            "AND entity_id in :entityIds ORDER BY attribute_key", nativeQuery = true)
-    List<String> findAllKeysByEntityIds(@Param("entityType") String entityType, @Param("entityIds") List<UUID> entityIds);
+    @Query(value = "SELECT DISTINCT attribute_key FROM attribute_kv WHERE " +
+            "entity_id in :entityIds ORDER BY attribute_key", nativeQuery = true)
+    List<Integer> findAllKeysByEntityIds(@Param("entityIds") List<UUID> entityIds);
 
-    @Query(value = "SELECT DISTINCT attribute_key FROM attribute_kv WHERE entity_type = :entityType " +
-            "AND entity_id in :entityIds AND attribute_type = :attributeType ORDER BY attribute_key", nativeQuery = true)
-    List<String> findAllKeysByEntityIdsAndAttributeType(@Param("entityType") String entityType,
-                                                        @Param("entityIds") List<UUID> entityIds,
+    @Query(value = "SELECT DISTINCT attribute_key FROM attribute_kv WHERE " +
+            "entity_id in :entityIds AND attribute_type = :attributeType ORDER BY attribute_key", nativeQuery = true)
+    List<Integer> findAllKeysByEntityIdsAndAttributeType(@Param("entityIds") List<UUID> entityIds,
                                                         @Param("attributeType") String attributeType);
 }
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/JpaAttributeDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/JpaAttributeDao.java
index cb51a7d8ad..3bf8e43c70 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/JpaAttributeDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/JpaAttributeDao.java
@@ -19,11 +19,15 @@ 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.apache.commons.lang3.tuple.Pair;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
-import org.thingsboard.server.common.data.EntityType;
+import org.springframework.transaction.annotation.Transactional;
+import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.TenantId;
@@ -31,6 +35,8 @@ import org.thingsboard.server.common.data.kv.AttributeKvEntry;
 import org.thingsboard.server.common.stats.StatsFactory;
 import org.thingsboard.server.dao.DaoUtil;
 import org.thingsboard.server.dao.attributes.AttributesDao;
+import org.thingsboard.server.dao.dictionary.KeyDictionaryDao;
+import org.thingsboard.server.dao.model.ModelConstants;
 import org.thingsboard.server.dao.model.sql.AttributeKvCompositeKey;
 import org.thingsboard.server.dao.model.sql.AttributeKvEntity;
 import org.thingsboard.server.dao.sql.JpaAbstractDaoListeningExecutorService;
@@ -39,8 +45,6 @@ import org.thingsboard.server.dao.sql.TbSqlBlockingQueueParams;
 import org.thingsboard.server.dao.sql.TbSqlBlockingQueueWrapper;
 import org.thingsboard.server.dao.util.SqlDao;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Comparator;
@@ -66,6 +70,9 @@ public class JpaAttributeDao extends JpaAbstractDaoListeningExecutorService impl
     @Autowired
     private StatsFactory statsFactory;
 
+    @Autowired
+    private KeyDictionaryDao keyDictionaryDao;
+
     @Value("${sql.attributes.batch_size:1000}")
     private int batchSize;
 
@@ -98,7 +105,6 @@ public class JpaAttributeDao extends JpaAbstractDaoListeningExecutorService impl
         queue = new TbSqlBlockingQueueWrapper<>(params, hashcodeFunction, batchThreads, statsFactory);
         queue.init(logExecutor, v -> attributeKvInsertRepository.saveOrUpdate(v),
                 Comparator.comparing((AttributeKvEntity attributeKvEntity) -> attributeKvEntity.getId().getEntityId())
-                        .thenComparing(attributeKvEntity -> attributeKvEntity.getId().getEntityType().name())
                         .thenComparing(attributeKvEntity -> attributeKvEntity.getId().getAttributeType())
                         .thenComparing(attributeKvEntity -> attributeKvEntity.getId().getAttributeKey())
         );
@@ -112,85 +118,106 @@ public class JpaAttributeDao extends JpaAbstractDaoListeningExecutorService impl
     }
 
     @Override
-    public Optional<AttributeKvEntry> find(TenantId tenantId, EntityId entityId, String attributeType, String attributeKey) {
+    public Optional<AttributeKvEntry> find(TenantId tenantId, EntityId entityId, AttributeScope attributeScope, String attributeKey) {
         AttributeKvCompositeKey compositeKey =
-                getAttributeKvCompositeKey(entityId, attributeType, attributeKey);
-        return Optional.ofNullable(DaoUtil.getData(attributeKvRepository.findById(compositeKey)));
+                getAttributeKvCompositeKey(entityId, attributeScope.getId(), keyDictionaryDao.getOrSaveKeyId(attributeKey));
+        Optional<AttributeKvEntity> attributeKvEntityOptional = attributeKvRepository.findById(compositeKey);
+        if (attributeKvEntityOptional.isPresent()) {
+            AttributeKvEntity attributeKvEntity = attributeKvEntityOptional.get();
+            attributeKvEntity.setStrKey(attributeKey);
+            return Optional.ofNullable(DaoUtil.getData(attributeKvEntity));
+        }
+        return Optional.ofNullable(DaoUtil.getData(attributeKvEntityOptional));
     }
 
     @Override
-    public List<AttributeKvEntry> find(TenantId tenantId, EntityId entityId, String attributeType, Collection<String> attributeKeys) {
+    public List<AttributeKvEntry> find(TenantId tenantId, EntityId entityId, AttributeScope attributeScope, Collection<String> attributeKeys) {
         List<AttributeKvCompositeKey> compositeKeys =
                 attributeKeys
                         .stream()
                         .map(attributeKey ->
-                                getAttributeKvCompositeKey(entityId, attributeType, attributeKey))
+                                getAttributeKvCompositeKey(entityId, attributeScope.getId(), keyDictionaryDao.getOrSaveKeyId(attributeKey)))
                         .collect(Collectors.toList());
-        return DaoUtil.convertDataList(Lists.newArrayList(attributeKvRepository.findAllById(compositeKeys)));
+        List<AttributeKvEntity> attributes = attributeKvRepository.findAllById(compositeKeys);
+        attributes.forEach(attributeKvEntity -> attributeKvEntity.setStrKey(keyDictionaryDao.getKey(attributeKvEntity.getId().getAttributeKey())));
+        return DaoUtil.convertDataList(Lists.newArrayList(attributes));
     }
 
     @Override
-    public List<AttributeKvEntry> findAll(TenantId tenantId, EntityId entityId, String attributeType) {
-        return DaoUtil.convertDataList(Lists.newArrayList(
-                        attributeKvRepository.findAllByEntityTypeAndEntityIdAndAttributeType(
-                                entityId.getEntityType(),
-                                entityId.getId(),
-                                attributeType)));
+    public List<AttributeKvEntry> findAll(TenantId tenantId, EntityId entityId, AttributeScope attributeScope) {
+        List<AttributeKvEntity> attributes = attributeKvRepository.findAllEntityIdAndAttributeType(
+                entityId.getId(),
+                attributeScope.getId());
+        attributes.forEach(attributeKvEntity -> attributeKvEntity.setStrKey(keyDictionaryDao.getKey(attributeKvEntity.getId().getAttributeKey())));
+        return DaoUtil.convertDataList(Lists.newArrayList(attributes));
     }
 
     @Override
     public List<String> findAllKeysByDeviceProfileId(TenantId tenantId, DeviceProfileId deviceProfileId) {
         if (deviceProfileId != null) {
-            return attributeKvRepository.findAllKeysByDeviceProfileId(tenantId.getId(), deviceProfileId.getId());
+            return attributeKvRepository.findAllKeysByDeviceProfileId(tenantId.getId(), deviceProfileId.getId())
+                    .stream().map(id -> keyDictionaryDao.getKey(id)).collect(Collectors.toList());
         } else {
-            return attributeKvRepository.findAllKeysByTenantId(tenantId.getId());
+            return attributeKvRepository.findAllKeysByTenantId(tenantId.getId())
+                    .stream().map(id -> keyDictionaryDao.getKey(id)).collect(Collectors.toList());
         }
     }
 
     @Override
-    public List<String> findAllKeysByEntityIds(TenantId tenantId, EntityType entityType, List<EntityId> entityIds) {
+    public List<String> findAllKeysByEntityIds(TenantId tenantId, List<EntityId> entityIds) {
         return attributeKvRepository
-                .findAllKeysByEntityIds(entityType.name(), entityIds.stream().map(EntityId::getId).collect(Collectors.toList()));
+                .findAllKeysByEntityIds(entityIds.stream().map(EntityId::getId).collect(Collectors.toList()))
+                .stream().map(id -> keyDictionaryDao.getKey(id)).collect(Collectors.toList());
     }
 
     @Override
-    public List<String> findAllKeysByEntityIdsAndAttributeType(TenantId tenantId, EntityType entityType, List<EntityId> entityIds, String attributeType) {
+    public List<String> findAllKeysByEntityIdsAndAttributeType(TenantId tenantId, List<EntityId> entityIds, String attributeType) {
         return attributeKvRepository
-                .findAllKeysByEntityIdsAndAttributeType(entityType.name(), entityIds.stream().map(EntityId::getId).collect(Collectors.toList()), attributeType);
+                .findAllKeysByEntityIdsAndAttributeType(entityIds.stream().map(EntityId::getId).collect(Collectors.toList()), attributeType)
+                .stream().map(id -> keyDictionaryDao.getKey(id)).collect(Collectors.toList());
     }
 
     @Override
-    public ListenableFuture<String> save(TenantId tenantId, EntityId entityId, String attributeType, AttributeKvEntry attribute) {
+    public ListenableFuture<String> save(TenantId tenantId, EntityId entityId, AttributeScope attributeScope, AttributeKvEntry attribute) {
         AttributeKvEntity entity = new AttributeKvEntity();
-        entity.setId(new AttributeKvCompositeKey(entityId.getEntityType(), entityId.getId(), attributeType, attribute.getKey()));
+        entity.setId(new AttributeKvCompositeKey(entityId.getId(), attributeScope.getId(), keyDictionaryDao.getOrSaveKeyId(attribute.getKey())));
         entity.setLastUpdateTs(attribute.getLastUpdateTs());
         entity.setStrValue(attribute.getStrValue().orElse(null));
         entity.setDoubleValue(attribute.getDoubleValue().orElse(null));
         entity.setLongValue(attribute.getLongValue().orElse(null));
         entity.setBooleanValue(attribute.getBooleanValue().orElse(null));
         entity.setJsonValue(attribute.getJsonValue().orElse(null));
-        return addToQueue(entity);
+        return addToQueue(entity, attribute.getKey());
     }
 
-    private ListenableFuture<String> addToQueue(AttributeKvEntity entity) {
-        return Futures.transform(queue.add(entity), v -> entity.getId().getAttributeKey(), MoreExecutors.directExecutor());
+    private ListenableFuture<String> addToQueue(AttributeKvEntity entity, String key) {
+        return Futures.transform(queue.add(entity), v -> key, MoreExecutors.directExecutor());
     }
 
     @Override
-    public List<ListenableFuture<String>> removeAll(TenantId tenantId, EntityId entityId, String attributeType, List<String> keys) {
+    public List<ListenableFuture<String>> removeAll(TenantId tenantId, EntityId entityId, AttributeScope attributeScope, List<String> keys) {
         List<ListenableFuture<String>> futuresList = new ArrayList<>(keys.size());
         for (String key : keys) {
             futuresList.add(service.submit(() -> {
-                attributeKvRepository.delete(entityId.getEntityType(), entityId.getId(), attributeType, key);
+                attributeKvRepository.delete(entityId.getId(), attributeScope.getId(), keyDictionaryDao.getOrSaveKeyId(key));
                 return key;
             }));
         }
         return futuresList;
     }
 
-    private AttributeKvCompositeKey getAttributeKvCompositeKey(EntityId entityId, String attributeType, String attributeKey) {
+    @Transactional
+    @Override
+    public List<Pair<AttributeScope, String>> removeAllByEntityId(TenantId tenantId, EntityId entityId) {
+        return jdbcTemplate.queryForList("DELETE FROM attribute_kv WHERE entity_id = ? " +
+                        "RETURNING attribute_type, attribute_key", entityId.getId()).stream()
+                .map(row -> Pair.of(AttributeScope.valueOf((Integer) row.get(ModelConstants.ATTRIBUTE_TYPE_COLUMN)),
+                        keyDictionaryDao.getKey((Integer) row.get(ModelConstants.ATTRIBUTE_KEY_COLUMN))))
+                .collect(Collectors.toList());
+    }
+
+    private AttributeKvCompositeKey getAttributeKvCompositeKey(EntityId entityId, Integer attributeType, Integer attributeKey) {
         return new AttributeKvCompositeKey(
-                entityId.getEntityType(),
                 entityId.getId(),
                 attributeType,
                 attributeKey);
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/audit/AuditLogRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/audit/AuditLogRepository.java
index c086df8a0c..cbe69318a0 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/audit/AuditLogRepository.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/audit/AuditLogRepository.java
@@ -33,7 +33,8 @@ public interface AuditLogRepository extends JpaRepository<AuditLogEntity, UUID>
             "a.tenantId = :tenantId " +
             "AND (:startTime IS NULL OR a.createdTime >= :startTime) " +
             "AND (:endTime IS NULL OR a.createdTime <= :endTime) " +
-            "AND ((:actionTypes) IS NULL OR a.actionType in (:actionTypes)) " +
+            "AND ((:#{#actionTypes == null} = true) OR a.actionType IN (:actionTypes)) " + //HHH-15968
+//            "AND ((:actionTypes) IS NULL OR a.actionType in (:actionTypes)) " +
             "AND (:textSearch IS NULL OR ilike(a.entityType, CONCAT('%', :textSearch, '%')) = true " +
             "OR ilike(a.entityName, CONCAT('%', :textSearch, '%')) = true " +
             "OR ilike(a.userName, CONCAT('%', :textSearch, '%')) = true " +
@@ -53,7 +54,8 @@ public interface AuditLogRepository extends JpaRepository<AuditLogEntity, UUID>
             "AND a.entityType = :entityType AND a.entityId = :entityId " +
             "AND (:startTime IS NULL OR a.createdTime >= :startTime) " +
             "AND (:endTime IS NULL OR a.createdTime <= :endTime) " +
-            "AND ((:actionTypes) IS NULL OR a.actionType in (:actionTypes)) " +
+            "AND ((:#{#actionTypes == null} = true) OR a.actionType IN (:actionTypes)) " + //HHH-15968
+//            "AND ((:actionTypes) IS NULL OR a.actionType in (:actionTypes)) " +
             "AND (:textSearch IS NULL OR ilike(a.entityName, CONCAT('%', :textSearch, '%')) = true " +
             "OR ilike(a.userName, CONCAT('%', :textSearch, '%')) = true " +
             "OR ilike(a.actionType, CONCAT('%', :textSearch, '%')) = true " +
@@ -73,7 +75,8 @@ public interface AuditLogRepository extends JpaRepository<AuditLogEntity, UUID>
             "AND a.customerId = :customerId " +
             "AND (:startTime IS NULL OR a.createdTime >= :startTime) " +
             "AND (:endTime IS NULL OR a.createdTime <= :endTime) " +
-            "AND ((:actionTypes) IS NULL OR a.actionType in (:actionTypes)) " +
+            "AND ((:#{#actionTypes == null} = true) OR a.actionType IN (:actionTypes)) " + //HHH-15968
+//            "AND ((:actionTypes) IS NULL OR a.actionType in (:actionTypes)) " +
             "AND (:textSearch IS NULL OR ilike(a.entityType, CONCAT('%', :textSearch, '%')) = true " +
             "OR ilike(a.entityName, CONCAT('%', :textSearch, '%')) = true " +
             "OR ilike(a.userName, CONCAT('%', :textSearch, '%')) = true " +
@@ -93,7 +96,8 @@ public interface AuditLogRepository extends JpaRepository<AuditLogEntity, UUID>
             "AND a.userId = :userId " +
             "AND (:startTime IS NULL OR a.createdTime >= :startTime) " +
             "AND (:endTime IS NULL OR a.createdTime <= :endTime) " +
-            "AND ((:actionTypes) IS NULL OR a.actionType in (:actionTypes)) " +
+            "AND ((:#{#actionTypes == null} = true) OR a.actionType IN (:actionTypes)) " + //HHH-15968
+//            "AND ((:actionTypes) IS NULL OR a.actionType in (:actionTypes)) " +
             "AND (:textSearch IS NULL OR ilike(a.entityType, CONCAT('%', :textSearch, '%')) = true " +
             "OR ilike(a.entityName, CONCAT('%', :textSearch, '%')) = true " +
             "OR ilike(a.actionType, CONCAT('%', :textSearch, '%')) = true " +
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/component/AbstractComponentDescriptorInsertRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/component/AbstractComponentDescriptorInsertRepository.java
index dc2759acd1..eca2c769b9 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/component/AbstractComponentDescriptorInsertRepository.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/component/AbstractComponentDescriptorInsertRepository.java
@@ -25,9 +25,9 @@ import org.springframework.transaction.TransactionStatus;
 import org.springframework.transaction.support.DefaultTransactionDefinition;
 import org.thingsboard.server.dao.model.sql.ComponentDescriptorEntity;
 
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.Query;
 
 @Slf4j
 public abstract class AbstractComponentDescriptorInsertRepository implements ComponentDescriptorInsertRepository {
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/device/DeviceRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/device/DeviceRepository.java
index 639382f50e..289da44626 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/device/DeviceRepository.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/device/DeviceRepository.java
@@ -126,20 +126,20 @@ public interface DeviceRepository extends JpaRepository<DeviceEntity, UUID>, Exp
 
     @Query("SELECT d FROM DeviceInfoEntity d " +
             "WHERE d.tenantId = :tenantId " +
-            "AND (:customerId IS NULL OR d.customerId = uuid(:customerId)) " +
-            "AND (:edgeId IS NULL OR d.id IN (SELECT re.toId FROM RelationEntity re WHERE re.toType = 'DEVICE' AND re.relationTypeGroup = 'EDGE' AND re.relationType = 'Contains' AND re.fromType = 'EDGE' AND re.fromId = uuid(:edgeId))) " +
+            "AND (:customerId IS NULL OR d.customerId = :customerId) " +
+            "AND (:edgeId IS NULL OR d.id IN (SELECT re.toId FROM RelationEntity re WHERE re.toType = 'DEVICE' AND re.relationTypeGroup = 'EDGE' AND re.relationType = 'Contains' AND re.fromType = 'EDGE' AND re.fromId = :edgeId)) " +
             "AND ((:deviceType) IS NULL OR d.type = :deviceType) " +
-            "AND (:deviceProfileId IS NULL OR d.deviceProfileId = uuid(:deviceProfileId)) " +
-            "AND ((:filterByActive) IS FALSE OR d.active = :deviceActive) " +
+            "AND (:deviceProfileId IS NULL OR d.deviceProfileId = :deviceProfileId) " +
+            "AND ((:filterByActive) = FALSE OR d.active = :deviceActive) " +
             "AND (:textSearch IS NULL OR ilike(d.name, CONCAT('%', :textSearch, '%')) = true " +
             "OR ilike(d.label, CONCAT('%', :textSearch, '%')) = true " +
             "OR ilike(d.type, CONCAT('%', :textSearch, '%')) = true " +
             "OR ilike(d.customerTitle, CONCAT('%', :textSearch, '%')) = true)")
     Page<DeviceInfoEntity> findDeviceInfosByFilter(@Param("tenantId") UUID tenantId,
-                                                   @Param("customerId") String customerId,
-                                                   @Param("edgeId") String edgeId,
+                                                   @Param("customerId") UUID customerId,
+                                                   @Param("edgeId") UUID edgeId,
                                                    @Param("deviceType") String type,
-                                                   @Param("deviceProfileId") String deviceProfileId,
+                                                   @Param("deviceProfileId") UUID deviceProfileId,
                                                    @Param("filterByActive") boolean filterByActive,
                                                    @Param("deviceActive") boolean active,
                                                    @Param("textSearch") String textSearch,
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceDao.java
index 9aa9a48fab..64f37f3838 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceDao.java
@@ -110,10 +110,10 @@ public class JpaDeviceDao extends JpaAbstractDao<DeviceEntity, Device> implement
         return DaoUtil.toPageData(
                 deviceRepository.findDeviceInfosByFilter(
                         filter.getTenantId().getId(),
-                        DaoUtil.getStringId(filter.getCustomerId()),
-                        DaoUtil.getStringId(filter.getEdgeId()),
+                        DaoUtil.getId(filter.getCustomerId()),
+                        DaoUtil.getId(filter.getEdgeId()),
                         filter.getType(),
-                        DaoUtil.getStringId(filter.getDeviceProfileId()),
+                        DaoUtil.getId(filter.getDeviceProfileId()),
                         filter.getActive() != null,
                         Boolean.TRUE.equals(filter.getActive()),
                         pageLink.getTextSearch(),
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/edge/JpaBaseEdgeEventDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/edge/JpaBaseEdgeEventDao.java
index 3e8e8ebf54..1c64973d94 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/edge/JpaBaseEdgeEventDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/edge/JpaBaseEdgeEventDao.java
@@ -17,6 +17,8 @@ package org.thingsboard.server.dao.sql.edge;
 
 import com.datastax.oss.driver.api.core.uuid.Uuids;
 import com.google.common.util.concurrent.ListenableFuture;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
@@ -42,8 +44,6 @@ import org.thingsboard.server.dao.sql.TbSqlBlockingQueueWrapper;
 import org.thingsboard.server.dao.sqlts.insert.sql.SqlPartitioningRepository;
 import org.thingsboard.server.dao.util.SqlDao;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/event/EventInsertRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/event/EventInsertRepository.java
index f830c495dd..5c6969fce9 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/event/EventInsertRepository.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/event/EventInsertRepository.java
@@ -33,7 +33,7 @@ import org.thingsboard.server.common.data.event.RuleNodeDebugEvent;
 import org.thingsboard.server.common.data.event.StatisticsEvent;
 import org.thingsboard.server.dao.util.SqlDao;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.sql.Types;
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/event/EventPartitionConfiguration.java b/dao/src/main/java/org/thingsboard/server/dao/sql/event/EventPartitionConfiguration.java
index 6350dcaad3..b053e2ebc2 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/event/EventPartitionConfiguration.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/event/EventPartitionConfiguration.java
@@ -20,7 +20,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.thingsboard.server.common.data.event.EventType;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import java.util.concurrent.TimeUnit;
 
 @Component
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 e19556be41..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
@@ -17,6 +17,8 @@ package org.thingsboard.server.dao.sql.event;
 
 import com.datastax.oss.driver.api.core.uuid.Uuids;
 import com.google.common.util.concurrent.ListenableFuture;
+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;
@@ -44,8 +46,6 @@ import org.thingsboard.server.dao.sql.TbSqlBlockingQueueWrapper;
 import org.thingsboard.server.dao.sqlts.insert.sql.SqlPartitioningRepository;
 import org.thingsboard.server.dao.util.SqlDao;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
@@ -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/JpaNotificationTemplateDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/notification/JpaNotificationTemplateDao.java
index 8ee6c3df3a..8950ab1e35 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/notification/JpaNotificationTemplateDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/notification/JpaNotificationTemplateDao.java
@@ -53,6 +53,11 @@ public class JpaNotificationTemplateDao extends JpaAbstractDao<NotificationTempl
                 notificationTypes, pageLink.getTextSearch(), DaoUtil.toPageable(pageLink)));
     }
 
+    @Override
+    public int countByTenantIdAndNotificationTypes(TenantId tenantId, List<NotificationType> notificationTypes) {
+        return notificationTemplateRepository.countByTenantIdAndNotificationTypes(tenantId.getId(), notificationTypes);
+    }
+
     @Override
     public void removeByTenantId(TenantId tenantId) {
         notificationTemplateRepository.deleteByTenantId(tenantId.getId());
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/notification/NotificationTemplateRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/notification/NotificationTemplateRepository.java
index b3e416a491..bb45c10d06 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/notification/NotificationTemplateRepository.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/notification/NotificationTemplateRepository.java
@@ -42,6 +42,11 @@ public interface NotificationTemplateRepository extends JpaRepository<Notificati
                                                                                      @Param("searchText") String searchText,
                                                                                      Pageable pageable);
 
+    @Query("SELECT count(t) FROM NotificationTemplateEntity t WHERE t.tenantId = :tenantId AND " +
+            "t.notificationType IN :notificationTypes")
+    int countByTenantIdAndNotificationTypes(@Param("tenantId") UUID tenantId,
+                                            @Param("notificationTypes") List<NotificationType> notificationTypes);
+
     @Transactional
     @Modifying
     @Query("DELETE FROM NotificationTemplateEntity t WHERE t.tenantId = :tenantId")
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..3203b72eca 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[]{
@@ -357,7 +359,7 @@ public class DefaultEntityQueryRepository implements EntityQueryRepository {
 
             List<EntityKeyMapping> filterMapping = mappings.stream().filter(EntityKeyMapping::hasFilter)
                     .collect(Collectors.toList());
-            List<EntityKeyMapping> entityFieldsFiltersMapping = filterMapping.stream().filter(mapping -> !mapping.isLatest())
+            List<EntityKeyMapping> entityFieldsFiltersMapping = filterMapping.stream().filter(mapping -> !mapping.isLatest() && mapping.getEntityKeyColumn() != null)
                     .collect(Collectors.toList());
 
             List<EntityKeyMapping> allLatestMappings = mappings.stream().filter(EntityKeyMapping::isLatest)
@@ -365,6 +367,7 @@ public class DefaultEntityQueryRepository implements EntityQueryRepository {
 
 
             String entityWhereClause = DefaultEntityQueryRepository.this.buildEntityWhere(ctx, query.getEntityFilter(), entityFieldsFiltersMapping);
+            String aliasWhereQuery = DefaultEntityQueryRepository.this.buildAliasWhereQuery(ctx, query.getEntityFilter(), selectionMapping, "");
             String latestJoinsCnt = EntityKeyMapping.buildLatestJoins(ctx, query.getEntityFilter(), entityType, allLatestMappings, true);
             String entityFieldsSelection = EntityKeyMapping.buildSelections(entityFieldsSelectionMapping, query.getEntityFilter().getType(), entityType);
             String entityTypeStr;
@@ -385,7 +388,7 @@ public class DefaultEntityQueryRepository implements EntityQueryRepository {
                     addEntityTableQuery(ctx, query.getEntityFilter()),
                     entityWhereClause,
                     latestJoinsCnt,
-                    "");
+                    aliasWhereQuery);
 
             String countQuery = String.format("select count(id) %s", fromClauseCount);
 
@@ -416,7 +419,7 @@ public class DefaultEntityQueryRepository implements EntityQueryRepository {
             QueryContext ctx = new QueryContext(new QuerySecurityContext(tenantId, customerId, entityType, ignorePermissionCheck));
             EntityDataPageLink pageLink = query.getPageLink();
 
-            List<EntityKeyMapping> mappings = EntityKeyMapping.prepareKeyMapping(query);
+            List<EntityKeyMapping> mappings = EntityKeyMapping.prepareKeyMapping(entityType, query);
 
             List<EntityKeyMapping> selectionMapping = mappings.stream().filter(EntityKeyMapping::isSelection)
                     .collect(Collectors.toList());
@@ -427,7 +430,7 @@ public class DefaultEntityQueryRepository implements EntityQueryRepository {
 
             List<EntityKeyMapping> filterMapping = mappings.stream().filter(EntityKeyMapping::hasFilter)
                     .collect(Collectors.toList());
-            List<EntityKeyMapping> entityFieldsFiltersMapping = filterMapping.stream().filter(mapping -> !mapping.isLatest())
+            List<EntityKeyMapping> entityFieldsFiltersMapping = filterMapping.stream().filter(mapping -> !mapping.isLatest() && mapping.getEntityKeyColumn() != null)
                     .collect(Collectors.toList());
 
             List<EntityKeyMapping> allLatestMappings = mappings.stream().filter(EntityKeyMapping::isLatest)
@@ -437,7 +440,7 @@ public class DefaultEntityQueryRepository implements EntityQueryRepository {
             String entityWhereClause = DefaultEntityQueryRepository.this.buildEntityWhere(ctx, query.getEntityFilter(), entityFieldsFiltersMapping);
             String latestJoinsCnt = EntityKeyMapping.buildLatestJoins(ctx, query.getEntityFilter(), entityType, allLatestMappings, true);
             String latestJoinsData = EntityKeyMapping.buildLatestJoins(ctx, query.getEntityFilter(), entityType, allLatestMappings, false);
-            String textSearchQuery = DefaultEntityQueryRepository.this.buildTextSearchQuery(ctx, selectionMapping, pageLink.getTextSearch());
+            String aliasWhereQuery = DefaultEntityQueryRepository.this.buildAliasWhereQuery(ctx, query.getEntityFilter(), selectionMapping, pageLink.getTextSearch());
             String entityFieldsSelection = EntityKeyMapping.buildSelections(entityFieldsSelectionMapping, query.getEntityFilter().getType(), entityType);
             String entityTypeStr;
             if (query.getEntityFilter().getType().equals(EntityFilterType.RELATIONS_QUERY)) {
@@ -463,7 +466,7 @@ public class DefaultEntityQueryRepository implements EntityQueryRepository {
                     addEntityTableQuery(ctx, query.getEntityFilter()),
                     entityWhereClause,
                     latestJoinsCnt,
-                    textSearchQuery);
+                    aliasWhereQuery);
 
             String fromClauseData = String.format("from (select %s from (select %s from %s e where %s) entities %s ) result %s",
                     topSelection,
@@ -471,7 +474,7 @@ public class DefaultEntityQueryRepository implements EntityQueryRepository {
                     addEntityTableQuery(ctx, query.getEntityFilter()),
                     entityWhereClause,
                     latestJoinsData,
-                    textSearchQuery);
+                    aliasWhereQuery);
 
             if (!StringUtils.isEmpty(pageLink.getTextSearch())) {
                 //Unfortunately, we need to sacrifice performance in case of full text search, because it is applied to all joined records.
@@ -798,6 +801,21 @@ public class DefaultEntityQueryRepository implements EntityQueryRepository {
         return from;
     }
 
+    private String buildAliasWhereQuery(QueryContext ctx, EntityFilter entityFilter, List<EntityKeyMapping> selectionMapping, String searchText) {
+        List<EntityKeyMapping> aliasFiltersMapping = selectionMapping.stream().filter(mapping -> !mapping.isLatest() && mapping.getEntityKeyColumn() == null)
+                .collect(Collectors.toList());
+        String entityFieldsQuery = EntityKeyMapping.buildQuery(ctx, aliasFiltersMapping, entityFilter.getType());
+        String searchTextQuery = buildTextSearchQuery(ctx, selectionMapping, searchText);
+        String result = "";
+        if (!entityFieldsQuery.isEmpty()) {
+            result += " where (" + entityFieldsQuery + ")";
+        }
+        if (!searchTextQuery.isEmpty()) {
+            result += (result.isEmpty() ? " where ": " and ") + "(" + searchTextQuery + ") ";
+        }
+        return result;
+    }
+
     private String buildTextSearchQuery(QueryContext ctx, List<EntityKeyMapping> selectionMapping, String searchText) {
         if (!StringUtils.isEmpty(searchText) && !selectionMapping.isEmpty()) {
             String sqlSearchText = "%" + searchText + "%";
@@ -809,7 +827,7 @@ public class DefaultEntityQueryRepository implements EntityQueryRepository {
             } else {
                 searchAliasesExpression = searchAliases.get(0);
             }
-            return String.format(" WHERE %s ILIKE :%s", searchAliasesExpression, "lowerSearchTextParam");
+            return String.format(" %s ILIKE :%s", searchAliasesExpression, "lowerSearchTextParam");
         } else {
             return "";
         }
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 b928e8790e..c125639def 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
@@ -16,7 +16,7 @@
 package org.thingsboard.server.dao.sql.query;
 
 import lombok.Data;
-import org.thingsboard.server.common.data.DataConstants;
+import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.query.BooleanFilterPredicate;
@@ -38,6 +38,7 @@ import org.thingsboard.server.dao.model.ModelConstants;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.EnumMap;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -48,6 +49,8 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import static org.thingsboard.server.common.data.StringUtils.splitByCommaWithoutQuotes;
+import static org.thingsboard.server.common.data.id.EntityId.NULL_UUID;
+import static org.thingsboard.server.dao.sql.query.DefaultEntityQueryRepository.resolveEntityType;
 
 @Data
 public class EntityKeyMapping {
@@ -55,6 +58,7 @@ public class EntityKeyMapping {
     private static final Map<EntityType, Set<String>> allowedEntityFieldMap = new HashMap<>();
     private static final Map<String, String> entityFieldColumnMap = new HashMap<>();
     private static final Map<EntityType, Map<String, String>> aliases = new HashMap<>();
+    private static final Map<EntityType, Map<String, String>> propertiesFunctions = new EnumMap<>(EntityType.class);
 
     public static final String CREATED_TIME = "createdTime";
     public static final String ENTITY_TYPE = "entityType";
@@ -75,6 +79,20 @@ 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 String OWNER_NAME = "ownerName";
+    public static final String OWNER_TYPE = "ownerType";
+    public static final String OWNER_NAME_SELECT_QUERY = "case when e.customer_id = '" + NULL_UUID + "' " +
+            "then (select title from tenant where id = e.tenant_id) " +
+            "else (select title from customer where id = e.customer_id) end";
+    public static final String OWNER_TYPE_SELECT_QUERY = "case when e.customer_id = '" + NULL_UUID + "' " +
+            "then 'TENANT' " +
+            "else 'CUSTOMER' end";
+    public static final Map<String, String> ownerPropertiesFunctions = Map.of(
+            OWNER_NAME, OWNER_NAME_SELECT_QUERY,
+            OWNER_TYPE, OWNER_TYPE_SELECT_QUERY
+    );
 
     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 +124,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 +145,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);
@@ -140,6 +161,12 @@ public class EntityKeyMapping {
         aliases.put(EntityType.ENTITY_VIEW, commonEntityAliases);
         aliases.put(EntityType.WIDGETS_BUNDLE, commonEntityAliases);
 
+        propertiesFunctions.put(EntityType.DEVICE, ownerPropertiesFunctions);
+        propertiesFunctions.put(EntityType.ASSET, ownerPropertiesFunctions);
+        propertiesFunctions.put(EntityType.ENTITY_VIEW, ownerPropertiesFunctions);
+        propertiesFunctions.put(EntityType.USER, ownerPropertiesFunctions);
+        propertiesFunctions.put(EntityType.DASHBOARD, ownerPropertiesFunctions);
+
         Map<String, String> userEntityAliases = new HashMap<>();
         userEntityAliases.put(TITLE, EMAIL);
         userEntityAliases.put(LABEL, EMAIL);
@@ -150,6 +177,7 @@ public class EntityKeyMapping {
     private int index;
     private String alias;
     private boolean isLatest;
+    private String entityKeyColumn;
     private boolean isSelection;
     private boolean isSearchable;
     private boolean isSortOrder;
@@ -179,12 +207,14 @@ public class EntityKeyMapping {
             if (entityKey.getKey().equals("entityType") && !filterType.equals(EntityFilterType.RELATIONS_QUERY)) {
                 return String.format("'%s' as %s", entityType.name(), getValueAlias());
             } else {
-                Set<String> existingEntityFields = getExistingEntityFields(filterType, entityType);
-                String alias = getEntityFieldAlias(filterType, entityType);
-                if (existingEntityFields.contains(alias)) {
-                    String column = entityFieldColumnMap.get(alias);
-                    return String.format("cast(e.%s as varchar) as %s", column, getValueAlias());
+                if (getEntityKeyColumn() != null) {
+                    return String.format("cast(e.%s as varchar) as %s", getEntityKeyColumn(), getValueAlias());
                 } else {
+                    Map<String, String> entityPropertiesFunctions = propertiesFunctions.get(entityType);
+                    String entityFieldAlias = getEntityFieldAlias(filterType, entityType);
+                    if (entityPropertiesFunctions != null && entityPropertiesFunctions.containsKey(entityFieldAlias)) {
+                        return String.format("%s as %s", entityPropertiesFunctions.get(entityFieldAlias), getValueAlias());
+                    }
                     return String.format("'' as %s", getValueAlias());
                 }
             }
@@ -234,7 +264,7 @@ public class EntityKeyMapping {
 
     public Stream<String> toQueries(QueryContext ctx, EntityFilterType filterType) {
         if (hasFilter()) {
-            String keyAlias = entityKey.getType().equals(EntityKeyType.ENTITY_FIELD) ? "e" : alias;
+            String keyAlias = (entityKey.getType().equals(EntityKeyType.ENTITY_FIELD) && getEntityKeyColumn() != null) ? "e" : alias;
             return keyFilters.stream().map(keyFilter ->
                     this.buildKeyQuery(ctx, keyAlias, keyFilter, filterType));
         } else {
@@ -258,28 +288,28 @@ public class EntityKeyMapping {
         }
         if (entityKey.getType().equals(EntityKeyType.TIME_SERIES)) {
             String join = (hasFilter() && hasFilterValues(ctx)) ? "inner join" : "left join";
-            return String.format("%s ts_kv_latest %s ON %s.entity_id=entities.id AND %s.key = (select key_id from ts_kv_dictionary where key = :%s_key_id) %s",
+            return String.format("%s ts_kv_latest %s ON %s.entity_id=entities.id AND %s.key = (select key_id from key_dictionary where key = :%s_key_id) %s",
                     join, alias, alias, alias, alias, filterQuery);
         } else {
             String query;
             if (!entityKey.getType().equals(EntityKeyType.ATTRIBUTE)) {
                 String join = (hasFilter() && hasFilterValues(ctx)) ? "inner join" : "left join";
-                query = String.format("%s attribute_kv %s ON %s.entity_id=entities.id AND %s.entity_type=%s AND %s.attribute_key=:%s_key_id ",
-                        join, alias, alias, alias, entityTypeStr, alias, alias);
-                String scope;
+                query = String.format("%s attribute_kv %s ON %s.entity_id=entities.id AND %s.attribute_key=(select key_id from key_dictionary where key = :%s_key_id) ",
+                        join, alias, alias, alias, alias);
+                int scope;
                 if (entityKey.getType().equals(EntityKeyType.CLIENT_ATTRIBUTE)) {
-                    scope = DataConstants.CLIENT_SCOPE;
+                    scope = AttributeScope.CLIENT_SCOPE.getId();
                 } else if (entityKey.getType().equals(EntityKeyType.SHARED_ATTRIBUTE)) {
-                    scope = DataConstants.SHARED_SCOPE;
+                    scope = AttributeScope.SHARED_SCOPE.getId();;
                 } else {
-                    scope = DataConstants.SERVER_SCOPE;
+                    scope = AttributeScope.SERVER_SCOPE.getId();;
                 }
-                query = String.format("%s AND %s.attribute_type='%s' %s", query, alias, scope, filterQuery);
+                query = String.format("%s AND %s.attribute_type=%s %s", query, alias, scope, filterQuery);
             } else {
                 String join = (hasFilter() && hasFilterValues(ctx)) ? "join LATERAL" : "left join LATERAL";
-                query = String.format("%s (select * from attribute_kv %s WHERE %s.entity_id=entities.id AND %s.entity_type=%s AND %s.attribute_key=:%s_key_id %s " +
+                query = String.format("%s (select * from attribute_kv %s WHERE %s.entity_id=entities.id  AND %s.attribute_key=(select key_id from key_dictionary where key = :%s_key_id) %s " +
                                 "ORDER BY %s.last_update_ts DESC limit 1) as %s ON true",
-                        join, alias, alias, alias, entityTypeStr, alias, alias, filterQuery, alias, alias);
+                        join, alias, alias, alias, alias, filterQuery, alias, alias);
             }
             return query;
         }
@@ -314,7 +344,9 @@ public class EntityKeyMapping {
                 .collect(Collectors.joining(" AND "));
     }
 
-    public static List<EntityKeyMapping> prepareKeyMapping(EntityDataQuery query) {
+    public static List<EntityKeyMapping> prepareKeyMapping(EntityType entityType, EntityDataQuery query) {
+        EntityFilterType entityFilterType = query.getEntityFilter().getType();
+
         List<EntityKey> entityFields = query.getEntityFields() != null ? query.getEntityFields() : Collections.emptyList();
         List<EntityKey> latestValues = query.getLatestValues() != null ? query.getLatestValues() : Collections.emptyList();
         Map<EntityKey, List<KeyFilter>> filters =
@@ -330,6 +362,7 @@ public class EntityKeyMapping {
                     mapping.setSelection(true);
                     mapping.setSearchable(!key.getKey().equals(ADDITIONAL_INFO));
                     mapping.setEntityKey(key);
+                    mapping.setEntityKeyColumn(entityType, entityFilterType);
                     return mapping;
                 }
         ).collect(Collectors.toList());
@@ -361,6 +394,7 @@ public class EntityKeyMapping {
                 sortOrderMapping.setEntityKey(sortOrderKey);
                 sortOrderMapping.setSortOrder(true);
                 sortOrderMapping.setIgnore(true);
+                sortOrderMapping.setEntityKeyColumn(entityType, entityFilterType);
                 if (sortOrderKey.getType().equals(EntityKeyType.ENTITY_FIELD)) {
                     entityFieldsMappings.add(sortOrderMapping);
                 } else {
@@ -388,8 +422,9 @@ public class EntityKeyMapping {
                 mapping.setAlias(String.format("alias%s", index));
                 mapping.setKeyFilters(filters.get(filterField));
                 mapping.setLatest(!filterField.getType().equals(EntityKeyType.ENTITY_FIELD));
-                mapping.setSelection(false);
                 mapping.setEntityKey(filterField);
+                mapping.setEntityKeyColumn(entityType, entityFilterType);
+                mapping.setSelection(mapping.getEntityKeyColumn() == null);
                 mappings.add(mapping);
                 index += 1;
             }
@@ -398,7 +433,18 @@ public class EntityKeyMapping {
         return mappings;
     }
 
+    private void setEntityKeyColumn(EntityType entityType, EntityFilterType entityFilterType) {
+        Set<String> existingEntityFields = getExistingEntityFields(entityFilterType, entityType);
+        String entityFieldAlias = getEntityFieldAlias(entityFilterType, entityType);
+        if (existingEntityFields.contains(entityFieldAlias)) {
+            entityKeyColumn = entityFieldColumnMap.get(entityFieldAlias);
+        }
+    }
+
     public static List<EntityKeyMapping> prepareEntityCountKeyMapping(EntityCountQuery query) {
+        EntityType entityType = resolveEntityType(query.getEntityFilter());
+        EntityFilterType entityFilterType = query.getEntityFilter().getType();
+
         Map<EntityKey, List<KeyFilter>> filters =
                 query.getKeyFilters() != null ?
                         query.getKeyFilters().stream().collect(Collectors.groupingBy(KeyFilter::getKey)) : Collections.emptyMap();
@@ -411,8 +457,9 @@ public class EntityKeyMapping {
                 mapping.setAlias(String.format("alias%s", index));
                 mapping.setKeyFilters(filters.get(filterField));
                 mapping.setLatest(!filterField.getType().equals(EntityKeyType.ENTITY_FIELD));
-                mapping.setSelection(false);
                 mapping.setEntityKey(filterField);
+                mapping.setEntityKeyColumn(entityType, entityFilterType);
+                mapping.setSelection(mapping.getEntityKeyColumn() == null);
                 mappings.add(mapping);
                 index += 1;
             }
@@ -489,30 +536,20 @@ public class EntityKeyMapping {
     private String buildSimplePredicateQuery(QueryContext ctx, String alias, EntityKey key,
                                              KeyFilterPredicate predicate, EntityFilterType filterType) {
         if (key.getType().equals(EntityKeyType.ENTITY_FIELD)) {
-            Set<String> existingEntityFields = getExistingEntityFields(filterType, ctx.getEntityType());
-            String entityFieldAlias = getEntityFieldAlias(filterType, ctx.getEntityType());
-            String column = null;
-            if (existingEntityFields.contains(entityFieldAlias)) {
-                column = entityFieldColumnMap.get(entityFieldAlias);
-            }
-            if (column != null) {
-                String field = alias + "." + column;
-                if (predicate.getType().equals(FilterPredicateType.NUMERIC)) {
-                    return this.buildNumericPredicateQuery(ctx, field, (NumericFilterPredicate) predicate);
-                } else if (predicate.getType().equals(FilterPredicateType.STRING)) {
-                    if (key.getKey().equals("entityType") && !filterType.equals(EntityFilterType.RELATIONS_QUERY)) {
-                        field = ctx.getEntityType().toString();
-                        return this.buildStringPredicateQuery(ctx, field, (StringFilterPredicate) predicate)
-                                .replace("lower(" + field, "lower('" + field + "'")
-                                .replace(field + " ", "'" + field + "' ");
-                    } else {
-                        return this.buildStringPredicateQuery(ctx, field, (StringFilterPredicate) predicate);
-                    }
+            String field = (getEntityKeyColumn() != null) ? alias + "." + getEntityKeyColumn() : alias;
+            if (predicate.getType().equals(FilterPredicateType.NUMERIC)) {
+                return this.buildNumericPredicateQuery(ctx, field, (NumericFilterPredicate) predicate);
+            } else if (predicate.getType().equals(FilterPredicateType.STRING)) {
+                if (key.getKey().equals("entityType") && !filterType.equals(EntityFilterType.RELATIONS_QUERY)) {
+                    field = ctx.getEntityType().toString();
+                    return this.buildStringPredicateQuery(ctx, field, (StringFilterPredicate) predicate)
+                            .replace("lower(" + field, "lower('" + field + "'")
+                            .replace(field + " ", "'" + field + "' ");
                 } else {
-                    return this.buildBooleanPredicateQuery(ctx, field, (BooleanFilterPredicate) predicate);
+                    return this.buildStringPredicateQuery(ctx, field, (StringFilterPredicate) predicate);
                 }
             } else {
-                return null;
+                return this.buildBooleanPredicateQuery(ctx, field, (BooleanFilterPredicate) predicate);
             }
         } else {
             if (predicate.getType().equals(FilterPredicateType.NUMERIC)) {
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/query/QueryContext.java b/dao/src/main/java/org/thingsboard/server/dao/sql/query/QueryContext.java
index a3dc660622..6869703bce 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/query/QueryContext.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/query/QueryContext.java
@@ -16,7 +16,7 @@
 package org.thingsboard.server.dao.sql.query;
 
 import lombok.extern.slf4j.Slf4j;
-import org.hibernate.type.PostgresUUIDType;
+import org.hibernate.type.descriptor.jdbc.UUIDJdbcType;
 import org.springframework.jdbc.core.namedparam.SqlParameterSource;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.id.CustomerId;
@@ -30,7 +30,7 @@ import java.util.UUID;
 
 @Slf4j
 public class QueryContext implements SqlParameterSource {
-    private static final PostgresUUIDType UUID_TYPE = new PostgresUUIDType();
+    private static final UUIDJdbcType UUID_TYPE = UUIDJdbcType.INSTANCE;
 
     private final QuerySecurityContext securityCtx;
     private final StringBuilder query;
@@ -91,7 +91,7 @@ public class QueryContext implements SqlParameterSource {
     }
 
     public void addUuidParameter(String name, UUID value) {
-        addParameter(name, value, UUID_TYPE.sqlType(), UUID_TYPE.getName());
+        addParameter(name, value, UUID_TYPE.getJdbcTypeCode(), UUID_TYPE.getFriendlyName());
     }
 
     public void addStringParameter(String name, String value) {
@@ -115,7 +115,7 @@ public class QueryContext implements SqlParameterSource {
     }
 
     public void addUuidListParameter(String name, List<UUID> value) {
-        addParameter(name, value, UUID_TYPE.sqlType(), UUID_TYPE.getName());
+        addParameter(name, value, UUID_TYPE.getJdbcTypeCode(), UUID_TYPE.getFriendlyName());
     }
 
     public String getQuery() {
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/queue/JpaQueueDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/queue/JpaQueueDao.java
index 9e0723d9fc..799d1ff521 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/queue/JpaQueueDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/queue/JpaQueueDao.java
@@ -21,6 +21,7 @@ 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.DataConstants;
+import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
@@ -86,4 +87,10 @@ public class JpaQueueDao extends JpaAbstractDao<QueueEntity, Queue> implements Q
         return DaoUtil.toPageData(queueRepository
                 .findByTenantId(tenantId.getId(), pageLink.getTextSearch(), DaoUtil.toPageable(pageLink)));
     }
-}
\ No newline at end of file
+
+    @Override
+    public EntityType getEntityType() {
+        return EntityType.QUEUE;
+    }
+
+}
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..1cfdbf0b38
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/queue/JpaQueueStatsDao.java
@@ -0,0 +1,72 @@
+/**
+ * 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.EntityType;
+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());
+    }
+
+    @Override
+    public EntityType getEntityType() {
+        return EntityType.QUEUE_STATS;
+    }
+
+}
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/relation/SqlRelationInsertRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/relation/SqlRelationInsertRepository.java
index a50617c8f1..7655ff5539 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/relation/SqlRelationInsertRepository.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/relation/SqlRelationInsertRepository.java
@@ -23,9 +23,9 @@ import org.springframework.transaction.annotation.Transactional;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.dao.model.sql.RelationEntity;
 
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.Query;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.util.List;
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/sql/tenant/JpaTenantProfileDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/JpaTenantProfileDao.java
index a757397911..372c5bc9b8 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/JpaTenantProfileDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/JpaTenantProfileDao.java
@@ -19,6 +19,7 @@ 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.EntityInfo;
+import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.TenantProfile;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.page.PageData;
@@ -31,7 +32,6 @@ import org.thingsboard.server.dao.util.SqlDao;
 
 import java.util.Arrays;
 import java.util.List;
-import java.util.Objects;
 import java.util.UUID;
 
 @Component
@@ -87,4 +87,9 @@ public class JpaTenantProfileDao extends JpaAbstractDao<TenantProfileEntity, Ten
         return DaoUtil.convertDataList(tenantProfileRepository.findByIdIn(Arrays.asList(ids)));
     }
 
+    @Override
+    public EntityType getEntityType() {
+        return EntityType.TENANT_PROFILE;
+    }
+
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserSettingsDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserSettingsDao.java
index 52a78c41fe..671304256e 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserSettingsDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserSettingsDao.java
@@ -19,6 +19,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.settings.UserSettings;
 import org.thingsboard.server.common.data.settings.UserSettingsCompositeKey;
 import org.thingsboard.server.common.data.settings.UserSettingsType;
@@ -40,6 +41,7 @@ public class JpaUserSettingsDao extends JpaAbstractDaoListeningExecutorService i
 
     @Override
     public UserSettings save(TenantId tenantId, UserSettings userSettings) {
+        log.trace("save [{}][{}]", tenantId, userSettings);
         return DaoUtil.getData(userSettingsRepository.save(new UserSettingsEntity(userSettings)));
     }
 
@@ -53,8 +55,14 @@ public class JpaUserSettingsDao extends JpaAbstractDaoListeningExecutorService i
         userSettingsRepository.deleteById(id);
     }
 
+    @Override
+    public void removeByUserId(TenantId tenantId, UserId userId) {
+        userSettingsRepository.deleteByUserId(userId.getId());
+    }
+
     @Override
     public List<UserSettings> findByTypeAndPath(TenantId tenantId, UserSettingsType type, String... path) {
+        log.trace("findByTypeAndPath [{}][{}][{}]", tenantId, type, path);
         return DaoUtil.convertDataList(userSettingsRepository.findByTypeAndPathExisting(type.name(), path));
     }
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/user/UserSettingsRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/user/UserSettingsRepository.java
index 7f50b5ad5b..436062ef4c 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/user/UserSettingsRepository.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/user/UserSettingsRepository.java
@@ -16,15 +16,23 @@
 package org.thingsboard.server.dao.sql.user;
 
 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.common.data.settings.UserSettingsCompositeKey;
 import org.thingsboard.server.dao.model.sql.UserSettingsEntity;
 
 import java.util.List;
+import java.util.UUID;
 
 public interface UserSettingsRepository extends JpaRepository<UserSettingsEntity, UserSettingsCompositeKey> {
 
+    @Transactional
+    @Modifying
+    @Query("DELETE FROM UserSettingsEntity s WHERE s.userId = :userId")
+    void deleteByUserId(@Param("userId") UUID userId);
+
     @Query(value = "SELECT * FROM user_settings WHERE type = :type AND (settings #> :path) IS NOT NULL", nativeQuery = true)
     List<UserSettingsEntity> findByTypeAndPathExisting(@Param("type") String type, @Param("path") String[] path);
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sqlts/AbstractChunkedAggregationTimeseriesDao.java b/dao/src/main/java/org/thingsboard/server/dao/sqlts/AbstractChunkedAggregationTimeseriesDao.java
index 6c22935b61..9a52f3a192 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sqlts/AbstractChunkedAggregationTimeseriesDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sqlts/AbstractChunkedAggregationTimeseriesDao.java
@@ -17,6 +17,8 @@ package org.thingsboard.server.dao.sqlts;
 
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageRequest;
@@ -31,6 +33,7 @@ import org.thingsboard.server.common.data.kv.ReadTsKvQueryResult;
 import org.thingsboard.server.common.data.kv.TsKvEntry;
 import org.thingsboard.server.common.stats.StatsFactory;
 import org.thingsboard.server.dao.DaoUtil;
+import org.thingsboard.server.dao.dictionary.KeyDictionaryDao;
 import org.thingsboard.server.dao.model.sql.AbstractTsKvEntity;
 import org.thingsboard.server.dao.model.sqlts.ts.TsKvEntity;
 import org.thingsboard.server.dao.sql.TbSqlBlockingQueueParams;
@@ -40,16 +43,6 @@ import org.thingsboard.server.dao.sqlts.ts.TsKvRepository;
 import org.thingsboard.server.dao.timeseries.TimeseriesDao;
 import org.thingsboard.server.dao.util.TimeUtils;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import java.time.Instant;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
-import java.time.temporal.ChronoUnit;
-import java.time.temporal.IsoFields;
-import java.time.temporal.TemporalUnit;
-import java.time.temporal.WeekFields;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
@@ -71,6 +64,9 @@ public abstract class AbstractChunkedAggregationTimeseriesDao extends AbstractSq
     @Autowired
     private StatsFactory statsFactory;
 
+    @Autowired
+    private KeyDictionaryDao keyDictionaryDao;
+
     @PostConstruct
     protected void init() {
         TbSqlBlockingQueueParams tsParams = TbSqlBlockingQueueParams.builder()
@@ -103,7 +99,7 @@ public abstract class AbstractChunkedAggregationTimeseriesDao extends AbstractSq
         return service.submit(() -> {
             tsKvRepository.delete(
                     entityId.getId(),
-                    getOrSaveKeyId(query.getKey()),
+                    keyDictionaryDao.getOrSaveKeyId(query.getKey()),
                     query.getStartTs(),
                     query.getEndTs());
             return null;
@@ -149,7 +145,7 @@ public abstract class AbstractChunkedAggregationTimeseriesDao extends AbstractSq
     }
 
     private ReadTsKvQueryResult findAllAsyncWithLimit(EntityId entityId, ReadTsKvQuery query) {
-        Integer keyId = getOrSaveKeyId(query.getKey());
+        Integer keyId = keyDictionaryDao.getOrSaveKeyId(query.getKey());
         List<TsKvEntity> tsKvEntities = tsKvRepository.findAllWithLimit(
                 entityId.getId(),
                 keyId,
@@ -177,7 +173,7 @@ public abstract class AbstractChunkedAggregationTimeseriesDao extends AbstractSq
     }
 
     protected TsKvEntity switchAggregation(EntityId entityId, String key, long startTs, long endTs, Aggregation aggregation) {
-        var keyId = getOrSaveKeyId(key);
+        var keyId = keyDictionaryDao.getOrSaveKeyId(key);
         switch (aggregation) {
             case AVG:
                 return tsKvRepository.findAvg(entityId.getId(), keyId, startTs, endTs);
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sqlts/AbstractSqlTimeseriesDao.java b/dao/src/main/java/org/thingsboard/server/dao/sqlts/AbstractSqlTimeseriesDao.java
index 6fbefe0a96..b9694fbff7 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sqlts/AbstractSqlTimeseriesDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sqlts/AbstractSqlTimeseriesDao.java
@@ -29,7 +29,7 @@ import org.thingsboard.server.common.data.kv.TsKvEntry;
 import org.thingsboard.server.dao.model.ModelConstants;
 import org.thingsboard.server.dao.sql.ScheduledLogExecutorComponent;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sqlts/BaseAbstractSqlTimeseriesDao.java b/dao/src/main/java/org/thingsboard/server/dao/sqlts/BaseAbstractSqlTimeseriesDao.java
index 39b8cbb121..91be4e0e2e 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sqlts/BaseAbstractSqlTimeseriesDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sqlts/BaseAbstractSqlTimeseriesDao.java
@@ -19,75 +19,21 @@ import com.google.common.base.Function;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import lombok.extern.slf4j.Slf4j;
-import org.hibernate.exception.ConstraintViolationException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.dao.DataIntegrityViolationException;
 import org.thingsboard.server.common.data.kv.ReadTsKvQuery;
 import org.thingsboard.server.common.data.kv.ReadTsKvQueryResult;
 import org.thingsboard.server.dao.DaoUtil;
 import org.thingsboard.server.dao.model.sql.AbstractTsKvEntity;
-import org.thingsboard.server.dao.model.sqlts.dictionary.TsKvDictionary;
-import org.thingsboard.server.dao.model.sqlts.dictionary.TsKvDictionaryCompositeKey;
 import org.thingsboard.server.dao.sql.JpaAbstractDaoListeningExecutorService;
-import org.thingsboard.server.dao.sqlts.dictionary.TsKvDictionaryRepository;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.locks.ReentrantLock;
 import java.util.stream.Collectors;
 
 @Slf4j
 public abstract class BaseAbstractSqlTimeseriesDao extends JpaAbstractDaoListeningExecutorService {
 
-    private final ConcurrentMap<String, Integer> tsKvDictionaryMap = new ConcurrentHashMap<>();
-    protected static final ReentrantLock tsCreationLock = new ReentrantLock();
-    @Autowired
-    protected TsKvDictionaryRepository dictionaryRepository;
-
-    protected Integer getOrSaveKeyId(String strKey) {
-        Integer keyId = tsKvDictionaryMap.get(strKey);
-        if (keyId == null) {
-            Optional<TsKvDictionary> tsKvDictionaryOptional;
-            tsKvDictionaryOptional = dictionaryRepository.findById(new TsKvDictionaryCompositeKey(strKey));
-            if (tsKvDictionaryOptional.isEmpty()) {
-                tsCreationLock.lock();
-                try {
-                    keyId = tsKvDictionaryMap.get(strKey);
-                    if (keyId != null) {
-                        return keyId;
-                    }
-                    tsKvDictionaryOptional = dictionaryRepository.findById(new TsKvDictionaryCompositeKey(strKey));
-                    if (tsKvDictionaryOptional.isEmpty()) {
-                        TsKvDictionary tsKvDictionary = new TsKvDictionary();
-                        tsKvDictionary.setKey(strKey);
-                        try {
-                            TsKvDictionary saved = dictionaryRepository.save(tsKvDictionary);
-                            tsKvDictionaryMap.put(saved.getKey(), saved.getKeyId());
-                            keyId = saved.getKeyId();
-                        } catch (DataIntegrityViolationException | ConstraintViolationException e) {
-                            tsKvDictionaryOptional = dictionaryRepository.findById(new TsKvDictionaryCompositeKey(strKey));
-                            TsKvDictionary dictionary = tsKvDictionaryOptional.orElseThrow(() -> new RuntimeException("Failed to get TsKvDictionary entity from DB!"));
-                            tsKvDictionaryMap.put(dictionary.getKey(), dictionary.getKeyId());
-                            keyId = dictionary.getKeyId();
-                        }
-                    } else {
-                        keyId = tsKvDictionaryOptional.get().getKeyId();
-                    }
-                } finally {
-                    tsCreationLock.unlock();
-                }
-            } else {
-                keyId = tsKvDictionaryOptional.get().getKeyId();
-                tsKvDictionaryMap.put(strKey, keyId);
-            }
-        }
-        return keyId;
-    }
-
     protected ListenableFuture<ReadTsKvQueryResult> getReadTsKvQueryResultFuture(ReadTsKvQuery query, ListenableFuture<List<Optional<? extends AbstractTsKvEntity>>> future) {
         return Futures.transform(future, new Function<>() {
             @Nullable
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 112daf0637..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;
@@ -37,6 +39,7 @@ import org.thingsboard.server.common.data.kv.TsKvEntry;
 import org.thingsboard.server.common.data.kv.TsKvLatestRemovingResult;
 import org.thingsboard.server.common.stats.StatsFactory;
 import org.thingsboard.server.dao.DaoUtil;
+import org.thingsboard.server.dao.dictionary.KeyDictionaryDao;
 import org.thingsboard.server.dao.model.sql.AbstractTsKvEntity;
 import org.thingsboard.server.dao.model.sqlts.latest.TsKvLatestCompositeKey;
 import org.thingsboard.server.dao.model.sqlts.latest.TsKvLatestEntity;
@@ -49,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 javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.HashMap;
@@ -103,6 +104,9 @@ public class SqlTimeseriesLatestDao extends BaseAbstractSqlTimeseriesDao impleme
     @Autowired
     private StatsFactory statsFactory;
 
+    @Autowired
+    private KeyDictionaryDao keyDictionaryDao;
+
     @PostConstruct
     protected void init() {
         TbSqlBlockingQueueParams tsLatestParams = TbSqlBlockingQueueParams.builder()
@@ -151,17 +155,12 @@ public class SqlTimeseriesLatestDao extends BaseAbstractSqlTimeseriesDao impleme
 
     @Override
     public ListenableFuture<Optional<TsKvEntry>> findLatestOpt(TenantId tenantId, EntityId entityId, String key) {
-        return Futures.immediateFuture(Optional.ofNullable(doFindLatest(entityId, key)));
+        return service.submit(() -> Optional.ofNullable(doFindLatest(entityId, key)));
     }
 
     @Override
     public ListenableFuture<TsKvEntry> findLatest(TenantId tenantId, EntityId entityId, String key) {
-        return Futures.immediateFuture(getLatestTsKvEntry(entityId, key));
-    }
-
-    @Override
-    public TsKvEntry findLatestSync(TenantId tenantId, EntityId entityId, String key) {
-        return getLatestTsKvEntry(entityId, key);
+        return service.submit(() -> getLatestTsKvEntry(entityId, key));
     }
 
     @Override
@@ -205,11 +204,11 @@ 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(),
-                        getOrSaveKeyId(key));
+                        keyDictionaryDao.getOrSaveKeyId(key));
         Optional<TsKvLatestEntity> entry = tsKvLatestRepository.findById(compositeKey);
         if (entry.isPresent()) {
             TsKvLatestEntity tsKvLatestEntity = entry.get();
@@ -221,36 +220,29 @@ public class SqlTimeseriesLatestDao extends BaseAbstractSqlTimeseriesDao impleme
     }
 
     protected ListenableFuture<TsKvLatestRemovingResult> getRemoveLatestFuture(TenantId tenantId, EntityId entityId, DeleteTsKvQuery query) {
-        TsKvEntry latest = doFindLatest(entityId, query.getKey());
-
-        if (latest == null) {
-            return Futures.immediateFuture(new TsKvLatestRemovingResult(query.getKey(), false));
-        }
-
-        long ts = latest.getTs();
-        ListenableFuture<Boolean> removedLatestFuture;
-        if (ts >= query.getStartTs() && ts < query.getEndTs()) {
-            TsKvLatestEntity latestEntity = new TsKvLatestEntity();
-            latestEntity.setEntityId(entityId.getId());
-            latestEntity.setKey(getOrSaveKeyId(query.getKey()));
-            removedLatestFuture = service.submit(() -> {
+        ListenableFuture<TsKvEntry> latestFuture = service.submit(() -> doFindLatest(entityId, query.getKey()));
+        return Futures.transformAsync(latestFuture, latest -> {
+            if (latest == null) {
+                return Futures.immediateFuture(new TsKvLatestRemovingResult(query.getKey(), false));
+            }
+            boolean isRemoved = false;
+            long ts = latest.getTs();
+            if (ts >= query.getStartTs() && ts < query.getEndTs()) {
+                TsKvLatestEntity latestEntity = new TsKvLatestEntity();
+                latestEntity.setEntityId(entityId.getId());
+                latestEntity.setKey(keyDictionaryDao.getOrSaveKeyId(query.getKey()));
                 tsKvLatestRepository.delete(latestEntity);
-                return true;
-            });
-        } else {
-            removedLatestFuture = Futures.immediateFuture(false);
-        }
-
-        return Futures.transformAsync(removedLatestFuture, isRemoved -> {
-            if (isRemoved && query.getRewriteLatestIfDeleted()) {
-                return getNewLatestEntryFuture(tenantId, entityId, query);
+                isRemoved = true;
+                if (query.getRewriteLatestIfDeleted()) {
+                    return getNewLatestEntryFuture(tenantId, entityId, query);
+                }
             }
             return Futures.immediateFuture(new TsKvLatestRemovingResult(query.getKey(), isRemoved));
         }, MoreExecutors.directExecutor());
     }
 
     protected ListenableFuture<List<TsKvEntry>> getFindAllLatestFuture(EntityId entityId) {
-        return Futures.immediateFuture(
+        return service.submit(() ->
                 DaoUtil.convertDataList(Lists.newArrayList(
                         searchTsKvLatestRepository.findAllByEntityId(entityId.getId()))));
     }
@@ -259,7 +251,7 @@ public class SqlTimeseriesLatestDao extends BaseAbstractSqlTimeseriesDao impleme
         TsKvLatestEntity latestEntity = new TsKvLatestEntity();
         latestEntity.setEntityId(entityId.getId());
         latestEntity.setTs(tsKvEntry.getTs());
-        latestEntity.setKey(getOrSaveKeyId(tsKvEntry.getKey()));
+        latestEntity.setKey(keyDictionaryDao.getOrSaveKeyId(tsKvEntry.getKey()));
         latestEntity.setStrValue(tsKvEntry.getStrValue().orElse(null));
         latestEntity.setDoubleValue(tsKvEntry.getDoubleValue().orElse(null));
         latestEntity.setLongValue(tsKvEntry.getLongValue().orElse(null));
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sqlts/dictionary/JpaKeyDictionaryDao.java b/dao/src/main/java/org/thingsboard/server/dao/sqlts/dictionary/JpaKeyDictionaryDao.java
new file mode 100644
index 0000000000..870c0bc505
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/sqlts/dictionary/JpaKeyDictionaryDao.java
@@ -0,0 +1,92 @@
+/**
+ * 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.sqlts.dictionary;
+
+import lombok.extern.slf4j.Slf4j;
+import org.hibernate.exception.ConstraintViolationException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataIntegrityViolationException;
+import org.springframework.stereotype.Component;
+import org.thingsboard.server.dao.dictionary.KeyDictionaryDao;
+import org.thingsboard.server.dao.model.sqlts.dictionary.KeyDictionaryCompositeKey;
+import org.thingsboard.server.dao.model.sqlts.dictionary.KeyDictionaryEntry;
+import org.thingsboard.server.dao.sql.JpaAbstractDaoListeningExecutorService;
+import org.thingsboard.server.dao.util.SqlDao;
+
+import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.locks.ReentrantLock;
+
+@Component
+@Slf4j
+@SqlDao
+public class JpaKeyDictionaryDao extends JpaAbstractDaoListeningExecutorService implements KeyDictionaryDao {
+
+    private final ConcurrentMap<String, Integer> keyDictionaryMap = new ConcurrentHashMap<>();
+    protected static final ReentrantLock creationLock = new ReentrantLock();
+
+    @Autowired
+    private KeyDictionaryRepository keyDictionaryRepository;
+
+    @Override
+    public Integer getOrSaveKeyId(String strKey) {
+        Integer keyId = keyDictionaryMap.get(strKey);
+        if (keyId == null) {
+            Optional<KeyDictionaryEntry> tsKvDictionaryOptional;
+            tsKvDictionaryOptional = keyDictionaryRepository.findById(new KeyDictionaryCompositeKey(strKey));
+            if (tsKvDictionaryOptional.isEmpty()) {
+                creationLock.lock();
+                try {
+                    keyId = keyDictionaryMap.get(strKey);
+                    if (keyId != null) {
+                        return keyId;
+                    }
+                    tsKvDictionaryOptional = keyDictionaryRepository.findById(new KeyDictionaryCompositeKey(strKey));
+                    if (tsKvDictionaryOptional.isEmpty()) {
+                        KeyDictionaryEntry keyDictionaryEntry = new KeyDictionaryEntry();
+                        keyDictionaryEntry.setKey(strKey);
+                        try {
+                            KeyDictionaryEntry saved = keyDictionaryRepository.save(keyDictionaryEntry);
+                            keyDictionaryMap.put(saved.getKey(), saved.getKeyId());
+                            keyId = saved.getKeyId();
+                        } catch (DataIntegrityViolationException | ConstraintViolationException e) {
+                            tsKvDictionaryOptional = keyDictionaryRepository.findById(new KeyDictionaryCompositeKey(strKey));
+                            KeyDictionaryEntry dictionary = tsKvDictionaryOptional.orElseThrow(() -> new RuntimeException("Failed to get KeyDictionaryEntry entity from DB!"));
+                            keyDictionaryMap.put(dictionary.getKey(), dictionary.getKeyId());
+                            keyId = dictionary.getKeyId();
+                        }
+                    } else {
+                        keyId = tsKvDictionaryOptional.get().getKeyId();
+                    }
+                } finally {
+                    creationLock.unlock();
+                }
+            } else {
+                keyId = tsKvDictionaryOptional.get().getKeyId();
+                keyDictionaryMap.put(strKey, keyId);
+            }
+        }
+        return keyId;
+    }
+
+    @Override
+    public String getKey(Integer keyId) {
+        Optional<KeyDictionaryEntry> byKeyId = keyDictionaryRepository.findByKeyId(keyId);
+        return byKeyId.map(KeyDictionaryEntry::getKey).orElse(null);
+    }
+
+}
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sqlts/dictionary/TsKvDictionaryRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sqlts/dictionary/KeyDictionaryRepository.java
similarity index 65%
rename from dao/src/main/java/org/thingsboard/server/dao/sqlts/dictionary/TsKvDictionaryRepository.java
rename to dao/src/main/java/org/thingsboard/server/dao/sqlts/dictionary/KeyDictionaryRepository.java
index 11e5ec4273..f61da09779 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sqlts/dictionary/TsKvDictionaryRepository.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sqlts/dictionary/KeyDictionaryRepository.java
@@ -16,15 +16,14 @@
 package org.thingsboard.server.dao.sqlts.dictionary;
 
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.thingsboard.server.dao.model.sqlts.dictionary.TsKvDictionary;
-import org.thingsboard.server.dao.model.sqlts.dictionary.TsKvDictionaryCompositeKey;
-import org.thingsboard.server.dao.util.SqlTsOrTsLatestAnyDao;
+import org.thingsboard.server.dao.model.sqlts.dictionary.KeyDictionaryEntry;
+import org.thingsboard.server.dao.model.sqlts.dictionary.KeyDictionaryCompositeKey;
 
 import java.util.Optional;
 
-@SqlTsOrTsLatestAnyDao
-public interface TsKvDictionaryRepository extends JpaRepository<TsKvDictionary, TsKvDictionaryCompositeKey> {
+public interface KeyDictionaryRepository extends JpaRepository<KeyDictionaryEntry, KeyDictionaryCompositeKey> {
+
+    Optional<KeyDictionaryEntry> findByKeyId(int keyId);
 
-    Optional<TsKvDictionary> findByKeyId(int keyId);
 
 }
\ No newline at end of file
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sqlts/latest/SearchTsKvLatestRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sqlts/latest/SearchTsKvLatestRepository.java
index a0595679da..50652d4f60 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sqlts/latest/SearchTsKvLatestRepository.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sqlts/latest/SearchTsKvLatestRepository.java
@@ -19,8 +19,8 @@ import org.springframework.stereotype.Repository;
 import org.thingsboard.server.dao.model.sqlts.latest.TsKvLatestEntity;
 import org.thingsboard.server.dao.util.SqlTsLatestAnyDao;
 
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
 import java.util.List;
 import java.util.UUID;
 
@@ -30,9 +30,9 @@ public class SearchTsKvLatestRepository {
 
     public static final String FIND_ALL_BY_ENTITY_ID = "findAllByEntityId";
 
-    public static final String FIND_ALL_BY_ENTITY_ID_QUERY = "SELECT ts_kv_latest.entity_id AS entityId, ts_kv_latest.key AS key, ts_kv_dictionary.key AS strKey, ts_kv_latest.str_v AS strValue," +
+    public static final String FIND_ALL_BY_ENTITY_ID_QUERY = "SELECT ts_kv_latest.entity_id AS entityId, ts_kv_latest.key AS key, key_dictionary.key AS strKey, ts_kv_latest.str_v AS strValue," +
             " ts_kv_latest.bool_v AS boolValue, ts_kv_latest.long_v AS longValue, ts_kv_latest.dbl_v AS doubleValue, ts_kv_latest.json_v AS jsonValue, ts_kv_latest.ts AS ts FROM ts_kv_latest " +
-            "INNER JOIN ts_kv_dictionary ON ts_kv_latest.key = ts_kv_dictionary.key_id WHERE ts_kv_latest.entity_id = cast(:id AS uuid)";
+            "INNER JOIN key_dictionary ON ts_kv_latest.key = key_dictionary.key_id WHERE ts_kv_latest.entity_id = cast(:id AS uuid)";
 
     @PersistenceContext
     private EntityManager entityManager;
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sqlts/latest/TsKvLatestRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sqlts/latest/TsKvLatestRepository.java
index 06aba102be..38bfde0acf 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sqlts/latest/TsKvLatestRepository.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sqlts/latest/TsKvLatestRepository.java
@@ -26,19 +26,19 @@ import java.util.UUID;
 
 public interface TsKvLatestRepository extends JpaRepository<TsKvLatestEntity, TsKvLatestCompositeKey> {
 
-    @Query(value = "SELECT DISTINCT ts_kv_dictionary.key AS strKey FROM ts_kv_latest " +
-            "INNER JOIN ts_kv_dictionary ON ts_kv_latest.key = ts_kv_dictionary.key_id " +
-            "WHERE ts_kv_latest.entity_id IN (SELECT id FROM device WHERE device_profile_id = :device_profile_id AND tenant_id = :tenant_id limit 100) ORDER BY ts_kv_dictionary.key", nativeQuery = true)
+    @Query(value = "SELECT DISTINCT key_dictionary.key AS strKey FROM ts_kv_latest " +
+            "INNER JOIN key_dictionary ON ts_kv_latest.key = key_dictionary.key_id " +
+            "WHERE ts_kv_latest.entity_id IN (SELECT id FROM device WHERE device_profile_id = :device_profile_id AND tenant_id = :tenant_id limit 100) ORDER BY key_dictionary.key", nativeQuery = true)
     List<String> getKeysByDeviceProfileId(@Param("tenant_id") UUID tenantId, @Param("device_profile_id") UUID deviceProfileId);
 
-    @Query(value = "SELECT DISTINCT ts_kv_dictionary.key AS strKey FROM ts_kv_latest " +
-            "INNER JOIN ts_kv_dictionary ON ts_kv_latest.key = ts_kv_dictionary.key_id " +
-            "WHERE ts_kv_latest.entity_id IN (SELECT id FROM device WHERE tenant_id = :tenant_id limit 100) ORDER BY ts_kv_dictionary.key", nativeQuery = true)
+    @Query(value = "SELECT DISTINCT key_dictionary.key AS strKey FROM ts_kv_latest " +
+            "INNER JOIN key_dictionary ON ts_kv_latest.key = key_dictionary.key_id " +
+            "WHERE ts_kv_latest.entity_id IN (SELECT id FROM device WHERE tenant_id = :tenant_id limit 100) ORDER BY key_dictionary.key", nativeQuery = true)
     List<String> getKeysByTenantId(@Param("tenant_id") UUID tenantId);
 
-    @Query(value = "SELECT DISTINCT ts_kv_dictionary.key AS strKey FROM ts_kv_latest " +
-            "INNER JOIN ts_kv_dictionary ON ts_kv_latest.key = ts_kv_dictionary.key_id " +
-            "WHERE ts_kv_latest.entity_id IN :entityIds ORDER BY ts_kv_dictionary.key", nativeQuery = true)
+    @Query(value = "SELECT DISTINCT key_dictionary.key AS strKey FROM ts_kv_latest " +
+            "INNER JOIN key_dictionary ON ts_kv_latest.key = key_dictionary.key_id " +
+            "WHERE ts_kv_latest.entity_id IN :entityIds ORDER BY key_dictionary.key", nativeQuery = true)
     List<String> findAllKeysByEntityIds(@Param("entityIds") List<UUID> entityIds);
 
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sqlts/sql/JpaSqlTimeseriesDao.java b/dao/src/main/java/org/thingsboard/server/dao/sqlts/sql/JpaSqlTimeseriesDao.java
index 97eb54f6e4..c750e12050 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sqlts/sql/JpaSqlTimeseriesDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sqlts/sql/JpaSqlTimeseriesDao.java
@@ -27,6 +27,7 @@ import org.springframework.stereotype.Component;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.kv.TsKvEntry;
+import org.thingsboard.server.dao.dictionary.KeyDictionaryDao;
 import org.thingsboard.server.dao.model.sqlts.ts.TsKvEntity;
 import org.thingsboard.server.dao.sqlts.AbstractChunkedAggregationTimeseriesDao;
 import org.thingsboard.server.dao.sqlts.insert.sql.SqlPartitioningRepository;
@@ -59,6 +60,8 @@ public class JpaSqlTimeseriesDao extends AbstractChunkedAggregationTimeseriesDao
 
     @Autowired
     private SqlPartitioningRepository partitioningRepository;
+    @Autowired
+    private KeyDictionaryDao keyDictionaryDao;
 
     private SqlTsPartitionDate tsFormat;
 
@@ -83,7 +86,7 @@ public class JpaSqlTimeseriesDao extends AbstractChunkedAggregationTimeseriesDao
         int dataPointDays = getDataPointDays(tsKvEntry, computeTtl(ttl));
         savePartitionIfNotExist(tsKvEntry.getTs());
         String strKey = tsKvEntry.getKey();
-        Integer keyId = getOrSaveKeyId(strKey);
+        Integer keyId = keyDictionaryDao.getOrSaveKeyId(strKey);
         TsKvEntity entity = new TsKvEntity();
         entity.setEntityId(entityId.getId());
         entity.setTs(tsKvEntry.getTs());
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sqlts/timescale/AggregationRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sqlts/timescale/AggregationRepository.java
index 99ad1a0846..1e3ae68f4c 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sqlts/timescale/AggregationRepository.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sqlts/timescale/AggregationRepository.java
@@ -19,8 +19,8 @@ import org.springframework.stereotype.Repository;
 import org.thingsboard.server.dao.model.sqlts.timescale.ts.TimescaleTsKvEntity;
 import org.thingsboard.server.dao.util.TimescaleDBTsOrTsLatestDao;
 
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
 import java.util.List;
 import java.util.UUID;
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sqlts/timescale/TimescaleTimeseriesDao.java b/dao/src/main/java/org/thingsboard/server/dao/sqlts/timescale/TimescaleTimeseriesDao.java
index bb0ce06026..c8bff8ceb9 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sqlts/timescale/TimescaleTimeseriesDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sqlts/timescale/TimescaleTimeseriesDao.java
@@ -35,6 +35,7 @@ import org.thingsboard.server.common.data.kv.ReadTsKvQueryResult;
 import org.thingsboard.server.common.data.kv.TsKvEntry;
 import org.thingsboard.server.common.stats.StatsFactory;
 import org.thingsboard.server.dao.DaoUtil;
+import org.thingsboard.server.dao.dictionary.KeyDictionaryDao;
 import org.thingsboard.server.dao.model.sql.AbstractTsKvEntity;
 import org.thingsboard.server.dao.model.sqlts.timescale.ts.TimescaleTsKvEntity;
 import org.thingsboard.server.dao.model.sqlts.ts.TsKvEntity;
@@ -46,8 +47,8 @@ import org.thingsboard.server.dao.timeseries.TimeseriesDao;
 import org.thingsboard.server.dao.util.TimeUtils;
 import org.thingsboard.server.dao.util.TimescaleDBTsDao;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -73,6 +74,9 @@ public class TimescaleTimeseriesDao extends AbstractSqlTimeseriesDao implements
     @Autowired
     protected InsertTsRepository<TimescaleTsKvEntity> insertRepository;
 
+    @Autowired
+    protected KeyDictionaryDao keyDictionaryDao;
+
     protected TbSqlBlockingQueueWrapper<TimescaleTsKvEntity> tsQueue;
 
     @PostConstruct
@@ -112,7 +116,7 @@ public class TimescaleTimeseriesDao extends AbstractSqlTimeseriesDao implements
     public ListenableFuture<Integer> save(TenantId tenantId, EntityId entityId, TsKvEntry tsKvEntry, long ttl) {
         int dataPointDays = getDataPointDays(tsKvEntry, computeTtl(ttl));
         String strKey = tsKvEntry.getKey();
-        Integer keyId = getOrSaveKeyId(strKey);
+        Integer keyId = keyDictionaryDao.getOrSaveKeyId(strKey);
         TimescaleTsKvEntity entity = new TimescaleTsKvEntity();
         entity.setEntityId(entityId.getId());
         entity.setTs(tsKvEntry.getTs());
@@ -134,7 +138,7 @@ public class TimescaleTimeseriesDao extends AbstractSqlTimeseriesDao implements
     @Override
     public ListenableFuture<Void> remove(TenantId tenantId, EntityId entityId, DeleteTsKvQuery query) {
         String strKey = query.getKey();
-        Integer keyId = getOrSaveKeyId(strKey);
+        Integer keyId = keyDictionaryDao.getOrSaveKeyId(strKey);
         return service.submit(() -> {
             tsKvRepository.delete(
                     entityId.getId(),
@@ -179,7 +183,7 @@ public class TimescaleTimeseriesDao extends AbstractSqlTimeseriesDao implements
 
     private ReadTsKvQueryResult findAllAsyncWithLimit(EntityId entityId, ReadTsKvQuery query) {
         String strKey = query.getKey();
-        Integer keyId = getOrSaveKeyId(strKey);
+        Integer keyId = keyDictionaryDao.getOrSaveKeyId(strKey);
         List<TimescaleTsKvEntity> timescaleTsKvEntities = tsKvRepository.findAllWithLimit(
                 entityId.getId(),
                 keyId,
@@ -227,7 +231,7 @@ public class TimescaleTimeseriesDao extends AbstractSqlTimeseriesDao implements
     }
 
     private List<TimescaleTsKvEntity> switchAggregation(String key, long startTs, long endTs, long timeBucket, Aggregation aggregation, UUID entityId) {
-        Integer keyId = getOrSaveKeyId(key);
+        Integer keyId = keyDictionaryDao.getOrSaveKeyId(key);
         switch (aggregation) {
             case AVG:
                 return aggregationRepository.findAvg(entityId, keyId, timeBucket, startTs, endTs);
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sqlts/ts/TsKvRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sqlts/ts/TsKvRepository.java
index 67de9af2d4..f2acb31f8a 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sqlts/ts/TsKvRepository.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sqlts/ts/TsKvRepository.java
@@ -30,12 +30,12 @@ import java.util.UUID;
 public interface TsKvRepository extends JpaRepository<TsKvEntity, TsKvCompositeKey> {
 
     /*
-    * Using native query to avoid adding 'nulls first' or 'nulls last' (ignoring spring.jpa.properties.hibernate.order_by.default_null_ordering)
-    * to the order so that index scan is done instead of full scan.
-    *
-    * Note: even when setting custom NullHandling for the Sort.Order for non-native queries,
-    * it will be ignored and default_null_ordering will be used
-    * */
+     * Using native query to avoid adding 'nulls first' or 'nulls last' (ignoring spring.jpa.properties.hibernate.order_by.default_null_ordering)
+     * to the order so that index scan is done instead of full scan.
+     *
+     * Note: even when setting custom NullHandling for the Sort.Order for non-native queries,
+     * it will be ignored and default_null_ordering will be used
+     * */
     @Query(value = "SELECT * FROM ts_kv WHERE entity_id = :entityId " +
             "AND key = :entityKey AND ts >= :startTs AND ts < :endTs ", nativeQuery = true)
     List<TsKvEntity> findAllWithLimit(@Param("entityId") UUID entityId,
@@ -57,41 +57,41 @@ public interface TsKvRepository extends JpaRepository<TsKvEntity, TsKvCompositeK
             "WHERE tskv.strValue IS NOT NULL " +
             "AND tskv.entityId = :entityId AND tskv.key = :entityKey AND tskv.ts >= :startTs AND tskv.ts < :endTs")
     TsKvEntity findStringMax(@Param("entityId") UUID entityId,
-                                                @Param("entityKey") int entityKey,
-                                                @Param("startTs") long startTs,
-                                                @Param("endTs") long endTs);
+                             @Param("entityKey") int entityKey,
+                             @Param("startTs") long startTs,
+                             @Param("endTs") long endTs);
 
     @Query("SELECT new TsKvEntity(MAX(COALESCE(tskv.longValue, -9223372036854775807)), " +
-            "MAX(COALESCE(tskv.doubleValue, -1.79769E+308)), " +
+            "MAX(COALESCE(tskv.doubleValue, java.lang.Double.MIN_VALUE)), " +
             "SUM(CASE WHEN tskv.longValue IS NULL THEN 0 ELSE 1 END), " +
             "SUM(CASE WHEN tskv.doubleValue IS NULL THEN 0 ELSE 1 END), " +
             "'MAX', MAX(tskv.ts)) FROM TsKvEntity tskv " +
             "WHERE tskv.entityId = :entityId AND tskv.key = :entityKey AND tskv.ts >= :startTs AND tskv.ts < :endTs")
     TsKvEntity findNumericMax(@Param("entityId") UUID entityId,
-                                          @Param("entityKey") int entityKey,
-                                          @Param("startTs") long startTs,
-                                          @Param("endTs") long endTs);
+                              @Param("entityKey") int entityKey,
+                              @Param("startTs") long startTs,
+                              @Param("endTs") long endTs);
 
 
     @Query("SELECT new TsKvEntity(MIN(tskv.strValue), MAX(tskv.ts)) FROM TsKvEntity tskv " +
             "WHERE tskv.strValue IS NOT NULL " +
             "AND tskv.entityId = :entityId AND tskv.key = :entityKey AND tskv.ts >= :startTs AND tskv.ts < :endTs")
     TsKvEntity findStringMin(@Param("entityId") UUID entityId,
-                                          @Param("entityKey") int entityKey,
-                                          @Param("startTs") long startTs,
-                                          @Param("endTs") long endTs);
+                             @Param("entityKey") int entityKey,
+                             @Param("startTs") long startTs,
+                             @Param("endTs") long endTs);
 
     @Query("SELECT new TsKvEntity(MIN(COALESCE(tskv.longValue, 9223372036854775807)), " +
-            "MIN(COALESCE(tskv.doubleValue, 1.79769E+308)), " +
+            "MIN(COALESCE(tskv.doubleValue, java.lang.Double.MAX_VALUE)), " +
             "SUM(CASE WHEN tskv.longValue IS NULL THEN 0 ELSE 1 END), " +
             "SUM(CASE WHEN tskv.doubleValue IS NULL THEN 0 ELSE 1 END), " +
             "'MIN', MAX(tskv.ts)) FROM TsKvEntity tskv " +
             "WHERE tskv.entityId = :entityId AND tskv.key = :entityKey AND tskv.ts >= :startTs AND tskv.ts < :endTs")
     TsKvEntity findNumericMin(
-                                          @Param("entityId") UUID entityId,
-                                          @Param("entityKey") int entityKey,
-                                          @Param("startTs") long startTs,
-                                          @Param("endTs") long endTs);
+            @Param("entityId") UUID entityId,
+            @Param("entityKey") int entityKey,
+            @Param("startTs") long startTs,
+            @Param("endTs") long endTs);
 
     @Query("SELECT new TsKvEntity(SUM(CASE WHEN tskv.booleanValue IS NULL THEN 0 ELSE 1 END), " +
             "SUM(CASE WHEN tskv.strValue IS NULL THEN 0 ELSE 1 END), " +
@@ -100,9 +100,9 @@ public interface TsKvRepository extends JpaRepository<TsKvEntity, TsKvCompositeK
             "SUM(CASE WHEN tskv.jsonValue IS NULL THEN 0 ELSE 1 END), MAX(tskv.ts)) FROM TsKvEntity tskv " +
             "WHERE tskv.entityId = :entityId AND tskv.key = :entityKey AND tskv.ts >= :startTs AND tskv.ts < :endTs")
     TsKvEntity findCount(@Param("entityId") UUID entityId,
-                                            @Param("entityKey") int entityKey,
-                                            @Param("startTs") long startTs,
-                                            @Param("endTs") long endTs);
+                         @Param("entityKey") int entityKey,
+                         @Param("startTs") long startTs,
+                         @Param("endTs") long endTs);
 
     @Query("SELECT new TsKvEntity(SUM(COALESCE(tskv.longValue, 0)), " +
             "SUM(COALESCE(tskv.doubleValue, 0.0)), " +
@@ -111,9 +111,9 @@ public interface TsKvRepository extends JpaRepository<TsKvEntity, TsKvCompositeK
             "'AVG', MAX(tskv.ts)) FROM TsKvEntity tskv " +
             "WHERE tskv.entityId = :entityId AND tskv.key = :entityKey AND tskv.ts >= :startTs AND tskv.ts < :endTs")
     TsKvEntity findAvg(@Param("entityId") UUID entityId,
-                                          @Param("entityKey") int entityKey,
-                                          @Param("startTs") long startTs,
-                                          @Param("endTs") long endTs);
+                       @Param("entityKey") int entityKey,
+                       @Param("startTs") long startTs,
+                       @Param("endTs") long endTs);
 
     @Query("SELECT new TsKvEntity(SUM(COALESCE(tskv.longValue, 0)), " +
             "SUM(COALESCE(tskv.doubleValue, 0.0)), " +
@@ -122,8 +122,8 @@ public interface TsKvRepository extends JpaRepository<TsKvEntity, TsKvCompositeK
             "'SUM', MAX(tskv.ts)) FROM TsKvEntity tskv " +
             "WHERE tskv.entityId = :entityId AND tskv.key = :entityKey AND tskv.ts >= :startTs AND tskv.ts < :endTs")
     TsKvEntity findSum(@Param("entityId") UUID entityId,
-                                          @Param("entityKey") int entityKey,
-                                          @Param("startTs") long startTs,
-                                          @Param("endTs") long endTs);
+                       @Param("entityKey") int entityKey,
+                       @Param("startTs") long startTs,
+                       @Param("endTs") long endTs);
 
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantExistsRedisCache.java b/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantExistsRedisCache.java
index b078107c01..53952e8827 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantExistsRedisCache.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantExistsRedisCache.java
@@ -21,7 +21,7 @@ import org.springframework.stereotype.Service;
 import org.thingsboard.server.cache.CacheSpecsMap;
 import org.thingsboard.server.cache.RedisTbTransactionalCache;
 import org.thingsboard.server.cache.TBRedisCacheConfiguration;
-import org.thingsboard.server.cache.TbFSTRedisSerializer;
+import org.thingsboard.server.cache.TbJsonRedisSerializer;
 import org.thingsboard.server.common.data.CacheConstants;
 import org.thingsboard.server.common.data.id.TenantId;
 
@@ -30,6 +30,6 @@ import org.thingsboard.server.common.data.id.TenantId;
 public class TenantExistsRedisCache extends RedisTbTransactionalCache<TenantId, Boolean> {
 
     public TenantExistsRedisCache(TBRedisCacheConfiguration configuration, CacheSpecsMap cacheSpecsMap, RedisConnectionFactory connectionFactory) {
-        super(CacheConstants.TENANTS_EXIST_CACHE, cacheSpecsMap, connectionFactory, configuration, new TbFSTRedisSerializer<>());
+        super(CacheConstants.TENANTS_EXIST_CACHE, cacheSpecsMap, connectionFactory, configuration, new TbJsonRedisSerializer<>(Boolean.class));
     }
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantProfileRedisCache.java b/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantProfileRedisCache.java
index eb868b48d2..989db7a9d3 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantProfileRedisCache.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantProfileRedisCache.java
@@ -21,7 +21,7 @@ import org.springframework.stereotype.Service;
 import org.thingsboard.server.cache.CacheSpecsMap;
 import org.thingsboard.server.cache.RedisTbTransactionalCache;
 import org.thingsboard.server.cache.TBRedisCacheConfiguration;
-import org.thingsboard.server.cache.TbFSTRedisSerializer;
+import org.thingsboard.server.cache.TbJsonRedisSerializer;
 import org.thingsboard.server.common.data.CacheConstants;
 import org.thingsboard.server.common.data.TenantProfile;
 
@@ -30,6 +30,6 @@ import org.thingsboard.server.common.data.TenantProfile;
 public class TenantProfileRedisCache extends RedisTbTransactionalCache<TenantProfileCacheKey, TenantProfile> {
 
     public TenantProfileRedisCache(TBRedisCacheConfiguration configuration, CacheSpecsMap cacheSpecsMap, RedisConnectionFactory connectionFactory) {
-        super(CacheConstants.TENANT_PROFILE_CACHE, cacheSpecsMap, connectionFactory, configuration, new TbFSTRedisSerializer<>());
+        super(CacheConstants.TENANT_PROFILE_CACHE, cacheSpecsMap, connectionFactory, configuration, new TbJsonRedisSerializer<>(TenantProfile.class));
     }
 }
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 31a419a5d0..acbc7041fb 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);
     }
@@ -94,7 +95,7 @@ public class TenantProfileServiceImpl extends AbstractCachedEntityService<Tenant
         try {
             savedTenantProfile = tenantProfileDao.save(tenantId, tenantProfile);
             publishEvictEvent(new TenantProfileEvictEvent(savedTenantProfile.getId(), savedTenantProfile.isDefault()));
-            eventPublisher.publishEvent(SaveEntityEvent.builder().tenantId(tenantId)
+            eventPublisher.publishEvent(SaveEntityEvent.builder().tenantId(tenantId).entity(savedTenantProfile)
                     .entityId(savedTenantProfile.getId()).created(tenantProfile.getId() == null).build());
         } catch (Exception t) {
             handleEvictEvent(new TenantProfileEvictEvent(null, tenantProfile.isDefault()));
@@ -111,15 +112,17 @@ 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!");
         }
-        this.removeTenantProfile(tenantId, tenantProfileId, false);
+        this.removeTenantProfile(tenantId, tenantProfile, false);
     }
 
-    private void removeTenantProfile(TenantId tenantId, TenantProfileId tenantProfileId, boolean isDefault) {
+    private void removeTenantProfile(TenantId tenantId, TenantProfile tenantProfile, boolean isDefault) {
+        TenantProfileId tenantProfileId = tenantProfile.getId();
         try {
             tenantProfileDao.removeById(tenantId, tenantProfileId.getId());
         } catch (Exception t) {
@@ -130,9 +133,8 @@ public class TenantProfileServiceImpl extends AbstractCachedEntityService<Tenant
                 throw t;
             }
         }
-        deleteEntityRelations(tenantId, tenantProfileId);
         publishEvictEvent(new TenantProfileEvictEvent(tenantProfileId, isDefault));
-        eventPublisher.publishEvent(DeleteEntityEvent.builder().tenantId(tenantId).entityId(tenantProfileId).build());
+        eventPublisher.publishEvent(DeleteEntityEvent.builder().tenantId(tenantId).entity(tenantProfile).entityId(tenantProfileId).build());
     }
 
     @Override
@@ -185,7 +187,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);
@@ -239,7 +242,7 @@ public class TenantProfileServiceImpl extends AbstractCachedEntityService<Tenant
 
                 @Override
                 protected void removeEntity(TenantId tenantId, TenantProfile entity) {
-                    removeTenantProfile(tenantId, entity.getId(), entity.isDefault());
+                    removeTenantProfile(tenantId, entity, entity.isDefault());
                 }
             };
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantRedisCache.java b/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantRedisCache.java
index 76b968c8d2..1f61c1163e 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantRedisCache.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantRedisCache.java
@@ -21,7 +21,7 @@ import org.springframework.stereotype.Service;
 import org.thingsboard.server.cache.CacheSpecsMap;
 import org.thingsboard.server.cache.RedisTbTransactionalCache;
 import org.thingsboard.server.cache.TBRedisCacheConfiguration;
-import org.thingsboard.server.cache.TbFSTRedisSerializer;
+import org.thingsboard.server.cache.TbJsonRedisSerializer;
 import org.thingsboard.server.common.data.CacheConstants;
 import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.common.data.id.TenantId;
@@ -31,6 +31,6 @@ import org.thingsboard.server.common.data.id.TenantId;
 public class TenantRedisCache extends RedisTbTransactionalCache<TenantId, Tenant> {
 
     public TenantRedisCache(TBRedisCacheConfiguration configuration, CacheSpecsMap cacheSpecsMap, RedisConnectionFactory connectionFactory) {
-        super(CacheConstants.TENANTS_CACHE, cacheSpecsMap, connectionFactory, configuration, new TbFSTRedisSerializer<>());
+        super(CacheConstants.TENANTS_CACHE, cacheSpecsMap, connectionFactory, configuration, new TbJsonRedisSerializer<>(Tenant.class));
     }
 }
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 78d8afca29..83f1a636c9 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
@@ -34,35 +34,21 @@ import org.thingsboard.server.common.data.id.TenantProfileId;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.dao.asset.AssetProfileService;
-import org.thingsboard.server.dao.asset.AssetService;
-import org.thingsboard.server.dao.customer.CustomerService;
-import org.thingsboard.server.dao.dashboard.DashboardService;
 import org.thingsboard.server.dao.device.DeviceProfileService;
-import org.thingsboard.server.dao.device.DeviceService;
 import org.thingsboard.server.dao.entity.AbstractCachedEntityService;
 import org.thingsboard.server.dao.eventsourcing.DeleteEntityEvent;
 import org.thingsboard.server.dao.eventsourcing.SaveEntityEvent;
-import org.thingsboard.server.dao.notification.NotificationRequestService;
-import org.thingsboard.server.dao.notification.NotificationRuleService;
 import org.thingsboard.server.dao.notification.NotificationSettingsService;
-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.resource.ResourceService;
-import org.thingsboard.server.dao.rpc.RpcService;
-import org.thingsboard.server.dao.rule.RuleChainService;
-import org.thingsboard.server.dao.service.DataValidator;
 import org.thingsboard.server.dao.service.PaginatedRemover;
 import org.thingsboard.server.dao.service.Validator;
+import org.thingsboard.server.dao.service.validator.TenantDataValidator;
 import org.thingsboard.server.dao.settings.AdminSettingsService;
 import org.thingsboard.server.dao.usagerecord.ApiUsageStateService;
 import org.thingsboard.server.dao.user.UserService;
-import org.thingsboard.server.dao.widget.WidgetTypeService;
-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;
 
@@ -75,80 +61,24 @@ public class TenantServiceImpl extends AbstractCachedEntityService<TenantId, Ten
 
     @Autowired
     private TenantDao tenantDao;
-
     @Autowired
     private TenantProfileService tenantProfileService;
-
     @Autowired
     @Lazy
     private UserService userService;
-
-    @Autowired
-    private CustomerService customerService;
-
-    @Autowired
-    private AssetService assetService;
-
     @Autowired
     private AssetProfileService assetProfileService;
-
-    @Autowired
-    private DeviceService deviceService;
-
     @Autowired
     private DeviceProfileService deviceProfileService;
-
     @Lazy
     @Autowired
     private ApiUsageStateService apiUsageStateService;
-
-    @Autowired
-    private WidgetsBundleService widgetsBundleService;
-
-    @Autowired
-    private WidgetTypeService widgetTypeService;
-
-    @Autowired
-    private DashboardService dashboardService;
-
-    @Autowired
-    private RuleChainService ruleChainService;
-
-    @Autowired
-    private ResourceService resourceService;
-
-    @Autowired
-    @Lazy
-    private OtaPackageService otaPackageService;
-
-    @Autowired
-    private RpcService rpcService;
-
-    @Autowired
-    private DataValidator<Tenant> tenantValidator;
-
-    @Lazy
-    @Autowired
-    private QueueService queueService;
-
     @Autowired
     private AdminSettingsService adminSettingsService;
-
     @Autowired
     private NotificationSettingsService notificationSettingsService;
-
-    @Autowired
-    private NotificationRequestService notificationRequestService;
-
     @Autowired
-    private NotificationRuleService notificationRuleService;
-
-    @Autowired
-    private NotificationTemplateService notificationTemplateService;
-
-    @Autowired
-    private NotificationTargetService notificationTargetService;
-
+    private TenantDataValidator tenantValidator;
     @Autowired
     protected TbTransactionalCache<TenantId, Boolean> existsTenantCache;
 
@@ -165,7 +95,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,20 +103,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, null);
+    }
+
+    @Override
+    @Transactional
+    public Tenant saveTenant(Tenant tenant, Consumer<TenantId> defaultEntitiesCreator) {
         log.trace("Executing saveTenant [{}]", tenant);
         tenant.setRegion(DEFAULT_TENANT_REGION);
         if (tenant.getTenantProfileId() == null) {
@@ -195,59 +131,46 @@ 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));
-        eventPublisher.publishEvent(SaveEntityEvent.builder().tenantId(savedTenant.getId()).entityId(savedTenant.getId()).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;
     }
 
-    /**
-     * We intentionally leave this method without "Transactional" annotation due to complexity of the method.
-     * Ideally we should delete related entites without "paginatedRemover" logic. But in such a case we can't clear cache and send events.
-     * We will create separate task to make "deleteTenant" transactional.
-     */
     @Override
     public void deleteTenant(TenantId tenantId) {
         log.trace("Executing deleteTenant [{}]", tenantId);
-        Validator.validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        entityViewService.deleteEntityViewsByTenantId(tenantId);
-        widgetsBundleService.deleteWidgetsBundlesByTenantId(tenantId);
-        widgetTypeService.deleteWidgetTypesByTenantId(tenantId);
-        assetService.deleteAssetsByTenantId(tenantId);
-        assetProfileService.deleteAssetProfilesByTenantId(tenantId);
-        deviceService.deleteDevicesByTenantId(tenantId);
-        deviceProfileService.deleteDeviceProfilesByTenantId(tenantId);
-        dashboardService.deleteDashboardsByTenantId(tenantId);
-        customerService.deleteCustomersByTenantId(tenantId);
-        edgeService.deleteEdgesByTenantId(tenantId);
-        userService.deleteTenantAdmins(tenantId);
-        ruleChainService.deleteRuleChainsByTenantId(tenantId);
-        apiUsageStateService.deleteApiUsageStateByTenantId(tenantId);
-        resourceService.deleteResourcesByTenantId(tenantId);
-        otaPackageService.deleteOtaPackagesByTenantId(tenantId);
-        rpcService.deleteAllRpcByTenantId(tenantId);
-        queueService.deleteQueuesByTenantId(tenantId);
-        notificationRequestService.deleteNotificationRequestsByTenantId(tenantId);
-        notificationRuleService.deleteNotificationRulesByTenantId(tenantId);
-        notificationTemplateService.deleteNotificationTemplatesByTenantId(tenantId);
-        notificationTargetService.deleteNotificationTargetsByTenantId(tenantId);
-        notificationSettingsService.deleteNotificationSettings(tenantId);
+        Tenant tenant = findTenantById(tenantId);
+        Validator.validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+
+        userService.deleteAllByTenantId(tenantId);
         adminSettingsService.deleteAdminSettingsByTenantId(tenantId);
+        notificationSettingsService.deleteNotificationSettings(tenantId);
         tenantDao.removeById(tenantId, tenantId.getId());
         publishEvictEvent(new TenantEvictEvent(tenantId, true));
-        eventPublisher.publishEvent(DeleteEntityEvent.builder().tenantId(tenantId).entityId(tenantId).build());
-        relationService.deleteEntityRelations(tenantId, tenantId);
-        alarmService.deleteEntityAlarmRecordsByTenantId(tenantId);
+
+        cleanUpService.removeTenantEntities(tenantId, // don't forget to implement deleteEntity from EntityDaoService when adding entity type to this list
+                EntityType.ENTITY_VIEW, EntityType.WIDGETS_BUNDLE, EntityType.WIDGET_TYPE,
+                EntityType.ASSET, EntityType.ASSET_PROFILE, EntityType.DEVICE, EntityType.DEVICE_PROFILE,
+                EntityType.DASHBOARD, EntityType.EDGE, EntityType.RULE_CHAIN, EntityType.API_USAGE_STATE,
+                EntityType.TB_RESOURCE, EntityType.OTA_PACKAGE, EntityType.RPC, EntityType.QUEUE,
+                EntityType.NOTIFICATION_REQUEST, EntityType.NOTIFICATION_RULE, EntityType.NOTIFICATION_TEMPLATE,
+                EntityType.NOTIFICATION_TARGET, EntityType.QUEUE_STATS, EntityType.CUSTOMER
+        );
+        eventPublisher.publishEvent(DeleteEntityEvent.builder().tenantId(tenantId).entityId(tenantId).entity(tenant).build());
     }
 
     @Override
diff --git a/dao/src/main/java/org/thingsboard/server/dao/timeseries/AggregatePartitionsFunction.java b/dao/src/main/java/org/thingsboard/server/dao/timeseries/AggregatePartitionsFunction.java
index 8ae0483516..b72ac1514b 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/timeseries/AggregatePartitionsFunction.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/timeseries/AggregatePartitionsFunction.java
@@ -32,7 +32,7 @@ import org.thingsboard.server.common.data.kv.TsKvEntry;
 import org.thingsboard.server.common.data.kv.TsKvEntryAggWrapper;
 import org.thingsboard.server.dao.nosql.TbResultSet;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.Executor;
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 1f77fa3c1d..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
@@ -16,7 +16,6 @@
 package org.thingsboard.server.dao.timeseries;
 
 import com.google.common.base.Function;
-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;
@@ -43,6 +42,7 @@ import org.thingsboard.server.dao.entityview.EntityViewService;
 import org.thingsboard.server.dao.exception.IncorrectParameterException;
 import org.thingsboard.server.dao.service.Validator;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -126,21 +126,14 @@ public class BaseTimeseriesService implements TimeseriesService {
     @Override
     public ListenableFuture<List<TsKvEntry>> findLatest(TenantId tenantId, EntityId entityId, Collection<String> keys) {
         validate(entityId);
-        List<ListenableFuture<TsKvEntry>> futures = Lists.newArrayListWithExpectedSize(keys.size());
-        keys.forEach(key -> Validator.validateString(key, "Incorrect key " + key));
-        keys.forEach(key -> futures.add(timeseriesLatestDao.findLatest(tenantId, entityId, key)));
+        List<ListenableFuture<TsKvEntry>> futures = new ArrayList<>(keys.size());
+        keys.forEach(key -> Validator.validateString(key, k -> "Incorrect key " + k));
+        for (String key : keys) {
+            futures.add(timeseriesLatestDao.findLatest(tenantId, entityId, key));
+        }
         return Futures.allAsList(futures);
     }
 
-    @Override
-    public List<TsKvEntry> findLatestSync(TenantId tenantId, EntityId entityId, Collection<String> keys) {
-        validate(entityId);
-        List<TsKvEntry> latestEntries = Lists.newArrayListWithExpectedSize(keys.size());
-        keys.forEach(key -> Validator.validateString(key, "Incorrect key " + key));
-        keys.forEach(key -> latestEntries.add(timeseriesLatestDao.findLatestSync(tenantId, entityId, key)));
-        return latestEntries;
-    }
-
     @Override
     public ListenableFuture<List<TsKvEntry>> findAllLatest(TenantId tenantId, EntityId entityId) {
         validate(entityId);
@@ -165,7 +158,7 @@ public class BaseTimeseriesService implements TimeseriesService {
     @Override
     public ListenableFuture<Integer> save(TenantId tenantId, EntityId entityId, TsKvEntry tsKvEntry) {
         validate(entityId);
-        List<ListenableFuture<Integer>> futures = Lists.newArrayListWithExpectedSize(INSERTS_PER_ENTRY);
+        List<ListenableFuture<Integer>> futures = new ArrayList<>(INSERTS_PER_ENTRY);
         saveAndRegisterFutures(tenantId, futures, entityId, tsKvEntry, 0L);
         return Futures.transform(Futures.allAsList(futures), SUM_ALL_INTEGERS, MoreExecutors.directExecutor());
     }
@@ -182,7 +175,7 @@ public class BaseTimeseriesService implements TimeseriesService {
 
     private ListenableFuture<Integer> doSave(TenantId tenantId, EntityId entityId, List<TsKvEntry> tsKvEntries, long ttl, boolean saveLatest) {
         int inserts = saveLatest ? INSERTS_PER_ENTRY : INSERTS_PER_ENTRY_WITHOUT_LATEST;
-        List<ListenableFuture<Integer>> futures = Lists.newArrayListWithExpectedSize(tsKvEntries.size() * inserts);
+        List<ListenableFuture<Integer>> futures = new ArrayList<>(tsKvEntries.size() * inserts);
         for (TsKvEntry tsKvEntry : tsKvEntries) {
             if (saveLatest) {
                 saveAndRegisterFutures(tenantId, futures, entityId, tsKvEntry, ttl);
@@ -195,7 +188,7 @@ public class BaseTimeseriesService implements TimeseriesService {
 
     @Override
     public ListenableFuture<List<Void>> saveLatest(TenantId tenantId, EntityId entityId, List<TsKvEntry> tsKvEntries) {
-        List<ListenableFuture<Void>> futures = Lists.newArrayListWithExpectedSize(tsKvEntries.size());
+        List<ListenableFuture<Void>> futures = new ArrayList<>(tsKvEntries.size());
         for (TsKvEntry tsKvEntry : tsKvEntries) {
             futures.add(timeseriesLatestDao.saveLatest(tenantId, entityId, tsKvEntry));
         }
@@ -242,7 +235,7 @@ public class BaseTimeseriesService implements TimeseriesService {
     public ListenableFuture<List<TsKvLatestRemovingResult>> remove(TenantId tenantId, EntityId entityId, List<DeleteTsKvQuery> deleteTsKvQueries) {
         validate(entityId);
         deleteTsKvQueries.forEach(BaseTimeseriesService::validate);
-        List<ListenableFuture<TsKvLatestRemovingResult>> futures = Lists.newArrayListWithExpectedSize(deleteTsKvQueries.size() * DELETES_PER_ENTRY);
+        List<ListenableFuture<TsKvLatestRemovingResult>> futures = new ArrayList<>(deleteTsKvQueries.size() * DELETES_PER_ENTRY);
         for (DeleteTsKvQuery tsKvQuery : deleteTsKvQueries) {
             deleteAndRegisterFutures(tenantId, futures, entityId, tsKvQuery);
         }
@@ -252,7 +245,7 @@ public class BaseTimeseriesService implements TimeseriesService {
     @Override
     public ListenableFuture<List<TsKvLatestRemovingResult>> removeLatest(TenantId tenantId, EntityId entityId, Collection<String> keys) {
         validate(entityId);
-        List<ListenableFuture<TsKvLatestRemovingResult>> futures = Lists.newArrayListWithExpectedSize(keys.size());
+        List<ListenableFuture<TsKvLatestRemovingResult>> futures = new ArrayList<>(keys.size());
         for (String key : keys) {
             DeleteTsKvQuery query = new BaseDeleteTsKvQuery(key, 0, System.currentTimeMillis(), false);
             futures.add(timeseriesLatestDao.removeLatest(tenantId, entityId, query));
@@ -281,7 +274,7 @@ public class BaseTimeseriesService implements TimeseriesService {
     }
 
     private static void validate(EntityId entityId) {
-        Validator.validateEntityId(entityId, "Incorrect entityId " + entityId);
+        Validator.validateEntityId(entityId, id -> "Incorrect entityId " + id);
     }
 
     private void validate(ReadTsKvQuery query) {
diff --git a/dao/src/main/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDao.java b/dao/src/main/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDao.java
index 6b2ab7e07b..383c592a31 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDao.java
@@ -54,9 +54,9 @@ import org.thingsboard.server.dao.sqlts.AggregationTimeseriesDao;
 import org.thingsboard.server.dao.util.NoSqlTsDao;
 import org.thingsboard.server.dao.util.TimeUtils;
 
-import javax.annotation.Nullable;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.Nullable;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
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 8d1a45789d..d901ae950e 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
@@ -18,6 +18,7 @@ package org.thingsboard.server.dao.usagerecord;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.thingsboard.server.common.data.ApiFeature;
 import org.thingsboard.server.common.data.ApiUsageRecordKey;
 import org.thingsboard.server.common.data.ApiUsageState;
@@ -35,6 +36,8 @@ import org.thingsboard.server.common.data.kv.StringDataEntry;
 import org.thingsboard.server.common.data.kv.TsKvEntry;
 import org.thingsboard.server.common.data.tenant.profile.TenantProfileConfiguration;
 import org.thingsboard.server.dao.entity.AbstractEntityService;
+import org.thingsboard.server.dao.eventsourcing.DeleteEntityEvent;
+import org.thingsboard.server.dao.eventsourcing.SaveEntityEvent;
 import org.thingsboard.server.dao.service.DataValidator;
 import org.thingsboard.server.dao.tenant.TenantProfileDao;
 import org.thingsboard.server.dao.tenant.TenantService;
@@ -68,25 +71,33 @@ public class ApiUsageStateServiceImpl extends AbstractEntityService implements A
         this.apiUsageStateValidator = apiUsageStateValidator;
     }
 
+    @Transactional
     @Override
-    public void deleteApiUsageStateByTenantId(TenantId tenantId) {
-        log.trace("Executing deleteUsageRecordsByTenantId [{}]", tenantId);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        apiUsageStateDao.deleteApiUsageStateByTenantId(tenantId);
+    public void deleteApiUsageStateByEntityId(EntityId entityId) {
+        log.trace("Executing deleteApiUsageStateByEntityId [{}]", entityId);
+        validateId(entityId.getId(), id -> "Invalid entity id " + id);
+        ApiUsageState apiUsageState = findApiUsageStateByEntityId(entityId);
+        deleteApiUsageState(apiUsageState);
+    }
+
+    private void deleteApiUsageState(ApiUsageState apiUsageState) {
+        if (apiUsageState != null) {
+            apiUsageStateDao.removeById(apiUsageState.getTenantId(), apiUsageState.getUuidId());
+            eventPublisher.publishEvent(DeleteEntityEvent.builder().tenantId(apiUsageState.getTenantId()).entityId(apiUsageState.getId()).build());
+        }
     }
 
     @Override
-    public void deleteApiUsageStateByEntityId(EntityId entityId) {
-        log.trace("Executing deleteApiUsageStateByEntityId [{}]", entityId);
-        validateId(entityId.getId(), "Invalid entity id");
-        apiUsageStateDao.deleteApiUsageStateByEntityId(entityId);
+    public void deleteEntity(TenantId tenantId, EntityId id, boolean force) {
+        ApiUsageState apiUsageState = findApiUsageStateById(tenantId, (ApiUsageStateId) id);
+        deleteApiUsageState(apiUsageState);
     }
 
     @Override
     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);
@@ -141,29 +152,32 @@ 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!");
-        return apiUsageStateDao.save(apiUsageState.getTenantId(), apiUsageState);
+        ApiUsageState savedState = apiUsageStateDao.save(apiUsageState.getTenantId(), apiUsageState);
+        eventPublisher.publishEvent(SaveEntityEvent.builder().tenantId(savedState.getTenantId()).entityId(savedState.getId())
+                .entity(savedState).build());
+        return savedState;
     }
 
     @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());
     }
 
@@ -172,6 +186,12 @@ public class ApiUsageStateServiceImpl extends AbstractEntityService implements A
         return Optional.ofNullable(findApiUsageStateById(tenantId, new ApiUsageStateId(entityId.getId())));
     }
 
+    @Transactional
+    @Override
+    public void deleteByTenantId(TenantId tenantId) {
+        deleteApiUsageStateByEntityId(tenantId);
+    }
+
     @Override
     public EntityType getEntityType() {
         return EntityType.API_USAGE_STATE;
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..90084e1a3f 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,10 +259,10 @@ 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);
+        userSettingsDao.removeByUserId(tenantId, userId);
 
         userDao.removeById(tenantId, userId.getId());
         eventPublisher.publishEvent(new UserCredentialsInvalidationEvent(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,26 @@ 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 void deleteAllByTenantId(TenantId tenantId) {
+        log.trace("Executing deleteByTenantId, tenantId [{}]", tenantId);
+        usersRemover.removeEntities(tenantId, tenantId);
+    }
+
+    @Override
+    public void deleteByTenantId(TenantId tenantId) {
+        deleteAllByTenantId(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 +344,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);
@@ -508,6 +519,18 @@ public class UserServiceImpl extends AbstractEntityService implements UserServic
         }
     };
 
+    private final PaginatedRemover<TenantId, User> usersRemover = new PaginatedRemover<>() {
+        @Override
+        protected PageData<User> findEntities(TenantId tenantId, TenantId id, PageLink pageLink) {
+            return findUsersByTenantId(tenantId, pageLink);
+        }
+
+        @Override
+        protected void removeEntity(TenantId tenantId, User user) {
+            deleteUser(tenantId, user);
+        }
+    };
+
     @Override
     public Optional<HasId<?>> findEntity(TenantId tenantId, EntityId entityId) {
         return Optional.ofNullable(findUserById(tenantId, new UserId(entityId.getId())));
diff --git a/dao/src/main/java/org/thingsboard/server/dao/user/UserSettingsDao.java b/dao/src/main/java/org/thingsboard/server/dao/user/UserSettingsDao.java
index 23734118a9..bc93a23568 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/user/UserSettingsDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/user/UserSettingsDao.java
@@ -16,6 +16,7 @@
 package org.thingsboard.server.dao.user;
 
 import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.settings.UserSettings;
 import org.thingsboard.server.common.data.settings.UserSettingsCompositeKey;
 import org.thingsboard.server.common.data.settings.UserSettingsType;
@@ -30,6 +31,8 @@ public interface UserSettingsDao {
 
     void removeById(TenantId tenantId, UserSettingsCompositeKey key);
 
+    void removeByUserId(TenantId tenantId, UserId userId);
+
     List<UserSettings> findByTypeAndPath(TenantId tenantId, UserSettingsType type, String... path);
 
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/user/UserSettingsRedisCache.java b/dao/src/main/java/org/thingsboard/server/dao/user/UserSettingsRedisCache.java
index c05fef0617..1f0d74420d 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/user/UserSettingsRedisCache.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/user/UserSettingsRedisCache.java
@@ -21,7 +21,7 @@ import org.springframework.stereotype.Service;
 import org.thingsboard.server.cache.CacheSpecsMap;
 import org.thingsboard.server.cache.RedisTbTransactionalCache;
 import org.thingsboard.server.cache.TBRedisCacheConfiguration;
-import org.thingsboard.server.cache.TbFSTRedisSerializer;
+import org.thingsboard.server.cache.TbJsonRedisSerializer;
 import org.thingsboard.server.common.data.CacheConstants;
 import org.thingsboard.server.common.data.settings.UserSettings;
 import org.thingsboard.server.common.data.settings.UserSettingsCompositeKey;
@@ -31,6 +31,6 @@ import org.thingsboard.server.common.data.settings.UserSettingsCompositeKey;
 public class UserSettingsRedisCache extends RedisTbTransactionalCache<UserSettingsCompositeKey, UserSettings> {
 
     public UserSettingsRedisCache(TBRedisCacheConfiguration configuration, CacheSpecsMap cacheSpecsMap, RedisConnectionFactory connectionFactory) {
-        super(CacheConstants.USER_SETTINGS_CACHE, cacheSpecsMap, connectionFactory, configuration, new TbFSTRedisSerializer<>());
+        super(CacheConstants.USER_SETTINGS_CACHE, cacheSpecsMap, connectionFactory, configuration, new TbJsonRedisSerializer<>(UserSettings.class));
     }
 }
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/util/AbstractBufferedRateExecutor.java b/dao/src/main/java/org/thingsboard/server/dao/util/AbstractBufferedRateExecutor.java
index 8474af9584..48b2471217 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/util/AbstractBufferedRateExecutor.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/util/AbstractBufferedRateExecutor.java
@@ -40,7 +40,7 @@ import org.thingsboard.server.dao.nosql.CassandraStatementTask;
 import org.thingsboard.server.common.data.limit.LimitedApi;
 import org.thingsboard.server.cache.limits.RateLimitService;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
diff --git a/dao/src/main/java/org/thingsboard/server/dao/util/mapping/AbstractJsonSqlTypeDescriptor.java b/dao/src/main/java/org/thingsboard/server/dao/util/mapping/AbstractJsonSqlTypeDescriptor.java
deleted file mode 100644
index 7dba00c7bb..0000000000
--- a/dao/src/main/java/org/thingsboard/server/dao/util/mapping/AbstractJsonSqlTypeDescriptor.java
+++ /dev/null
@@ -1,78 +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.dao.util.mapping;
-
-import org.hibernate.type.descriptor.ValueExtractor;
-import org.hibernate.type.descriptor.WrapperOptions;
-import org.hibernate.type.descriptor.java.JavaTypeDescriptor;
-import org.hibernate.type.descriptor.sql.BasicExtractor;
-import org.hibernate.type.descriptor.sql.SqlTypeDescriptor;
-
-import java.sql.CallableStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Types;
-
-public abstract class AbstractJsonSqlTypeDescriptor
-        implements SqlTypeDescriptor {
-
-    @Override
-    public int getSqlType() {
-        return Types.VARCHAR;
-    }
-
-    @Override
-    public boolean canBeRemapped() {
-        return true;
-    }
-
-    @Override
-    public <X> ValueExtractor<X> getExtractor(
-            final JavaTypeDescriptor<X> javaTypeDescriptor) {
-        return new BasicExtractor<X>(javaTypeDescriptor, this) {
-            @Override
-            protected X doExtract(
-                    ResultSet rs,
-                    String name,
-                    WrapperOptions options) throws SQLException {
-                return javaTypeDescriptor.wrap(
-                        rs.getObject(name), options
-                );
-            }
-
-            @Override
-            protected X doExtract(
-                    CallableStatement statement,
-                    int index,
-                    WrapperOptions options) throws SQLException {
-                return javaTypeDescriptor.wrap(
-                        statement.getObject(index), options
-                );
-            }
-
-            @Override
-            protected X doExtract(
-                    CallableStatement statement,
-                    String name,
-                    WrapperOptions options) throws SQLException {
-                return javaTypeDescriptor.wrap(
-                        statement.getObject(name), options
-                );
-            }
-        };
-    }
-
-}
\ No newline at end of file
diff --git a/dao/src/main/java/org/thingsboard/server/dao/util/mapping/JsonBinarySqlTypeDescriptor.java b/dao/src/main/java/org/thingsboard/server/dao/util/mapping/JsonBinarySqlTypeDescriptor.java
deleted file mode 100644
index 083ffdb4ef..0000000000
--- a/dao/src/main/java/org/thingsboard/server/dao/util/mapping/JsonBinarySqlTypeDescriptor.java
+++ /dev/null
@@ -1,52 +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.dao.util.mapping;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import org.hibernate.type.descriptor.ValueBinder;
-import org.hibernate.type.descriptor.WrapperOptions;
-import org.hibernate.type.descriptor.java.JavaTypeDescriptor;
-import org.hibernate.type.descriptor.sql.BasicBinder;
-
-import java.sql.CallableStatement;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.sql.Types;
-
-public class JsonBinarySqlTypeDescriptor extends AbstractJsonSqlTypeDescriptor {
-
-    public static final JsonBinarySqlTypeDescriptor INSTANCE = new JsonBinarySqlTypeDescriptor();
-
-    @Override
-    public int getSqlType() {
-        return Types.OTHER;
-    }
-
-    @Override
-    public <X> ValueBinder<X> getBinder(final JavaTypeDescriptor<X> javaTypeDescriptor) {
-        return new BasicBinder<X>(javaTypeDescriptor, this) {
-            @Override
-            protected void doBind(PreparedStatement st, X value, int index, WrapperOptions options) throws SQLException {
-                st.setObject(index, javaTypeDescriptor.unwrap(value, JsonNode.class, options), getSqlType());
-            }
-
-            @Override
-            protected void doBind(CallableStatement st, X value, String name, WrapperOptions options) throws SQLException {
-                st.setObject(name, javaTypeDescriptor.unwrap(value, JsonNode.class, options), getSqlType());
-            }
-        };
-    }
-}
diff --git a/dao/src/main/java/org/thingsboard/server/dao/util/mapping/JsonBinaryType.java b/dao/src/main/java/org/thingsboard/server/dao/util/mapping/JsonBinaryType.java
deleted file mode 100644
index c376f1f43f..0000000000
--- a/dao/src/main/java/org/thingsboard/server/dao/util/mapping/JsonBinaryType.java
+++ /dev/null
@@ -1,46 +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.dao.util.mapping;
-
-import org.hibernate.type.AbstractSingleColumnStandardBasicType;
-import org.hibernate.usertype.DynamicParameterizedType;
-
-import java.util.Properties;
-
-public class JsonBinaryType extends AbstractSingleColumnStandardBasicType<Object> implements DynamicParameterizedType {
-
-    public JsonBinaryType() {
-        super(
-                JsonBinarySqlTypeDescriptor.INSTANCE,
-                new JsonTypeDescriptor()
-        );
-    }
-
-    public String getName() {
-        return "jsonb";
-    }
-
-    @Override
-    protected boolean registerUnderJavaType() {
-        return true;
-    }
-
-    @Override
-    public void setParameterValues(Properties parameters) {
-        ((JsonTypeDescriptor) getJavaTypeDescriptor())
-                .setParameterValues(parameters);
-    }
-}
diff --git a/dao/src/main/java/org/thingsboard/server/dao/util/mapping/JsonConverter.java b/dao/src/main/java/org/thingsboard/server/dao/util/mapping/JsonConverter.java
new file mode 100644
index 0000000000..6359ee540f
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/util/mapping/JsonConverter.java
@@ -0,0 +1,34 @@
+/**
+ * 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.util.mapping;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import jakarta.persistence.AttributeConverter;
+import jakarta.persistence.Converter;
+import org.thingsboard.common.util.JacksonUtil;
+
+@Converter
+public class JsonConverter implements AttributeConverter<JsonNode, String> {
+    @Override
+    public String convertToDatabaseColumn(JsonNode jsonNode) {
+        return JacksonUtil.toString(jsonNode);
+    }
+
+    @Override
+    public JsonNode convertToEntityAttribute(String s) {
+        return JacksonUtil.toJsonNode(s);
+    }
+}
diff --git a/dao/src/main/java/org/thingsboard/server/dao/util/mapping/JsonStringSqlTypeDescriptor.java b/dao/src/main/java/org/thingsboard/server/dao/util/mapping/JsonStringSqlTypeDescriptor.java
deleted file mode 100644
index 2663ceb4f7..0000000000
--- a/dao/src/main/java/org/thingsboard/server/dao/util/mapping/JsonStringSqlTypeDescriptor.java
+++ /dev/null
@@ -1,61 +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.dao.util.mapping;
-
-import org.hibernate.type.descriptor.ValueBinder;
-import org.hibernate.type.descriptor.WrapperOptions;
-import org.hibernate.type.descriptor.java.JavaTypeDescriptor;
-import org.hibernate.type.descriptor.sql.BasicBinder;
-
-import java.sql.CallableStatement;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-
-public class JsonStringSqlTypeDescriptor
-        extends AbstractJsonSqlTypeDescriptor {
-
-    public static final JsonStringSqlTypeDescriptor INSTANCE =
-            new JsonStringSqlTypeDescriptor();
-
-    @Override
-    public <X> ValueBinder<X> getBinder(
-            final JavaTypeDescriptor<X> javaTypeDescriptor) {
-        return new BasicBinder<X>(javaTypeDescriptor, this) {
-            @Override
-            protected void doBind(
-                    PreparedStatement st,
-                    X value,
-                    int index,
-                    WrapperOptions options) throws SQLException {
-                st.setString(index,
-                        javaTypeDescriptor.unwrap(value, String.class, options)
-                );
-            }
-
-            @Override
-            protected void doBind(
-                    CallableStatement st,
-                    X value,
-                    String name,
-                    WrapperOptions options)
-                    throws SQLException {
-                st.setString(name,
-                        javaTypeDescriptor.unwrap(value, String.class, options
-                        ));
-            }
-        };
-    }
-}
\ No newline at end of file
diff --git a/dao/src/main/java/org/thingsboard/server/dao/util/mapping/JsonStringType.java b/dao/src/main/java/org/thingsboard/server/dao/util/mapping/JsonStringType.java
deleted file mode 100644
index 9d597089f2..0000000000
--- a/dao/src/main/java/org/thingsboard/server/dao/util/mapping/JsonStringType.java
+++ /dev/null
@@ -1,48 +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.dao.util.mapping;
-
-import org.hibernate.type.AbstractSingleColumnStandardBasicType;
-import org.hibernate.usertype.DynamicParameterizedType;
-
-import java.util.Properties;
-
-public class JsonStringType
-        extends AbstractSingleColumnStandardBasicType<Object>
-        implements DynamicParameterizedType {
-
-    public JsonStringType() {
-        super(
-                JsonStringSqlTypeDescriptor.INSTANCE,
-                new JsonTypeDescriptor()
-        );
-    }
-
-    public String getName() {
-        return "json";
-    }
-
-    @Override
-    protected boolean registerUnderJavaType() {
-        return true;
-    }
-
-    @Override
-    public void setParameterValues(Properties parameters) {
-        ((JsonTypeDescriptor) getJavaTypeDescriptor())
-                .setParameterValues(parameters);
-    }
-}
\ No newline at end of file
diff --git a/dao/src/main/java/org/thingsboard/server/dao/util/mapping/JsonTypeDescriptor.java b/dao/src/main/java/org/thingsboard/server/dao/util/mapping/JsonTypeDescriptor.java
deleted file mode 100644
index 492cacaa2b..0000000000
--- a/dao/src/main/java/org/thingsboard/server/dao/util/mapping/JsonTypeDescriptor.java
+++ /dev/null
@@ -1,96 +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.dao.util.mapping;
-
-import org.hibernate.type.descriptor.WrapperOptions;
-import org.hibernate.type.descriptor.java.AbstractTypeDescriptor;
-import org.hibernate.type.descriptor.java.MutableMutabilityPlan;
-import org.hibernate.usertype.DynamicParameterizedType;
-import org.thingsboard.common.util.JacksonUtil;
-
-import java.util.Properties;
-
-/**
- * Created by Valerii Sosliuk on 5/12/2017.
- */
-public class JsonTypeDescriptor
-        extends AbstractTypeDescriptor<Object>
-        implements DynamicParameterizedType {
-
-    private Class<?> jsonObjectClass;
-
-    @Override
-    public void setParameterValues(Properties parameters) {
-        jsonObjectClass = ( (ParameterType) parameters.get( PARAMETER_TYPE ) )
-                .getReturnedClass();
-
-    }
-
-    public JsonTypeDescriptor() {
-        super( Object.class, new MutableMutabilityPlan<Object>() {
-            @Override
-            protected Object deepCopyNotNull(Object value) {
-                return JacksonUtil.clone(value);
-            }
-        });
-    }
-
-    @Override
-    public boolean areEqual(Object one, Object another) {
-        if ( one == another ) {
-            return true;
-        }
-        if ( one == null || another == null ) {
-            return false;
-        }
-        return JacksonUtil.toJsonNode(JacksonUtil.toString(one)).equals(
-                JacksonUtil.toJsonNode(JacksonUtil.toString(another)));
-    }
-
-    @Override
-    public String toString(Object value) {
-        return JacksonUtil.toString(value);
-    }
-
-    @Override
-    public Object fromString(String string) {
-        return JacksonUtil.fromString(string, jsonObjectClass);
-    }
-
-    @SuppressWarnings({ "unchecked" })
-    @Override
-    public <X> X unwrap(Object value, Class<X> type, WrapperOptions options) {
-        if ( value == null ) {
-            return null;
-        }
-        if ( String.class.isAssignableFrom( type ) ) {
-            return (X) toString(value);
-        }
-        if ( Object.class.isAssignableFrom( type ) ) {
-            return (X) JacksonUtil.toJsonNode(toString(value));
-        }
-        throw unknownUnwrap( type );
-    }
-
-    @Override
-    public <X> Object wrap(X value, WrapperOptions options) {
-        if ( value == null ) {
-            return null;
-        }
-        return fromString(value.toString());
-    }
-
-}
\ No newline at end of file
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..f2506a2d9b 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,11 +110,16 @@ 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());
     }
 
+    @Override
+    public void deleteEntity(TenantId tenantId, EntityId id, boolean force) {
+        deleteWidgetType(tenantId, (WidgetTypeId) id);
+    }
+
     @Override
     public PageData<WidgetTypeInfo> findSystemWidgetTypesByPageLink(TenantId tenantId, boolean fullSearch, DeprecatedFilter deprecatedFilter, List<String> widgetTypes, PageLink pageLink) {
         log.trace("Executing findSystemWidgetTypesByPageLink, fullSearch [{}], deprecatedFilter [{}], widgetTypes [{}], pageLink [{}]", fullSearch, deprecatedFilter, widgetTypes, pageLink);
@@ -126,7 +131,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 +140,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 +148,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 +167,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 +176,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,10 +227,15 @@ 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);
     }
 
+    @Override
+    public void deleteByTenantId(TenantId tenantId) {
+        deleteWidgetTypesByTenantId(tenantId);
+    }
+
     @Override
     public Optional<HasId<?>> findEntity(TenantId tenantId, EntityId entityId) {
         return Optional.ofNullable(findWidgetTypeById(tenantId, new WidgetTypeId(entityId.getId())));
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..ae53c70ec8 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,20 +91,29 @@ public class WidgetsBundleServiceImpl implements WidgetsBundleService {
     @Override
     public void deleteWidgetsBundle(TenantId tenantId, WidgetsBundleId widgetsBundleId) {
         log.trace("Executing deleteWidgetsBundle [{}]", widgetsBundleId);
-        Validator.validateId(widgetsBundleId, "Incorrect widgetsBundleId " + widgetsBundleId);
-        WidgetsBundle widgetsBundle = findWidgetsBundleById(tenantId, widgetsBundleId);
+        Validator.validateId(widgetsBundleId, id -> "Incorrect widgetsBundleId " + id);
+        deleteEntity(tenantId, widgetsBundleId, false);
+    }
+
+    @Override
+    public void deleteEntity(TenantId tenantId, EntityId id, boolean force) {
+        WidgetsBundle widgetsBundle = findWidgetsBundleById(tenantId, (WidgetsBundleId) id);
         if (widgetsBundle == null) {
-            throw new IncorrectParameterException("Unable to delete non-existent widgets bundle.");
+            if (force) {
+                return;
+            } else {
+                throw new IncorrectParameterException("Unable to delete non-existent widgets bundle.");
+            }
         }
-        eventPublisher.publishEvent(DeleteEntityEvent.builder().tenantId(tenantId).entityId(widgetsBundleId).build());
-        widgetsBundleDao.removeById(tenantId, widgetsBundleId.getId());
+        eventPublisher.publishEvent(DeleteEntityEvent.builder().tenantId(tenantId).entityId(id).build());
+        widgetsBundleDao.removeById(tenantId, id.getId());
     }
 
     @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 +143,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 +151,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 +159,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 +167,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,18 +184,18 @@ 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);
     }
 
     @Override
-    public Optional<HasId<?>> findEntity(TenantId tenantId, EntityId entityId) {
-        return Optional.ofNullable(findWidgetsBundleById(tenantId, new WidgetsBundleId(entityId.getId())));
+    public void deleteByTenantId(TenantId tenantId) {
+        deleteWidgetsBundlesByTenantId(tenantId);
     }
 
     @Override
-    public void deleteEntity(TenantId tenantId, EntityId id) {
-        deleteWidgetsBundle(tenantId, (WidgetsBundleId) id);
+    public Optional<HasId<?>> findEntity(TenantId tenantId, EntityId entityId) {
+        return Optional.ofNullable(findWidgetsBundleById(tenantId, new WidgetsBundleId(entityId.getId())));
     }
 
     @Override
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 cdd4edea06..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;
 $$;
@@ -103,17 +103,16 @@ CREATE TABLE IF NOT EXISTS audit_log (
 ) PARTITION BY RANGE (created_time);
 
 CREATE TABLE IF NOT EXISTS attribute_kv (
-  entity_type varchar(255),
   entity_id uuid,
-  attribute_type varchar(255),
-  attribute_key varchar(255),
+  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_type, entity_id, attribute_type, attribute_key)
+  CONSTRAINT attribute_kv_pkey PRIMARY KEY (entity_id, attribute_type, attribute_key)
 );
 
 CREATE TABLE IF NOT EXISTS component_descriptor (
@@ -550,16 +549,17 @@ CREATE TABLE IF NOT EXISTS ts_kv_latest
     CONSTRAINT ts_kv_latest_pkey PRIMARY KEY (entity_id, key)
 );
 
-CREATE TABLE IF NOT EXISTS ts_kv_dictionary
+CREATE TABLE IF NOT EXISTS key_dictionary
 (
     key    varchar(255) NOT NULL,
     key_id serial UNIQUE,
-    CONSTRAINT ts_key_id_pkey PRIMARY KEY (key)
+    CONSTRAINT key_dictionary_id_pkey PRIMARY KEY (key)
 );
 
 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
 );
@@ -864,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),
@@ -884,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/main/resources/sql/schema-timescale.sql b/dao/src/main/resources/sql/schema-timescale.sql
index 8e151b0add..ecd8aa1e9d 100644
--- a/dao/src/main/resources/sql/schema-timescale.sql
+++ b/dao/src/main/resources/sql/schema-timescale.sql
@@ -28,10 +28,10 @@ CREATE TABLE IF NOT EXISTS ts_kv (
     CONSTRAINT ts_kv_pkey PRIMARY KEY (entity_id, key, ts)
 );
 
-CREATE TABLE IF NOT EXISTS ts_kv_dictionary (
+CREATE TABLE IF NOT EXISTS key_dictionary (
     key varchar(255) NOT NULL,
     key_id serial UNIQUE,
-    CONSTRAINT ts_key_id_pkey PRIMARY KEY (key)
+    CONSTRAINT key_dictionary_id_pkey PRIMARY KEY (key)
 );
 
 CREATE TABLE IF NOT EXISTS ts_kv_latest (
@@ -104,7 +104,7 @@ BEGIN
     WHILE FOUND
         LOOP
             EXECUTE format(
-                    'select attribute_kv.long_v from attribute_kv where attribute_kv.entity_id = %L and attribute_kv.attribute_key = %L',
+                    'select attribute_kv.long_v from attribute_kv where attribute_kv.entity_id = %L and attribute_kv.attribute_key = (select key_id from key_dictionary where key = %L)',
                     tenant_id_record, 'TTL') INTO tenant_ttl;
             if tenant_ttl IS NULL THEN
                 tenant_ttl := system_ttl;
@@ -122,7 +122,7 @@ BEGIN
                 SELECT customer.id AS customer_id FROM customer WHERE customer.tenant_id = tenant_id_record
                 LOOP
                     EXECUTE format(
-                            'select attribute_kv.long_v from attribute_kv where attribute_kv.entity_id = %L and attribute_kv.attribute_key = %L',
+                            'select attribute_kv.long_v from attribute_kv where attribute_kv.entity_id = %L and attribute_kv.attribute_key = (select key_id from key_dictionary where key = %L)',
                             customer_id_record, 'TTL') INTO customer_ttl;
                     IF customer_ttl IS NULL THEN
                         customer_ttl_ts := tenant_ttl_ts;
diff --git a/dao/src/main/resources/sql/schema-ts-psql.sql b/dao/src/main/resources/sql/schema-ts-psql.sql
index 186c5855ca..fa8461c035 100644
--- a/dao/src/main/resources/sql/schema-ts-psql.sql
+++ b/dao/src/main/resources/sql/schema-ts-psql.sql
@@ -27,11 +27,11 @@ CREATE TABLE IF NOT EXISTS ts_kv
     CONSTRAINT ts_kv_pkey PRIMARY KEY (entity_id, key, ts)
 ) PARTITION BY RANGE (ts);
 
-CREATE TABLE IF NOT EXISTS ts_kv_dictionary
+CREATE TABLE IF NOT EXISTS key_dictionary
 (
     key    varchar(255) NOT NULL,
     key_id serial UNIQUE,
-    CONSTRAINT ts_key_id_pkey PRIMARY KEY (key)
+    CONSTRAINT key_dictionary_id_pkey PRIMARY KEY (key)
 );
 
 CREATE OR REPLACE PROCEDURE drop_partitions_by_system_ttl(IN partition_type varchar, IN system_ttl bigint, INOUT deleted bigint)
@@ -75,7 +75,7 @@ BEGIN
                                      WHERE schemaname = 'public'
                                        AND tablename like 'ts_kv_' || '%'
                                        AND tablename != 'ts_kv_latest'
-                                       AND tablename != 'ts_kv_dictionary'
+                                       AND tablename != 'key_dictionary'
                                        AND tablename != 'ts_kv_indefinite'
                                        AND tablename != partition_by_max_ttl_date
                         LOOP
@@ -96,7 +96,7 @@ BEGIN
                                              WHERE schemaname = 'public'
                                                AND tablename like 'ts_kv_' || '%'
                                                AND tablename != 'ts_kv_latest'
-                                               AND tablename != 'ts_kv_dictionary'
+                                               AND tablename != 'key_dictionary'
                                                AND tablename != 'ts_kv_indefinite'
                                                AND tablename != partition_by_max_ttl_date
                                 LOOP
@@ -138,7 +138,7 @@ BEGIN
                                                      WHERE schemaname = 'public'
                                                        AND tablename like 'ts_kv_' || '%'
                                                        AND tablename != 'ts_kv_latest'
-                                                       AND tablename != 'ts_kv_dictionary'
+                                                       AND tablename != 'key_dictionary'
                                                        AND tablename != 'ts_kv_indefinite'
                                                        AND tablename != partition_by_max_ttl_date
                                         LOOP
@@ -272,7 +272,7 @@ BEGIN
     WHILE FOUND
         LOOP
             EXECUTE format(
-                    'select attribute_kv.long_v from attribute_kv where attribute_kv.entity_id = %L and attribute_kv.attribute_key = %L',
+                    'select attribute_kv.long_v from attribute_kv where attribute_kv.entity_id = %L and attribute_kv.attribute_key = (select key_id from key_dictionary where key = %L)',
                     tenant_id_record, 'TTL') INTO tenant_ttl;
             if tenant_ttl IS NULL THEN
                 tenant_ttl := system_ttl;
@@ -290,7 +290,7 @@ BEGIN
                 SELECT customer.id AS customer_id FROM customer WHERE customer.tenant_id = tenant_id_record
                 LOOP
                     EXECUTE format(
-                            'select attribute_kv.long_v from attribute_kv where attribute_kv.entity_id = %L and attribute_kv.attribute_key = %L',
+                            'select attribute_kv.long_v from attribute_kv where attribute_kv.entity_id = %L and attribute_kv.attribute_key = (select key_id from key_dictionary where key = %L)',
                             customer_id_record, 'TTL') INTO customer_ttl;
                     IF customer_ttl IS NULL THEN
                         customer_ttl_ts := tenant_ttl_ts;
diff --git a/dao/src/main/resources/sql/schema-views-and-functions.sql b/dao/src/main/resources/sql/schema-views-and-functions.sql
index 09c377014d..31219ced18 100644
--- a/dao/src/main/resources/sql/schema-views-and-functions.sql
+++ b/dao/src/main/resources/sql/schema-views-and-functions.sql
@@ -23,7 +23,7 @@ SELECT d.*
        , COALESCE(da.bool_v, FALSE) as active
 FROM device d
          LEFT JOIN customer c ON c.id = d.customer_id
-         LEFT JOIN attribute_kv da ON da.entity_type = 'DEVICE' AND da.entity_id = d.id AND da.attribute_type = 'SERVER_SCOPE' AND da.attribute_key = 'active';
+         LEFT JOIN attribute_kv da ON da.entity_id = d.id AND da.attribute_type = 2 AND da.attribute_key = (select key_id from key_dictionary  where key = 'active');
 
 DROP VIEW IF EXISTS device_info_active_ts_view CASCADE;
 CREATE OR REPLACE VIEW device_info_active_ts_view AS
@@ -34,7 +34,7 @@ SELECT d.*
        , COALESCE(dt.bool_v, FALSE) as active
 FROM device d
          LEFT JOIN customer c ON c.id = d.customer_id
-         LEFT JOIN ts_kv_latest dt ON dt.entity_id = d.id and dt.key = (select key_id from ts_kv_dictionary where key = 'active');
+         LEFT JOIN ts_kv_latest dt ON dt.entity_id = d.id and dt.key = (select key_id from key_dictionary where key = 'active');
 
 DROP VIEW IF EXISTS device_info_view CASCADE;
 CREATE OR REPLACE VIEW device_info_view AS SELECT * FROM device_info_active_attribute_view;
@@ -291,3 +291,75 @@ CREATE OR REPLACE VIEW widget_type_info_view AS
 SELECT t.*
      , COALESCE((t.descriptor::json->>'type')::text, '') as widget_type
 FROM widget_type t;
+
+CREATE OR REPLACE PROCEDURE cleanup_timeseries_by_ttl(IN null_uuid uuid,
+                                                      IN system_ttl bigint, INOUT deleted bigint)
+    LANGUAGE plpgsql AS
+$$
+DECLARE
+    tenant_cursor CURSOR FOR select tenant.id as tenant_id
+                             from tenant;
+    tenant_id_record     uuid;
+    customer_id_record   uuid;
+    tenant_ttl           bigint;
+    customer_ttl         bigint;
+    deleted_for_entities bigint;
+    tenant_ttl_ts        bigint;
+    customer_ttl_ts      bigint;
+BEGIN
+    OPEN tenant_cursor;
+    FETCH tenant_cursor INTO tenant_id_record;
+    WHILE FOUND
+        LOOP
+            EXECUTE format(
+                    'select attribute_kv.long_v from attribute_kv where attribute_kv.entity_id = %L and attribute_kv.attribute_key = (select key_id from key_dictionary where key = %L)',
+                    tenant_id_record, 'TTL') INTO tenant_ttl;
+            if tenant_ttl IS NULL THEN
+                tenant_ttl := system_ttl;
+            END IF;
+            IF tenant_ttl > 0 THEN
+                tenant_ttl_ts := (EXTRACT(EPOCH FROM current_timestamp) * 1000 - tenant_ttl::bigint * 1000)::bigint;
+                deleted_for_entities := delete_device_records_from_ts_kv(tenant_id_record, null_uuid, tenant_ttl_ts);
+                deleted := deleted + deleted_for_entities;
+                RAISE NOTICE '% telemetry removed for devices where tenant_id = %', deleted_for_entities, tenant_id_record;
+                deleted_for_entities := delete_asset_records_from_ts_kv(tenant_id_record, null_uuid, tenant_ttl_ts);
+                deleted := deleted + deleted_for_entities;
+                RAISE NOTICE '% telemetry removed for assets where tenant_id = %', deleted_for_entities, tenant_id_record;
+            END IF;
+            FOR customer_id_record IN
+                SELECT customer.id AS customer_id FROM customer WHERE customer.tenant_id = tenant_id_record
+                LOOP
+                    EXECUTE format(
+                            'select attribute_kv.long_v from attribute_kv where attribute_kv.entity_id = %L and attribute_kv.attribute_key = (select key_id from key_dictionary where key = %L)',
+                            customer_id_record, 'TTL') INTO customer_ttl;
+                    IF customer_ttl IS NULL THEN
+                        customer_ttl_ts := tenant_ttl_ts;
+                    ELSE
+                        IF customer_ttl > 0 THEN
+                            customer_ttl_ts :=
+                                    (EXTRACT(EPOCH FROM current_timestamp) * 1000 -
+                                     customer_ttl::bigint * 1000)::bigint;
+                        END IF;
+                    END IF;
+                    IF customer_ttl_ts IS NOT NULL AND customer_ttl_ts > 0 THEN
+                        deleted_for_entities :=
+                                delete_customer_records_from_ts_kv(tenant_id_record, customer_id_record,
+                                                                   customer_ttl_ts);
+                        deleted := deleted + deleted_for_entities;
+                        RAISE NOTICE '% telemetry removed for customer with id = % where tenant_id = %', deleted_for_entities, customer_id_record, tenant_id_record;
+                        deleted_for_entities :=
+                                delete_device_records_from_ts_kv(tenant_id_record, customer_id_record,
+                                                                 customer_ttl_ts);
+                        deleted := deleted + deleted_for_entities;
+                        RAISE NOTICE '% telemetry removed for devices where tenant_id = % and customer_id = %', deleted_for_entities, tenant_id_record, customer_id_record;
+                        deleted_for_entities := delete_asset_records_from_ts_kv(tenant_id_record,
+                                                                                customer_id_record,
+                                                                                customer_ttl_ts);
+                        deleted := deleted + deleted_for_entities;
+                        RAISE NOTICE '% telemetry removed for assets where tenant_id = % and customer_id = %', deleted_for_entities, tenant_id_record, customer_id_record;
+                    END IF;
+                END LOOP;
+            FETCH tenant_cursor INTO tenant_id_record;
+        END LOOP;
+END
+$$;
\ No newline at end of file
diff --git a/dao/src/test/java/org/thingsboard/server/dao/AbstractRedisContainer.java b/dao/src/test/java/org/thingsboard/server/dao/AbstractRedisContainer.java
index 0c0a1c8ef8..d1f3839cf5 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/AbstractRedisContainer.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/AbstractRedisContainer.java
@@ -26,7 +26,7 @@ import java.util.List;
 public class AbstractRedisContainer {
 
     @ClassRule(order = 0)
-    public static GenericContainer redis = new GenericContainer("redis:7.0")
+    public static GenericContainer redis = new GenericContainer("redis:7.2")
             .withExposedPorts(6379);
 
     @ClassRule(order = 1)
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..6127a4192a 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
@@ -42,6 +42,8 @@ import org.thingsboard.server.common.data.device.profile.DefaultDeviceProfileTra
 import org.thingsboard.server.common.data.device.profile.DeviceProfileData;
 import org.thingsboard.server.common.data.edge.Edge;
 import org.thingsboard.server.common.data.event.RuleNodeDebugEvent;
+import org.thingsboard.server.common.data.housekeeper.TenantEntitiesDeletionHousekeeperTask;
+import org.thingsboard.server.common.data.housekeeper.HousekeeperTaskType;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.HasId;
@@ -51,6 +53,9 @@ import org.thingsboard.server.common.data.ota.OtaPackageType;
 import org.thingsboard.server.dao.audit.AuditLogLevelFilter;
 import org.thingsboard.server.dao.audit.AuditLogLevelMask;
 import org.thingsboard.server.dao.audit.AuditLogLevelProperties;
+import org.thingsboard.server.dao.entity.EntityDaoService;
+import org.thingsboard.server.dao.entity.EntityServiceRegistry;
+import org.thingsboard.server.common.msg.housekeeper.HousekeeperClient;
 import org.thingsboard.server.dao.tenant.TenantService;
 
 import java.io.IOException;
@@ -77,6 +82,9 @@ public abstract class AbstractServiceTest {
     @Autowired
     protected TenantService tenantService;
 
+    @Autowired
+    protected EntityServiceRegistry entityServiceRegistry;
+
     protected TenantId tenantId;
 
     @Before
@@ -98,6 +106,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 +117,7 @@ public abstract class AbstractServiceTest {
                 .tenantId(tenantId)
                 .entityId(entityId.getId())
                 .serviceId("server A")
+                .eventType(eventType)
                 .data(JacksonUtil.toString(readFromResource("TestJsonData.json")))
                 .build();
     }
@@ -126,6 +139,16 @@ public abstract class AbstractServiceTest {
         return new AuditLogLevelFilter(props);
     }
 
+    @Bean
+    public HousekeeperClient housekeeperClient() {
+        return task -> {
+            if (task.getTaskType() == HousekeeperTaskType.DELETE_TENANT_ENTITIES) {
+                EntityDaoService entityService = entityServiceRegistry.getServiceByEntityType(((TenantEntitiesDeletionHousekeeperTask) task).getEntityType());
+                entityService.deleteByTenantId(task.getTenantId());
+            }
+        };
+    }
+
     protected DeviceProfile createDeviceProfile(TenantId tenantId, String name) {
         DeviceProfile deviceProfile = new DeviceProfile();
         deviceProfile.setTenantId(tenantId);
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/DashboardServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/DashboardServiceTest.java
index 67520c5eab..f803bbd4fd 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/DashboardServiceTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/DashboardServiceTest.java
@@ -90,9 +90,8 @@ public class DashboardServiceTest extends AbstractServiceTest {
     public void testSaveDashboardWithEmptyTenant() {
         Dashboard dashboard = new Dashboard();
         dashboard.setTitle("My dashboard");
-        Assertions.assertThrows(DataValidationException.class, () -> {
-            dashboardService.saveDashboard(dashboard);
-        });
+        Assertions.assertThrows(DataValidationException.class, () ->
+                dashboardService.saveDashboard(dashboard));
     }
     
     @Test
@@ -100,9 +99,8 @@ public class DashboardServiceTest extends AbstractServiceTest {
         Dashboard dashboard = new Dashboard();
         dashboard.setTitle("My dashboard");
         dashboard.setTenantId(TenantId.fromUUID(Uuids.timeBased()));
-        Assertions.assertThrows(DataValidationException.class, () -> {
-            dashboardService.saveDashboard(dashboard);
-        });
+        Assertions.assertThrows(DataValidationException.class, () ->
+                dashboardService.saveDashboard(dashboard));
     }
     
     @Test
@@ -112,9 +110,8 @@ public class DashboardServiceTest extends AbstractServiceTest {
         dashboard.setTenantId(tenantId);
         Dashboard savedDashboard = dashboardService.saveDashboard(dashboard);
         try {
-            Assertions.assertThrows(DataValidationException.class, () -> {
-                dashboardService.assignDashboardToCustomer(tenantId, savedDashboard.getId(), new CustomerId(Uuids.timeBased()));
-            });
+            Assertions.assertThrows(DataValidationException.class, () ->
+                    dashboardService.assignDashboardToCustomer(tenantId, savedDashboard.getId(), new CustomerId(Uuids.timeBased())));
         } finally {
             dashboardService.deleteDashboard(tenantId, savedDashboard.getId());
         }
@@ -221,7 +218,7 @@ public class DashboardServiceTest extends AbstractServiceTest {
 
         List<DashboardInfo> loadedMobileDashboards = new ArrayList<>();
         PageLink pageLink = new PageLink(16, 0, null, new SortOrder("title", SortOrder.Direction.ASC));
-        PageData<DashboardInfo> pageData = null;
+        PageData<DashboardInfo> pageData;
         do {
             pageData = dashboardService.findMobileDashboardsByTenantId(tenantId, pageLink);
             loadedMobileDashboards.addAll(pageData.getData());
@@ -235,7 +232,7 @@ public class DashboardServiceTest extends AbstractServiceTest {
             Integer order2 = o2.getMobileOrder();
             if (order1 == null && order2 == null) {
                 return o1.getTitle().compareTo(o2.getTitle());
-            } else if (order1 == null && order2 != null) {
+            } else if (order1 == null) {
                 return 1;
             }  else if (order2 == null) {
                 return -1;
@@ -403,9 +400,8 @@ public class DashboardServiceTest extends AbstractServiceTest {
         edge.setRoutingKey(StringUtils.randomAlphanumeric(20));
         Edge savedEdge = edgeService.saveEdge(edge);
         try {
-            Assertions.assertThrows(DataValidationException.class, () -> {
-                dashboardService.assignDashboardToEdge(tenantId, savedDashboard.getId(), savedEdge.getId());
-            });
+            Assertions.assertThrows(DataValidationException.class, () ->
+                    dashboardService.assignDashboardToEdge(tenantId, savedDashboard.getId(), savedEdge.getId()));
         } finally {
             dashboardService.deleteDashboard(tenantId, savedDashboard.getId());
             tenantService.deleteTenant(tenant.getId());
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/EntityDaoRegistryTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/EntityDaoRegistryTest.java
new file mode 100644
index 0000000000..8524efc4a0
--- /dev/null
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/EntityDaoRegistryTest.java
@@ -0,0 +1,76 @@
+/**
+ * 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 lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.exception.ExceptionUtils;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.thingsboard.server.common.data.EntityType;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.dao.Dao;
+import org.thingsboard.server.dao.entity.EntityDaoRegistry;
+
+import java.util.UUID;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+
+@Slf4j
+@DaoSqlTest
+public class EntityDaoRegistryTest extends AbstractServiceTest {
+
+    @Autowired
+    EntityDaoRegistry entityDaoRegistry;
+
+    @Test
+    public void givenAllEntityTypes_whenGetDao_thenAllPresent() {
+        for (EntityType entityType : EntityType.values()) {
+            Dao<?> dao = assertDoesNotThrow(() -> entityDaoRegistry.getDao(entityType));
+            assertThat(dao).isNotNull();
+        }
+    }
+
+    @Test
+    public void givenAllDaos_whenFindById_thenOk() {
+        for (EntityType entityType : EntityType.values()) {
+            Dao<?> dao = entityDaoRegistry.getDao(entityType);
+            assertDoesNotThrow(() -> {
+                dao.findById(TenantId.SYS_TENANT_ID, UUID.randomUUID());
+            });
+        }
+    }
+
+    @Test
+    public void givenAllDaos_whenFindIdsByTenantIdAndIdOffset_thenOk() {
+        for (EntityType entityType : EntityType.values()) {
+            Dao<?> dao = entityDaoRegistry.getDao(entityType);
+            try {
+                dao.findIdsByTenantIdAndIdOffset(TenantId.SYS_TENANT_ID, null, 10);
+                dao.findIdsByTenantIdAndIdOffset(TenantId.SYS_TENANT_ID, UUID.randomUUID(), 10);
+            } catch (Exception e) {
+                String error = ExceptionUtils.getRootCauseMessage(e);
+                if (error.contains("tenant_id")) {
+                    log.debug("[{}] Ignoring not found tenant_id column", entityType);
+                } else {
+                    fail("findIdsByTenantIdAndIdOffset for " + entityType + " dao threw error: " + error);
+                }
+            }
+        }
+    }
+
+}
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 31bfa34efa..1fc2ff2ce6 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
@@ -18,18 +18,28 @@ package org.thingsboard.server.dao.service;
 import com.google.common.collect.Lists;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
+import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.RandomUtils;
 import org.hamcrest.Matchers;
 import org.junit.Assert;
+import org.junit.Before;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.ResultSetExtractor;
-import org.thingsboard.server.common.data.DataConstants;
+import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.server.common.data.AttributeScope;
+import org.thingsboard.server.common.data.Customer;
+import org.thingsboard.server.common.data.Dashboard;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.EntityType;
+import org.thingsboard.server.common.data.EntityView;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.User;
+import org.thingsboard.server.common.data.alarm.AlarmApiCallResult;
+import org.thingsboard.server.common.data.alarm.AlarmCreateOrUpdateActiveRequest;
+import org.thingsboard.server.common.data.alarm.AlarmSeverity;
 import org.thingsboard.server.common.data.asset.Asset;
 import org.thingsboard.server.common.data.edge.Edge;
 import org.thingsboard.server.common.data.id.CustomerId;
@@ -46,6 +56,7 @@ 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.page.PageData;
+import org.thingsboard.server.common.data.query.ApiUsageStateFilter;
 import org.thingsboard.server.common.data.query.AssetSearchQueryFilter;
 import org.thingsboard.server.common.data.query.AssetTypeFilter;
 import org.thingsboard.server.common.data.query.DeviceSearchQueryFilter;
@@ -65,6 +76,7 @@ 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.RelationsQueryFilter;
+import org.thingsboard.server.common.data.query.SingleEntityFilter;
 import org.thingsboard.server.common.data.query.StringFilterPredicate;
 import org.thingsboard.server.common.data.query.StringFilterPredicate.StringOperation;
 import org.thingsboard.server.common.data.relation.EntityRelation;
@@ -72,15 +84,20 @@ import org.thingsboard.server.common.data.relation.EntitySearchDirection;
 import org.thingsboard.server.common.data.relation.RelationEntityTypeFilter;
 import org.thingsboard.server.common.data.relation.RelationTypeGroup;
 import org.thingsboard.server.common.data.security.Authority;
+import org.thingsboard.server.dao.alarm.AlarmService;
 import org.thingsboard.server.dao.asset.AssetService;
 import org.thingsboard.server.dao.attributes.AttributesService;
+import org.thingsboard.server.dao.customer.CustomerService;
+import org.thingsboard.server.dao.dashboard.DashboardDao;
 import org.thingsboard.server.dao.device.DeviceService;
 import org.thingsboard.server.dao.edge.EdgeService;
 import org.thingsboard.server.dao.entity.EntityService;
+import org.thingsboard.server.dao.entityview.EntityViewDao;
 import org.thingsboard.server.dao.model.sqlts.ts.TsKvEntity;
 import org.thingsboard.server.dao.relation.RelationService;
 import org.thingsboard.server.dao.sql.relation.RelationRepository;
 import org.thingsboard.server.dao.timeseries.TimeseriesService;
+import org.thingsboard.server.dao.usagerecord.ApiUsageStateService;
 import org.thingsboard.server.dao.user.UserService;
 
 import java.util.ArrayList;
@@ -91,19 +108,23 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
+import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.ExecutionException;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static org.hamcrest.MatcherAssert.assertThat;
+import static org.assertj.core.api.Assertions.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
 public class EntityServiceTest extends AbstractServiceTest {
 
     static final int ENTITY_COUNT = 5;
+    public static final String TEST_CUSTOMER_NAME = "Test";
 
     @Autowired
     AssetService assetService;
@@ -123,6 +144,27 @@ public class EntityServiceTest extends AbstractServiceTest {
     RelationService relationService;
     @Autowired
     TimeseriesService timeseriesService;
+    @Autowired
+    ApiUsageStateService apiUsageStateService;
+    @Autowired
+    CustomerService customerService;
+    @Autowired
+    DashboardDao dashboardDao;
+    @Autowired
+    EntityViewDao entityViewDao;
+    @Autowired
+    AlarmService alarmService;
+
+    private CustomerId customerId;
+
+    @Before
+    public void before() {
+        Customer customer = new Customer();
+        customer.setTenantId(tenantId);
+        customer.setTitle(TEST_CUSTOMER_NAME);
+        customer = customerService.saveCustomer(customer);
+        customerId = customer.getId();
+    }
 
     @Test
     public void testCountEntitiesByQuery() throws InterruptedException {
@@ -373,7 +415,7 @@ public class EntityServiceTest extends AbstractServiceTest {
         List<ListenableFuture<List<String>>> attributeFutures = new ArrayList<>();
         for (int i = 0; i < devices.size(); i++) {
             Device device = devices.get(i);
-            attributeFutures.add(saveLongAttribute(device.getId(), "temperature", temperatures.get(i), DataConstants.CLIENT_SCOPE));
+            attributeFutures.add(saveLongAttribute(device.getId(), "temperature", temperatures.get(i), AttributeScope.CLIENT_SCOPE));
         }
         Futures.allAsList(attributeFutures).get();
 
@@ -552,7 +594,7 @@ public class EntityServiceTest extends AbstractServiceTest {
         List<ListenableFuture<List<String>>> attributeFutures = new ArrayList<>();
         for (int i = 0; i < devices.size(); i++) {
             Device device = devices.get(i);
-            attributeFutures.add(saveLongAttribute(device.getId(), "temperature", temperatures.get(i), DataConstants.CLIENT_SCOPE));
+            attributeFutures.add(saveLongAttribute(device.getId(), "temperature", temperatures.get(i), AttributeScope.CLIENT_SCOPE));
         }
         Futures.allAsList(attributeFutures).get();
 
@@ -627,7 +669,7 @@ public class EntityServiceTest extends AbstractServiceTest {
         List<ListenableFuture<List<String>>> attributeFutures = new ArrayList<>();
         for (int i = 0; i < assets.size(); i++) {
             Asset asset = assets.get(i);
-            attributeFutures.add(saveLongAttribute(asset.getId(), "consumption", consumptions.get(i), DataConstants.SERVER_SCOPE));
+            attributeFutures.add(saveLongAttribute(asset.getId(), "consumption", consumptions.get(i), AttributeScope.SERVER_SCOPE));
         }
         Futures.allAsList(attributeFutures).get();
 
@@ -808,7 +850,7 @@ public class EntityServiceTest extends AbstractServiceTest {
     }
 
     void createLoopRelations(TenantId tenantId, String type, EntityId... ids) {
-        assertThat("ids lenght", ids.length, Matchers.greaterThanOrEqualTo(1));
+        assertThat(ids.length).isGreaterThanOrEqualTo(1);
         //chain all from the head to the tail
         for (int i = 1; i < ids.length; i++) {
             relationService.saveRelation(tenantId, new EntityRelation(ids[i - 1], ids[i], type, RelationTypeGroup.COMMON));
@@ -1177,6 +1219,117 @@ public class EntityServiceTest extends AbstractServiceTest {
         assertEquals(0, result.getTotalElements());
     }
 
+    @Test
+    public void testFindEntitiesBySingleEntityFilter() {
+        List<Device> devices = new ArrayList<>();
+
+        for (int i = 0; i < 3; i++) {
+            Device device = new Device();
+            device.setTenantId(tenantId);
+            device.setName("Device test" + i);
+            device.setType("default");
+            devices.add(deviceService.saveDevice(device));
+        }
+
+        SingleEntityFilter singleEntityFilter = new SingleEntityFilter();
+        singleEntityFilter.setSingleEntity(devices.get(0).getId());
+
+        List<EntityKey> entityFields = List.of(
+                new EntityKey(EntityKeyType.ENTITY_FIELD, "name")
+        );
+
+        EntityDataPageLink pageLink = new EntityDataPageLink(1000, 0, null, null);
+
+        EntityDataQuery query = new EntityDataQuery(singleEntityFilter, pageLink, entityFields, null, null);
+
+        PageData<EntityData> result = searchEntities(query);
+        assertEquals(1, result.getTotalElements());
+
+        String deviceName = result.getData().get(0).getLatest().get(EntityKeyType.ENTITY_FIELD).get("name").getValue();
+        assertThat(deviceName).isEqualTo(devices.get(0).getName());
+    }
+
+    @Test
+    public void testFindEntitiesByApiUsageStateFilter() {
+        apiUsageStateService.createDefaultApiUsageState(tenantId, customerId);
+        ApiUsageStateFilter apiUsageStateFilter = new ApiUsageStateFilter();
+        apiUsageStateFilter.setCustomerId(customerId);
+
+        List<EntityKey> entityFields = List.of(
+                new EntityKey(EntityKeyType.ENTITY_FIELD, "name")
+        );
+
+        EntityDataPageLink pageLink = new EntityDataPageLink(1000, 0, null, null);
+        EntityDataQuery query = new EntityDataQuery(apiUsageStateFilter, pageLink, entityFields, null, null);
+        PageData<EntityData> result = searchEntities(query);
+        assertEquals(1, result.getTotalElements());
+        String name = result.getData().get(0).getLatest().get(EntityKeyType.ENTITY_FIELD).get("name").getValue();
+        assertThat(name).isEqualTo(TEST_CUSTOMER_NAME);
+    }
+
+    @Test
+    public void testFindEntitiesByRelationEntityTypeFilter() {
+        Customer customer = new Customer();
+        customer.setTenantId(tenantId);
+        customer.setTitle("Customer Relation Query");
+        customer = customerService.saveCustomer(customer);
+
+        final int assetCount = 2;
+        final int relationsCnt = 4;
+        final int deviceEntitiesCnt = assetCount * relationsCnt;
+
+        List<Asset> assets = new ArrayList<>();
+        for (int i = 0; i < assetCount; i++) {
+            Asset building = new Asset();
+            building.setTenantId(tenantId);
+            building.setCustomerId(customer.getId());
+            building.setName("Building _" + i);
+            building.setType("building");
+            building = assetService.saveAsset(building);
+            assets.add(building);
+        }
+
+        List<Device> devices = new ArrayList<>();
+        for (int i = 0; i < deviceEntitiesCnt; i++) {
+            Device device = new Device();
+            device.setTenantId(tenantId);
+            device.setCustomerId(customer.getId());
+            device.setName("Test device " + i);
+            device.setType("default");
+            Device savedDevice = deviceService.saveDevice(device);
+            devices.add(savedDevice);
+        }
+
+        for (int i = 0; i < assetCount; i++) {
+            for (int j = 0; j < relationsCnt; j++) {
+                EntityRelation relationEntity = new EntityRelation();
+                relationEntity.setFrom(assets.get(i).getId());
+                relationEntity.setTo(devices.get(j + (i * relationsCnt)).getId());
+                relationEntity.setTypeGroup(RelationTypeGroup.COMMON);
+                relationEntity.setType("contains");
+                relationService.saveRelation(tenantId, relationEntity);
+            }
+        }
+
+        RelationEntityTypeFilter relationEntityTypeFilter = new RelationEntityTypeFilter("contains", Collections.singletonList(EntityType.DEVICE));
+        RelationsQueryFilter filter = new RelationsQueryFilter();
+        filter.setFilters(Collections.singletonList(relationEntityTypeFilter));
+        filter.setDirection(EntitySearchDirection.FROM);
+        EntityDataPageLink pageLink = new EntityDataPageLink(10, 0, null, null);
+        List<KeyFilter> keyFiltersEqualString = createStringKeyFilters("name", EntityKeyType.ENTITY_FIELD, StringOperation.STARTS_WITH, "Test device ");
+
+        for (Asset asset : assets) {
+            filter.setRootEntity(asset.getId());
+
+            EntityDataQuery query = new EntityDataQuery(filter, pageLink, Collections.emptyList(), Collections.emptyList(), keyFiltersEqualString);
+            PageData<EntityData> relationsResult = entityService.findEntityDataByQuery(tenantId, customer.getId(), query);
+            long relationsResultCnt = entityService.countEntitiesByQuery(tenantId, customer.getId(), query);
+
+            Assert.assertEquals(relationsCnt, relationsResult.getData().size());
+            Assert.assertEquals(relationsCnt, relationsResultCnt);
+        }
+    }
+
     @Test
     public void testFindEntityDataByQuery_filter_device_type_name_ends_with() {
         List<Device> devices = new ArrayList<>();
@@ -1436,7 +1589,7 @@ public class EntityServiceTest extends AbstractServiceTest {
         List<ListenableFuture<List<String>>> attributeFutures = new ArrayList<>();
         for (int i = 0; i < devices.size(); i++) {
             Device device = devices.get(i);
-            for (String currentScope : DataConstants.allScopes()) {
+            for (AttributeScope currentScope : AttributeScope.values()) {
                 attributeFutures.add(saveLongAttribute(device.getId(), "temperature", temperatures.get(i), currentScope));
             }
         }
@@ -1538,7 +1691,7 @@ public class EntityServiceTest extends AbstractServiceTest {
         List<ListenableFuture<List<String>>> attributeFutures = new ArrayList<>();
         for (int i = 0; i < devices.size(); i++) {
             Device device = devices.get(i);
-            attributeFutures.add(saveLongAttribute(device.getId(), "temperature", temperatures.get(i), DataConstants.CLIENT_SCOPE));
+            attributeFutures.add(saveLongAttribute(device.getId(), "temperature", temperatures.get(i), AttributeScope.CLIENT_SCOPE));
         }
         Futures.allAsList(attributeFutures).get();
 
@@ -1816,7 +1969,7 @@ public class EntityServiceTest extends AbstractServiceTest {
         List<ListenableFuture<List<String>>> attributeFutures = new ArrayList<>();
         for (int i = 0; i < devices.size(); i++) {
             Device device = devices.get(i);
-            attributeFutures.add(saveStringAttribute(device.getId(), "attributeString", attributeStrings.get(i), DataConstants.CLIENT_SCOPE));
+            attributeFutures.add(saveStringAttribute(device.getId(), "attributeString", attributeStrings.get(i), AttributeScope.CLIENT_SCOPE));
         }
         Futures.allAsList(attributeFutures).get();
 
@@ -2112,6 +2265,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);
     }
@@ -2149,13 +2428,13 @@ public class EntityServiceTest extends AbstractServiceTest {
         return filter;
     }
 
-    private ListenableFuture<List<String>> saveLongAttribute(EntityId entityId, String key, long value, String scope) {
+    private ListenableFuture<List<String>> saveLongAttribute(EntityId entityId, String key, long value, AttributeScope scope) {
         KvEntry attrValue = new LongDataEntry(key, value);
         AttributeKvEntry attr = new BaseAttributeKvEntry(attrValue, 42L);
         return attributesService.save(SYSTEM_TENANT_ID, entityId, scope, Collections.singletonList(attr));
     }
 
-    private ListenableFuture<List<String>> saveStringAttribute(EntityId entityId, String key, String value, String scope) {
+    private ListenableFuture<List<String>> saveStringAttribute(EntityId entityId, String key, String value, AttributeScope scope) {
         KvEntry attrValue = new StringDataEntry(key, value);
         AttributeKvEntry attr = new BaseAttributeKvEntry(attrValue, 42L);
         return attributesService.save(SYSTEM_TENANT_ID, entityId, scope, Collections.singletonList(attr));
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/TenantProfileServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/TenantProfileServiceTest.java
index 1e568987f2..6f697017ac 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/TenantProfileServiceTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/TenantProfileServiceTest.java
@@ -24,7 +24,6 @@ import org.junit.jupiter.api.Assertions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.EntityInfo;
-import org.thingsboard.server.common.data.FSTUtils;
 import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.common.data.TenantProfile;
 import org.thingsboard.server.common.data.id.TenantId;
@@ -38,12 +37,15 @@ import org.thingsboard.server.common.data.queue.SubmitStrategyType;
 import org.thingsboard.server.common.data.tenant.profile.DefaultTenantProfileConfiguration;
 import org.thingsboard.server.common.data.tenant.profile.TenantProfileData;
 import org.thingsboard.server.common.data.tenant.profile.TenantProfileQueueConfiguration;
+import org.thingsboard.server.common.util.ProtoUtils;
 import org.thingsboard.server.dao.exception.DataValidationException;
 import org.thingsboard.server.dao.tenant.TenantProfileService;
+import org.thingsboard.server.gen.transport.TransportProtos;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.UUID;
 import java.util.stream.Collectors;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -300,23 +302,18 @@ public class TenantProfileServiceTest extends AbstractServiceTest {
     }
 
     @Test
-    public void testTenantProfileSerialization_fst() {
+    public void testTenantProfileSerialization_proto() {
         TenantProfile tenantProfile = new TenantProfile();
+        tenantProfile.setId(new TenantProfileId(UUID.randomUUID()));
+        tenantProfile.setName("testProfile");
         TenantProfileData profileData = new TenantProfileData();
         tenantProfile.setProfileData(profileData);
         profileData.setConfiguration(new DefaultTenantProfileConfiguration());
         addMainQueueConfig(tenantProfile);
 
-        byte[] serialized = assertDoesNotThrow(() -> {
-            return FSTUtils.encode(tenantProfile);
-        });
-        assertDoesNotThrow(() -> {
-            FSTUtils.encode(profileData);
-        });
+        byte[] serialized = assertDoesNotThrow(() -> ProtoUtils.toProto(tenantProfile).toByteArray());
 
-        TenantProfile deserialized = assertDoesNotThrow(() -> {
-            return FSTUtils.decode(serialized);
-        });
+        TenantProfile deserialized = assertDoesNotThrow(() -> ProtoUtils.fromProto(TransportProtos.TenantProfileProto.parseFrom(serialized)));
         assertThat(deserialized).isEqualTo(tenantProfile);
         assertThat(deserialized.getProfileData()).isNotNull();
         assertThat(deserialized.getProfileData().getQueueConfiguration()).isNotEmpty();
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/attributes/BaseAttributesServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/attributes/BaseAttributesServiceTest.java
index 6340e84f73..707155c86c 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/attributes/BaseAttributesServiceTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/attributes/BaseAttributesServiceTest.java
@@ -26,7 +26,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.thingsboard.server.cache.TbTransactionalCache;
-import org.thingsboard.server.common.data.DataConstants;
+import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.kv.AttributeKvEntry;
@@ -71,8 +71,8 @@ public abstract class BaseAttributesServiceTest extends AbstractServiceTest {
         DeviceId deviceId = new DeviceId(Uuids.timeBased());
         KvEntry attrValue = new StringDataEntry("attribute1", "value1");
         AttributeKvEntry attr = new BaseAttributeKvEntry(attrValue, 42L);
-        attributesService.save(SYSTEM_TENANT_ID, deviceId, DataConstants.CLIENT_SCOPE, Collections.singletonList(attr)).get();
-        Optional<AttributeKvEntry> saved = attributesService.find(SYSTEM_TENANT_ID, deviceId, DataConstants.CLIENT_SCOPE, attr.getKey()).get();
+        attributesService.save(SYSTEM_TENANT_ID, deviceId, AttributeScope.CLIENT_SCOPE, Collections.singletonList(attr)).get();
+        Optional<AttributeKvEntry> saved = attributesService.find(SYSTEM_TENANT_ID, deviceId, AttributeScope.CLIENT_SCOPE, attr.getKey()).get();
         Assert.assertTrue(saved.isPresent());
         Assert.assertEquals(attr, saved.get());
     }
@@ -83,17 +83,17 @@ public abstract class BaseAttributesServiceTest extends AbstractServiceTest {
         KvEntry attrOldValue = new StringDataEntry("attribute1", "value1");
         AttributeKvEntry attrOld = new BaseAttributeKvEntry(attrOldValue, 42L);
 
-        attributesService.save(SYSTEM_TENANT_ID, deviceId, DataConstants.CLIENT_SCOPE, Collections.singletonList(attrOld)).get();
-        Optional<AttributeKvEntry> saved = attributesService.find(SYSTEM_TENANT_ID, deviceId, DataConstants.CLIENT_SCOPE, attrOld.getKey()).get();
+        attributesService.save(SYSTEM_TENANT_ID, deviceId, AttributeScope.CLIENT_SCOPE, Collections.singletonList(attrOld)).get();
+        Optional<AttributeKvEntry> saved = attributesService.find(SYSTEM_TENANT_ID, deviceId, AttributeScope.CLIENT_SCOPE, attrOld.getKey()).get();
 
         Assert.assertTrue(saved.isPresent());
         Assert.assertEquals(attrOld, saved.get());
 
         KvEntry attrNewValue = new StringDataEntry("attribute1", "value2");
         AttributeKvEntry attrNew = new BaseAttributeKvEntry(attrNewValue, 73L);
-        attributesService.save(SYSTEM_TENANT_ID, deviceId, DataConstants.CLIENT_SCOPE, Collections.singletonList(attrNew)).get();
+        attributesService.save(SYSTEM_TENANT_ID, deviceId, AttributeScope.CLIENT_SCOPE, Collections.singletonList(attrNew)).get();
 
-        saved = attributesService.find(SYSTEM_TENANT_ID, deviceId, DataConstants.CLIENT_SCOPE, attrOld.getKey()).get();
+        saved = attributesService.find(SYSTEM_TENANT_ID, deviceId, AttributeScope.CLIENT_SCOPE, attrOld.getKey()).get();
         Assert.assertEquals(attrNew, saved.get());
     }
 
@@ -108,11 +108,11 @@ public abstract class BaseAttributesServiceTest extends AbstractServiceTest {
         KvEntry attrBNewValue = new StringDataEntry("B", "value3");
         AttributeKvEntry attrBNew = new BaseAttributeKvEntry(attrBNewValue, 73L);
 
-        attributesService.save(SYSTEM_TENANT_ID, deviceId, DataConstants.CLIENT_SCOPE, Collections.singletonList(attrAOld)).get();
-        attributesService.save(SYSTEM_TENANT_ID, deviceId, DataConstants.CLIENT_SCOPE, Collections.singletonList(attrANew)).get();
-        attributesService.save(SYSTEM_TENANT_ID, deviceId, DataConstants.CLIENT_SCOPE, Collections.singletonList(attrBNew)).get();
+        attributesService.save(SYSTEM_TENANT_ID, deviceId, AttributeScope.CLIENT_SCOPE, Collections.singletonList(attrAOld)).get();
+        attributesService.save(SYSTEM_TENANT_ID, deviceId, AttributeScope.CLIENT_SCOPE, Collections.singletonList(attrANew)).get();
+        attributesService.save(SYSTEM_TENANT_ID, deviceId, AttributeScope.CLIENT_SCOPE, Collections.singletonList(attrBNew)).get();
 
-        List<AttributeKvEntry> saved = attributesService.findAll(SYSTEM_TENANT_ID, deviceId, DataConstants.CLIENT_SCOPE).get();
+        List<AttributeKvEntry> saved = attributesService.findAll(SYSTEM_TENANT_ID, deviceId, AttributeScope.CLIENT_SCOPE).get();
 
         Assert.assertNotNull(saved);
         Assert.assertEquals(2, saved.size());
@@ -123,7 +123,7 @@ public abstract class BaseAttributesServiceTest extends AbstractServiceTest {
 
     @Test
     public void testDummyRequestWithEmptyResult() throws Exception {
-        var future = attributesService.find(new TenantId(UUID.randomUUID()), new DeviceId(UUID.randomUUID()), DataConstants.SERVER_SCOPE, "TEST");
+        var future = attributesService.find(new TenantId(UUID.randomUUID()), new DeviceId(UUID.randomUUID()), AttributeScope.SERVER_SCOPE, "TEST");
         Assert.assertNotNull(future);
         var result = future.get(10, TimeUnit.SECONDS);
         Assert.assertTrue(result.isEmpty());
@@ -133,7 +133,7 @@ public abstract class BaseAttributesServiceTest extends AbstractServiceTest {
     public void testConcurrentTransaction() throws Exception {
         var tenantId = new TenantId(UUID.randomUUID());
         var deviceId = new DeviceId(UUID.randomUUID());
-        var scope = DataConstants.SERVER_SCOPE;
+        var scope = AttributeScope.SERVER_SCOPE;
         var key = "TEST";
 
         var attrKey = new AttributeCacheKey(scope, deviceId, "TEST");
@@ -179,7 +179,7 @@ public abstract class BaseAttributesServiceTest extends AbstractServiceTest {
     public void testFetchAndUpdateEmpty() throws Exception {
         var tenantId = new TenantId(UUID.randomUUID());
         var deviceId = new DeviceId(UUID.randomUUID());
-        var scope = DataConstants.SERVER_SCOPE;
+        var scope = AttributeScope.SERVER_SCOPE;
         var key = "TEST";
 
         Optional<AttributeKvEntry> emptyValue = attributesService.find(tenantId, deviceId, scope, key).get(10, TimeUnit.SECONDS);
@@ -193,7 +193,7 @@ public abstract class BaseAttributesServiceTest extends AbstractServiceTest {
     public void testFetchAndUpdateMulti() throws Exception {
         var tenantId = new TenantId(UUID.randomUUID());
         var deviceId = new DeviceId(UUID.randomUUID());
-        var scope = DataConstants.SERVER_SCOPE;
+        var scope = AttributeScope.SERVER_SCOPE;
         var key1 = "TEST1";
         var key2 = "TEST2";
 
@@ -222,7 +222,7 @@ public abstract class BaseAttributesServiceTest extends AbstractServiceTest {
     }
 
     private void testConcurrentFetchAndUpdate(TenantId tenantId, DeviceId deviceId, ListeningExecutorService pool) throws Exception {
-        var scope = DataConstants.SERVER_SCOPE;
+        var scope = AttributeScope.SERVER_SCOPE;
         var key = "TEST";
         saveAttribute(tenantId, deviceId, scope, key, OLD_VALUE);
         List<ListenableFuture<?>> futures = new ArrayList<>();
@@ -236,7 +236,7 @@ public abstract class BaseAttributesServiceTest extends AbstractServiceTest {
     }
 
     private void testConcurrentFetchAndUpdateMulti(TenantId tenantId, DeviceId deviceId, ListeningExecutorService pool) throws Exception {
-        var scope = DataConstants.SERVER_SCOPE;
+        var scope = AttributeScope.SERVER_SCOPE;
         var key1 = "TEST1";
         var key2 = "TEST2";
         saveAttribute(tenantId, deviceId, scope, key1, OLD_VALUE);
@@ -258,7 +258,7 @@ public abstract class BaseAttributesServiceTest extends AbstractServiceTest {
         Assert.assertEquals(NEW_VALUE, newResult.get(1));
     }
 
-    private String getAttributeValue(TenantId tenantId, DeviceId deviceId, String scope, String key) {
+    private String getAttributeValue(TenantId tenantId, DeviceId deviceId, AttributeScope scope, String key) {
         try {
             Optional<AttributeKvEntry> entry = attributesService.find(tenantId, deviceId, scope, key).get(10, TimeUnit.SECONDS);
             return entry.orElseThrow(RuntimeException::new).getStrValue().orElse("Unknown");
@@ -268,7 +268,7 @@ public abstract class BaseAttributesServiceTest extends AbstractServiceTest {
         }
     }
 
-    private List<String> getAttributeValues(TenantId tenantId, DeviceId deviceId, String scope, List<String> keys) {
+    private List<String> getAttributeValues(TenantId tenantId, DeviceId deviceId, AttributeScope scope, List<String> keys) {
         try {
             List<AttributeKvEntry> entry = attributesService.find(tenantId, deviceId, scope, keys).get(10, TimeUnit.SECONDS);
             return entry.stream().map(e -> e.getStrValue().orElse(null)).collect(Collectors.toList());
@@ -278,7 +278,7 @@ public abstract class BaseAttributesServiceTest extends AbstractServiceTest {
         }
     }
 
-    private void saveAttribute(TenantId tenantId, DeviceId deviceId, String scope, String key, String s) {
+    private void saveAttribute(TenantId tenantId, DeviceId deviceId, AttributeScope scope, String key, String s) {
         try {
             AttributeKvEntry newEntry = new BaseAttributeKvEntry(System.currentTimeMillis(), new StringDataEntry(key, s));
             attributesService.save(tenantId, deviceId, scope, Collections.singletonList(newEntry)).get(10, TimeUnit.SECONDS);
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..9cd355ccd0 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
@@ -38,7 +38,7 @@ import org.thingsboard.server.dao.service.AbstractServiceTest;
 import java.text.ParseException;
 import java.util.List;
 
-import static org.apache.commons.lang3.time.DateFormatUtils.ISO_DATETIME_TIME_ZONE_FORMAT;
+import static org.apache.commons.lang3.time.DateFormatUtils.ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT;
 
 public abstract class BaseEventServiceTest extends AbstractServiceTest {
 
@@ -53,11 +53,11 @@ public abstract class BaseEventServiceTest extends AbstractServiceTest {
 
     @Before
     public void before() throws ParseException {
-        timeBeforeStartTime = ISO_DATETIME_TIME_ZONE_FORMAT.parse("2016-11-01T11:30:00Z").getTime();
-        startTime = ISO_DATETIME_TIME_ZONE_FORMAT.parse("2016-11-01T12:00:00Z").getTime();
-        eventTime = ISO_DATETIME_TIME_ZONE_FORMAT.parse("2016-11-01T12:30:00Z").getTime();
-        endTime = ISO_DATETIME_TIME_ZONE_FORMAT.parse("2016-11-01T13:00:00Z").getTime();
-        timeAfterEndTime = ISO_DATETIME_TIME_ZONE_FORMAT.parse("2016-11-01T13:30:30Z").getTime();
+        timeBeforeStartTime = ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2016-11-01T11:30:00Z").getTime();
+        startTime = ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2016-11-01T12:00:00Z").getTime();
+        eventTime = ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2016-11-01T12:30:00Z").getTime();
+        endTime = ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2016-11-01T13:00:00Z").getTime();
+        timeAfterEndTime = ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2016-11-01T13:30:30Z").getTime();
     }
 
     @Test
@@ -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/service/timeseries/BaseTimeseriesServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/timeseries/BaseTimeseriesServiceTest.java
index a624a2b6e5..390cb9afac 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/timeseries/BaseTimeseriesServiceTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/timeseries/BaseTimeseriesServiceTest.java
@@ -48,6 +48,7 @@ import org.thingsboard.server.dao.timeseries.TimeseriesService;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
@@ -119,18 +120,18 @@ public abstract class BaseTimeseriesServiceTest extends AbstractServiceTest {
 
         assertNotNull(tsList);
         assertEquals(4, tsList.size());
-        for (int i = 0; i < tsList.size(); i++) {
-            assertEquals(TS, tsList.get(i).getTs());
+        for (TsKvEntry entry : tsList) {
+            assertEquals(TS, entry.getTs());
         }
 
-        Collections.sort(tsList, (o1, o2) -> o1.getKey().compareTo(o2.getKey()));
+        Collections.sort(tsList, Comparator.comparing(KvEntry::getKey));
 
         List<TsKvEntry> expected = Arrays.asList(
                 toTsEntry(TS, stringKvEntry),
                 toTsEntry(TS, longKvEntry),
                 toTsEntry(TS, doubleKvEntry),
                 toTsEntry(TS, booleanKvEntry));
-        Collections.sort(expected, (o1, o2) -> o1.getKey().compareTo(o2.getKey()));
+        Collections.sort(expected, Comparator.comparing(KvEntry::getKey));
 
         assertEquals(expected, tsList);
     }
@@ -190,7 +191,7 @@ public abstract class BaseTimeseriesServiceTest extends AbstractServiceTest {
         Assert.assertEquals(toTsEntry(TS - 2, stringKvEntry), entries.get(1));
         Assert.assertEquals(toTsEntry(TS - 1, stringKvEntry), entries.get(2));
 
-        EntityView entityView = saveAndCreateEntityView(deviceId, Arrays.asList(STRING_KEY));
+        EntityView entityView = saveAndCreateEntityView(deviceId, List.of(STRING_KEY));
 
         entries = tsService.findAll(tenantId, entityView.getId(), queries).get(MAX_TIMEOUT, TimeUnit.SECONDS);
         Assert.assertEquals(3, entries.size());
@@ -350,7 +351,7 @@ public abstract class BaseTimeseriesServiceTest extends AbstractServiceTest {
         Assert.assertEquals(toTsEntry(TS - 2, stringKvEntry), entries.get(1));
         Assert.assertEquals(toTsEntry(TS - 3, stringKvEntry), entries.get(2));
 
-        EntityView entityView = saveAndCreateEntityView(deviceId, Arrays.asList(STRING_KEY));
+        EntityView entityView = saveAndCreateEntityView(deviceId, List.of(STRING_KEY));
 
         entries = tsService.findAll(tenantId, entityView.getId(), queries).get(MAX_TIMEOUT, TimeUnit.SECONDS);
         Assert.assertEquals(3, entries.size());
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/user/JpaUserSettingsDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/user/JpaUserSettingsDaoTest.java
index bf30ebb83b..2151f728d0 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/sql/user/JpaUserSettingsDaoTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/sql/user/JpaUserSettingsDaoTest.java
@@ -16,6 +16,7 @@
 package org.thingsboard.server.dao.sql.user;
 
 import com.datastax.oss.driver.api.core.uuid.Uuids;
+import lombok.extern.slf4j.Slf4j;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -37,11 +38,14 @@ import org.thingsboard.server.dao.user.UserSettingsDao;
 
 import java.util.UUID;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.data.Index.atIndex;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID;
 import static org.thingsboard.server.dao.service.AbstractServiceTest.SYSTEM_TENANT_ID;
 
+@Slf4j
 public class JpaUserSettingsDaoTest extends AbstractJpaDaoTest {
 
     private UUID tenantId;
@@ -77,6 +81,34 @@ public class JpaUserSettingsDaoTest extends AbstractJpaDaoTest {
         assertNull(retrievedUserSettings2);
     }
 
+    // If Hibernate fail to bind JSON path please check the hypersistence-utils-hibernate-XX artifact name and version in the dependency management
+    // Example: java.lang.ClassCastException: class [Ljava.lang.String; cannot be cast to class [B ([Ljava.lang.String; and [B are in module java.base of loader 'bootstrap')
+    @Test
+    public void testFindByTypeAndJsonPath() {
+        UserSettings userSettings = createUserSettings(user.getId());
+        log.warn("userSettings {}", userSettings);
+
+        userSettings.setSettings(JacksonUtil.toJsonNode("{\"text\":\"bla1\",\"sessions\":{\"tenantFcmToken\":{\"fcmTokenTimestamp\":0}}}"));
+
+        userSettingsDao.save(SYSTEM_TENANT_ID, userSettings);
+
+        assertThat(userSettingsDao.findByTypeAndPath(SYSTEM_TENANT_ID, UserSettingsType.GENERAL, "text"))
+                .isNotEmpty().hasSize(1).contains(userSettings, atIndex(0));
+
+        assertThat(userSettingsDao.findByTypeAndPath(SYSTEM_TENANT_ID, UserSettingsType.GENERAL, "sessions", "tenantFcmToken"))
+                .isNotEmpty().hasSize(1).contains(userSettings, atIndex(0));
+
+        assertThat(userSettingsDao.findByTypeAndPath(user.getTenantId(), UserSettingsType.GENERAL, "mistery")).isEmpty();
+        assertThat(userSettingsDao.findByTypeAndPath(user.getTenantId(), UserSettingsType.GENERAL, "text", "text")).isEmpty();
+        assertThat(userSettingsDao.findByTypeAndPath(user.getTenantId(), UserSettingsType.GENERAL, "text", "lvl2")).isEmpty();
+        assertThat(userSettingsDao.findByTypeAndPath(user.getTenantId(), UserSettingsType.MOBILE, "text")).isEmpty();
+        assertThat(userSettingsDao.findByTypeAndPath(user.getTenantId(), UserSettingsType.MOBILE, "sessions", "1")).isEmpty();
+        assertThat(userSettingsDao.findByTypeAndPath(user.getTenantId(), UserSettingsType.MOBILE, "text", "text")).isEmpty();
+        assertThat(userSettingsDao.findByTypeAndPath(user.getTenantId(), UserSettingsType.MOBILE, "")).isEmpty();
+        assertThat(userSettingsDao.findByTypeAndPath(user.getTenantId(), UserSettingsType.MOBILE, null)).isEmpty();
+        assertThat(userSettingsDao.findByTypeAndPath(user.getTenantId(), UserSettingsType.MOBILE)).isEmpty();
+    }
+
     private UserSettings createUserSettings(UserId userId) {
         UserSettings userSettings = new UserSettings();
         userSettings.setType(UserSettingsType.GENERAL);
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/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningDaysAlwaysExistsTest.java b/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningDaysAlwaysExistsTest.java
index 3505c3af00..a10515cc48 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningDaysAlwaysExistsTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningDaysAlwaysExistsTest.java
@@ -32,7 +32,7 @@ import org.thingsboard.server.dao.nosql.CassandraBufferedRateWriteExecutor;
 import java.text.ParseException;
 import java.util.List;
 
-import static org.apache.commons.lang3.time.DateFormatUtils.ISO_DATETIME_TIME_ZONE_FORMAT;
+import static org.apache.commons.lang3.time.DateFormatUtils.ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT;
 import static org.assertj.core.api.Assertions.assertThat;
 
 @RunWith(SpringRunner.class)
@@ -66,68 +66,68 @@ public class CassandraBaseTimeseriesDaoPartitioningDaysAlwaysExistsTest {
     public void testToPartitionsDays() throws ParseException {
         assertThat(tsDao.getPartitioning()).isEqualTo("DAYS");
         assertThat(tsDao.toPartitionTs(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-01-01T00:00:00Z").getTime())).isEqualTo(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-01-01T00:00:00Z").getTime());
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-01-01T00:00:00Z").getTime())).isEqualTo(
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-01-01T00:00:00Z").getTime());
         assertThat(tsDao.toPartitionTs(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-05-02T00:00:00Z").getTime())).isEqualTo(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-05-02T00:00:00Z").getTime());
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-05-02T00:00:00Z").getTime())).isEqualTo(
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-05-02T00:00:00Z").getTime());
         assertThat(tsDao.toPartitionTs(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-05-03T00:00:01Z").getTime())).isEqualTo(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-05-03T00:00:00Z").getTime());
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-05-03T00:00:01Z").getTime())).isEqualTo(
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-05-03T00:00:00Z").getTime());
         assertThat(tsDao.toPartitionTs(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-05-31T23:59:59Z").getTime())).isEqualTo(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-05-31T00:00:00Z").getTime());
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-05-31T23:59:59Z").getTime())).isEqualTo(
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-05-31T00:00:00Z").getTime());
         assertThat(tsDao.toPartitionTs(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2023-12-31T23:59:59Z").getTime())).isEqualTo(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2023-12-31T00:00:00Z").getTime());
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2023-12-31T23:59:59Z").getTime())).isEqualTo(
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2023-12-31T00:00:00Z").getTime());
     }
 
     @Test
     public void testCalculatePartitionsDays() throws ParseException {
         long startTs = tsDao.toPartitionTs(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T00:00:00Z").getTime());
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T00:00:00Z").getTime());
         long nextTs = tsDao.toPartitionTs(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-12T23:59:59Z").getTime());
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-12T23:59:59Z").getTime());
         long endTs = tsDao.toPartitionTs(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-15T00:00:00Z").getTime());
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-15T00:00:00Z").getTime());
         log.info("startTs {}, nextTs {}, endTs {}", startTs, nextTs, endTs);
 
         assertThat(tsDao.calculatePartitions(0, 0)).isEqualTo(List.of(0L));
         assertThat(tsDao.calculatePartitions(0, 1)).isEqualTo(List.of(0L, 1L));
 
         assertThat(tsDao.calculatePartitions(startTs, startTs)).isEqualTo(List.of(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T00:00:00Z").getTime()));
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T00:00:00Z").getTime()));
         assertThat(tsDao.calculatePartitions(startTs, nextTs)).isEqualTo(List.of(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T00:00:00Z").getTime(),
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-11T00:00:00Z").getTime(),
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-12T00:00:00Z").getTime()));
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T00:00:00Z").getTime(),
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-11T00:00:00Z").getTime(),
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-12T00:00:00Z").getTime()));
 
         assertThat(tsDao.calculatePartitions(startTs, endTs)).hasSize(6).isEqualTo(List.of(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T00:00:00Z").getTime(),
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-11T00:00:00Z").getTime(),
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-12T00:00:00Z").getTime(),
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-13T00:00:00Z").getTime(),
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-14T00:00:00Z").getTime(),
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-15T00:00:00Z").getTime()));
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T00:00:00Z").getTime(),
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-11T00:00:00Z").getTime(),
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-12T00:00:00Z").getTime(),
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-13T00:00:00Z").getTime(),
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-14T00:00:00Z").getTime(),
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-15T00:00:00Z").getTime()));
 
         long leapStartTs = tsDao.toPartitionTs(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2020-02-27T00:00:00Z").getTime());
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2020-02-27T00:00:00Z").getTime());
         long leapEndTs = tsDao.toPartitionTs(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2020-03-01T00:00:00Z").getTime());
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2020-03-01T00:00:00Z").getTime());
         assertThat(tsDao.calculatePartitions(leapStartTs, leapEndTs)).isEqualTo(List.of(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2020-02-27T00:00:00Z").getTime(),
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2020-02-28T00:00:00Z").getTime(),
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2020-02-29T00:00:00Z").getTime(),
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2020-03-01T00:00:00Z").getTime()));
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2020-02-27T00:00:00Z").getTime(),
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2020-02-28T00:00:00Z").getTime(),
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2020-02-29T00:00:00Z").getTime(),
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2020-03-01T00:00:00Z").getTime()));
 
         long newYearStartTs = tsDao.toPartitionTs(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2020-12-30T00:00:00Z").getTime());
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2020-12-30T00:00:00Z").getTime());
         long newYearEndTs = tsDao.toPartitionTs(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2021-01-01T00:00:00Z").getTime());
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2021-01-01T00:00:00Z").getTime());
         assertThat(tsDao.calculatePartitions(newYearStartTs, newYearEndTs)).isEqualTo(List.of(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2020-12-30T00:00:00Z").getTime(),
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2020-12-31T00:00:00Z").getTime(),
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2021-01-01T00:00:00Z").getTime()));
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2020-12-30T00:00:00Z").getTime(),
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2020-12-31T00:00:00Z").getTime(),
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2021-01-01T00:00:00Z").getTime()));
     }
 
 }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningHoursAlwaysExistsTest.java b/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningHoursAlwaysExistsTest.java
index 9b8e427ffc..d8149844ca 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningHoursAlwaysExistsTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningHoursAlwaysExistsTest.java
@@ -32,7 +32,7 @@ import org.thingsboard.server.dao.nosql.CassandraBufferedRateWriteExecutor;
 import java.text.ParseException;
 import java.util.List;
 
-import static org.apache.commons.lang3.time.DateFormatUtils.ISO_DATETIME_TIME_ZONE_FORMAT;
+import static org.apache.commons.lang3.time.DateFormatUtils.ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT;
 import static org.assertj.core.api.Assertions.assertThat;
 
 @RunWith(SpringRunner.class)
@@ -66,69 +66,69 @@ public class CassandraBaseTimeseriesDaoPartitioningHoursAlwaysExistsTest {
     public void testToPartitionsHours() throws ParseException {
         assertThat(tsDao.getPartitioning()).isEqualTo("HOURS");
         assertThat(tsDao.toPartitionTs(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-01-01T00:00:00Z").getTime())).isEqualTo(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-01-01T00:00:00Z").getTime());
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-01-01T00:00:00Z").getTime())).isEqualTo(
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-01-01T00:00:00Z").getTime());
         assertThat(tsDao.toPartitionTs(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-05-02T01:00:00Z").getTime())).isEqualTo(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-05-02T01:00:00Z").getTime());
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-05-02T01:00:00Z").getTime())).isEqualTo(
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-05-02T01:00:00Z").getTime());
         assertThat(tsDao.toPartitionTs(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-05-03T02:00:01Z").getTime())).isEqualTo(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-05-03T02:00:00Z").getTime());
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-05-03T02:00:01Z").getTime())).isEqualTo(
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-05-03T02:00:00Z").getTime());
         assertThat(tsDao.toPartitionTs(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-05-31T23:59:59Z").getTime())).isEqualTo(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-05-31T23:00:00Z").getTime());
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-05-31T23:59:59Z").getTime())).isEqualTo(
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-05-31T23:00:00Z").getTime());
         assertThat(tsDao.toPartitionTs(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2023-12-31T23:59:59Z").getTime())).isEqualTo(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2023-12-31T23:00:00Z").getTime());
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2023-12-31T23:59:59Z").getTime())).isEqualTo(
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2023-12-31T23:00:00Z").getTime());
     }
 
     @Test
     public void testCalculatePartitionsHours() throws ParseException {
             long startTs = tsDao.toPartitionTs(
-                    ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T00:00:00Z").getTime());
+                    ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T00:00:00Z").getTime());
             long nextTs = tsDao.toPartitionTs(
-                    ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T03:59:59Z").getTime());
+                    ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T03:59:59Z").getTime());
             long endTs = tsDao.toPartitionTs(
-                    ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-11T00:59:00Z").getTime());
+                    ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-11T00:59:00Z").getTime());
             log.info("startTs {}, nextTs {}, endTs {}", startTs, nextTs, endTs);
 
             assertThat(tsDao.calculatePartitions(0, 0)).isEqualTo(List.of(0L));
             assertThat(tsDao.calculatePartitions(0, 1)).isEqualTo(List.of(0L, 1L));
 
             assertThat(tsDao.calculatePartitions(startTs, startTs)).isEqualTo(List.of(
-                    ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T00:00:00Z").getTime()));
+                    ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T00:00:00Z").getTime()));
             assertThat(tsDao.calculatePartitions(startTs, nextTs)).isEqualTo(List.of(
-                    ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T00:00:00Z").getTime(),
-                    ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T01:00:00Z").getTime(),
-                    ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T02:00:00Z").getTime(),
-                    ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T03:00:00Z").getTime()));
+                    ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T00:00:00Z").getTime(),
+                    ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T01:00:00Z").getTime(),
+                    ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T02:00:00Z").getTime(),
+                    ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T03:00:00Z").getTime()));
 
             assertThat(tsDao.calculatePartitions(startTs, endTs)).hasSize(25).isEqualTo(List.of(
-                    ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T00:00:00Z").getTime(),
-                    ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T01:00:00Z").getTime(),
-                    ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T02:00:00Z").getTime(),
-                    ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T03:00:00Z").getTime(),
-                    ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T04:00:00Z").getTime(),
-                    ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T05:00:00Z").getTime(),
-                    ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T06:00:00Z").getTime(),
-                    ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T07:00:00Z").getTime(),
-                    ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T08:00:00Z").getTime(),
-                    ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T09:00:00Z").getTime(),
-                    ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T10:00:00Z").getTime(),
-                    ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T11:00:00Z").getTime(),
-                    ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T12:00:00Z").getTime(),
-                    ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T13:00:00Z").getTime(),
-                    ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T14:00:00Z").getTime(),
-                    ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T15:00:00Z").getTime(),
-                    ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T16:00:00Z").getTime(),
-                    ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T17:00:00Z").getTime(),
-                    ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T18:00:00Z").getTime(),
-                    ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T19:00:00Z").getTime(),
-                    ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T20:00:00Z").getTime(),
-                    ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T21:00:00Z").getTime(),
-                    ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T22:00:00Z").getTime(),
-                    ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T23:00:00Z").getTime(),
-                    ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-11T00:00:00Z").getTime()));
+                    ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T00:00:00Z").getTime(),
+                    ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T01:00:00Z").getTime(),
+                    ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T02:00:00Z").getTime(),
+                    ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T03:00:00Z").getTime(),
+                    ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T04:00:00Z").getTime(),
+                    ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T05:00:00Z").getTime(),
+                    ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T06:00:00Z").getTime(),
+                    ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T07:00:00Z").getTime(),
+                    ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T08:00:00Z").getTime(),
+                    ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T09:00:00Z").getTime(),
+                    ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T10:00:00Z").getTime(),
+                    ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T11:00:00Z").getTime(),
+                    ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T12:00:00Z").getTime(),
+                    ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T13:00:00Z").getTime(),
+                    ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T14:00:00Z").getTime(),
+                    ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T15:00:00Z").getTime(),
+                    ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T16:00:00Z").getTime(),
+                    ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T17:00:00Z").getTime(),
+                    ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T18:00:00Z").getTime(),
+                    ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T19:00:00Z").getTime(),
+                    ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T20:00:00Z").getTime(),
+                    ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T21:00:00Z").getTime(),
+                    ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T22:00:00Z").getTime(),
+                    ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T23:00:00Z").getTime(),
+                    ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-11T00:00:00Z").getTime()));
     }
 
 }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningIndefiniteAlwaysExistsTest.java b/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningIndefiniteAlwaysExistsTest.java
index 8d91121cc5..33989ff64f 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningIndefiniteAlwaysExistsTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningIndefiniteAlwaysExistsTest.java
@@ -31,7 +31,7 @@ import org.thingsboard.server.dao.nosql.CassandraBufferedRateWriteExecutor;
 
 import java.text.ParseException;
 
-import static org.apache.commons.lang3.time.DateFormatUtils.ISO_DATETIME_TIME_ZONE_FORMAT;
+import static org.apache.commons.lang3.time.DateFormatUtils.ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT;
 import static org.assertj.core.api.Assertions.assertThat;
 
 @RunWith(SpringRunner.class)
@@ -64,7 +64,7 @@ public class CassandraBaseTimeseriesDaoPartitioningIndefiniteAlwaysExistsTest {
     @Test
     public void testToPartitionsIndefinite() throws ParseException {
         assertThat(tsDao.getPartitioning()).isEqualTo("INDEFINITE");
-        assertThat(tsDao.toPartitionTs(ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-01-01T00:00:00Z").getTime())).isEqualTo(0L);
+        assertThat(tsDao.toPartitionTs(ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-01-01T00:00:00Z").getTime())).isEqualTo(0L);
     }
 
 
diff --git a/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningMinutesAlwaysExistsTest.java b/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningMinutesAlwaysExistsTest.java
index c497da3047..ac0ea6dd4f 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningMinutesAlwaysExistsTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningMinutesAlwaysExistsTest.java
@@ -32,7 +32,7 @@ import org.thingsboard.server.dao.nosql.CassandraBufferedRateWriteExecutor;
 import java.text.ParseException;
 import java.util.List;
 
-import static org.apache.commons.lang3.time.DateFormatUtils.ISO_DATETIME_TIME_ZONE_FORMAT;
+import static org.apache.commons.lang3.time.DateFormatUtils.ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT;
 import static org.assertj.core.api.Assertions.assertThat;
 
 @RunWith(SpringRunner.class)
@@ -66,55 +66,55 @@ public class CassandraBaseTimeseriesDaoPartitioningMinutesAlwaysExistsTest {
     public void testToPartitionsMinutes() throws ParseException {
         assertThat(tsDao.getPartitioning()).isEqualTo("MINUTES");
         assertThat(tsDao.toPartitionTs(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-01-01T00:00:00Z").getTime())).isEqualTo(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-01-01T00:00:00Z").getTime());
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-01-01T00:00:00Z").getTime())).isEqualTo(
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-01-01T00:00:00Z").getTime());
         assertThat(tsDao.toPartitionTs(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-05-02T00:01:00Z").getTime())).isEqualTo(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-05-02T00:01:00Z").getTime());
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-05-02T00:01:00Z").getTime())).isEqualTo(
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-05-02T00:01:00Z").getTime());
         assertThat(tsDao.toPartitionTs(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-05-03T00:02:01Z").getTime())).isEqualTo(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-05-03T00:02:00Z").getTime());
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-05-03T00:02:01Z").getTime())).isEqualTo(
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-05-03T00:02:00Z").getTime());
         assertThat(tsDao.toPartitionTs(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-05-31T23:59:59Z").getTime())).isEqualTo(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-05-31T23:59:00Z").getTime());
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-05-31T23:59:59Z").getTime())).isEqualTo(
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-05-31T23:59:00Z").getTime());
         assertThat(tsDao.toPartitionTs(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2023-12-31T23:59:59Z").getTime())).isEqualTo(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2023-12-31T23:59:00Z").getTime());
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2023-12-31T23:59:59Z").getTime())).isEqualTo(
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2023-12-31T23:59:00Z").getTime());
     }
 
 
     @Test
     public void testCalculatePartitionsMinutes() throws ParseException {
         long startTs = tsDao.toPartitionTs(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T00:00:00Z").getTime());
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T00:00:00Z").getTime());
         long nextTs = tsDao.toPartitionTs(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T00:02:59Z").getTime());
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T00:02:59Z").getTime());
         long endTs = tsDao.toPartitionTs(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T00:10:00Z").getTime());
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T00:10:00Z").getTime());
         log.info("startTs {}, nextTs {}, endTs {}", startTs, nextTs, endTs);
 
         assertThat(tsDao.calculatePartitions(0, 0)).isEqualTo(List.of(0L));
         assertThat(tsDao.calculatePartitions(0, 1)).isEqualTo(List.of(0L, 1L));
 
         assertThat(tsDao.calculatePartitions(startTs, startTs)).isEqualTo(List.of(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T00:00:00Z").getTime()));
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T00:00:00Z").getTime()));
         assertThat(tsDao.calculatePartitions(startTs, nextTs)).isEqualTo(List.of(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T00:00:00Z").getTime(),
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T00:01:00Z").getTime(),
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T00:02:00Z").getTime()));
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T00:00:00Z").getTime(),
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T00:01:00Z").getTime(),
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T00:02:00Z").getTime()));
 
         assertThat(tsDao.calculatePartitions(startTs, endTs)).hasSize(11).isEqualTo(List.of(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T00:00:00Z").getTime(),
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T00:01:00Z").getTime(),
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T00:02:00Z").getTime(),
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T00:03:00Z").getTime(),
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T00:04:00Z").getTime(),
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T00:05:00Z").getTime(),
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T00:06:00Z").getTime(),
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T00:07:00Z").getTime(),
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T00:08:00Z").getTime(),
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T00:09:00Z").getTime(),
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T00:10:00Z").getTime()));
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T00:00:00Z").getTime(),
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T00:01:00Z").getTime(),
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T00:02:00Z").getTime(),
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T00:03:00Z").getTime(),
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T00:04:00Z").getTime(),
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T00:05:00Z").getTime(),
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T00:06:00Z").getTime(),
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T00:07:00Z").getTime(),
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T00:08:00Z").getTime(),
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T00:09:00Z").getTime(),
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-10-10T00:10:00Z").getTime()));
     }
 
 }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningMonthsAlwaysExistsTest.java b/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningMonthsAlwaysExistsTest.java
index 108620a43e..a99f42b668 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningMonthsAlwaysExistsTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningMonthsAlwaysExistsTest.java
@@ -32,7 +32,7 @@ import org.thingsboard.server.dao.nosql.CassandraBufferedRateWriteExecutor;
 import java.text.ParseException;
 import java.util.List;
 
-import static org.apache.commons.lang3.time.DateFormatUtils.ISO_DATETIME_TIME_ZONE_FORMAT;
+import static org.apache.commons.lang3.time.DateFormatUtils.ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT;
 import static org.assertj.core.api.Assertions.assertThat;
 
 @RunWith(SpringRunner.class)
@@ -66,47 +66,47 @@ public class CassandraBaseTimeseriesDaoPartitioningMonthsAlwaysExistsTest {
     public void testToPartitionsMonths() throws ParseException {
         assertThat(tsDao.getPartitioning()).isEqualTo("MONTHS");
         assertThat(tsDao.toPartitionTs(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-01-01T00:00:00Z").getTime())).isEqualTo(1640995200000L).isEqualTo(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-01-01T00:00:00Z").getTime());
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-01-01T00:00:00Z").getTime())).isEqualTo(1640995200000L).isEqualTo(
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-01-01T00:00:00Z").getTime());
         assertThat(tsDao.toPartitionTs(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-05-01T00:00:00Z").getTime())).isEqualTo(1651363200000L).isEqualTo(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-05-01T00:00:00Z").getTime());
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-05-01T00:00:00Z").getTime())).isEqualTo(1651363200000L).isEqualTo(
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-05-01T00:00:00Z").getTime());
         assertThat(tsDao.toPartitionTs(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-05-01T00:00:01Z").getTime())).isEqualTo(1651363200000L).isEqualTo(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-05-01T00:00:00Z").getTime());
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-05-01T00:00:01Z").getTime())).isEqualTo(1651363200000L).isEqualTo(
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-05-01T00:00:00Z").getTime());
         assertThat(tsDao.toPartitionTs(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-05-31T23:59:59Z").getTime())).isEqualTo(1651363200000L).isEqualTo(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-05-01T00:00:00Z").getTime());
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-05-31T23:59:59Z").getTime())).isEqualTo(1651363200000L).isEqualTo(
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-05-01T00:00:00Z").getTime());
         assertThat(tsDao.toPartitionTs(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2023-12-31T23:59:59Z").getTime())).isEqualTo(1701388800000L).isEqualTo(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2023-12-01T00:00:00Z").getTime());
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2023-12-31T23:59:59Z").getTime())).isEqualTo(1701388800000L).isEqualTo(
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2023-12-01T00:00:00Z").getTime());
     }
 
     @Test
     public void testCalculatePartitionsMonths() throws ParseException {
         long startTs = tsDao.toPartitionTs(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2019-12-12T00:00:00Z").getTime());
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2019-12-12T00:00:00Z").getTime());
         long nextTs = tsDao.toPartitionTs(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2020-01-31T23:59:59Z").getTime());
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2020-01-31T23:59:59Z").getTime());
         long leapTs = tsDao.toPartitionTs(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2020-02-29T23:59:59Z").getTime());
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2020-02-29T23:59:59Z").getTime());
         long endTs = tsDao.toPartitionTs(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2021-01-31T23:59:59Z").getTime());
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2021-01-31T23:59:59Z").getTime());
         log.info("startTs {}, nextTs {}, leapTs {}, endTs {}", startTs, nextTs, leapTs, endTs);
 
         assertThat(tsDao.calculatePartitions(0, 0)).isEqualTo(List.of(0L));
         assertThat(tsDao.calculatePartitions(0, 1)).isEqualTo(List.of(0L, 1L));
 
         assertThat(tsDao.calculatePartitions(startTs, startTs)).isEqualTo(List.of(1575158400000L)).isEqualTo(List.of(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2019-12-01T00:00:00Z").getTime()));
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2019-12-01T00:00:00Z").getTime()));
         assertThat(tsDao.calculatePartitions(startTs, nextTs)).isEqualTo(List.of(1575158400000L, 1577836800000L)).isEqualTo(List.of(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2019-12-01T00:00:00Z").getTime(),
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2020-01-01T00:00:00Z").getTime()));
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2019-12-01T00:00:00Z").getTime(),
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2020-01-01T00:00:00Z").getTime()));
 
         assertThat(tsDao.calculatePartitions(startTs, leapTs)).isEqualTo(List.of(1575158400000L, 1577836800000L, 1580515200000L)).isEqualTo(List.of(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2019-12-01T00:00:00Z").getTime(),
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2020-01-01T00:00:00Z").getTime(),
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2020-02-01T00:00:00Z").getTime()));
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2019-12-01T00:00:00Z").getTime(),
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2020-01-01T00:00:00Z").getTime(),
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2020-02-01T00:00:00Z").getTime()));
 
         assertThat(tsDao.calculatePartitions(startTs, endTs)).hasSize(14).isEqualTo(List.of(
                 1575158400000L,
@@ -115,20 +115,20 @@ public class CassandraBaseTimeseriesDaoPartitioningMonthsAlwaysExistsTest {
                 1593561600000L, 1596240000000L, 1598918400000L,
                 1601510400000L, 1604188800000L, 1606780800000L,
                 1609459200000L)).isEqualTo(List.of(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2019-12-01T00:00:00Z").getTime(),
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2020-01-01T00:00:00Z").getTime(),
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2020-02-01T00:00:00Z").getTime(),
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2020-03-01T00:00:00Z").getTime(),
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2020-04-01T00:00:00Z").getTime(),
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2020-05-01T00:00:00Z").getTime(),
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2020-06-01T00:00:00Z").getTime(),
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2020-07-01T00:00:00Z").getTime(),
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2020-08-01T00:00:00Z").getTime(),
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2020-09-01T00:00:00Z").getTime(),
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2020-10-01T00:00:00Z").getTime(),
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2020-11-01T00:00:00Z").getTime(),
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2020-12-01T00:00:00Z").getTime(),
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2021-01-01T00:00:00Z").getTime()));
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2019-12-01T00:00:00Z").getTime(),
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2020-01-01T00:00:00Z").getTime(),
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2020-02-01T00:00:00Z").getTime(),
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2020-03-01T00:00:00Z").getTime(),
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2020-04-01T00:00:00Z").getTime(),
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2020-05-01T00:00:00Z").getTime(),
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2020-06-01T00:00:00Z").getTime(),
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2020-07-01T00:00:00Z").getTime(),
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2020-08-01T00:00:00Z").getTime(),
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2020-09-01T00:00:00Z").getTime(),
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2020-10-01T00:00:00Z").getTime(),
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2020-11-01T00:00:00Z").getTime(),
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2020-12-01T00:00:00Z").getTime(),
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2021-01-01T00:00:00Z").getTime()));
     }
 
 }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningYearsAlwaysExistsTest.java b/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningYearsAlwaysExistsTest.java
index 6806eab7e1..7443cba945 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningYearsAlwaysExistsTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningYearsAlwaysExistsTest.java
@@ -32,7 +32,7 @@ import org.thingsboard.server.dao.nosql.CassandraBufferedRateWriteExecutor;
 import java.text.ParseException;
 import java.util.List;
 
-import static org.apache.commons.lang3.time.DateFormatUtils.ISO_DATETIME_TIME_ZONE_FORMAT;
+import static org.apache.commons.lang3.time.DateFormatUtils.ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT;
 import static org.assertj.core.api.Assertions.assertThat;
 
 @RunWith(SpringRunner.class)
@@ -66,50 +66,50 @@ public class CassandraBaseTimeseriesDaoPartitioningYearsAlwaysExistsTest {
     public void testToPartitionsYears() throws ParseException {
         assertThat(tsDao.getPartitioning()).isEqualTo("YEARS");
         assertThat(tsDao.toPartitionTs(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-01-01T00:00:00Z").getTime())).isEqualTo(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-01-01T00:00:00Z").getTime());
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-01-01T00:00:00Z").getTime())).isEqualTo(
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-01-01T00:00:00Z").getTime());
         assertThat(tsDao.toPartitionTs(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-05-01T00:00:00Z").getTime())).isEqualTo(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-01-01T00:00:00Z").getTime());
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-05-01T00:00:00Z").getTime())).isEqualTo(
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-01-01T00:00:00Z").getTime());
         assertThat(tsDao.toPartitionTs(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-05-01T00:00:01Z").getTime())).isEqualTo(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-01-01T00:00:00Z").getTime());
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-05-01T00:00:01Z").getTime())).isEqualTo(
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-01-01T00:00:00Z").getTime());
         assertThat(tsDao.toPartitionTs(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-05-31T23:59:59Z").getTime())).isEqualTo(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-01-01T00:00:00Z").getTime());
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-05-31T23:59:59Z").getTime())).isEqualTo(
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-01-01T00:00:00Z").getTime());
         assertThat(tsDao.toPartitionTs(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2023-12-31T23:59:59Z").getTime())).isEqualTo(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2023-01-01T00:00:00Z").getTime());
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2023-12-31T23:59:59Z").getTime())).isEqualTo(
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2023-01-01T00:00:00Z").getTime());
     }
 
     @Test
     public void testCalculatePartitionsYears() throws ParseException {
         long startTs = tsDao.toPartitionTs(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2019-01-01T00:00:00Z").getTime());
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2019-01-01T00:00:00Z").getTime());
         long nextTs = tsDao.toPartitionTs(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2021-10-12T23:59:59Z").getTime());
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2021-10-12T23:59:59Z").getTime());
         long endTs = tsDao.toPartitionTs(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2025-07-15T00:00:00Z").getTime());
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2025-07-15T00:00:00Z").getTime());
         log.info("startTs {}, nextTs {}, endTs {}", startTs, nextTs, endTs);
 
         assertThat(tsDao.calculatePartitions(0, 0)).isEqualTo(List.of(0L));
         assertThat(tsDao.calculatePartitions(0, 1)).isEqualTo(List.of(0L, 1L));
 
         assertThat(tsDao.calculatePartitions(startTs, startTs)).isEqualTo(List.of(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2019-01-01T00:00:00Z").getTime()));
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2019-01-01T00:00:00Z").getTime()));
         assertThat(tsDao.calculatePartitions(startTs, nextTs)).isEqualTo(List.of(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2019-01-01T00:00:00Z").getTime(),
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2020-01-01T00:00:00Z").getTime(),
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2021-01-01T00:00:00Z").getTime()));
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2019-01-01T00:00:00Z").getTime(),
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2020-01-01T00:00:00Z").getTime(),
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2021-01-01T00:00:00Z").getTime()));
 
         assertThat(tsDao.calculatePartitions(startTs, endTs)).hasSize(7).isEqualTo(List.of(
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2019-01-01T00:00:00Z").getTime(),
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2020-01-01T00:00:00Z").getTime(),
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2021-01-01T00:00:00Z").getTime(),
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2022-01-01T00:00:00Z").getTime(),
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2023-01-01T00:00:00Z").getTime(),
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2024-01-01T00:00:00Z").getTime(),
-                ISO_DATETIME_TIME_ZONE_FORMAT.parse("2025-01-01T00:00:00Z").getTime()));
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2019-01-01T00:00:00Z").getTime(),
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2020-01-01T00:00:00Z").getTime(),
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2021-01-01T00:00:00Z").getTime(),
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2022-01-01T00:00:00Z").getTime(),
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2023-01-01T00:00:00Z").getTime(),
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2024-01-01T00:00:00Z").getTime(),
+                ISO_8601_EXTENDED_DATETIME_TIME_ZONE_FORMAT.parse("2025-01-01T00:00:00Z").getTime()));
     }
 
 }
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.hybrid.yml b/docker/docker-compose.hybrid.yml
index a68e77ed28..43f1e81cd1 100644
--- a/docker/docker-compose.hybrid.yml
+++ b/docker/docker-compose.hybrid.yml
@@ -29,7 +29,7 @@ services:
       - ./tb-node/postgres:/var/lib/postgresql/data
   cassandra:
     restart: always
-    image: "cassandra:4.0.4"
+    image: "cassandra:4.1"
     ports:
       - "9042"
     volumes:
diff --git a/docker/docker-compose.kafka.yml b/docker/docker-compose.kafka.yml
index 99af42965b..c842cc75af 100644
--- a/docker/docker-compose.kafka.yml
+++ b/docker/docker-compose.kafka.yml
@@ -19,7 +19,7 @@ version: '3.0'
 services:
   kafka:
     restart: always
-    image: "bitnami/kafka:3.2.0"
+    image: "bitnami/kafka:3.7.0"
     ports:
       - "9092:9092"
     env_file:
diff --git a/docker/docker-compose.redis-cluster.yml b/docker/docker-compose.redis-cluster.yml
index 6017f2d6df..7b5d6d6dde 100644
--- a/docker/docker-compose.redis-cluster.yml
+++ b/docker/docker-compose.redis-cluster.yml
@@ -19,7 +19,7 @@ version: '3.0'
 services:
 # Redis cluster
   redis-node-0:
-    image: bitnami/redis-cluster:7.0
+    image: bitnami/redis-cluster:7.2
     volumes:
       - ./tb-node/redis-cluster-data-0:/bitnami/redis/data
     environment:
@@ -28,7 +28,7 @@ services:
       - 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'
 
   redis-node-1:
-    image: bitnami/redis-cluster:7.0
+    image: bitnami/redis-cluster:7.2
     volumes:
       - ./tb-node/redis-cluster-data-1:/bitnami/redis/data
     depends_on:
@@ -39,7 +39,7 @@ services:
       - 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'
 
   redis-node-2:
-    image: bitnami/redis-cluster:7.0
+    image: bitnami/redis-cluster:7.2
     volumes:
       - ./tb-node/redis-cluster-data-2:/bitnami/redis/data
     depends_on:
@@ -50,7 +50,7 @@ services:
       - 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'
 
   redis-node-3:
-    image: bitnami/redis-cluster:7.0
+    image: bitnami/redis-cluster:7.2
     volumes:
       - ./tb-node/redis-cluster-data-3:/bitnami/redis/data
     depends_on:
@@ -61,7 +61,7 @@ services:
       - 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'
 
   redis-node-4:
-    image: bitnami/redis-cluster:7.0
+    image: bitnami/redis-cluster:7.2
     volumes:
       - ./tb-node/redis-cluster-data-4:/bitnami/redis/data
     depends_on:
@@ -72,7 +72,7 @@ services:
       - 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'
 
   redis-node-5:
-    image: bitnami/redis-cluster:7.0
+    image: bitnami/redis-cluster:7.2
     volumes:
       - ./tb-node/redis-cluster-data-5:/bitnami/redis/data
     depends_on:
diff --git a/docker/docker-compose.redis-sentinel.yml b/docker/docker-compose.redis-sentinel.yml
index 54a3789664..a131bc7df9 100644
--- a/docker/docker-compose.redis-sentinel.yml
+++ b/docker/docker-compose.redis-sentinel.yml
@@ -19,7 +19,7 @@ version: '3.0'
 services:
   # Redis sentinel
   redis-master:
-    image: 'bitnami/redis:7.0'
+    image: 'bitnami/redis:7.2'
     volumes:
       - ./tb-node/redis-sentinel-data-master:/bitnami/redis/data
     environment:
@@ -27,7 +27,7 @@ services:
       - 'REDIS_PASSWORD=thingsboard'
 
   redis-slave:
-    image: 'bitnami/redis:7.0'
+    image: 'bitnami/redis:7.2'
     volumes:
       - ./tb-node/redis-sentinel-data-slave:/bitnami/redis/data
     environment:
@@ -39,7 +39,7 @@ services:
       - redis-master
 
   redis-sentinel:
-    image: 'bitnami/redis-sentinel:7.0'
+    image: 'bitnami/redis-sentinel:7.2'
     volumes:
       - ./tb-node/redis-sentinel-data-sentinel:/bitnami/redis/data
     environment:
diff --git a/docker/docker-compose.redis.yml b/docker/docker-compose.redis.yml
index 60170d5eb6..16b16d4a8e 100644
--- a/docker/docker-compose.redis.yml
+++ b/docker/docker-compose.redis.yml
@@ -20,7 +20,7 @@ services:
 # Redis standalone
   redis:
     restart: always
-    image: bitnami/redis:7.0
+    image: bitnami/redis:7.2
     environment:
       # ALLOW_EMPTY_PASSWORD is recommended only for development.
       ALLOW_EMPTY_PASSWORD: "yes"
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 9ed8e015f1..3205c62e57 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}"
@@ -300,7 +301,7 @@ services:
   haproxy:
     restart: always
     container_name: "${LOAD_BALANCER_NAME}"
-    image: thingsboard/haproxy-certbot:2.2.31-alpine3.18
+    image: thingsboard/haproxy-certbot:2.2.33-alpine
     volumes:
      - ./haproxy/config:/config
      - ./haproxy/letsencrypt:/etc/letsencrypt
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/pom.xml b/monitoring/pom.xml
index c948961ab9..2dd8e54f83 100644
--- a/monitoring/pom.xml
+++ b/monitoring/pom.xml
@@ -21,7 +21,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.6.3-SNAPSHOT</version>
+        <version>3.7.0-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
 
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/monitoring/src/main/java/org/thingsboard/monitoring/notification/channels/impl/SlackNotificationChannel.java b/monitoring/src/main/java/org/thingsboard/monitoring/notification/channels/impl/SlackNotificationChannel.java
index e508159b8b..77b68f665d 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/notification/channels/impl/SlackNotificationChannel.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/notification/channels/impl/SlackNotificationChannel.java
@@ -23,7 +23,7 @@ import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestTemplate;
 import org.thingsboard.monitoring.notification.channels.NotificationChannel;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import java.time.Duration;
 import java.util.Map;
 
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/service/BaseHealthChecker.java b/monitoring/src/main/java/org/thingsboard/monitoring/service/BaseHealthChecker.java
index e6a4517a2a..ae5cc63994 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/service/BaseHealthChecker.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/service/BaseHealthChecker.java
@@ -29,8 +29,8 @@ import org.thingsboard.monitoring.data.MonitoredServiceKey;
 import org.thingsboard.monitoring.data.ServiceFailureException;
 import org.thingsboard.monitoring.util.TbStopWatch;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/service/BaseMonitoringService.java b/monitoring/src/main/java/org/thingsboard/monitoring/service/BaseMonitoringService.java
index 105fd94c7f..5ff8c4f9a1 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/service/BaseMonitoringService.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/service/BaseMonitoringService.java
@@ -29,7 +29,7 @@ import org.thingsboard.monitoring.data.MonitoredServiceKey;
 import org.thingsboard.monitoring.service.transport.TransportHealthChecker;
 import org.thingsboard.monitoring.util.TbStopWatch;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import java.net.InetAddress;
 import java.net.URI;
 import java.net.URISyntaxException;
diff --git a/msa/black-box-tests/README.md b/msa/black-box-tests/README.md
index 340f0d0eb8..31277e2a55 100644
--- a/msa/black-box-tests/README.md
+++ b/msa/black-box-tests/README.md
@@ -22,6 +22,10 @@ As result, in REPOSITORY column, next images should be present:
 
         mvn clean install -DblackBoxTests.skip=false
 
+- Run the black box tests (without ui tests) in the [msa/black-box-tests](../black-box-tests) directory with Redis standalone with TLS:
+
+        mvn clean install -DblackBoxTests.skip=false -DblackBoxTests.redisSsl=true
+
 - Run the black box tests in the [msa/black-box-tests](../black-box-tests) directory with Redis cluster:
 
         mvn clean install -DblackBoxTests.skip=false -DblackBoxTests.redisCluster=true
diff --git a/msa/black-box-tests/pom.xml b/msa/black-box-tests/pom.xml
index 2d3c2ce18f..f1b7525438 100644
--- a/msa/black-box-tests/pom.xml
+++ b/msa/black-box-tests/pom.xml
@@ -21,7 +21,7 @@
 
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.6.3-SNAPSHOT</version>
+        <version>3.7.0-SNAPSHOT</version>
         <artifactId>msa</artifactId>
     </parent>
     <groupId>org.thingsboard.msa</groupId>
@@ -85,7 +85,7 @@
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-all</artifactId>
+            <artifactId>hamcrest</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -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/AbstractCoapClientTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/AbstractCoapClientTest.java
new file mode 100644
index 0000000000..4ed5426bc4
--- /dev/null
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/AbstractCoapClientTest.java
@@ -0,0 +1,81 @@
+/**
+ * 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 com.fasterxml.jackson.databind.node.ObjectNode;
+import org.eclipse.californium.core.CoapClient;
+import org.eclipse.californium.core.coap.MediaTypeRegistry;
+import org.eclipse.californium.core.config.CoapConfig;
+import org.eclipse.californium.elements.config.Configuration;
+import org.eclipse.californium.elements.config.Configuration.ModuleDefinitionsProvider;
+import org.eclipse.californium.elements.config.IntegerDefinition;
+import org.eclipse.californium.elements.config.TcpConfig;
+import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.server.common.msg.session.FeatureType;
+
+public abstract class AbstractCoapClientTest extends AbstractContainerTest{
+
+    private static final String COAP_BASE_URL = "coap://localhost:5683/api/v1/";
+    private static final long CLIENT_REQUEST_TIMEOUT = 60000L;
+
+
+    private static final String COAP_CLIENT_TEST = "COAP_CLIENT_TEST.";
+    private static final IntegerDefinition COAP_PORT_DEF = CoapConfig.COAP_PORT;
+
+    private static final ModuleDefinitionsProvider MODULE_DEFINITIONS_PROVIDER = new ModuleDefinitionsProvider() {
+
+        @Override
+        public String getModule() {
+            return COAP_CLIENT_TEST;
+        }
+
+        @Override
+        public void applyDefinitions(Configuration config) {
+            TcpConfig.register();
+            config.set(COAP_PORT_DEF, 5683);
+        }
+    };
+
+    protected CoapClient client;
+
+    protected byte[] createCoapClientAndPublish(String deviceName) throws Exception {
+        String provisionRequestMsg = createTestProvisionMessage(deviceName);
+        Configuration.addDefaultModule(MODULE_DEFINITIONS_PROVIDER);
+        String featureTokenUrl = COAP_BASE_URL + FeatureType.PROVISION.name().toLowerCase();
+        client = new CoapClient(featureTokenUrl);
+        return client.setTimeout(CLIENT_REQUEST_TIMEOUT)
+                .post(provisionRequestMsg.getBytes(), MediaTypeRegistry.APPLICATION_JSON)
+                .getPayload();
+    }
+
+    protected void disconnect() {
+        if (client != null) {
+            client.shutdown();
+        }
+    }
+
+    private String createTestProvisionMessage(String deviceName) {
+        ObjectNode provisionRequest = JacksonUtil.newObjectNode();
+        provisionRequest.put("provisionDeviceKey", TEST_PROVISION_DEVICE_KEY);
+        provisionRequest.put("provisionDeviceSecret", TEST_PROVISION_DEVICE_SECRET);
+        if (deviceName != null) {
+            provisionRequest.put("deviceName", deviceName);
+        }
+        return provisionRequest.toString();
+    }
+}
+
+
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/ContainerTestSuite.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ContainerTestSuite.java
index 15c3ccbbba..bbaeabe907 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ContainerTestSuite.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ContainerTestSuite.java
@@ -44,6 +44,7 @@ import static org.testng.Assert.fail;
 public class ContainerTestSuite {
     final static boolean IS_REDIS_CLUSTER = Boolean.parseBoolean(System.getProperty("blackBoxTests.redisCluster"));
     final static boolean IS_REDIS_SENTINEL = Boolean.parseBoolean(System.getProperty("blackBoxTests.redisSentinel"));
+    final static boolean IS_REDIS_SSL = Boolean.parseBoolean(System.getProperty("blackBoxTests.redisSsl"));
     final static boolean IS_HYBRID_MODE = Boolean.parseBoolean(System.getProperty("blackBoxTests.hybridMode"));
     final static String QUEUE_TYPE = System.getProperty("blackBoxTests.queue", "kafka");
     private static final String SOURCE_DIR = "./../../docker/";
@@ -82,6 +83,7 @@ public class ContainerTestSuite {
         installTb.createVolumes();
         log.info("System property of blackBoxTests.redisCluster is {}", IS_REDIS_CLUSTER);
         log.info("System property of blackBoxTests.redisSentinel is {}", IS_REDIS_SENTINEL);
+        log.info("System property of blackBoxTests.redisSsl is {}", IS_REDIS_SSL);
         log.info("System property of blackBoxTests.hybridMode is {}", IS_HYBRID_MODE);
         boolean skipTailChildContainers = Boolean.parseBoolean(System.getProperty("blackBoxTests.skipTailChildContainers"));
         try {
@@ -104,6 +106,12 @@ public class ContainerTestSuite {
                 }
             }
 
+            if (IS_REDIS_SSL) {
+                addToFile(targetDir, "cache-redis.env",
+                        Map.of("TB_REDIS_SSL_ENABLED", "true",
+                                "TB_REDIS_SSL_PEM_CERT", "/redis/certs/redisCA.crt"));
+            }
+
             List<File> composeFiles = new ArrayList<>(Arrays.asList(
                     new File(targetDir + "docker-compose.yml"),
                     new File(targetDir + "docker-compose.volumes.yml"),
@@ -188,6 +196,9 @@ public class ContainerTestSuite {
         if (IS_REDIS_SENTINEL) {
             return "docker-compose.redis-sentinel.yml";
         }
+        if (IS_REDIS_SSL) {
+            return "docker-compose.redis-ssl.yml";
+        }
         return "docker-compose.redis.yml";
     }
 
@@ -198,6 +209,9 @@ public class ContainerTestSuite {
         if (IS_REDIS_SENTINEL) {
             return "docker-compose.redis-sentinel.volumes.yml";
         }
+        if (IS_REDIS_SSL) {
+            return "docker-compose.redis-ssl.volumes.yml";
+        }
         return "docker-compose.redis.volumes.yml";
     }
 
@@ -218,6 +232,15 @@ public class ContainerTestSuite {
         Files.write(envFilePath, data.getBytes(StandardCharsets.UTF_8));
     }
 
+    private static void addToFile(String targetDir, String fileName, Map<String, String> properties) throws IOException {
+        Path envFilePath = Path.of(targetDir, fileName);
+        StringBuilder data = new StringBuilder(Files.readString(envFilePath));
+        for (var entry : properties.entrySet()) {
+            data.append("\n").append(entry.getKey()).append("=").append(entry.getValue());
+        }
+        Files.write(envFilePath, data.toString().getBytes(StandardCharsets.UTF_8));
+    }
+
     private static String getSysProp(String propertyName) {
         var value = System.getProperty(propertyName);
         if (StringUtils.isEmpty(value)) {
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/TestCoapClient.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/TestCoapClient.java
deleted file mode 100644
index 67638ebefb..0000000000
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/TestCoapClient.java
+++ /dev/null
@@ -1,122 +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.msa;
-
-import org.eclipse.californium.core.CoapClient;
-import org.eclipse.californium.core.CoapHandler;
-import org.eclipse.californium.core.CoapObserveRelation;
-import org.eclipse.californium.core.CoapResponse;
-import org.eclipse.californium.core.coap.CoAP;
-import org.eclipse.californium.core.coap.MediaTypeRegistry;
-import org.eclipse.californium.core.coap.Request;
-import org.eclipse.californium.elements.exception.ConnectorException;
-import org.thingsboard.server.common.msg.session.FeatureType;
-
-import java.io.IOException;
-
-public class TestCoapClient {
-
-    private static final String COAP_BASE_URL = "coap://localhost:5683/api/v1/";
-    private static final long CLIENT_REQUEST_TIMEOUT = 60000L;
-
-    private final CoapClient client;
-
-    public TestCoapClient(){
-        this.client = createClient();
-    }
-
-    public TestCoapClient(String accessToken, FeatureType featureType) {
-        this.client = createClient(getFeatureTokenUrl(accessToken, featureType));
-    }
-
-    public TestCoapClient(String featureTokenUrl) {
-        this.client = createClient(featureTokenUrl);
-    }
-
-    public void connectToCoap(String accessToken) {
-        setURI(accessToken, null);
-    }
-
-    public void connectToCoap(String accessToken, FeatureType featureType) {
-        setURI(accessToken, featureType);
-    }
-
-    public void disconnect() {
-        if (client != null) {
-            client.shutdown();
-        }
-    }
-
-    public CoapResponse postMethod(String requestBody) throws ConnectorException, IOException {
-        return this.postMethod(requestBody.getBytes());
-    }
-
-    public CoapResponse postMethod(byte[] requestBodyBytes) throws ConnectorException, IOException {
-        return client.setTimeout(CLIENT_REQUEST_TIMEOUT).post(requestBodyBytes, MediaTypeRegistry.APPLICATION_JSON);
-    }
-
-    public void postMethod(CoapHandler handler, String payload, int format) {
-        client.post(handler, payload, format);
-    }
-
-    public void postMethod(CoapHandler handler, byte[] payload, int format) {
-        client.post(handler, payload, format);
-    }
-
-    public CoapResponse getMethod() throws ConnectorException, IOException {
-        return client.setTimeout(CLIENT_REQUEST_TIMEOUT).get();
-    }
-
-    public CoapObserveRelation getObserveRelation(TestCoapClientCallback callback){
-        Request request = Request.newGet().setObserve();
-        request.setType(CoAP.Type.CON);
-        return client.observe(request, callback);
-    }
-
-    public void setURI(String featureTokenUrl) {
-        if (client == null) {
-            throw new RuntimeException("Failed to connect! CoapClient is not initialized!");
-        }
-        client.setURI(featureTokenUrl);
-    }
-
-    public void setURI(String accessToken, FeatureType featureType) {
-        if (featureType == null){
-            featureType = FeatureType.ATTRIBUTES;
-        }
-        setURI(getFeatureTokenUrl(accessToken, featureType));
-    }
-
-    private CoapClient createClient() {
-        return new CoapClient();
-    }
-
-    private CoapClient createClient(String featureTokenUrl) {
-        return new CoapClient(featureTokenUrl);
-    }
-
-    public static String getFeatureTokenUrl(FeatureType featureType) {
-        return COAP_BASE_URL + featureType.name().toLowerCase();
-    }
-
-    public static String getFeatureTokenUrl(String token, FeatureType featureType) {
-        return COAP_BASE_URL + token + "/" + featureType.name().toLowerCase();
-    }
-
-    public static String getFeatureTokenUrl(String token, FeatureType featureType, int requestId) {
-        return COAP_BASE_URL + token + "/" + featureType.name().toLowerCase() + "/" + requestId;
-    }
-}
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/TestCoapClientCallback.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/TestCoapClientCallback.java
deleted file mode 100644
index 49c5a06476..0000000000
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/TestCoapClientCallback.java
+++ /dev/null
@@ -1,68 +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.msa;
-
-import lombok.Data;
-import lombok.extern.slf4j.Slf4j;
-import org.eclipse.californium.core.CoapHandler;
-import org.eclipse.californium.core.CoapResponse;
-import org.eclipse.californium.core.coap.CoAP;
-
-import java.util.concurrent.CountDownLatch;
-
-@Slf4j
-@Data
-public class TestCoapClientCallback implements CoapHandler {
-
-    protected final CountDownLatch latch;
-    protected Integer observe;
-    protected byte[] payloadBytes;
-    protected CoAP.ResponseCode responseCode;
-
-    public TestCoapClientCallback() {
-        this.latch = new CountDownLatch(1);
-    }
-
-    public TestCoapClientCallback(int subscribeCount) {
-        this.latch = new CountDownLatch(subscribeCount);
-    }
-
-    public Integer getObserve() {
-        return observe;
-    }
-
-    public byte[] getPayloadBytes() {
-        return payloadBytes;
-    }
-
-    public CoAP.ResponseCode getResponseCode() {
-        return responseCode;
-    }
-
-    @Override
-    public void onLoad(CoapResponse response) {
-        observe = response.getOptions().getObserve();
-        payloadBytes = response.getPayload();
-        responseCode = response.getCode();
-        latch.countDown();
-    }
-
-    @Override
-    public void onError() {
-        log.warn("Command Response Ack Error, No connect");
-    }
-
-}
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 305e8706f2..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;
@@ -187,7 +190,7 @@ public class TestRestClient {
 
     public ValidatableResponse postAttribute(String accessToken, JsonNode attribute) {
         return given().spec(requestSpec).body(attribute)
-                .post("/api/v1/{accessToken}/attributes/", accessToken)
+                .post("/api/v1/{accessToken}/attributes", accessToken)
                 .then()
                 .statusCode(HTTP_OK);
     }
@@ -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/CoapClientTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/CoapClientTest.java
index 4dc7d91b2a..a65aff1bc1 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/CoapClientTest.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/CoapClientTest.java
@@ -16,7 +16,6 @@
 package org.thingsboard.server.msa.connectivity;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.gson.JsonObject;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
@@ -26,18 +25,14 @@ 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.security.DeviceCredentials;
-import org.thingsboard.server.common.msg.session.FeatureType;
-import org.thingsboard.server.msa.AbstractContainerTest;
+import org.thingsboard.server.msa.AbstractCoapClientTest;
 import org.thingsboard.server.msa.DisableUIListeners;
-import org.thingsboard.server.msa.TestCoapClient;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.thingsboard.server.msa.prototypes.DevicePrototypes.defaultDevicePrototype;
 
 @DisableUIListeners
-public class CoapClientTest  extends AbstractContainerTest {
-    private TestCoapClient client;
-
+public class CoapClientTest extends AbstractCoapClientTest{
     private Device device;
     @BeforeMethod
     public void setUp() throws Exception {
@@ -48,6 +43,7 @@ public class CoapClientTest  extends AbstractContainerTest {
     @AfterMethod
     public void tearDown() {
         testRestClient.deleteDeviceIfExists(device.getId());
+        disconnect();
     }
 
     @Test
@@ -101,21 +97,5 @@ public class CoapClientTest  extends AbstractContainerTest {
 
         assertThat(response.get("status").asText()).isEqualTo("NOT_FOUND");
     }
-
-    private byte[] createCoapClientAndPublish(String deviceName) throws Exception {
-        String provisionRequestMsg = createTestProvisionMessage(deviceName);
-        client = new TestCoapClient(TestCoapClient.getFeatureTokenUrl(FeatureType.PROVISION));
-        return client.postMethod(provisionRequestMsg.getBytes()).getPayload();
-    }
-
-    private String createTestProvisionMessage(String deviceName) {
-        ObjectNode provisionRequest = JacksonUtil.newObjectNode();
-        provisionRequest.put("provisionDeviceKey", TEST_PROVISION_DEVICE_KEY);
-        provisionRequest.put("provisionDeviceSecret", TEST_PROVISION_DEVICE_SECRET);
-        if (deviceName != null) {
-            provisionRequest.put("deviceName", deviceName);
-        }
-        return provisionRequest.toString();
-    }
-
 }
+
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/docker-compose.redis-ssl.volumes.yml b/msa/black-box-tests/src/test/resources/docker-compose.redis-ssl.volumes.yml
new file mode 100644
index 0000000000..2042fa5919
--- /dev/null
+++ b/msa/black-box-tests/src/test/resources/docker-compose.redis-ssl.volumes.yml
@@ -0,0 +1,27 @@
+#
+# 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.
+#
+
+version: '3.0'
+
+services:
+  redis:
+    volumes:
+      - redis-data:/bitnami/redis/data
+
+volumes:
+  redis-data:
+    external:
+      name: ${REDIS_DATA_VOLUME}
diff --git a/msa/black-box-tests/src/test/resources/docker-compose.redis-ssl.yml b/msa/black-box-tests/src/test/resources/docker-compose.redis-ssl.yml
new file mode 100644
index 0000000000..0407aa3f8c
--- /dev/null
+++ b/msa/black-box-tests/src/test/resources/docker-compose.redis-ssl.yml
@@ -0,0 +1,129 @@
+#
+# 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.
+#
+
+version: '3.0'
+
+services:
+# Redis standalone
+  redis:
+    restart: always
+    image: bitnami/redis:7.2
+    environment:
+      # ALLOW_EMPTY_PASSWORD is recommended only for development.
+      - 'ALLOW_EMPTY_PASSWORD=yes'
+      - 'REDIS_TLS_ENABLED=yes'
+      - 'REDIS_TLS_CERT_FILE=/redis/certs/redis.crt'
+      - 'REDIS_TLS_KEY_FILE=/redis/certs/redis.key'
+      - 'REDIS_TLS_CA_FILE=/redis/certs/redisCA.crt'
+      - 'REDIS_TLS_AUTH_CLIENTS=no'
+    ports:
+      - '6379:6379'
+    volumes:
+      - ./tb-node/redis-data:/bitnami/redis/data
+      - ./redis-certs:/redis/certs
+
+# ThingsBoard setup to use redis-standalone
+  tb-core1:
+    env_file:
+      - cache-redis.env
+    volumes:
+      - ./redis-certs:/redis/certs
+    depends_on:
+      - redis
+  tb-core2:
+    env_file:
+      - cache-redis.env
+    volumes:
+      - ./redis-certs:/redis/certs
+    depends_on:
+      - redis
+  tb-rule-engine1:
+    env_file:
+      - cache-redis.env
+    volumes:
+      - ./redis-certs:/redis/certs
+    depends_on:
+      - redis
+  tb-rule-engine2:
+    env_file:
+      - cache-redis.env
+    volumes:
+      - ./redis-certs:/redis/certs
+    depends_on:
+      - redis
+  tb-mqtt-transport1:
+    env_file:
+      - cache-redis.env
+    volumes:
+      - ./redis-certs:/redis/certs
+    depends_on:
+      - redis
+  tb-mqtt-transport2:
+    env_file:
+      - cache-redis.env
+    volumes:
+      - ./redis-certs:/redis/certs
+    depends_on:
+      - redis
+  tb-http-transport1:
+    env_file:
+      - cache-redis.env
+    volumes:
+      - ./redis-certs:/redis/certs
+    depends_on:
+      - redis
+  tb-http-transport2:
+    env_file:
+      - cache-redis.env
+    volumes:
+      - ./redis-certs:/redis/certs
+    depends_on:
+      - redis
+  tb-coap-transport:
+    env_file:
+      - cache-redis.env
+    volumes:
+      - ./redis-certs:/redis/certs
+    depends_on:
+      - redis
+  tb-lwm2m-transport:
+    env_file:
+      - cache-redis.env
+    volumes:
+      - ./redis-certs:/redis/certs
+    depends_on:
+      - redis
+  tb-snmp-transport:
+    env_file:
+      - cache-redis.env
+    volumes:
+      - ./redis-certs:/redis/certs
+    depends_on:
+      - redis
+  tb-vc-executor1:
+    env_file:
+      - cache-redis.env
+    volumes:
+      - ./redis-certs:/redis/certs
+    depends_on:
+      - redis
+  tb-vc-executor2:
+    env_file:
+      - cache-redis.env
+    volumes:
+      - ./redis-certs:/redis/certs
+    depends_on:
+      - redis
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/redis-certs/redis.crt b/msa/black-box-tests/src/test/resources/redis-certs/redis.crt
new file mode 100755
index 0000000000..8fce48c0a1
--- /dev/null
+++ b/msa/black-box-tests/src/test/resources/redis-certs/redis.crt
@@ -0,0 +1,28 @@
+-----BEGIN CERTIFICATE-----
+MIIE1TCCAr2gAwIBAgIUFdFLz/q0EosJc39HhIac9+XpyRkwDQYJKoZIhvcNAQEL
+BQAwWTELMAkGA1UEBhMCdWExDTALBgNVBAgMBGt5aXYxDTALBgNVBAcMBGt5aXYx
+CzAJBgNVBAoMAnRiMQswCQYDVQQLDAJ0YjESMBAGA1UEAwwJbG9jYWxob3N0MB4X
+DTIzMDkwNDE1NTA0MVoXDTI0MDkwMzE1NTA0MVowYjELMAkGA1UEBhMCQ1IxEzAR
+BgNVBAgMCkNoYW5kcmlsbGExEzARBgNVBAcMCkNoYW5kcmlsbGExEjAQBgNVBAMM
+CUhPU1RfTkFNRTEVMBMGA1UECgwMTmV3IFJlcHVibGljMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEA+ICaK/aSklkUIih3cl4k4RYJL8rLS68d5JVSxpCQ
+8MwuAakdU+ptD0b6X4+CcNtR96UlcO3cR15GLLT6s29Kw4Ta5SME+yhuFLUIrWxA
+/gJ/pkJGkq1vXYZzdUFjtMlF+VbIw+r2hhSkbTR1hV08iRlvflafS8JB/tznqTFy
+QIXu08heRtxVaC6SMHLeHmZdgdJrSOulwg/ctcP6tki+ZU9v+TH71M3mTIOLzuSz
+7sqnFMPgW7ER0Utc4fndRfz17LA1NZdSrN0Ch5IO+EZ9gf/25w8makbx7lZoZASm
+sAd0Uyq9ZPC0ok+oJjeDwanl/Bo7CGEgdxaFYNKpnizyUQIDAQABo4GLMIGIMAsG
+A1UdDwQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGgYDVR0R
+BBMwEYIJbG9jYWxob3N0hwR/AAABMB0GA1UdDgQWBBRAIkMMxT30wZYoNQuDM7uT
+qwb+VzAfBgNVHSMEGDAWgBSfpEhvBqWx6usjDlGx7lEx8Fl21DANBgkqhkiG9w0B
+AQsFAAOCAgEAMeaZ5K0w2kPSqcZbzV4WwGShrhnSYdsA4dlZhAUNNxsoXX590Ppe
+lla+vhFSdk/IwjFxLzmiau5+JlCySeOJv2AaG56JvBBU1Wl8LOk01a7qRctiKRth
+AGFGKZoJ50h5W1A0NV7KwcGIkQdebAFPdMmkOd6Do98ZhkzYLRuAK3U0K4wNQJuf
+gPt9XtIugRNQOwxolXAj81FfhjZ5CnoaCQYJBFyIenwg4uGjg+D0F9WtAlRq8ww+
+XpWpVw8QgPDk+SVoGXUsBs+wMCDlGu4ozN2lIvG1N5n1q0qn39SUYOSBkEsdM+AS
+Yu6LMP4J1SPOwT5UJN2jK7fAYBdChF39nV/xiatfUSy8rWUFQSwGv6JD3X0MAYfT
+DyOiYdX8o+AnetjfBHHwVXDobh5d1GiC2DwoUNW7KoEdj5mmhDZKiB2S47/5J7El
+UA9CevmmDvf/tN9itPrutSwcb7uwLYRsf7Gx3D3P/2+nQHUKyNcyQCNtgR7RKHBS
+EjeedMgtKvrqsdPnk6Ygwj8EMh4owDIDcieqnPZAxhqJOJT2ZORdzyelmpv5aDGc
+0XnnRHRInSUgQStfPa9ghOBpSXlhxL1EJFFik+yFOjH4GivhoynCb7zjW+MjlPDV
+LAsnmMukBR95ZkpxMnRUEoLTEvTaxmg4Vr/mqXeQUKdU8A812Wrk2hc=
+-----END CERTIFICATE-----
diff --git a/msa/black-box-tests/src/test/resources/redis-certs/redis.key b/msa/black-box-tests/src/test/resources/redis-certs/redis.key
new file mode 100755
index 0000000000..cbbf83ca2b
--- /dev/null
+++ b/msa/black-box-tests/src/test/resources/redis-certs/redis.key
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQD4gJor9pKSWRQi
+KHdyXiThFgkvystLrx3klVLGkJDwzC4BqR1T6m0PRvpfj4Jw21H3pSVw7dxHXkYs
+tPqzb0rDhNrlIwT7KG4UtQitbED+An+mQkaSrW9dhnN1QWO0yUX5VsjD6vaGFKRt
+NHWFXTyJGW9+Vp9LwkH+3OepMXJAhe7TyF5G3FVoLpIwct4eZl2B0mtI66XCD9y1
+w/q2SL5lT2/5MfvUzeZMg4vO5LPuyqcUw+BbsRHRS1zh+d1F/PXssDU1l1Ks3QKH
+kg74Rn2B//bnDyZqRvHuVmhkBKawB3RTKr1k8LSiT6gmN4PBqeX8GjsIYSB3FoVg
+0qmeLPJRAgMBAAECggEAE6sCCMa8NQ8N0+JGCew/mP0Ifxra2kOi5wuWgJbCkfxn
+C8SZyKF+Pj5M5LFUDqCdLS+J9hUtYQyqGzG7weXmEfF67bXG2CYMCGGHrUorHq+N
+8NfABC3r6YgRrU8emBlyC1j+DNuU5WnO1cHYJ1UIzIUR2Pr8Ip/eX1CWmUKLm2WW
+YvUGzvTG0mM0l9/Q8pcTndAxDuL90GG6TrxtQoy7Ir6dYxTVKHgOwa6RX86VrCkm
+jl6Wu7Bvo2fnPvPVx8p1mgWNgtBbnc/VAYjeF7Yi7CETWHTxGM4iGtZNL8/xxlW7
+sm2SmWEu72EupLYgytA9w+EptjbwWfcTaWbWUXTFHQKBgQD5nmYLVvZUR1oc9g2a
+Q7XpFQ/jVvwedeKGolMbWTFrEhl1+D8lKN/S3SoRCOALOUJFUCU+L1snN3MsJ5Es
+Gb0FLSH1LBBfuHqP+aHn/uGLMW8e7P9thh4DQ1tIzKE5xhh+JDJJqd15YJlsDy1F
+0aKWyulS4o9XK5q86rs5QbI4MwKBgQD+2uXEAiFwEXq7pw2e8STrnt0jp09KU6b1
+z/ykyArBdcVkrEudZ+jIrR/6rlSKK+SKQxtx8MG9M/Nm09KFRCAWblxHBwQ87ZnU
+8tMAmPHrikLKk1dbbU3BQ3cZkIWMryCo4wzuxeT4mc2goTGNZpNZDpjqjCXbnCgP
+T29aPHG3awKBgGFv8UlP4su3JnfTnC+xaprXO+J0G+oP/iKrzmEIif/Pity/0HZC
+5Eu9RSRtIHeBHFtOE5uYhK5kOLLtpv9d9KjGm1DGqIWUz1LQEOEsXwIkg8nAnVw1
+VBXV/xYFupGAwCLNIkwa4Hb2vCywJ+3vDNZr0nQmN+nA/Z/syLRq7pR9AoGBALqp
+l3pd2SHdG5jP/VD57IHLRMs1YwTcikAmizQh9IbH/MEE1QlALya0buTLxM3C4kxG
+ZJaqsSwkHdWltd64DAyB3oKDaB48JNzs0ZDxdNeA1/TJwEUNpNK12EjYKojlSDWK
+v1Evjspq1EofZkzb4XZsE6JO7feQw2KbWsKr3NprAoGBAKSSAjDpncxb+9Pr0Lwa
+AS7ATgMhot6+lbtZZV6egTGUVvtgd1LyE2ZJkE+5XJRu49X1lSJdDpFT66rG5eNV
++rYnDqXL8c0Z/j1L96z1UMY6DLPj3n+07zgLiNIrOR4UKP/+TGB9MHHFMEpYnij0
+m/f6dg0Ujw6CW31Hq2QdJ9P7
+-----END PRIVATE KEY-----
diff --git a/msa/black-box-tests/src/test/resources/redis-certs/redisCA.crt b/msa/black-box-tests/src/test/resources/redis-certs/redisCA.crt
new file mode 100644
index 0000000000..444dac130b
--- /dev/null
+++ b/msa/black-box-tests/src/test/resources/redis-certs/redisCA.crt
@@ -0,0 +1,32 @@
+-----BEGIN CERTIFICATE-----
+MIIFkzCCA3ugAwIBAgIUK9fjeDv+ESrdFSHMqsod5djzTh4wDQYJKoZIhvcNAQEL
+BQAwWTELMAkGA1UEBhMCdWExDTALBgNVBAgMBGt5aXYxDTALBgNVBAcMBGt5aXYx
+CzAJBgNVBAoMAnRiMQswCQYDVQQLDAJ0YjESMBAGA1UEAwwJbG9jYWxob3N0MB4X
+DTIzMDkwNDE1MDUxN1oXDTMzMDkwMTE1MDUxN1owWTELMAkGA1UEBhMCdWExDTAL
+BgNVBAgMBGt5aXYxDTALBgNVBAcMBGt5aXYxCzAJBgNVBAoMAnRiMQswCQYDVQQL
+DAJ0YjESMBAGA1UEAwwJbG9jYWxob3N0MIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
+MIICCgKCAgEAsaxpM/OLfx0jNVHAiD4dmJ4t5vZQNINtaI/GgnXNv9iM3aDvbYr/
+Cp8mJgkOvI9BZqDEcLscBv+H4mxCqS2IFBqJbtkYHExBgg7V13NRtJwqsWVz0rBG
+V1SFou2JSzPkQ6IDxJI+AUW6DfsbCs3o6VRPbriMfY06rNagerG1osaD9yn/EsH9
+BTdALravcvU8mxOghzWH54EzwDUA0mKUetgvgfqkzjDlqzXFnOsIinnDi0Ia3idF
+RaBVs7bKokl0Zp1mdtvsEpG4lcmhDtNIogcmeH2LW2zEneHuDX2BGsN9CCwEGj3k
+cftuxEck2mQVDoDgX1IpIUGBhIaAixj+UXh8RNSwU96GBwKbFNy/CXNj5+34DcL0
+kBh7p77rcrzm6xEGpP/3YYPoRVBRAX64x4QqzqF5oj6Sf2NGKH9RILmLWdqmq/up
+6cMYyzAEOr3nIQ/7OfkdvxOt0oUzeB7QPYbTvM9bCqe3XA+JH1pnLhgySPxdTeVe
+nUExge8WPJmdTlH1McminFDiJruFRa069hbky/b5z8BjIBN5S3lC4PdEE9YmDSL1
+u26HnRVwtqC32fkDNI1PT/4p2VaB+DmIxkFXrVUnV0TiyCyxu4jIgXhUiJRHgBn9
+zwB7lEZUhMriOBGJqHa0H0TtnH8z/5GYmipeJZllmQbhI+sMyYBS/+cCAwEAAaNT
+MFEwHQYDVR0OBBYEFJ+kSG8GpbHq6yMOUbHuUTHwWXbUMB8GA1UdIwQYMBaAFJ+k
+SG8GpbHq6yMOUbHuUTHwWXbUMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEL
+BQADggIBABCt/bx7/YbvR/0PE4nIzxVovPItR+oYcInRrbwT+VWvL22Su7rf71lc
+1vlil4xjdVxSEi6s5KZ69PLJKKXukt1MBCUStDK1HKPPB1SAhtD6nuvkh7YL+2im
+A5gmtg3KkD2ZD2mWCHAa8K7NEMah1XiMVMo+ByFNPQExqOk2i3+5kjBrlfElsm0Q
+ixM++93T62gTibOjuO8uPP0NUcIHI+RcEalc1hJjFof4gWLnIulaeuUydXw7RhzE
+HzeOeZiZWrvW2mjfiANMn27TV5K0dZoh/4+YLqkKn1bdQsYVIWxWx8jZ0Nj0yzMb
+Ekkodny3F+BHqkSUb3whRWDKN82valnCSJFAKZFZzueAJgCjANTNdr7S7UUIxZyi
+QKll59T4O1yhawRu/cZ6TQWzV7RWdTerFfIjHMwsohDUxlkoACJebLahsBG9IHGN
+Tn+P2djY6CXBctbTXhRiYqeb79/TPU0EETv7/ilNHS/tssWcKWkFdai3yMzLvxeH
+YTVPMzeAWW/PnQOwYTkgeaj7SIK5bbm5n/gpWk31R5gRWhgJc9FZSa9+oZWbWeYh
+3XfsuCuTH+jSs0g+jJUx/cpIVrO38r2hSuhDPugmHgM6yEnKMubhChCPCyXjO0z9
+brEMQ1T9r2sKOYuyNDhN/W9/QsTb/RO4Ug2lYlzRTdehqvimHspW
+-----END CERTIFICATE-----
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/docker/Dockerfile b/msa/js-executor/docker/Dockerfile
index a7bebc8aaf..117bde8712 100644
--- a/msa/js-executor/docker/Dockerfile
+++ b/msa/js-executor/docker/Dockerfile
@@ -35,7 +35,7 @@ COPY src/server.js ./
 RUN chmod a+x /tmp/*.sh \
     && mv /tmp/start-js-executor.sh /usr/bin \
     && chown -R node:node ${pkg.installFolder} \
-    && yarn install --production && yarn cache clean --all
+    && yarn install --production --non-interactive --network-concurrency 4 --network-timeout 100000 --mutex network && yarn cache clean --all
 
 USER node
 
diff --git a/msa/js-executor/package.json b/msa/js-executor/package.json
index c7edb2bbd7..d0864c013a 100644
--- a/msa/js-executor/package.json
+++ b/msa/js-executor/package.json
@@ -1,7 +1,7 @@
 {
   "name": "thingsboard-js-executor",
   "private": true,
-  "version": "3.6.3",
+  "version": "3.7.0",
   "description": "ThingsBoard JavaScript Executor Microservice",
   "main": "server.ts",
   "bin": "server.js",
@@ -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/pom.xml b/msa/js-executor/pom.xml
index 5eb3a34c49..8d3592cbe2 100644
--- a/msa/js-executor/pom.xml
+++ b/msa/js-executor/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.6.3-SNAPSHOT</version>
+        <version>3.7.0-SNAPSHOT</version>
         <artifactId>msa</artifactId>
     </parent>
     <groupId>org.thingsboard.msa</groupId>
@@ -81,7 +81,7 @@
                             <goal>yarn</goal>
                         </goals>
                         <configuration>
-                            <arguments>install</arguments>
+                            <arguments>install --non-interactive --network-concurrency 4 --network-timeout 100000 --mutex network</arguments>
                         </configuration>
                     </execution>
                     <execution>
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/monitoring/docker/Dockerfile b/msa/monitoring/docker/Dockerfile
index 842a04a399..31b29ae16d 100644
--- a/msa/monitoring/docker/Dockerfile
+++ b/msa/monitoring/docker/Dockerfile
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-FROM thingsboard/openjdk11:bullseye-slim
+FROM thingsboard/openjdk17:bookworm-slim
 
 COPY start-tb-monitoring.sh ${pkg.name}.deb /tmp/
 
diff --git a/msa/monitoring/docker/start-tb-monitoring.sh b/msa/monitoring/docker/start-tb-monitoring.sh
index 692719b1f0..026fa58888 100755
--- a/msa/monitoring/docker/start-tb-monitoring.sh
+++ b/msa/monitoring/docker/start-tb-monitoring.sh
@@ -28,4 +28,4 @@ cd ${pkg.installFolder}/bin
 exec java -cp ${jarfile} $JAVA_OPTS -Dloader.main=org.thingsboard.monitoring.ThingsboardMonitoringApplication \
                     -Dspring.jpa.hibernate.ddl-auto=none \
                     -Dlogging.config=$CONF_FOLDER/logback.xml \
-                    org.springframework.boot.loader.PropertiesLauncher
+                    org.springframework.boot.loader.launch.PropertiesLauncher
diff --git a/msa/monitoring/pom.xml b/msa/monitoring/pom.xml
index 8d99011751..60ff2e3f4a 100644
--- a/msa/monitoring/pom.xml
+++ b/msa/monitoring/pom.xml
@@ -22,7 +22,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.6.3-SNAPSHOT</version>
+        <version>3.7.0-SNAPSHOT</version>
         <artifactId>msa</artifactId>
     </parent>
 
diff --git a/msa/pom.xml b/msa/pom.xml
index 4602bc210d..71ddc91412 100644
--- a/msa/pom.xml
+++ b/msa/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.6.3-SNAPSHOT</version>
+        <version>3.7.0-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <artifactId>msa</artifactId>
diff --git a/msa/tb-node/docker/Dockerfile b/msa/tb-node/docker/Dockerfile
index 559d1bdab5..92e4893946 100644
--- a/msa/tb-node/docker/Dockerfile
+++ b/msa/tb-node/docker/Dockerfile
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-FROM thingsboard/openjdk11:bullseye-slim
+FROM thingsboard/openjdk17:bookworm-slim
 
 COPY start-tb-node.sh ${pkg.name}.deb /tmp/
 
diff --git a/msa/tb-node/docker/start-tb-node.sh b/msa/tb-node/docker/start-tb-node.sh
index 76ed35cc7c..c164954a82 100755
--- a/msa/tb-node/docker/start-tb-node.sh
+++ b/msa/tb-node/docker/start-tb-node.sh
@@ -41,7 +41,7 @@ if [ "$INSTALL_TB" == "true" ]; then
                         -Dspring.jpa.hibernate.ddl-auto=none \
                         -Dinstall.upgrade=false \
                         -Dlogging.config=/usr/share/thingsboard/bin/install/logback.xml \
-                        org.springframework.boot.loader.PropertiesLauncher
+                        org.springframework.boot.loader.launch.PropertiesLauncher
 
 elif [ "$UPGRADE_TB" == "true" ]; then
 
@@ -59,7 +59,7 @@ elif [ "$UPGRADE_TB" == "true" ]; then
                     -Dinstall.upgrade=true \
                     -Dinstall.upgrade.from_version=${fromVersion} \
                     -Dlogging.config=/usr/share/thingsboard/bin/install/logback.xml \
-                    org.springframework.boot.loader.PropertiesLauncher
+                    org.springframework.boot.loader.launch.PropertiesLauncher
 
 else
 
@@ -68,6 +68,6 @@ else
     exec java -cp ${jarfile} $JAVA_OPTS -Dloader.main=org.thingsboard.server.ThingsboardServerApplication \
                         -Dspring.jpa.hibernate.ddl-auto=none \
                         -Dlogging.config=/config/logback.xml \
-                        org.springframework.boot.loader.PropertiesLauncher
+                        org.springframework.boot.loader.launch.PropertiesLauncher
 
 fi
diff --git a/msa/tb-node/pom.xml b/msa/tb-node/pom.xml
index 3103fd2676..708af73ae0 100644
--- a/msa/tb-node/pom.xml
+++ b/msa/tb-node/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.6.3-SNAPSHOT</version>
+        <version>3.7.0-SNAPSHOT</version>
         <artifactId>msa</artifactId>
     </parent>
     <groupId>org.thingsboard.msa</groupId>
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 95987c62a1..18071b249b 100644
--- a/msa/tb/docker-cassandra/Dockerfile
+++ b/msa/tb/docker-cassandra/Dockerfile
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-FROM thingsboard/openjdk11:bullseye-slim
+FROM thingsboard/openjdk17:bookworm-slim
 
 ENV PG_MAJOR=15
 
@@ -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 9ffe5fbd56..984e390496 100644
--- a/msa/tb/docker-postgres/Dockerfile
+++ b/msa/tb/docker-postgres/Dockerfile
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-FROM thingsboard/openjdk11:bullseye-slim
+FROM thingsboard/openjdk17:bookworm-slim
 
 ENV PG_MAJOR 12
 
@@ -69,6 +69,7 @@ EXPOSE 9090
 EXPOSE 1883
 EXPOSE 5683/udp
 EXPOSE 5685/udp
+EXPOSE 5686/udp
 
 VOLUME ["/data"]
 
diff --git a/msa/tb/docker/install-tb.sh b/msa/tb/docker/install-tb.sh
index 75970a79ef..9567908316 100644
--- a/msa/tb/docker/install-tb.sh
+++ b/msa/tb/docker/install-tb.sh
@@ -53,6 +53,6 @@ java -cp ${jarfile} $JAVA_OPTS -Dloader.main=org.thingsboard.server.ThingsboardI
                     -Dspring.jpa.hibernate.ddl-auto=none \
                     -Dinstall.upgrade=false \
                     -Dlogging.config=/usr/share/thingsboard/bin/install/logback.xml \
-                    org.springframework.boot.loader.PropertiesLauncher
+                    org.springframework.boot.loader.launch.PropertiesLauncher
 
 echo "${pkg.upgradeVersion}" > ${upgradeversion}
diff --git a/msa/tb/docker/start-tb.sh b/msa/tb/docker/start-tb.sh
index 49f2e3e5ae..21a62f5b6d 100755
--- a/msa/tb/docker/start-tb.sh
+++ b/msa/tb/docker/start-tb.sh
@@ -34,7 +34,7 @@ if [ -f ${firstlaunch} ]; then
     java -cp ${jarfile} $JAVA_OPTS -Dloader.main=org.thingsboard.server.ThingsboardServerApplication \
                         -Dspring.jpa.hibernate.ddl-auto=none \
                         -Dlogging.config=${CONF_FOLDER}/logback.xml \
-                        org.springframework.boot.loader.PropertiesLauncher
+                        org.springframework.boot.loader.launch.PropertiesLauncher
 else
     echo "ERROR: ThingsBoard is not installed"
 fi
diff --git a/msa/tb/docker/upgrade-tb.sh b/msa/tb/docker/upgrade-tb.sh
index dbfdf68a32..545bf4b8d6 100644
--- a/msa/tb/docker/upgrade-tb.sh
+++ b/msa/tb/docker/upgrade-tb.sh
@@ -40,7 +40,7 @@ java -cp ${jarfile} $JAVA_OPTS -Dloader.main=org.thingsboard.server.ThingsboardI
                 -Dinstall.upgrade=true \
                 -Dinstall.upgrade.from_version=${fromVersion} \
                 -Dlogging.config=/usr/share/thingsboard/bin/install/logback.xml \
-                org.springframework.boot.loader.PropertiesLauncher
+                org.springframework.boot.loader.launch.PropertiesLauncher
 
 echo "${pkg.upgradeVersion}" > ${upgradeversion}
 
diff --git a/msa/tb/pom.xml b/msa/tb/pom.xml
index 52e4978303..70fea2c0a5 100644
--- a/msa/tb/pom.xml
+++ b/msa/tb/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.6.3-SNAPSHOT</version>
+        <version>3.7.0-SNAPSHOT</version>
         <artifactId>msa</artifactId>
     </parent>
     <groupId>org.thingsboard.msa</groupId>
@@ -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/msa/transport/coap/docker/Dockerfile b/msa/transport/coap/docker/Dockerfile
index 65ffac1c59..39e1ae2f1c 100644
--- a/msa/transport/coap/docker/Dockerfile
+++ b/msa/transport/coap/docker/Dockerfile
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-FROM thingsboard/openjdk11:bullseye-slim
+FROM thingsboard/openjdk17:bookworm-slim
 
 COPY start-tb-coap-transport.sh ${pkg.name}.deb /tmp/
 
diff --git a/msa/transport/coap/docker/start-tb-coap-transport.sh b/msa/transport/coap/docker/start-tb-coap-transport.sh
index f073494bb2..75b56c205d 100755
--- a/msa/transport/coap/docker/start-tb-coap-transport.sh
+++ b/msa/transport/coap/docker/start-tb-coap-transport.sh
@@ -30,4 +30,4 @@ cd ${pkg.installFolder}/bin
 exec java -cp ${jarfile} $JAVA_OPTS -Dloader.main=org.thingsboard.server.coap.ThingsboardCoapTransportApplication \
                     -Dspring.jpa.hibernate.ddl-auto=none \
                     -Dlogging.config=/config/logback.xml \
-                    org.springframework.boot.loader.PropertiesLauncher
+                    org.springframework.boot.loader.launch.PropertiesLauncher
diff --git a/msa/transport/coap/pom.xml b/msa/transport/coap/pom.xml
index caf06056ea..5c11fd7adf 100644
--- a/msa/transport/coap/pom.xml
+++ b/msa/transport/coap/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard.msa</groupId>
-        <version>3.6.3-SNAPSHOT</version>
+        <version>3.7.0-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.msa.transport</groupId>
diff --git a/msa/transport/http/docker/Dockerfile b/msa/transport/http/docker/Dockerfile
index a0482d0038..42361f39d9 100644
--- a/msa/transport/http/docker/Dockerfile
+++ b/msa/transport/http/docker/Dockerfile
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-FROM thingsboard/openjdk11:bullseye-slim
+FROM thingsboard/openjdk17:bookworm-slim
 
 COPY start-tb-http-transport.sh ${pkg.name}.deb /tmp/
 
diff --git a/msa/transport/http/docker/start-tb-http-transport.sh b/msa/transport/http/docker/start-tb-http-transport.sh
index 3737523b39..eacb65e2ef 100755
--- a/msa/transport/http/docker/start-tb-http-transport.sh
+++ b/msa/transport/http/docker/start-tb-http-transport.sh
@@ -30,4 +30,4 @@ cd ${pkg.installFolder}/bin
 exec java -cp ${jarfile} $JAVA_OPTS -Dloader.main=org.thingsboard.server.http.ThingsboardHttpTransportApplication \
                     -Dspring.jpa.hibernate.ddl-auto=none \
                     -Dlogging.config=/config/logback.xml \
-                    org.springframework.boot.loader.PropertiesLauncher
+                    org.springframework.boot.loader.launch.PropertiesLauncher
diff --git a/msa/transport/http/pom.xml b/msa/transport/http/pom.xml
index 7db412c8ff..b7cdae9c95 100644
--- a/msa/transport/http/pom.xml
+++ b/msa/transport/http/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard.msa</groupId>
-        <version>3.6.3-SNAPSHOT</version>
+        <version>3.7.0-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.msa.transport</groupId>
diff --git a/msa/transport/lwm2m/docker/Dockerfile b/msa/transport/lwm2m/docker/Dockerfile
index 77ec42820f..64266f2968 100644
--- a/msa/transport/lwm2m/docker/Dockerfile
+++ b/msa/transport/lwm2m/docker/Dockerfile
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-FROM thingsboard/openjdk11:bullseye-slim
+FROM thingsboard/openjdk17:bookworm-slim
 
 COPY start-tb-lwm2m-transport.sh ${pkg.name}.deb /tmp/
 
diff --git a/msa/transport/lwm2m/docker/start-tb-lwm2m-transport.sh b/msa/transport/lwm2m/docker/start-tb-lwm2m-transport.sh
index e1e95fb78f..d88ad849f2 100755
--- a/msa/transport/lwm2m/docker/start-tb-lwm2m-transport.sh
+++ b/msa/transport/lwm2m/docker/start-tb-lwm2m-transport.sh
@@ -30,4 +30,4 @@ cd ${pkg.installFolder}/bin
 exec java -cp ${jarfile} $JAVA_OPTS -Dloader.main=org.thingsboard.server.lwm2m.ThingsboardLwm2mTransportApplication \
                     -Dspring.jpa.hibernate.ddl-auto=none \
                     -Dlogging.config=/config/logback.xml \
-                    org.springframework.boot.loader.PropertiesLauncher
+                    org.springframework.boot.loader.launch.PropertiesLauncher
diff --git a/msa/transport/lwm2m/pom.xml b/msa/transport/lwm2m/pom.xml
index 1005963af0..19ea2a022c 100644
--- a/msa/transport/lwm2m/pom.xml
+++ b/msa/transport/lwm2m/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard.msa</groupId>
-        <version>3.6.3-SNAPSHOT</version>
+        <version>3.7.0-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.msa.transport</groupId>
diff --git a/msa/transport/mqtt/docker/Dockerfile b/msa/transport/mqtt/docker/Dockerfile
index 4f4258918e..c1f2bfc4db 100644
--- a/msa/transport/mqtt/docker/Dockerfile
+++ b/msa/transport/mqtt/docker/Dockerfile
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-FROM thingsboard/openjdk11:bullseye-slim
+FROM thingsboard/openjdk17:bookworm-slim
 
 COPY start-tb-mqtt-transport.sh ${pkg.name}.deb /tmp/
 
diff --git a/msa/transport/mqtt/docker/start-tb-mqtt-transport.sh b/msa/transport/mqtt/docker/start-tb-mqtt-transport.sh
index ea0f21ea24..7350965861 100755
--- a/msa/transport/mqtt/docker/start-tb-mqtt-transport.sh
+++ b/msa/transport/mqtt/docker/start-tb-mqtt-transport.sh
@@ -30,4 +30,4 @@ cd ${pkg.installFolder}/bin
 exec java -cp ${jarfile} $JAVA_OPTS -Dloader.main=org.thingsboard.server.mqtt.ThingsboardMqttTransportApplication \
                     -Dspring.jpa.hibernate.ddl-auto=none \
                     -Dlogging.config=/config/logback.xml \
-                    org.springframework.boot.loader.PropertiesLauncher
+                    org.springframework.boot.loader.launch.PropertiesLauncher
diff --git a/msa/transport/mqtt/pom.xml b/msa/transport/mqtt/pom.xml
index bbd7cc752b..f06777265e 100644
--- a/msa/transport/mqtt/pom.xml
+++ b/msa/transport/mqtt/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard.msa</groupId>
-        <version>3.6.3-SNAPSHOT</version>
+        <version>3.7.0-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.msa.transport</groupId>
diff --git a/msa/transport/pom.xml b/msa/transport/pom.xml
index f9cc2f08dc..13ee09c3a7 100644
--- a/msa/transport/pom.xml
+++ b/msa/transport/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.6.3-SNAPSHOT</version>
+        <version>3.7.0-SNAPSHOT</version>
         <artifactId>msa</artifactId>
     </parent>
     <groupId>org.thingsboard.msa</groupId>
diff --git a/msa/transport/snmp/docker/Dockerfile b/msa/transport/snmp/docker/Dockerfile
index 8a36577860..f45ece2fef 100644
--- a/msa/transport/snmp/docker/Dockerfile
+++ b/msa/transport/snmp/docker/Dockerfile
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-FROM thingsboard/openjdk11:bullseye-slim
+FROM thingsboard/openjdk17:bookworm-slim
 
 COPY start-tb-snmp-transport.sh ${pkg.name}.deb /tmp/
 
diff --git a/msa/transport/snmp/docker/start-tb-snmp-transport.sh b/msa/transport/snmp/docker/start-tb-snmp-transport.sh
index 1d39301d38..20d4809958 100644
--- a/msa/transport/snmp/docker/start-tb-snmp-transport.sh
+++ b/msa/transport/snmp/docker/start-tb-snmp-transport.sh
@@ -30,4 +30,4 @@ cd ${pkg.installFolder}/bin
 exec java -cp ${jarfile} $JAVA_OPTS -Dloader.main=org.thingsboard.server.snmp.ThingsboardSnmpTransportApplication \
                     -Dspring.jpa.hibernate.ddl-auto=none \
                     -Dlogging.config=/config/logback.xml \
-                    org.springframework.boot.loader.PropertiesLauncher
+                    org.springframework.boot.loader.launch.PropertiesLauncher
diff --git a/msa/transport/snmp/pom.xml b/msa/transport/snmp/pom.xml
index ef55db19c5..35b3809aae 100644
--- a/msa/transport/snmp/pom.xml
+++ b/msa/transport/snmp/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.thingsboard.msa</groupId>
         <artifactId>transport</artifactId>
-        <version>3.6.3-SNAPSHOT</version>
+        <version>3.7.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.thingsboard.msa.transport</groupId>
diff --git a/msa/vc-executor-docker/docker/Dockerfile b/msa/vc-executor-docker/docker/Dockerfile
index bc1251abc2..adf948a33a 100644
--- a/msa/vc-executor-docker/docker/Dockerfile
+++ b/msa/vc-executor-docker/docker/Dockerfile
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-FROM thingsboard/openjdk11:bullseye-slim
+FROM thingsboard/openjdk17:bookworm-slim
 
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update \
diff --git a/msa/vc-executor-docker/docker/start-tb-vc-executor.sh b/msa/vc-executor-docker/docker/start-tb-vc-executor.sh
index ec7bf39427..09aef7d97f 100755
--- a/msa/vc-executor-docker/docker/start-tb-vc-executor.sh
+++ b/msa/vc-executor-docker/docker/start-tb-vc-executor.sh
@@ -30,4 +30,4 @@ cd ${pkg.installFolder}/bin
 exec java -cp ${jarfile} $JAVA_OPTS -Dloader.main=org.thingsboard.server.vc.ThingsboardVersionControlExecutorApplication \
                     -Dspring.jpa.hibernate.ddl-auto=none \
                     -Dlogging.config=/config/logback.xml \
-                    org.springframework.boot.loader.PropertiesLauncher
+                    org.springframework.boot.loader.launch.PropertiesLauncher
diff --git a/msa/vc-executor-docker/pom.xml b/msa/vc-executor-docker/pom.xml
index 7b9b34b8a7..e70656c49b 100644
--- a/msa/vc-executor-docker/pom.xml
+++ b/msa/vc-executor-docker/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.6.3-SNAPSHOT</version>
+        <version>3.7.0-SNAPSHOT</version>
         <artifactId>msa</artifactId>
     </parent>
     <groupId>org.thingsboard.msa</groupId>
diff --git a/msa/vc-executor/pom.xml b/msa/vc-executor/pom.xml
index d0884e6302..34340ab08c 100644
--- a/msa/vc-executor/pom.xml
+++ b/msa/vc-executor/pom.xml
@@ -21,7 +21,7 @@
 
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.6.3-SNAPSHOT</version>
+        <version>3.7.0-SNAPSHOT</version>
         <artifactId>msa</artifactId>
     </parent>
     <groupId>org.thingsboard.msa</groupId>
diff --git a/msa/vc-executor/src/main/resources/tb-vc-executor.yml b/msa/vc-executor/src/main/resources/tb-vc-executor.yml
index 289baaa97a..a92a7eea2b 100644
--- a/msa/vc-executor/src/main/resources/tb-vc-executor.yml
+++ b/msa/vc-executor/src/main/resources/tb-vc-executor.yml
@@ -137,6 +137,8 @@ queue:
       notifications: "${TB_QUEUE_KAFKA_NOTIFICATIONS_TOPIC_PROPERTIES:retention.ms:604800000;segment.bytes:26214400;retention.bytes:1048576000;partitions:1;min.insync.replicas:1}"
       # Kafka properties for Core topics
       version-control: "${TB_QUEUE_KAFKA_VC_TOPIC_PROPERTIES:retention.ms:604800000;segment.bytes:26214400;retention.bytes:1048576000;partitions:1;min.insync.replicas:1}"
+      # Kafka properties for Housekeeper tasks topic
+      housekeeper: "${TB_QUEUE_KAFKA_HOUSEKEEPER_TOPIC_PROPERTIES:retention.ms:604800000;segment.bytes:26214400;retention.bytes:1048576000;partitions:10;min.insync.replicas:1}"
     consumer-stats:
       # Prints lag between consumer group offset and last messages offset in Kafka topics
       enabled: "${TB_QUEUE_KAFKA_CONSUMER_STATS_ENABLED:true}"
@@ -250,6 +252,9 @@ queue:
       enabled: "${TB_QUEUE_CORE_STATS_ENABLED:true}"
       # Statistics printing interval for Core microservices
       print-interval-ms: "${TB_QUEUE_CORE_STATS_PRINT_INTERVAL_MS:60000}"
+    housekeeper:
+      # Topic name for Housekeeper tasks
+      topic: "${TB_HOUSEKEEPER_TOPIC:tb_housekeeper}"
   vc:
     # Default topic name for Kafka, RabbitMQ, etc.
     topic: "${TB_QUEUE_VC_TOPIC:tb_version_control}"
diff --git a/msa/web-ui/docker/Dockerfile b/msa/web-ui/docker/Dockerfile
index 8bac82683b..3081d90107 100644
--- a/msa/web-ui/docker/Dockerfile
+++ b/msa/web-ui/docker/Dockerfile
@@ -34,7 +34,7 @@ COPY src/server.js ./
 RUN chmod a+x /tmp/*.sh \
     && mv /tmp/start-web-ui.sh /usr/bin \
     && chown -R node:node ${pkg.installFolder} \
-    && yarn install --production && yarn cache clean --all
+    && yarn install --production --non-interactive --network-concurrency 4 --network-timeout 100000 --mutex network && yarn cache clean --all
 
 USER node
 
diff --git a/msa/web-ui/package.json b/msa/web-ui/package.json
index f078f9af5f..6e7cdd4bc1 100644
--- a/msa/web-ui/package.json
+++ b/msa/web-ui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "thingsboard-web-ui",
   "private": true,
-  "version": "3.6.3",
+  "version": "3.7.0",
   "description": "ThingsBoard Web UI Microservice",
   "main": "server.ts",
   "bin": "server.js",
diff --git a/msa/web-ui/pom.xml b/msa/web-ui/pom.xml
index f60c73b8d1..103a498a61 100644
--- a/msa/web-ui/pom.xml
+++ b/msa/web-ui/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.6.3-SNAPSHOT</version>
+        <version>3.7.0-SNAPSHOT</version>
         <artifactId>msa</artifactId>
     </parent>
     <groupId>org.thingsboard.msa</groupId>
@@ -90,7 +90,7 @@
                             <goal>yarn</goal>
                         </goals>
                         <configuration>
-                            <arguments>install</arguments>
+                            <arguments>install --non-interactive --network-concurrency 4 --network-timeout 100000 --mutex network</arguments>
                         </configuration>
                     </execution>
                     <execution>
diff --git a/netty-mqtt/pom.xml b/netty-mqtt/pom.xml
index c5854b45eb..6834bb1aca 100644
--- a/netty-mqtt/pom.xml
+++ b/netty-mqtt/pom.xml
@@ -19,11 +19,11 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.6.3-SNAPSHOT</version>
+        <version>3.7.0-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <artifactId>netty-mqtt</artifactId>
-    <version>3.6.3-SNAPSHOT</version>
+    <version>3.7.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>Netty MQTT Client</name>
@@ -73,6 +73,10 @@
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
         </dependency>
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
diff --git a/netty-mqtt/src/main/java/org/thingsboard/mqtt/MqttClientConfig.java b/netty-mqtt/src/main/java/org/thingsboard/mqtt/MqttClientConfig.java
index 0272a395ab..e42dee834d 100644
--- a/netty-mqtt/src/main/java/org/thingsboard/mqtt/MqttClientConfig.java
+++ b/netty-mqtt/src/main/java/org/thingsboard/mqtt/MqttClientConfig.java
@@ -22,8 +22,8 @@ import io.netty.handler.ssl.SslContext;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import java.util.Random;
 
 @SuppressWarnings({"WeakerAccess", "unused"})
diff --git a/packaging/java/build.gradle b/packaging/java/build.gradle
index 9eb7eb33cf..b629913d99 100644
--- a/packaging/java/build.gradle
+++ b/packaging/java/build.gradle
@@ -92,7 +92,7 @@ buildRpm {
     archiveVersion = projectVersion.replace('-', '')
     archiveFileName = "${pkgName}.rpm"
 
-    requires("java-11")
+    requires("java-17")
 
     from("${buildDir}/conf") {
         include "${pkgName}.conf"
@@ -131,7 +131,7 @@ buildDeb {
 
     archiveFileName = "${pkgName}.deb"
 
-    requires("openjdk-11-jre").or("java11-runtime").or("oracle-java11-installer").or("openjdk-11-jre-headless")
+    requires("openjdk-17-jre").or("java17-runtime").or("oracle-java17-installer").or("openjdk-17-jre-headless")
 
     from("${buildDir}/conf") {
         include "${pkgName}.conf"
diff --git a/packaging/java/scripts/install/install.sh b/packaging/java/scripts/install/install.sh
index 159d612976..450064f6f2 100755
--- a/packaging/java/scripts/install/install.sh
+++ b/packaging/java/scripts/install/install.sh
@@ -52,7 +52,7 @@ su -s /bin/sh -c "java -cp ${jarfile} $JAVA_OPTS -Dloader.main=org.thingsboard.s
                     -Dspring.jpa.hibernate.ddl-auto=none \
                     -Dinstall.upgrade=false \
                     -Dlogging.config=${pkg.installFolder}/bin/install/logback.xml \
-                    org.springframework.boot.loader.PropertiesLauncher" "$run_user"
+                    org.springframework.boot.loader.launch.PropertiesLauncher" "$run_user"
 
 if [ $? -ne 0 ]; then
     echo "ThingsBoard installation failed!"
diff --git a/packaging/java/scripts/install/install_dev_db.sh b/packaging/java/scripts/install/install_dev_db.sh
index ca9affe596..78100554a9 100644
--- a/packaging/java/scripts/install/install_dev_db.sh
+++ b/packaging/java/scripts/install/install_dev_db.sh
@@ -36,7 +36,7 @@ sudo -u "$run_user" -s /bin/sh -c "java -cp ${jarfile} $JAVA_OPTS -Dloader.main=
                     -Dspring.jpa.hibernate.ddl-auto=none \
                     -Dinstall.upgrade=false \
                     -Dlogging.config=logback.xml \
-                    org.springframework.boot.loader.PropertiesLauncher"
+                    org.springframework.boot.loader.launch.PropertiesLauncher"
 
 if [ $? -ne 0 ]; then
     echo "ThingsBoard DB installation failed!"
diff --git a/packaging/java/scripts/install/upgrade.sh b/packaging/java/scripts/install/upgrade.sh
index 9011db73d2..2b87b26aa6 100755
--- a/packaging/java/scripts/install/upgrade.sh
+++ b/packaging/java/scripts/install/upgrade.sh
@@ -51,7 +51,7 @@ su -s /bin/sh -c "java -cp ${jarfile} $JAVA_OPTS -Dloader.main=org.thingsboard.s
                     -Dinstall.upgrade=true \
                     -Dinstall.upgrade.from_version=${fromVersion} \
                     -Dlogging.config=${pkg.installFolder}/bin/install/logback.xml \
-                    org.springframework.boot.loader.PropertiesLauncher" "$run_user"
+                    org.springframework.boot.loader.launch.PropertiesLauncher" "$run_user"
 
 if [ $? -ne 0 ]; then
     echo "ThingsBoard upgrade failed!"
diff --git a/packaging/java/scripts/install/upgrade_dev_db.sh b/packaging/java/scripts/install/upgrade_dev_db.sh
index 43cd463706..d0c42eaaa6 100755
--- a/packaging/java/scripts/install/upgrade_dev_db.sh
+++ b/packaging/java/scripts/install/upgrade_dev_db.sh
@@ -57,7 +57,7 @@ sudo -u "$run_user" -s /bin/sh -c "java -cp ${jarfile} $JAVA_OPTS -Dloader.main=
                     -Dinstall.upgrade=true \
                     -Dinstall.upgrade.from_version=${fromVersion} \
                     -Dlogging.config=logback.xml \
-                    org.springframework.boot.loader.PropertiesLauncher"
+                    org.springframework.boot.loader.launch.PropertiesLauncher"
 
 if [ $? -ne 0 ]; then
     echo "ThingsBoard DB installation failed!"
diff --git a/packaging/java/scripts/windows/install.bat b/packaging/java/scripts/windows/install.bat
index 6f168c76d8..075755886e 100644
--- a/packaging/java/scripts/windows/install.bat
+++ b/packaging/java/scripts/windows/install.bat
@@ -7,11 +7,11 @@ setlocal ENABLEEXTENSIONS
 for /f tokens^=2-5^ delims^=.-_^" %%j in ('java -fullversion 2^>^&1') do set "jver=%%j%%k"
 @ECHO CurrentVersion %jver%
 
-if %jver% NEQ 110 GOTO JAVA_NOT_INSTALLED
+if %jver% NEQ 170 GOTO JAVA_NOT_INSTALLED
 
 :JAVA_INSTALLED
 
-@ECHO Java 11 found!
+@ECHO Java 17 found!
 @ECHO Installing thingsboard ...
 
 SET loadDemo=false
@@ -34,7 +34,7 @@ java -cp "%jarfile%" -Dloader.main=org.thingsboard.server.ThingsboardInstallAppl
                     -Dspring.jpa.hibernate.ddl-auto=none^
                     -Dinstall.upgrade=false^
                     -Dlogging.config="%BASE%\install\logback.xml"^
-                    org.springframework.boot.loader.PropertiesLauncher
+                    org.springframework.boot.loader.launch.PropertiesLauncher
 
 if errorlevel 1 (
    @echo ThingsBoard installation failed!
@@ -50,8 +50,8 @@ POPD
 GOTO END
 
 :JAVA_NOT_INSTALLED
-@ECHO Java 11 is not installed. Only Java 11 is supported
-@ECHO Please go to https://adoptopenjdk.net/index.html and install Java 11. Then retry installation.
+@ECHO Java 17 is not installed. Only Java 17 is supported
+@ECHO Please go to https://adoptopenjdk.net/index.html and install Java 17. Then retry installation.
 PAUSE
 GOTO END
 
diff --git a/packaging/java/scripts/windows/install_dev_db.bat b/packaging/java/scripts/windows/install_dev_db.bat
index 6abc80fef1..522d0bfc93 100644
--- a/packaging/java/scripts/windows/install_dev_db.bat
+++ b/packaging/java/scripts/windows/install_dev_db.bat
@@ -19,7 +19,7 @@ java -cp %jarfile% -Dloader.main=org.thingsboard.server.ThingsboardInstallApplic
                     -Dspring.jpa.hibernate.ddl-auto=none^
                     -Dinstall.upgrade=false^
                     -Dlogging.config=%BASE%\windows\install\logback.xml^
-                    org.springframework.boot.loader.PropertiesLauncher
+                    org.springframework.boot.loader.launch.PropertiesLauncher
 
 if errorlevel 1 (
    @echo ThingsBoard DB installation failed!
diff --git a/packaging/java/scripts/windows/upgrade.bat b/packaging/java/scripts/windows/upgrade.bat
index 704d4c170d..b86121b8f1 100644
--- a/packaging/java/scripts/windows/upgrade.bat
+++ b/packaging/java/scripts/windows/upgrade.bat
@@ -34,7 +34,7 @@ java -cp "%jarfile%" -Dloader.main=org.thingsboard.server.ThingsboardInstallAppl
                     -Dinstall.upgrade=true^
                     -Dinstall.upgrade.from_version=%fromVersion%^
                     -Dlogging.config="%BASE%\install\logback.xml"^
-                    org.springframework.boot.loader.PropertiesLauncher
+                    org.springframework.boot.loader.launch.PropertiesLauncher
 
 if errorlevel 1 (
    @echo ThingsBoard upgrade failed!
diff --git a/pom.xml b/pom.xml
index c4b851bfbc..c13c25566b 100755
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.thingsboard</groupId>
     <artifactId>thingsboard</artifactId>
-    <version>3.6.3-SNAPSHOT</version>
+    <version>3.7.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Thingsboard</name>
@@ -28,6 +28,8 @@
     <inceptionYear>2016</inceptionYear>
 
     <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
         <main.dir>${basedir}</main.dir>
         <pkg.disabled>true</pkg.disabled>
         <pkg.process-resources.phase>none</pkg.process-resources.phase>
@@ -36,127 +38,133 @@
         <pkg.implementationTitle>${project.name}</pkg.implementationTitle>
         <pkg.unixLogFolder>/var/log/${pkg.name}</pkg.unixLogFolder>
         <pkg.installFolder>/usr/share/${pkg.name}</pkg.installFolder>
-        <javax-annotation.version>1.3.2</javax-annotation.version>
-        <jakarta.xml.bind-api.version>2.3.2</jakarta.xml.bind-api.version>
-        <jaxb-runtime.version>2.3.2</jaxb-runtime.version>
-        <spring-boot.version>2.7.10</spring-boot.version>
-        <spring-data.version>2.7.10</spring-data.version>
-        <spring.version>5.3.26</spring.version>
-        <spring-redis.version>5.5.17</spring-redis.version>
-        <spring-security.version>5.7.7</spring-security.version>
-        <spring-data-redis.version>2.7.10</spring-data-redis.version>
-        <jedis.version>3.8.0</jedis.version>
-        <jjwt.version>0.7.0</jjwt.version>
-        <slf4j.version>1.7.32</slf4j.version>
-        <log4j.version>2.17.1</log4j.version>
-        <logback.version>1.2.10</logback.version>
-        <rat.version>0.10</rat.version>
-        <cassandra.version>4.15.0</cassandra.version>
-        <metrics.version>4.0.5</metrics.version>
-        <cassandra-all.version>3.11.14</cassandra-all.version>
-        <guava.version>31.1-jre</guava.version>
-        <caffeine.version>2.6.1</caffeine.version>
-        <commons-lang3.version>3.12.0</commons-lang3.version>
-        <commons-codec.version>1.15</commons-codec.version>
-        <commons-io.version>2.11.0</commons-io.version>
-        <commons-logging.version>1.2</commons-logging.version>
-        <commons-csv.version>1.4</commons-csv.version>
-        <apache-httpclient.version>4.5.13</apache-httpclient.version>
-        <apache-httpcore.version>4.4.14</apache-httpcore.version>
-        <joda-time.version>2.8.1</joda-time.version>
-        <jackson.version>2.13.4</jackson.version>
-        <jackson-databind.version>2.13.4.2</jackson-databind.version>
-        <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.0.0</californium.version>
-        <leshan.version>2.0.0-M5</leshan.version>
-        <gson.version>2.9.0</gson.version>
-        <freemarker.version>2.3.30</freemarker.version>
-        <mail.version>1.6.2</mail.version>
-        <curator.version>5.5.0</curator.version>
-        <zookeeper.version>3.8.1</zookeeper.version>
-        <protobuf.version>3.21.9</protobuf.version>
-        <grpc.version>1.42.1</grpc.version>
-        <tbel.version>1.1.5</tbel.version>
-        <lombok.version>1.18.18</lombok.version>
-        <paho.client.version>1.2.4</paho.client.version>
+        <jakarta-annotation.version>3.0.0</jakarta-annotation.version>
+        <jakarta.xml.bind-api.version>4.0.2</jakarta.xml.bind-api.version>
+        <javax.xml.bind-api.version>2.4.0-b180830.0359</javax.xml.bind-api.version>
+        <jaxb-runtime.version>4.0.5</jaxb-runtime.version>
+        <spring-boot.version>3.2.4</spring-boot.version>
+        <spring-data.version>3.2.5</spring-data.version>
+        <spring-data-redis.version>3.2.5</spring-data-redis.version>
+        <spring.version>6.1.6</spring.version>
+        <spring-redis.version>6.2.4</spring-redis.version>
+        <spring-security.version>6.2.4</spring-security.version>
+        <jedis.version>5.1.2</jedis.version>
+        <jjwt.version>0.9.1</jjwt.version> <!-- 0.12.5 requires JWT usage refactoring-->
+        <slf4j.version>2.0.13</slf4j.version>
+        <log4j.version>2.23.1</log4j.version>
+        <logback.version>1.5.5</logback.version>
+        <rat.version>0.10</rat.version> <!-- unused -->
+        <cassandra.version>4.17.0</cassandra.version>
+        <metrics.version>4.2.25</metrics.version>
+        <cassandra-all.version>3.11.17</cassandra-all.version> <!-- tools -->
+        <guava.version>33.1.0-jre</guava.version>
+        <caffeine.version>3.1.8</caffeine.version>
+        <commons-lang3.version>3.14.0</commons-lang3.version>
+        <commons-codec.version>1.16.1</commons-codec.version>
+        <commons-io.version>2.16.1</commons-io.version>
+        <commons-logging.version>1.3.1</commons-logging.version>
+        <commons-csv.version>1.10.0</commons-csv.version>
+        <apache-httpclient5.version>5.3.1</apache-httpclient5.version>
+        <apache-httpcore5.version>5.2.4</apache-httpcore5.version>
+        <apache-httpclient.version>4.5.14</apache-httpclient.version>
+        <apache-httpcore.version>4.4.16</apache-httpcore.version>
+        <joda-time.version>2.12.7</joda-time.version>
+        <jackson.version>2.17.0</jackson.version>
+        <jackson-databind.version>2.17.0</jackson-databind.version>
+        <fasterxml-classmate.version>1.7.0</fasterxml-classmate.version>
+        <auth0-jwt.version>4.4.0</auth0-jwt.version>
+        <json-schema-validator.version>2.2.14</json-schema-validator.version>
+        <californium.version>3.11.0</californium.version>
+        <leshan.version>2.0.0-M14</leshan.version>
+        <gson.version>2.10.1</gson.version>
+        <freemarker.version>2.3.32</freemarker.version>
+        <mail.version>2.0.1</mail.version>
+        <curator.version>5.6.0</curator.version>
+        <zookeeper.version>3.9.2</zookeeper.version>
+        <protobuf.version>3.25.3</protobuf.version> <!-- A Major v4 does not support by the pubsub yet-->
+        <grpc.version>1.63.0</grpc.version>
+        <tbel.version>1.2.0</tbel.version>
+        <lombok.version>1.18.32</lombok.version>
+        <paho.client.version>1.2.5</paho.client.version>
         <paho.mqttv5.client.version>1.2.5</paho.mqttv5.client.version>
-        <netty.version>4.1.91.Final</netty.version>
-        <netty-tcnative.version>2.0.51.Final</netty-tcnative.version>
-        <os-maven-plugin.version>1.7.0</os-maven-plugin.version>
-        <rabbitmq.version>4.8.0</rabbitmq.version>
-        <surefire.version>3.0.0-M9</surefire.version>
-        <jar-plugin.version>3.0.2</jar-plugin.version>
-        <springfox-swagger.version>3.0.4</springfox-swagger.version>
-        <swagger-annotations.version>1.6.3</swagger-annotations.version>
-        <spatial4j.version>0.7</spatial4j.version>
-        <jts.version>1.18.2</jts.version>
-        <bouncycastle.version>1.69</bouncycastle.version>
+        <netty.version>4.1.109.Final</netty.version>
+        <netty-tcnative.version>2.0.65.Final</netty-tcnative.version>
+        <reactor-netty.version>1.1.18</reactor-netty.version>
+        <os-maven-plugin.version>1.7.1</os-maven-plugin.version>
+        <rabbitmq.version>5.21.0</rabbitmq.version>
+        <surefire.version>3.2.5</surefire.version>
+        <jar-plugin.version>3.4.0</jar-plugin.version>
+        <springdoc-swagger.version>2.4.0TB</springdoc-swagger.version>
+        <swagger-annotations.version>2.2.21</swagger-annotations.version>
+        <spatial4j.version>0.8</spatial4j.version>
+        <jts.version>1.19.0</jts.version>
+        <bouncycastle.version>1.78</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>
+        <elasticsearch.version>8.13.2</elasticsearch.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.
         Here is the source to track https://github.com/apache/kafka/tree/trunk/clients/src/main/java/org/apache/kafka/common/network -->
-        <kafka.version>3.2.0</kafka.version>
-        <bucket4j.version>4.1.1</bucket4j.version>
-        <fst.version>2.57</fst.version>
-        <antlr.version>2.7.7</antlr.version>
-        <snakeyaml.version>2.0</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-->
+        <kafka.version>3.7.0</kafka.version>
+        <bucket4j.version>8.10.1</bucket4j.version>
+        <antlr.version>3.5.3</antlr.version>
+        <snakeyaml.version>2.2</snakeyaml.version>
+        <aws.sdk.version>1.12.701</aws.sdk.version>
+        <pubsub.client.version>1.128.1</pubsub.client.version>
+        <google.common.protos.version>2.37.1</google.common.protos.version>
         <azure-servicebus.version>3.6.7</azure-servicebus.version>
-        <passay.version>1.5.0</passay.version>
-        <ua-parser.version>1.5.4</ua-parser.version>
+        <passay.version>1.6.4</passay.version>
+        <ua-parser.version>1.6.1</ua-parser.version>
         <commons-beanutils.version>1.9.4</commons-beanutils.version>
-        <commons-collections.version>3.2.2</commons-collections.version>
-        <micrometer.version>1.9.0</micrometer.version>
+        <commons-collections.version>4.4</commons-collections.version>
+        <micrometer.version>1.12.5</micrometer.version>
         <protobuf-dynamic.version>1.0.4TB</protobuf-dynamic.version>
-        <wire-schema.version>3.4.0</wire-schema.version>
-        <twilio.version>8.17.0</twilio.version>
-        <hibernate-validator.version>6.0.20.Final</hibernate-validator.version>
-        <hypersistence-utils.version>3.5.2</hypersistence-utils.version>
-        <javax.el.version>3.0.0</javax.el.version>
-        <javax.validation-api.version>2.0.1.Final</javax.validation-api.version>
-        <antisamy.version>1.7.2</antisamy.version>
-        <snmp4j.version>2.8.5</snmp4j.version>
+        <wire-schema.version>3.7.1</wire-schema.version>
+        <twilio.version>10.1.3</twilio.version>
+        <hibernate-validator.version>8.0.1.Final</hibernate-validator.version>
+        <hypersistence-utils.version>3.7.4</hypersistence-utils.version> <!-- artifact name should be updated with hibernate-core version -->
+        <jakarta.el.version>4.0.2</jakarta.el.version>
+        <jakarta.validation-api.version>3.0.2</jakarta.validation-api.version>
+        <antisamy.version>1.7.5</antisamy.version>
+        <snmp4j.version>3.8.0</snmp4j.version>
+        <json-path.version>2.9.0</json-path.version>
         <!--         TEST SCOPE         -->
-        <awaitility.version>4.1.0</awaitility.version>
-        <dbunit.version>2.7.2</dbunit.version>
-        <java-websocket.version>1.5.2</java-websocket.version>
-        <jupiter.version>5.8.2</jupiter.version> <!-- keep the same version as spring-boot-starter-test depend on jupiter-->
-        <mockito.version>4.5.1</mockito.version>
-        <json-path.version>2.6.0</json-path.version>
-        <mock-server.version>5.13.1</mock-server.version>
+        <awaitility.version>4.2.1</awaitility.version>
+        <dbunit.version>2.7.3</dbunit.version>
+        <java-websocket.version>1.5.6</java-websocket.version>
+        <jupiter.version>5.10.2</jupiter.version> <!-- keep the same version as spring-boot-starter-test depend on jupiter-->
+        <mock-server.version>5.15.0</mock-server.version>
         <spring-test-dbunit.version>1.3.0</spring-test-dbunit.version> <!-- 2016 -->
         <takari-cpsuite.version>1.2.7</takari-cpsuite.version> <!-- 2015 -->
+        <jeasy.version>5.0.0</jeasy.version>
         <!--      BLACKBOX TEST SCOPE     -->
-        <testng.version>7.6.1</testng.version>
-        <assertj.version>3.23.1</assertj.version>
-        <rest-assured.version>5.2.0</rest-assured.version>
-        <hamcrest.version>1.3</hamcrest.version>
-        <testcontainers.version>1.17.3</testcontainers.version>
+        <testng.version>7.10.1</testng.version>
+        <assertj.version>3.25.3</assertj.version>
+        <rest-assured.version>5.4.0</rest-assured.version>
+        <hamcrest.version>2.2</hamcrest.version>
+        <testcontainers.version>1.19.7</testcontainers.version>
         <zeroturnaround.version>1.12</zeroturnaround.version>
-        <opensmpp.version>3.0.0</opensmpp.version>
-        <jgit.version>6.1.0.202203080745-r</jgit.version>
+        <selenium.version>4.19.1</selenium.version>
+        <webdrivermanager.version>5.8.0</webdrivermanager.version>
+        <allure-testng.version>2.27.0</allure-testng.version>
+        <allure-maven.version>2.12.0</allure-maven.version>
+
+        <opensmpp.version>3.0.2</opensmpp.version>
+        <jgit.version>6.9.0.202403050737-r</jgit.version>
         <exp4j.version>0.4.8</exp4j.version>
         <aerogear-otp.version>1.0.0</aerogear-otp.version>
-        <selenium.version>4.6.0</selenium.version>
-        <webdrivermanager.version>5.2.0</webdrivermanager.version>
-        <allure-testng.version>2.21.0</allure-testng.version>
-        <allure-maven.version>2.12.0</allure-maven.version>
-        <slack-api.version>1.12.1</slack-api.version>
-        <oshi.version>6.4.2</oshi.version>
-        <google-oauth-client.version>1.34.1</google-oauth-client.version>
+
+        <slack-api.version>1.39.0</slack-api.version>
+        <oshi.version>6.6.0</oshi.version>
+        <google-oauth-client.version>1.35.0</google-oauth-client.version>
         <apache-xmlgraphics.version>1.17</apache-xmlgraphics.version>
         <drewnoakes-metadata-extractor.version>2.19.0</drewnoakes-metadata-extractor.version>
-        <firebase-admin.version>8.0.1</firebase-admin.version>
+        <firebase-admin.version>9.2.0</firebase-admin.version>
     </properties>
 
     <modules>
@@ -611,13 +619,14 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.8.1</version>
+                    <version>3.11.0</version>
                     <configuration>
-                        <release>11</release>
+                        <release>17</release>
                         <compilerArgs>
                             <arg>-Xlint:deprecation</arg>
                             <arg>-Xlint:removal</arg>
                             <arg>-Xlint:unchecked</arg>
+                            <arg>-parameters</arg>
                         </compilerArgs>
                         <annotationProcessorPaths>
                             <path>
@@ -656,7 +665,7 @@
                 <plugin>
                     <groupId>org.thingsboard</groupId>
                     <artifactId>gradle-maven-plugin</artifactId>
-                    <version>1.0.11</version>
+                    <version>1.0.12</version>
                 </plugin>
                 <plugin>
                     <groupId>com.github.eirslett</groupId>
@@ -669,7 +678,8 @@
                     <version>${surefire.version}</version>
                     <configuration>
                         <argLine>
-                            --illegal-access=permit -XX:+UseStringDeduplication -XX:MaxGCPauseMillis=20
+                            -XX:+UseStringDeduplication -XX:MaxGCPauseMillis=20
+                            --add-opens java.base/java.lang.reflect=ALL-UNNAMED
                         </argLine>
                     </configuration>
                 </plugin>
@@ -1083,15 +1093,20 @@
                 <scope>test</scope>
             </dependency>
             <dependency>
-                <groupId>javax.annotation</groupId>
-                <artifactId>javax.annotation-api</artifactId>
-                <version>${javax-annotation.version}</version>
+                <groupId>jakarta.annotation</groupId>
+                <artifactId>jakarta.annotation-api</artifactId>
+                <version>${jakarta-annotation.version}</version>
             </dependency>
             <dependency>
                 <groupId>jakarta.xml.bind</groupId>
                 <artifactId>jakarta.xml.bind-api</artifactId>
                 <version>${jakarta.xml.bind-api.version}</version>
             </dependency>
+            <dependency>
+                <groupId>javax.xml.bind</groupId>
+                <artifactId>jaxb-api</artifactId>
+                <version>${javax.xml.bind-api.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.glassfish.jaxb</groupId>
                 <artifactId>jaxb-runtime</artifactId>
@@ -1159,6 +1174,16 @@
                 <artifactId>spring-data-commons</artifactId>
                 <version>${spring-data.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-starter-webflux</artifactId>
+                <version>${spring-boot.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.projectreactor.netty</groupId>
+                <artifactId>reactor-netty-http</artifactId>
+                <version>${reactor-netty.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.apache.kafka</groupId>
                 <artifactId>kafka-clients</artifactId>
@@ -1228,7 +1253,7 @@
             </dependency>
             <dependency>
                 <groupId>com.sun.mail</groupId>
-                <artifactId>javax.mail</artifactId>
+                <artifactId>jakarta.mail</artifactId>
                 <version>${mail.version}</version>
             </dependency>
             <dependency>
@@ -1289,6 +1314,11 @@
                 <artifactId>netty-codec</artifactId>
                 <version>${netty.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-codec-dns</artifactId>
+                <version>${netty.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.netty</groupId>
                 <artifactId>netty-codec-http</artifactId>
@@ -1329,17 +1359,58 @@
                 <artifactId>netty-resolver</artifactId>
                 <version>${netty.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-resolver-dns</artifactId>
+                <version>${netty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-resolver-dns-classes-macos</artifactId>
+                <version>${netty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-resolver-dns-native-macos</artifactId>
+                <version>${netty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-resolver-dns-native-macos</artifactId>
+                <version>${netty.version}</version>
+                <classifier>osx-x86_64</classifier>
+            </dependency>
             <dependency>
                 <groupId>io.netty</groupId>
                 <artifactId>netty-transport</artifactId>
                 <version>${netty.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-transport-classes-epoll</artifactId>
+                <version>${netty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-transport-classes-kqueue</artifactId>
+                <version>${netty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-transport-native-epoll</artifactId>
+                <version>${netty.version}</version>
+            </dependency>
             <dependency> <!-- brought by com.microsoft.azure:azure-servicebus -->
                 <groupId>io.netty</groupId>
                 <artifactId>netty-transport-native-epoll</artifactId>
                 <version>${netty.version}</version>
                 <classifier>linux-x86_64</classifier>
             </dependency>
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-transport-native-kqueue</artifactId>
+                <version>${netty.version}</version>
+            </dependency>
             <dependency> <!-- brought by com.microsoft.azure:azure-servicebus -->
                 <groupId>io.netty</groupId>
                 <artifactId>netty-transport-native-kqueue</artifactId>
@@ -1391,6 +1462,16 @@
                 <artifactId>commons-csv</artifactId>
                 <version>${commons-csv.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.httpcomponents.client5</groupId>
+                <artifactId>httpclient5</artifactId>
+                <version>${apache-httpclient5.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.httpcomponents.core5</groupId>
+                <artifactId>httpcore5</artifactId>
+                <version>${apache-httpcore5.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpclient</artifactId>
@@ -1426,6 +1507,11 @@
                 <artifactId>jackson-dataformat-cbor</artifactId>
                 <version>${jackson.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.dataformat</groupId>
+                <artifactId>jackson-dataformat-yaml</artifactId>
+                <version>${jackson.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.datatype</groupId>
                 <artifactId>jackson-datatype-jdk8</artifactId>
@@ -1457,7 +1543,7 @@
                 <version>${auth0-jwt.version}</version>
             </dependency>
             <dependency>
-                <groupId>com.github.fge</groupId>
+                <groupId>com.github.java-json-tools</groupId>
                 <artifactId>json-schema-validator</artifactId>
                 <version>${json-schema-validator.version}</version>
                 <exclusions>
@@ -1586,6 +1672,56 @@
                 <artifactId>grpc-protobuf</artifactId>
                 <version>${grpc.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.grpc</groupId>
+                <artifactId>grpc-protobuf-lite</artifactId>
+                <version>${grpc.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.grpc</groupId>
+                <artifactId>grpc-rls</artifactId>
+                <version>${grpc.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.grpc</groupId>
+                <artifactId>grpc-util</artifactId>
+                <version>${grpc.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.grpc</groupId>
+                <artifactId>grpc-googleapis</artifactId>
+                <version>${grpc.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.grpc</groupId>
+                <artifactId>grpc-xds</artifactId>
+                <version>${grpc.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.grpc</groupId>
+                <artifactId>grpc-services</artifactId>
+                <version>${grpc.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.grpc</groupId>
+                <artifactId>grpc-context</artifactId>
+                <version>${grpc.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.grpc</groupId>
+                <artifactId>grpc-inprocess</artifactId>
+                <version>${grpc.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.grpc</groupId>
+                <artifactId>grpc-core</artifactId>
+                <version>${grpc.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.grpc</groupId>
+                <artifactId>grpc-grpclb</artifactId>
+                <version>${grpc.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.grpc</groupId>
                 <artifactId>grpc-stub</artifactId>
@@ -1651,12 +1787,6 @@
                     </exclusion>
                 </exclusions>
             </dependency>
-            <dependency>
-                <groupId>org.mockito</groupId>
-                <artifactId>mockito-inline</artifactId>
-                <version>${mockito.version}</version>
-                <scope>test</scope>
-            </dependency>
             <dependency>
                 <groupId>org.testng</groupId>
                 <artifactId>testng</artifactId>
@@ -1701,7 +1831,7 @@
             </dependency>
             <dependency>
                 <groupId>org.hamcrest</groupId>
-                <artifactId>hamcrest-all</artifactId>
+                <artifactId>hamcrest</artifactId>
                 <version>${hamcrest.version}</version>
                 <scope>test</scope>
             </dependency>
@@ -1740,22 +1870,32 @@
             </dependency>
             <dependency>
                 <groupId>org.thingsboard</groupId>
-                <artifactId>springfox-boot-starter</artifactId>
-                <version>${springfox-swagger.version}</version>
+                <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+                <version>${springdoc-swagger.version}</version>
             </dependency>
             <dependency>
-                <groupId>io.swagger</groupId>
-                <artifactId>swagger-annotations</artifactId>
+                <groupId>io.swagger.core.v3</groupId>
+                <artifactId>swagger-annotations-jakarta</artifactId>
                 <version>${swagger-annotations.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.bouncycastle</groupId>
-                <artifactId>bcprov-jdk15on</artifactId>
+                <artifactId>bcprov-jdk18on</artifactId>
+                <version>${bouncycastle.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.bouncycastle</groupId>
+                <artifactId>bcpkix-jdk18on</artifactId>
+                <version>${bouncycastle.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.bouncycastle</groupId>
+                <artifactId>bcutil-jdk18on</artifactId>
                 <version>${bouncycastle.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.bouncycastle</groupId>
-                <artifactId>bcpkix-jdk15on</artifactId>
+                <artifactId>bcprov-ext-jdk18on</artifactId>
                 <version>${bouncycastle.version}</version>
             </dependency>
             <dependency>
@@ -1801,7 +1941,7 @@
             </dependency>
             <dependency>
                 <groupId>org.elasticsearch.client</groupId>
-                <artifactId>rest</artifactId>
+                <artifactId>elasticsearch-rest-client</artifactId>
                 <version>${elasticsearch.version}</version>
             </dependency>
             <dependency>
@@ -1810,15 +1950,10 @@
                 <version>${delight-nashorn-sandbox.version}</version>
             </dependency>
             <dependency>
-                <groupId>com.github.vladimir-bukhtoyarov</groupId>
+                <groupId>com.bucket4j</groupId>
                 <artifactId>bucket4j-core</artifactId>
                 <version>${bucket4j.version}</version>
             </dependency>
-            <dependency>
-                <groupId>de.ruedigermoeller</groupId>
-                <artifactId>fst</artifactId>
-                <version>${fst.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.locationtech.spatial4j</groupId>
                 <artifactId>spatial4j</artifactId>
@@ -1880,8 +2015,8 @@
                 <version>${commons-beanutils.version}</version>
             </dependency>
             <dependency>
-                <groupId>commons-collections</groupId>
-                <artifactId>commons-collections</artifactId>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-collections4</artifactId>
                 <version>${commons-collections.version}</version>
             </dependency>
             <dependency>
@@ -1932,6 +2067,10 @@
                         <groupId>io.jsonwebtoken</groupId>
                         <artifactId>jjwt-impl</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>com.fasterxml.jackson.dataformat</groupId>
+                        <artifactId>jackson-dataformat-xml</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
@@ -1941,18 +2080,18 @@
             </dependency>
             <dependency>
                 <groupId>io.hypersistence</groupId>
-                <artifactId>hypersistence-utils-hibernate-55</artifactId>
+                <artifactId>hypersistence-utils-hibernate-63</artifactId>
                 <version>${hypersistence-utils.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.glassfish</groupId>
-                <artifactId>javax.el</artifactId>
-                <version>${javax.el.version}</version>
+                <artifactId>jakarta.el</artifactId>
+                <version>${jakarta.el.version}</version>
             </dependency>
             <dependency>
-                <groupId>javax.validation</groupId>
-                <artifactId>validation-api</artifactId>
-                <version>${javax.validation-api.version}</version>
+                <groupId>jakarta.validation</groupId>
+                <artifactId>jakarta.validation-api</artifactId>
+                <version>${jakarta.validation-api.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.owasp.antisamy</groupId>
@@ -2004,6 +2143,12 @@
                 <version>${mock-server.version}</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>org.jeasy</groupId>
+                <artifactId>easy-random-core</artifactId>
+                <version>${jeasy.version}</version>
+                <scope>test</scope>
+            </dependency>
             <dependency>
                 <groupId>org.opensmpp</groupId>
                 <artifactId>opensmpp-core</artifactId>
@@ -2044,6 +2189,11 @@
                 <artifactId>oshi-core</artifactId>
                 <version>${oshi.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.openjdk.nashorn</groupId>
+                <artifactId>nashorn-core</artifactId>
+                <version>${nashorn-core.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.google.oauth-client</groupId>
                 <artifactId>google-oauth-client</artifactId>
diff --git a/rest-client/pom.xml b/rest-client/pom.xml
index 1bdd531fe2..e4a959a7ec 100644
--- a/rest-client/pom.xml
+++ b/rest-client/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.6.3-SNAPSHOT</version>
+        <version>3.7.0-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <artifactId>rest-client</artifactId>
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/pom.xml b/rule-engine/pom.xml
index a0cbca16ba..8902ef0cee 100644
--- a/rule-engine/pom.xml
+++ b/rule-engine/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.6.3-SNAPSHOT</version>
+        <version>3.7.0-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <artifactId>rule-engine</artifactId>
diff --git a/rule-engine/rule-engine-api/pom.xml b/rule-engine/rule-engine-api/pom.xml
index fb4ee314ce..743baf1ab4 100644
--- a/rule-engine/rule-engine-api/pom.xml
+++ b/rule-engine/rule-engine-api/pom.xml
@@ -22,7 +22,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.6.3-SNAPSHOT</version>
+        <version>3.7.0-SNAPSHOT</version>
         <artifactId>rule-engine</artifactId>
     </parent>
     <groupId>org.thingsboard.rule-engine</groupId>
@@ -95,7 +95,7 @@
         </dependency>
         <dependency>
             <groupId>com.sun.mail</groupId>
-            <artifactId>javax.mail</artifactId>
+            <artifactId>jakarta.mail</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -103,11 +103,6 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.awaitility</groupId>
             <artifactId>awaitility</artifactId>
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/RuleEngineTelemetryService.java b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/RuleEngineTelemetryService.java
index e88da22064..0c2de91b2f 100644
--- a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/RuleEngineTelemetryService.java
+++ b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/RuleEngineTelemetryService.java
@@ -17,6 +17,7 @@ package org.thingsboard.rule.engine.api;
 
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.ListenableFuture;
+import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.TenantId;
@@ -40,32 +41,68 @@ public interface RuleEngineTelemetryService {
 
     void saveWithoutLatestAndNotify(TenantId tenantId, CustomerId id, EntityId entityId, List<TsKvEntry> ts, long ttl, FutureCallback<Void> callback);
 
+    @Deprecated(since = "3.7.0")
     void saveAndNotify(TenantId tenantId, EntityId entityId, String scope, List<AttributeKvEntry> attributes, FutureCallback<Void> callback);
 
+    void saveAndNotify(TenantId tenantId, EntityId entityId, AttributeScope scope, List<AttributeKvEntry> attributes, FutureCallback<Void> callback);
+
+    @Deprecated(since = "3.7.0")
     void saveAndNotify(TenantId tenantId, EntityId entityId, String scope, List<AttributeKvEntry> attributes, boolean notifyDevice, FutureCallback<Void> callback);
 
+    void saveAndNotify(TenantId tenantId, EntityId entityId, AttributeScope scope, List<AttributeKvEntry> attributes, boolean notifyDevice, FutureCallback<Void> callback);
+
     void saveLatestAndNotify(TenantId tenantId, EntityId entityId, List<TsKvEntry> ts, FutureCallback<Void> callback);
 
+    @Deprecated(since = "3.7.0")
     ListenableFuture<Void> saveAttrAndNotify(TenantId tenantId, EntityId entityId, String scope, String key, long value);
 
+    ListenableFuture<Void> saveAttrAndNotify(TenantId tenantId, EntityId entityId, AttributeScope scope, String key, long value);
+
+    @Deprecated(since = "3.7.0")
     ListenableFuture<Void> saveAttrAndNotify(TenantId tenantId, EntityId entityId, String scope, String key, String value);
 
+    ListenableFuture<Void> saveAttrAndNotify(TenantId tenantId, EntityId entityId, AttributeScope scope, String key, String value);
+
+    @Deprecated(since = "3.7.0")
     ListenableFuture<Void> saveAttrAndNotify(TenantId tenantId, EntityId entityId, String scope, String key, double value);
 
+    ListenableFuture<Void> saveAttrAndNotify(TenantId tenantId, EntityId entityId, AttributeScope scope, String key, double value);
+
+    @Deprecated(since = "3.7.0")
     ListenableFuture<Void> saveAttrAndNotify(TenantId tenantId, EntityId entityId, String scope, String key, boolean value);
 
+    ListenableFuture<Void> saveAttrAndNotify(TenantId tenantId, EntityId entityId, AttributeScope scope, String key, boolean value);
+
+    @Deprecated(since = "3.7.0")
     void saveAttrAndNotify(TenantId tenantId, EntityId entityId, String scope, String key, long value, FutureCallback<Void> callback);
 
+    void saveAttrAndNotify(TenantId tenantId, EntityId entityId, AttributeScope scope, String key, long value, FutureCallback<Void> callback);
+
+    @Deprecated(since = "3.7.0")
     void saveAttrAndNotify(TenantId tenantId, EntityId entityId, String scope, String key, String value, FutureCallback<Void> callback);
 
+    void saveAttrAndNotify(TenantId tenantId, EntityId entityId, AttributeScope scope, String key, String value, FutureCallback<Void> callback);
+
+    @Deprecated(since = "3.7.0")
     void saveAttrAndNotify(TenantId tenantId, EntityId entityId, String scope, String key, double value, FutureCallback<Void> callback);
 
+    void saveAttrAndNotify(TenantId tenantId, EntityId entityId, AttributeScope scope, String key, double value, FutureCallback<Void> callback);
+
+    @Deprecated(since = "3.7.0")
     void saveAttrAndNotify(TenantId tenantId, EntityId entityId, String scope, String key, boolean value, FutureCallback<Void> callback);
 
+    void saveAttrAndNotify(TenantId tenantId, EntityId entityId, AttributeScope scope, String key, boolean value, FutureCallback<Void> callback);
+
+    @Deprecated(since = "3.7.0")
     void deleteAndNotify(TenantId tenantId, EntityId entityId, String scope, List<String> keys, FutureCallback<Void> callback);
 
+    void deleteAndNotify(TenantId tenantId, EntityId entityId, AttributeScope scope, List<String> keys, FutureCallback<Void> callback);
+
+    @Deprecated(since = "3.7.0")
     void deleteAndNotify(TenantId tenantId, EntityId entityId, String scope, List<String> keys, boolean notifyDevice, FutureCallback<Void> callback);
 
+    void deleteAndNotify(TenantId tenantId, EntityId entityId, AttributeScope scope, List<String> keys, boolean notifyDevice, FutureCallback<Void> callback);
+
     void deleteLatest(TenantId tenantId, EntityId entityId, List<String> keys, FutureCallback<Void> callback);
 
     void deleteAllLatest(TenantId tenantId, EntityId entityId, FutureCallback<Collection<String>> callback);
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 a258ee4fff..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
@@ -31,7 +31,6 @@ import org.thingsboard.server.common.data.asset.AssetProfile;
 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.EdgeId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.RuleChainId;
 import org.thingsboard.server.common.data.id.RuleNodeId;
@@ -69,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;
@@ -238,8 +238,6 @@ public interface TbContext {
 
     TbMsg attributesDeletedActionMsg(EntityId originator, RuleNodeId ruleNodeId, String scope, List<String> keys);
 
-    void onEdgeEventUpdate(TenantId tenantId, EdgeId edgeId);
-
     /*
      *
      *  METHODS TO PROCESS THE MESSAGES
@@ -318,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-api/src/test/java/org/thingsboard/rule/engine/api/util/TbNodeUtilsTest.java b/rule-engine/rule-engine-api/src/test/java/org/thingsboard/rule/engine/api/util/TbNodeUtilsTest.java
index 3b8ce60e6c..25237a2cdc 100644
--- a/rule-engine/rule-engine-api/src/test/java/org/thingsboard/rule/engine/api/util/TbNodeUtilsTest.java
+++ b/rule-engine/rule-engine-api/src/test/java/org/thingsboard/rule/engine/api/util/TbNodeUtilsTest.java
@@ -16,10 +16,10 @@
 package org.thingsboard.rule.engine.api.util;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.Test;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.msg.TbMsgType;
@@ -29,7 +29,7 @@ import org.thingsboard.server.common.msg.TbMsgMetaData;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class TbNodeUtilsTest {
 
     private static final String DATA_VARIABLE_TEMPLATE = "$[%s]";
@@ -46,7 +46,7 @@ public class TbNodeUtilsTest {
 
         TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, TenantId.SYS_TENANT_ID, md, JacksonUtil.toString(node));
         String result = TbNodeUtils.processPattern(pattern, msg);
-        Assert.assertEquals("ABC metadata_value data_value", result);
+        Assertions.assertEquals("ABC metadata_value data_value", result);
     }
 
     @Test
@@ -60,7 +60,7 @@ public class TbNodeUtilsTest {
 
         TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, TenantId.SYS_TENANT_ID, md, JacksonUtil.toString(node));
         String result = TbNodeUtils.processPattern(pattern, msg);
-        Assert.assertEquals(pattern, result);
+        Assertions.assertEquals(pattern, result);
     }
 
     @Test
@@ -74,7 +74,7 @@ public class TbNodeUtilsTest {
 
         TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, TenantId.SYS_TENANT_ID, md, JacksonUtil.toString(node));
         String result = TbNodeUtils.processPattern(pattern, msg);
-        Assert.assertEquals("ABC metadata_value data_value", result);
+        Assertions.assertEquals("ABC metadata_value data_value", result);
     }
 
     @Test
@@ -95,7 +95,7 @@ public class TbNodeUtilsTest {
 
         TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, TenantId.SYS_TENANT_ID, md, JacksonUtil.toString(node));
         String result = TbNodeUtils.processPattern(pattern, msg);
-        Assert.assertEquals("ABC metadata_value value3", result);
+        Assertions.assertEquals("ABC metadata_value value3", result);
     }
 
     @Test
@@ -116,7 +116,7 @@ public class TbNodeUtilsTest {
 
         TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, TenantId.SYS_TENANT_ID, md, JacksonUtil.toString(node));
         String result = TbNodeUtils.processPattern(pattern, msg);
-        Assert.assertEquals("ABC metadata_value $[key1.key2[0].key3]", result);
+        Assertions.assertEquals("ABC metadata_value $[key1.key2[0].key3]", result);
     }
 
     @Test
diff --git a/rule-engine/rule-engine-api/src/test/resources/junit-platform.properties b/rule-engine/rule-engine-api/src/test/resources/junit-platform.properties
new file mode 100644
index 0000000000..f2ed301920
--- /dev/null
+++ b/rule-engine/rule-engine-api/src/test/resources/junit-platform.properties
@@ -0,0 +1,3 @@
+junit.jupiter.execution.parallel.enabled = true
+junit.jupiter.execution.parallel.mode.default = concurrent
+junit.jupiter.execution.parallel.mode.classes.default = concurrent
diff --git a/rule-engine/rule-engine-api/src/test/resources/logback-test.xml b/rule-engine/rule-engine-api/src/test/resources/logback-test.xml
new file mode 100644
index 0000000000..52f2a77588
--- /dev/null
+++ b/rule-engine/rule-engine-api/src/test/resources/logback-test.xml
@@ -0,0 +1,14 @@
+<?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>
+
+    <root level="INFO">
+        <appender-ref ref="console"/>
+    </root>
+
+</configuration>
diff --git a/rule-engine/rule-engine-components/pom.xml b/rule-engine/rule-engine-components/pom.xml
index b1d3b01c39..de48596d70 100644
--- a/rule-engine/rule-engine-components/pom.xml
+++ b/rule-engine/rule-engine-components/pom.xml
@@ -22,7 +22,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.6.3-SNAPSHOT</version>
+        <version>3.7.0-SNAPSHOT</version>
         <artifactId>rule-engine</artifactId>
     </parent>
     <groupId>org.thingsboard.rule-engine</groupId>
@@ -84,6 +84,14 @@
             <artifactId>spring-web</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-webflux</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.projectreactor.netty</groupId>
+            <artifactId>reactor-netty-http</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.kafka</groupId>
             <artifactId>kafka-clients</artifactId>
@@ -106,7 +114,7 @@
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcpkix-jdk15on</artifactId>
+            <artifactId>bcpkix-jdk18on</artifactId>
         </dependency>
         <dependency>
             <groupId>org.locationtech.spatial4j</groupId>
@@ -118,7 +126,7 @@
         </dependency>
         <dependency>
             <groupId>com.sun.mail</groupId>
-            <artifactId>javax.mail</artifactId>
+            <artifactId>jakarta.mail</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -130,11 +138,6 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.awaitility</groupId>
             <artifactId>awaitility</artifactId>
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbAbstractRelationActionNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbAbstractRelationActionNode.java
index 8584b59925..3bef21d779 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbAbstractRelationActionNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbAbstractRelationActionNode.java
@@ -192,7 +192,6 @@ public abstract class TbAbstractRelationActionNode<C extends TbAbstractRelationA
                         newDevice.setType(entitykey.getType());
                         newDevice.setTenantId(ctx.getTenantId());
                         Device savedDevice = deviceService.saveDevice(newDevice);
-                        ctx.getClusterService().onDeviceUpdated(savedDevice, null);
                         ctx.enqueue(ctx.deviceCreatedMsg(savedDevice, ctx.getSelfId()),
                                 () -> log.trace("Pushed Device Created message: {}", savedDevice),
                                 throwable -> log.warn("Failed to push Device Created message: {}", savedDevice, throwable));
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbCopyAttributesToEntityViewNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbCopyAttributesToEntityViewNode.java
index 6a5428377d..312e6b9d8f 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbCopyAttributesToEntityViewNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbCopyAttributesToEntityViewNode.java
@@ -29,6 +29,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.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.EntityView;
 import org.thingsboard.server.common.data.kv.AttributeKvEntry;
@@ -38,7 +39,7 @@ import org.thingsboard.server.common.data.util.CollectionsUtil;
 import org.thingsboard.server.common.msg.TbMsg;
 import org.thingsboard.server.common.adaptor.JsonConverter;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
@@ -79,8 +80,8 @@ public class TbCopyAttributesToEntityViewNode implements TbNode {
                 ACTIVITY_EVENT, INACTIVITY_EVENT, POST_ATTRIBUTES_REQUEST)) {
             if (!msg.getMetaData().getData().isEmpty()) {
                 long now = System.currentTimeMillis();
-                String scope = msg.isTypeOf(POST_ATTRIBUTES_REQUEST) ?
-                        DataConstants.CLIENT_SCOPE : msg.getMetaData().getValue(DataConstants.SCOPE);
+                AttributeScope scope = msg.isTypeOf(POST_ATTRIBUTES_REQUEST) ?
+                        AttributeScope.CLIENT_SCOPE : AttributeScope.valueOf(msg.getMetaData().getValue(DataConstants.SCOPE));
 
                 ListenableFuture<List<EntityView>> entityViewsFuture =
                         ctx.getEntityViewService().findEntityViewsByTenantIdAndEntityIdAsync(ctx.getTenantId(), msg.getOriginator());
@@ -145,17 +146,17 @@ public class TbCopyAttributesToEntityViewNode implements TbNode {
         ctx.enqueueForTellNext(ctx.newMsg(msg.getQueueName(), msg.getType(), entityView.getId(), msg.getCustomerId(), msg.getMetaData(), msg.getData()), SUCCESS);
     }
 
-    private boolean attributeContainsInEntityView(String scope, String attrKey, EntityView entityView) {
+    private boolean attributeContainsInEntityView(AttributeScope scope, String attrKey, EntityView entityView) {
         AttributesEntityView attributesEntityView = entityView.getKeys().getAttributes();
         List<String> keys = null;
         switch (scope) {
-            case DataConstants.CLIENT_SCOPE:
+            case CLIENT_SCOPE:
                 keys = attributesEntityView.getCs();
                 break;
-            case DataConstants.SERVER_SCOPE:
+            case SERVER_SCOPE:
                 keys = attributesEntityView.getSs();
                 break;
-            case DataConstants.SHARED_SCOPE:
+            case SHARED_SCOPE:
                 keys = attributesEntityView.getSh();
                 break;
         }
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 3abd7099f3..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
@@ -43,7 +43,7 @@ import org.thingsboard.server.dao.cassandra.guava.GuavaSession;
 import org.thingsboard.server.dao.nosql.CassandraStatementTask;
 import org.thingsboard.server.dao.nosql.TbResultSetFuture;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -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 58cbe05b92..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
@@ -17,7 +17,7 @@ package org.thingsboard.rule.engine.edge;
 
 import lombok.Data;
 import org.thingsboard.rule.engine.api.NodeConfiguration;
-import org.thingsboard.server.common.data.DataConstants;
+import org.thingsboard.server.common.data.AttributeScope;
 
 @Data
 public class BaseTbMsgPushNodeConfiguration implements NodeConfiguration<BaseTbMsgPushNodeConfiguration> {
@@ -27,7 +27,8 @@ public class BaseTbMsgPushNodeConfiguration implements NodeConfiguration<BaseTbM
     @Override
     public BaseTbMsgPushNodeConfiguration defaultConfiguration() {
         BaseTbMsgPushNodeConfiguration configuration = new BaseTbMsgPushNodeConfiguration();
-        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/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 701d7fd717..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
@@ -153,10 +153,7 @@ public class TbMsgPushToEdgeNode extends AbstractTbMsgPushNode<TbMsgPushToEdgeNo
 
     private ListenableFuture<Void> notifyEdge(TbContext ctx, EdgeEvent edgeEvent, EdgeId edgeId) {
         edgeEvent.setEdgeId(edgeId);
-        ListenableFuture<Void> future = ctx.getEdgeEventService().saveAsync(edgeEvent);
-        return Futures.transform(future, result -> {
-            ctx.onEdgeEventUpdate(ctx.getTenantId(), edgeId);
-            return null;
-        }, ctx.getDbCallbackExecutor());
+        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 08a1776ba3..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
@@ -31,7 +31,8 @@ import org.thingsboard.server.common.data.msg.TbNodeConnectionType;
 import org.thingsboard.server.common.data.plugin.ComponentType;
 import org.thingsboard.server.common.msg.TbMsg;
 
-import javax.annotation.Nullable;
+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 0a9d0deb1d..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
@@ -24,7 +24,7 @@ import lombok.extern.slf4j.Slf4j;
 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.DataConstants;
+import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.kv.AttributeKvEntry;
 import org.thingsboard.server.common.data.kv.BaseAttributeKvEntry;
@@ -74,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 {
@@ -84,10 +83,10 @@ public class TbGpsGeofencingActionNode extends AbstractGeofencingNode<TbGpsGeofe
         EntityGeofencingState entityState = entityStates.computeIfAbsent(msg.getOriginator(), key -> {
             try {
                 Optional<AttributeKvEntry> entry = ctx.getAttributesService()
-                        .find(ctx.getTenantId(), msg.getOriginator(), DataConstants.SERVER_SCOPE, ctx.getServiceId())
+                        .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);
@@ -144,7 +143,7 @@ public class TbGpsGeofencingActionNode extends AbstractGeofencingNode<TbGpsGeofe
         object.addProperty("stayed", entityState.isStayed());
         AttributeKvEntry entry = new BaseAttributeKvEntry(new StringDataEntry(ctx.getServiceId(), gson.toJson(object)), System.currentTimeMillis());
         List<AttributeKvEntry> attributeKvEntryList = Collections.singletonList(entry);
-        ctx.getAttributesService().save(ctx.getTenantId(), entityId, DataConstants.SERVER_SCOPE, attributeKvEntryList);
+        ctx.getAttributesService().save(ctx.getTenantId(), entityId, AttributeScope.SERVER_SCOPE, attributeKvEntryList);
     }
 
     @Override
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 42a555ed79..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,7 +30,8 @@ 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.server.common.data.DataConstants;
+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;
 import org.thingsboard.server.common.data.kv.BasicTsKvEntry;
@@ -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) {
@@ -208,7 +145,7 @@ public class TbMathNode implements TbNode {
     }
 
     private ListenableFuture<Void> saveAttribute(TbContext ctx, TbMsg msg, double result, TbMathResult mathResultDef) {
-        String attributeScope = getAttributeScope(mathResultDef.getAttributeScope());
+        AttributeScope attributeScope = getAttributeScope(mathResultDef.getAttributeScope());
         if (isIntegerResult(mathResultDef, config.getOperation())) {
             var value = toIntValue(result);
             return ctx.getTelemetryService().saveAttrAndNotify(
@@ -384,7 +321,7 @@ public class TbMathNode implements TbNode {
             case MESSAGE_METADATA:
                 return Futures.immediateFuture(TbMathArgumentValue.fromMessageMetadata(arg, argKey, msg.getMetaData()));
             case ATTRIBUTE:
-                String scope = getAttributeScope(arg.getAttributeScope());
+                AttributeScope scope = getAttributeScope(arg.getAttributeScope());
                 return Futures.transform(ctx.getAttributesService().find(ctx.getTenantId(), msg.getOriginator(), scope, argKey),
                         opt -> getTbMathArgumentValue(arg, opt, "Attribute: " + argKey + " with scope: " + scope + " not found for entity: " + msg.getOriginator())
                         , MoreExecutors.directExecutor());
@@ -402,8 +339,8 @@ public class TbMathNode implements TbNode {
         return CONSTANT.equals(type) ? keyPattern : TbNodeUtils.processPattern(keyPattern, msg);
     }
 
-    private String getAttributeScope(String attrScope) {
-        return StringUtils.isEmpty(attrScope) ? DataConstants.SERVER_SCOPE : attrScope;
+    private AttributeScope getAttributeScope(String attrScope) {
+        return StringUtils.isEmpty(attrScope) ? AttributeScope.SERVER_SCOPE : AttributeScope.valueOf(attrScope);
     }
 
     private TbMathArgumentValue getTbMathArgumentValue(TbMathArgument arg, Optional<? extends KvEntry> kvOpt, String error) {
@@ -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/metadata/TbAbstractGetAttributesNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbAbstractGetAttributesNode.java
index fab1893702..c7ef41d909 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbAbstractGetAttributesNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbAbstractGetAttributesNode.java
@@ -21,7 +21,7 @@ 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.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.BooleanUtils;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.rule.engine.api.TbContext;
@@ -29,6 +29,7 @@ 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.TbMsgSource;
+import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.kv.AttributeKvEntry;
 import org.thingsboard.server.common.data.kv.BasicTsKvEntry;
@@ -99,10 +100,10 @@ public abstract class TbAbstractGetAttributesNode<C extends TbGetAttributesNodeC
     private void safePutAttributes(TbContext ctx, TbMsg msg, ObjectNode msgDataNode, T entityId) {
         Set<TbPair<String, List<String>>> failuresPairSet = ConcurrentHashMap.newKeySet();
         var getKvEntryPairFutures = Futures.allAsList(
-                getLatestTelemetry(ctx, entityId, TbNodeUtils.processPatterns(config.getLatestTsKeyNames(), msg), failuresPairSet),
-                getAttrAsync(ctx, entityId, CLIENT_SCOPE, TbNodeUtils.processPatterns(config.getClientAttributeNames(), msg), failuresPairSet),
-                getAttrAsync(ctx, entityId, SHARED_SCOPE, TbNodeUtils.processPatterns(config.getSharedAttributeNames(), msg), failuresPairSet),
-                getAttrAsync(ctx, entityId, SERVER_SCOPE, TbNodeUtils.processPatterns(config.getServerAttributeNames(), msg), failuresPairSet)
+                getAttrAsync(ctx, entityId, AttributeScope.CLIENT_SCOPE, TbNodeUtils.processPatterns(config.getClientAttributeNames(), msg), failuresPairSet),
+                getAttrAsync(ctx, entityId, AttributeScope.SHARED_SCOPE, TbNodeUtils.processPatterns(config.getSharedAttributeNames(), msg), failuresPairSet),
+                getAttrAsync(ctx, entityId, AttributeScope.SERVER_SCOPE, TbNodeUtils.processPatterns(config.getServerAttributeNames(), msg), failuresPairSet),
+                getLatestTelemetry(ctx, entityId, TbNodeUtils.processPatterns(config.getLatestTsKeyNames(), msg), failuresPairSet)
         );
         withCallback(getKvEntryPairFutures, futuresList -> {
             var msgMetaData = msg.getMetaData().copy();
@@ -127,7 +128,7 @@ public abstract class TbAbstractGetAttributesNode<C extends TbGetAttributesNodeC
     private ListenableFuture<TbPair<String, List<AttributeKvEntry>>> getAttrAsync(
             TbContext ctx,
             EntityId entityId,
-            String scope,
+            AttributeScope scope,
             List<String> keys,
             Set<TbPair<String, List<String>>> failuresPairSet
     ) {
@@ -138,9 +139,9 @@ public abstract class TbAbstractGetAttributesNode<C extends TbGetAttributesNodeC
         return Futures.transform(attributeKvEntryListFuture, attributeKvEntryList -> {
             if (isTellFailureIfAbsent && attributeKvEntryList.size() != keys.size()) {
                 List<String> nonExistentKeys = getNonExistentKeys(attributeKvEntryList, keys);
-                failuresPairSet.add(new TbPair<>(scope, nonExistentKeys));
+                failuresPairSet.add(new TbPair<>(scope.name(), nonExistentKeys));
             }
-            return new TbPair<>(scope, attributeKvEntryList);
+            return new TbPair<>(scope.name(), attributeKvEntryList);
         }, ctx.getDbCallbackExecutor());
     }
 
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbAbstractGetMappedDataNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbAbstractGetMappedDataNode.java
index 3469ae1cc9..2911e777f3 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbAbstractGetMappedDataNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbAbstractGetMappedDataNode.java
@@ -25,6 +25,7 @@ import org.thingsboard.rule.engine.api.TbNodeException;
 import org.thingsboard.rule.engine.api.util.TbNodeUtils;
 import org.thingsboard.rule.engine.util.EntitiesFieldsAsyncLoader;
 import org.thingsboard.rule.engine.util.TbMsgSource;
+import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.kv.KvEntry;
 import org.thingsboard.server.common.msg.TbMsg;
@@ -36,7 +37,6 @@ import java.util.Map;
 import java.util.stream.Collectors;
 
 import static org.thingsboard.common.util.DonAsynchron.withCallback;
-import static org.thingsboard.server.common.data.DataConstants.SERVER_SCOPE;
 
 @Slf4j
 public abstract class TbAbstractGetMappedDataNode<T extends EntityId, C extends TbGetMappedDataNodeConfiguration> extends TbAbstractNodeWithFetchTo<C> {
@@ -134,7 +134,7 @@ public abstract class TbAbstractGetMappedDataNode<T extends EntityId, C extends
     }
 
     private ListenableFuture<List<KvEntry>> getAttributesAsync(TbContext ctx, EntityId entityId, List<String> attrKeys) {
-        var latest = ctx.getAttributesService().find(ctx.getTenantId(), entityId, SERVER_SCOPE, attrKeys);
+        var latest = ctx.getAttributesService().find(ctx.getTenantId(), entityId, AttributeScope.SERVER_SCOPE, attrKeys);
         return Futures.transform(latest, l ->
                         l.stream()
                                 .map(i -> (KvEntry) i)
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/notification/TbNotificationNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/notification/TbNotificationNodeConfiguration.java
index 3b58f7b85f..5e8df9c24e 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/notification/TbNotificationNodeConfiguration.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/notification/TbNotificationNodeConfiguration.java
@@ -19,8 +19,8 @@ import lombok.Data;
 import org.thingsboard.rule.engine.api.NodeConfiguration;
 import org.thingsboard.server.common.data.id.NotificationTemplateId;
 
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 import java.util.List;
 import java.util.UUID;
 
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/notification/TbSlackNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/notification/TbSlackNodeConfiguration.java
index ecc541bfb8..7a5a4d8e82 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/notification/TbSlackNodeConfiguration.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/notification/TbSlackNodeConfiguration.java
@@ -20,9 +20,9 @@ import org.thingsboard.rule.engine.api.NodeConfiguration;
 import org.thingsboard.server.common.data.notification.targets.slack.SlackConversation;
 import org.thingsboard.server.common.data.notification.targets.slack.SlackConversationType;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 
 @Data
 public class TbSlackNodeConfiguration implements NodeConfiguration<TbSlackNodeConfiguration> {
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/profile/DeviceState.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/profile/DeviceState.java
index 3ce53a7a3b..b231cb5dde 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/profile/DeviceState.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/profile/DeviceState.java
@@ -21,6 +21,7 @@ import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.rule.engine.api.TbContext;
 import org.thingsboard.rule.engine.profile.state.PersistedAlarmState;
 import org.thingsboard.rule.engine.profile.state.PersistedDeviceState;
+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.DeviceProfile;
@@ -382,9 +383,9 @@ class DeviceState {
             }
         }
         if (!attributeKeys.isEmpty()) {
-            addToSnapshot(result, ctx.getAttributesService().find(ctx.getTenantId(), originator, DataConstants.CLIENT_SCOPE, attributeKeys).get());
-            addToSnapshot(result, ctx.getAttributesService().find(ctx.getTenantId(), originator, DataConstants.SHARED_SCOPE, attributeKeys).get());
-            addToSnapshot(result, ctx.getAttributesService().find(ctx.getTenantId(), originator, DataConstants.SERVER_SCOPE, attributeKeys).get());
+            addToSnapshot(result, ctx.getAttributesService().find(ctx.getTenantId(), originator, AttributeScope.CLIENT_SCOPE, attributeKeys).get());
+            addToSnapshot(result, ctx.getAttributesService().find(ctx.getTenantId(), originator, AttributeScope.SHARED_SCOPE, attributeKeys).get());
+            addToSnapshot(result, ctx.getAttributesService().find(ctx.getTenantId(), originator, AttributeScope.SERVER_SCOPE, attributeKeys).get());
         }
     }
 
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/profile/DynamicPredicateValueCtxImpl.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/profile/DynamicPredicateValueCtxImpl.java
index fec15fa73e..1120a597a1 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/profile/DynamicPredicateValueCtxImpl.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/profile/DynamicPredicateValueCtxImpl.java
@@ -17,6 +17,7 @@ package org.thingsboard.rule.engine.profile;
 
 import lombok.extern.slf4j.Slf4j;
 import org.thingsboard.rule.engine.api.TbContext;
+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.id.CustomerId;
@@ -62,7 +63,7 @@ public class DynamicPredicateValueCtxImpl implements DynamicPredicateValueCtx {
 
     private EntityKeyValue getValue(EntityId entityId, String key) {
         try {
-            Optional<AttributeKvEntry> entry = ctx.getAttributesService().find(tenantId, entityId, DataConstants.SERVER_SCOPE, key).get();
+            Optional<AttributeKvEntry> entry = ctx.getAttributesService().find(tenantId, entityId, AttributeScope.SERVER_SCOPE, key).get();
             if (entry.isPresent()) {
                 return DeviceState.toEntityValue(entry.get());
             }
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 73671d0e36..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
@@ -17,28 +17,20 @@ package org.thingsboard.rule.engine.rest;
 
 import io.netty.channel.EventLoopGroup;
 import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.handler.ssl.SslContext;
+import io.netty.handler.ssl.SslContextBuilder;
+import io.netty.handler.timeout.ReadTimeoutHandler;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.codec.binary.Base64;
-import org.apache.http.HttpHost;
-import org.apache.http.auth.AuthScope;
-import org.apache.http.auth.UsernamePasswordCredentials;
-import org.apache.http.client.CredentialsProvider;
-import org.apache.http.conn.ssl.DefaultHostnameVerifier;
-import org.apache.http.impl.client.BasicCredentialsProvider;
-import org.apache.http.impl.nio.client.CloseableHttpAsyncClient;
-import org.apache.http.impl.nio.client.HttpAsyncClientBuilder;
-import org.apache.http.impl.nio.client.HttpAsyncClients;
-import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.http.client.HttpComponentsAsyncClientHttpRequestFactory;
-import org.springframework.http.client.Netty4ClientHttpRequestFactory;
-import org.springframework.util.concurrent.ListenableFuture;
-import org.springframework.util.concurrent.ListenableFutureCallback;
-import org.springframework.web.client.AsyncRestTemplate;
+import org.springframework.http.client.reactive.ReactorClientHttpConnector;
 import org.springframework.web.client.RestClientResponseException;
+import org.springframework.web.reactive.function.BodyInserters;
+import org.springframework.web.reactive.function.client.WebClient;
+import org.springframework.web.reactive.function.client.WebClient.RequestBodySpec;
 import org.springframework.web.util.UriComponentsBuilder;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.rule.engine.api.TbContext;
@@ -50,25 +42,23 @@ import org.thingsboard.rule.engine.credentials.CredentialsType;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.msg.TbMsg;
 import org.thingsboard.server.common.msg.TbMsgMetaData;
+import reactor.netty.http.client.HttpClient;
+import reactor.netty.transport.ProxyProvider;
 
-import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLException;
-import java.net.Authenticator;
-import java.net.PasswordAuthentication;
 import java.net.URI;
 import java.nio.charset.StandardCharsets;
-import java.security.NoSuchAlgorithmException;
-import java.util.Deque;
+import java.util.Base64;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.ConcurrentLinkedDeque;
+import java.util.Properties;
+import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 
 @Data
 @Slf4j
-@SuppressWarnings("deprecation")
 public class TbHttpClient {
 
     private static final String STATUS = "status";
@@ -78,79 +68,72 @@ public class TbHttpClient {
     private static final String ERROR_BODY = "error_body";
     private static final String ERROR_SYSTEM_PROPERTIES = "Didn't set any system proxy properties. Should be added next system proxy properties: \"http.proxyHost\" and \"http.proxyPort\" or  \"https.proxyHost\" and \"https.proxyPort\" or \"socksProxyHost\" and \"socksProxyPort\"";
 
+    private static final String HTTP_PROXY_HOST = "http.proxyHost";
+    private static final String HTTP_PROXY_PORT = "http.proxyPort";
+    private static final String HTTPS_PROXY_HOST = "https.proxyHost";
+    private static final String HTTPS_PROXY_PORT = "https.proxyPort";
+
+    private static final String SOCKS_PROXY_HOST = "socksProxyHost";
+    private static final String SOCKS_PROXY_PORT = "socksProxyPort";
+    private static final String SOCKS_VERSION = "socksProxyVersion";
+    private static final String SOCKS_VERSION_5 = "5";
+    private static final String SOCKS_VERSION_4 = "4";
+    public static final String PROXY_USER = "tb.proxy.user";
+    public static final String PROXY_PASSWORD = "tb.proxy.password";
+
     private final TbRestApiCallNodeConfiguration config;
 
     private EventLoopGroup eventLoopGroup;
-    private AsyncRestTemplate httpClient;
-    private Deque<ListenableFuture<ResponseEntity<String>>> pendingFutures;
+    private WebClient webClient;
+    private Semaphore semaphore;
 
     TbHttpClient(TbRestApiCallNodeConfiguration config, EventLoopGroup eventLoopGroupShared) throws TbNodeException {
         try {
             this.config = config;
             if (config.getMaxParallelRequestsCount() > 0) {
-                pendingFutures = new ConcurrentLinkedDeque<>();
+                semaphore = new Semaphore(config.getMaxParallelRequestsCount());
             }
 
-            if (config.isEnableProxy()) {
-                checkProxyHost(config.getProxyHost());
-                checkProxyPort(config.getProxyPort());
-
-                String proxyUser;
-                String proxyPassword;
-
-                CloseableHttpAsyncClient asyncClient;
-                HttpComponentsAsyncClientHttpRequestFactory requestFactory = new HttpComponentsAsyncClientHttpRequestFactory();
+            HttpClient httpClient = HttpClient.create()
+                    .runOn(getSharedOrCreateEventLoopGroup(eventLoopGroupShared))
+                    .doOnConnected(c ->
+                            c.addHandlerLast(new ReadTimeoutHandler(config.getReadTimeoutMs(), TimeUnit.MILLISECONDS)));
 
+            if (config.isEnableProxy()) {
                 if (config.isUseSystemProxyProperties()) {
                     checkSystemProxyProperties();
-
-                    asyncClient = HttpAsyncClients.createSystem();
-
-                    proxyUser = System.getProperty("tb.proxy.user");
-                    proxyPassword = System.getProperty("tb.proxy.password");
-
-                    if (useAuth(proxyUser, proxyPassword)) {
-                        Authenticator.setDefault(new Authenticator() {
-                            protected PasswordAuthentication getPasswordAuthentication() {
-                                return new PasswordAuthentication(proxyUser, proxyPassword.toCharArray());
-                            }
-                        });
-                    }
+                    httpClient = httpClient.proxy(this::createSystemProxyProvider);
                 } else {
-                    HttpAsyncClientBuilder httpAsyncClientBuilder = HttpAsyncClientBuilder.create()
-                            .setSSLHostnameVerifier(new DefaultHostnameVerifier())
-                            .setSSLContext(SSLContext.getDefault())
-                            .setProxy(new HttpHost(config.getProxyHost(), config.getProxyPort(), config.getProxyScheme()));
-
-                    proxyUser = config.getProxyUser();
-                    proxyPassword = config.getProxyPassword();
-
-                    if (useAuth(proxyUser, proxyPassword)) {
-                        CredentialsProvider credsProvider = new BasicCredentialsProvider();
-                        credsProvider.setCredentials(
-                                new AuthScope(config.getProxyHost(), config.getProxyPort()),
-                                new UsernamePasswordCredentials(proxyUser, proxyPassword)
-                        );
-                        httpAsyncClientBuilder.setDefaultCredentialsProvider(credsProvider);
-                    }
-                    asyncClient = httpAsyncClientBuilder.build();
+                    checkProxyHost(config.getProxyHost());
+                    checkProxyPort(config.getProxyPort());
+                    String proxyUser = config.getProxyUser();
+                    String proxyPassword = config.getProxyPassword();
+
+                    httpClient = httpClient.proxy(options -> {
+                        var o = options.type(ProxyProvider.Proxy.HTTP)
+                                .host(config.getProxyHost())
+                                .port(config.getProxyPort());
+
+                        if (useAuth(proxyUser, proxyPassword)) {
+                            o.username(proxyUser).password(u -> proxyPassword);
+                        }
+                    });
+                    SslContext sslContext = SslContextBuilder.forClient().build();
+                    httpClient.secure(t -> t.sslContext(sslContext));
                 }
-
-                requestFactory.setAsyncClient(asyncClient);
-                requestFactory.setReadTimeout(config.getReadTimeoutMs());
-                httpClient = new AsyncRestTemplate(requestFactory);
-            } else if (config.isUseSimpleClientHttpFactory()) {
+            } else if (!config.isUseSimpleClientHttpFactory()) {
                 if (CredentialsType.CERT_PEM == config.getCredentials().getType()) {
                     throw new TbNodeException("Simple HTTP Factory does not support CERT PEM credentials!");
                 }
-                httpClient = new AsyncRestTemplate();
             } else {
-                Netty4ClientHttpRequestFactory nettyFactory = new Netty4ClientHttpRequestFactory(getSharedOrCreateEventLoopGroup(eventLoopGroupShared));
-                nettyFactory.setSslContext(config.getCredentials().initSslContext());
-                nettyFactory.setReadTimeout(config.getReadTimeoutMs());
-                httpClient = new AsyncRestTemplate(nettyFactory);
+                SslContext sslContext = config.getCredentials().initSslContext();
+                httpClient = httpClient.secure(t -> t.sslContext(sslContext));
             }
-        } catch (SSLException | NoSuchAlgorithmException e) {
+
+            this.webClient = WebClient.builder()
+                    .clientConnector(new ReactorClientHttpConnector(httpClient))
+                    .build();
+        } catch (SSLException e) {
             throw new TbNodeException(e);
         }
     }
@@ -185,38 +168,49 @@ public class TbHttpClient {
     public void processMessage(TbContext ctx, TbMsg msg,
                                Consumer<TbMsg> onSuccess,
                                BiConsumer<TbMsg, Throwable> onFailure) {
-        String endpointUrl = TbNodeUtils.processPattern(config.getRestEndpointUrlPattern(), msg);
-        HttpHeaders headers = prepareHeaders(msg);
-        HttpMethod method = HttpMethod.valueOf(config.getRequestMethod());
-        HttpEntity<String> entity;
-        if (HttpMethod.GET.equals(method) || HttpMethod.HEAD.equals(method) ||
-                HttpMethod.OPTIONS.equals(method) || HttpMethod.TRACE.equals(method) ||
-                config.isIgnoreRequestBody()) {
-            entity = new HttpEntity<>(headers);
-        } else {
-            entity = new HttpEntity<>(getData(msg, config.isIgnoreRequestBody(), config.isParseToPlainText()), headers);
-        }
-
-        URI uri = buildEncodedUri(endpointUrl);
-        ListenableFuture<ResponseEntity<String>> future = httpClient.exchange(
-                uri, method, entity, String.class);
-        future.addCallback(new ListenableFutureCallback<>() {
-            @Override
-            public void onFailure(Throwable throwable) {
-                onFailure.accept(processException(msg, throwable), throwable);
+        try {
+            if (semaphore != null && !semaphore.tryAcquire(config.getReadTimeoutMs(), TimeUnit.MILLISECONDS)) {
+                ctx.tellFailure(msg, new RuntimeException("Timeout during waiting for reply!"));
+                return;
             }
 
-            @Override
-            public void onSuccess(ResponseEntity<String> responseEntity) {
-                if (responseEntity.getStatusCode().is2xxSuccessful()) {
-                    onSuccess.accept(processResponse(ctx, msg, responseEntity));
-                } else {
-                    onFailure.accept(processFailureResponse(msg, responseEntity), null);
-                }
+            String endpointUrl = TbNodeUtils.processPattern(config.getRestEndpointUrlPattern(), msg);
+            HttpMethod method = HttpMethod.valueOf(config.getRequestMethod());
+            URI uri = buildEncodedUri(endpointUrl);
+
+            RequestBodySpec request = webClient
+                    .method(method)
+                    .uri(uri)
+                    .headers(headers -> prepareHeaders(headers, msg));
+
+            if (HttpMethod.POST.equals(method) || HttpMethod.PUT.equals(method) ||
+                    HttpMethod.PATCH.equals(method) || HttpMethod.DELETE.equals(method) ||
+                    !config.isIgnoreRequestBody()) {
+                request.body(BodyInserters.fromValue(getData(msg, config.isIgnoreRequestBody(), config.isParseToPlainText())));
             }
-        });
-        if (pendingFutures != null) {
-            processParallelRequests(future);
+
+            request
+                    .retrieve()
+                    .toEntity(String.class)
+                    .subscribe(responseEntity -> {
+                        if (semaphore != null) {
+                            semaphore.release();
+                        }
+
+                        if (responseEntity.getStatusCode().is2xxSuccessful()) {
+                            onSuccess.accept(processResponse(ctx, msg, responseEntity));
+                        } else {
+                            onFailure.accept(processFailureResponse(msg, responseEntity), null);
+                        }
+                    }, throwable -> {
+                        if (semaphore != null) {
+                            semaphore.release();
+                        }
+
+                        onFailure.accept(processException(msg, throwable), throwable);
+                    });
+        } catch (InterruptedException e) {
+            log.warn("Timeout during waiting for reply!", e);
         }
     }
 
@@ -244,28 +238,17 @@ 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();
-        metaData.putValue(STATUS, response.getStatusCode().name());
+        HttpStatus httpStatus = (HttpStatus) response.getStatusCode();
+        metaData.putValue(STATUS, httpStatus.name());
         metaData.putValue(STATUS_CODE, response.getStatusCode().value() + "");
-        metaData.putValue(STATUS_REASON, response.getStatusCode().getReasonPhrase());
+        metaData.putValue(STATUS_REASON, httpStatus.getReasonPhrase());
         headersToMetaData(response.getHeaders(), metaData::putValue);
         String body = response.getBody() == null ? TbMsg.EMPTY_JSON_OBJECT : response.getBody();
         return ctx.transformMsg(origMsg, metaData, body);
@@ -287,10 +270,11 @@ public class TbHttpClient {
     }
 
     private TbMsg processFailureResponse(TbMsg origMsg, ResponseEntity<String> response) {
+        HttpStatus httpStatus = (HttpStatus) response.getStatusCode();
         TbMsgMetaData metaData = origMsg.getMetaData();
-        metaData.putValue(STATUS, response.getStatusCode().name());
-        metaData.putValue(STATUS_CODE, response.getStatusCode().value() + "");
-        metaData.putValue(STATUS_REASON, response.getStatusCode().getReasonPhrase());
+        metaData.putValue(STATUS, httpStatus.name());
+        metaData.putValue(STATUS_CODE, httpStatus.value() + "");
+        metaData.putValue(STATUS_REASON, httpStatus.getReasonPhrase());
         metaData.putValue(ERROR_BODY, response.getBody());
         headersToMetaData(response.getHeaders(), metaData::putValue);
         return TbMsg.transformMsgMetadata(origMsg, metaData);
@@ -308,47 +292,92 @@ public class TbHttpClient {
         return TbMsg.transformMsgMetadata(origMsg, metaData);
     }
 
-    private HttpHeaders prepareHeaders(TbMsg msg) {
-        HttpHeaders headers = new HttpHeaders();
+    private void prepareHeaders(HttpHeaders headers, TbMsg msg) {
         config.getHeaders().forEach((k, v) -> headers.add(TbNodeUtils.processPattern(k, msg), TbNodeUtils.processPattern(v, msg)));
         ClientCredentials credentials = config.getCredentials();
         if (CredentialsType.BASIC == credentials.getType()) {
             BasicCredentials basicCredentials = (BasicCredentials) credentials;
             String authString = basicCredentials.getUsername() + ":" + basicCredentials.getPassword();
-            String encodedAuthString = new String(Base64.encodeBase64(authString.getBytes(StandardCharsets.UTF_8)));
+            String encodedAuthString = new String(Base64.getDecoder().decode(authString.getBytes(StandardCharsets.UTF_8)));
             headers.add("Authorization", "Basic " + encodedAuthString);
         }
-        return headers;
     }
 
-    private void processParallelRequests(ListenableFuture<ResponseEntity<String>> future) {
-        pendingFutures.add(future);
-        if (pendingFutures.size() > config.getMaxParallelRequestsCount()) {
-            for (int i = 0; i < config.getMaxParallelRequestsCount(); i++) {
-                try {
-                    ListenableFuture<ResponseEntity<String>> pendingFuture = pendingFutures.removeFirst();
-                    try {
-                        pendingFuture.get(config.getReadTimeoutMs(), TimeUnit.MILLISECONDS);
-                    } catch (Exception e) {
-                        log.warn("Timeout during waiting for reply!", e);
-                        pendingFuture.cancel(true);
-                    }
-                } catch (Exception e) {
-                    log.warn("Failure during waiting for reply!", e);
-                }
-            }
+    private static void checkProxyHost(String proxyHost) {
+        if (StringUtils.isEmpty(proxyHost)) {
+            throw new IllegalArgumentException("Proxy host can't be empty");
         }
     }
 
-    private static void checkProxyHost(String proxyHost) throws TbNodeException {
-        if (StringUtils.isEmpty(proxyHost)) {
-            throw new TbNodeException("Proxy host can't be empty");
+    private static void checkProxyPort(int proxyPort) {
+        if (proxyPort < 0 || proxyPort > 65535) {
+            throw new IllegalArgumentException("Proxy port out of range:" + proxyPort);
         }
     }
 
-    private static void checkProxyPort(int proxyPort) throws TbNodeException {
-        if (proxyPort < 0 || proxyPort > 65535) {
-            throw new TbNodeException("Proxy port out of range:" + proxyPort);
+    private void createSystemProxyProvider(ProxyProvider.TypeSpec option) {
+        Properties properties = System.getProperties();
+        if (properties.containsKey(HTTP_PROXY_HOST) || properties.containsKey(HTTPS_PROXY_HOST)) {
+            createHttpProxyFrom(option, properties);
+        }
+        if (properties.containsKey(SOCKS_PROXY_HOST)) {
+            createSocksProxyFrom(option, properties);
+        }
+    }
+
+    private void createHttpProxyFrom(ProxyProvider.TypeSpec option, Properties properties) {
+        String hostProperty;
+        String portProperty;
+        if (properties.containsKey(HTTPS_PROXY_HOST)) {
+            hostProperty = HTTPS_PROXY_HOST;
+            portProperty = HTTPS_PROXY_PORT;
+        } else {
+            hostProperty = HTTP_PROXY_HOST;
+            portProperty = HTTP_PROXY_PORT;
+        }
+
+        String hostname = properties.getProperty(hostProperty);
+        int port = Integer.parseInt(properties.getProperty(portProperty));
+
+        checkProxyHost(config.getProxyHost());
+        checkProxyPort(config.getProxyPort());
+
+        var proxy = option
+                .type(ProxyProvider.Proxy.HTTP)
+                .host(hostname)
+                .port(port);
+
+        var proxyUser = properties.getProperty(PROXY_USER);
+        var proxyPassword = properties.getProperty(PROXY_PASSWORD);
+
+        if (useAuth(proxyUser, proxyPassword)) {
+            proxy.username(proxyUser).password(u -> proxyPassword);
+        }
+    }
+
+    private void createSocksProxyFrom(ProxyProvider.TypeSpec option, Properties properties) {
+        String hostname = properties.getProperty(SOCKS_PROXY_HOST);
+        String version = properties.getProperty(SOCKS_VERSION, SOCKS_VERSION_5);
+        if (!SOCKS_VERSION_5.equals(version) && !SOCKS_VERSION_4.equals(version)) {
+            throw new IllegalArgumentException(String.format("Wrong socks version %s! Supported only socks versions 4 and 5.", version));
+        }
+
+        ProxyProvider.Proxy type = SOCKS_VERSION_5.equals(version) ? ProxyProvider.Proxy.SOCKS5 : ProxyProvider.Proxy.SOCKS4;
+        int port = Integer.parseInt(properties.getProperty(SOCKS_PROXY_PORT));
+
+        checkProxyHost(config.getProxyHost());
+        checkProxyPort(config.getProxyPort());
+
+        ProxyProvider.Builder proxy = option
+                .type(type)
+                .host(hostname)
+                .port(port);
+
+        var proxyUser = properties.getProperty(PROXY_USER);
+        var proxyPassword = properties.getProperty(PROXY_PASSWORD);
+
+        if (useAuth(proxyUser, proxyPassword)) {
+            proxy.username(proxyUser).password(u -> proxyPassword);
         }
     }
 
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/rpc/TbSendRPCReplyNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/rpc/TbSendRPCReplyNode.java
index 411b090a0b..c343b242bf 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/rpc/TbSendRPCReplyNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/rpc/TbSendRPCReplyNode.java
@@ -109,7 +109,6 @@ public class TbSendRPCReplyNode implements TbNode {
         Futures.addCallback(future, new FutureCallback<>() {
             @Override
             public void onSuccess(Void result) {
-                ctx.onEdgeEventUpdate(ctx.getTenantId(), edgeId);
                 ctx.tellSuccess(msg);
             }
 
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/AttributesDeleteNodeCallback.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/AttributesDeleteNodeCallback.java
index bec4ffc389..37c2cb430e 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/AttributesDeleteNodeCallback.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/AttributesDeleteNodeCallback.java
@@ -19,7 +19,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.thingsboard.rule.engine.api.TbContext;
 import org.thingsboard.server.common.msg.TbMsg;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import java.util.List;
 
 @Slf4j
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/AttributesUpdateNodeCallback.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/AttributesUpdateNodeCallback.java
index 4ba2fcaefc..a0e2726037 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/AttributesUpdateNodeCallback.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/AttributesUpdateNodeCallback.java
@@ -19,7 +19,7 @@ import org.thingsboard.rule.engine.api.TbContext;
 import org.thingsboard.server.common.data.kv.AttributeKvEntry;
 import org.thingsboard.server.common.msg.TbMsg;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import java.util.List;
 
 public class AttributesUpdateNodeCallback extends TelemetryNodeCallback {
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgAttributesNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgAttributesNode.java
index b2ea22c566..4f9cfae136 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgAttributesNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgAttributesNode.java
@@ -29,6 +29,7 @@ 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.server.common.adaptor.JsonConverter;
+import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.kv.AttributeKvEntry;
 import org.thingsboard.server.common.data.kv.KvEntry;
@@ -89,7 +90,7 @@ public class TbMsgAttributesNode implements TbNode {
             ctx.tellSuccess(msg);
             return;
         }
-        String scope = getScope(msg.getMetaData().getValue(SCOPE));
+        AttributeScope scope = getScope(msg.getMetaData().getValue(SCOPE));
         boolean sendAttributesUpdateNotification = checkSendNotification(scope);
 
         if (!config.isUpdateAttributesOnlyOnValueChange()) {
@@ -109,7 +110,7 @@ public class TbMsgAttributesNode implements TbNode {
                 MoreExecutors.directExecutor());
     }
 
-    void saveAttr(List<AttributeKvEntry> attributes, TbContext ctx, TbMsg msg, String scope, boolean sendAttributesUpdateNotification) {
+    void saveAttr(List<AttributeKvEntry> attributes, TbContext ctx, TbMsg msg, AttributeScope scope, boolean sendAttributesUpdateNotification) {
         if (attributes.isEmpty()) {
             ctx.tellSuccess(msg);
             return;
@@ -121,7 +122,7 @@ public class TbMsgAttributesNode implements TbNode {
                 attributes,
                 config.isNotifyDevice() || checkNotifyDeviceMdValue(msg.getMetaData().getValue(NOTIFY_DEVICE_METADATA_KEY)),
                 sendAttributesUpdateNotification ?
-                        new AttributesUpdateNodeCallback(ctx, msg, scope, attributes) :
+                        new AttributesUpdateNodeCallback(ctx, msg, scope.name(), attributes) :
                         new TelemetryNodeCallback(ctx, msg)
         );
     }
@@ -144,8 +145,8 @@ public class TbMsgAttributesNode implements TbNode {
                 .collect(Collectors.toList());
     }
 
-    private boolean checkSendNotification(String scope) {
-        return config.isSendAttributesUpdatedNotification() && !CLIENT_SCOPE.equals(scope);
+    private boolean checkSendNotification(AttributeScope scope) {
+        return config.isSendAttributesUpdatedNotification() && AttributeScope.CLIENT_SCOPE != scope;
     }
 
     private boolean checkNotifyDeviceMdValue(String notifyDeviceMdValue) {
@@ -153,11 +154,11 @@ public class TbMsgAttributesNode implements TbNode {
         return StringUtils.isEmpty(notifyDeviceMdValue) || Boolean.parseBoolean(notifyDeviceMdValue);
     }
 
-    private String getScope(String mdScopeValue) {
+    private AttributeScope getScope(String mdScopeValue) {
         if (StringUtils.isNotEmpty(mdScopeValue)) {
-            return mdScopeValue;
+            return AttributeScope.valueOf(mdScopeValue);
         }
-        return config.getScope();
+        return AttributeScope.valueOf(config.getScope());
     }
 
     @Override
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgDeleteAttributesNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgDeleteAttributesNode.java
index 96a554af7e..66faa80f9f 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgDeleteAttributesNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgDeleteAttributesNode.java
@@ -22,6 +22,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.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.plugin.ComponentType;
 import org.thingsboard.server.common.msg.TbMsg;
@@ -32,7 +33,6 @@ import java.util.stream.Collectors;
 
 import static org.thingsboard.server.common.data.DataConstants.NOTIFY_DEVICE_METADATA_KEY;
 import static org.thingsboard.server.common.data.DataConstants.SCOPE;
-import static org.thingsboard.server.common.data.DataConstants.SHARED_SCOPE;
 
 @Slf4j
 @RuleNode(
@@ -69,7 +69,7 @@ public class TbMsgDeleteAttributesNode implements TbNode {
         if (keysToDelete.isEmpty()) {
             ctx.tellSuccess(msg);
         } else {
-            String scope = getScope(msg.getMetaData().getValue(SCOPE));
+            AttributeScope scope = getScope(msg.getMetaData().getValue(SCOPE));
             ctx.getTelemetryService().deleteAndNotify(
                     ctx.getTenantId(),
                     msg.getOriginator(),
@@ -77,21 +77,21 @@ public class TbMsgDeleteAttributesNode implements TbNode {
                     keysToDelete,
                     checkNotifyDevice(msg.getMetaData().getValue(NOTIFY_DEVICE_METADATA_KEY), scope),
                     config.isSendAttributesDeletedNotification() ?
-                            new AttributesDeleteNodeCallback(ctx, msg, scope, keysToDelete) :
+                            new AttributesDeleteNodeCallback(ctx, msg, scope.name(), keysToDelete) :
                             new TelemetryNodeCallback(ctx, msg)
             );
         }
     }
 
-    private String getScope(String mdScopeValue) {
+    private AttributeScope getScope(String mdScopeValue) {
         if (StringUtils.isNotEmpty(mdScopeValue)) {
-            return mdScopeValue;
+            return AttributeScope.valueOf(mdScopeValue);
         }
-        return config.getScope();
+        return AttributeScope.valueOf(config.getScope());
     }
 
-    private boolean checkNotifyDevice(String notifyDeviceMdValue, String scope) {
-        return SHARED_SCOPE.equals(scope) && (config.isNotifyDevice() || Boolean.parseBoolean(notifyDeviceMdValue));
+    private boolean checkNotifyDevice(String notifyDeviceMdValue, AttributeScope scope) {
+        return (AttributeScope.SHARED_SCOPE == scope) && (config.isNotifyDevice() || Boolean.parseBoolean(notifyDeviceMdValue));
     }
 
 }
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TelemetryNodeCallback.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TelemetryNodeCallback.java
index 303b5fd431..b01fa2ca3a 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TelemetryNodeCallback.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TelemetryNodeCallback.java
@@ -20,7 +20,7 @@ import lombok.Data;
 import org.thingsboard.rule.engine.api.TbContext;
 import org.thingsboard.server.common.msg.TbMsg;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 /**
  * Created by ashvayka on 02.04.18.
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/EntitiesRelatedDeviceIdAsyncLoader.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/EntitiesRelatedDeviceIdAsyncLoader.java
index 79c18f9a8c..17f19e3b85 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/EntitiesRelatedDeviceIdAsyncLoader.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/EntitiesRelatedDeviceIdAsyncLoader.java
@@ -17,7 +17,7 @@ package org.thingsboard.rule.engine.util;
 
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.thingsboard.rule.engine.api.TbContext;
 import org.thingsboard.rule.engine.data.DeviceRelationsQuery;
 import org.thingsboard.server.common.data.device.DeviceSearchQuery;
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/EntitiesRelatedEntityIdAsyncLoader.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/EntitiesRelatedEntityIdAsyncLoader.java
index eadef5a013..82026f97dd 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/EntitiesRelatedEntityIdAsyncLoader.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/EntitiesRelatedEntityIdAsyncLoader.java
@@ -17,7 +17,7 @@ package org.thingsboard.rule.engine.util;
 
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.thingsboard.rule.engine.api.TbContext;
 import org.thingsboard.rule.engine.data.RelationsQuery;
 import org.thingsboard.server.common.data.id.EntityId;
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/main/resources/public/static/rulenode/rulenode-core-config.js b/rule-engine/rule-engine-components/src/main/resources/public/static/rulenode/rulenode-core-config.js
index 7e161bb6ba..2e50246059 100644
--- a/rule-engine/rule-engine-components/src/main/resources/public/static/rulenode/rulenode-core-config.js
+++ b/rule-engine/rule-engine-components/src/main/resources/public/static/rulenode/rulenode-core-config.js
@@ -1,25 +1,25 @@
-System.register(["@angular/core","@shared/public-api","@ngrx/store","@angular/forms","@angular/common","@angular/material/checkbox","@angular/material/input","@angular/material/form-field","@angular/flex-layout/flex","@ngx-translate/core","@angular/material/select","@angular/material/core","@angular/material/slide-toggle","@shared/components/hint-tooltip-icon.component","@core/public-api","@shared/components/js-func.component","@angular/material/button","@angular/material/icon","@angular/material/tooltip","@shared/components/script-lang.component","@angular/cdk/keycodes","@angular/material/chips","@shared/pipe/safe.pipe","@shared/components/entity/entity-type-select.component","@shared/components/entity/entity-select.component","@shared/components/toggle-header.component","@shared/components/toggle-select.component","@angular/cdk/coercion","@shared/components/tb-error.component","@angular/flex-layout/extended","@angular/material/list","@angular/cdk/drag-drop","rxjs/operators","@angular/material/autocomplete","@shared/pipe/highlight.pipe","@home/components/public-api","tslib","rxjs","@shared/components/help-popup.component","@shared/components/entity/entity-subtype-list.component","@shared/components/relation/relation-type-autocomplete.component","@home/components/relation/relation-filters.component","@angular/material/expansion","@shared/components/file-input.component","@shared/components/button/toggle-password.component","@shared/components/string-items-list.component","@shared/components/entity/entity-list.component","@shared/components/notification/template-autocomplete.component","@shared/components/tb-checkbox.component","@home/components/sms/sms-provider-configuration.component","@angular/material/radio","@shared/components/slack-conversation-autocomplete.component","@shared/components/entity/entity-autocomplete.component","@shared/components/entity/entity-type-list.component","@angular/cdk/platform"],(function(e){"use strict";var t,n,r,o,a,i,l,s,m,p,d,u,c,f,g,y,x,b,h,v,C,F,k,L,T,I,N,S,q,A,M,E,G,D,w,V,P,R,O,_,B,K,z,U,H,j,$,Q,J,Y,W,Z,X,ee,te,ne,re,oe,ae,ie,le,se,me,pe,de,ue,ce,fe,ge,ye,xe,be,he,ve,Ce,Fe,ke,Le,Te,Ie,Ne,Se,qe,Ae,Me,Ee,Ge,De,we,Ve,Pe,Re,Oe,_e,Be,Ke,ze,Ue,He,je,$e,Qe,Je,Ye,We,Ze,Xe,et,tt,nt,rt,ot,at,it,lt,st,mt,pt;return{setters:[function(e){t=e,n=e.Component,r=e.EventEmitter,o=e.ViewChild,a=e.forwardRef,i=e.Input,l=e.InjectionToken,s=e.Injectable,m=e.Inject,p=e.Optional,d=e.Directive,u=e.Output,c=e.NgModule},function(e){f=e.RuleNodeConfigurationComponent,g=e.AttributeScope,y=e.telemetryTypeTranslations,x=e.ScriptLanguage,b=e.AlarmSeverity,h=e.alarmSeverityTranslations,v=e.EntitySearchDirection,C=e.entitySearchDirectionTranslations,F=e.EntityType,k=e.entityFields,L=e.PageComponent,T=e.messageTypeNames,I=e.MessageType,N=e.coerceBoolean,S=e,q=e.AlarmStatus,A=e.alarmStatusTranslations,M=e.SharedModule,E=e.AggregationType,G=e.aggregationTranslations,D=e.NotificationType,w=e.SlackChanelType,V=e.SlackChanelTypesTranslateMap},function(e){P=e},function(e){R=e,O=e.Validators,_=e.NgControl,B=e.NG_VALUE_ACCESSOR,K=e.NG_VALIDATORS,z=e.FormArray,U=e.FormGroup},function(e){H=e,j=e.DOCUMENT,$=e.CommonModule},function(e){Q=e},function(e){J=e},function(e){Y=e},function(e){W=e},function(e){Z=e},function(e){X=e},function(e){ee=e},function(e){te=e},function(e){ne=e},function(e){re=e.getCurrentAuthState,oe=e,ae=e.isDefinedAndNotNull,ie=e.isEqual,le=e.deepTrim,se=e.isObject,me=e.isNotEmptyStr},function(e){pe=e},function(e){de=e},function(e){ue=e},function(e){ce=e},function(e){fe=e},function(e){ge=e.ENTER,ye=e.COMMA,xe=e.SEMICOLON},function(e){be=e},function(e){he=e},function(e){ve=e},function(e){Ce=e},function(e){Fe=e},function(e){ke=e},function(e){Le=e.coerceBooleanProperty,Te=e.coerceElement,Ie=e.coerceNumberProperty},function(e){Ne=e},function(e){Se=e},function(e){qe=e},function(e){Ae=e},function(e){Me=e.tap,Ee=e.map,Ge=e.startWith,De=e.mergeMap,we=e.share,Ve=e.takeUntil,Pe=e.auditTime},function(e){Re=e},function(e){Oe=e},function(e){_e=e.HomeComponentsModule},function(e){Be=e.__decorate},function(e){Ke=e.Subject,ze=e.takeUntil,Ue=e.of,He=e.EMPTY,je=e.fromEvent},function(e){$e=e},function(e){Qe=e},function(e){Je=e},function(e){Ye=e},function(e){We=e},function(e){Ze=e},function(e){Xe=e},function(e){et=e},function(e){tt=e},function(e){nt=e},function(e){rt=e},function(e){ot=e},function(e){at=e},function(e){it=e},function(e){lt=e},function(e){st=e},function(e){mt=e.normalizePassiveListenerOptions,pt=e}],execute:function(){class dt extends f{constructor(e,t){super(e),this.store=e,this.fb=t}configForm(){return this.emptyConfigForm}onConfigurationSet(e){this.emptyConfigForm=this.fb.group({})}}e("EmptyConfigComponent",dt),dt.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:dt,deps:[{token:P.Store},{token:R.UntypedFormBuilder}],target:t.ɵɵFactoryTarget.Component}),dt.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:dt,selector:"tb-node-empty-config",usesInheritance:!0,ngImport:t,template:"<div></div>",isInline:!0}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:dt,decorators:[{type:n,args:[{selector:"tb-node-empty-config",template:"<div></div>"}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder}]}});class ut extends f{constructor(e,t){super(e),this.store=e,this.fb=t}configForm(){return this.assignCustomerConfigForm}onConfigurationSet(e){this.assignCustomerConfigForm=this.fb.group({customerNamePattern:[e?e.customerNamePattern:null,[O.required,O.pattern(/.*\S.*/)]],createCustomerIfNotExists:[!!e&&e.createCustomerIfNotExists,[]],customerCacheExpiration:[e?e.customerCacheExpiration:null,[O.required,O.min(0)]]})}prepareOutputConfig(e){return e.customerNamePattern=e.customerNamePattern.trim(),e}}e("AssignCustomerConfigComponent",ut),ut.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:ut,deps:[{token:P.Store},{token:R.UntypedFormBuilder}],target:t.ɵɵFactoryTarget.Component}),ut.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:ut,selector:"tb-action-node-assign-to-customer-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="assignCustomerConfigForm" fxLayout="column">\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.customer-name-pattern</mat-label>\n    <input required matInput formControlName="customerNamePattern">\n    <mat-error *ngIf="assignCustomerConfigForm.get(\'customerNamePattern\').hasError(\'required\') ||\n                      assignCustomerConfigForm.get(\'customerNamePattern\').hasError(\'pattern\')">\n      {{ \'tb.rulenode.customer-name-pattern-required\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n  </mat-form-field>\n  <mat-checkbox fxFlex formControlName="createCustomerIfNotExists">\n    {{ \'tb.rulenode.create-customer-if-not-exists\' | translate }}\n  </mat-checkbox>\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.customer-cache-expiration</mat-label>\n    <input required type="number" min="0" step="1" matInput formControlName="customerCacheExpiration">\n    <mat-error *ngIf="assignCustomerConfigForm.get(\'customerCacheExpiration\').hasError(\'required\')">\n      {{ \'tb.rulenode.customer-cache-expiration-required\' | translate }}\n    </mat-error>\n    <mat-error *ngIf="assignCustomerConfigForm.get(\'customerCacheExpiration\').hasError(\'min\')">\n      {{ \'tb.rulenode.customer-cache-expiration-range\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.customer-cache-expiration-hint</mat-hint>\n  </mat-form-field>\n</section>\n',dependencies:[{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:Q.MatCheckbox,selector:"mat-checkbox",inputs:["disableRipple","color","tabIndex"],exportAs:["matCheckbox"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatHint,selector:"mat-hint",inputs:["align","id"]},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:W.DefaultFlexDirective,selector:"  [fxFlex], [fxFlex.xs], [fxFlex.sm], [fxFlex.md],  [fxFlex.lg], [fxFlex.xl], [fxFlex.lt-sm], [fxFlex.lt-md],  [fxFlex.lt-lg], [fxFlex.lt-xl], [fxFlex.gt-xs], [fxFlex.gt-sm],  [fxFlex.gt-md], [fxFlex.gt-lg]",inputs:["fxFlex","fxFlex.xs","fxFlex.sm","fxFlex.md","fxFlex.lg","fxFlex.xl","fxFlex.lt-sm","fxFlex.lt-md","fxFlex.lt-lg","fxFlex.lt-xl","fxFlex.gt-xs","fxFlex.gt-sm","fxFlex.gt-md","fxFlex.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NumberValueAccessor,selector:"input[type=number][formControlName],input[type=number][formControl],input[type=number][ngModel]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.MinValidator,selector:"input[type=number][min][formControlName],input[type=number][min][formControl],input[type=number][min][ngModel]",inputs:["min"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:ut,decorators:[{type:n,args:[{selector:"tb-action-node-assign-to-customer-config",template:'<section [formGroup]="assignCustomerConfigForm" fxLayout="column">\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.customer-name-pattern</mat-label>\n    <input required matInput formControlName="customerNamePattern">\n    <mat-error *ngIf="assignCustomerConfigForm.get(\'customerNamePattern\').hasError(\'required\') ||\n                      assignCustomerConfigForm.get(\'customerNamePattern\').hasError(\'pattern\')">\n      {{ \'tb.rulenode.customer-name-pattern-required\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n  </mat-form-field>\n  <mat-checkbox fxFlex formControlName="createCustomerIfNotExists">\n    {{ \'tb.rulenode.create-customer-if-not-exists\' | translate }}\n  </mat-checkbox>\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.customer-cache-expiration</mat-label>\n    <input required type="number" min="0" step="1" matInput formControlName="customerCacheExpiration">\n    <mat-error *ngIf="assignCustomerConfigForm.get(\'customerCacheExpiration\').hasError(\'required\')">\n      {{ \'tb.rulenode.customer-cache-expiration-required\' | translate }}\n    </mat-error>\n    <mat-error *ngIf="assignCustomerConfigForm.get(\'customerCacheExpiration\').hasError(\'min\')">\n      {{ \'tb.rulenode.customer-cache-expiration-range\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.customer-cache-expiration-hint</mat-hint>\n  </mat-form-field>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder}]}});class ct extends f{constructor(e,t){super(e),this.store=e,this.fb=t,this.attributeScopeMap=g,this.attributeScopes=Object.keys(g),this.telemetryTypeTranslationsMap=y}configForm(){return this.attributesConfigForm}onConfigurationSet(e){this.attributesConfigForm=this.fb.group({scope:[e?e.scope:null,[O.required]],notifyDevice:[!e||e.notifyDevice,[]],sendAttributesUpdatedNotification:[!!e&&e.sendAttributesUpdatedNotification,[]],updateAttributesOnlyOnValueChange:[!!e&&e.updateAttributesOnlyOnValueChange,[]]}),this.attributesConfigForm.get("scope").valueChanges.subscribe((e=>{e!==g.SHARED_SCOPE&&this.attributesConfigForm.get("notifyDevice").patchValue(!1,{emitEvent:!1}),e===g.CLIENT_SCOPE&&this.attributesConfigForm.get("sendAttributesUpdatedNotification").patchValue(!1,{emitEvent:!1}),this.attributesConfigForm.get("updateAttributesOnlyOnValueChange").patchValue(!1,{emitEvent:!1})}))}}e("AttributesConfigComponent",ct),ct.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:ct,deps:[{token:P.Store},{token:R.UntypedFormBuilder}],target:t.ɵɵFactoryTarget.Component}),ct.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:ct,selector:"tb-action-node-attributes-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="attributesConfigForm" fxLayout="column">\n  <mat-form-field fxFlex class="mat-block">\n    <mat-label translate>attribute.attributes-scope</mat-label>\n    <mat-select formControlName="scope" required>\n      <mat-option *ngFor="let scope of attributeScopes" [value]="scope">\n        {{ telemetryTypeTranslationsMap.get(scope) | translate }}\n      </mat-option>\n    </mat-select>\n  </mat-form-field>\n  <div class="tb-form-panel no-padding no-border">\n    <div tb-hint-tooltip-icon="{{ (attributesConfigForm.get(\'updateAttributesOnlyOnValueChange\').value\n                                     ? \'tb.rulenode.update-attributes-only-on-value-change-hint-enabled\'\n                                     : \'tb.rulenode.update-attributes-only-on-value-change-hint\') | translate }}"\n         class="tb-form-row same-padding">\n      <mat-slide-toggle class="mat-slide margin" formControlName="updateAttributesOnlyOnValueChange">\n        {{ \'tb.rulenode.update-attributes-only-on-value-change\' | translate }}\n      </mat-slide-toggle>\n    </div>\n    <div tb-hint-tooltip-icon="{{ \'tb.rulenode.send-attributes-updated-notification-hint\' | translate }}"\n         *ngIf="attributesConfigForm.get(\'scope\').value !== attributeScopeMap.CLIENT_SCOPE"\n         class="tb-form-row same-padding">\n      <mat-slide-toggle class="mat-slide margin" formControlName="sendAttributesUpdatedNotification">\n        {{ \'tb.rulenode.send-attributes-updated-notification\' | translate }}\n      </mat-slide-toggle>\n    </div>\n    <div tb-hint-tooltip-icon="{{ \'tb.rulenode.notify-device-on-update-hint\' | translate }}"\n         *ngIf="attributesConfigForm.get(\'scope\').value === attributeScopeMap.SHARED_SCOPE"\n         class="tb-form-row same-padding">\n      <mat-slide-toggle class="mat-slide margin" formControlName="notifyDevice">\n        {{ \'tb.rulenode.notify-device\' | translate }}\n      </mat-slide-toggle>\n    </div>\n  </div>\n</section>\n',dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"component",type:X.MatSelect,selector:"mat-select",inputs:["disabled","disableRipple","tabIndex","hideSingleSelectionIndicator"],exportAs:["matSelect"]},{kind:"component",type:ee.MatOption,selector:"mat-option",exportAs:["matOption"]},{kind:"component",type:te.MatSlideToggle,selector:"mat-slide-toggle",inputs:["disabled","disableRipple","color","tabIndex"],exportAs:["matSlideToggle"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:W.DefaultFlexDirective,selector:"  [fxFlex], [fxFlex.xs], [fxFlex.sm], [fxFlex.md],  [fxFlex.lg], [fxFlex.xl], [fxFlex.lt-sm], [fxFlex.lt-md],  [fxFlex.lt-lg], [fxFlex.lt-xl], [fxFlex.gt-xs], [fxFlex.gt-sm],  [fxFlex.gt-md], [fxFlex.gt-lg]",inputs:["fxFlex","fxFlex.xs","fxFlex.sm","fxFlex.md","fxFlex.lg","fxFlex.xl","fxFlex.lt-sm","fxFlex.lt-md","fxFlex.lt-lg","fxFlex.lt-xl","fxFlex.gt-xs","fxFlex.gt-sm","fxFlex.gt-md","fxFlex.gt-lg"]},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"component",type:ne.HintTooltipIconComponent,selector:"[tb-hint-tooltip-icon]",inputs:["tb-hint-tooltip-icon","tooltipPosition","hintIcon"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:ct,decorators:[{type:n,args:[{selector:"tb-action-node-attributes-config",template:'<section [formGroup]="attributesConfigForm" fxLayout="column">\n  <mat-form-field fxFlex class="mat-block">\n    <mat-label translate>attribute.attributes-scope</mat-label>\n    <mat-select formControlName="scope" required>\n      <mat-option *ngFor="let scope of attributeScopes" [value]="scope">\n        {{ telemetryTypeTranslationsMap.get(scope) | translate }}\n      </mat-option>\n    </mat-select>\n  </mat-form-field>\n  <div class="tb-form-panel no-padding no-border">\n    <div tb-hint-tooltip-icon="{{ (attributesConfigForm.get(\'updateAttributesOnlyOnValueChange\').value\n                                     ? \'tb.rulenode.update-attributes-only-on-value-change-hint-enabled\'\n                                     : \'tb.rulenode.update-attributes-only-on-value-change-hint\') | translate }}"\n         class="tb-form-row same-padding">\n      <mat-slide-toggle class="mat-slide margin" formControlName="updateAttributesOnlyOnValueChange">\n        {{ \'tb.rulenode.update-attributes-only-on-value-change\' | translate }}\n      </mat-slide-toggle>\n    </div>\n    <div tb-hint-tooltip-icon="{{ \'tb.rulenode.send-attributes-updated-notification-hint\' | translate }}"\n         *ngIf="attributesConfigForm.get(\'scope\').value !== attributeScopeMap.CLIENT_SCOPE"\n         class="tb-form-row same-padding">\n      <mat-slide-toggle class="mat-slide margin" formControlName="sendAttributesUpdatedNotification">\n        {{ \'tb.rulenode.send-attributes-updated-notification\' | translate }}\n      </mat-slide-toggle>\n    </div>\n    <div tb-hint-tooltip-icon="{{ \'tb.rulenode.notify-device-on-update-hint\' | translate }}"\n         *ngIf="attributesConfigForm.get(\'scope\').value === attributeScopeMap.SHARED_SCOPE"\n         class="tb-form-row same-padding">\n      <mat-slide-toggle class="mat-slide margin" formControlName="notifyDevice">\n        {{ \'tb.rulenode.notify-device\' | translate }}\n      </mat-slide-toggle>\n    </div>\n  </div>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder}]}});class ft extends f{constructor(e,t,n,o){super(e),this.store=e,this.fb=t,this.nodeScriptTestService=n,this.translate=o,this.tbelEnabled=re(this.store).tbelEnabled,this.scriptLanguage=x,this.changeScript=new r,this.hasScript=!0,this.testScriptLabel="tb.rulenode.test-details-function"}configForm(){return this.clearAlarmConfigForm}onConfigurationSet(e){this.clearAlarmConfigForm=this.fb.group({scriptLang:[e?e.scriptLang:x.JS,[O.required]],alarmDetailsBuildJs:[e?e.alarmDetailsBuildJs:null,[]],alarmDetailsBuildTbel:[e?e.alarmDetailsBuildTbel:null,[]],alarmType:[e?e.alarmType:null,[O.required]]})}validatorTriggers(){return["scriptLang"]}updateValidators(e){let t=this.clearAlarmConfigForm.get("scriptLang").value;t!==x.TBEL||this.tbelEnabled||(t=x.JS,this.clearAlarmConfigForm.get("scriptLang").patchValue(t,{emitEvent:!1}),setTimeout((()=>{this.clearAlarmConfigForm.updateValueAndValidity({emitEvent:!0})}))),this.clearAlarmConfigForm.get("alarmDetailsBuildJs").setValidators(t===x.JS?[O.required]:[]),this.clearAlarmConfigForm.get("alarmDetailsBuildJs").updateValueAndValidity({emitEvent:e}),this.clearAlarmConfigForm.get("alarmDetailsBuildTbel").setValidators(t===x.TBEL?[O.required]:[]),this.clearAlarmConfigForm.get("alarmDetailsBuildTbel").updateValueAndValidity({emitEvent:e})}prepareInputConfig(e){return e&&(e.scriptLang||(e.scriptLang=x.JS)),e}testScript(e){const t=this.clearAlarmConfigForm.get("scriptLang").value,n=t===x.JS?"alarmDetailsBuildJs":"alarmDetailsBuildTbel",r=t===x.JS?"rulenode/clear_alarm_node_script_fn":"rulenode/tbel/clear_alarm_node_script_fn",o=this.clearAlarmConfigForm.get(n).value;this.nodeScriptTestService.testNodeScript(o,"json",this.translate.instant("tb.rulenode.details"),"Details",["msg","metadata","msgType"],this.ruleNodeId,r,t,e).subscribe((e=>{e&&(this.clearAlarmConfigForm.get(n).setValue(e),this.changeScript.emit())}))}onValidate(){this.clearAlarmConfigForm.get("scriptLang").value===x.JS&&this.jsFuncComponent.validateOnSubmit()}}e("ClearAlarmConfigComponent",ft),ft.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:ft,deps:[{token:P.Store},{token:R.UntypedFormBuilder},{token:oe.NodeScriptTestService},{token:Z.TranslateService}],target:t.ɵɵFactoryTarget.Component}),ft.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:ft,selector:"tb-action-node-clear-alarm-config",viewQueries:[{propertyName:"jsFuncComponent",first:!0,predicate:["jsFuncComponent"],descendants:!0},{propertyName:"tbelFuncComponent",first:!0,predicate:["tbelFuncComponent"],descendants:!0}],usesInheritance:!0,ngImport:t,template:'<section [formGroup]="clearAlarmConfigForm" fxLayout="column">\n  <tb-script-lang formControlName="scriptLang" *ngIf="tbelEnabled"></tb-script-lang>\n  <tb-js-func *ngIf="clearAlarmConfigForm.get(\'scriptLang\').value === scriptLanguage.JS"\n              #jsFuncComponent\n              formControlName="alarmDetailsBuildJs"\n              functionName="Details"\n              [functionArgs]="[\'msg\', \'metadata\', \'msgType\']"\n              helpId="rulenode/clear_alarm_node_script_fn"\n              noValidate="true">\n    <button toolbarSuffixButton\n            mat-icon-button\n            matTooltip="{{ testScriptLabel | translate }}"\n            matTooltipPosition="above"\n            class="tb-mat-32"\n            (click)="testScript()">\n      <mat-icon class="material-icons" color="primary">bug_report</mat-icon>\n    </button>\n  </tb-js-func>\n  <tb-js-func *ngIf="clearAlarmConfigForm.get(\'scriptLang\').value === scriptLanguage.TBEL"\n              #tbelFuncComponent\n              formControlName="alarmDetailsBuildTbel"\n              functionName="Details"\n              [functionArgs]="[\'msg\', \'metadata\', \'msgType\']"\n              [disableUndefinedCheck]="true"\n              [scriptLanguage]="scriptLanguage.TBEL"\n              helpId="rulenode/tbel/clear_alarm_node_script_fn"\n              noValidate="true">\n    <button toolbarSuffixButton\n            mat-icon-button\n            matTooltip="{{ testScriptLabel | translate }}"\n            matTooltipPosition="above"\n            class="tb-mat-32"\n            (click)="testScript()">\n      <mat-icon class="material-icons" color="primary">bug_report</mat-icon>\n    </button>\n  </tb-js-func>\n  <div fxLayout="row" style="padding-bottom: 16px;">\n    <button mat-button mat-raised-button color="primary" (click)="testScript()">\n      {{ testScriptLabel | translate }}\n    </button>\n  </div>\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.alarm-type</mat-label>\n    <input required matInput formControlName="alarmType">\n    <mat-error *ngIf="clearAlarmConfigForm.get(\'alarmType\').hasError(\'required\')">\n      {{ \'tb.rulenode.alarm-type-required\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n  </mat-form-field>\n</section>\n',dependencies:[{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:pe.JsFuncComponent,selector:"tb-js-func",inputs:["functionTitle","functionName","functionArgs","validationArgs","resultType","disabled","fillHeight","minHeight","editorCompleter","globalVariables","disableUndefinedCheck","helpId","scriptLanguage","noValidate","required"]},{kind:"component",type:de.MatButton,selector:"    button[mat-button], button[mat-raised-button], button[mat-flat-button],    button[mat-stroked-button]  ",inputs:["disabled","disableRipple","color"],exportAs:["matButton"]},{kind:"component",type:de.MatIconButton,selector:"button[mat-icon-button]",inputs:["disabled","disableRipple","color"],exportAs:["matButton"]},{kind:"component",type:ue.MatIcon,selector:"mat-icon",inputs:["color","inline","svgIcon","fontSet","fontIcon"],exportAs:["matIcon"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatHint,selector:"mat-hint",inputs:["align","id"]},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"directive",type:ce.MatTooltip,selector:"[matTooltip]",exportAs:["matTooltip"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"component",type:fe.TbScriptLangComponent,selector:"tb-script-lang",inputs:["disabled"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:ft,decorators:[{type:n,args:[{selector:"tb-action-node-clear-alarm-config",template:'<section [formGroup]="clearAlarmConfigForm" fxLayout="column">\n  <tb-script-lang formControlName="scriptLang" *ngIf="tbelEnabled"></tb-script-lang>\n  <tb-js-func *ngIf="clearAlarmConfigForm.get(\'scriptLang\').value === scriptLanguage.JS"\n              #jsFuncComponent\n              formControlName="alarmDetailsBuildJs"\n              functionName="Details"\n              [functionArgs]="[\'msg\', \'metadata\', \'msgType\']"\n              helpId="rulenode/clear_alarm_node_script_fn"\n              noValidate="true">\n    <button toolbarSuffixButton\n            mat-icon-button\n            matTooltip="{{ testScriptLabel | translate }}"\n            matTooltipPosition="above"\n            class="tb-mat-32"\n            (click)="testScript()">\n      <mat-icon class="material-icons" color="primary">bug_report</mat-icon>\n    </button>\n  </tb-js-func>\n  <tb-js-func *ngIf="clearAlarmConfigForm.get(\'scriptLang\').value === scriptLanguage.TBEL"\n              #tbelFuncComponent\n              formControlName="alarmDetailsBuildTbel"\n              functionName="Details"\n              [functionArgs]="[\'msg\', \'metadata\', \'msgType\']"\n              [disableUndefinedCheck]="true"\n              [scriptLanguage]="scriptLanguage.TBEL"\n              helpId="rulenode/tbel/clear_alarm_node_script_fn"\n              noValidate="true">\n    <button toolbarSuffixButton\n            mat-icon-button\n            matTooltip="{{ testScriptLabel | translate }}"\n            matTooltipPosition="above"\n            class="tb-mat-32"\n            (click)="testScript()">\n      <mat-icon class="material-icons" color="primary">bug_report</mat-icon>\n    </button>\n  </tb-js-func>\n  <div fxLayout="row" style="padding-bottom: 16px;">\n    <button mat-button mat-raised-button color="primary" (click)="testScript()">\n      {{ testScriptLabel | translate }}\n    </button>\n  </div>\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.alarm-type</mat-label>\n    <input required matInput formControlName="alarmType">\n    <mat-error *ngIf="clearAlarmConfigForm.get(\'alarmType\').hasError(\'required\')">\n      {{ \'tb.rulenode.alarm-type-required\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n  </mat-form-field>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder},{type:oe.NodeScriptTestService},{type:Z.TranslateService}]},propDecorators:{jsFuncComponent:[{type:o,args:["jsFuncComponent",{static:!1}]}],tbelFuncComponent:[{type:o,args:["tbelFuncComponent",{static:!1}]}]}});class gt extends f{constructor(e,t,n,o){super(e),this.store=e,this.fb=t,this.nodeScriptTestService=n,this.translate=o,this.alarmSeverities=Object.keys(b),this.alarmSeverityTranslationMap=h,this.separatorKeysCodes=[ge,ye,xe],this.tbelEnabled=re(this.store).tbelEnabled,this.scriptLanguage=x,this.changeScript=new r,this.hasScript=!0,this.testScriptLabel="tb.rulenode.test-details-function"}configForm(){return this.createAlarmConfigForm}onConfigurationSet(e){this.createAlarmConfigForm=this.fb.group({scriptLang:[e?e.scriptLang:x.JS,[O.required]],alarmDetailsBuildJs:[e?e.alarmDetailsBuildJs:null,[]],alarmDetailsBuildTbel:[e?e.alarmDetailsBuildTbel:null,[]],useMessageAlarmData:[!!e&&e.useMessageAlarmData,[]],overwriteAlarmDetails:[!!e&&e.overwriteAlarmDetails,[]],alarmType:[e?e.alarmType:null,[]],severity:[e?e.severity:null,[]],propagate:[!!e&&e.propagate,[]],relationTypes:[e?e.relationTypes:null,[]],propagateToOwner:[!!e&&e.propagateToOwner,[]],propagateToTenant:[!!e&&e.propagateToTenant,[]],dynamicSeverity:!1}),this.createAlarmConfigForm.get("dynamicSeverity").valueChanges.subscribe((e=>{e?this.createAlarmConfigForm.get("severity").patchValue("",{emitEvent:!1}):this.createAlarmConfigForm.get("severity").patchValue(this.alarmSeverities[0],{emitEvent:!1})}))}validatorTriggers(){return["useMessageAlarmData","overwriteAlarmDetails","scriptLang"]}updateValidators(e){const t=this.createAlarmConfigForm.get("useMessageAlarmData").value,n=this.createAlarmConfigForm.get("overwriteAlarmDetails").value;t?(this.createAlarmConfigForm.get("alarmType").setValidators([]),this.createAlarmConfigForm.get("severity").setValidators([])):(this.createAlarmConfigForm.get("alarmType").setValidators([O.required]),this.createAlarmConfigForm.get("severity").setValidators([O.required])),this.createAlarmConfigForm.get("alarmType").updateValueAndValidity({emitEvent:e}),this.createAlarmConfigForm.get("severity").updateValueAndValidity({emitEvent:e});let r=this.createAlarmConfigForm.get("scriptLang").value;r!==x.TBEL||this.tbelEnabled||(r=x.JS,this.createAlarmConfigForm.get("scriptLang").patchValue(r,{emitEvent:!1}),setTimeout((()=>{this.createAlarmConfigForm.updateValueAndValidity({emitEvent:!0})})));const o=!1===t||!0===n;this.createAlarmConfigForm.get("alarmDetailsBuildJs").setValidators(o&&r===x.JS?[O.required]:[]),this.createAlarmConfigForm.get("alarmDetailsBuildTbel").setValidators(o&&r===x.TBEL?[O.required]:[]),this.createAlarmConfigForm.get("alarmDetailsBuildJs").updateValueAndValidity({emitEvent:e}),this.createAlarmConfigForm.get("alarmDetailsBuildTbel").updateValueAndValidity({emitEvent:e})}prepareInputConfig(e){return e&&(e.scriptLang||(e.scriptLang=x.JS)),e}testScript(e){const t=this.createAlarmConfigForm.get("scriptLang").value,n=t===x.JS?"alarmDetailsBuildJs":"alarmDetailsBuildTbel",r=t===x.JS?"rulenode/create_alarm_node_script_fn":"rulenode/tbel/create_alarm_node_script_fn",o=this.createAlarmConfigForm.get(n).value;this.nodeScriptTestService.testNodeScript(o,"json",this.translate.instant("tb.rulenode.details"),"Details",["msg","metadata","msgType"],this.ruleNodeId,r,t,e).subscribe((e=>{e&&(this.createAlarmConfigForm.get(n).setValue(e),this.changeScript.emit())}))}removeKey(e,t){const n=this.createAlarmConfigForm.get(t).value,r=n.indexOf(e);r>=0&&(n.splice(r,1),this.createAlarmConfigForm.get(t).setValue(n,{emitEvent:!0}))}addKey(e,t){const n=e.input;let r=e.value;if((r||"").trim()){r=r.trim();let e=this.createAlarmConfigForm.get(t).value;e&&-1!==e.indexOf(r)||(e||(e=[]),e.push(r),this.createAlarmConfigForm.get(t).setValue(e,{emitEvent:!0}))}n&&(n.value="")}onValidate(){const e=this.createAlarmConfigForm.get("useMessageAlarmData").value,t=this.createAlarmConfigForm.get("overwriteAlarmDetails").value;if(!e||t){this.createAlarmConfigForm.get("scriptLang").value===x.JS&&this.jsFuncComponent.validateOnSubmit()}}}e("CreateAlarmConfigComponent",gt),gt.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:gt,deps:[{token:P.Store},{token:R.UntypedFormBuilder},{token:oe.NodeScriptTestService},{token:Z.TranslateService}],target:t.ɵɵFactoryTarget.Component}),gt.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:gt,selector:"tb-action-node-create-alarm-config",viewQueries:[{propertyName:"jsFuncComponent",first:!0,predicate:["jsFuncComponent"],descendants:!0},{propertyName:"tbelFuncComponent",first:!0,predicate:["tbelFuncComponent"],descendants:!0}],usesInheritance:!0,ngImport:t,template:'<section [formGroup]="createAlarmConfigForm" fxLayout="column">\n  <mat-checkbox formControlName="useMessageAlarmData">\n    {{ \'tb.rulenode.use-message-alarm-data\' | translate }}\n  </mat-checkbox>\n  <mat-checkbox formControlName="overwriteAlarmDetails" *ngIf="createAlarmConfigForm.get(\'useMessageAlarmData\').value === true">\n    {{ \'tb.rulenode.overwrite-alarm-details\' | translate }}\n  </mat-checkbox>\n  <section fxLayout="column" *ngIf="createAlarmConfigForm.get(\'useMessageAlarmData\').value === false ||\n                                    createAlarmConfigForm.get(\'overwriteAlarmDetails\').value === true">\n    <tb-script-lang formControlName="scriptLang" *ngIf="tbelEnabled"></tb-script-lang>\n    <tb-js-func *ngIf="createAlarmConfigForm.get(\'scriptLang\').value === scriptLanguage.JS"\n                #jsFuncComponent\n                formControlName="alarmDetailsBuildJs"\n                functionName="Details"\n                [functionArgs]="[\'msg\', \'metadata\', \'msgType\']"\n                helpId="rulenode/create_alarm_node_script_fn"\n                noValidate="true">\n      <button toolbarSuffixButton\n              mat-icon-button\n              matTooltip="{{ testScriptLabel | translate }}"\n              matTooltipPosition="above"\n              class="tb-mat-32"\n              (click)="testScript()">\n        <mat-icon class="material-icons" color="primary">bug_report</mat-icon>\n      </button>\n    </tb-js-func>\n    <tb-js-func *ngIf="createAlarmConfigForm.get(\'scriptLang\').value === scriptLanguage.TBEL"\n                #tbelFuncComponent\n                formControlName="alarmDetailsBuildTbel"\n                functionName="Details"\n                [functionArgs]="[\'msg\', \'metadata\', \'msgType\']"\n                [disableUndefinedCheck]="true"\n                [scriptLanguage]="scriptLanguage.TBEL"\n                helpId="rulenode/tbel/create_alarm_node_script_fn"\n                noValidate="true">\n      <button toolbarSuffixButton\n              mat-icon-button\n              matTooltip="{{ testScriptLabel | translate }}"\n              matTooltipPosition="above"\n              class="tb-mat-32"\n              (click)="testScript()">\n        <mat-icon class="material-icons" color="primary">bug_report</mat-icon>\n      </button>\n    </tb-js-func>\n    <div fxLayout="row" style="padding-bottom: 16px;">\n      <button mat-button mat-raised-button color="primary" (click)="testScript()">\n        {{ testScriptLabel | translate }}\n      </button>\n    </div>\n  </section>\n  <section fxLayout="column" *ngIf="createAlarmConfigForm.get(\'useMessageAlarmData\').value === false">\n    <mat-form-field fxFlex subscriptSizing="dynamic">\n      <mat-label translate>tb.rulenode.alarm-type</mat-label>\n      <input required matInput formControlName="alarmType">\n      <mat-error *ngIf="createAlarmConfigForm.get(\'alarmType\').hasError(\'required\')">\n        {{ \'tb.rulenode.alarm-type-required\' | translate }}\n      </mat-error>\n      <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n    </mat-form-field>\n    <mat-checkbox formControlName="dynamicSeverity">\n      {{ \'tb.rulenode.use-alarm-severity-pattern\' | translate }}\n    </mat-checkbox>\n    <mat-form-field fxFlex *ngIf="!createAlarmConfigForm.get(\'dynamicSeverity\').value">\n      <mat-label translate>tb.rulenode.alarm-severity</mat-label>\n      <mat-select formControlName="severity" required>\n        <mat-option *ngFor="let severity of alarmSeverities" [value]="severity">\n          {{ alarmSeverityTranslationMap.get(severity) | translate }}\n        </mat-option>\n      </mat-select>\n      <mat-error *ngIf="createAlarmConfigForm.get(\'severity\').hasError(\'required\')">\n        {{ \'tb.rulenode.alarm-severity-required\' | translate }}\n      </mat-error>\n    </mat-form-field>\n    <mat-form-field fxFlex *ngIf="createAlarmConfigForm.get(\'dynamicSeverity\').value" subscriptSizing="dynamic">\n      <mat-label translate>tb.rulenode.alarm-severity-pattern</mat-label>\n      <input matInput formControlName="severity" required>\n      <mat-error *ngIf="createAlarmConfigForm.get(\'severity\').hasError(\'required\')">\n        {{ \'tb.rulenode.alarm-severity-required\' | translate }}\n      </mat-error>\n      <mat-hint [innerHTML]="\'tb.rulenode.alarm-severity-pattern-hint\' | translate | safe: \'html\'"></mat-hint>\n    </mat-form-field>\n    <mat-checkbox formControlName="propagate">\n      {{ \'tb.rulenode.propagate\' | translate }}\n    </mat-checkbox>\n    <section *ngIf="createAlarmConfigForm.get(\'propagate\').value === true">\n      <mat-form-field floatLabel="always" class="mat-block" subscriptSizing="dynamic">\n        <mat-label translate>tb.rulenode.relation-types-list</mat-label>\n        <mat-chip-grid #relationTypesChipList>\n          <mat-chip-row\n            *ngFor="let key of createAlarmConfigForm.get(\'relationTypes\').value;"\n            (removed)="removeKey(key, \'relationTypes\')">\n            {{key}}\n            <mat-icon matChipRemove>close</mat-icon>\n          </mat-chip-row>\n          <input matInput type="text" placeholder="{{\'tb.rulenode.relation-types-list\' | translate}}"\n                 [matChipInputFor]="relationTypesChipList"\n                 [matChipInputSeparatorKeyCodes]="separatorKeysCodes"\n                 (matChipInputTokenEnd)="addKey($event, \'relationTypes\')"\n                 [matChipInputAddOnBlur]="true">\n        </mat-chip-grid>\n        <mat-hint translate>tb.rulenode.relation-types-list-hint</mat-hint>\n      </mat-form-field>\n    </section>\n    <mat-checkbox formControlName="propagateToOwner">\n      {{ \'tb.rulenode.propagate-to-owner\' | translate }}\n    </mat-checkbox>\n    <mat-checkbox formControlName="propagateToTenant">\n      {{ \'tb.rulenode.propagate-to-tenant\' | translate }}\n    </mat-checkbox>\n  </section>\n</section>\n',dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:pe.JsFuncComponent,selector:"tb-js-func",inputs:["functionTitle","functionName","functionArgs","validationArgs","resultType","disabled","fillHeight","minHeight","editorCompleter","globalVariables","disableUndefinedCheck","helpId","scriptLanguage","noValidate","required"]},{kind:"component",type:de.MatButton,selector:"    button[mat-button], button[mat-raised-button], button[mat-flat-button],    button[mat-stroked-button]  ",inputs:["disabled","disableRipple","color"],exportAs:["matButton"]},{kind:"component",type:de.MatIconButton,selector:"button[mat-icon-button]",inputs:["disabled","disableRipple","color"],exportAs:["matButton"]},{kind:"component",type:Q.MatCheckbox,selector:"mat-checkbox",inputs:["disableRipple","color","tabIndex"],exportAs:["matCheckbox"]},{kind:"component",type:ue.MatIcon,selector:"mat-icon",inputs:["color","inline","svgIcon","fontSet","fontIcon"],exportAs:["matIcon"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatHint,selector:"mat-hint",inputs:["align","id"]},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"component",type:X.MatSelect,selector:"mat-select",inputs:["disabled","disableRipple","tabIndex","hideSingleSelectionIndicator"],exportAs:["matSelect"]},{kind:"component",type:ee.MatOption,selector:"mat-option",exportAs:["matOption"]},{kind:"directive",type:ce.MatTooltip,selector:"[matTooltip]",exportAs:["matTooltip"]},{kind:"component",type:be.MatChipGrid,selector:"mat-chip-grid",inputs:["tabIndex","disabled","placeholder","required","value","errorStateMatcher"],outputs:["change","valueChange"]},{kind:"directive",type:be.MatChipInput,selector:"input[matChipInputFor]",inputs:["matChipInputFor","matChipInputAddOnBlur","matChipInputSeparatorKeyCodes","placeholder","id","disabled"],outputs:["matChipInputTokenEnd"],exportAs:["matChipInput","matChipInputFor"]},{kind:"directive",type:be.MatChipRemove,selector:"[matChipRemove]"},{kind:"component",type:be.MatChipRow,selector:"mat-chip-row, [mat-chip-row], mat-basic-chip-row, [mat-basic-chip-row]",inputs:["color","disabled","disableRipple","tabIndex","editable"],outputs:["edited"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:W.DefaultFlexDirective,selector:"  [fxFlex], [fxFlex.xs], [fxFlex.sm], [fxFlex.md],  [fxFlex.lg], [fxFlex.xl], [fxFlex.lt-sm], [fxFlex.lt-md],  [fxFlex.lt-lg], [fxFlex.lt-xl], [fxFlex.gt-xs], [fxFlex.gt-sm],  [fxFlex.gt-md], [fxFlex.gt-lg]",inputs:["fxFlex","fxFlex.xs","fxFlex.sm","fxFlex.md","fxFlex.lg","fxFlex.xl","fxFlex.lt-sm","fxFlex.lt-md","fxFlex.lt-lg","fxFlex.lt-xl","fxFlex.gt-xs","fxFlex.gt-sm","fxFlex.gt-md","fxFlex.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"component",type:fe.TbScriptLangComponent,selector:"tb-script-lang",inputs:["disabled"]},{kind:"pipe",type:he.SafePipe,name:"safe"},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:gt,decorators:[{type:n,args:[{selector:"tb-action-node-create-alarm-config",template:'<section [formGroup]="createAlarmConfigForm" fxLayout="column">\n  <mat-checkbox formControlName="useMessageAlarmData">\n    {{ \'tb.rulenode.use-message-alarm-data\' | translate }}\n  </mat-checkbox>\n  <mat-checkbox formControlName="overwriteAlarmDetails" *ngIf="createAlarmConfigForm.get(\'useMessageAlarmData\').value === true">\n    {{ \'tb.rulenode.overwrite-alarm-details\' | translate }}\n  </mat-checkbox>\n  <section fxLayout="column" *ngIf="createAlarmConfigForm.get(\'useMessageAlarmData\').value === false ||\n                                    createAlarmConfigForm.get(\'overwriteAlarmDetails\').value === true">\n    <tb-script-lang formControlName="scriptLang" *ngIf="tbelEnabled"></tb-script-lang>\n    <tb-js-func *ngIf="createAlarmConfigForm.get(\'scriptLang\').value === scriptLanguage.JS"\n                #jsFuncComponent\n                formControlName="alarmDetailsBuildJs"\n                functionName="Details"\n                [functionArgs]="[\'msg\', \'metadata\', \'msgType\']"\n                helpId="rulenode/create_alarm_node_script_fn"\n                noValidate="true">\n      <button toolbarSuffixButton\n              mat-icon-button\n              matTooltip="{{ testScriptLabel | translate }}"\n              matTooltipPosition="above"\n              class="tb-mat-32"\n              (click)="testScript()">\n        <mat-icon class="material-icons" color="primary">bug_report</mat-icon>\n      </button>\n    </tb-js-func>\n    <tb-js-func *ngIf="createAlarmConfigForm.get(\'scriptLang\').value === scriptLanguage.TBEL"\n                #tbelFuncComponent\n                formControlName="alarmDetailsBuildTbel"\n                functionName="Details"\n                [functionArgs]="[\'msg\', \'metadata\', \'msgType\']"\n                [disableUndefinedCheck]="true"\n                [scriptLanguage]="scriptLanguage.TBEL"\n                helpId="rulenode/tbel/create_alarm_node_script_fn"\n                noValidate="true">\n      <button toolbarSuffixButton\n              mat-icon-button\n              matTooltip="{{ testScriptLabel | translate }}"\n              matTooltipPosition="above"\n              class="tb-mat-32"\n              (click)="testScript()">\n        <mat-icon class="material-icons" color="primary">bug_report</mat-icon>\n      </button>\n    </tb-js-func>\n    <div fxLayout="row" style="padding-bottom: 16px;">\n      <button mat-button mat-raised-button color="primary" (click)="testScript()">\n        {{ testScriptLabel | translate }}\n      </button>\n    </div>\n  </section>\n  <section fxLayout="column" *ngIf="createAlarmConfigForm.get(\'useMessageAlarmData\').value === false">\n    <mat-form-field fxFlex subscriptSizing="dynamic">\n      <mat-label translate>tb.rulenode.alarm-type</mat-label>\n      <input required matInput formControlName="alarmType">\n      <mat-error *ngIf="createAlarmConfigForm.get(\'alarmType\').hasError(\'required\')">\n        {{ \'tb.rulenode.alarm-type-required\' | translate }}\n      </mat-error>\n      <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n    </mat-form-field>\n    <mat-checkbox formControlName="dynamicSeverity">\n      {{ \'tb.rulenode.use-alarm-severity-pattern\' | translate }}\n    </mat-checkbox>\n    <mat-form-field fxFlex *ngIf="!createAlarmConfigForm.get(\'dynamicSeverity\').value">\n      <mat-label translate>tb.rulenode.alarm-severity</mat-label>\n      <mat-select formControlName="severity" required>\n        <mat-option *ngFor="let severity of alarmSeverities" [value]="severity">\n          {{ alarmSeverityTranslationMap.get(severity) | translate }}\n        </mat-option>\n      </mat-select>\n      <mat-error *ngIf="createAlarmConfigForm.get(\'severity\').hasError(\'required\')">\n        {{ \'tb.rulenode.alarm-severity-required\' | translate }}\n      </mat-error>\n    </mat-form-field>\n    <mat-form-field fxFlex *ngIf="createAlarmConfigForm.get(\'dynamicSeverity\').value" subscriptSizing="dynamic">\n      <mat-label translate>tb.rulenode.alarm-severity-pattern</mat-label>\n      <input matInput formControlName="severity" required>\n      <mat-error *ngIf="createAlarmConfigForm.get(\'severity\').hasError(\'required\')">\n        {{ \'tb.rulenode.alarm-severity-required\' | translate }}\n      </mat-error>\n      <mat-hint [innerHTML]="\'tb.rulenode.alarm-severity-pattern-hint\' | translate | safe: \'html\'"></mat-hint>\n    </mat-form-field>\n    <mat-checkbox formControlName="propagate">\n      {{ \'tb.rulenode.propagate\' | translate }}\n    </mat-checkbox>\n    <section *ngIf="createAlarmConfigForm.get(\'propagate\').value === true">\n      <mat-form-field floatLabel="always" class="mat-block" subscriptSizing="dynamic">\n        <mat-label translate>tb.rulenode.relation-types-list</mat-label>\n        <mat-chip-grid #relationTypesChipList>\n          <mat-chip-row\n            *ngFor="let key of createAlarmConfigForm.get(\'relationTypes\').value;"\n            (removed)="removeKey(key, \'relationTypes\')">\n            {{key}}\n            <mat-icon matChipRemove>close</mat-icon>\n          </mat-chip-row>\n          <input matInput type="text" placeholder="{{\'tb.rulenode.relation-types-list\' | translate}}"\n                 [matChipInputFor]="relationTypesChipList"\n                 [matChipInputSeparatorKeyCodes]="separatorKeysCodes"\n                 (matChipInputTokenEnd)="addKey($event, \'relationTypes\')"\n                 [matChipInputAddOnBlur]="true">\n        </mat-chip-grid>\n        <mat-hint translate>tb.rulenode.relation-types-list-hint</mat-hint>\n      </mat-form-field>\n    </section>\n    <mat-checkbox formControlName="propagateToOwner">\n      {{ \'tb.rulenode.propagate-to-owner\' | translate }}\n    </mat-checkbox>\n    <mat-checkbox formControlName="propagateToTenant">\n      {{ \'tb.rulenode.propagate-to-tenant\' | translate }}\n    </mat-checkbox>\n  </section>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder},{type:oe.NodeScriptTestService},{type:Z.TranslateService}]},propDecorators:{jsFuncComponent:[{type:o,args:["jsFuncComponent",{static:!1}]}],tbelFuncComponent:[{type:o,args:["tbelFuncComponent",{static:!1}]}]}});class yt extends f{constructor(e,t){super(e),this.store=e,this.fb=t,this.directionTypes=Object.keys(v),this.directionTypeTranslations=C,this.entityType=F}configForm(){return this.createRelationConfigForm}onConfigurationSet(e){this.createRelationConfigForm=this.fb.group({direction:[e?e.direction:null,[O.required]],entityType:[e?e.entityType:null,[O.required]],entityNamePattern:[e?e.entityNamePattern:null,[]],entityTypePattern:[e?e.entityTypePattern:null,[]],relationType:[e?e.relationType:null,[O.required]],createEntityIfNotExists:[!!e&&e.createEntityIfNotExists,[]],removeCurrentRelations:[!!e&&e.removeCurrentRelations,[]],changeOriginatorToRelatedEntity:[!!e&&e.changeOriginatorToRelatedEntity,[]],entityCacheExpiration:[e?e.entityCacheExpiration:null,[O.required,O.min(0)]]})}validatorTriggers(){return["entityType"]}updateValidators(e){const t=this.createRelationConfigForm.get("entityType").value;t?this.createRelationConfigForm.get("entityNamePattern").setValidators([O.required,O.pattern(/.*\S.*/)]):this.createRelationConfigForm.get("entityNamePattern").setValidators([]),!t||t!==F.DEVICE&&t!==F.ASSET?this.createRelationConfigForm.get("entityTypePattern").setValidators([]):this.createRelationConfigForm.get("entityTypePattern").setValidators([O.required,O.pattern(/.*\S.*/)]),this.createRelationConfigForm.get("entityNamePattern").updateValueAndValidity({emitEvent:e}),this.createRelationConfigForm.get("entityTypePattern").updateValueAndValidity({emitEvent:e})}prepareOutputConfig(e){return e.entityNamePattern=e.entityNamePattern?e.entityNamePattern.trim():null,e.entityTypePattern=e.entityTypePattern?e.entityTypePattern.trim():null,e}}e("CreateRelationConfigComponent",yt),yt.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:yt,deps:[{token:P.Store},{token:R.UntypedFormBuilder}],target:t.ɵɵFactoryTarget.Component}),yt.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:yt,selector:"tb-action-node-create-relation-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="createRelationConfigForm" fxLayout="column">\n  <mat-form-field class="mat-block" style="min-width: 100px;">\n    <mat-label translate>relation.direction</mat-label>\n    <mat-select required matInput formControlName="direction">\n      <mat-option *ngFor="let type of directionTypes" [value]="type">\n        {{ directionTypeTranslations.get(type) | translate }}\n      </mat-option>\n    </mat-select>\n  </mat-form-field>\n  <div fxLayout="row" fxLayoutGap="8px">\n    <tb-entity-type-select\n      showLabel\n      style="min-width: 100px;"\n      required\n      formControlName="entityType">\n    </tb-entity-type-select>\n    <mat-form-field *ngIf="createRelationConfigForm.get(\'entityType\').value" fxFlex class="mat-block" subscriptSizing="dynamic">\n      <mat-label translate>tb.rulenode.entity-name-pattern</mat-label>\n      <input required matInput formControlName="entityNamePattern">\n      <mat-error *ngIf="createRelationConfigForm.get(\'entityNamePattern\').hasError(\'required\') ||\n                        createRelationConfigForm.get(\'entityNamePattern\').hasError(\'pattern\')">\n        {{ \'tb.rulenode.entity-name-pattern-required\' | translate }}\n      </mat-error>\n      <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n    </mat-form-field>\n    <mat-form-field *ngIf="createRelationConfigForm.get(\'entityType\').value === entityType.DEVICE ||\n                           createRelationConfigForm.get(\'entityType\').value === entityType.ASSET"\n                    fxFlex class="mat-block" subscriptSizing="dynamic">\n      <mat-label translate>tb.rulenode.entity-type-pattern</mat-label>\n      <input required matInput formControlName="entityTypePattern">\n      <mat-error *ngIf="createRelationConfigForm.get(\'entityTypePattern\').hasError(\'required\') ||\n                        createRelationConfigForm.get(\'entityTypePattern\').hasError(\'pattern\')">\n        {{ \'tb.rulenode.entity-type-pattern-required\' | translate }}\n      </mat-error>\n      <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n    </mat-form-field>\n  </div>\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.relation-type-pattern</mat-label>\n    <input required matInput formControlName="relationType">\n    <mat-error *ngIf="createRelationConfigForm.get(\'relationType\').hasError(\'required\')">\n      {{ \'tb.rulenode.relation-type-pattern-required\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n  </mat-form-field>\n  <section *ngIf="createRelationConfigForm.get(\'entityType\').value === entityType.CUSTOMER ||\n                  createRelationConfigForm.get(\'entityType\').value === entityType.DEVICE ||\n                  createRelationConfigForm.get(\'entityType\').value === entityType.ASSET">\n    <mat-checkbox formControlName="createEntityIfNotExists">\n      {{ \'tb.rulenode.create-entity-if-not-exists\' | translate }}\n    </mat-checkbox>\n    <div class="tb-hint" translate>tb.rulenode.create-entity-if-not-exists-hint</div>\n  </section>\n  <mat-checkbox formControlName="removeCurrentRelations">\n    {{ \'tb.rulenode.remove-current-relations\' | translate }}\n  </mat-checkbox>\n  <div class="tb-hint" translate>tb.rulenode.remove-current-relations-hint</div>\n  <mat-checkbox formControlName="changeOriginatorToRelatedEntity">\n    {{ \'tb.rulenode.change-originator-to-related-entity\' | translate }}\n  </mat-checkbox>\n  <div class="tb-hint" translate>tb.rulenode.change-originator-to-related-entity-hint</div>\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.entity-cache-expiration</mat-label>\n    <input required type="number" min="0" step="1" matInput formControlName="entityCacheExpiration">\n    <mat-error *ngIf="createRelationConfigForm.get(\'entityCacheExpiration\').hasError(\'required\')">\n      {{ \'tb.rulenode.entity-cache-expiration-required\' | translate }}\n    </mat-error>\n    <mat-error *ngIf="createRelationConfigForm.get(\'entityCacheExpiration\').hasError(\'min\')">\n      {{ \'tb.rulenode.entity-cache-expiration-range\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.entity-cache-expiration-hint</mat-hint>\n  </mat-form-field>\n</section>\n',dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:ve.EntityTypeSelectComponent,selector:"tb-entity-type-select",inputs:["allowedEntityTypes","useAliasEntityTypes","filterAllowedEntityTypes","showLabel","required","disabled"]},{kind:"component",type:Q.MatCheckbox,selector:"mat-checkbox",inputs:["disableRipple","color","tabIndex"],exportAs:["matCheckbox"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatHint,selector:"mat-hint",inputs:["align","id"]},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"component",type:X.MatSelect,selector:"mat-select",inputs:["disabled","disableRipple","tabIndex","hideSingleSelectionIndicator"],exportAs:["matSelect"]},{kind:"component",type:ee.MatOption,selector:"mat-option",exportAs:["matOption"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:W.DefaultLayoutGapDirective,selector:"  [fxLayoutGap], [fxLayoutGap.xs], [fxLayoutGap.sm], [fxLayoutGap.md],  [fxLayoutGap.lg], [fxLayoutGap.xl], [fxLayoutGap.lt-sm], [fxLayoutGap.lt-md],  [fxLayoutGap.lt-lg], [fxLayoutGap.lt-xl], [fxLayoutGap.gt-xs], [fxLayoutGap.gt-sm],  [fxLayoutGap.gt-md], [fxLayoutGap.gt-lg]",inputs:["fxLayoutGap","fxLayoutGap.xs","fxLayoutGap.sm","fxLayoutGap.md","fxLayoutGap.lg","fxLayoutGap.xl","fxLayoutGap.lt-sm","fxLayoutGap.lt-md","fxLayoutGap.lt-lg","fxLayoutGap.lt-xl","fxLayoutGap.gt-xs","fxLayoutGap.gt-sm","fxLayoutGap.gt-md","fxLayoutGap.gt-lg"]},{kind:"directive",type:W.DefaultFlexDirective,selector:"  [fxFlex], [fxFlex.xs], [fxFlex.sm], [fxFlex.md],  [fxFlex.lg], [fxFlex.xl], [fxFlex.lt-sm], [fxFlex.lt-md],  [fxFlex.lt-lg], [fxFlex.lt-xl], [fxFlex.gt-xs], [fxFlex.gt-sm],  [fxFlex.gt-md], [fxFlex.gt-lg]",inputs:["fxFlex","fxFlex.xs","fxFlex.sm","fxFlex.md","fxFlex.lg","fxFlex.xl","fxFlex.lt-sm","fxFlex.lt-md","fxFlex.lt-lg","fxFlex.lt-xl","fxFlex.gt-xs","fxFlex.gt-sm","fxFlex.gt-md","fxFlex.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NumberValueAccessor,selector:"input[type=number][formControlName],input[type=number][formControl],input[type=number][ngModel]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.MinValidator,selector:"input[type=number][min][formControlName],input[type=number][min][formControl],input[type=number][min][ngModel]",inputs:["min"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:yt,decorators:[{type:n,args:[{selector:"tb-action-node-create-relation-config",template:'<section [formGroup]="createRelationConfigForm" fxLayout="column">\n  <mat-form-field class="mat-block" style="min-width: 100px;">\n    <mat-label translate>relation.direction</mat-label>\n    <mat-select required matInput formControlName="direction">\n      <mat-option *ngFor="let type of directionTypes" [value]="type">\n        {{ directionTypeTranslations.get(type) | translate }}\n      </mat-option>\n    </mat-select>\n  </mat-form-field>\n  <div fxLayout="row" fxLayoutGap="8px">\n    <tb-entity-type-select\n      showLabel\n      style="min-width: 100px;"\n      required\n      formControlName="entityType">\n    </tb-entity-type-select>\n    <mat-form-field *ngIf="createRelationConfigForm.get(\'entityType\').value" fxFlex class="mat-block" subscriptSizing="dynamic">\n      <mat-label translate>tb.rulenode.entity-name-pattern</mat-label>\n      <input required matInput formControlName="entityNamePattern">\n      <mat-error *ngIf="createRelationConfigForm.get(\'entityNamePattern\').hasError(\'required\') ||\n                        createRelationConfigForm.get(\'entityNamePattern\').hasError(\'pattern\')">\n        {{ \'tb.rulenode.entity-name-pattern-required\' | translate }}\n      </mat-error>\n      <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n    </mat-form-field>\n    <mat-form-field *ngIf="createRelationConfigForm.get(\'entityType\').value === entityType.DEVICE ||\n                           createRelationConfigForm.get(\'entityType\').value === entityType.ASSET"\n                    fxFlex class="mat-block" subscriptSizing="dynamic">\n      <mat-label translate>tb.rulenode.entity-type-pattern</mat-label>\n      <input required matInput formControlName="entityTypePattern">\n      <mat-error *ngIf="createRelationConfigForm.get(\'entityTypePattern\').hasError(\'required\') ||\n                        createRelationConfigForm.get(\'entityTypePattern\').hasError(\'pattern\')">\n        {{ \'tb.rulenode.entity-type-pattern-required\' | translate }}\n      </mat-error>\n      <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n    </mat-form-field>\n  </div>\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.relation-type-pattern</mat-label>\n    <input required matInput formControlName="relationType">\n    <mat-error *ngIf="createRelationConfigForm.get(\'relationType\').hasError(\'required\')">\n      {{ \'tb.rulenode.relation-type-pattern-required\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n  </mat-form-field>\n  <section *ngIf="createRelationConfigForm.get(\'entityType\').value === entityType.CUSTOMER ||\n                  createRelationConfigForm.get(\'entityType\').value === entityType.DEVICE ||\n                  createRelationConfigForm.get(\'entityType\').value === entityType.ASSET">\n    <mat-checkbox formControlName="createEntityIfNotExists">\n      {{ \'tb.rulenode.create-entity-if-not-exists\' | translate }}\n    </mat-checkbox>\n    <div class="tb-hint" translate>tb.rulenode.create-entity-if-not-exists-hint</div>\n  </section>\n  <mat-checkbox formControlName="removeCurrentRelations">\n    {{ \'tb.rulenode.remove-current-relations\' | translate }}\n  </mat-checkbox>\n  <div class="tb-hint" translate>tb.rulenode.remove-current-relations-hint</div>\n  <mat-checkbox formControlName="changeOriginatorToRelatedEntity">\n    {{ \'tb.rulenode.change-originator-to-related-entity\' | translate }}\n  </mat-checkbox>\n  <div class="tb-hint" translate>tb.rulenode.change-originator-to-related-entity-hint</div>\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.entity-cache-expiration</mat-label>\n    <input required type="number" min="0" step="1" matInput formControlName="entityCacheExpiration">\n    <mat-error *ngIf="createRelationConfigForm.get(\'entityCacheExpiration\').hasError(\'required\')">\n      {{ \'tb.rulenode.entity-cache-expiration-required\' | translate }}\n    </mat-error>\n    <mat-error *ngIf="createRelationConfigForm.get(\'entityCacheExpiration\').hasError(\'min\')">\n      {{ \'tb.rulenode.entity-cache-expiration-range\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.entity-cache-expiration-hint</mat-hint>\n  </mat-form-field>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder}]}});class xt extends f{constructor(e,t){super(e),this.store=e,this.fb=t,this.directionTypes=Object.keys(v),this.directionTypeTranslations=C,this.entityType=F}configForm(){return this.deleteRelationConfigForm}onConfigurationSet(e){this.deleteRelationConfigForm=this.fb.group({deleteForSingleEntity:[!!e&&e.deleteForSingleEntity,[]],direction:[e?e.direction:null,[O.required]],entityType:[e?e.entityType:null,[]],entityNamePattern:[e?e.entityNamePattern:null,[]],relationType:[e?e.relationType:null,[O.required]],entityCacheExpiration:[e?e.entityCacheExpiration:null,[O.required,O.min(0)]]})}validatorTriggers(){return["deleteForSingleEntity","entityType"]}updateValidators(e){const t=this.deleteRelationConfigForm.get("deleteForSingleEntity").value,n=this.deleteRelationConfigForm.get("entityType").value;t?this.deleteRelationConfigForm.get("entityType").setValidators([O.required]):this.deleteRelationConfigForm.get("entityType").setValidators([]),t&&n?this.deleteRelationConfigForm.get("entityNamePattern").setValidators([O.required,O.pattern(/.*\S.*/)]):this.deleteRelationConfigForm.get("entityNamePattern").setValidators([]),this.deleteRelationConfigForm.get("entityType").updateValueAndValidity({emitEvent:!1}),this.deleteRelationConfigForm.get("entityNamePattern").updateValueAndValidity({emitEvent:e})}prepareOutputConfig(e){return e.entityNamePattern=e.entityNamePattern?e.entityNamePattern.trim():null,e}}e("DeleteRelationConfigComponent",xt),xt.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:xt,deps:[{token:P.Store},{token:R.UntypedFormBuilder}],target:t.ɵɵFactoryTarget.Component}),xt.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:xt,selector:"tb-action-node-delete-relation-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="deleteRelationConfigForm" fxLayout="column">\n  <mat-checkbox formControlName="deleteForSingleEntity">\n    {{ \'tb.rulenode.delete-relation-to-specific-entity\' | translate }}\n  </mat-checkbox>\n  <div class="tb-hint" style="padding-bottom: 16px;" translate>tb.rulenode.delete-relation-hint</div>\n  <mat-form-field class="mat-block" style="min-width: 100px;">\n    <mat-label translate>relation.direction</mat-label>\n    <mat-select required matInput formControlName="direction">\n      <mat-option *ngFor="let type of directionTypes" [value]="type">\n        {{ directionTypeTranslations.get(type) | translate }}\n      </mat-option>\n    </mat-select>\n  </mat-form-field>\n  <div *ngIf="deleteRelationConfigForm.get(\'deleteForSingleEntity\').value" fxLayout="row" fxLayoutGap="8px">\n    <tb-entity-type-select\n      showLabel\n      style="min-width: 100px;"\n      required\n      formControlName="entityType">\n    </tb-entity-type-select>\n    <mat-form-field *ngIf="deleteRelationConfigForm.get(\'entityType\').value" fxFlex class="mat-block" subscriptSizing="dynamic">\n      <mat-label translate>tb.rulenode.entity-name-pattern</mat-label>\n      <input required matInput formControlName="entityNamePattern">\n      <mat-error *ngIf="deleteRelationConfigForm.get(\'entityNamePattern\').hasError(\'required\') ||\n                        deleteRelationConfigForm.get(\'entityNamePattern\').hasError(\'pattern\')">\n        {{ \'tb.rulenode.entity-name-pattern-required\' | translate }}\n      </mat-error>\n      <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n    </mat-form-field>\n  </div>\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.relation-type-pattern</mat-label>\n    <input required matInput formControlName="relationType">\n    <mat-error *ngIf="deleteRelationConfigForm.get(\'relationType\').hasError(\'required\')">\n      {{ \'tb.rulenode.relation-type-pattern-required\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n  </mat-form-field>\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.entity-cache-expiration</mat-label>\n    <input required type="number" min="0" step="1" matInput formControlName="entityCacheExpiration">\n    <mat-error *ngIf="deleteRelationConfigForm.get(\'entityCacheExpiration\').hasError(\'required\')">\n      {{ \'tb.rulenode.entity-cache-expiration-required\' | translate }}\n    </mat-error>\n    <mat-error *ngIf="deleteRelationConfigForm.get(\'entityCacheExpiration\').hasError(\'min\')">\n      {{ \'tb.rulenode.entity-cache-expiration-range\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.entity-cache-expiration-hint</mat-hint>\n  </mat-form-field>\n</section>\n',dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:ve.EntityTypeSelectComponent,selector:"tb-entity-type-select",inputs:["allowedEntityTypes","useAliasEntityTypes","filterAllowedEntityTypes","showLabel","required","disabled"]},{kind:"component",type:Q.MatCheckbox,selector:"mat-checkbox",inputs:["disableRipple","color","tabIndex"],exportAs:["matCheckbox"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatHint,selector:"mat-hint",inputs:["align","id"]},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"component",type:X.MatSelect,selector:"mat-select",inputs:["disabled","disableRipple","tabIndex","hideSingleSelectionIndicator"],exportAs:["matSelect"]},{kind:"component",type:ee.MatOption,selector:"mat-option",exportAs:["matOption"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:W.DefaultLayoutGapDirective,selector:"  [fxLayoutGap], [fxLayoutGap.xs], [fxLayoutGap.sm], [fxLayoutGap.md],  [fxLayoutGap.lg], [fxLayoutGap.xl], [fxLayoutGap.lt-sm], [fxLayoutGap.lt-md],  [fxLayoutGap.lt-lg], [fxLayoutGap.lt-xl], [fxLayoutGap.gt-xs], [fxLayoutGap.gt-sm],  [fxLayoutGap.gt-md], [fxLayoutGap.gt-lg]",inputs:["fxLayoutGap","fxLayoutGap.xs","fxLayoutGap.sm","fxLayoutGap.md","fxLayoutGap.lg","fxLayoutGap.xl","fxLayoutGap.lt-sm","fxLayoutGap.lt-md","fxLayoutGap.lt-lg","fxLayoutGap.lt-xl","fxLayoutGap.gt-xs","fxLayoutGap.gt-sm","fxLayoutGap.gt-md","fxLayoutGap.gt-lg"]},{kind:"directive",type:W.DefaultFlexDirective,selector:"  [fxFlex], [fxFlex.xs], [fxFlex.sm], [fxFlex.md],  [fxFlex.lg], [fxFlex.xl], [fxFlex.lt-sm], [fxFlex.lt-md],  [fxFlex.lt-lg], [fxFlex.lt-xl], [fxFlex.gt-xs], [fxFlex.gt-sm],  [fxFlex.gt-md], [fxFlex.gt-lg]",inputs:["fxFlex","fxFlex.xs","fxFlex.sm","fxFlex.md","fxFlex.lg","fxFlex.xl","fxFlex.lt-sm","fxFlex.lt-md","fxFlex.lt-lg","fxFlex.lt-xl","fxFlex.gt-xs","fxFlex.gt-sm","fxFlex.gt-md","fxFlex.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NumberValueAccessor,selector:"input[type=number][formControlName],input[type=number][formControl],input[type=number][ngModel]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.MinValidator,selector:"input[type=number][min][formControlName],input[type=number][min][formControl],input[type=number][min][ngModel]",inputs:["min"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:xt,decorators:[{type:n,args:[{selector:"tb-action-node-delete-relation-config",template:'<section [formGroup]="deleteRelationConfigForm" fxLayout="column">\n  <mat-checkbox formControlName="deleteForSingleEntity">\n    {{ \'tb.rulenode.delete-relation-to-specific-entity\' | translate }}\n  </mat-checkbox>\n  <div class="tb-hint" style="padding-bottom: 16px;" translate>tb.rulenode.delete-relation-hint</div>\n  <mat-form-field class="mat-block" style="min-width: 100px;">\n    <mat-label translate>relation.direction</mat-label>\n    <mat-select required matInput formControlName="direction">\n      <mat-option *ngFor="let type of directionTypes" [value]="type">\n        {{ directionTypeTranslations.get(type) | translate }}\n      </mat-option>\n    </mat-select>\n  </mat-form-field>\n  <div *ngIf="deleteRelationConfigForm.get(\'deleteForSingleEntity\').value" fxLayout="row" fxLayoutGap="8px">\n    <tb-entity-type-select\n      showLabel\n      style="min-width: 100px;"\n      required\n      formControlName="entityType">\n    </tb-entity-type-select>\n    <mat-form-field *ngIf="deleteRelationConfigForm.get(\'entityType\').value" fxFlex class="mat-block" subscriptSizing="dynamic">\n      <mat-label translate>tb.rulenode.entity-name-pattern</mat-label>\n      <input required matInput formControlName="entityNamePattern">\n      <mat-error *ngIf="deleteRelationConfigForm.get(\'entityNamePattern\').hasError(\'required\') ||\n                        deleteRelationConfigForm.get(\'entityNamePattern\').hasError(\'pattern\')">\n        {{ \'tb.rulenode.entity-name-pattern-required\' | translate }}\n      </mat-error>\n      <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n    </mat-form-field>\n  </div>\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.relation-type-pattern</mat-label>\n    <input required matInput formControlName="relationType">\n    <mat-error *ngIf="deleteRelationConfigForm.get(\'relationType\').hasError(\'required\')">\n      {{ \'tb.rulenode.relation-type-pattern-required\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n  </mat-form-field>\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.entity-cache-expiration</mat-label>\n    <input required type="number" min="0" step="1" matInput formControlName="entityCacheExpiration">\n    <mat-error *ngIf="deleteRelationConfigForm.get(\'entityCacheExpiration\').hasError(\'required\')">\n      {{ \'tb.rulenode.entity-cache-expiration-required\' | translate }}\n    </mat-error>\n    <mat-error *ngIf="deleteRelationConfigForm.get(\'entityCacheExpiration\').hasError(\'min\')">\n      {{ \'tb.rulenode.entity-cache-expiration-range\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.entity-cache-expiration-hint</mat-hint>\n  </mat-form-field>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder}]}});class bt extends f{constructor(e,t){super(e),this.store=e,this.fb=t}configForm(){return this.deviceProfile}onConfigurationSet(e){this.deviceProfile=this.fb.group({persistAlarmRulesState:[!!e&&e.persistAlarmRulesState,O.required],fetchAlarmRulesStateOnStart:[!!e&&e.fetchAlarmRulesStateOnStart,O.required]})}}e("DeviceProfileConfigComponent",bt),bt.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:bt,deps:[{token:P.Store},{token:R.UntypedFormBuilder}],target:t.ɵɵFactoryTarget.Component}),bt.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:bt,selector:"tb-device-profile-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="deviceProfile" fxLayout="column">\n  <mat-checkbox fxFlex formControlName="persistAlarmRulesState">\n    {{ \'tb.rulenode.persist-alarm-rules\' | translate }}\n  </mat-checkbox>\n  <mat-checkbox fxFlex formControlName="fetchAlarmRulesStateOnStart">\n    {{ \'tb.rulenode.fetch-alarm-rules\' | translate }}\n  </mat-checkbox>\n</section>\n',dependencies:[{kind:"component",type:Q.MatCheckbox,selector:"mat-checkbox",inputs:["disableRipple","color","tabIndex"],exportAs:["matCheckbox"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:W.DefaultFlexDirective,selector:"  [fxFlex], [fxFlex.xs], [fxFlex.sm], [fxFlex.md],  [fxFlex.lg], [fxFlex.xl], [fxFlex.lt-sm], [fxFlex.lt-md],  [fxFlex.lt-lg], [fxFlex.lt-xl], [fxFlex.gt-xs], [fxFlex.gt-sm],  [fxFlex.gt-md], [fxFlex.gt-lg]",inputs:["fxFlex","fxFlex.xs","fxFlex.sm","fxFlex.md","fxFlex.lg","fxFlex.xl","fxFlex.lt-sm","fxFlex.lt-md","fxFlex.lt-lg","fxFlex.lt-xl","fxFlex.gt-xs","fxFlex.gt-sm","fxFlex.gt-md","fxFlex.gt-lg"]},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:bt,decorators:[{type:n,args:[{selector:"tb-device-profile-config",template:'<section [formGroup]="deviceProfile" fxLayout="column">\n  <mat-checkbox fxFlex formControlName="persistAlarmRulesState">\n    {{ \'tb.rulenode.persist-alarm-rules\' | translate }}\n  </mat-checkbox>\n  <mat-checkbox fxFlex formControlName="fetchAlarmRulesStateOnStart">\n    {{ \'tb.rulenode.fetch-alarm-rules\' | translate }}\n  </mat-checkbox>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder}]}});class ht extends f{constructor(e,t,n,o){super(e),this.store=e,this.fb=t,this.nodeScriptTestService=n,this.translate=o,this.tbelEnabled=re(this.store).tbelEnabled,this.scriptLanguage=x,this.changeScript=new r,this.hasScript=!0,this.testScriptLabel="tb.rulenode.test-generator-function"}configForm(){return this.generatorConfigForm}onConfigurationSet(e){this.generatorConfigForm=this.fb.group({msgCount:[e?e.msgCount:null,[O.required,O.min(0)]],periodInSeconds:[e?e.periodInSeconds:null,[O.required,O.min(1)]],originator:[e?e.originator:null,[]],scriptLang:[e?e.scriptLang:x.JS,[O.required]],jsScript:[e?e.jsScript:null,[]],tbelScript:[e?e.tbelScript:null,[]]})}validatorTriggers(){return["scriptLang"]}updateValidators(e){let t=this.generatorConfigForm.get("scriptLang").value;t!==x.TBEL||this.tbelEnabled||(t=x.JS,this.generatorConfigForm.get("scriptLang").patchValue(t,{emitEvent:!1}),setTimeout((()=>{this.generatorConfigForm.updateValueAndValidity({emitEvent:!0})}))),this.generatorConfigForm.get("jsScript").setValidators(t===x.JS?[O.required]:[]),this.generatorConfigForm.get("jsScript").updateValueAndValidity({emitEvent:e}),this.generatorConfigForm.get("tbelScript").setValidators(t===x.TBEL?[O.required]:[]),this.generatorConfigForm.get("tbelScript").updateValueAndValidity({emitEvent:e})}prepareInputConfig(e){return e&&(e.scriptLang||(e.scriptLang=x.JS),e.originatorId&&e.originatorType?e.originator={id:e.originatorId,entityType:e.originatorType}:e.originator=null,delete e.originatorId,delete e.originatorType),e}prepareOutputConfig(e){return e.originator?(e.originatorId=e.originator.id,e.originatorType=e.originator.entityType):(e.originatorId=null,e.originatorType=null),delete e.originator,e}testScript(e){const t=this.generatorConfigForm.get("scriptLang").value,n=t===x.JS?"jsScript":"tbelScript",r=t===x.JS?"rulenode/generator_node_script_fn":"rulenode/tbel/generator_node_script_fn",o=this.generatorConfigForm.get(n).value;this.nodeScriptTestService.testNodeScript(o,"generate",this.translate.instant("tb.rulenode.generator"),"Generate",["prevMsg","prevMetadata","prevMsgType"],this.ruleNodeId,r,t,e).subscribe((e=>{e&&(this.generatorConfigForm.get(n).setValue(e),this.changeScript.emit())}))}onValidate(){this.generatorConfigForm.get("scriptLang").value===x.JS&&this.jsFuncComponent.validateOnSubmit()}}var vt;e("GeneratorConfigComponent",ht),ht.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:ht,deps:[{token:P.Store},{token:R.UntypedFormBuilder},{token:oe.NodeScriptTestService},{token:Z.TranslateService}],target:t.ɵɵFactoryTarget.Component}),ht.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:ht,selector:"tb-action-node-generator-config",viewQueries:[{propertyName:"jsFuncComponent",first:!0,predicate:["jsFuncComponent"],descendants:!0},{propertyName:"tbelFuncComponent",first:!0,predicate:["tbelFuncComponent"],descendants:!0}],usesInheritance:!0,ngImport:t,template:'<section [formGroup]="generatorConfigForm" fxLayout="column">\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.message-count</mat-label>\n    <input required type="number" min="0" step="1" matInput formControlName="msgCount">\n    <mat-error *ngIf="generatorConfigForm.get(\'msgCount\').hasError(\'required\')">\n      {{ \'tb.rulenode.message-count-required\' | translate }}\n    </mat-error>\n    <mat-error *ngIf="generatorConfigForm.get(\'msgCount\').hasError(\'min\')">\n      {{ \'tb.rulenode.min-message-count-message\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.period-seconds</mat-label>\n    <input required type="number" min="1" step="1" matInput formControlName="periodInSeconds">\n    <mat-error *ngIf="generatorConfigForm.get(\'periodInSeconds\').hasError(\'required\')">\n      {{ \'tb.rulenode.period-seconds-required\' | translate }}\n    </mat-error>\n    <mat-error *ngIf="generatorConfigForm.get(\'periodInSeconds\').hasError(\'min\')">\n      {{ \'tb.rulenode.min-period-seconds-message\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <div fxLayout="column">\n    <label class="tb-small">{{ \'tb.rulenode.originator\' | translate }}</label>\n    <tb-entity-select\n      required="false"\n      formControlName="originator">\n    </tb-entity-select>\n  </div>\n\n  <tb-script-lang formControlName="scriptLang" *ngIf="tbelEnabled"></tb-script-lang>\n  <tb-js-func *ngIf="generatorConfigForm.get(\'scriptLang\').value === scriptLanguage.JS"\n              #jsFuncComponent\n              formControlName="jsScript"\n              functionName="Generate"\n              [functionArgs]="[\'prevMsg\', \'prevMetadata\', \'prevMsgType\']"\n              helpId="rulenode/generator_node_script_fn"\n              noValidate="true">\n    <button toolbarSuffixButton\n            mat-icon-button\n            matTooltip="{{ testScriptLabel | translate }}"\n            matTooltipPosition="above"\n            class="tb-mat-32"\n            (click)="testScript()">\n      <mat-icon class="material-icons" color="primary">bug_report</mat-icon>\n    </button>\n  </tb-js-func>\n  <tb-js-func *ngIf="generatorConfigForm.get(\'scriptLang\').value === scriptLanguage.TBEL"\n              #tbelFuncComponent\n              formControlName="tbelScript"\n              functionName="Generate"\n              [functionArgs]="[\'prevMsg\', \'prevMetadata\', \'prevMsgType\']"\n              [disableUndefinedCheck]="true"\n              [scriptLanguage]="scriptLanguage.TBEL"\n              helpId="rulenode/tbel/generator_node_script_fn"\n              noValidate="true">\n    <button toolbarSuffixButton\n            mat-icon-button\n            matTooltip="{{ testScriptLabel | translate }}"\n            matTooltipPosition="above"\n            class="tb-mat-32"\n            (click)="testScript()">\n      <mat-icon class="material-icons" color="primary">bug_report</mat-icon>\n    </button>\n  </tb-js-func>\n  <div fxLayout="row" style="padding-bottom: 16px;">\n    <button mat-button mat-raised-button color="primary" (click)="testScript()">\n      {{ testScriptLabel | translate }}\n    </button>\n  </div>\n</section>\n',dependencies:[{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:Ce.EntitySelectComponent,selector:"tb-entity-select",inputs:["allowedEntityTypes","useAliasEntityTypes","required","disabled"]},{kind:"component",type:pe.JsFuncComponent,selector:"tb-js-func",inputs:["functionTitle","functionName","functionArgs","validationArgs","resultType","disabled","fillHeight","minHeight","editorCompleter","globalVariables","disableUndefinedCheck","helpId","scriptLanguage","noValidate","required"]},{kind:"component",type:de.MatButton,selector:"    button[mat-button], button[mat-raised-button], button[mat-flat-button],    button[mat-stroked-button]  ",inputs:["disabled","disableRipple","color"],exportAs:["matButton"]},{kind:"component",type:de.MatIconButton,selector:"button[mat-icon-button]",inputs:["disabled","disableRipple","color"],exportAs:["matButton"]},{kind:"component",type:ue.MatIcon,selector:"mat-icon",inputs:["color","inline","svgIcon","fontSet","fontIcon"],exportAs:["matIcon"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"directive",type:ce.MatTooltip,selector:"[matTooltip]",exportAs:["matTooltip"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NumberValueAccessor,selector:"input[type=number][formControlName],input[type=number][formControl],input[type=number][ngModel]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.MinValidator,selector:"input[type=number][min][formControlName],input[type=number][min][formControl],input[type=number][min][ngModel]",inputs:["min"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"component",type:fe.TbScriptLangComponent,selector:"tb-script-lang",inputs:["disabled"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:ht,decorators:[{type:n,args:[{selector:"tb-action-node-generator-config",template:'<section [formGroup]="generatorConfigForm" fxLayout="column">\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.message-count</mat-label>\n    <input required type="number" min="0" step="1" matInput formControlName="msgCount">\n    <mat-error *ngIf="generatorConfigForm.get(\'msgCount\').hasError(\'required\')">\n      {{ \'tb.rulenode.message-count-required\' | translate }}\n    </mat-error>\n    <mat-error *ngIf="generatorConfigForm.get(\'msgCount\').hasError(\'min\')">\n      {{ \'tb.rulenode.min-message-count-message\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.period-seconds</mat-label>\n    <input required type="number" min="1" step="1" matInput formControlName="periodInSeconds">\n    <mat-error *ngIf="generatorConfigForm.get(\'periodInSeconds\').hasError(\'required\')">\n      {{ \'tb.rulenode.period-seconds-required\' | translate }}\n    </mat-error>\n    <mat-error *ngIf="generatorConfigForm.get(\'periodInSeconds\').hasError(\'min\')">\n      {{ \'tb.rulenode.min-period-seconds-message\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <div fxLayout="column">\n    <label class="tb-small">{{ \'tb.rulenode.originator\' | translate }}</label>\n    <tb-entity-select\n      required="false"\n      formControlName="originator">\n    </tb-entity-select>\n  </div>\n\n  <tb-script-lang formControlName="scriptLang" *ngIf="tbelEnabled"></tb-script-lang>\n  <tb-js-func *ngIf="generatorConfigForm.get(\'scriptLang\').value === scriptLanguage.JS"\n              #jsFuncComponent\n              formControlName="jsScript"\n              functionName="Generate"\n              [functionArgs]="[\'prevMsg\', \'prevMetadata\', \'prevMsgType\']"\n              helpId="rulenode/generator_node_script_fn"\n              noValidate="true">\n    <button toolbarSuffixButton\n            mat-icon-button\n            matTooltip="{{ testScriptLabel | translate }}"\n            matTooltipPosition="above"\n            class="tb-mat-32"\n            (click)="testScript()">\n      <mat-icon class="material-icons" color="primary">bug_report</mat-icon>\n    </button>\n  </tb-js-func>\n  <tb-js-func *ngIf="generatorConfigForm.get(\'scriptLang\').value === scriptLanguage.TBEL"\n              #tbelFuncComponent\n              formControlName="tbelScript"\n              functionName="Generate"\n              [functionArgs]="[\'prevMsg\', \'prevMetadata\', \'prevMsgType\']"\n              [disableUndefinedCheck]="true"\n              [scriptLanguage]="scriptLanguage.TBEL"\n              helpId="rulenode/tbel/generator_node_script_fn"\n              noValidate="true">\n    <button toolbarSuffixButton\n            mat-icon-button\n            matTooltip="{{ testScriptLabel | translate }}"\n            matTooltipPosition="above"\n            class="tb-mat-32"\n            (click)="testScript()">\n      <mat-icon class="material-icons" color="primary">bug_report</mat-icon>\n    </button>\n  </tb-js-func>\n  <div fxLayout="row" style="padding-bottom: 16px;">\n    <button mat-button mat-raised-button color="primary" (click)="testScript()">\n      {{ testScriptLabel | translate }}\n    </button>\n  </div>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder},{type:oe.NodeScriptTestService},{type:Z.TranslateService}]},propDecorators:{jsFuncComponent:[{type:o,args:["jsFuncComponent",{static:!1}]}],tbelFuncComponent:[{type:o,args:["tbelFuncComponent",{static:!1}]}]}}),function(e){e.CUSTOMER="CUSTOMER",e.TENANT="TENANT",e.RELATED="RELATED",e.ALARM_ORIGINATOR="ALARM_ORIGINATOR",e.ENTITY="ENTITY"}(vt||(vt={}));const Ct=new Map([[vt.CUSTOMER,"tb.rulenode.originator-customer"],[vt.TENANT,"tb.rulenode.originator-tenant"],[vt.RELATED,"tb.rulenode.originator-related"],[vt.ALARM_ORIGINATOR,"tb.rulenode.originator-alarm-originator"],[vt.ENTITY,"tb.rulenode.originator-entity"]]),Ft=new Map([[vt.CUSTOMER,"tb.rulenode.originator-customer-desc"],[vt.TENANT,"tb.rulenode.originator-tenant-desc"],[vt.RELATED,"tb.rulenode.originator-related-entity-desc"],[vt.ALARM_ORIGINATOR,"tb.rulenode.originator-alarm-originator-desc"],[vt.ENTITY,"tb.rulenode.originator-entity-by-name-pattern-desc"]]),kt=[k.createdTime,k.name,{value:"type",name:"tb.rulenode.profile-name",keyName:"originatorProfileName"},k.firstName,k.lastName,k.email,k.title,k.country,k.state,k.city,k.address,k.address2,k.zip,k.phone,k.label,{value:"id",name:"tb.rulenode.id",keyName:"id"},{value:"additionalInfo",name:"tb.rulenode.additional-info",keyName:"additionalInfo"}],Lt=new Map([["type","profileName"],["createdTime","createdTime"],["name","name"],["firstName","firstName"],["lastName","lastName"],["email","email"],["title","title"],["country","country"],["state","state"],["city","city"],["address","address"],["address2","address2"],["zip","zip"],["phone","phone"],["label","label"],["id","id"],["additionalInfo","additionalInfo"]]);var Tt;!function(e){e.CIRCLE="CIRCLE",e.POLYGON="POLYGON"}(Tt||(Tt={}));const It=new Map([[Tt.CIRCLE,"tb.rulenode.perimeter-circle"],[Tt.POLYGON,"tb.rulenode.perimeter-polygon"]]);var Nt;!function(e){e.MILLISECONDS="MILLISECONDS",e.SECONDS="SECONDS",e.MINUTES="MINUTES",e.HOURS="HOURS",e.DAYS="DAYS"}(Nt||(Nt={}));const St=new Map([[Nt.MILLISECONDS,"tb.rulenode.time-unit-milliseconds"],[Nt.SECONDS,"tb.rulenode.time-unit-seconds"],[Nt.MINUTES,"tb.rulenode.time-unit-minutes"],[Nt.HOURS,"tb.rulenode.time-unit-hours"],[Nt.DAYS,"tb.rulenode.time-unit-days"]]);var qt;!function(e){e.METER="METER",e.KILOMETER="KILOMETER",e.FOOT="FOOT",e.MILE="MILE",e.NAUTICAL_MILE="NAUTICAL_MILE"}(qt||(qt={}));const At=new Map([[qt.METER,"tb.rulenode.range-unit-meter"],[qt.KILOMETER,"tb.rulenode.range-unit-kilometer"],[qt.FOOT,"tb.rulenode.range-unit-foot"],[qt.MILE,"tb.rulenode.range-unit-mile"],[qt.NAUTICAL_MILE,"tb.rulenode.range-unit-nautical-mile"]]);var Mt;!function(e){e.ID="ID",e.TITLE="TITLE",e.COUNTRY="COUNTRY",e.STATE="STATE",e.CITY="CITY",e.ZIP="ZIP",e.ADDRESS="ADDRESS",e.ADDRESS2="ADDRESS2",e.PHONE="PHONE",e.EMAIL="EMAIL",e.ADDITIONAL_INFO="ADDITIONAL_INFO"}(Mt||(Mt={}));const Et=new Map([[Mt.ID,"tb.rulenode.entity-details-id"],[Mt.TITLE,"tb.rulenode.entity-details-title"],[Mt.COUNTRY,"tb.rulenode.entity-details-country"],[Mt.STATE,"tb.rulenode.entity-details-state"],[Mt.CITY,"tb.rulenode.entity-details-city"],[Mt.ZIP,"tb.rulenode.entity-details-zip"],[Mt.ADDRESS,"tb.rulenode.entity-details-address"],[Mt.ADDRESS2,"tb.rulenode.entity-details-address2"],[Mt.PHONE,"tb.rulenode.entity-details-phone"],[Mt.EMAIL,"tb.rulenode.entity-details-email"],[Mt.ADDITIONAL_INFO,"tb.rulenode.entity-details-additional_info"]]);var Gt;!function(e){e.FIRST="FIRST",e.LAST="LAST",e.ALL="ALL"}(Gt||(Gt={}));const Dt=new Map([[Gt.FIRST,"tb.rulenode.first"],[Gt.LAST,"tb.rulenode.last"],[Gt.ALL,"tb.rulenode.all"]]),wt=new Map([[Gt.FIRST,"tb.rulenode.first-mode-hint"],[Gt.LAST,"tb.rulenode.last-mode-hint"],[Gt.ALL,"tb.rulenode.all-mode-hint"]]);var Vt,Pt;!function(e){e.ASC="ASC",e.DESC="DESC"}(Vt||(Vt={})),function(e){e.ATTRIBUTES="ATTRIBUTES",e.LATEST_TELEMETRY="LATEST_TELEMETRY",e.FIELDS="FIELDS"}(Pt||(Pt={}));const Rt=new Map([[Pt.ATTRIBUTES,"tb.rulenode.attributes"],[Pt.LATEST_TELEMETRY,"tb.rulenode.latest-telemetry"],[Pt.FIELDS,"tb.rulenode.fields"]]),Ot=new Map([[Pt.ATTRIBUTES,"tb.rulenode.add-mapped-attribute-to"],[Pt.LATEST_TELEMETRY,"tb.rulenode.add-mapped-latest-telemetry-to"],[Pt.FIELDS,"tb.rulenode.add-mapped-fields-to"]]),_t=new Map([[Vt.ASC,"tb.rulenode.ascending"],[Vt.DESC,"tb.rulenode.descending"]]);var Bt;!function(e){e.STANDARD="STANDARD",e.FIFO="FIFO"}(Bt||(Bt={}));const Kt=new Map([[Bt.STANDARD,"tb.rulenode.sqs-queue-standard"],[Bt.FIFO,"tb.rulenode.sqs-queue-fifo"]]),zt=["anonymous","basic","cert.PEM"],Ut=new Map([["anonymous","tb.rulenode.credentials-anonymous"],["basic","tb.rulenode.credentials-basic"],["cert.PEM","tb.rulenode.credentials-pem"]]),Ht=["sas","cert.PEM"],jt=new Map([["sas","tb.rulenode.credentials-sas"],["cert.PEM","tb.rulenode.credentials-pem"]]);var $t;!function(e){e.GET="GET",e.POST="POST",e.PUT="PUT",e.DELETE="DELETE"}($t||($t={}));const Qt=["US-ASCII","ISO-8859-1","UTF-8","UTF-16BE","UTF-16LE","UTF-16"],Jt=new Map([["US-ASCII","tb.rulenode.charset-us-ascii"],["ISO-8859-1","tb.rulenode.charset-iso-8859-1"],["UTF-8","tb.rulenode.charset-utf-8"],["UTF-16BE","tb.rulenode.charset-utf-16be"],["UTF-16LE","tb.rulenode.charset-utf-16le"],["UTF-16","tb.rulenode.charset-utf-16"]]);var Yt;!function(e){e.CUSTOM="CUSTOM",e.ADD="ADD",e.SUB="SUB",e.MULT="MULT",e.DIV="DIV",e.SIN="SIN",e.SINH="SINH",e.COS="COS",e.COSH="COSH",e.TAN="TAN",e.TANH="TANH",e.ACOS="ACOS",e.ASIN="ASIN",e.ATAN="ATAN",e.ATAN2="ATAN2",e.EXP="EXP",e.EXPM1="EXPM1",e.SQRT="SQRT",e.CBRT="CBRT",e.GET_EXP="GET_EXP",e.HYPOT="HYPOT",e.LOG="LOG",e.LOG10="LOG10",e.LOG1P="LOG1P",e.CEIL="CEIL",e.FLOOR="FLOOR",e.FLOOR_DIV="FLOOR_DIV",e.FLOOR_MOD="FLOOR_MOD",e.ABS="ABS",e.MIN="MIN",e.MAX="MAX",e.POW="POW",e.SIGNUM="SIGNUM",e.RAD="RAD",e.DEG="DEG"}(Yt||(Yt={}));const Wt=new Map([[Yt.CUSTOM,{value:Yt.CUSTOM,name:"Custom Function",description:"Use this function to specify complex mathematical expression.",minArgs:1,maxArgs:16}],[Yt.ADD,{value:Yt.ADD,name:"Addition",description:"x + y",minArgs:2,maxArgs:2}],[Yt.SUB,{value:Yt.SUB,name:"Subtraction",description:"x - y",minArgs:2,maxArgs:2}],[Yt.MULT,{value:Yt.MULT,name:"Multiplication",description:"x * y",minArgs:2,maxArgs:2}],[Yt.DIV,{value:Yt.DIV,name:"Division",description:"x / y",minArgs:2,maxArgs:2}],[Yt.SIN,{value:Yt.SIN,name:"Sine",description:"Returns the trigonometric sine of an angle in radians.",minArgs:1,maxArgs:1}],[Yt.SINH,{value:Yt.SINH,name:"Hyperbolic sine",description:"Returns the hyperbolic sine of an argument.",minArgs:1,maxArgs:1}],[Yt.COS,{value:Yt.COS,name:"Cosine",description:"Returns the trigonometric cosine of an angle in radians.",minArgs:1,maxArgs:1}],[Yt.COSH,{value:Yt.COSH,name:"Hyperbolic cosine",description:"Returns the hyperbolic cosine of an argument.",minArgs:1,maxArgs:1}],[Yt.TAN,{value:Yt.TAN,name:"Tangent",description:"Returns the trigonometric tangent of an angle in radians",minArgs:1,maxArgs:1}],[Yt.TANH,{value:Yt.TANH,name:"Hyperbolic tangent",description:"Returns the hyperbolic tangent of an argument",minArgs:1,maxArgs:1}],[Yt.ACOS,{value:Yt.ACOS,name:"Arc cosine",description:"Returns the arc cosine of an argument",minArgs:1,maxArgs:1}],[Yt.ASIN,{value:Yt.ASIN,name:"Arc sine",description:"Returns the arc sine of an argument",minArgs:1,maxArgs:1}],[Yt.ATAN,{value:Yt.ATAN,name:"Arc tangent",description:"Returns the arc tangent of an argument",minArgs:1,maxArgs:1}],[Yt.ATAN2,{value:Yt.ATAN2,name:"2-argument arc tangent",description:"Returns the angle theta from the conversion of rectangular coordinates (x, y) to polar coordinates (r, theta)",minArgs:2,maxArgs:2}],[Yt.EXP,{value:Yt.EXP,name:"Exponential",description:"Returns Euler's number e raised to the power of an argument",minArgs:1,maxArgs:1}],[Yt.EXPM1,{value:Yt.EXPM1,name:"Exponential minus one",description:"Returns Euler's number e raised to the power of an argument minus one",minArgs:1,maxArgs:1}],[Yt.SQRT,{value:Yt.SQRT,name:"Square",description:"Returns the correctly rounded positive square root of an argument",minArgs:1,maxArgs:1}],[Yt.CBRT,{value:Yt.CBRT,name:"Cube root",description:"Returns the cube root of an argument",minArgs:1,maxArgs:1}],[Yt.GET_EXP,{value:Yt.GET_EXP,name:"Get exponent",description:"Returns the unbiased exponent used in the representation of an argument",minArgs:1,maxArgs:1}],[Yt.HYPOT,{value:Yt.HYPOT,name:"Square root",description:"Returns the square root of the squares of the arguments",minArgs:2,maxArgs:2}],[Yt.LOG,{value:Yt.LOG,name:"Logarithm",description:"Returns the natural logarithm of an argument",minArgs:1,maxArgs:1}],[Yt.LOG10,{value:Yt.LOG10,name:"Base 10 logarithm",description:"Returns the base 10 logarithm of an argument",minArgs:1,maxArgs:1}],[Yt.LOG1P,{value:Yt.LOG1P,name:"Logarithm of the sum",description:"Returns the natural logarithm of the sum of an argument",minArgs:1,maxArgs:1}],[Yt.CEIL,{value:Yt.CEIL,name:"Ceiling",description:"Returns the smallest (closest to negative infinity) of an argument",minArgs:1,maxArgs:1}],[Yt.FLOOR,{value:Yt.FLOOR,name:"Floor",description:"Returns the largest (closest to positive infinity) of an argument",minArgs:1,maxArgs:1}],[Yt.FLOOR_DIV,{value:Yt.FLOOR_DIV,name:"Floor division",description:"Returns the largest (closest to positive infinity) of the arguments",minArgs:2,maxArgs:2}],[Yt.FLOOR_MOD,{value:Yt.FLOOR_MOD,name:"Floor modulus",description:"Returns the floor modulus of the arguments",minArgs:2,maxArgs:2}],[Yt.ABS,{value:Yt.ABS,name:"Absolute",description:"Returns the absolute value of an argument",minArgs:1,maxArgs:1}],[Yt.MIN,{value:Yt.MIN,name:"Min",description:"Returns the smaller of the arguments",minArgs:2,maxArgs:2}],[Yt.MAX,{value:Yt.MAX,name:"Max",description:"Returns the greater of the arguments",minArgs:2,maxArgs:2}],[Yt.POW,{value:Yt.POW,name:"Raise to a power",description:"Returns the value of the first argument raised to the power of the second argument",minArgs:2,maxArgs:2}],[Yt.SIGNUM,{value:Yt.SIGNUM,name:"Sign of a real number",description:"Returns the signum function of the argument",minArgs:1,maxArgs:1}],[Yt.RAD,{value:Yt.RAD,name:"Radian",description:"Converts an angle measured in degrees to an approximately equivalent angle measured in radians",minArgs:1,maxArgs:1}],[Yt.DEG,{value:Yt.DEG,name:"Degrees",description:"Converts an angle measured in radians to an approximately equivalent angle measured in degrees.",minArgs:1,maxArgs:1}]]);var Zt,Xt,en;!function(e){e.MESSAGE_BODY="MESSAGE_BODY",e.MESSAGE_METADATA="MESSAGE_METADATA",e.ATTRIBUTE="ATTRIBUTE",e.TIME_SERIES="TIME_SERIES",e.CONSTANT="CONSTANT"}(Zt||(Zt={})),function(e){e.MESSAGE_BODY="MESSAGE_BODY",e.MESSAGE_METADATA="MESSAGE_METADATA",e.ATTRIBUTE="ATTRIBUTE",e.TIME_SERIES="TIME_SERIES"}(Xt||(Xt={})),function(e){e.DATA="DATA",e.METADATA="METADATA"}(en||(en={}));const tn=new Map([[en.DATA,"tb.rulenode.message-to-metadata"],[en.METADATA,"tb.rulenode.metadata-to-message"]]),nn=(new Map([[en.DATA,"tb.rulenode.from-message"],[en.METADATA,"tb.rulenode.from-metadata"]]),new Map([[en.DATA,"tb.rulenode.message"],[en.METADATA,"tb.rulenode.metadata"]])),rn=new Map([[en.DATA,"tb.rulenode.message"],[en.METADATA,"tb.rulenode.message-metadata"]]),on=new Map([[Zt.MESSAGE_BODY,{name:"tb.rulenode.message-body-type",description:"Fetch argument value from incoming message"}],[Zt.MESSAGE_METADATA,{name:"tb.rulenode.message-metadata-type",description:"Fetch argument value from incoming message metadata"}],[Zt.ATTRIBUTE,{name:"tb.rulenode.attribute-type",description:"Fetch attribute value from database"}],[Zt.TIME_SERIES,{name:"tb.rulenode.time-series-type",description:"Fetch latest time-series value from database"}],[Zt.CONSTANT,{name:"tb.rulenode.constant-type",description:"Define constant value"}]]),an=new Map([[Xt.MESSAGE_BODY,{name:"tb.rulenode.message-body-type",description:"Add result to the outgoing message"}],[Xt.MESSAGE_METADATA,{name:"tb.rulenode.message-metadata-type",description:"Add result to the outgoing message metadata"}],[Xt.ATTRIBUTE,{name:"tb.rulenode.attribute-type",description:"Store result as an entity attribute in the database"}],[Xt.TIME_SERIES,{name:"tb.rulenode.time-series-type",description:"Store result as an entity time-series in the database"}]]),ln=["x","y","z","a","b","c","d","k","l","m","n","o","p","r","s","t"];var sn,mn;!function(e){e.SHARED_SCOPE="SHARED_SCOPE",e.SERVER_SCOPE="SERVER_SCOPE",e.CLIENT_SCOPE="CLIENT_SCOPE"}(sn||(sn={})),function(e){e.SHARED_SCOPE="SHARED_SCOPE",e.SERVER_SCOPE="SERVER_SCOPE"}(mn||(mn={}));const pn=new Map([[sn.SHARED_SCOPE,"tb.rulenode.shared-scope"],[sn.SERVER_SCOPE,"tb.rulenode.server-scope"],[sn.CLIENT_SCOPE,"tb.rulenode.client-scope"]]);var dn;!function(e){e.ON_FIRST_MESSAGE="ON_FIRST_MESSAGE",e.ON_EACH_MESSAGE="ON_EACH_MESSAGE"}(dn||(dn={}));const un=new Map([[dn.ON_EACH_MESSAGE,{value:!0,name:"tb.rulenode.presence-monitoring-strategy-on-each-message"}],[dn.ON_FIRST_MESSAGE,{value:!1,name:"tb.rulenode.presence-monitoring-strategy-on-first-message"}]]);class cn extends f{constructor(e,t){super(e),this.store=e,this.fb=t,this.perimeterType=Tt,this.perimeterTypes=Object.keys(Tt),this.perimeterTypeTranslationMap=It,this.rangeUnits=Object.keys(qt),this.rangeUnitTranslationMap=At,this.presenceMonitoringStrategies=un,this.presenceMonitoringStrategyKeys=Array.from(this.presenceMonitoringStrategies.keys()),this.timeUnits=Object.keys(Nt),this.timeUnitsTranslationMap=St,this.defaultPaddingEnable=!0}configForm(){return this.geoActionConfigForm}onConfigurationSet(e){this.geoActionConfigForm=this.fb.group({reportPresenceStatusOnEachMessage:[!e||e.reportPresenceStatusOnEachMessage,[O.required]],latitudeKeyName:[e?e.latitudeKeyName:null,[O.required]],longitudeKeyName:[e?e.longitudeKeyName:null,[O.required]],perimeterType:[e?e.perimeterType:null,[O.required]],fetchPerimeterInfoFromMessageMetadata:[!!e&&e.fetchPerimeterInfoFromMessageMetadata,[]],perimeterKeyName:[e?e.perimeterKeyName:null,[]],centerLatitude:[e?e.centerLatitude:null,[]],centerLongitude:[e?e.centerLatitude:null,[]],range:[e?e.range:null,[]],rangeUnit:[e?e.rangeUnit:null,[]],polygonsDefinition:[e?e.polygonsDefinition:null,[]],minInsideDuration:[e?e.minInsideDuration:null,[O.required,O.min(1),O.max(2147483647)]],minInsideDurationTimeUnit:[e?e.minInsideDurationTimeUnit:null,[O.required]],minOutsideDuration:[e?e.minOutsideDuration:null,[O.required,O.min(1),O.max(2147483647)]],minOutsideDurationTimeUnit:[e?e.minOutsideDurationTimeUnit:null,[O.required]]})}validatorTriggers(){return["fetchPerimeterInfoFromMessageMetadata","perimeterType"]}updateValidators(e){const t=this.geoActionConfigForm.get("fetchPerimeterInfoFromMessageMetadata").value,n=this.geoActionConfigForm.get("perimeterType").value;t?this.geoActionConfigForm.get("perimeterKeyName").setValidators([O.required]):this.geoActionConfigForm.get("perimeterKeyName").setValidators([]),t||n!==Tt.CIRCLE?(this.geoActionConfigForm.get("centerLatitude").setValidators([]),this.geoActionConfigForm.get("centerLongitude").setValidators([]),this.geoActionConfigForm.get("range").setValidators([]),this.geoActionConfigForm.get("rangeUnit").setValidators([]),this.defaultPaddingEnable=!0):(this.geoActionConfigForm.get("centerLatitude").setValidators([O.required,O.min(-90),O.max(90)]),this.geoActionConfigForm.get("centerLongitude").setValidators([O.required,O.min(-180),O.max(180)]),this.geoActionConfigForm.get("range").setValidators([O.required,O.min(0)]),this.geoActionConfigForm.get("rangeUnit").setValidators([O.required]),this.defaultPaddingEnable=!1),t||n!==Tt.POLYGON?this.geoActionConfigForm.get("polygonsDefinition").setValidators([]):this.geoActionConfigForm.get("polygonsDefinition").setValidators([O.required]),this.geoActionConfigForm.get("perimeterKeyName").updateValueAndValidity({emitEvent:e}),this.geoActionConfigForm.get("centerLatitude").updateValueAndValidity({emitEvent:e}),this.geoActionConfigForm.get("centerLongitude").updateValueAndValidity({emitEvent:e}),this.geoActionConfigForm.get("range").updateValueAndValidity({emitEvent:e}),this.geoActionConfigForm.get("rangeUnit").updateValueAndValidity({emitEvent:e}),this.geoActionConfigForm.get("polygonsDefinition").updateValueAndValidity({emitEvent:e})}}e("GpsGeoActionConfigComponent",cn),cn.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:cn,deps:[{token:P.Store},{token:R.UntypedFormBuilder}],target:t.ɵɵFactoryTarget.Component}),cn.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:cn,selector:"tb-action-node-gps-geofencing-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="geoActionConfigForm" class="tb-form-panel no-border no-padding">\n  <section class="tb-form-panel stroked">\n    <div class="tb-form-panel-title" translate>tb.rulenode.coordinate-field-names</div>\n    <section>\n      <div fxLayout="row" fxLayoutGap="16px">\n        <mat-form-field fxFlex="50" class="mat-block">\n          <mat-label>{{ \'tb.rulenode.latitude-field-name\' | translate }}</mat-label>\n          <input matInput formControlName="latitudeKeyName" required>\n          <mat-error *ngIf="geoActionConfigForm.get(\'latitudeKeyName\').hasError(\'required\')">\n            {{ \'tb.rulenode.latitude-field-name-required\' | translate }}\n          </mat-error>\n        </mat-form-field>\n        <mat-form-field fxFlex="50" class="mat-block">\n          <mat-label>{{ \'tb.rulenode.longitude-field-name\' | translate }}</mat-label>\n          <input matInput formControlName="longitudeKeyName" required>\n          <mat-error *ngIf="geoActionConfigForm.get(\'longitudeKeyName\').hasError(\'required\')">\n            {{ \'tb.rulenode.longitude-field-name-required\' | translate }}\n          </mat-error>\n        </mat-form-field>\n      </div>\n      <div class="tb-form-hint tb-primary-fill" translate>tb.rulenode.coordinate-field-hint</div>\n    </section>\n  </section>\n  <section class="tb-form-panel stroked" [class.no-padding-bottom]="!defaultPaddingEnable">\n    <div class="tb-form-panel-title" translate>tb.rulenode.geofence-configuration</div>\n    <section fxLayout="column">\n      <mat-form-field fxFlex class="mat-block" hideRequiredMarker>\n        <mat-label>{{ \'tb.rulenode.perimeter-type\' | translate }}</mat-label>\n        <mat-select formControlName="perimeterType">\n          <mat-option *ngFor="let type of perimeterTypes" [value]="type">\n            {{ perimeterTypeTranslationMap.get(type) | translate }}\n          </mat-option>\n        </mat-select>\n      </mat-form-field>\n      <div tb-hint-tooltip-icon="{{ geoActionConfigForm.get(\'perimeterType\').value === perimeterType.CIRCLE\n        ? (\'tb.rulenode.fetch-circle-parameter-info-from-metadata-hint\'\n            | translate : { perimeterKeyName: geoActionConfigForm.get(\'perimeterKeyName\').valid\n                              ? geoActionConfigForm.get(\'perimeterKeyName\').value\n                              : \'ss_perimeter\'})\n        : (\'tb.rulenode.fetch-poligon-parameter-info-from-metadata-hint\'\n            | translate : { perimeterKeyName: geoActionConfigForm.get(\'perimeterKeyName\').valid\n                              ? geoActionConfigForm.get(\'perimeterKeyName\').value\n                              : \'ss_perimeter\'}) }}"\n           class="tb-form-row no-border no-padding slide-toggle">\n        <mat-slide-toggle class="mat-slide" formControlName="fetchPerimeterInfoFromMessageMetadata">\n          {{ \'tb.rulenode.fetch-perimeter-info-from-metadata\' | translate }}\n        </mat-slide-toggle>\n      </div>\n      <mat-form-field *ngIf="geoActionConfigForm.get(\'fetchPerimeterInfoFromMessageMetadata\').value" class="mat-block">\n        <mat-label>{{ \'tb.rulenode.perimeter-key-name\' | translate }}</mat-label>\n        <input matInput formControlName="perimeterKeyName" required>\n        <mat-error *ngIf="geoActionConfigForm.get(\'perimeterKeyName\').hasError(\'required\')">\n          {{ \'tb.rulenode.perimeter-key-name-required\' | translate }}\n        </mat-error>\n        <mat-hint>{{ \'tb.rulenode.perimeter-key-name-hint\' | translate }}</mat-hint>\n      </mat-form-field>\n      <div fxLayout="column"\n           *ngIf="geoActionConfigForm.get(\'perimeterType\').value === perimeterType.CIRCLE &&\n              !geoActionConfigForm.get(\'fetchPerimeterInfoFromMessageMetadata\').value">\n        <div fxLayout="row" fxLayoutGap="16px">\n          <mat-form-field fxFlex>\n            <mat-label>{{ \'tb.rulenode.circle-center-latitude\' | translate }}</mat-label>\n            <input type="number" min="-90" max="90" step="0.1" matInput formControlName="centerLatitude" required>\n            <mat-error *ngIf="geoActionConfigForm.get(\'centerLatitude\').hasError(\'required\')">\n              {{ \'tb.rulenode.circle-center-latitude-required\' | translate }}\n            </mat-error>\n          </mat-form-field>\n          <mat-form-field fxFlex>\n            <mat-label>{{ \'tb.rulenode.circle-center-longitude\' | translate }}</mat-label>\n            <input type="number" min="-180" max="180" step="0.1" matInput formControlName="centerLongitude" required>\n            <mat-error *ngIf="geoActionConfigForm.get(\'centerLongitude\').hasError(\'required\')">\n              {{ \'tb.rulenode.circle-center-longitude-required\' | translate }}\n            </mat-error>\n          </mat-form-field>\n        </div>\n        <div fxLayout="row" fxLayoutGap="16px">\n          <mat-form-field fxFlex>\n            <mat-label>{{ \'tb.rulenode.range\' | translate }}</mat-label>\n            <input type="number" min="0" step="0.1" matInput formControlName="range" required>\n            <mat-error *ngIf="geoActionConfigForm.get(\'range\').hasError(\'required\')">\n              {{ \'tb.rulenode.range-required\' | translate }}\n            </mat-error>\n          </mat-form-field>\n          <mat-form-field fxFlex>\n            <mat-label>{{ \'tb.rulenode.range-units\' | translate }}</mat-label>\n            <mat-select formControlName="rangeUnit" required>\n              <mat-option *ngFor="let type of rangeUnits" [value]="type">\n                {{ rangeUnitTranslationMap.get(type) | translate }}\n              </mat-option>\n            </mat-select>\n            <mat-error *ngIf="geoActionConfigForm.get(\'rangeUnit\').hasError(\'required\')">\n              {{ \'tb.rulenode.range-units-required\' | translate }}\n            </mat-error>\n          </mat-form-field>\n        </div>\n      </div>\n      <div fxLayout="column" *ngIf="geoActionConfigForm.get(\'perimeterType\').value === perimeterType.POLYGON &&\n                                 !geoActionConfigForm.get(\'fetchPerimeterInfoFromMessageMetadata\').value">\n        <mat-form-field class="mat-block" subscriptSizing="dynamic">\n          <mat-label translate>tb.rulenode.polygon-definition</mat-label>\n          <input matInput formControlName="polygonsDefinition" required>\n          <mat-icon matSuffix class="margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon"\n                    color="primary"\n                    matTooltip="{{ \'tb.rulenode.polygon-definition-hint\' | translate }}">\n            help\n          </mat-icon>\n          <mat-error *ngIf="geoActionConfigForm.get(\'polygonsDefinition\').hasError(\'required\')">\n            {{ \'tb.rulenode.polygon-definition-required\' | translate }}\n          </mat-error>\n        </mat-form-field>\n      </div>\n    </section>\n  </section>\n  <section class="tb-form-panel stroked no-padding-bottom">\n    <div fxLayout="column" fxLayout.gt-sm="row"  fxLayoutGap.lt-md="16px" fxLayoutAlign="space-between">\n      <div class="tb-form-panel-title">{{ \'tb.rulenode.presence-monitoring-strategy\' | translate }}</div>\n      <tb-toggle-select class="fetch-to-data-toggle" formControlName="reportPresenceStatusOnEachMessage" appearance="fill" >\n        <tb-toggle-option *ngFor="let strategy of presenceMonitoringStrategyKeys" [value]="presenceMonitoringStrategies.get(strategy).value">\n          {{ presenceMonitoringStrategies.get(strategy).name | translate }}\n        </tb-toggle-option>\n      </tb-toggle-select>\n    </div>\n    <div class="tb-form-hint tb-primary-fill"> {{ geoActionConfigForm.get(\'reportPresenceStatusOnEachMessage\').value === false ?\n        (\'tb.rulenode.presence-monitoring-strategy-on-first-message-hint\' | translate) :\n        (\'tb.rulenode.presence-monitoring-strategy-on-each-message-hint\' | translate) }}\n    </div>\n    <section fxLayout="column">\n      <div *ngIf="geoActionConfigForm.get(\'reportPresenceStatusOnEachMessage\').value === false">\n        <div fxLayout="column" fxLayout.gt-sm="row" fxLayoutGap.gt-sm="8px">\n          <mat-form-field fxFlex class="mat-block">\n            <mat-label translate>tb.rulenode.min-inside-duration</mat-label>\n            <input type="number" step="1" min="1" max="2147483647" matInput formControlName="minInsideDuration" required>\n            <mat-error *ngIf="geoActionConfigForm.get(\'minInsideDuration\').hasError(\'required\')">\n              {{ \'tb.rulenode.min-inside-duration-value-required\' | translate }}\n            </mat-error>\n            <mat-error *ngIf="geoActionConfigForm.get(\'minInsideDuration\').hasError(\'min\')">\n              {{ \'tb.rulenode.time-value-range\' | translate }}\n            </mat-error>\n            <mat-error *ngIf="geoActionConfigForm.get(\'minInsideDuration\').hasError(\'max\')">\n              {{ \'tb.rulenode.time-value-range\' | translate }}\n            </mat-error>\n          </mat-form-field>\n          <mat-form-field fxFlex class="mat-block">\n            <mat-label translate>tb.rulenode.min-inside-duration-time-unit</mat-label>\n            <mat-select formControlName="minInsideDurationTimeUnit" required>\n              <mat-option *ngFor="let timeUnit of timeUnits" [value]="timeUnit">\n                {{ timeUnitsTranslationMap.get(timeUnit) | translate }}\n              </mat-option>\n            </mat-select>\n          </mat-form-field>\n        </div>\n        <div fxLayout="column" fxLayout.gt-sm="row" fxLayoutGap.gt-sm="8px">\n          <mat-form-field fxFlex class="mat-block">\n            <mat-label translate>tb.rulenode.min-outside-duration</mat-label>\n            <input type="number" step="1" min="1" max="2147483647" matInput formControlName="minOutsideDuration" required>\n            <mat-error *ngIf="geoActionConfigForm.get(\'minOutsideDuration\').hasError(\'required\')">\n              {{ \'tb.rulenode.min-outside-duration-value-required\' | translate }}\n            </mat-error>\n            <mat-error *ngIf="geoActionConfigForm.get(\'minOutsideDuration\').hasError(\'min\')">\n              {{ \'tb.rulenode.time-value-range\' | translate }}\n            </mat-error>\n            <mat-error *ngIf="geoActionConfigForm.get(\'minOutsideDuration\').hasError(\'max\')">\n              {{ \'tb.rulenode.time-value-range\' | translate }}\n            </mat-error>\n          </mat-form-field>\n          <mat-form-field fxFlex class="mat-block">\n            <mat-label translate>tb.rulenode.min-outside-duration-time-unit</mat-label>\n            <mat-select formControlName="minOutsideDurationTimeUnit" required>\n              <mat-option *ngFor="let timeUnit of timeUnits" [value]="timeUnit">\n                {{ timeUnitsTranslationMap.get(timeUnit) | translate }}\n              </mat-option>\n            </mat-select>\n          </mat-form-field>\n        </div>\n      </div>\n    </section>\n  </section>\n</section>\n',styles:[":host .slide-toggle{margin-bottom:18px}\n",':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n'],dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:ue.MatIcon,selector:"mat-icon",inputs:["color","inline","svgIcon","fontSet","fontIcon"],exportAs:["matIcon"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatHint,selector:"mat-hint",inputs:["align","id"]},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"directive",type:Y.MatSuffix,selector:"[matSuffix], [matIconSuffix], [matTextSuffix]",inputs:["matTextSuffix"]},{kind:"component",type:X.MatSelect,selector:"mat-select",inputs:["disabled","disableRipple","tabIndex","hideSingleSelectionIndicator"],exportAs:["matSelect"]},{kind:"component",type:ee.MatOption,selector:"mat-option",exportAs:["matOption"]},{kind:"directive",type:ce.MatTooltip,selector:"[matTooltip]",exportAs:["matTooltip"]},{kind:"component",type:te.MatSlideToggle,selector:"mat-slide-toggle",inputs:["disabled","disableRipple","color","tabIndex"],exportAs:["matSlideToggle"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:W.DefaultLayoutGapDirective,selector:"  [fxLayoutGap], [fxLayoutGap.xs], [fxLayoutGap.sm], [fxLayoutGap.md],  [fxLayoutGap.lg], [fxLayoutGap.xl], [fxLayoutGap.lt-sm], [fxLayoutGap.lt-md],  [fxLayoutGap.lt-lg], [fxLayoutGap.lt-xl], [fxLayoutGap.gt-xs], [fxLayoutGap.gt-sm],  [fxLayoutGap.gt-md], [fxLayoutGap.gt-lg]",inputs:["fxLayoutGap","fxLayoutGap.xs","fxLayoutGap.sm","fxLayoutGap.md","fxLayoutGap.lg","fxLayoutGap.xl","fxLayoutGap.lt-sm","fxLayoutGap.lt-md","fxLayoutGap.lt-lg","fxLayoutGap.lt-xl","fxLayoutGap.gt-xs","fxLayoutGap.gt-sm","fxLayoutGap.gt-md","fxLayoutGap.gt-lg"]},{kind:"directive",type:W.DefaultLayoutAlignDirective,selector:"  [fxLayoutAlign], [fxLayoutAlign.xs], [fxLayoutAlign.sm], [fxLayoutAlign.md],  [fxLayoutAlign.lg], [fxLayoutAlign.xl], [fxLayoutAlign.lt-sm], [fxLayoutAlign.lt-md],  [fxLayoutAlign.lt-lg], [fxLayoutAlign.lt-xl], [fxLayoutAlign.gt-xs], [fxLayoutAlign.gt-sm],  [fxLayoutAlign.gt-md], [fxLayoutAlign.gt-lg]",inputs:["fxLayoutAlign","fxLayoutAlign.xs","fxLayoutAlign.sm","fxLayoutAlign.md","fxLayoutAlign.lg","fxLayoutAlign.xl","fxLayoutAlign.lt-sm","fxLayoutAlign.lt-md","fxLayoutAlign.lt-lg","fxLayoutAlign.lt-xl","fxLayoutAlign.gt-xs","fxLayoutAlign.gt-sm","fxLayoutAlign.gt-md","fxLayoutAlign.gt-lg"]},{kind:"directive",type:W.DefaultFlexDirective,selector:"  [fxFlex], [fxFlex.xs], [fxFlex.sm], [fxFlex.md],  [fxFlex.lg], [fxFlex.xl], [fxFlex.lt-sm], [fxFlex.lt-md],  [fxFlex.lt-lg], [fxFlex.lt-xl], [fxFlex.gt-xs], [fxFlex.gt-sm],  [fxFlex.gt-md], [fxFlex.gt-lg]",inputs:["fxFlex","fxFlex.xs","fxFlex.sm","fxFlex.md","fxFlex.lg","fxFlex.xl","fxFlex.lt-sm","fxFlex.lt-md","fxFlex.lt-lg","fxFlex.lt-xl","fxFlex.gt-xs","fxFlex.gt-sm","fxFlex.gt-md","fxFlex.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NumberValueAccessor,selector:"input[type=number][formControlName],input[type=number][formControl],input[type=number][ngModel]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.MinValidator,selector:"input[type=number][min][formControlName],input[type=number][min][formControl],input[type=number][min][ngModel]",inputs:["min"]},{kind:"directive",type:R.MaxValidator,selector:"input[type=number][max][formControlName],input[type=number][max][formControl],input[type=number][max][ngModel]",inputs:["max"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"directive",type:Fe.ToggleOption,selector:"tb-toggle-option",inputs:["value"]},{kind:"component",type:ke.ToggleSelectComponent,selector:"tb-toggle-select",inputs:["disabled","selectMediaBreakpoint","appearance","disablePagination"]},{kind:"component",type:ne.HintTooltipIconComponent,selector:"[tb-hint-tooltip-icon]",inputs:["tb-hint-tooltip-icon","tooltipPosition","hintIcon"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:cn,decorators:[{type:n,args:[{selector:"tb-action-node-gps-geofencing-config",template:'<section [formGroup]="geoActionConfigForm" class="tb-form-panel no-border no-padding">\n  <section class="tb-form-panel stroked">\n    <div class="tb-form-panel-title" translate>tb.rulenode.coordinate-field-names</div>\n    <section>\n      <div fxLayout="row" fxLayoutGap="16px">\n        <mat-form-field fxFlex="50" class="mat-block">\n          <mat-label>{{ \'tb.rulenode.latitude-field-name\' | translate }}</mat-label>\n          <input matInput formControlName="latitudeKeyName" required>\n          <mat-error *ngIf="geoActionConfigForm.get(\'latitudeKeyName\').hasError(\'required\')">\n            {{ \'tb.rulenode.latitude-field-name-required\' | translate }}\n          </mat-error>\n        </mat-form-field>\n        <mat-form-field fxFlex="50" class="mat-block">\n          <mat-label>{{ \'tb.rulenode.longitude-field-name\' | translate }}</mat-label>\n          <input matInput formControlName="longitudeKeyName" required>\n          <mat-error *ngIf="geoActionConfigForm.get(\'longitudeKeyName\').hasError(\'required\')">\n            {{ \'tb.rulenode.longitude-field-name-required\' | translate }}\n          </mat-error>\n        </mat-form-field>\n      </div>\n      <div class="tb-form-hint tb-primary-fill" translate>tb.rulenode.coordinate-field-hint</div>\n    </section>\n  </section>\n  <section class="tb-form-panel stroked" [class.no-padding-bottom]="!defaultPaddingEnable">\n    <div class="tb-form-panel-title" translate>tb.rulenode.geofence-configuration</div>\n    <section fxLayout="column">\n      <mat-form-field fxFlex class="mat-block" hideRequiredMarker>\n        <mat-label>{{ \'tb.rulenode.perimeter-type\' | translate }}</mat-label>\n        <mat-select formControlName="perimeterType">\n          <mat-option *ngFor="let type of perimeterTypes" [value]="type">\n            {{ perimeterTypeTranslationMap.get(type) | translate }}\n          </mat-option>\n        </mat-select>\n      </mat-form-field>\n      <div tb-hint-tooltip-icon="{{ geoActionConfigForm.get(\'perimeterType\').value === perimeterType.CIRCLE\n        ? (\'tb.rulenode.fetch-circle-parameter-info-from-metadata-hint\'\n            | translate : { perimeterKeyName: geoActionConfigForm.get(\'perimeterKeyName\').valid\n                              ? geoActionConfigForm.get(\'perimeterKeyName\').value\n                              : \'ss_perimeter\'})\n        : (\'tb.rulenode.fetch-poligon-parameter-info-from-metadata-hint\'\n            | translate : { perimeterKeyName: geoActionConfigForm.get(\'perimeterKeyName\').valid\n                              ? geoActionConfigForm.get(\'perimeterKeyName\').value\n                              : \'ss_perimeter\'}) }}"\n           class="tb-form-row no-border no-padding slide-toggle">\n        <mat-slide-toggle class="mat-slide" formControlName="fetchPerimeterInfoFromMessageMetadata">\n          {{ \'tb.rulenode.fetch-perimeter-info-from-metadata\' | translate }}\n        </mat-slide-toggle>\n      </div>\n      <mat-form-field *ngIf="geoActionConfigForm.get(\'fetchPerimeterInfoFromMessageMetadata\').value" class="mat-block">\n        <mat-label>{{ \'tb.rulenode.perimeter-key-name\' | translate }}</mat-label>\n        <input matInput formControlName="perimeterKeyName" required>\n        <mat-error *ngIf="geoActionConfigForm.get(\'perimeterKeyName\').hasError(\'required\')">\n          {{ \'tb.rulenode.perimeter-key-name-required\' | translate }}\n        </mat-error>\n        <mat-hint>{{ \'tb.rulenode.perimeter-key-name-hint\' | translate }}</mat-hint>\n      </mat-form-field>\n      <div fxLayout="column"\n           *ngIf="geoActionConfigForm.get(\'perimeterType\').value === perimeterType.CIRCLE &&\n              !geoActionConfigForm.get(\'fetchPerimeterInfoFromMessageMetadata\').value">\n        <div fxLayout="row" fxLayoutGap="16px">\n          <mat-form-field fxFlex>\n            <mat-label>{{ \'tb.rulenode.circle-center-latitude\' | translate }}</mat-label>\n            <input type="number" min="-90" max="90" step="0.1" matInput formControlName="centerLatitude" required>\n            <mat-error *ngIf="geoActionConfigForm.get(\'centerLatitude\').hasError(\'required\')">\n              {{ \'tb.rulenode.circle-center-latitude-required\' | translate }}\n            </mat-error>\n          </mat-form-field>\n          <mat-form-field fxFlex>\n            <mat-label>{{ \'tb.rulenode.circle-center-longitude\' | translate }}</mat-label>\n            <input type="number" min="-180" max="180" step="0.1" matInput formControlName="centerLongitude" required>\n            <mat-error *ngIf="geoActionConfigForm.get(\'centerLongitude\').hasError(\'required\')">\n              {{ \'tb.rulenode.circle-center-longitude-required\' | translate }}\n            </mat-error>\n          </mat-form-field>\n        </div>\n        <div fxLayout="row" fxLayoutGap="16px">\n          <mat-form-field fxFlex>\n            <mat-label>{{ \'tb.rulenode.range\' | translate }}</mat-label>\n            <input type="number" min="0" step="0.1" matInput formControlName="range" required>\n            <mat-error *ngIf="geoActionConfigForm.get(\'range\').hasError(\'required\')">\n              {{ \'tb.rulenode.range-required\' | translate }}\n            </mat-error>\n          </mat-form-field>\n          <mat-form-field fxFlex>\n            <mat-label>{{ \'tb.rulenode.range-units\' | translate }}</mat-label>\n            <mat-select formControlName="rangeUnit" required>\n              <mat-option *ngFor="let type of rangeUnits" [value]="type">\n                {{ rangeUnitTranslationMap.get(type) | translate }}\n              </mat-option>\n            </mat-select>\n            <mat-error *ngIf="geoActionConfigForm.get(\'rangeUnit\').hasError(\'required\')">\n              {{ \'tb.rulenode.range-units-required\' | translate }}\n            </mat-error>\n          </mat-form-field>\n        </div>\n      </div>\n      <div fxLayout="column" *ngIf="geoActionConfigForm.get(\'perimeterType\').value === perimeterType.POLYGON &&\n                                 !geoActionConfigForm.get(\'fetchPerimeterInfoFromMessageMetadata\').value">\n        <mat-form-field class="mat-block" subscriptSizing="dynamic">\n          <mat-label translate>tb.rulenode.polygon-definition</mat-label>\n          <input matInput formControlName="polygonsDefinition" required>\n          <mat-icon matSuffix class="margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon"\n                    color="primary"\n                    matTooltip="{{ \'tb.rulenode.polygon-definition-hint\' | translate }}">\n            help\n          </mat-icon>\n          <mat-error *ngIf="geoActionConfigForm.get(\'polygonsDefinition\').hasError(\'required\')">\n            {{ \'tb.rulenode.polygon-definition-required\' | translate }}\n          </mat-error>\n        </mat-form-field>\n      </div>\n    </section>\n  </section>\n  <section class="tb-form-panel stroked no-padding-bottom">\n    <div fxLayout="column" fxLayout.gt-sm="row"  fxLayoutGap.lt-md="16px" fxLayoutAlign="space-between">\n      <div class="tb-form-panel-title">{{ \'tb.rulenode.presence-monitoring-strategy\' | translate }}</div>\n      <tb-toggle-select class="fetch-to-data-toggle" formControlName="reportPresenceStatusOnEachMessage" appearance="fill" >\n        <tb-toggle-option *ngFor="let strategy of presenceMonitoringStrategyKeys" [value]="presenceMonitoringStrategies.get(strategy).value">\n          {{ presenceMonitoringStrategies.get(strategy).name | translate }}\n        </tb-toggle-option>\n      </tb-toggle-select>\n    </div>\n    <div class="tb-form-hint tb-primary-fill"> {{ geoActionConfigForm.get(\'reportPresenceStatusOnEachMessage\').value === false ?\n        (\'tb.rulenode.presence-monitoring-strategy-on-first-message-hint\' | translate) :\n        (\'tb.rulenode.presence-monitoring-strategy-on-each-message-hint\' | translate) }}\n    </div>\n    <section fxLayout="column">\n      <div *ngIf="geoActionConfigForm.get(\'reportPresenceStatusOnEachMessage\').value === false">\n        <div fxLayout="column" fxLayout.gt-sm="row" fxLayoutGap.gt-sm="8px">\n          <mat-form-field fxFlex class="mat-block">\n            <mat-label translate>tb.rulenode.min-inside-duration</mat-label>\n            <input type="number" step="1" min="1" max="2147483647" matInput formControlName="minInsideDuration" required>\n            <mat-error *ngIf="geoActionConfigForm.get(\'minInsideDuration\').hasError(\'required\')">\n              {{ \'tb.rulenode.min-inside-duration-value-required\' | translate }}\n            </mat-error>\n            <mat-error *ngIf="geoActionConfigForm.get(\'minInsideDuration\').hasError(\'min\')">\n              {{ \'tb.rulenode.time-value-range\' | translate }}\n            </mat-error>\n            <mat-error *ngIf="geoActionConfigForm.get(\'minInsideDuration\').hasError(\'max\')">\n              {{ \'tb.rulenode.time-value-range\' | translate }}\n            </mat-error>\n          </mat-form-field>\n          <mat-form-field fxFlex class="mat-block">\n            <mat-label translate>tb.rulenode.min-inside-duration-time-unit</mat-label>\n            <mat-select formControlName="minInsideDurationTimeUnit" required>\n              <mat-option *ngFor="let timeUnit of timeUnits" [value]="timeUnit">\n                {{ timeUnitsTranslationMap.get(timeUnit) | translate }}\n              </mat-option>\n            </mat-select>\n          </mat-form-field>\n        </div>\n        <div fxLayout="column" fxLayout.gt-sm="row" fxLayoutGap.gt-sm="8px">\n          <mat-form-field fxFlex class="mat-block">\n            <mat-label translate>tb.rulenode.min-outside-duration</mat-label>\n            <input type="number" step="1" min="1" max="2147483647" matInput formControlName="minOutsideDuration" required>\n            <mat-error *ngIf="geoActionConfigForm.get(\'minOutsideDuration\').hasError(\'required\')">\n              {{ \'tb.rulenode.min-outside-duration-value-required\' | translate }}\n            </mat-error>\n            <mat-error *ngIf="geoActionConfigForm.get(\'minOutsideDuration\').hasError(\'min\')">\n              {{ \'tb.rulenode.time-value-range\' | translate }}\n            </mat-error>\n            <mat-error *ngIf="geoActionConfigForm.get(\'minOutsideDuration\').hasError(\'max\')">\n              {{ \'tb.rulenode.time-value-range\' | translate }}\n            </mat-error>\n          </mat-form-field>\n          <mat-form-field fxFlex class="mat-block">\n            <mat-label translate>tb.rulenode.min-outside-duration-time-unit</mat-label>\n            <mat-select formControlName="minOutsideDurationTimeUnit" required>\n              <mat-option *ngFor="let timeUnit of timeUnits" [value]="timeUnit">\n                {{ timeUnitsTranslationMap.get(timeUnit) | translate }}\n              </mat-option>\n            </mat-select>\n          </mat-form-field>\n        </div>\n      </div>\n    </section>\n  </section>\n</section>\n',styles:[":host .slide-toggle{margin-bottom:18px}\n",':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n']}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder}]}});class fn extends f{constructor(e,t,n,o){super(e),this.store=e,this.fb=t,this.nodeScriptTestService=n,this.translate=o,this.tbelEnabled=re(this.store).tbelEnabled,this.scriptLanguage=x,this.changeScript=new r,this.hasScript=!0,this.testScriptLabel="tb.rulenode.test-to-string-function"}configForm(){return this.logConfigForm}onConfigurationSet(e){this.logConfigForm=this.fb.group({scriptLang:[e?e.scriptLang:x.JS,[O.required]],jsScript:[e?e.jsScript:null,[]],tbelScript:[e?e.tbelScript:null,[]]})}validatorTriggers(){return["scriptLang"]}updateValidators(e){let t=this.logConfigForm.get("scriptLang").value;t!==x.TBEL||this.tbelEnabled||(t=x.JS,this.logConfigForm.get("scriptLang").patchValue(t,{emitEvent:!1}),setTimeout((()=>{this.logConfigForm.updateValueAndValidity({emitEvent:!0})}))),this.logConfigForm.get("jsScript").setValidators(t===x.JS?[O.required]:[]),this.logConfigForm.get("jsScript").updateValueAndValidity({emitEvent:e}),this.logConfigForm.get("tbelScript").setValidators(t===x.TBEL?[O.required]:[]),this.logConfigForm.get("tbelScript").updateValueAndValidity({emitEvent:e})}prepareInputConfig(e){return e&&(e.scriptLang||(e.scriptLang=x.JS)),e}testScript(e){const t=this.logConfigForm.get("scriptLang").value,n=t===x.JS?"jsScript":"tbelScript",r=t===x.JS?"rulenode/log_node_script_fn":"rulenode/tbel/log_node_script_fn",o=this.logConfigForm.get(n).value;this.nodeScriptTestService.testNodeScript(o,"string",this.translate.instant("tb.rulenode.to-string"),"ToString",["msg","metadata","msgType"],this.ruleNodeId,r,t,e).subscribe((e=>{e&&(this.logConfigForm.get(n).setValue(e),this.changeScript.emit())}))}onValidate(){this.logConfigForm.get("scriptLang").value===x.JS&&this.jsFuncComponent.validateOnSubmit()}}e("LogConfigComponent",fn),fn.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:fn,deps:[{token:P.Store},{token:R.UntypedFormBuilder},{token:oe.NodeScriptTestService},{token:Z.TranslateService}],target:t.ɵɵFactoryTarget.Component}),fn.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:fn,selector:"tb-action-node-log-config",viewQueries:[{propertyName:"jsFuncComponent",first:!0,predicate:["jsFuncComponent"],descendants:!0},{propertyName:"tbelFuncComponent",first:!0,predicate:["tbelFuncComponent"],descendants:!0}],usesInheritance:!0,ngImport:t,template:'<section [formGroup]="logConfigForm" fxLayout="column">\n  <tb-script-lang formControlName="scriptLang" *ngIf="tbelEnabled"></tb-script-lang>\n  <tb-js-func *ngIf="logConfigForm.get(\'scriptLang\').value === scriptLanguage.JS"\n              #jsFuncComponent\n              formControlName="jsScript"\n              functionName="ToString"\n              [functionArgs]="[\'msg\', \'metadata\', \'msgType\']"\n              helpId="rulenode/log_node_script_fn"\n              noValidate="true">\n    <button toolbarSuffixButton\n            mat-icon-button\n            matTooltip="{{ testScriptLabel | translate }}"\n            matTooltipPosition="above"\n            class="tb-mat-32"\n            (click)="testScript()">\n      <mat-icon class="material-icons" color="primary">bug_report</mat-icon>\n    </button>\n  </tb-js-func>\n  <tb-js-func *ngIf="logConfigForm.get(\'scriptLang\').value === scriptLanguage.TBEL"\n              #tbelFuncComponent\n              formControlName="tbelScript"\n              functionName="ToString"\n              [functionArgs]="[\'msg\', \'metadata\', \'msgType\']"\n              [disableUndefinedCheck]="true"\n              [scriptLanguage]="scriptLanguage.TBEL"\n              helpId="rulenode/tbel/log_node_script_fn"\n              noValidate="true">\n    <button toolbarSuffixButton\n            mat-icon-button\n            matTooltip="{{ testScriptLabel | translate }}"\n            matTooltipPosition="above"\n            class="tb-mat-32"\n            (click)="testScript()">\n      <mat-icon class="material-icons" color="primary">bug_report</mat-icon>\n    </button>\n  </tb-js-func>\n  <div fxLayout="row">\n    <button mat-button mat-raised-button color="primary" (click)="testScript()">\n      {{ testScriptLabel | translate }}\n    </button>\n  </div>\n</section>\n',dependencies:[{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:pe.JsFuncComponent,selector:"tb-js-func",inputs:["functionTitle","functionName","functionArgs","validationArgs","resultType","disabled","fillHeight","minHeight","editorCompleter","globalVariables","disableUndefinedCheck","helpId","scriptLanguage","noValidate","required"]},{kind:"component",type:de.MatButton,selector:"    button[mat-button], button[mat-raised-button], button[mat-flat-button],    button[mat-stroked-button]  ",inputs:["disabled","disableRipple","color"],exportAs:["matButton"]},{kind:"component",type:de.MatIconButton,selector:"button[mat-icon-button]",inputs:["disabled","disableRipple","color"],exportAs:["matButton"]},{kind:"component",type:ue.MatIcon,selector:"mat-icon",inputs:["color","inline","svgIcon","fontSet","fontIcon"],exportAs:["matIcon"]},{kind:"directive",type:ce.MatTooltip,selector:"[matTooltip]",exportAs:["matTooltip"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"component",type:fe.TbScriptLangComponent,selector:"tb-script-lang",inputs:["disabled"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:fn,decorators:[{type:n,args:[{selector:"tb-action-node-log-config",template:'<section [formGroup]="logConfigForm" fxLayout="column">\n  <tb-script-lang formControlName="scriptLang" *ngIf="tbelEnabled"></tb-script-lang>\n  <tb-js-func *ngIf="logConfigForm.get(\'scriptLang\').value === scriptLanguage.JS"\n              #jsFuncComponent\n              formControlName="jsScript"\n              functionName="ToString"\n              [functionArgs]="[\'msg\', \'metadata\', \'msgType\']"\n              helpId="rulenode/log_node_script_fn"\n              noValidate="true">\n    <button toolbarSuffixButton\n            mat-icon-button\n            matTooltip="{{ testScriptLabel | translate }}"\n            matTooltipPosition="above"\n            class="tb-mat-32"\n            (click)="testScript()">\n      <mat-icon class="material-icons" color="primary">bug_report</mat-icon>\n    </button>\n  </tb-js-func>\n  <tb-js-func *ngIf="logConfigForm.get(\'scriptLang\').value === scriptLanguage.TBEL"\n              #tbelFuncComponent\n              formControlName="tbelScript"\n              functionName="ToString"\n              [functionArgs]="[\'msg\', \'metadata\', \'msgType\']"\n              [disableUndefinedCheck]="true"\n              [scriptLanguage]="scriptLanguage.TBEL"\n              helpId="rulenode/tbel/log_node_script_fn"\n              noValidate="true">\n    <button toolbarSuffixButton\n            mat-icon-button\n            matTooltip="{{ testScriptLabel | translate }}"\n            matTooltipPosition="above"\n            class="tb-mat-32"\n            (click)="testScript()">\n      <mat-icon class="material-icons" color="primary">bug_report</mat-icon>\n    </button>\n  </tb-js-func>\n  <div fxLayout="row">\n    <button mat-button mat-raised-button color="primary" (click)="testScript()">\n      {{ testScriptLabel | translate }}\n    </button>\n  </div>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder},{type:oe.NodeScriptTestService},{type:Z.TranslateService}]},propDecorators:{jsFuncComponent:[{type:o,args:["jsFuncComponent",{static:!1}]}],tbelFuncComponent:[{type:o,args:["tbelFuncComponent",{static:!1}]}]}});class gn extends f{constructor(e,t){super(e),this.store=e,this.fb=t}configForm(){return this.msgCountConfigForm}onConfigurationSet(e){this.msgCountConfigForm=this.fb.group({interval:[e?e.interval:null,[O.required,O.min(1)]],telemetryPrefix:[e?e.telemetryPrefix:null,[O.required]]})}}e("MsgCountConfigComponent",gn),gn.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:gn,deps:[{token:P.Store},{token:R.UntypedFormBuilder}],target:t.ɵɵFactoryTarget.Component}),gn.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:gn,selector:"tb-action-node-msg-count-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="msgCountConfigForm" fxLayout="column">\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.interval-seconds</mat-label>\n    <input required type="number" min="1" step="1" matInput formControlName="interval">\n    <mat-error *ngIf="msgCountConfigForm.get(\'interval\').hasError(\'required\')">\n      {{ \'tb.rulenode.interval-seconds-required\' | translate }}\n    </mat-error>\n    <mat-error *ngIf="msgCountConfigForm.get(\'interval\').hasError(\'min\')">\n      {{ \'tb.rulenode.min-interval-seconds-message\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.output-timeseries-key-prefix</mat-label>\n    <input required matInput formControlName="telemetryPrefix">\n    <mat-error *ngIf="msgCountConfigForm.get(\'telemetryPrefix\').hasError(\'required\')">\n      {{ \'tb.rulenode.output-timeseries-key-prefix-required\' | translate }}\n    </mat-error>\n  </mat-form-field>\n</section>\n',dependencies:[{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NumberValueAccessor,selector:"input[type=number][formControlName],input[type=number][formControl],input[type=number][ngModel]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.MinValidator,selector:"input[type=number][min][formControlName],input[type=number][min][formControl],input[type=number][min][ngModel]",inputs:["min"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:gn,decorators:[{type:n,args:[{selector:"tb-action-node-msg-count-config",template:'<section [formGroup]="msgCountConfigForm" fxLayout="column">\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.interval-seconds</mat-label>\n    <input required type="number" min="1" step="1" matInput formControlName="interval">\n    <mat-error *ngIf="msgCountConfigForm.get(\'interval\').hasError(\'required\')">\n      {{ \'tb.rulenode.interval-seconds-required\' | translate }}\n    </mat-error>\n    <mat-error *ngIf="msgCountConfigForm.get(\'interval\').hasError(\'min\')">\n      {{ \'tb.rulenode.min-interval-seconds-message\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.output-timeseries-key-prefix</mat-label>\n    <input required matInput formControlName="telemetryPrefix">\n    <mat-error *ngIf="msgCountConfigForm.get(\'telemetryPrefix\').hasError(\'required\')">\n      {{ \'tb.rulenode.output-timeseries-key-prefix-required\' | translate }}\n    </mat-error>\n  </mat-form-field>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder}]}});class yn extends f{constructor(e,t){super(e),this.store=e,this.fb=t}configForm(){return this.msgDelayConfigForm}onConfigurationSet(e){this.msgDelayConfigForm=this.fb.group({useMetadataPeriodInSecondsPatterns:[!!e&&e.useMetadataPeriodInSecondsPatterns,[]],periodInSeconds:[e?e.periodInSeconds:null,[]],periodInSecondsPattern:[e?e.periodInSecondsPattern:null,[]],maxPendingMsgs:[e?e.maxPendingMsgs:null,[O.required,O.min(1),O.max(1e5)]]})}validatorTriggers(){return["useMetadataPeriodInSecondsPatterns"]}updateValidators(e){this.msgDelayConfigForm.get("useMetadataPeriodInSecondsPatterns").value?(this.msgDelayConfigForm.get("periodInSecondsPattern").setValidators([O.required]),this.msgDelayConfigForm.get("periodInSeconds").setValidators([])):(this.msgDelayConfigForm.get("periodInSecondsPattern").setValidators([]),this.msgDelayConfigForm.get("periodInSeconds").setValidators([O.required,O.min(0)])),this.msgDelayConfigForm.get("periodInSecondsPattern").updateValueAndValidity({emitEvent:e}),this.msgDelayConfigForm.get("periodInSeconds").updateValueAndValidity({emitEvent:e})}}e("MsgDelayConfigComponent",yn),yn.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:yn,deps:[{token:P.Store},{token:R.UntypedFormBuilder}],target:t.ɵɵFactoryTarget.Component}),yn.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:yn,selector:"tb-action-node-msg-delay-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="msgDelayConfigForm" fxLayout="column">\n  <mat-checkbox formControlName="useMetadataPeriodInSecondsPatterns">\n    {{ \'tb.rulenode.use-metadata-period-in-seconds-patterns\' | translate }}\n  </mat-checkbox>\n  <div class="tb-hint" translate>tb.rulenode.use-metadata-period-in-seconds-patterns-hint</div>\n  <mat-form-field *ngIf="msgDelayConfigForm.get(\'useMetadataPeriodInSecondsPatterns\').value !== true; else periodInSecondsPattern"\n                  class="mat-block">\n    <mat-label translate>tb.rulenode.period-seconds</mat-label>\n    <input required type="number" min="0" step="1" matInput formControlName="periodInSeconds">\n    <mat-error *ngIf="msgDelayConfigForm.get(\'periodInSeconds\').hasError(\'required\')">\n      {{ \'tb.rulenode.period-seconds-required\' | translate }}\n    </mat-error>\n    <mat-error *ngIf="msgDelayConfigForm.get(\'periodInSeconds\').hasError(\'min\')">\n      {{ \'tb.rulenode.min-period-0-seconds-message\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <ng-template #periodInSecondsPattern>\n    <mat-form-field class="mat-block" subscriptSizing="dynamic">\n      <mat-label translate>tb.rulenode.period-in-seconds-pattern</mat-label>\n      <input required matInput formControlName="periodInSecondsPattern">\n      <mat-error *ngIf="msgDelayConfigForm.get(\'periodInSecondsPattern\').hasError(\'required\')">\n        {{ \'tb.rulenode.period-in-seconds-pattern-required\' | translate }}\n      </mat-error>\n      <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n    </mat-form-field>\n  </ng-template>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.max-pending-messages</mat-label>\n    <input required type="number" min="1" max="100000" step="1" matInput formControlName="maxPendingMsgs">\n    <mat-error *ngIf="msgDelayConfigForm.get(\'maxPendingMsgs\').hasError(\'required\')">\n      {{ \'tb.rulenode.max-pending-messages-required\' | translate }}\n    </mat-error>\n    <mat-error *ngIf="msgDelayConfigForm.get(\'maxPendingMsgs\').hasError(\'min\')">\n      {{ \'tb.rulenode.max-pending-messages-range\' | translate }}\n    </mat-error>\n    <mat-error *ngIf="msgDelayConfigForm.get(\'maxPendingMsgs\').hasError(\'max\')">\n      {{ \'tb.rulenode.max-pending-messages-range\' | translate }}\n    </mat-error>\n  </mat-form-field>\n</section>\n',dependencies:[{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:Q.MatCheckbox,selector:"mat-checkbox",inputs:["disableRipple","color","tabIndex"],exportAs:["matCheckbox"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatHint,selector:"mat-hint",inputs:["align","id"]},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NumberValueAccessor,selector:"input[type=number][formControlName],input[type=number][formControl],input[type=number][ngModel]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.MinValidator,selector:"input[type=number][min][formControlName],input[type=number][min][formControl],input[type=number][min][ngModel]",inputs:["min"]},{kind:"directive",type:R.MaxValidator,selector:"input[type=number][max][formControlName],input[type=number][max][formControl],input[type=number][max][ngModel]",inputs:["max"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:yn,decorators:[{type:n,args:[{selector:"tb-action-node-msg-delay-config",template:'<section [formGroup]="msgDelayConfigForm" fxLayout="column">\n  <mat-checkbox formControlName="useMetadataPeriodInSecondsPatterns">\n    {{ \'tb.rulenode.use-metadata-period-in-seconds-patterns\' | translate }}\n  </mat-checkbox>\n  <div class="tb-hint" translate>tb.rulenode.use-metadata-period-in-seconds-patterns-hint</div>\n  <mat-form-field *ngIf="msgDelayConfigForm.get(\'useMetadataPeriodInSecondsPatterns\').value !== true; else periodInSecondsPattern"\n                  class="mat-block">\n    <mat-label translate>tb.rulenode.period-seconds</mat-label>\n    <input required type="number" min="0" step="1" matInput formControlName="periodInSeconds">\n    <mat-error *ngIf="msgDelayConfigForm.get(\'periodInSeconds\').hasError(\'required\')">\n      {{ \'tb.rulenode.period-seconds-required\' | translate }}\n    </mat-error>\n    <mat-error *ngIf="msgDelayConfigForm.get(\'periodInSeconds\').hasError(\'min\')">\n      {{ \'tb.rulenode.min-period-0-seconds-message\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <ng-template #periodInSecondsPattern>\n    <mat-form-field class="mat-block" subscriptSizing="dynamic">\n      <mat-label translate>tb.rulenode.period-in-seconds-pattern</mat-label>\n      <input required matInput formControlName="periodInSecondsPattern">\n      <mat-error *ngIf="msgDelayConfigForm.get(\'periodInSecondsPattern\').hasError(\'required\')">\n        {{ \'tb.rulenode.period-in-seconds-pattern-required\' | translate }}\n      </mat-error>\n      <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n    </mat-form-field>\n  </ng-template>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.max-pending-messages</mat-label>\n    <input required type="number" min="1" max="100000" step="1" matInput formControlName="maxPendingMsgs">\n    <mat-error *ngIf="msgDelayConfigForm.get(\'maxPendingMsgs\').hasError(\'required\')">\n      {{ \'tb.rulenode.max-pending-messages-required\' | translate }}\n    </mat-error>\n    <mat-error *ngIf="msgDelayConfigForm.get(\'maxPendingMsgs\').hasError(\'min\')">\n      {{ \'tb.rulenode.max-pending-messages-range\' | translate }}\n    </mat-error>\n    <mat-error *ngIf="msgDelayConfigForm.get(\'maxPendingMsgs\').hasError(\'max\')">\n      {{ \'tb.rulenode.max-pending-messages-range\' | translate }}\n    </mat-error>\n  </mat-form-field>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder}]}});class xn extends f{constructor(e,t){super(e),this.store=e,this.fb=t,this.attributeScopes=Object.keys(g),this.telemetryTypeTranslationsMap=y}configForm(){return this.pushToCloudConfigForm}onConfigurationSet(e){this.pushToCloudConfigForm=this.fb.group({scope:[e?e.scope:null,[O.required]]})}}e("PushToCloudConfigComponent",xn),xn.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:xn,deps:[{token:P.Store},{token:R.UntypedFormBuilder}],target:t.ɵɵFactoryTarget.Component}),xn.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:xn,selector:"tb-action-node-push-to-cloud-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="pushToCloudConfigForm" fxLayout="column">\n  <mat-form-field fxFlex class="mat-block">\n    <mat-label translate>attribute.attributes-scope</mat-label>\n    <mat-select formControlName="scope" required>\n      <mat-option *ngFor="let scope of attributeScopes" [value]="scope">\n        {{ telemetryTypeTranslationsMap.get(scope) | translate }}\n      </mat-option>\n    </mat-select>\n  </mat-form-field>\n</section>\n',dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"component",type:X.MatSelect,selector:"mat-select",inputs:["disabled","disableRipple","tabIndex","hideSingleSelectionIndicator"],exportAs:["matSelect"]},{kind:"component",type:ee.MatOption,selector:"mat-option",exportAs:["matOption"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:W.DefaultFlexDirective,selector:"  [fxFlex], [fxFlex.xs], [fxFlex.sm], [fxFlex.md],  [fxFlex.lg], [fxFlex.xl], [fxFlex.lt-sm], [fxFlex.lt-md],  [fxFlex.lt-lg], [fxFlex.lt-xl], [fxFlex.gt-xs], [fxFlex.gt-sm],  [fxFlex.gt-md], [fxFlex.gt-lg]",inputs:["fxFlex","fxFlex.xs","fxFlex.sm","fxFlex.md","fxFlex.lg","fxFlex.xl","fxFlex.lt-sm","fxFlex.lt-md","fxFlex.lt-lg","fxFlex.lt-xl","fxFlex.gt-xs","fxFlex.gt-sm","fxFlex.gt-md","fxFlex.gt-lg"]},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:xn,decorators:[{type:n,args:[{selector:"tb-action-node-push-to-cloud-config",template:'<section [formGroup]="pushToCloudConfigForm" fxLayout="column">\n  <mat-form-field fxFlex class="mat-block">\n    <mat-label translate>attribute.attributes-scope</mat-label>\n    <mat-select formControlName="scope" required>\n      <mat-option *ngFor="let scope of attributeScopes" [value]="scope">\n        {{ telemetryTypeTranslationsMap.get(scope) | translate }}\n      </mat-option>\n    </mat-select>\n  </mat-form-field>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder}]}});class bn extends f{constructor(e,t){super(e),this.store=e,this.fb=t,this.attributeScopes=Object.keys(g),this.telemetryTypeTranslationsMap=y}configForm(){return this.pushToEdgeConfigForm}onConfigurationSet(e){this.pushToEdgeConfigForm=this.fb.group({scope:[e?e.scope:null,[O.required]]})}}e("PushToEdgeConfigComponent",bn),bn.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:bn,deps:[{token:P.Store},{token:R.UntypedFormBuilder}],target:t.ɵɵFactoryTarget.Component}),bn.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:bn,selector:"tb-action-node-push-to-edge-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="pushToEdgeConfigForm" fxLayout="column">\n  <mat-form-field fxFlex class="mat-block">\n    <mat-label translate>attribute.attributes-scope</mat-label>\n    <mat-select formControlName="scope" required>\n      <mat-option *ngFor="let scope of attributeScopes" [value]="scope">\n        {{ telemetryTypeTranslationsMap.get(scope) | translate }}\n      </mat-option>\n    </mat-select>\n  </mat-form-field>\n</section>\n',dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"component",type:X.MatSelect,selector:"mat-select",inputs:["disabled","disableRipple","tabIndex","hideSingleSelectionIndicator"],exportAs:["matSelect"]},{kind:"component",type:ee.MatOption,selector:"mat-option",exportAs:["matOption"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:W.DefaultFlexDirective,selector:"  [fxFlex], [fxFlex.xs], [fxFlex.sm], [fxFlex.md],  [fxFlex.lg], [fxFlex.xl], [fxFlex.lt-sm], [fxFlex.lt-md],  [fxFlex.lt-lg], [fxFlex.lt-xl], [fxFlex.gt-xs], [fxFlex.gt-sm],  [fxFlex.gt-md], [fxFlex.gt-lg]",inputs:["fxFlex","fxFlex.xs","fxFlex.sm","fxFlex.md","fxFlex.lg","fxFlex.xl","fxFlex.lt-sm","fxFlex.lt-md","fxFlex.lt-lg","fxFlex.lt-xl","fxFlex.gt-xs","fxFlex.gt-sm","fxFlex.gt-md","fxFlex.gt-lg"]},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:bn,decorators:[{type:n,args:[{selector:"tb-action-node-push-to-edge-config",template:'<section [formGroup]="pushToEdgeConfigForm" fxLayout="column">\n  <mat-form-field fxFlex class="mat-block">\n    <mat-label translate>attribute.attributes-scope</mat-label>\n    <mat-select formControlName="scope" required>\n      <mat-option *ngFor="let scope of attributeScopes" [value]="scope">\n        {{ telemetryTypeTranslationsMap.get(scope) | translate }}\n      </mat-option>\n    </mat-select>\n  </mat-form-field>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder}]}});class hn extends f{constructor(e,t){super(e),this.store=e,this.fb=t}configForm(){return this.rpcReplyConfigForm}onConfigurationSet(e){this.rpcReplyConfigForm=this.fb.group({requestIdMetaDataAttribute:[e?e.requestIdMetaDataAttribute:null,[]]})}}e("RpcReplyConfigComponent",hn),hn.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:hn,deps:[{token:P.Store},{token:R.UntypedFormBuilder}],target:t.ɵɵFactoryTarget.Component}),hn.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:hn,selector:"tb-action-node-rpc-reply-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="rpcReplyConfigForm" fxLayout="column">\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.request-id-metadata-attribute</mat-label>\n    <input matInput formControlName="requestIdMetaDataAttribute">\n  </mat-form-field>\n</section>\n',dependencies:[{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:hn,decorators:[{type:n,args:[{selector:"tb-action-node-rpc-reply-config",template:'<section [formGroup]="rpcReplyConfigForm" fxLayout="column">\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.request-id-metadata-attribute</mat-label>\n    <input matInput formControlName="requestIdMetaDataAttribute">\n  </mat-form-field>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder}]}});class vn extends f{constructor(e,t){super(e),this.store=e,this.fb=t}configForm(){return this.rpcRequestConfigForm}onConfigurationSet(e){this.rpcRequestConfigForm=this.fb.group({timeoutInSeconds:[e?e.timeoutInSeconds:null,[O.required,O.min(0)]]})}}e("RpcRequestConfigComponent",vn),vn.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:vn,deps:[{token:P.Store},{token:R.UntypedFormBuilder}],target:t.ɵɵFactoryTarget.Component}),vn.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:vn,selector:"tb-action-node-rpc-request-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="rpcRequestConfigForm" fxLayout="column">\n  <mat-form-field fxFlex class="mat-block">\n    <mat-label translate>tb.rulenode.timeout-sec</mat-label>\n    <input type="number" min="0" step="1" matInput formControlName="timeoutInSeconds" required>\n    <mat-error *ngIf="rpcRequestConfigForm.get(\'timeoutInSeconds\').hasError(\'required\')">\n      {{ \'tb.rulenode.timeout-required\' | translate }}\n    </mat-error>\n    <mat-error *ngIf="rpcRequestConfigForm.get(\'timeoutInSeconds\').hasError(\'min\')">\n      {{ \'tb.rulenode.min-timeout-message\' | translate }}\n    </mat-error>\n  </mat-form-field>\n</section>\n',dependencies:[{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:W.DefaultFlexDirective,selector:"  [fxFlex], [fxFlex.xs], [fxFlex.sm], [fxFlex.md],  [fxFlex.lg], [fxFlex.xl], [fxFlex.lt-sm], [fxFlex.lt-md],  [fxFlex.lt-lg], [fxFlex.lt-xl], [fxFlex.gt-xs], [fxFlex.gt-sm],  [fxFlex.gt-md], [fxFlex.gt-lg]",inputs:["fxFlex","fxFlex.xs","fxFlex.sm","fxFlex.md","fxFlex.lg","fxFlex.xl","fxFlex.lt-sm","fxFlex.lt-md","fxFlex.lt-lg","fxFlex.lt-xl","fxFlex.gt-xs","fxFlex.gt-sm","fxFlex.gt-md","fxFlex.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NumberValueAccessor,selector:"input[type=number][formControlName],input[type=number][formControl],input[type=number][ngModel]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.MinValidator,selector:"input[type=number][min][formControlName],input[type=number][min][formControl],input[type=number][min][ngModel]",inputs:["min"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:vn,decorators:[{type:n,args:[{selector:"tb-action-node-rpc-request-config",template:'<section [formGroup]="rpcRequestConfigForm" fxLayout="column">\n  <mat-form-field fxFlex class="mat-block">\n    <mat-label translate>tb.rulenode.timeout-sec</mat-label>\n    <input type="number" min="0" step="1" matInput formControlName="timeoutInSeconds" required>\n    <mat-error *ngIf="rpcRequestConfigForm.get(\'timeoutInSeconds\').hasError(\'required\')">\n      {{ \'tb.rulenode.timeout-required\' | translate }}\n    </mat-error>\n    <mat-error *ngIf="rpcRequestConfigForm.get(\'timeoutInSeconds\').hasError(\'min\')">\n      {{ \'tb.rulenode.min-timeout-message\' | translate }}\n    </mat-error>\n  </mat-form-field>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder}]}});class Cn extends L{get required(){return this.requiredValue}set required(e){this.requiredValue=Le(e)}constructor(e,t,n,r){super(e),this.store=e,this.translate=t,this.injector=n,this.fb=r,this.propagateChange=null,this.valueChangeSubscription=null}ngOnInit(){this.ngControl=this.injector.get(_),null!=this.ngControl&&(this.ngControl.valueAccessor=this),this.kvListFormGroup=this.fb.group({}),this.kvListFormGroup.addControl("keyVals",this.fb.array([]))}keyValsFormArray(){return this.kvListFormGroup.get("keyVals")}registerOnChange(e){this.propagateChange=e}registerOnTouched(e){}setDisabledState(e){this.disabled=e,this.disabled?this.kvListFormGroup.disable({emitEvent:!1}):this.kvListFormGroup.enable({emitEvent:!1})}writeValue(e){this.valueChangeSubscription&&this.valueChangeSubscription.unsubscribe();const t=[];if(e)for(const n of Object.keys(e))Object.prototype.hasOwnProperty.call(e,n)&&t.push(this.fb.group({key:[n,[O.required]],value:[e[n],[O.required]]}));this.kvListFormGroup.setControl("keyVals",this.fb.array(t)),this.valueChangeSubscription=this.kvListFormGroup.valueChanges.subscribe((()=>{this.updateModel()}))}removeKeyVal(e){this.kvListFormGroup.get("keyVals").removeAt(e)}addKeyVal(){this.kvListFormGroup.get("keyVals").push(this.fb.group({key:["",[O.required]],value:["",[O.required]]}))}validate(e){const t=this.kvListFormGroup.get("keyVals").value;if(!t.length&&this.required)return{kvMapRequired:!0};if(!this.kvListFormGroup.valid)return{kvFieldsRequired:!0};if(this.uniqueKeyValuePairValidator)for(const e of t)if(e.key===e.value)return{uniqueKeyValuePair:!0};return null}updateModel(){const e=this.kvListFormGroup.get("keyVals").value;if(this.required&&!e.length||!this.kvListFormGroup.valid)this.propagateChange(null);else{const t={};e.forEach((e=>{t[e.key]=e.value})),this.propagateChange(t)}}}e("KvMapConfigOldComponent",Cn),Cn.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Cn,deps:[{token:P.Store},{token:Z.TranslateService},{token:t.Injector},{token:R.FormBuilder}],target:t.ɵɵFactoryTarget.Component}),Cn.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:Cn,selector:"tb-kv-map-config-old",inputs:{disabled:"disabled",uniqueKeyValuePairValidator:"uniqueKeyValuePairValidator",requiredText:"requiredText",keyText:"keyText",keyRequiredText:"keyRequiredText",valText:"valText",valRequiredText:"valRequiredText",hintText:"hintText",required:"required"},providers:[{provide:B,useExisting:a((()=>Cn)),multi:!0},{provide:K,useExisting:a((()=>Cn)),multi:!0}],usesInheritance:!0,ngImport:t,template:'<section fxLayout="column" class="tb-kv-map-config" [formGroup]="kvListFormGroup">\n  <div class="header" fxFlex fxLayout="row" fxLayoutGap="8px">\n    <span class="cell tb-required" fxFlex>{{ keyText | translate }}</span>\n    <span class="cell tb-required" fxFlex>{{ valText | translate }}</span>\n    <span [fxShow]="!disabled" style="width: 52px;" innerHTML="&nbsp"></span>\n  </div>\n  <div class="body">\n    <div class="row" fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px"\n         formArrayName="keyVals"\n         *ngFor="let keyValControl of keyValsFormArray().controls; let $index = index">\n      <mat-form-field fxFlex class="cell mat-block">\n        <input [formControl]="keyValControl.get(\'key\')" matInput required\n               placeholder="{{ keyText | translate }}"/>\n        <mat-error *ngIf="keyValControl.get(\'key\').hasError(\'required\')">\n          {{ keyRequiredText | translate }}\n        </mat-error>\n      </mat-form-field>\n      <mat-form-field fxFlex class="cell mat-block">\n        <input [formControl]="keyValControl.get(\'value\')" matInput required\n               placeholder="{{ valText | translate }}"/>\n        <mat-error *ngIf="keyValControl.get(\'value\').hasError(\'required\')">\n          {{ valRequiredText | translate }}\n        </mat-error>\n      </mat-form-field>\n      <button mat-icon-button color="primary"\n              [fxShow]="!disabled"\n              type="button"\n              (click)="removeKeyVal($index)"\n              [disabled]="isLoading$ | async"\n              matTooltip="{{ \'tb.key-val.remove-entry\' | translate }}"\n              matTooltipPosition="above">\n        <mat-icon>close</mat-icon>\n      </button>\n    </div>\n    <div *ngIf="hintText" class="tb-hint" [innerHTML]="hintText | translate | safe: \'html\'"></div>\n  </div>\n  <tb-error [error]="ngControl.hasError(\'kvMapRequired\') || ngControl.hasError(\'uniqueKeyValuePair\') ?\n                     (ngControl.hasError(\'kvMapRequired\') ? translate.instant(requiredText) :\n                     translate.instant(\'tb.key-val.unique-key-value-pair-error\', {keyText: translate.instant(keyText),\n                     valText: translate.instant(valText)})) : \'\'"></tb-error>\n  <div style="margin-top: 16px;">\n    <button mat-button mat-raised-button color="primary"\n            [fxShow]="!disabled"\n            [disabled]="isLoading$ | async"\n            (click)="addKeyVal()"\n            type="button"\n            matTooltip="{{ \'tb.key-val.add-entry\' | translate }}"\n            matTooltipPosition="above">\n      <mat-icon>add</mat-icon>\n      {{ \'action.add\' | translate }}\n    </button>\n  </div>\n</section>\n',styles:[":host .tb-kv-map-config{margin-bottom:16px}:host .tb-kv-map-config .header{padding-left:5px;padding-right:5px;padding-bottom:5px}:host .tb-kv-map-config .header .cell{padding-left:5px;padding-right:5px;color:#757575;font-size:12px;font-weight:700;white-space:nowrap}:host .tb-kv-map-config .header .tb-required:after{color:#757575;font-size:12px;font-weight:700}:host .tb-kv-map-config .body{padding-left:5px;padding-right:5px;padding-bottom:0;max-height:300px;overflow:auto}:host .tb-kv-map-config .body .cell{padding-left:5px;padding-right:5px}:host .tb-kv-map-config tb-error{display:block;margin-top:-12px}\n",':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n'],dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:Ne.TbErrorComponent,selector:"tb-error",inputs:["noMargin","error"]},{kind:"component",type:de.MatButton,selector:"    button[mat-button], button[mat-raised-button], button[mat-flat-button],    button[mat-stroked-button]  ",inputs:["disabled","disableRipple","color"],exportAs:["matButton"]},{kind:"component",type:de.MatIconButton,selector:"button[mat-icon-button]",inputs:["disabled","disableRipple","color"],exportAs:["matButton"]},{kind:"component",type:ue.MatIcon,selector:"mat-icon",inputs:["color","inline","svgIcon","fontSet","fontIcon"],exportAs:["matIcon"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"directive",type:ce.MatTooltip,selector:"[matTooltip]",exportAs:["matTooltip"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:W.DefaultLayoutGapDirective,selector:"  [fxLayoutGap], [fxLayoutGap.xs], [fxLayoutGap.sm], [fxLayoutGap.md],  [fxLayoutGap.lg], [fxLayoutGap.xl], [fxLayoutGap.lt-sm], [fxLayoutGap.lt-md],  [fxLayoutGap.lt-lg], [fxLayoutGap.lt-xl], [fxLayoutGap.gt-xs], [fxLayoutGap.gt-sm],  [fxLayoutGap.gt-md], [fxLayoutGap.gt-lg]",inputs:["fxLayoutGap","fxLayoutGap.xs","fxLayoutGap.sm","fxLayoutGap.md","fxLayoutGap.lg","fxLayoutGap.xl","fxLayoutGap.lt-sm","fxLayoutGap.lt-md","fxLayoutGap.lt-lg","fxLayoutGap.lt-xl","fxLayoutGap.gt-xs","fxLayoutGap.gt-sm","fxLayoutGap.gt-md","fxLayoutGap.gt-lg"]},{kind:"directive",type:W.DefaultLayoutAlignDirective,selector:"  [fxLayoutAlign], [fxLayoutAlign.xs], [fxLayoutAlign.sm], [fxLayoutAlign.md],  [fxLayoutAlign.lg], [fxLayoutAlign.xl], [fxLayoutAlign.lt-sm], [fxLayoutAlign.lt-md],  [fxLayoutAlign.lt-lg], [fxLayoutAlign.lt-xl], [fxLayoutAlign.gt-xs], [fxLayoutAlign.gt-sm],  [fxLayoutAlign.gt-md], [fxLayoutAlign.gt-lg]",inputs:["fxLayoutAlign","fxLayoutAlign.xs","fxLayoutAlign.sm","fxLayoutAlign.md","fxLayoutAlign.lg","fxLayoutAlign.xl","fxLayoutAlign.lt-sm","fxLayoutAlign.lt-md","fxLayoutAlign.lt-lg","fxLayoutAlign.lt-xl","fxLayoutAlign.gt-xs","fxLayoutAlign.gt-sm","fxLayoutAlign.gt-md","fxLayoutAlign.gt-lg"]},{kind:"directive",type:W.DefaultFlexDirective,selector:"  [fxFlex], [fxFlex.xs], [fxFlex.sm], [fxFlex.md],  [fxFlex.lg], [fxFlex.xl], [fxFlex.lt-sm], [fxFlex.lt-md],  [fxFlex.lt-lg], [fxFlex.lt-xl], [fxFlex.gt-xs], [fxFlex.gt-sm],  [fxFlex.gt-md], [fxFlex.gt-lg]",inputs:["fxFlex","fxFlex.xs","fxFlex.sm","fxFlex.md","fxFlex.lg","fxFlex.xl","fxFlex.lt-sm","fxFlex.lt-md","fxFlex.lt-lg","fxFlex.lt-xl","fxFlex.gt-xs","fxFlex.gt-sm","fxFlex.gt-md","fxFlex.gt-lg"]},{kind:"directive",type:Se.DefaultShowHideDirective,selector:"  [fxShow], [fxShow.print],  [fxShow.xs], [fxShow.sm], [fxShow.md], [fxShow.lg], [fxShow.xl],  [fxShow.lt-sm], [fxShow.lt-md], [fxShow.lt-lg], [fxShow.lt-xl],  [fxShow.gt-xs], [fxShow.gt-sm], [fxShow.gt-md], [fxShow.gt-lg],  [fxHide], [fxHide.print],  [fxHide.xs], [fxHide.sm], [fxHide.md], [fxHide.lg], [fxHide.xl],  [fxHide.lt-sm], [fxHide.lt-md], [fxHide.lt-lg], [fxHide.lt-xl],  [fxHide.gt-xs], [fxHide.gt-sm], [fxHide.gt-md], [fxHide.gt-lg]",inputs:["fxShow","fxShow.print","fxShow.xs","fxShow.sm","fxShow.md","fxShow.lg","fxShow.xl","fxShow.lt-sm","fxShow.lt-md","fxShow.lt-lg","fxShow.lt-xl","fxShow.gt-xs","fxShow.gt-sm","fxShow.gt-md","fxShow.gt-lg","fxHide","fxHide.print","fxHide.xs","fxHide.sm","fxHide.md","fxHide.lg","fxHide.xl","fxHide.lt-sm","fxHide.lt-md","fxHide.lt-lg","fxHide.lt-xl","fxHide.gt-xs","fxHide.gt-sm","fxHide.gt-md","fxHide.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.FormControlDirective,selector:"[formControl]",inputs:["formControl","disabled","ngModel"],outputs:["ngModelChange"],exportAs:["ngForm"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormArrayName,selector:"[formArrayName]",inputs:["formArrayName"]},{kind:"pipe",type:H.AsyncPipe,name:"async"},{kind:"pipe",type:he.SafePipe,name:"safe"},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Cn,decorators:[{type:n,args:[{selector:"tb-kv-map-config-old",providers:[{provide:B,useExisting:a((()=>Cn)),multi:!0},{provide:K,useExisting:a((()=>Cn)),multi:!0}],template:'<section fxLayout="column" class="tb-kv-map-config" [formGroup]="kvListFormGroup">\n  <div class="header" fxFlex fxLayout="row" fxLayoutGap="8px">\n    <span class="cell tb-required" fxFlex>{{ keyText | translate }}</span>\n    <span class="cell tb-required" fxFlex>{{ valText | translate }}</span>\n    <span [fxShow]="!disabled" style="width: 52px;" innerHTML="&nbsp"></span>\n  </div>\n  <div class="body">\n    <div class="row" fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px"\n         formArrayName="keyVals"\n         *ngFor="let keyValControl of keyValsFormArray().controls; let $index = index">\n      <mat-form-field fxFlex class="cell mat-block">\n        <input [formControl]="keyValControl.get(\'key\')" matInput required\n               placeholder="{{ keyText | translate }}"/>\n        <mat-error *ngIf="keyValControl.get(\'key\').hasError(\'required\')">\n          {{ keyRequiredText | translate }}\n        </mat-error>\n      </mat-form-field>\n      <mat-form-field fxFlex class="cell mat-block">\n        <input [formControl]="keyValControl.get(\'value\')" matInput required\n               placeholder="{{ valText | translate }}"/>\n        <mat-error *ngIf="keyValControl.get(\'value\').hasError(\'required\')">\n          {{ valRequiredText | translate }}\n        </mat-error>\n      </mat-form-field>\n      <button mat-icon-button color="primary"\n              [fxShow]="!disabled"\n              type="button"\n              (click)="removeKeyVal($index)"\n              [disabled]="isLoading$ | async"\n              matTooltip="{{ \'tb.key-val.remove-entry\' | translate }}"\n              matTooltipPosition="above">\n        <mat-icon>close</mat-icon>\n      </button>\n    </div>\n    <div *ngIf="hintText" class="tb-hint" [innerHTML]="hintText | translate | safe: \'html\'"></div>\n  </div>\n  <tb-error [error]="ngControl.hasError(\'kvMapRequired\') || ngControl.hasError(\'uniqueKeyValuePair\') ?\n                     (ngControl.hasError(\'kvMapRequired\') ? translate.instant(requiredText) :\n                     translate.instant(\'tb.key-val.unique-key-value-pair-error\', {keyText: translate.instant(keyText),\n                     valText: translate.instant(valText)})) : \'\'"></tb-error>\n  <div style="margin-top: 16px;">\n    <button mat-button mat-raised-button color="primary"\n            [fxShow]="!disabled"\n            [disabled]="isLoading$ | async"\n            (click)="addKeyVal()"\n            type="button"\n            matTooltip="{{ \'tb.key-val.add-entry\' | translate }}"\n            matTooltipPosition="above">\n      <mat-icon>add</mat-icon>\n      {{ \'action.add\' | translate }}\n    </button>\n  </div>\n</section>\n',styles:[":host .tb-kv-map-config{margin-bottom:16px}:host .tb-kv-map-config .header{padding-left:5px;padding-right:5px;padding-bottom:5px}:host .tb-kv-map-config .header .cell{padding-left:5px;padding-right:5px;color:#757575;font-size:12px;font-weight:700;white-space:nowrap}:host .tb-kv-map-config .header .tb-required:after{color:#757575;font-size:12px;font-weight:700}:host .tb-kv-map-config .body{padding-left:5px;padding-right:5px;padding-bottom:0;max-height:300px;overflow:auto}:host .tb-kv-map-config .body .cell{padding-left:5px;padding-right:5px}:host .tb-kv-map-config tb-error{display:block;margin-top:-12px}\n",':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n']}]}],ctorParameters:function(){return[{type:P.Store},{type:Z.TranslateService},{type:t.Injector},{type:R.FormBuilder}]},propDecorators:{disabled:[{type:i}],uniqueKeyValuePairValidator:[{type:i}],requiredText:[{type:i}],keyText:[{type:i}],keyRequiredText:[{type:i}],valText:[{type:i}],valRequiredText:[{type:i}],hintText:[{type:i}],required:[{type:i}]}});class Fn extends f{constructor(e,t){super(e),this.store=e,this.fb=t}configForm(){return this.saveToCustomTableConfigForm}onConfigurationSet(e){this.saveToCustomTableConfigForm=this.fb.group({tableName:[e?e.tableName:null,[O.required,O.pattern(/.*\S.*/)]],fieldsMapping:[e?e.fieldsMapping:null,[O.required]]})}prepareOutputConfig(e){return e.tableName=e.tableName.trim(),e}}e("SaveToCustomTableConfigComponent",Fn),Fn.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Fn,deps:[{token:P.Store},{token:R.UntypedFormBuilder}],target:t.ɵɵFactoryTarget.Component}),Fn.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:Fn,selector:"tb-action-node-custom-table-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="saveToCustomTableConfigForm" fxLayout="column">\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.custom-table-name</mat-label>\n    <input required matInput formControlName="tableName">\n    <mat-error *ngIf="saveToCustomTableConfigForm.get(\'tableName\').hasError(\'required\') ||\n                      saveToCustomTableConfigForm.get(\'tableName\').hasError(\'pattern\')">\n      {{ \'tb.rulenode.custom-table-name-required\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.custom-table-hint</mat-hint>\n  </mat-form-field>\n  <label translate class="tb-title tb-required">tb.rulenode.fields-mapping</label>\n  <tb-kv-map-config-old\n    required\n    formControlName="fieldsMapping"\n    requiredText="tb.rulenode.fields-mapping-required"\n    keyText="tb.rulenode.message-field"\n    keyRequiredText="tb.rulenode.message-field-required"\n    valText="tb.rulenode.table-col"\n    valRequiredText="tb.rulenode.table-col-required">\n  </tb-kv-map-config-old>\n</section>\n',dependencies:[{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatHint,selector:"mat-hint",inputs:["align","id"]},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"component",type:Cn,selector:"tb-kv-map-config-old",inputs:["disabled","uniqueKeyValuePairValidator","requiredText","keyText","keyRequiredText","valText","valRequiredText","hintText","required"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Fn,decorators:[{type:n,args:[{selector:"tb-action-node-custom-table-config",template:'<section [formGroup]="saveToCustomTableConfigForm" fxLayout="column">\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.custom-table-name</mat-label>\n    <input required matInput formControlName="tableName">\n    <mat-error *ngIf="saveToCustomTableConfigForm.get(\'tableName\').hasError(\'required\') ||\n                      saveToCustomTableConfigForm.get(\'tableName\').hasError(\'pattern\')">\n      {{ \'tb.rulenode.custom-table-name-required\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.custom-table-hint</mat-hint>\n  </mat-form-field>\n  <label translate class="tb-title tb-required">tb.rulenode.fields-mapping</label>\n  <tb-kv-map-config-old\n    required\n    formControlName="fieldsMapping"\n    requiredText="tb.rulenode.fields-mapping-required"\n    keyText="tb.rulenode.message-field"\n    keyRequiredText="tb.rulenode.message-field-required"\n    valText="tb.rulenode.table-col"\n    valRequiredText="tb.rulenode.table-col-required">\n  </tb-kv-map-config-old>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder}]}});class kn extends f{constructor(e,t){super(e),this.store=e,this.fb=t}configForm(){return this.timeseriesConfigForm}onConfigurationSet(e){this.timeseriesConfigForm=this.fb.group({defaultTTL:[e?e.defaultTTL:null,[O.required,O.min(0)]],skipLatestPersistence:[!!e&&e.skipLatestPersistence,[]],useServerTs:[!!e&&e.useServerTs,[]]})}}e("TimeseriesConfigComponent",kn),kn.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:kn,deps:[{token:P.Store},{token:R.UntypedFormBuilder}],target:t.ɵɵFactoryTarget.Component}),kn.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:kn,selector:"tb-action-node-timeseries-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="timeseriesConfigForm" fxLayout="column">\n  <mat-form-field fxFlex class="mat-block">\n    <mat-label translate>tb.rulenode.default-ttl</mat-label>\n    <input type="number" min="0" step="1" matInput formControlName="defaultTTL" required>\n    <mat-error *ngIf="timeseriesConfigForm.get(\'defaultTTL\').hasError(\'required\')">\n      {{ \'tb.rulenode.default-ttl-required\' | translate }}\n    </mat-error>\n    <mat-error *ngIf="timeseriesConfigForm.get(\'defaultTTL\').hasError(\'min\')">\n      {{ \'tb.rulenode.min-default-ttl-message\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <mat-checkbox fxFlex formControlName="skipLatestPersistence">\n    {{ \'tb.rulenode.skip-latest-persistence\' | translate }}\n  </mat-checkbox>\n  <mat-checkbox fxFlex formControlName="useServerTs">\n    {{ \'tb.rulenode.use-server-ts\' | translate }}\n  </mat-checkbox>\n  <div class="tb-hint" translate>tb.rulenode.use-server-ts-hint</div>\n</section>\n',dependencies:[{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:Q.MatCheckbox,selector:"mat-checkbox",inputs:["disableRipple","color","tabIndex"],exportAs:["matCheckbox"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:W.DefaultFlexDirective,selector:"  [fxFlex], [fxFlex.xs], [fxFlex.sm], [fxFlex.md],  [fxFlex.lg], [fxFlex.xl], [fxFlex.lt-sm], [fxFlex.lt-md],  [fxFlex.lt-lg], [fxFlex.lt-xl], [fxFlex.gt-xs], [fxFlex.gt-sm],  [fxFlex.gt-md], [fxFlex.gt-lg]",inputs:["fxFlex","fxFlex.xs","fxFlex.sm","fxFlex.md","fxFlex.lg","fxFlex.xl","fxFlex.lt-sm","fxFlex.lt-md","fxFlex.lt-lg","fxFlex.lt-xl","fxFlex.gt-xs","fxFlex.gt-sm","fxFlex.gt-md","fxFlex.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NumberValueAccessor,selector:"input[type=number][formControlName],input[type=number][formControl],input[type=number][ngModel]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.MinValidator,selector:"input[type=number][min][formControlName],input[type=number][min][formControl],input[type=number][min][ngModel]",inputs:["min"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:kn,decorators:[{type:n,args:[{selector:"tb-action-node-timeseries-config",template:'<section [formGroup]="timeseriesConfigForm" fxLayout="column">\n  <mat-form-field fxFlex class="mat-block">\n    <mat-label translate>tb.rulenode.default-ttl</mat-label>\n    <input type="number" min="0" step="1" matInput formControlName="defaultTTL" required>\n    <mat-error *ngIf="timeseriesConfigForm.get(\'defaultTTL\').hasError(\'required\')">\n      {{ \'tb.rulenode.default-ttl-required\' | translate }}\n    </mat-error>\n    <mat-error *ngIf="timeseriesConfigForm.get(\'defaultTTL\').hasError(\'min\')">\n      {{ \'tb.rulenode.min-default-ttl-message\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <mat-checkbox fxFlex formControlName="skipLatestPersistence">\n    {{ \'tb.rulenode.skip-latest-persistence\' | translate }}\n  </mat-checkbox>\n  <mat-checkbox fxFlex formControlName="useServerTs">\n    {{ \'tb.rulenode.use-server-ts\' | translate }}\n  </mat-checkbox>\n  <div class="tb-hint" translate>tb.rulenode.use-server-ts-hint</div>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder}]}});class Ln extends f{constructor(e,t){super(e),this.store=e,this.fb=t}configForm(){return this.unassignCustomerConfigForm}onConfigurationSet(e){this.unassignCustomerConfigForm=this.fb.group({customerNamePattern:[e?e.customerNamePattern:null,[O.required,O.pattern(/.*\S.*/)]],customerCacheExpiration:[e?e.customerCacheExpiration:null,[O.required,O.min(0)]]})}prepareOutputConfig(e){return e.customerNamePattern=e.customerNamePattern.trim(),e}}e("UnassignCustomerConfigComponent",Ln),Ln.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Ln,deps:[{token:P.Store},{token:R.UntypedFormBuilder}],target:t.ɵɵFactoryTarget.Component}),Ln.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:Ln,selector:"tb-action-node-un-assign-to-customer-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="unassignCustomerConfigForm" fxLayout="column">\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.customer-name-pattern</mat-label>\n    <input required matInput formControlName="customerNamePattern">\n    <mat-error *ngIf="unassignCustomerConfigForm.get(\'customerNamePattern\').hasError(\'required\') ||\n                      unassignCustomerConfigForm.get(\'customerNamePattern\').hasError(\'pattern\')">\n      {{ \'tb.rulenode.customer-name-pattern-required\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n  </mat-form-field>\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.customer-cache-expiration</mat-label>\n    <input required type="number" min="0" step="1" matInput formControlName="customerCacheExpiration">\n    <mat-error *ngIf="unassignCustomerConfigForm.get(\'customerCacheExpiration\').hasError(\'required\')">\n      {{ \'tb.rulenode.customer-cache-expiration-required\' | translate }}\n    </mat-error>\n    <mat-error *ngIf="unassignCustomerConfigForm.get(\'customerCacheExpiration\').hasError(\'min\')">\n      {{ \'tb.rulenode.customer-cache-expiration-range\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.customer-cache-expiration-hint</mat-hint>\n  </mat-form-field>\n</section>\n',dependencies:[{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatHint,selector:"mat-hint",inputs:["align","id"]},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NumberValueAccessor,selector:"input[type=number][formControlName],input[type=number][formControl],input[type=number][ngModel]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.MinValidator,selector:"input[type=number][min][formControlName],input[type=number][min][formControl],input[type=number][min][ngModel]",inputs:["min"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Ln,decorators:[{type:n,args:[{selector:"tb-action-node-un-assign-to-customer-config",template:'<section [formGroup]="unassignCustomerConfigForm" fxLayout="column">\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.customer-name-pattern</mat-label>\n    <input required matInput formControlName="customerNamePattern">\n    <mat-error *ngIf="unassignCustomerConfigForm.get(\'customerNamePattern\').hasError(\'required\') ||\n                      unassignCustomerConfigForm.get(\'customerNamePattern\').hasError(\'pattern\')">\n      {{ \'tb.rulenode.customer-name-pattern-required\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n  </mat-form-field>\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.customer-cache-expiration</mat-label>\n    <input required type="number" min="0" step="1" matInput formControlName="customerCacheExpiration">\n    <mat-error *ngIf="unassignCustomerConfigForm.get(\'customerCacheExpiration\').hasError(\'required\')">\n      {{ \'tb.rulenode.customer-cache-expiration-required\' | translate }}\n    </mat-error>\n    <mat-error *ngIf="unassignCustomerConfigForm.get(\'customerCacheExpiration\').hasError(\'min\')">\n      {{ \'tb.rulenode.customer-cache-expiration-range\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.customer-cache-expiration-hint</mat-hint>\n  </mat-form-field>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder}]}});class Tn extends f{constructor(e,t){super(e),this.store=e,this.fb=t,this.attributeScopeMap=g,this.attributeScopes=Object.keys(g),this.telemetryTypeTranslationsMap=y,this.separatorKeysCodes=[ge,ye,xe]}configForm(){return this.deleteAttributesConfigForm}onConfigurationSet(e){this.deleteAttributesConfigForm=this.fb.group({scope:[e?e.scope:null,[O.required]],keys:[e?e.keys:null,[O.required]],sendAttributesDeletedNotification:[!!e&&e.sendAttributesDeletedNotification,[]],notifyDevice:[!!e&&e.notifyDevice,[]]}),this.deleteAttributesConfigForm.get("scope").valueChanges.subscribe((e=>{e!==g.SHARED_SCOPE&&this.deleteAttributesConfigForm.get("notifyDevice").patchValue(!1,{emitEvent:!1})}))}removeKey(e){const t=this.deleteAttributesConfigForm.get("keys").value,n=t.indexOf(e);n>=0&&(t.splice(n,1),this.deleteAttributesConfigForm.get("keys").patchValue(t,{emitEvent:!0}))}addKey(e){const t=e.input;let n=e.value;if((n||"").trim()){n=n.trim();let e=this.deleteAttributesConfigForm.get("keys").value;e&&-1!==e.indexOf(n)||(e||(e=[]),e.push(n),this.deleteAttributesConfigForm.get("keys").patchValue(e,{emitEvent:!0}))}t&&(t.value="")}}e("DeleteAttributesConfigComponent",Tn),Tn.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Tn,deps:[{token:P.Store},{token:R.UntypedFormBuilder}],target:t.ɵɵFactoryTarget.Component}),Tn.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:Tn,selector:"tb-action-node-delete-attributes-config",viewQueries:[{propertyName:"attributeChipList",first:!0,predicate:["attributeChipList"],descendants:!0}],usesInheritance:!0,ngImport:t,template:'<section [formGroup]="deleteAttributesConfigForm" fxLayout="column">\n  <mat-form-field>\n    <mat-label>{{ \'attribute.attributes-scope\' | translate }}</mat-label>\n    <mat-select required\n                class="tb-entity-type-select" matInput formControlName="scope">\n      <mat-option *ngFor="let scope of attributeScopes" [value]="scope">\n        {{ telemetryTypeTranslationsMap.get(scope) | translate }}\n      </mat-option>\n    </mat-select>\n  </mat-form-field>\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label>{{ \'tb.rulenode.attributes-keys\' | translate }}</mat-label>\n    <mat-chip-grid formControlName="keys" #attributeChipList>\n      <mat-chip-row\n        *ngFor="let key of deleteAttributesConfigForm.get(\'keys\').value;"\n        (removed)="removeKey(key)">\n        {{key}}\n        <mat-icon matChipRemove>close</mat-icon>\n      </mat-chip-row>\n      <input matInput type="text"\n             [matChipInputFor]="attributeChipList"\n             [matChipInputSeparatorKeyCodes]="separatorKeysCodes"\n             (matChipInputTokenEnd)="addKey($event)"\n             [matChipInputAddOnBlur]="true">\n    </mat-chip-grid>\n    <mat-error *ngIf="deleteAttributesConfigForm.get(\'keys\').hasError(\'required\')">{{ \'tb.rulenode.attributes-keys-required\' | translate }}</mat-error>\n    <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n  </mat-form-field>\n  <mat-checkbox formControlName="sendAttributesDeletedNotification">\n    {{ \'tb.rulenode.send-attributes-deleted-notification\' | translate }}\n  </mat-checkbox>\n  <div class="tb-hint" translate>tb.rulenode.send-attributes-deleted-notification-hint</div>\n  <div *ngIf="deleteAttributesConfigForm.get(\'scope\').value === attributeScopeMap.SHARED_SCOPE">\n    <mat-checkbox formControlName="notifyDevice">\n      {{ \'tb.rulenode.notify-device\' | translate }}\n    </mat-checkbox>\n    <div class="tb-hint" translate>tb.rulenode.notify-device-on-delete-hint</div>\n  </div>\n</section>\n',styles:[':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n'],dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:Q.MatCheckbox,selector:"mat-checkbox",inputs:["disableRipple","color","tabIndex"],exportAs:["matCheckbox"]},{kind:"component",type:ue.MatIcon,selector:"mat-icon",inputs:["color","inline","svgIcon","fontSet","fontIcon"],exportAs:["matIcon"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatHint,selector:"mat-hint",inputs:["align","id"]},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"component",type:X.MatSelect,selector:"mat-select",inputs:["disabled","disableRipple","tabIndex","hideSingleSelectionIndicator"],exportAs:["matSelect"]},{kind:"component",type:ee.MatOption,selector:"mat-option",exportAs:["matOption"]},{kind:"component",type:be.MatChipGrid,selector:"mat-chip-grid",inputs:["tabIndex","disabled","placeholder","required","value","errorStateMatcher"],outputs:["change","valueChange"]},{kind:"directive",type:be.MatChipInput,selector:"input[matChipInputFor]",inputs:["matChipInputFor","matChipInputAddOnBlur","matChipInputSeparatorKeyCodes","placeholder","id","disabled"],outputs:["matChipInputTokenEnd"],exportAs:["matChipInput","matChipInputFor"]},{kind:"directive",type:be.MatChipRemove,selector:"[matChipRemove]"},{kind:"component",type:be.MatChipRow,selector:"mat-chip-row, [mat-chip-row], mat-basic-chip-row, [mat-basic-chip-row]",inputs:["color","disabled","disableRipple","tabIndex","editable"],outputs:["edited"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Tn,decorators:[{type:n,args:[{selector:"tb-action-node-delete-attributes-config",template:'<section [formGroup]="deleteAttributesConfigForm" fxLayout="column">\n  <mat-form-field>\n    <mat-label>{{ \'attribute.attributes-scope\' | translate }}</mat-label>\n    <mat-select required\n                class="tb-entity-type-select" matInput formControlName="scope">\n      <mat-option *ngFor="let scope of attributeScopes" [value]="scope">\n        {{ telemetryTypeTranslationsMap.get(scope) | translate }}\n      </mat-option>\n    </mat-select>\n  </mat-form-field>\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label>{{ \'tb.rulenode.attributes-keys\' | translate }}</mat-label>\n    <mat-chip-grid formControlName="keys" #attributeChipList>\n      <mat-chip-row\n        *ngFor="let key of deleteAttributesConfigForm.get(\'keys\').value;"\n        (removed)="removeKey(key)">\n        {{key}}\n        <mat-icon matChipRemove>close</mat-icon>\n      </mat-chip-row>\n      <input matInput type="text"\n             [matChipInputFor]="attributeChipList"\n             [matChipInputSeparatorKeyCodes]="separatorKeysCodes"\n             (matChipInputTokenEnd)="addKey($event)"\n             [matChipInputAddOnBlur]="true">\n    </mat-chip-grid>\n    <mat-error *ngIf="deleteAttributesConfigForm.get(\'keys\').hasError(\'required\')">{{ \'tb.rulenode.attributes-keys-required\' | translate }}</mat-error>\n    <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n  </mat-form-field>\n  <mat-checkbox formControlName="sendAttributesDeletedNotification">\n    {{ \'tb.rulenode.send-attributes-deleted-notification\' | translate }}\n  </mat-checkbox>\n  <div class="tb-hint" translate>tb.rulenode.send-attributes-deleted-notification-hint</div>\n  <div *ngIf="deleteAttributesConfigForm.get(\'scope\').value === attributeScopeMap.SHARED_SCOPE">\n    <mat-checkbox formControlName="notifyDevice">\n      {{ \'tb.rulenode.notify-device\' | translate }}\n    </mat-checkbox>\n    <div class="tb-hint" translate>tb.rulenode.notify-device-on-delete-hint</div>\n  </div>\n</section>\n',styles:[':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n']}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder}]},propDecorators:{attributeChipList:[{type:o,args:["attributeChipList"]}]}});class In extends L{get function(){return this.functionValue}set function(e){e&&this.functionValue!==e&&(this.functionValue=e,this.setupArgumentsFormGroup(!0))}constructor(e,t){super(e),this.store=e,this.fb=t,this.maxArgs=16,this.minArgs=1,this.displayArgumentName=!1,this.mathFunctionMap=Wt,this.ArgumentType=Zt,this.attributeScopeMap=pn,this.argumentTypeMap=on,this.arguments=Object.values(Zt),this.attributeScope=Object.values(sn),this.propagateChange=null,this.valueChangeSubscription=[]}ngOnInit(){this.argumentsFormGroup=this.fb.group({arguments:this.fb.array([])}),this.valueChangeSubscription.push(this.argumentsFormGroup.valueChanges.subscribe((()=>{this.updateModel()}))),this.setupArgumentsFormGroup()}onDrop(e){const t=this.argumentsFormArray,n=t.at(e.previousIndex);t.removeAt(e.previousIndex),t.insert(e.currentIndex,n),this.updateArgumentNames()}get argumentsFormArray(){return this.argumentsFormGroup.get("arguments")}registerOnChange(e){this.propagateChange=e}registerOnTouched(e){}setDisabledState(e){this.disabled=e,this.disabled?this.argumentsFormGroup.disable({emitEvent:!1}):(this.argumentsFormGroup.enable({emitEvent:!1}),this.argumentsFormArray.controls.forEach((e=>this.updateArgumentControlValidators(e))))}ngOnDestroy(){this.valueChangeSubscription.length&&this.valueChangeSubscription.forEach((e=>e.unsubscribe()))}writeValue(e){const t=[];e&&e.forEach(((e,n)=>{t.push(this.createArgumentControl(e,n))})),this.argumentsFormGroup.setControl("arguments",this.fb.array(t),{emitEvent:!1}),this.setupArgumentsFormGroup()}removeArgument(e){this.argumentsFormArray.removeAt(e),this.updateArgumentNames()}addArgument(e=!0){const t=this.argumentsFormArray,n=this.createArgumentControl(null,t.length);t.push(n,{emitEvent:e})}validate(e){return this.argumentsFormGroup.valid?null:{argumentsRequired:!0}}setupArgumentsFormGroup(e=!1){if(this.function&&(this.maxArgs=this.mathFunctionMap.get(this.function).maxArgs,this.minArgs=this.mathFunctionMap.get(this.function).minArgs,this.displayArgumentName=this.function===Yt.CUSTOM),this.argumentsFormGroup){for(this.argumentsFormGroup.get("arguments").setValidators([O.minLength(this.minArgs),O.maxLength(this.maxArgs)]);this.argumentsFormArray.length>this.maxArgs;)this.removeArgument(this.maxArgs-1);for(;this.argumentsFormArray.length<this.minArgs;)this.addArgument(e);this.argumentsFormGroup.get("arguments").updateValueAndValidity({emitEvent:!1})}}createArgumentControl(e,t){const n=this.fb.group({type:[e?.type,[O.required]],key:[e?.key,[O.required]],name:[ln[t],[O.required]],attributeScope:[e?.attributeScope??sn.SERVER_SCOPE,[O.required]],defaultValue:[e?.defaultValue?e?.defaultValue:null]});return this.updateArgumentControlValidators(n),this.valueChangeSubscription.push(n.get("type").valueChanges.subscribe((()=>{this.updateArgumentControlValidators(n),n.get("attributeScope").updateValueAndValidity({emitEvent:!1}),n.get("defaultValue").updateValueAndValidity({emitEvent:!1})}))),n}updateArgumentControlValidators(e){const t=e.get("type").value;t===Zt.ATTRIBUTE?e.get("attributeScope").enable({emitEvent:!1}):e.get("attributeScope").disable({emitEvent:!1}),t&&t!==Zt.CONSTANT?e.get("defaultValue").enable({emitEvent:!1}):e.get("defaultValue").disable({emitEvent:!1})}updateArgumentNames(){this.argumentsFormArray.controls.forEach(((e,t)=>{e.get("name").setValue(ln[t])}))}updateModel(){const e=this.argumentsFormArray.value;e.length&&this.argumentsFormGroup.valid?this.propagateChange(e):this.propagateChange(null)}}e("ArgumentsMapConfigComponent",In),In.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:In,deps:[{token:P.Store},{token:R.FormBuilder}],target:t.ɵɵFactoryTarget.Component}),In.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:In,selector:"tb-arguments-map-config",inputs:{disabled:"disabled",function:"function"},providers:[{provide:B,useExisting:a((()=>In)),multi:!0},{provide:K,useExisting:a((()=>In)),multi:!0}],usesInheritance:!0,ngImport:t,template:'<section fxLayout="column">\n\n  <div [ngClass]="{\'tb-readonly\': disabled}"\n       style="max-height: 500px; overflow: auto;">\n    <mat-list class="tb-drop-list arguments-list" cdkDropList cdkDropListOrientation="vertical"\n              [formGroup]="argumentsFormGroup"\n              (cdkDropListDropped)="onDrop($event)"\n              [cdkDropListDisabled]="disabled">\n      <mat-list-item *ngFor="let argumentControl of argumentsFormArray.controls; let $index = index"\n                     formArrayName="arguments"\n                     cdkDrag class="tb-argument tb-draggable"\n                     [cdkDragDisabled]="disabled"\n                     style="height: 100%">\n        <div fxFlex fxLayout="row" fxLayoutAlign="start center">\n          <button *ngIf="!disabled" mat-icon-button color="primary"\n                  cdkDragHandle\n                  class="tb-drag-handle handle"\n                  style="min-width: 40px; margin: 0"\n                  matTooltip="{{ \'action.drag\' | translate }}"\n                  matTooltipPosition="above">\n            <mat-icon>drag_handle</mat-icon>\n          </button>\n          <div fxFlex fxLAyout="row" fxLayoutAlign="start center" fxLayoutGap="16px">\n            <span *ngIf="displayArgumentName"\n                  style="padding: 0 10px; min-width: 20px;">{{argumentControl.get(\'name\').value}}.</span>\n            <div fxFlex fxLayout="column">\n              <mat-form-field class="mat-block">\n                <mat-label translate>tb.rulenode.argument-source-field-input</mat-label>\n                <mat-select [formControl]="argumentControl.get(\'type\')" required>\n                  <mat-select-trigger>\n                    {{ argumentTypeMap.get(argumentControl.get(\'type\').value)?.name | translate }}\n                  </mat-select-trigger>\n                  <mat-option *ngFor="let argument of arguments" [value]="argument"\n                              style="border-bottom: 1px solid #eee;">\n                    {{ argumentTypeMap.get(argument).name | translate }}\n                    <small style="display: block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">\n                      {{ argumentTypeMap.get(argument).description }}\n                    </small>\n                  </mat-option>\n                </mat-select>\n                <mat-error *ngIf="argumentControl.get(\'type\').hasError(\'required\')" translate>\n                  tb.rulenode.argument-source-field-input-required\n                </mat-error>\n              </mat-form-field>\n              <div fxFlex fxLayout="row" fxLayout.xs="column" fxLayoutGap.gt-xs="16px">\n                <mat-form-field fxFlex="50" floatLabel="always" class="mat-block"\n                                *ngIf="argumentControl.get(\'type\').value && argumentControl.get(\'type\').value !== ArgumentType.CONSTANT">\n                  <mat-label translate>tb.rulenode.argument-key-field-input</mat-label>\n                  <input [formControl]="argumentControl.get(\'key\')" matInput required/>\n                  <mat-icon class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon" matSuffix\n                            color="primary"\n                            matTooltip="{{ \'tb.rulenode.math-templatization-tooltip\' | translate }}">\n                    help\n                  </mat-icon>\n                  <mat-error *ngIf="argumentControl.get(\'key\').hasError(\'required\')" translate>\n                    tb.rulenode.argument-key-field-input-required\n                  </mat-error>\n                </mat-form-field>\n                <mat-form-field fxFlex floatLabel="always" class="mat-block"\n                                *ngIf="argumentControl.get(\'type\').value === ArgumentType.CONSTANT">\n                  <mat-label translate>tb.rulenode.constant-value-field-input</mat-label>\n                  <input [formControl]="argumentControl.get(\'key\')"\n                         matInput\n                         required\n                         step="1" min="0"\n                         type="number"/>\n                  <mat-error *ngIf="argumentControl.get(\'key\').hasError(\'required\')" translate>\n                    tb.rulenode.constant-value-field-input-required\n                  </mat-error>\n                </mat-form-field>\n                <mat-form-field *ngIf="argumentControl.get(\'type\').value && argumentControl.get(\'type\').value !== ArgumentType.CONSTANT"\n                                fxFlex="50" floatLabel="always" class="mat-block">\n                  <mat-label translate>tb.rulenode.default-value-field-input</mat-label>\n                  <input [formControl]="argumentControl.get(\'defaultValue\')" matInput step="1" type="number"/>\n                </mat-form-field>\n              </div>\n              <mat-form-field *ngIf="argumentControl.get(\'type\').value === ArgumentType.ATTRIBUTE" class="mat-block">\n                <mat-label translate>tb.rulenode.attribute-scope-field-input</mat-label>\n                <mat-select required [formControl]="argumentControl.get(\'attributeScope\')">\n                  <mat-option *ngFor="let scope of attributeScope" [value]="scope">\n                    {{ attributeScopeMap.get(scope) | translate }}\n                  </mat-option>\n                </mat-select>\n                <mat-error *ngIf="argumentControl.get(\'attributeScope\').hasError(\'required\')" translate>\n                  tb.rulenode.attribute-scope-field-input-required\n                </mat-error>\n              </mat-form-field>\n            </div>\n            <button *ngIf="!disabled" mat-icon-button color="primary" style="min-width: 40px;"\n                    (click)="removeArgument($index)"\n                    matTooltip="{{ \'action.remove\' | translate }}"\n                    matTooltipPosition="above">\n              <mat-icon>close</mat-icon>\n            </button>\n          </div>\n        </div>\n      </mat-list-item>\n    </mat-list>\n  </div>\n  <div *ngIf="!argumentsFormArray.length">\n      <span translate fxLayoutAlign="center center"\n            class="tb-prompt">tb.rulenode.no-arguments-prompt</span>\n  </div>\n  <button mat-button mat-raised-button color="primary"\n          [disabled]="argumentsFormArray.length >= maxArgs"\n          (click)="addArgument()"\n          type="button"\n          matTooltipPosition="above">\n    <mat-icon>add</mat-icon>\n    {{ \'action.add\' | translate }}\n  </button>\n</section>\n',styles:[":host .mat-mdc-list-item.tb-argument{border:solid rgba(0,0,0,.25) 1px;border-radius:4px;padding:10px 0;margin-bottom:16px}:host .arguments-list{padding:0}\n"],dependencies:[{kind:"directive",type:H.NgClass,selector:"[ngClass]",inputs:["class","ngClass"]},{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:de.MatButton,selector:"    button[mat-button], button[mat-raised-button], button[mat-flat-button],    button[mat-stroked-button]  ",inputs:["disabled","disableRipple","color"],exportAs:["matButton"]},{kind:"component",type:de.MatIconButton,selector:"button[mat-icon-button]",inputs:["disabled","disableRipple","color"],exportAs:["matButton"]},{kind:"component",type:ue.MatIcon,selector:"mat-icon",inputs:["color","inline","svgIcon","fontSet","fontIcon"],exportAs:["matIcon"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"directive",type:Y.MatSuffix,selector:"[matSuffix], [matIconSuffix], [matTextSuffix]",inputs:["matTextSuffix"]},{kind:"component",type:X.MatSelect,selector:"mat-select",inputs:["disabled","disableRipple","tabIndex","hideSingleSelectionIndicator"],exportAs:["matSelect"]},{kind:"directive",type:X.MatSelectTrigger,selector:"mat-select-trigger"},{kind:"component",type:ee.MatOption,selector:"mat-option",exportAs:["matOption"]},{kind:"directive",type:ce.MatTooltip,selector:"[matTooltip]",exportAs:["matTooltip"]},{kind:"component",type:qe.MatList,selector:"mat-list",exportAs:["matList"]},{kind:"component",type:qe.MatListItem,selector:"mat-list-item, a[mat-list-item], button[mat-list-item]",inputs:["activated"],exportAs:["matListItem"]},{kind:"directive",type:Ae.CdkDropList,selector:"[cdkDropList], cdk-drop-list",inputs:["cdkDropListConnectedTo","cdkDropListData","cdkDropListOrientation","id","cdkDropListLockAxis","cdkDropListDisabled","cdkDropListSortingDisabled","cdkDropListEnterPredicate","cdkDropListSortPredicate","cdkDropListAutoScrollDisabled","cdkDropListAutoScrollStep"],outputs:["cdkDropListDropped","cdkDropListEntered","cdkDropListExited","cdkDropListSorted"],exportAs:["cdkDropList"]},{kind:"directive",type:Ae.CdkDrag,selector:"[cdkDrag]",inputs:["cdkDragData","cdkDragLockAxis","cdkDragRootElement","cdkDragBoundary","cdkDragStartDelay","cdkDragFreeDragPosition","cdkDragDisabled","cdkDragConstrainPosition","cdkDragPreviewClass","cdkDragPreviewContainer"],outputs:["cdkDragStarted","cdkDragReleased","cdkDragEnded","cdkDragEntered","cdkDragExited","cdkDragDropped","cdkDragMoved"],exportAs:["cdkDrag"]},{kind:"directive",type:Ae.CdkDragHandle,selector:"[cdkDragHandle]",inputs:["cdkDragHandleDisabled"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:W.DefaultLayoutGapDirective,selector:"  [fxLayoutGap], [fxLayoutGap.xs], [fxLayoutGap.sm], [fxLayoutGap.md],  [fxLayoutGap.lg], [fxLayoutGap.xl], [fxLayoutGap.lt-sm], [fxLayoutGap.lt-md],  [fxLayoutGap.lt-lg], [fxLayoutGap.lt-xl], [fxLayoutGap.gt-xs], [fxLayoutGap.gt-sm],  [fxLayoutGap.gt-md], [fxLayoutGap.gt-lg]",inputs:["fxLayoutGap","fxLayoutGap.xs","fxLayoutGap.sm","fxLayoutGap.md","fxLayoutGap.lg","fxLayoutGap.xl","fxLayoutGap.lt-sm","fxLayoutGap.lt-md","fxLayoutGap.lt-lg","fxLayoutGap.lt-xl","fxLayoutGap.gt-xs","fxLayoutGap.gt-sm","fxLayoutGap.gt-md","fxLayoutGap.gt-lg"]},{kind:"directive",type:W.DefaultLayoutAlignDirective,selector:"  [fxLayoutAlign], [fxLayoutAlign.xs], [fxLayoutAlign.sm], [fxLayoutAlign.md],  [fxLayoutAlign.lg], [fxLayoutAlign.xl], [fxLayoutAlign.lt-sm], [fxLayoutAlign.lt-md],  [fxLayoutAlign.lt-lg], [fxLayoutAlign.lt-xl], [fxLayoutAlign.gt-xs], [fxLayoutAlign.gt-sm],  [fxLayoutAlign.gt-md], [fxLayoutAlign.gt-lg]",inputs:["fxLayoutAlign","fxLayoutAlign.xs","fxLayoutAlign.sm","fxLayoutAlign.md","fxLayoutAlign.lg","fxLayoutAlign.xl","fxLayoutAlign.lt-sm","fxLayoutAlign.lt-md","fxLayoutAlign.lt-lg","fxLayoutAlign.lt-xl","fxLayoutAlign.gt-xs","fxLayoutAlign.gt-sm","fxLayoutAlign.gt-md","fxLayoutAlign.gt-lg"]},{kind:"directive",type:W.DefaultFlexDirective,selector:"  [fxFlex], [fxFlex.xs], [fxFlex.sm], [fxFlex.md],  [fxFlex.lg], [fxFlex.xl], [fxFlex.lt-sm], [fxFlex.lt-md],  [fxFlex.lt-lg], [fxFlex.lt-xl], [fxFlex.gt-xs], [fxFlex.gt-sm],  [fxFlex.gt-md], [fxFlex.gt-lg]",inputs:["fxFlex","fxFlex.xs","fxFlex.sm","fxFlex.md","fxFlex.lg","fxFlex.xl","fxFlex.lt-sm","fxFlex.lt-md","fxFlex.lt-lg","fxFlex.lt-xl","fxFlex.gt-xs","fxFlex.gt-sm","fxFlex.gt-md","fxFlex.gt-lg"]},{kind:"directive",type:Se.DefaultClassDirective,selector:"  [ngClass], [ngClass.xs], [ngClass.sm], [ngClass.md], [ngClass.lg], [ngClass.xl],  [ngClass.lt-sm], [ngClass.lt-md], [ngClass.lt-lg], [ngClass.lt-xl],  [ngClass.gt-xs], [ngClass.gt-sm], [ngClass.gt-md], [ngClass.gt-lg]",inputs:["ngClass","ngClass.xs","ngClass.sm","ngClass.md","ngClass.lg","ngClass.xl","ngClass.lt-sm","ngClass.lt-md","ngClass.lt-lg","ngClass.lt-xl","ngClass.gt-xs","ngClass.gt-sm","ngClass.gt-md","ngClass.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NumberValueAccessor,selector:"input[type=number][formControlName],input[type=number][formControl],input[type=number][ngModel]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.MinValidator,selector:"input[type=number][min][formControlName],input[type=number][min][formControl],input[type=number][min][ngModel]",inputs:["min"]},{kind:"directive",type:R.FormControlDirective,selector:"[formControl]",inputs:["formControl","disabled","ngModel"],outputs:["ngModelChange"],exportAs:["ngForm"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormArrayName,selector:"[formArrayName]",inputs:["formArrayName"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:In,decorators:[{type:n,args:[{selector:"tb-arguments-map-config",providers:[{provide:B,useExisting:a((()=>In)),multi:!0},{provide:K,useExisting:a((()=>In)),multi:!0}],template:'<section fxLayout="column">\n\n  <div [ngClass]="{\'tb-readonly\': disabled}"\n       style="max-height: 500px; overflow: auto;">\n    <mat-list class="tb-drop-list arguments-list" cdkDropList cdkDropListOrientation="vertical"\n              [formGroup]="argumentsFormGroup"\n              (cdkDropListDropped)="onDrop($event)"\n              [cdkDropListDisabled]="disabled">\n      <mat-list-item *ngFor="let argumentControl of argumentsFormArray.controls; let $index = index"\n                     formArrayName="arguments"\n                     cdkDrag class="tb-argument tb-draggable"\n                     [cdkDragDisabled]="disabled"\n                     style="height: 100%">\n        <div fxFlex fxLayout="row" fxLayoutAlign="start center">\n          <button *ngIf="!disabled" mat-icon-button color="primary"\n                  cdkDragHandle\n                  class="tb-drag-handle handle"\n                  style="min-width: 40px; margin: 0"\n                  matTooltip="{{ \'action.drag\' | translate }}"\n                  matTooltipPosition="above">\n            <mat-icon>drag_handle</mat-icon>\n          </button>\n          <div fxFlex fxLAyout="row" fxLayoutAlign="start center" fxLayoutGap="16px">\n            <span *ngIf="displayArgumentName"\n                  style="padding: 0 10px; min-width: 20px;">{{argumentControl.get(\'name\').value}}.</span>\n            <div fxFlex fxLayout="column">\n              <mat-form-field class="mat-block">\n                <mat-label translate>tb.rulenode.argument-source-field-input</mat-label>\n                <mat-select [formControl]="argumentControl.get(\'type\')" required>\n                  <mat-select-trigger>\n                    {{ argumentTypeMap.get(argumentControl.get(\'type\').value)?.name | translate }}\n                  </mat-select-trigger>\n                  <mat-option *ngFor="let argument of arguments" [value]="argument"\n                              style="border-bottom: 1px solid #eee;">\n                    {{ argumentTypeMap.get(argument).name | translate }}\n                    <small style="display: block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">\n                      {{ argumentTypeMap.get(argument).description }}\n                    </small>\n                  </mat-option>\n                </mat-select>\n                <mat-error *ngIf="argumentControl.get(\'type\').hasError(\'required\')" translate>\n                  tb.rulenode.argument-source-field-input-required\n                </mat-error>\n              </mat-form-field>\n              <div fxFlex fxLayout="row" fxLayout.xs="column" fxLayoutGap.gt-xs="16px">\n                <mat-form-field fxFlex="50" floatLabel="always" class="mat-block"\n                                *ngIf="argumentControl.get(\'type\').value && argumentControl.get(\'type\').value !== ArgumentType.CONSTANT">\n                  <mat-label translate>tb.rulenode.argument-key-field-input</mat-label>\n                  <input [formControl]="argumentControl.get(\'key\')" matInput required/>\n                  <mat-icon class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon" matSuffix\n                            color="primary"\n                            matTooltip="{{ \'tb.rulenode.math-templatization-tooltip\' | translate }}">\n                    help\n                  </mat-icon>\n                  <mat-error *ngIf="argumentControl.get(\'key\').hasError(\'required\')" translate>\n                    tb.rulenode.argument-key-field-input-required\n                  </mat-error>\n                </mat-form-field>\n                <mat-form-field fxFlex floatLabel="always" class="mat-block"\n                                *ngIf="argumentControl.get(\'type\').value === ArgumentType.CONSTANT">\n                  <mat-label translate>tb.rulenode.constant-value-field-input</mat-label>\n                  <input [formControl]="argumentControl.get(\'key\')"\n                         matInput\n                         required\n                         step="1" min="0"\n                         type="number"/>\n                  <mat-error *ngIf="argumentControl.get(\'key\').hasError(\'required\')" translate>\n                    tb.rulenode.constant-value-field-input-required\n                  </mat-error>\n                </mat-form-field>\n                <mat-form-field *ngIf="argumentControl.get(\'type\').value && argumentControl.get(\'type\').value !== ArgumentType.CONSTANT"\n                                fxFlex="50" floatLabel="always" class="mat-block">\n                  <mat-label translate>tb.rulenode.default-value-field-input</mat-label>\n                  <input [formControl]="argumentControl.get(\'defaultValue\')" matInput step="1" type="number"/>\n                </mat-form-field>\n              </div>\n              <mat-form-field *ngIf="argumentControl.get(\'type\').value === ArgumentType.ATTRIBUTE" class="mat-block">\n                <mat-label translate>tb.rulenode.attribute-scope-field-input</mat-label>\n                <mat-select required [formControl]="argumentControl.get(\'attributeScope\')">\n                  <mat-option *ngFor="let scope of attributeScope" [value]="scope">\n                    {{ attributeScopeMap.get(scope) | translate }}\n                  </mat-option>\n                </mat-select>\n                <mat-error *ngIf="argumentControl.get(\'attributeScope\').hasError(\'required\')" translate>\n                  tb.rulenode.attribute-scope-field-input-required\n                </mat-error>\n              </mat-form-field>\n            </div>\n            <button *ngIf="!disabled" mat-icon-button color="primary" style="min-width: 40px;"\n                    (click)="removeArgument($index)"\n                    matTooltip="{{ \'action.remove\' | translate }}"\n                    matTooltipPosition="above">\n              <mat-icon>close</mat-icon>\n            </button>\n          </div>\n        </div>\n      </mat-list-item>\n    </mat-list>\n  </div>\n  <div *ngIf="!argumentsFormArray.length">\n      <span translate fxLayoutAlign="center center"\n            class="tb-prompt">tb.rulenode.no-arguments-prompt</span>\n  </div>\n  <button mat-button mat-raised-button color="primary"\n          [disabled]="argumentsFormArray.length >= maxArgs"\n          (click)="addArgument()"\n          type="button"\n          matTooltipPosition="above">\n    <mat-icon>add</mat-icon>\n    {{ \'action.add\' | translate }}\n  </button>\n</section>\n',styles:[":host .mat-mdc-list-item.tb-argument{border:solid rgba(0,0,0,.25) 1px;border-radius:4px;padding:10px 0;margin-bottom:16px}:host .arguments-list{padding:0}\n"]}]}],ctorParameters:function(){return[{type:P.Store},{type:R.FormBuilder}]},propDecorators:{disabled:[{type:i}],function:[{type:i}]}});class Nn extends L{get required(){return this.requiredValue}set required(e){this.requiredValue=Le(e)}constructor(e,t,n,r){super(e),this.store=e,this.translate=t,this.injector=n,this.fb=r,this.searchText="",this.dirty=!1,this.mathOperation=[...Wt.values()],this.propagateChange=null}ngOnInit(){this.mathFunctionForm=this.fb.group({operation:[""]}),this.filteredOptions=this.mathFunctionForm.get("operation").valueChanges.pipe(Me((e=>{let t;t="string"==typeof e&&Yt[e]?Yt[e]:null,this.updateView(t)})),Ee((e=>(this.searchText=e||"",e?this._filter(e):this.mathOperation.slice()))))}_filter(e){const t=e.toLowerCase();return this.mathOperation.filter((e=>e.name.toLowerCase().includes(t)||e.value.toLowerCase().includes(t)))}registerOnChange(e){this.propagateChange=e}registerOnTouched(e){}setDisabledState(e){this.disabled=e,this.disabled?this.mathFunctionForm.disable({emitEvent:!1}):this.mathFunctionForm.enable({emitEvent:!1})}mathFunctionDisplayFn(e){if(e){const t=Wt.get(e);return t.value+" | "+t.name}return""}writeValue(e){this.modelValue=e,this.mathFunctionForm.get("operation").setValue(e,{emitEvent:!1}),this.dirty=!0}updateView(e){this.modelValue!==e&&(this.modelValue=e,this.propagateChange(this.modelValue))}onFocus(){this.dirty&&(this.mathFunctionForm.get("operation").updateValueAndValidity({onlySelf:!0}),this.dirty=!1)}clear(){this.mathFunctionForm.get("operation").patchValue(""),setTimeout((()=>{this.operationInput.nativeElement.blur(),this.operationInput.nativeElement.focus()}),0)}}e("MathFunctionAutocompleteComponent",Nn),Nn.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Nn,deps:[{token:P.Store},{token:Z.TranslateService},{token:t.Injector},{token:R.UntypedFormBuilder}],target:t.ɵɵFactoryTarget.Component}),Nn.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:Nn,selector:"tb-math-function-autocomplete",inputs:{required:"required",disabled:"disabled"},providers:[{provide:B,useExisting:a((()=>Nn)),multi:!0}],viewQueries:[{propertyName:"operationInput",first:!0,predicate:["operationInput"],descendants:!0,static:!0}],usesInheritance:!0,ngImport:t,template:'<mat-form-field [formGroup]="mathFunctionForm" class="mat-block">\n  <mat-label translate>tb.rulenode.functions-field-input</mat-label>\n  <input [required]="required"\n         (focusin)="onFocus()"\n         type="text"\n         #operationInput matInput\n         formControlName="operation"\n         [matAutocomplete]="auto">\n  <button *ngIf="mathFunctionForm.get(\'operation\').value"\n          type="button"\n          matSuffix mat-icon-button aria-label="Clear"\n          (click)="clear()">\n    <mat-icon class="material-icons">close</mat-icon>\n  </button>\n  <mat-autocomplete #auto="matAutocomplete" class="tb-autocomplete" [displayWith]="mathFunctionDisplayFn">\n    <mat-option *ngFor="let option of filteredOptions | async" [value]="option.value">\n      <span [innerHTML]="option.value + \' | \' + option.name | highlight:searchText"></span>\n      <small style="display: block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">\n        {{ option.description }}\n      </small>\n    </mat-option>\n    <mat-option *ngIf="!(filteredOptions | async)?.length" [value]="null">\n      <span translate>tb.rulenode.no-option-found</span>\n    </mat-option>\n  </mat-autocomplete>\n</mat-form-field>\n',dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:de.MatIconButton,selector:"button[mat-icon-button]",inputs:["disabled","disableRipple","color"],exportAs:["matButton"]},{kind:"component",type:ue.MatIcon,selector:"mat-icon",inputs:["color","inline","svgIcon","fontSet","fontIcon"],exportAs:["matIcon"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatSuffix,selector:"[matSuffix], [matIconSuffix], [matTextSuffix]",inputs:["matTextSuffix"]},{kind:"component",type:ee.MatOption,selector:"mat-option",exportAs:["matOption"]},{kind:"component",type:Re.MatAutocomplete,selector:"mat-autocomplete",inputs:["disableRipple","hideSingleSelectionIndicator"],exportAs:["matAutocomplete"]},{kind:"directive",type:Re.MatAutocompleteTrigger,selector:"input[matAutocomplete], textarea[matAutocomplete]",exportAs:["matAutocompleteTrigger"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"pipe",type:H.AsyncPipe,name:"async"},{kind:"pipe",type:Oe.HighlightPipe,name:"highlight"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Nn,decorators:[{type:n,args:[{selector:"tb-math-function-autocomplete",providers:[{provide:B,useExisting:a((()=>Nn)),multi:!0}],template:'<mat-form-field [formGroup]="mathFunctionForm" class="mat-block">\n  <mat-label translate>tb.rulenode.functions-field-input</mat-label>\n  <input [required]="required"\n         (focusin)="onFocus()"\n         type="text"\n         #operationInput matInput\n         formControlName="operation"\n         [matAutocomplete]="auto">\n  <button *ngIf="mathFunctionForm.get(\'operation\').value"\n          type="button"\n          matSuffix mat-icon-button aria-label="Clear"\n          (click)="clear()">\n    <mat-icon class="material-icons">close</mat-icon>\n  </button>\n  <mat-autocomplete #auto="matAutocomplete" class="tb-autocomplete" [displayWith]="mathFunctionDisplayFn">\n    <mat-option *ngFor="let option of filteredOptions | async" [value]="option.value">\n      <span [innerHTML]="option.value + \' | \' + option.name | highlight:searchText"></span>\n      <small style="display: block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">\n        {{ option.description }}\n      </small>\n    </mat-option>\n    <mat-option *ngIf="!(filteredOptions | async)?.length" [value]="null">\n      <span translate>tb.rulenode.no-option-found</span>\n    </mat-option>\n  </mat-autocomplete>\n</mat-form-field>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:Z.TranslateService},{type:t.Injector},{type:R.UntypedFormBuilder}]},propDecorators:{required:[{type:i}],disabled:[{type:i}],operationInput:[{type:o,args:["operationInput",{static:!0}]}]}});class Sn extends f{constructor(e,t){super(e),this.store=e,this.fb=t,this.MathFunction=Yt,this.ArgumentTypeResult=Xt,this.argumentTypeResultMap=an,this.attributeScopeMap=pn,this.argumentsResult=Object.values(Xt),this.attributeScopeResult=Object.values(mn)}configForm(){return this.mathFunctionConfigForm}onConfigurationSet(e){this.mathFunctionConfigForm=this.fb.group({operation:[e?e.operation:null,[O.required]],arguments:[e?e.arguments:null,[O.required]],customFunction:[e?e.customFunction:"",[O.required]],result:this.fb.group({type:[e?e.result.type:null,[O.required]],attributeScope:[e?e.result.attributeScope:null,[O.required]],key:[e?e.result.key:"",[O.required]],resultValuePrecision:[e?e.result.resultValuePrecision:0],addToBody:[!!e&&e.result.addToBody],addToMetadata:[!!e&&e.result.addToMetadata]})})}updateValidators(e){const t=this.mathFunctionConfigForm.get("operation").value,n=this.mathFunctionConfigForm.get("result.type").value;t===Yt.CUSTOM?(this.mathFunctionConfigForm.get("customFunction").enable({emitEvent:!1}),null===this.mathFunctionConfigForm.get("customFunction").value&&this.mathFunctionConfigForm.get("customFunction").patchValue("(x - 32) / 1.8",{emitEvent:!1})):this.mathFunctionConfigForm.get("customFunction").disable({emitEvent:!1}),n===Xt.ATTRIBUTE?this.mathFunctionConfigForm.get("result.attributeScope").enable({emitEvent:!1}):this.mathFunctionConfigForm.get("result.attributeScope").disable({emitEvent:!1}),this.mathFunctionConfigForm.get("customFunction").updateValueAndValidity({emitEvent:e}),this.mathFunctionConfigForm.get("result.attributeScope").updateValueAndValidity({emitEvent:e})}validatorTriggers(){return["operation","result.type"]}}e("MathFunctionConfigComponent",Sn),Sn.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Sn,deps:[{token:P.Store},{token:R.UntypedFormBuilder}],target:t.ɵɵFactoryTarget.Component}),Sn.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:Sn,selector:"tb-action-node-math-function-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="mathFunctionConfigForm" fxLayout="column">\n  <tb-math-function-autocomplete\n    fxFlex="30" fxFlex.md fxFlex.xs\n    required\n    formControlName="operation">\n  </tb-math-function-autocomplete>\n  <fieldset class="fields-group" fxLayout="column" fxLayoutGap="8px">\n    <legend class="group-title" translate>tb.rulenode.argument-tile</legend>\n    <tb-arguments-map-config formControlName="arguments"\n                             [function]="mathFunctionConfigForm.get(\'operation\').value">\n    </tb-arguments-map-config>\n  </fieldset>\n  <fieldset *ngIf="mathFunctionConfigForm.get(\'operation\').value === MathFunction.CUSTOM"\n            class="fields-group" fxLayout="column" fxLayoutGap="8px">\n    <legend class="group-title">{{\'tb.rulenode.custom-expression-field-input\' | translate }} *</legend>\n    <mat-form-field fxFlex class="mat-block no-margin-top" subscriptSizing="dynamic">\n      <input matInput formControlName="customFunction" required/>\n      <mat-error *ngIf="mathFunctionConfigForm.get(\'customFunction\').hasError(\'required\')" translate>\n        tb.rulenode.custom-expression-field-input-required\n      </mat-error>\n      <mat-hint translate>tb.rulenode.custom-expression-field-input-hint</mat-hint>\n    </mat-form-field>\n  </fieldset>\n  <fieldset class="fields-group" fxLayout="column" fxLayoutGap="8px">\n    <legend class="group-title" translate>tb.rulenode.result-title</legend>\n    <div formGroupName="result">\n      <mat-form-field fxFlex class="mat-block">\n        <mat-label translate>tb.rulenode.type-field-input</mat-label>\n        <mat-select formControlName="type" required>\n          <mat-select-trigger>\n            {{ argumentTypeResultMap.get(mathFunctionConfigForm.get(\'result.type\').value)?.name | translate }}\n          </mat-select-trigger>\n          <mat-option *ngFor="let argument of argumentsResult" [value]="argument"\n                      style="border-bottom: 1px solid #eee;">\n            {{ argumentTypeResultMap.get(argument).name | translate }}\n            <small style="display: block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">\n              {{ argumentTypeResultMap.get(argument).description }}\n            </small>\n          </mat-option>\n        </mat-select>\n        <mat-error *ngIf="mathFunctionConfigForm.get(\'result.type\').hasError(\'required\')" translate>\n          tb.rulenode.type-field-input-required\n        </mat-error>\n      </mat-form-field>\n      <div fxFlex fxLayout="row" fxLayout.xs="column" fxLayoutGap.gt-xs="16px">\n        <mat-form-field fxFlex class="mat-block" *ngIf="mathFunctionConfigForm.get(\'result\').get(\'type\').value === ArgumentTypeResult.ATTRIBUTE">\n          <mat-label translate>tb.rulenode.attribute-scope-field-input</mat-label>\n          <mat-select required formControlName="attributeScope">\n            <mat-option *ngFor="let scope of attributeScopeResult" [value]="scope">\n              {{ attributeScopeMap.get(scope) | translate }}\n            </mat-option>\n          </mat-select>\n        </mat-form-field>\n        <mat-form-field fxFlex floatLabel="always" class="mat-block">\n          <mat-label translate>tb.rulenode.key-field-input</mat-label>\n          <input matInput formControlName="key" required/>\n          <mat-icon class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon" matSuffix\n                    color="primary"\n                    matTooltip="{{ \'tb.rulenode.math-templatization-tooltip\' | translate }}">help</mat-icon>\n          <mat-error *ngIf="mathFunctionConfigForm.get(\'result.key\').hasError(\'required\')" translate>\n            tb.rulenode.key-field-input-required\n          </mat-error>\n        </mat-form-field>\n      </div>\n      <div fxFlex fxLayout="row" fxLayout.xs="column" fxLayoutGap.gt-xs="16px">\n        <mat-form-field fxFlex floatLabel="always" class="mat-block" subscriptSizing="dynamic">\n          <mat-label translate>tb.rulenode.number-floating-point-field-input</mat-label>\n          <input formControlName="resultValuePrecision"\n                 matInput\n                 step="1" min="0"\n                 type="number"/>\n          <mat-hint [innerHTML]="\'tb.rulenode.number-floating-point-field-input-hint\' | translate | safe: \'html\'"></mat-hint>\n        </mat-form-field>\n      </div>\n      <div *ngIf="[ArgumentTypeResult.ATTRIBUTE, ArgumentTypeResult.TIME_SERIES].includes(mathFunctionConfigForm.get(\'result\').get(\'type\').value)"\n           fxFlex fxLayout="row" fxLayout.xs="column" fxLayoutAlign="start" fxLayoutGap.gt-xs="16px" style="padding-top: 16px;">\n        <mat-checkbox formControlName="addToBody">\n          {{\'tb.rulenode.add-to-message-field-input\' | translate }}\n        </mat-checkbox>\n        <mat-checkbox formControlName="addToMetadata">\n          {{\'tb.rulenode.add-to-metadata-field-input\' | translate}}\n        </mat-checkbox>\n      </div>\n    </div>\n  </fieldset>\n</section>\n',styles:[":host ::ng-deep .fields-group{padding:0 16px 8px;margin:10px 0;border:1px groove rgba(0,0,0,.25);border-radius:4px}:host ::ng-deep .fields-group .mat-mdc-form-field .mat-mdc-form-field-infix{width:100%}:host ::ng-deep .fields-group legend{color:#000000b3;width:-moz-fit-content;width:fit-content}:host ::ng-deep .fields-group legend+*{display:block}:host ::ng-deep .fields-group legend+*.no-margin-top{margin-top:0}\n"],dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:Q.MatCheckbox,selector:"mat-checkbox",inputs:["disableRipple","color","tabIndex"],exportAs:["matCheckbox"]},{kind:"component",type:ue.MatIcon,selector:"mat-icon",inputs:["color","inline","svgIcon","fontSet","fontIcon"],exportAs:["matIcon"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatHint,selector:"mat-hint",inputs:["align","id"]},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"directive",type:Y.MatSuffix,selector:"[matSuffix], [matIconSuffix], [matTextSuffix]",inputs:["matTextSuffix"]},{kind:"component",type:X.MatSelect,selector:"mat-select",inputs:["disabled","disableRipple","tabIndex","hideSingleSelectionIndicator"],exportAs:["matSelect"]},{kind:"directive",type:X.MatSelectTrigger,selector:"mat-select-trigger"},{kind:"component",type:ee.MatOption,selector:"mat-option",exportAs:["matOption"]},{kind:"directive",type:ce.MatTooltip,selector:"[matTooltip]",exportAs:["matTooltip"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:W.DefaultLayoutGapDirective,selector:"  [fxLayoutGap], [fxLayoutGap.xs], [fxLayoutGap.sm], [fxLayoutGap.md],  [fxLayoutGap.lg], [fxLayoutGap.xl], [fxLayoutGap.lt-sm], [fxLayoutGap.lt-md],  [fxLayoutGap.lt-lg], [fxLayoutGap.lt-xl], [fxLayoutGap.gt-xs], [fxLayoutGap.gt-sm],  [fxLayoutGap.gt-md], [fxLayoutGap.gt-lg]",inputs:["fxLayoutGap","fxLayoutGap.xs","fxLayoutGap.sm","fxLayoutGap.md","fxLayoutGap.lg","fxLayoutGap.xl","fxLayoutGap.lt-sm","fxLayoutGap.lt-md","fxLayoutGap.lt-lg","fxLayoutGap.lt-xl","fxLayoutGap.gt-xs","fxLayoutGap.gt-sm","fxLayoutGap.gt-md","fxLayoutGap.gt-lg"]},{kind:"directive",type:W.DefaultLayoutAlignDirective,selector:"  [fxLayoutAlign], [fxLayoutAlign.xs], [fxLayoutAlign.sm], [fxLayoutAlign.md],  [fxLayoutAlign.lg], [fxLayoutAlign.xl], [fxLayoutAlign.lt-sm], [fxLayoutAlign.lt-md],  [fxLayoutAlign.lt-lg], [fxLayoutAlign.lt-xl], [fxLayoutAlign.gt-xs], [fxLayoutAlign.gt-sm],  [fxLayoutAlign.gt-md], [fxLayoutAlign.gt-lg]",inputs:["fxLayoutAlign","fxLayoutAlign.xs","fxLayoutAlign.sm","fxLayoutAlign.md","fxLayoutAlign.lg","fxLayoutAlign.xl","fxLayoutAlign.lt-sm","fxLayoutAlign.lt-md","fxLayoutAlign.lt-lg","fxLayoutAlign.lt-xl","fxLayoutAlign.gt-xs","fxLayoutAlign.gt-sm","fxLayoutAlign.gt-md","fxLayoutAlign.gt-lg"]},{kind:"directive",type:W.DefaultFlexDirective,selector:"  [fxFlex], [fxFlex.xs], [fxFlex.sm], [fxFlex.md],  [fxFlex.lg], [fxFlex.xl], [fxFlex.lt-sm], [fxFlex.lt-md],  [fxFlex.lt-lg], [fxFlex.lt-xl], [fxFlex.gt-xs], [fxFlex.gt-sm],  [fxFlex.gt-md], [fxFlex.gt-lg]",inputs:["fxFlex","fxFlex.xs","fxFlex.sm","fxFlex.md","fxFlex.lg","fxFlex.xl","fxFlex.lt-sm","fxFlex.lt-md","fxFlex.lt-lg","fxFlex.lt-xl","fxFlex.gt-xs","fxFlex.gt-sm","fxFlex.gt-md","fxFlex.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NumberValueAccessor,selector:"input[type=number][formControlName],input[type=number][formControl],input[type=number][ngModel]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.MinValidator,selector:"input[type=number][min][formControlName],input[type=number][min][formControl],input[type=number][min][ngModel]",inputs:["min"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:R.FormGroupName,selector:"[formGroupName]",inputs:["formGroupName"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"component",type:In,selector:"tb-arguments-map-config",inputs:["disabled","function"]},{kind:"component",type:Nn,selector:"tb-math-function-autocomplete",inputs:["required","disabled"]},{kind:"pipe",type:he.SafePipe,name:"safe"},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Sn,decorators:[{type:n,args:[{selector:"tb-action-node-math-function-config",template:'<section [formGroup]="mathFunctionConfigForm" fxLayout="column">\n  <tb-math-function-autocomplete\n    fxFlex="30" fxFlex.md fxFlex.xs\n    required\n    formControlName="operation">\n  </tb-math-function-autocomplete>\n  <fieldset class="fields-group" fxLayout="column" fxLayoutGap="8px">\n    <legend class="group-title" translate>tb.rulenode.argument-tile</legend>\n    <tb-arguments-map-config formControlName="arguments"\n                             [function]="mathFunctionConfigForm.get(\'operation\').value">\n    </tb-arguments-map-config>\n  </fieldset>\n  <fieldset *ngIf="mathFunctionConfigForm.get(\'operation\').value === MathFunction.CUSTOM"\n            class="fields-group" fxLayout="column" fxLayoutGap="8px">\n    <legend class="group-title">{{\'tb.rulenode.custom-expression-field-input\' | translate }} *</legend>\n    <mat-form-field fxFlex class="mat-block no-margin-top" subscriptSizing="dynamic">\n      <input matInput formControlName="customFunction" required/>\n      <mat-error *ngIf="mathFunctionConfigForm.get(\'customFunction\').hasError(\'required\')" translate>\n        tb.rulenode.custom-expression-field-input-required\n      </mat-error>\n      <mat-hint translate>tb.rulenode.custom-expression-field-input-hint</mat-hint>\n    </mat-form-field>\n  </fieldset>\n  <fieldset class="fields-group" fxLayout="column" fxLayoutGap="8px">\n    <legend class="group-title" translate>tb.rulenode.result-title</legend>\n    <div formGroupName="result">\n      <mat-form-field fxFlex class="mat-block">\n        <mat-label translate>tb.rulenode.type-field-input</mat-label>\n        <mat-select formControlName="type" required>\n          <mat-select-trigger>\n            {{ argumentTypeResultMap.get(mathFunctionConfigForm.get(\'result.type\').value)?.name | translate }}\n          </mat-select-trigger>\n          <mat-option *ngFor="let argument of argumentsResult" [value]="argument"\n                      style="border-bottom: 1px solid #eee;">\n            {{ argumentTypeResultMap.get(argument).name | translate }}\n            <small style="display: block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">\n              {{ argumentTypeResultMap.get(argument).description }}\n            </small>\n          </mat-option>\n        </mat-select>\n        <mat-error *ngIf="mathFunctionConfigForm.get(\'result.type\').hasError(\'required\')" translate>\n          tb.rulenode.type-field-input-required\n        </mat-error>\n      </mat-form-field>\n      <div fxFlex fxLayout="row" fxLayout.xs="column" fxLayoutGap.gt-xs="16px">\n        <mat-form-field fxFlex class="mat-block" *ngIf="mathFunctionConfigForm.get(\'result\').get(\'type\').value === ArgumentTypeResult.ATTRIBUTE">\n          <mat-label translate>tb.rulenode.attribute-scope-field-input</mat-label>\n          <mat-select required formControlName="attributeScope">\n            <mat-option *ngFor="let scope of attributeScopeResult" [value]="scope">\n              {{ attributeScopeMap.get(scope) | translate }}\n            </mat-option>\n          </mat-select>\n        </mat-form-field>\n        <mat-form-field fxFlex floatLabel="always" class="mat-block">\n          <mat-label translate>tb.rulenode.key-field-input</mat-label>\n          <input matInput formControlName="key" required/>\n          <mat-icon class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon" matSuffix\n                    color="primary"\n                    matTooltip="{{ \'tb.rulenode.math-templatization-tooltip\' | translate }}">help</mat-icon>\n          <mat-error *ngIf="mathFunctionConfigForm.get(\'result.key\').hasError(\'required\')" translate>\n            tb.rulenode.key-field-input-required\n          </mat-error>\n        </mat-form-field>\n      </div>\n      <div fxFlex fxLayout="row" fxLayout.xs="column" fxLayoutGap.gt-xs="16px">\n        <mat-form-field fxFlex floatLabel="always" class="mat-block" subscriptSizing="dynamic">\n          <mat-label translate>tb.rulenode.number-floating-point-field-input</mat-label>\n          <input formControlName="resultValuePrecision"\n                 matInput\n                 step="1" min="0"\n                 type="number"/>\n          <mat-hint [innerHTML]="\'tb.rulenode.number-floating-point-field-input-hint\' | translate | safe: \'html\'"></mat-hint>\n        </mat-form-field>\n      </div>\n      <div *ngIf="[ArgumentTypeResult.ATTRIBUTE, ArgumentTypeResult.TIME_SERIES].includes(mathFunctionConfigForm.get(\'result\').get(\'type\').value)"\n           fxFlex fxLayout="row" fxLayout.xs="column" fxLayoutAlign="start" fxLayoutGap.gt-xs="16px" style="padding-top: 16px;">\n        <mat-checkbox formControlName="addToBody">\n          {{\'tb.rulenode.add-to-message-field-input\' | translate }}\n        </mat-checkbox>\n        <mat-checkbox formControlName="addToMetadata">\n          {{\'tb.rulenode.add-to-metadata-field-input\' | translate}}\n        </mat-checkbox>\n      </div>\n    </div>\n  </fieldset>\n</section>\n',styles:[":host ::ng-deep .fields-group{padding:0 16px 8px;margin:10px 0;border:1px groove rgba(0,0,0,.25);border-radius:4px}:host ::ng-deep .fields-group .mat-mdc-form-field .mat-mdc-form-field-infix{width:100%}:host ::ng-deep .fields-group legend{color:#000000b3;width:-moz-fit-content;width:fit-content}:host ::ng-deep .fields-group legend+*{display:block}:host ::ng-deep .fields-group legend+*.no-margin-top{margin-top:0}\n"]}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder}]}});class qn extends f{constructor(e,t){super(e),this.store=e,this.fb=t,this.messageTypeNames=T,this.eventOptions=[I.CONNECT_EVENT,I.ACTIVITY_EVENT,I.DISCONNECT_EVENT,I.INACTIVITY_EVENT]}configForm(){return this.deviceState}prepareInputConfig(e){return{event:ae(e?.event)?e.event:I.ACTIVITY_EVENT}}onConfigurationSet(e){this.deviceState=this.fb.group({event:[e.event,[O.required]]})}}e("DeviceStateConfigComponent",qn),qn.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:qn,deps:[{token:P.Store},{token:R.FormBuilder}],target:t.ɵɵFactoryTarget.Component}),qn.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:qn,selector:"tb-action-node-device-state-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="deviceState">\n    <mat-form-field class="mat-block" subscriptSizing="dynamic">\n        <mat-label>{{ \'tb.rulenode.select-device-connectivity-event\' | translate }}</mat-label>\n        <mat-select formControlName="event">\n            <mat-option *ngFor="let eventOption of eventOptions" [value]="eventOption">\n                {{ messageTypeNames.get(eventOption) }}\n            </mat-option>\n        </mat-select>\n    </mat-form-field>\n</section>\n',dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"component",type:X.MatSelect,selector:"mat-select",inputs:["disabled","disableRipple","tabIndex","hideSingleSelectionIndicator"],exportAs:["matSelect"]},{kind:"component",type:ee.MatOption,selector:"mat-option",exportAs:["matOption"]},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:qn,decorators:[{type:n,args:[{selector:"tb-action-node-device-state-config",template:'<section [formGroup]="deviceState">\n    <mat-form-field class="mat-block" subscriptSizing="dynamic">\n        <mat-label>{{ \'tb.rulenode.select-device-connectivity-event\' | translate }}</mat-label>\n        <mat-select formControlName="event">\n            <mat-option *ngFor="let eventOption of eventOptions" [value]="eventOption">\n                {{ messageTypeNames.get(eventOption) }}\n            </mat-option>\n        </mat-select>\n    </mat-form-field>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.FormBuilder}]}});class An{constructor(){this.textAlign="left"}}e("ExampleHintComponent",An),An.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:An,deps:[],target:t.ɵɵFactoryTarget.Component}),An.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:An,selector:"tb-example-hint",inputs:{hintText:"hintText",popupHelpLink:"popupHelpLink",textAlign:"textAlign"},ngImport:t,template:'<div [hidden]="!hintText" class="tb-form-hint tb-primary-fill space-between">\n  <div [innerHTML]=" hintText | translate | safe: \'html\'"\n       [style.text-align]="textAlign"\n       class="hint-text"></div>\n  <div *ngIf="popupHelpLink" class="see-example" tb-help-popup="{{ popupHelpLink }}"\n       hintMode\n       tb-help-popup-placement="right"\n       trigger-style="letter-spacing:0.25px; font-size:12px"\n       [tb-help-popup-style]="{maxWidth: \'820px\'}"\n       trigger-text="{{ \'tb.key-val.see-examples\' | translate }}">\n  </div>\n</div>\n',styles:[":host .space-between{display:flex;justify-content:space-between;gap:20px}:host .space-between .see-example{display:flex;flex-shrink:0}:host .hint-text{width:100%}\n"],dependencies:[{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:$e.HelpPopupComponent,selector:"[tb-help-popup], [tb-help-popup-content]",inputs:["tb-help-popup","tb-help-popup-content","trigger-text","trigger-style","tb-help-popup-placement","tb-help-popup-style","hintMode"]},{kind:"pipe",type:he.SafePipe,name:"safe"},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:An,decorators:[{type:n,args:[{selector:"tb-example-hint",template:'<div [hidden]="!hintText" class="tb-form-hint tb-primary-fill space-between">\n  <div [innerHTML]=" hintText | translate | safe: \'html\'"\n       [style.text-align]="textAlign"\n       class="hint-text"></div>\n  <div *ngIf="popupHelpLink" class="see-example" tb-help-popup="{{ popupHelpLink }}"\n       hintMode\n       tb-help-popup-placement="right"\n       trigger-style="letter-spacing:0.25px; font-size:12px"\n       [tb-help-popup-style]="{maxWidth: \'820px\'}"\n       trigger-text="{{ \'tb.key-val.see-examples\' | translate }}">\n  </div>\n</div>\n',styles:[":host .space-between{display:flex;justify-content:space-between;gap:20px}:host .space-between .see-example{display:flex;flex-shrink:0}:host .hint-text{width:100%}\n"]}]}],propDecorators:{hintText:[{type:i}],popupHelpLink:[{type:i}],textAlign:[{type:i}]}});class Mn{constructor(e,t){this.injector=e,this.fb=t,this.propagateChange=()=>{},this.destroy$=new Ke,this.disabled=!1,this.uniqueKeyValuePairValidator=!1,this.required=!1,this.duplicateValuesValidator=e=>e.controls.key.value===e.controls.value.value&&e.controls.key.value&&e.controls.value.value?{uniqueKeyValuePair:!0}:null,this.oneMapRequiredValidator=e=>e.get("keyVals").value.length,this.propagateNestedErrors=e=>{if(this.kvListFormGroup&&this.kvListFormGroup.get("keyVals")&&"VALID"===this.kvListFormGroup.get("keyVals")?.status)return null;const t={};if(this.kvListFormGroup&&this.kvListFormGroup.setErrors(null),e instanceof z||e instanceof U){if(e.errors)for(const n of Object.keys(e.errors))t[n]=!0;for(const n of Object.keys(e.controls)){const r=this.propagateNestedErrors(e.controls[n]);if(r&&Object.keys(r).length)for(const e of Object.keys(r))t[e]=!0}return t}if(e.errors)for(const n of Object.keys(e.errors))t[n]=!0;return ie(t,{})?null:t}}ngOnInit(){this.ngControl=this.injector.get(_),null!=this.ngControl&&(this.ngControl.valueAccessor=this),this.kvListFormGroup=this.fb.group({keyVals:this.fb.array([])},{validators:[this.propagateNestedErrors,this.oneMapRequiredValidator]}),this.kvListFormGroup.valueChanges.pipe(ze(this.destroy$)).subscribe((()=>{this.updateModel()}))}ngOnDestroy(){this.destroy$.next(),this.destroy$.complete()}keyValsFormArray(){return this.kvListFormGroup.get("keyVals")}registerOnChange(e){this.propagateChange=e}registerOnTouched(e){}setDisabledState(e){this.disabled=e,this.disabled?this.kvListFormGroup.disable({emitEvent:!1}):this.kvListFormGroup.enable({emitEvent:!1})}writeValue(e){const t=Object.keys(e).map((t=>({key:t,value:e[t]})));if(this.keyValsFormArray().length===t.length)this.keyValsFormArray().patchValue(t,{emitEvent:!1});else{const e=[];t.forEach((t=>{e.push(this.fb.group({key:[t.key,[O.required,O.pattern(/(?:.|\s)*\S(&:.|\s)*/)]],value:[t.value,[O.required,O.pattern(/(?:.|\s)*\S(&:.|\s)*/)]]},{validators:this.uniqueKeyValuePairValidator?[this.duplicateValuesValidator]:[]}))})),this.kvListFormGroup.setControl("keyVals",this.fb.array(e,this.propagateNestedErrors),{emitEvent:!1})}}removeKeyVal(e){this.keyValsFormArray().removeAt(e)}addKeyVal(){this.keyValsFormArray().push(this.fb.group({key:["",[O.required,O.pattern(/(?:.|\s)*\S(&:.|\s)*/)]],value:["",[O.required,O.pattern(/(?:.|\s)*\S(&:.|\s)*/)]]},{validators:this.uniqueKeyValuePairValidator?[this.duplicateValuesValidator]:[]}))}validate(){const e=this.kvListFormGroup.get("keyVals").value;if(!e.length&&this.required)return{kvMapRequired:!0};if(!this.kvListFormGroup.valid)return{kvFieldsRequired:!0};if(this.uniqueKeyValuePairValidator)for(const t of e)if(t.key===t.value)return{uniqueKeyValuePair:!0};return null}updateModel(){const e=this.kvListFormGroup.get("keyVals").value;if(this.required&&!e.length||!this.kvListFormGroup.valid)this.propagateChange(null);else{const t={};e.forEach((e=>{t[e.key]=e.value})),this.propagateChange(t)}}}e("KvMapConfigComponent",Mn),Mn.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Mn,deps:[{token:t.Injector},{token:R.FormBuilder}],target:t.ɵɵFactoryTarget.Component}),Mn.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:Mn,selector:"tb-kv-map-config",inputs:{disabled:"disabled",uniqueKeyValuePairValidator:"uniqueKeyValuePairValidator",labelText:"labelText",requiredText:"requiredText",keyText:"keyText",keyRequiredText:"keyRequiredText",valText:"valText",valRequiredText:"valRequiredText",hintText:"hintText",popupHelpLink:"popupHelpLink",required:"required"},providers:[{provide:B,useExisting:a((()=>Mn)),multi:!0},{provide:K,useExisting:a((()=>Mn)),multi:!0}],ngImport:t,template:'<section [formGroup]="kvListFormGroup" class="tb-form-panel stroked">\n  <div class="tb-form-row no-padding no-border space-between">\n    <div class="tb-form-panel-title">{{ labelText }}</div>\n    <div class="tb-form-panel-hint tb-error" translate *ngIf="kvListFormGroup.hasError(\'kvMapRequired\')">\n      {{ requiredText }}\n    </div>\n    <div class="tb-form-panel-hint tb-error" translate *ngIf="kvListFormGroup.hasError(\'required\')">\n      tb.rulenode.map-fields-required\n    </div>\n    <div class="tb-form-panel-hint tb-error" translate *ngIf="kvListFormGroup.hasError(\'uniqueKeyValuePair\')">\n      {{ \'tb.key-val.unique-key-value-pair-error\' | translate:\n            {\n              valText: valText,\n              keyText: keyText\n            } }}\n    </div>\n  </div>\n  <div class="tb-form-panel no-border no-padding">\n    <div class="tb-form-table">\n      <div class="tb-form-table-header">\n        <div class="tb-form-table-header-cell field-space">{{ keyText }}</div>\n        <div class="tb-form-table-header-cell field-space">{{ valText }}</div>\n        <div class="tb-form-table-header-cell actions-header"></div>\n      </div>\n      <div class="tb-form-table-body">\n        <div class="tb-form-table-row"\n             *ngFor="let keyValControl of keyValsFormArray().controls; let $index = index;">\n          <mat-form-field class="tb-inline-field field-space" appearance="outline" subscriptSizing="dynamic">\n            <input [placeholder]="keyText+\'*\'" [formControl]="keyValControl.get(\'key\')" matInput/>\n          </mat-form-field>\n          <mat-form-field class="tb-inline-field field-space" appearance="outline" subscriptSizing="dynamic">\n            <input [placeholder]="valText+\'*\'" [formControl]="keyValControl.get(\'value\')" matInput/>\n          </mat-form-field>\n          <div class="tb-form-table-row-cell-buttons">\n            <button [class.tb-hidden]="keyValsFormArray().controls.length === 1"\n                    type="button"\n                    mat-icon-button\n                    (click)="removeKeyVal($index)"\n                    [disabled]="disabled"\n                    matTooltip="{{ \'tb.key-val.remove-mapping-entry\' | translate }}"\n                    matTooltipPosition="above">\n              <mat-icon>delete</mat-icon>\n            </button>\n          </div>\n        </div>\n      </div>\n    </div>\n  </div>\n  <div>\n    <button type="button" mat-stroked-button color="primary" (click)="addKeyVal()">\n      {{ \'tb.key-val.add-mapping-entry\' | translate }}\n    </button>\n  </div>\n  <tb-example-hint [hintText]="hintText" [popupHelpLink]="popupHelpLink" *ngIf="popupHelpLink || hintText"></tb-example-hint>\n</section>\n',styles:[":host .field-space{flex:1 1 50%}:host .actions-header{width:40px}\n",':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n'],dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:de.MatButton,selector:"    button[mat-button], button[mat-raised-button], button[mat-flat-button],    button[mat-stroked-button]  ",inputs:["disabled","disableRipple","color"],exportAs:["matButton"]},{kind:"component",type:de.MatIconButton,selector:"button[mat-icon-button]",inputs:["disabled","disableRipple","color"],exportAs:["matButton"]},{kind:"component",type:ue.MatIcon,selector:"mat-icon",inputs:["color","inline","svgIcon","fontSet","fontIcon"],exportAs:["matIcon"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:ce.MatTooltip,selector:"[matTooltip]",exportAs:["matTooltip"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.FormControlDirective,selector:"[formControl]",inputs:["formControl","disabled","ngModel"],outputs:["ngModelChange"],exportAs:["ngForm"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"component",type:An,selector:"tb-example-hint",inputs:["hintText","popupHelpLink","textAlign"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),Be([N()],Mn.prototype,"disabled",void 0),Be([N()],Mn.prototype,"uniqueKeyValuePairValidator",void 0),Be([N()],Mn.prototype,"required",void 0),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Mn,decorators:[{type:n,args:[{selector:"tb-kv-map-config",providers:[{provide:B,useExisting:a((()=>Mn)),multi:!0},{provide:K,useExisting:a((()=>Mn)),multi:!0}],template:'<section [formGroup]="kvListFormGroup" class="tb-form-panel stroked">\n  <div class="tb-form-row no-padding no-border space-between">\n    <div class="tb-form-panel-title">{{ labelText }}</div>\n    <div class="tb-form-panel-hint tb-error" translate *ngIf="kvListFormGroup.hasError(\'kvMapRequired\')">\n      {{ requiredText }}\n    </div>\n    <div class="tb-form-panel-hint tb-error" translate *ngIf="kvListFormGroup.hasError(\'required\')">\n      tb.rulenode.map-fields-required\n    </div>\n    <div class="tb-form-panel-hint tb-error" translate *ngIf="kvListFormGroup.hasError(\'uniqueKeyValuePair\')">\n      {{ \'tb.key-val.unique-key-value-pair-error\' | translate:\n            {\n              valText: valText,\n              keyText: keyText\n            } }}\n    </div>\n  </div>\n  <div class="tb-form-panel no-border no-padding">\n    <div class="tb-form-table">\n      <div class="tb-form-table-header">\n        <div class="tb-form-table-header-cell field-space">{{ keyText }}</div>\n        <div class="tb-form-table-header-cell field-space">{{ valText }}</div>\n        <div class="tb-form-table-header-cell actions-header"></div>\n      </div>\n      <div class="tb-form-table-body">\n        <div class="tb-form-table-row"\n             *ngFor="let keyValControl of keyValsFormArray().controls; let $index = index;">\n          <mat-form-field class="tb-inline-field field-space" appearance="outline" subscriptSizing="dynamic">\n            <input [placeholder]="keyText+\'*\'" [formControl]="keyValControl.get(\'key\')" matInput/>\n          </mat-form-field>\n          <mat-form-field class="tb-inline-field field-space" appearance="outline" subscriptSizing="dynamic">\n            <input [placeholder]="valText+\'*\'" [formControl]="keyValControl.get(\'value\')" matInput/>\n          </mat-form-field>\n          <div class="tb-form-table-row-cell-buttons">\n            <button [class.tb-hidden]="keyValsFormArray().controls.length === 1"\n                    type="button"\n                    mat-icon-button\n                    (click)="removeKeyVal($index)"\n                    [disabled]="disabled"\n                    matTooltip="{{ \'tb.key-val.remove-mapping-entry\' | translate }}"\n                    matTooltipPosition="above">\n              <mat-icon>delete</mat-icon>\n            </button>\n          </div>\n        </div>\n      </div>\n    </div>\n  </div>\n  <div>\n    <button type="button" mat-stroked-button color="primary" (click)="addKeyVal()">\n      {{ \'tb.key-val.add-mapping-entry\' | translate }}\n    </button>\n  </div>\n  <tb-example-hint [hintText]="hintText" [popupHelpLink]="popupHelpLink" *ngIf="popupHelpLink || hintText"></tb-example-hint>\n</section>\n',styles:[":host .field-space{flex:1 1 50%}:host .actions-header{width:40px}\n",':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n']}]}],ctorParameters:function(){return[{type:t.Injector},{type:R.FormBuilder}]},propDecorators:{disabled:[{type:i}],uniqueKeyValuePairValidator:[{type:i}],labelText:[{type:i}],requiredText:[{type:i}],keyText:[{type:i}],keyRequiredText:[{type:i}],valText:[{type:i}],valRequiredText:[{type:i}],hintText:[{type:i}],popupHelpLink:[{type:i}],required:[{type:i}]}});class En extends L{get required(){return this.requiredValue}set required(e){this.requiredValue=Le(e)}constructor(e,t){super(e),this.store=e,this.fb=t,this.directionTypes=Object.values(v),this.directionTypeTranslations=C,this.entityType=F,this.propagateChange=null}ngOnInit(){this.deviceRelationsQueryFormGroup=this.fb.group({fetchLastLevelOnly:[!1,[]],direction:[null,[O.required]],maxLevel:[null,[O.min(1)]],relationType:[null],deviceTypes:[null,[O.required]]}),this.deviceRelationsQueryFormGroup.valueChanges.subscribe((e=>{this.deviceRelationsQueryFormGroup.valid?this.propagateChange(e):this.propagateChange(null)}))}registerOnChange(e){this.propagateChange=e}registerOnTouched(e){}setDisabledState(e){this.disabled=e,this.disabled?this.deviceRelationsQueryFormGroup.disable({emitEvent:!1}):this.deviceRelationsQueryFormGroup.enable({emitEvent:!1})}writeValue(e){this.deviceRelationsQueryFormGroup.reset(e,{emitEvent:!1})}}e("DeviceRelationsQueryConfigComponent",En),En.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:En,deps:[{token:P.Store},{token:R.FormBuilder}],target:t.ɵɵFactoryTarget.Component}),En.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:En,selector:"tb-device-relations-query-config",inputs:{disabled:"disabled",required:"required"},providers:[{provide:B,useExisting:a((()=>En)),multi:!0}],usesInheritance:!0,ngImport:t,template:'<section fxLayout="column" [formGroup]="deviceRelationsQueryFormGroup">\n  <div fxLayoutGap="22px" fxLayout="row">\n    <mat-form-field class="mat-block" subscriptSizing="dynamic" fxFlex="50" style="min-width: 100px;" hideRequiredMarker>\n      <mat-label translate>relation.direction</mat-label>\n      <mat-select required formControlName="direction">\n        <mat-option *ngFor="let type of directionTypes" [value]="type">\n          {{ directionTypeTranslations.get(type) | translate }} <span translate>tb.rulenode.relations-query-config-direction-suffix</span>\n        </mat-option>\n      </mat-select>\n    </mat-form-field>\n    <mat-form-field fxFlex="50" floatLabel="always" class="mat-block">\n      <mat-label translate>tb.rulenode.max-relation-level</mat-label>\n      <input matInput\n             type="number"\n             min="1"\n             step="1"\n             placeholder="{{ \'tb.rulenode.unlimited-level\' | translate }}"\n             formControlName="maxLevel">\n      <mat-error *ngIf="deviceRelationsQueryFormGroup.get(\'maxLevel\').hasError(\'min\')">\n        {{ \'tb.rulenode.max-relation-level-error\' | translate }}\n      </mat-error>\n    </mat-form-field>\n  </div>\n  <div tb-hint-tooltip-icon="{{ \'tb.rulenode.last-level-device-relation-tooltip\' | translate }}"\n       *ngIf="deviceRelationsQueryFormGroup.get(\'maxLevel\').value > 1"\n       class="tb-form-row no-border no-padding last-level-slide-toggle">\n    <mat-slide-toggle class="mat-slide" formControlName="fetchLastLevelOnly">\n      {{ \'alias.last-level-relation\' | translate }}\n    </mat-slide-toggle>\n  </div>\n  <tb-relation-type-autocomplete\n    fxFlex\n    formControlName="relationType">\n  </tb-relation-type-autocomplete>\n  <tb-entity-subtype-list\n    required\n    [label]="\'tb.rulenode.device-profiles\' | translate"\n    [entityType]="entityType.DEVICE"\n    [emptyInputPlaceholder]="\'tb.rulenode.add-device-profile\' | translate"\n    [filledInputPlaceholder]="\'tb.rulenode.add-device-profile\' | translate"\n    formControlName="deviceTypes">\n    <mat-icon matSuffix class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon" color="primary"\n              matTooltip="{{ \'tb.rulenode.chip-help\' | translate: { inputName: \'tb.rulenode.device-profile\' | translate } }}">help</mat-icon>\n  </tb-entity-subtype-list>\n</section>\n',styles:[":host .last-level-slide-toggle{margin:8px 0 24px}\n",':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n'],dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:Qe.EntitySubTypeListComponent,selector:"tb-entity-subtype-list",inputs:["required","floatLabel","label","disabled","entityType","emptyInputPlaceholder","filledInputPlaceholder","appearance","subscriptSizing","additionalClasses"]},{kind:"component",type:Je.RelationTypeAutocompleteComponent,selector:"tb-relation-type-autocomplete",inputs:["showLabel","additionalClasses","appearance","required","disabled","subscriptSizing"]},{kind:"component",type:ue.MatIcon,selector:"mat-icon",inputs:["color","inline","svgIcon","fontSet","fontIcon"],exportAs:["matIcon"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"directive",type:Y.MatSuffix,selector:"[matSuffix], [matIconSuffix], [matTextSuffix]",inputs:["matTextSuffix"]},{kind:"component",type:X.MatSelect,selector:"mat-select",inputs:["disabled","disableRipple","tabIndex","hideSingleSelectionIndicator"],exportAs:["matSelect"]},{kind:"component",type:ee.MatOption,selector:"mat-option",exportAs:["matOption"]},{kind:"directive",type:ce.MatTooltip,selector:"[matTooltip]",exportAs:["matTooltip"]},{kind:"component",type:te.MatSlideToggle,selector:"mat-slide-toggle",inputs:["disabled","disableRipple","color","tabIndex"],exportAs:["matSlideToggle"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:W.DefaultLayoutGapDirective,selector:"  [fxLayoutGap], [fxLayoutGap.xs], [fxLayoutGap.sm], [fxLayoutGap.md],  [fxLayoutGap.lg], [fxLayoutGap.xl], [fxLayoutGap.lt-sm], [fxLayoutGap.lt-md],  [fxLayoutGap.lt-lg], [fxLayoutGap.lt-xl], [fxLayoutGap.gt-xs], [fxLayoutGap.gt-sm],  [fxLayoutGap.gt-md], [fxLayoutGap.gt-lg]",inputs:["fxLayoutGap","fxLayoutGap.xs","fxLayoutGap.sm","fxLayoutGap.md","fxLayoutGap.lg","fxLayoutGap.xl","fxLayoutGap.lt-sm","fxLayoutGap.lt-md","fxLayoutGap.lt-lg","fxLayoutGap.lt-xl","fxLayoutGap.gt-xs","fxLayoutGap.gt-sm","fxLayoutGap.gt-md","fxLayoutGap.gt-lg"]},{kind:"directive",type:W.DefaultFlexDirective,selector:"  [fxFlex], [fxFlex.xs], [fxFlex.sm], [fxFlex.md],  [fxFlex.lg], [fxFlex.xl], [fxFlex.lt-sm], [fxFlex.lt-md],  [fxFlex.lt-lg], [fxFlex.lt-xl], [fxFlex.gt-xs], [fxFlex.gt-sm],  [fxFlex.gt-md], [fxFlex.gt-lg]",inputs:["fxFlex","fxFlex.xs","fxFlex.sm","fxFlex.md","fxFlex.lg","fxFlex.xl","fxFlex.lt-sm","fxFlex.lt-md","fxFlex.lt-lg","fxFlex.lt-xl","fxFlex.gt-xs","fxFlex.gt-sm","fxFlex.gt-md","fxFlex.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NumberValueAccessor,selector:"input[type=number][formControlName],input[type=number][formControl],input[type=number][ngModel]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.MinValidator,selector:"input[type=number][min][formControlName],input[type=number][min][formControl],input[type=number][min][ngModel]",inputs:["min"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"component",type:ne.HintTooltipIconComponent,selector:"[tb-hint-tooltip-icon]",inputs:["tb-hint-tooltip-icon","tooltipPosition","hintIcon"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:En,decorators:[{type:n,args:[{selector:"tb-device-relations-query-config",providers:[{provide:B,useExisting:a((()=>En)),multi:!0}],template:'<section fxLayout="column" [formGroup]="deviceRelationsQueryFormGroup">\n  <div fxLayoutGap="22px" fxLayout="row">\n    <mat-form-field class="mat-block" subscriptSizing="dynamic" fxFlex="50" style="min-width: 100px;" hideRequiredMarker>\n      <mat-label translate>relation.direction</mat-label>\n      <mat-select required formControlName="direction">\n        <mat-option *ngFor="let type of directionTypes" [value]="type">\n          {{ directionTypeTranslations.get(type) | translate }} <span translate>tb.rulenode.relations-query-config-direction-suffix</span>\n        </mat-option>\n      </mat-select>\n    </mat-form-field>\n    <mat-form-field fxFlex="50" floatLabel="always" class="mat-block">\n      <mat-label translate>tb.rulenode.max-relation-level</mat-label>\n      <input matInput\n             type="number"\n             min="1"\n             step="1"\n             placeholder="{{ \'tb.rulenode.unlimited-level\' | translate }}"\n             formControlName="maxLevel">\n      <mat-error *ngIf="deviceRelationsQueryFormGroup.get(\'maxLevel\').hasError(\'min\')">\n        {{ \'tb.rulenode.max-relation-level-error\' | translate }}\n      </mat-error>\n    </mat-form-field>\n  </div>\n  <div tb-hint-tooltip-icon="{{ \'tb.rulenode.last-level-device-relation-tooltip\' | translate }}"\n       *ngIf="deviceRelationsQueryFormGroup.get(\'maxLevel\').value > 1"\n       class="tb-form-row no-border no-padding last-level-slide-toggle">\n    <mat-slide-toggle class="mat-slide" formControlName="fetchLastLevelOnly">\n      {{ \'alias.last-level-relation\' | translate }}\n    </mat-slide-toggle>\n  </div>\n  <tb-relation-type-autocomplete\n    fxFlex\n    formControlName="relationType">\n  </tb-relation-type-autocomplete>\n  <tb-entity-subtype-list\n    required\n    [label]="\'tb.rulenode.device-profiles\' | translate"\n    [entityType]="entityType.DEVICE"\n    [emptyInputPlaceholder]="\'tb.rulenode.add-device-profile\' | translate"\n    [filledInputPlaceholder]="\'tb.rulenode.add-device-profile\' | translate"\n    formControlName="deviceTypes">\n    <mat-icon matSuffix class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon" color="primary"\n              matTooltip="{{ \'tb.rulenode.chip-help\' | translate: { inputName: \'tb.rulenode.device-profile\' | translate } }}">help</mat-icon>\n  </tb-entity-subtype-list>\n</section>\n',styles:[":host .last-level-slide-toggle{margin:8px 0 24px}\n",':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n']}]}],ctorParameters:function(){return[{type:P.Store},{type:R.FormBuilder}]},propDecorators:{disabled:[{type:i}],required:[{type:i}]}});class Gn extends L{get required(){return this.requiredValue}set required(e){this.requiredValue=Le(e)}constructor(e,t){super(e),this.store=e,this.fb=t,this.directionTypes=Object.values(v),this.directionTypeTranslations=C,this.propagateChange=null}ngOnInit(){this.relationsQueryFormGroup=this.fb.group({fetchLastLevelOnly:[!1,[]],direction:[null,[O.required]],maxLevel:[null,[O.min(1)]],filters:[null]}),this.relationsQueryFormGroup.valueChanges.subscribe((e=>{this.relationsQueryFormGroup.valid?this.propagateChange(e):this.propagateChange(null)}))}registerOnChange(e){this.propagateChange=e}registerOnTouched(e){}setDisabledState(e){this.disabled=e,this.disabled?this.relationsQueryFormGroup.disable({emitEvent:!1}):this.relationsQueryFormGroup.enable({emitEvent:!1})}writeValue(e){this.relationsQueryFormGroup.reset(e||{},{emitEvent:!1})}}e("RelationsQueryConfigComponent",Gn),Gn.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Gn,deps:[{token:P.Store},{token:R.FormBuilder}],target:t.ɵɵFactoryTarget.Component}),Gn.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:Gn,selector:"tb-relations-query-config",inputs:{disabled:"disabled",required:"required"},providers:[{provide:B,useExisting:a((()=>Gn)),multi:!0}],usesInheritance:!0,ngImport:t,template:'<section [formGroup]="relationsQueryFormGroup" class="tb-form-panel stroked">\n  <div class="tb-form-panel-title tb-required" translate>tb.rulenode.relations-query</div>\n  <section>\n    <div fxLayoutGap="16px" fxLayout="row">\n      <mat-form-field fxFlex="50" class="mat-block" style="min-width: 100px;" hideRequiredMarker>\n        <mat-label translate>relation.direction</mat-label>\n        <mat-select required formControlName="direction">\n          <mat-option *ngFor="let type of directionTypes" [value]="type">\n            {{ directionTypeTranslations.get(type) | translate }} <span translate>tb.rulenode.relations-query-config-direction-suffix</span>\n          </mat-option>\n        </mat-select>\n      </mat-form-field>\n      <mat-form-field fxFlex="50" floatLabel="always" class="mat-block">\n        <mat-label translate>tb.rulenode.max-relation-level</mat-label>\n        <input matInput\n               type="number"\n               min="1"\n               step="1"\n               placeholder="{{ \'tb.rulenode.unlimited-level\' | translate }}"\n               formControlName="maxLevel">\n        <mat-error *ngIf="relationsQueryFormGroup.get(\'maxLevel\').hasError(\'min\')">\n          {{ \'tb.rulenode.max-relation-level-error\' | translate }}\n        </mat-error>\n      </mat-form-field>\n    </div>\n    <div tb-hint-tooltip-icon="{{ \'tb.rulenode.last-level-relation-tooltip\' | translate }}"\n         *ngIf="relationsQueryFormGroup.get(\'maxLevel\').value > 1"\n         class="tb-form-row no-border no-padding last-level-slide-toggle">\n      <mat-slide-toggle class="mat-slide" formControlName="fetchLastLevelOnly">\n        {{ \'alias.last-level-relation\' | translate }}\n      </mat-slide-toggle>\n    </div>\n  </section>\n  <section [formGroup]="relationsQueryFormGroup" class="tb-form-panel stroked">\n    <div class="tb-form-panel-title" translate>relation.relation-filters</div>\n    <tb-relation-filters\n      formControlName="filters">\n    </tb-relation-filters>\n  </section>\n</section>\n',dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"component",type:X.MatSelect,selector:"mat-select",inputs:["disabled","disableRipple","tabIndex","hideSingleSelectionIndicator"],exportAs:["matSelect"]},{kind:"component",type:ee.MatOption,selector:"mat-option",exportAs:["matOption"]},{kind:"component",type:te.MatSlideToggle,selector:"mat-slide-toggle",inputs:["disabled","disableRipple","color","tabIndex"],exportAs:["matSlideToggle"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:W.DefaultLayoutGapDirective,selector:"  [fxLayoutGap], [fxLayoutGap.xs], [fxLayoutGap.sm], [fxLayoutGap.md],  [fxLayoutGap.lg], [fxLayoutGap.xl], [fxLayoutGap.lt-sm], [fxLayoutGap.lt-md],  [fxLayoutGap.lt-lg], [fxLayoutGap.lt-xl], [fxLayoutGap.gt-xs], [fxLayoutGap.gt-sm],  [fxLayoutGap.gt-md], [fxLayoutGap.gt-lg]",inputs:["fxLayoutGap","fxLayoutGap.xs","fxLayoutGap.sm","fxLayoutGap.md","fxLayoutGap.lg","fxLayoutGap.xl","fxLayoutGap.lt-sm","fxLayoutGap.lt-md","fxLayoutGap.lt-lg","fxLayoutGap.lt-xl","fxLayoutGap.gt-xs","fxLayoutGap.gt-sm","fxLayoutGap.gt-md","fxLayoutGap.gt-lg"]},{kind:"directive",type:W.DefaultFlexDirective,selector:"  [fxFlex], [fxFlex.xs], [fxFlex.sm], [fxFlex.md],  [fxFlex.lg], [fxFlex.xl], [fxFlex.lt-sm], [fxFlex.lt-md],  [fxFlex.lt-lg], [fxFlex.lt-xl], [fxFlex.gt-xs], [fxFlex.gt-sm],  [fxFlex.gt-md], [fxFlex.gt-lg]",inputs:["fxFlex","fxFlex.xs","fxFlex.sm","fxFlex.md","fxFlex.lg","fxFlex.xl","fxFlex.lt-sm","fxFlex.lt-md","fxFlex.lt-lg","fxFlex.lt-xl","fxFlex.gt-xs","fxFlex.gt-sm","fxFlex.gt-md","fxFlex.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NumberValueAccessor,selector:"input[type=number][formControlName],input[type=number][formControl],input[type=number][ngModel]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.MinValidator,selector:"input[type=number][min][formControlName],input[type=number][min][formControl],input[type=number][min][ngModel]",inputs:["min"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"component",type:ne.HintTooltipIconComponent,selector:"[tb-hint-tooltip-icon]",inputs:["tb-hint-tooltip-icon","tooltipPosition","hintIcon"]},{kind:"component",type:Ye.RelationFiltersComponent,selector:"tb-relation-filters",inputs:["disabled","allowedEntityTypes"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Gn,decorators:[{type:n,args:[{selector:"tb-relations-query-config",providers:[{provide:B,useExisting:a((()=>Gn)),multi:!0}],template:'<section [formGroup]="relationsQueryFormGroup" class="tb-form-panel stroked">\n  <div class="tb-form-panel-title tb-required" translate>tb.rulenode.relations-query</div>\n  <section>\n    <div fxLayoutGap="16px" fxLayout="row">\n      <mat-form-field fxFlex="50" class="mat-block" style="min-width: 100px;" hideRequiredMarker>\n        <mat-label translate>relation.direction</mat-label>\n        <mat-select required formControlName="direction">\n          <mat-option *ngFor="let type of directionTypes" [value]="type">\n            {{ directionTypeTranslations.get(type) | translate }} <span translate>tb.rulenode.relations-query-config-direction-suffix</span>\n          </mat-option>\n        </mat-select>\n      </mat-form-field>\n      <mat-form-field fxFlex="50" floatLabel="always" class="mat-block">\n        <mat-label translate>tb.rulenode.max-relation-level</mat-label>\n        <input matInput\n               type="number"\n               min="1"\n               step="1"\n               placeholder="{{ \'tb.rulenode.unlimited-level\' | translate }}"\n               formControlName="maxLevel">\n        <mat-error *ngIf="relationsQueryFormGroup.get(\'maxLevel\').hasError(\'min\')">\n          {{ \'tb.rulenode.max-relation-level-error\' | translate }}\n        </mat-error>\n      </mat-form-field>\n    </div>\n    <div tb-hint-tooltip-icon="{{ \'tb.rulenode.last-level-relation-tooltip\' | translate }}"\n         *ngIf="relationsQueryFormGroup.get(\'maxLevel\').value > 1"\n         class="tb-form-row no-border no-padding last-level-slide-toggle">\n      <mat-slide-toggle class="mat-slide" formControlName="fetchLastLevelOnly">\n        {{ \'alias.last-level-relation\' | translate }}\n      </mat-slide-toggle>\n    </div>\n  </section>\n  <section [formGroup]="relationsQueryFormGroup" class="tb-form-panel stroked">\n    <div class="tb-form-panel-title" translate>relation.relation-filters</div>\n    <tb-relation-filters\n      formControlName="filters">\n    </tb-relation-filters>\n  </section>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.FormBuilder}]},propDecorators:{disabled:[{type:i}],required:[{type:i}]}});class Dn extends L{get required(){return this.requiredValue}set required(e){this.requiredValue=Le(e)}constructor(e,t,n,r){super(e),this.store=e,this.translate=t,this.truncate=n,this.fb=r,this.placeholder="tb.rulenode.add-message-type",this.separatorKeysCodes=[ge,ye,xe],this.messageTypes=[],this.messageTypesList=[],this.searchText="",this.propagateChange=e=>{},this.messageTypeConfigForm=this.fb.group({messageType:[null]});for(const e of Object.keys(I))this.messageTypesList.push({name:T.get(I[e]),value:e})}registerOnChange(e){this.propagateChange=e}registerOnTouched(e){}ngOnInit(){this.filteredMessageTypes=this.messageTypeConfigForm.get("messageType").valueChanges.pipe(Ge(""),Ee((e=>e||"")),De((e=>this.fetchMessageTypes(e))),we())}setDisabledState(e){this.disabled=e,this.disabled?this.messageTypeConfigForm.disable({emitEvent:!1}):this.messageTypeConfigForm.enable({emitEvent:!1})}writeValue(e){this.searchText="",this.messageTypes.length=0,e&&e.forEach((e=>{const t=this.messageTypesList.find((t=>t.value===e));t?this.messageTypes.push({name:t.name,value:t.value}):this.messageTypes.push({name:e,value:e})}))}displayMessageTypeFn(e){return e?e.name:void 0}textIsNotEmpty(e){return e&&e.length>0}createMessageType(e,t){e.preventDefault(),this.transformMessageType(t)}add(e){this.transformMessageType(e.value)}fetchMessageTypes(e){if(this.searchText=e,this.searchText&&this.searchText.length){const e=this.searchText.toUpperCase();return Ue(this.messageTypesList.filter((t=>t.name.toUpperCase().includes(e))))}return Ue(this.messageTypesList)}transformMessageType(e){if((e||"").trim()){let t;const n=e.trim(),r=this.messageTypesList.find((e=>e.name===n));t=r?{name:r.name,value:r.value}:{name:n,value:n},t&&this.addMessageType(t)}this.clear("")}remove(e){const t=this.messageTypes.indexOf(e);t>=0&&(this.messageTypes.splice(t,1),this.updateModel())}selected(e){this.addMessageType(e.option.value),this.clear("")}addMessageType(e){-1===this.messageTypes.findIndex((t=>t.value===e.value))&&(this.messageTypes.push(e),this.updateModel())}onFocus(){this.messageTypeConfigForm.get("messageType").updateValueAndValidity({onlySelf:!0,emitEvent:!0})}clear(e=""){this.messageTypeInput.nativeElement.value=e,this.messageTypeConfigForm.get("messageType").patchValue(null,{emitEvent:!0}),setTimeout((()=>{this.messageTypeInput.nativeElement.blur(),this.messageTypeInput.nativeElement.focus()}),0)}updateModel(){const e=this.messageTypes.map((e=>e.value));this.required?(this.chipList.errorState=!e.length,this.propagateChange(e.length>0?e:null)):(this.chipList.errorState=!1,this.propagateChange(e))}}e("MessageTypesConfigComponent",Dn),Dn.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Dn,deps:[{token:P.Store},{token:Z.TranslateService},{token:S.TruncatePipe},{token:R.FormBuilder}],target:t.ɵɵFactoryTarget.Component}),Dn.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:Dn,selector:"tb-message-types-config",inputs:{required:"required",label:"label",placeholder:"placeholder",disabled:"disabled"},providers:[{provide:B,useExisting:a((()=>Dn)),multi:!0}],viewQueries:[{propertyName:"chipList",first:!0,predicate:["chipList"],descendants:!0},{propertyName:"matAutocomplete",first:!0,predicate:["messageTypeAutocomplete"],descendants:!0},{propertyName:"messageTypeInput",first:!0,predicate:["messageTypeInput"],descendants:!0}],usesInheritance:!0,ngImport:t,template:'<mat-form-field [formGroup]="messageTypeConfigForm" style="width: 100%;">\n  <mat-label *ngIf="label">{{ label }}</mat-label>\n  <mat-chip-grid #chipList [required]="required">\n    <mat-chip-row\n      *ngFor="let messageType of messageTypes"\n      [removable]="true"\n      (removed)="remove(messageType)">\n      {{messageType.name}}\n      <mat-icon matChipRemove>close</mat-icon>\n    </mat-chip-row>\n    <input matInput type="text" placeholder="{{ placeholder | translate }}"\n           #messageTypeInput\n           (focusin)="onFocus()"\n           formControlName="messageType"\n           matAutocompleteOrigin\n           #origin="matAutocompleteOrigin"\n           [matAutocompleteConnectedTo]="origin"\n           [matAutocomplete]="messageTypeAutocomplete"\n           [matChipInputFor]="chipList"\n           [matChipInputSeparatorKeyCodes]="separatorKeysCodes"\n           (matChipInputTokenEnd)="add($event)">\n  </mat-chip-grid>\n  <mat-autocomplete #messageTypeAutocomplete="matAutocomplete"\n                    class="tb-autocomplete"\n                    (optionSelected)="selected($event)"\n                    [displayWith]="displayMessageTypeFn">\n    <mat-option *ngFor="let messageType of filteredMessageTypes | async" [value]="messageType">\n      <span [innerHTML]="messageType.name | highlight:searchText"></span>\n    </mat-option>\n    <mat-option *ngIf="(filteredMessageTypes | async)?.length === 0" [value]="null" class="tb-not-found">\n      <div class="tb-not-found-content" (click)="$event.stopPropagation()">\n        <div *ngIf="!textIsNotEmpty(searchText); else searchNotEmpty">\n          <span translate>tb.rulenode.no-message-types-found</span>\n        </div>\n        <ng-template #searchNotEmpty>\n                <span>\n                  {{ \'tb.rulenode.no-message-type-matching\' | translate :\n                  {messageType: truncate.transform(searchText, true, 6, &apos;...&apos;)}\n                  }}\n                </span>\n        </ng-template>\n        <span>\n          <a translate (click)="createMessageType($event, searchText)">tb.rulenode.create-new-message-type</a>\n        </span>\n      </div>\n    </mat-option>\n  </mat-autocomplete>\n  <mat-icon class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon" matSuffix\n            color="primary"\n            matTooltip="{{ \'tb.rulenode.chip-help\' | translate: { inputName: \'tb.rulenode.message-type\' | translate } }}">help</mat-icon>\n  <mat-error *ngIf="chipList.errorState">\n    {{ \'tb.rulenode.select-message-types-required\' | translate }}\n  </mat-error>\n</mat-form-field>\n',styles:[':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n'],dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:ue.MatIcon,selector:"mat-icon",inputs:["color","inline","svgIcon","fontSet","fontIcon"],exportAs:["matIcon"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"directive",type:Y.MatSuffix,selector:"[matSuffix], [matIconSuffix], [matTextSuffix]",inputs:["matTextSuffix"]},{kind:"component",type:ee.MatOption,selector:"mat-option",exportAs:["matOption"]},{kind:"directive",type:ce.MatTooltip,selector:"[matTooltip]",exportAs:["matTooltip"]},{kind:"component",type:Re.MatAutocomplete,selector:"mat-autocomplete",inputs:["disableRipple","hideSingleSelectionIndicator"],exportAs:["matAutocomplete"]},{kind:"directive",type:Re.MatAutocompleteTrigger,selector:"input[matAutocomplete], textarea[matAutocomplete]",exportAs:["matAutocompleteTrigger"]},{kind:"directive",type:Re.MatAutocompleteOrigin,selector:"[matAutocompleteOrigin]",exportAs:["matAutocompleteOrigin"]},{kind:"component",type:be.MatChipGrid,selector:"mat-chip-grid",inputs:["tabIndex","disabled","placeholder","required","value","errorStateMatcher"],outputs:["change","valueChange"]},{kind:"directive",type:be.MatChipInput,selector:"input[matChipInputFor]",inputs:["matChipInputFor","matChipInputAddOnBlur","matChipInputSeparatorKeyCodes","placeholder","id","disabled"],outputs:["matChipInputTokenEnd"],exportAs:["matChipInput","matChipInputFor"]},{kind:"directive",type:be.MatChipRemove,selector:"[matChipRemove]"},{kind:"component",type:be.MatChipRow,selector:"mat-chip-row, [mat-chip-row], mat-basic-chip-row, [mat-basic-chip-row]",inputs:["color","disabled","disableRipple","tabIndex","editable"],outputs:["edited"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"pipe",type:H.AsyncPipe,name:"async"},{kind:"pipe",type:Oe.HighlightPipe,name:"highlight"},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Dn,decorators:[{type:n,args:[{selector:"tb-message-types-config",providers:[{provide:B,useExisting:a((()=>Dn)),multi:!0}],template:'<mat-form-field [formGroup]="messageTypeConfigForm" style="width: 100%;">\n  <mat-label *ngIf="label">{{ label }}</mat-label>\n  <mat-chip-grid #chipList [required]="required">\n    <mat-chip-row\n      *ngFor="let messageType of messageTypes"\n      [removable]="true"\n      (removed)="remove(messageType)">\n      {{messageType.name}}\n      <mat-icon matChipRemove>close</mat-icon>\n    </mat-chip-row>\n    <input matInput type="text" placeholder="{{ placeholder | translate }}"\n           #messageTypeInput\n           (focusin)="onFocus()"\n           formControlName="messageType"\n           matAutocompleteOrigin\n           #origin="matAutocompleteOrigin"\n           [matAutocompleteConnectedTo]="origin"\n           [matAutocomplete]="messageTypeAutocomplete"\n           [matChipInputFor]="chipList"\n           [matChipInputSeparatorKeyCodes]="separatorKeysCodes"\n           (matChipInputTokenEnd)="add($event)">\n  </mat-chip-grid>\n  <mat-autocomplete #messageTypeAutocomplete="matAutocomplete"\n                    class="tb-autocomplete"\n                    (optionSelected)="selected($event)"\n                    [displayWith]="displayMessageTypeFn">\n    <mat-option *ngFor="let messageType of filteredMessageTypes | async" [value]="messageType">\n      <span [innerHTML]="messageType.name | highlight:searchText"></span>\n    </mat-option>\n    <mat-option *ngIf="(filteredMessageTypes | async)?.length === 0" [value]="null" class="tb-not-found">\n      <div class="tb-not-found-content" (click)="$event.stopPropagation()">\n        <div *ngIf="!textIsNotEmpty(searchText); else searchNotEmpty">\n          <span translate>tb.rulenode.no-message-types-found</span>\n        </div>\n        <ng-template #searchNotEmpty>\n                <span>\n                  {{ \'tb.rulenode.no-message-type-matching\' | translate :\n                  {messageType: truncate.transform(searchText, true, 6, &apos;...&apos;)}\n                  }}\n                </span>\n        </ng-template>\n        <span>\n          <a translate (click)="createMessageType($event, searchText)">tb.rulenode.create-new-message-type</a>\n        </span>\n      </div>\n    </mat-option>\n  </mat-autocomplete>\n  <mat-icon class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon" matSuffix\n            color="primary"\n            matTooltip="{{ \'tb.rulenode.chip-help\' | translate: { inputName: \'tb.rulenode.message-type\' | translate } }}">help</mat-icon>\n  <mat-error *ngIf="chipList.errorState">\n    {{ \'tb.rulenode.select-message-types-required\' | translate }}\n  </mat-error>\n</mat-form-field>\n',styles:[':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n']}]}],ctorParameters:function(){return[{type:P.Store},{type:Z.TranslateService},{type:S.TruncatePipe},{type:R.FormBuilder}]},propDecorators:{required:[{type:i}],label:[{type:i}],placeholder:[{type:i}],disabled:[{type:i}],chipList:[{type:o,args:["chipList",{static:!1}]}],matAutocomplete:[{type:o,args:["messageTypeAutocomplete",{static:!1}]}],messageTypeInput:[{type:o,args:["messageTypeInput",{static:!1}]}]}});class wn extends L{get required(){return this.requiredValue}set required(e){this.requiredValue=Le(e)}constructor(e,t){super(e),this.store=e,this.fb=t,this.subscriptions=[],this.disableCertPemCredentials=!1,this.passwordFieldRequired=!0,this.allCredentialsTypes=zt,this.credentialsTypeTranslationsMap=Ut,this.propagateChange=e=>{}}ngOnInit(){this.credentialsConfigFormGroup=this.fb.group({type:[null,[O.required]],username:[null,[]],password:[null,[]],caCert:[null,[]],caCertFileName:[null,[]],privateKey:[null,[]],privateKeyFileName:[null,[]],cert:[null,[]],certFileName:[null,[]]}),this.subscriptions.push(this.credentialsConfigFormGroup.valueChanges.subscribe((()=>{this.updateView()}))),this.subscriptions.push(this.credentialsConfigFormGroup.get("type").valueChanges.subscribe((()=>{this.credentialsTypeChanged()})))}ngOnChanges(e){for(const t of Object.keys(e)){const n=e[t];if(!n.firstChange&&n.currentValue!==n.previousValue&&n.currentValue&&"disableCertPemCredentials"===t){"cert.PEM"===this.credentialsConfigFormGroup.get("type").value&&setTimeout((()=>{this.credentialsConfigFormGroup.get("type").patchValue("anonymous",{emitEvent:!0})}))}}}ngOnDestroy(){this.subscriptions.forEach((e=>e.unsubscribe()))}writeValue(e){ae(e)&&(this.credentialsConfigFormGroup.reset(e,{emitEvent:!1}),this.updateValidators())}setDisabledState(e){e?this.credentialsConfigFormGroup.disable({emitEvent:!1}):(this.credentialsConfigFormGroup.enable({emitEvent:!1}),this.updateValidators())}updateView(){let e=this.credentialsConfigFormGroup.value;const t=e.type;switch(t){case"anonymous":e={type:t};break;case"basic":e={type:t,username:e.username,password:e.password};break;case"cert.PEM":delete e.username}this.propagateChange(e)}registerOnChange(e){this.propagateChange=e}registerOnTouched(e){}validate(e){return this.credentialsConfigFormGroup.valid?null:{credentialsConfig:{valid:!1}}}credentialsTypeChanged(){this.credentialsConfigFormGroup.patchValue({username:null,password:null,caCert:null,caCertFileName:null,privateKey:null,privateKeyFileName:null,cert:null,certFileName:null}),this.updateValidators()}updateValidators(e=!1){const t=this.credentialsConfigFormGroup.get("type").value;switch(e&&this.credentialsConfigFormGroup.reset({type:t},{emitEvent:!1}),this.credentialsConfigFormGroup.setValidators([]),this.credentialsConfigFormGroup.get("username").setValidators([]),this.credentialsConfigFormGroup.get("password").setValidators([]),t){case"anonymous":break;case"basic":this.credentialsConfigFormGroup.get("username").setValidators([O.required]),this.credentialsConfigFormGroup.get("password").setValidators(this.passwordFieldRequired?[O.required]:[]);break;case"cert.PEM":this.credentialsConfigFormGroup.setValidators([this.requiredFilesSelected(O.required,[["caCert","caCertFileName"],["privateKey","privateKeyFileName","cert","certFileName"]])])}this.credentialsConfigFormGroup.get("username").updateValueAndValidity({emitEvent:e}),this.credentialsConfigFormGroup.get("password").updateValueAndValidity({emitEvent:e}),this.credentialsConfigFormGroup.updateValueAndValidity({emitEvent:e})}requiredFilesSelected(e,t=null){return n=>{t||(t=[Object.keys(n.controls)]);return n?.controls&&t.some((t=>t.every((t=>!e(n.controls[t])))))?null:{notAllRequiredFilesSelected:!0}}}}e("CredentialsConfigComponent",wn),wn.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:wn,deps:[{token:P.Store},{token:R.FormBuilder}],target:t.ɵɵFactoryTarget.Component}),wn.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:wn,selector:"tb-credentials-config",inputs:{required:"required",disableCertPemCredentials:"disableCertPemCredentials",passwordFieldRequired:"passwordFieldRequired"},providers:[{provide:B,useExisting:a((()=>wn)),multi:!0},{provide:K,useExisting:a((()=>wn)),multi:!0}],usesInheritance:!0,usesOnChanges:!0,ngImport:t,template:'<section [formGroup]="credentialsConfigFormGroup" fxLayout="column">\n  <mat-expansion-panel class="tb-credentials-config-panel-group">\n    <mat-expansion-panel-header>\n      <mat-panel-title translate>tb.rulenode.credentials</mat-panel-title>\n      <mat-panel-description>\n        {{ credentialsTypeTranslationsMap.get(credentialsConfigFormGroup.get(\'type\').value) | translate }}\n      </mat-panel-description>\n    </mat-expansion-panel-header>\n    <ng-template matExpansionPanelContent>\n      <mat-form-field class="mat-block">\n        <mat-label translate>tb.rulenode.credentials-type</mat-label>\n        <mat-select formControlName="type" required>\n          <mat-option *ngFor="let credentialsType of allCredentialsTypes" [value]="credentialsType"\n                      [disabled]="credentialsType === \'cert.PEM\' && disableCertPemCredentials">\n            {{ credentialsTypeTranslationsMap.get(credentialsType) | translate }}\n          </mat-option>\n        </mat-select>\n        <mat-error *ngIf="credentialsConfigFormGroup.get(\'type\').hasError(\'required\')">\n          {{ \'tb.rulenode.credentials-type-required\' | translate }}\n        </mat-error>\n      </mat-form-field>\n      <section fxLayout="column" [ngSwitch]="credentialsConfigFormGroup.get(\'type\').value">\n        <ng-template ngSwitchCase="anonymous">\n        </ng-template>\n        <ng-template ngSwitchCase="basic">\n          <mat-form-field class="mat-block">\n            <mat-label translate>tb.rulenode.username</mat-label>\n            <input required matInput formControlName="username">\n            <mat-error *ngIf="credentialsConfigFormGroup.get(\'username\').hasError(\'required\')">\n              {{ \'tb.rulenode.username-required\' | translate }}\n            </mat-error>\n          </mat-form-field>\n          <mat-form-field class="mat-block">\n            <mat-label translate>tb.rulenode.password</mat-label>\n            <input type="password" [required]="passwordFieldRequired" matInput formControlName="password">\n            <tb-toggle-password matSuffix></tb-toggle-password>\n            <mat-error *ngIf="credentialsConfigFormGroup.get(\'password\').hasError(\'required\')">\n              {{ \'tb.rulenode.password-required\' | translate }}\n            </mat-error>\n          </mat-form-field>\n        </ng-template>\n        <ng-template ngSwitchCase="cert.PEM">\n          <div class="tb-hint">{{ \'tb.rulenode.credentials-pem-hint\' | translate }}</div>\n          <tb-file-input formControlName="caCert"\n                         inputId="caCertSelect"\n                         [existingFileName]="credentialsConfigFormGroup.get(\'caCertFileName\').value"\n                         (fileNameChanged)="credentialsConfigFormGroup.get(\'caCertFileName\').setValue($event)"\n                         label="{{\'tb.rulenode.ca-cert\' | translate}}"\n                         noFileText="tb.rulenode.no-file"\n                         dropLabel="{{\'tb.rulenode.drop-file\' | translate}}">\n          </tb-file-input>\n          <tb-file-input formControlName="cert"\n                         inputId="CertSelect"\n                         [existingFileName]="credentialsConfigFormGroup.get(\'certFileName\').value"\n                         (fileNameChanged)="credentialsConfigFormGroup.get(\'certFileName\').setValue($event)"\n                         label="{{\'tb.rulenode.cert\' | translate}}"\n                         noFileText="tb.rulenode.no-file"\n                         dropLabel="{{\'tb.rulenode.drop-file\' | translate}}">\n          </tb-file-input>\n          <tb-file-input style="padding-bottom: 8px;"\n                         formControlName="privateKey"\n                         inputId="privateKeySelect"\n                         [existingFileName]="credentialsConfigFormGroup.get(\'privateKeyFileName\').value"\n                         (fileNameChanged)="credentialsConfigFormGroup.get(\'privateKeyFileName\').setValue($event)"\n                         label="{{\'tb.rulenode.private-key\' | translate}}"\n                         noFileText="tb.rulenode.no-file"\n                         dropLabel="{{\'tb.rulenode.drop-file\' | translate}}">\n          </tb-file-input>\n          <mat-form-field class="mat-block">\n            <mat-label translate>tb.rulenode.private-key-password</mat-label>\n            <input type="password" matInput formControlName="password">\n            <tb-toggle-password matSuffix></tb-toggle-password>\n          </mat-form-field>\n        </ng-template>\n      </section>\n    </ng-template>\n  </mat-expansion-panel>\n</section>\n',dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"directive",type:H.NgSwitch,selector:"[ngSwitch]",inputs:["ngSwitch"]},{kind:"directive",type:H.NgSwitchCase,selector:"[ngSwitchCase]",inputs:["ngSwitchCase"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"directive",type:Y.MatSuffix,selector:"[matSuffix], [matIconSuffix], [matTextSuffix]",inputs:["matTextSuffix"]},{kind:"component",type:X.MatSelect,selector:"mat-select",inputs:["disabled","disableRipple","tabIndex","hideSingleSelectionIndicator"],exportAs:["matSelect"]},{kind:"component",type:ee.MatOption,selector:"mat-option",exportAs:["matOption"]},{kind:"component",type:We.MatExpansionPanel,selector:"mat-expansion-panel",inputs:["disabled","expanded","hideToggle","togglePosition"],outputs:["opened","closed","expandedChange","afterExpand","afterCollapse"],exportAs:["matExpansionPanel"]},{kind:"component",type:We.MatExpansionPanelHeader,selector:"mat-expansion-panel-header",inputs:["tabIndex","expandedHeight","collapsedHeight"]},{kind:"directive",type:We.MatExpansionPanelTitle,selector:"mat-panel-title"},{kind:"directive",type:We.MatExpansionPanelDescription,selector:"mat-panel-description"},{kind:"directive",type:We.MatExpansionPanelContent,selector:"ng-template[matExpansionPanelContent]"},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"component",type:Ze.FileInputComponent,selector:"tb-file-input",inputs:["label","hint","accept","noFileText","inputId","allowedExtensions","dropLabel","maxSizeByte","contentConvertFunction","required","requiredAsError","disabled","existingFileName","readAsBinary","workFromFileObj","multipleFile"],outputs:["fileNameChanged"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"component",type:Xe.TogglePasswordComponent,selector:"tb-toggle-password"},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:wn,decorators:[{type:n,args:[{selector:"tb-credentials-config",providers:[{provide:B,useExisting:a((()=>wn)),multi:!0},{provide:K,useExisting:a((()=>wn)),multi:!0}],template:'<section [formGroup]="credentialsConfigFormGroup" fxLayout="column">\n  <mat-expansion-panel class="tb-credentials-config-panel-group">\n    <mat-expansion-panel-header>\n      <mat-panel-title translate>tb.rulenode.credentials</mat-panel-title>\n      <mat-panel-description>\n        {{ credentialsTypeTranslationsMap.get(credentialsConfigFormGroup.get(\'type\').value) | translate }}\n      </mat-panel-description>\n    </mat-expansion-panel-header>\n    <ng-template matExpansionPanelContent>\n      <mat-form-field class="mat-block">\n        <mat-label translate>tb.rulenode.credentials-type</mat-label>\n        <mat-select formControlName="type" required>\n          <mat-option *ngFor="let credentialsType of allCredentialsTypes" [value]="credentialsType"\n                      [disabled]="credentialsType === \'cert.PEM\' && disableCertPemCredentials">\n            {{ credentialsTypeTranslationsMap.get(credentialsType) | translate }}\n          </mat-option>\n        </mat-select>\n        <mat-error *ngIf="credentialsConfigFormGroup.get(\'type\').hasError(\'required\')">\n          {{ \'tb.rulenode.credentials-type-required\' | translate }}\n        </mat-error>\n      </mat-form-field>\n      <section fxLayout="column" [ngSwitch]="credentialsConfigFormGroup.get(\'type\').value">\n        <ng-template ngSwitchCase="anonymous">\n        </ng-template>\n        <ng-template ngSwitchCase="basic">\n          <mat-form-field class="mat-block">\n            <mat-label translate>tb.rulenode.username</mat-label>\n            <input required matInput formControlName="username">\n            <mat-error *ngIf="credentialsConfigFormGroup.get(\'username\').hasError(\'required\')">\n              {{ \'tb.rulenode.username-required\' | translate }}\n            </mat-error>\n          </mat-form-field>\n          <mat-form-field class="mat-block">\n            <mat-label translate>tb.rulenode.password</mat-label>\n            <input type="password" [required]="passwordFieldRequired" matInput formControlName="password">\n            <tb-toggle-password matSuffix></tb-toggle-password>\n            <mat-error *ngIf="credentialsConfigFormGroup.get(\'password\').hasError(\'required\')">\n              {{ \'tb.rulenode.password-required\' | translate }}\n            </mat-error>\n          </mat-form-field>\n        </ng-template>\n        <ng-template ngSwitchCase="cert.PEM">\n          <div class="tb-hint">{{ \'tb.rulenode.credentials-pem-hint\' | translate }}</div>\n          <tb-file-input formControlName="caCert"\n                         inputId="caCertSelect"\n                         [existingFileName]="credentialsConfigFormGroup.get(\'caCertFileName\').value"\n                         (fileNameChanged)="credentialsConfigFormGroup.get(\'caCertFileName\').setValue($event)"\n                         label="{{\'tb.rulenode.ca-cert\' | translate}}"\n                         noFileText="tb.rulenode.no-file"\n                         dropLabel="{{\'tb.rulenode.drop-file\' | translate}}">\n          </tb-file-input>\n          <tb-file-input formControlName="cert"\n                         inputId="CertSelect"\n                         [existingFileName]="credentialsConfigFormGroup.get(\'certFileName\').value"\n                         (fileNameChanged)="credentialsConfigFormGroup.get(\'certFileName\').setValue($event)"\n                         label="{{\'tb.rulenode.cert\' | translate}}"\n                         noFileText="tb.rulenode.no-file"\n                         dropLabel="{{\'tb.rulenode.drop-file\' | translate}}">\n          </tb-file-input>\n          <tb-file-input style="padding-bottom: 8px;"\n                         formControlName="privateKey"\n                         inputId="privateKeySelect"\n                         [existingFileName]="credentialsConfigFormGroup.get(\'privateKeyFileName\').value"\n                         (fileNameChanged)="credentialsConfigFormGroup.get(\'privateKeyFileName\').setValue($event)"\n                         label="{{\'tb.rulenode.private-key\' | translate}}"\n                         noFileText="tb.rulenode.no-file"\n                         dropLabel="{{\'tb.rulenode.drop-file\' | translate}}">\n          </tb-file-input>\n          <mat-form-field class="mat-block">\n            <mat-label translate>tb.rulenode.private-key-password</mat-label>\n            <input type="password" matInput formControlName="password">\n            <tb-toggle-password matSuffix></tb-toggle-password>\n          </mat-form-field>\n        </ng-template>\n      </section>\n    </ng-template>\n  </mat-expansion-panel>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.FormBuilder}]},propDecorators:{required:[{type:i}],disableCertPemCredentials:[{type:i}],passwordFieldRequired:[{type:i}]}});const Vn=new l("WindowToken","undefined"!=typeof window&&window.document?{providedIn:"root",factory:()=>window}:{providedIn:"root",factory:()=>{}});class Pn{constructor(e,t,n){this.ngZone=e,this.document=t,this.window=n,this.copySubject=new Ke,this.copyResponse$=this.copySubject.asObservable(),this.config={}}configure(e){this.config=e}copy(e){if(!this.isSupported||!e)return this.pushCopyResponse({isSuccess:!1,content:e});const t=this.copyFromContent(e);return t?this.pushCopyResponse({content:e,isSuccess:t}):this.pushCopyResponse({isSuccess:!1,content:e})}get isSupported(){return!!this.document.queryCommandSupported&&!!this.document.queryCommandSupported("copy")&&!!this.window}isTargetValid(e){if(e instanceof HTMLInputElement||e instanceof HTMLTextAreaElement){if(e.hasAttribute("disabled"))throw new Error('Invalid "target" attribute. Please use "readonly" instead of "disabled" attribute');return!0}throw new Error("Target should be input or textarea")}copyFromInputElement(e,t=!0){try{this.selectTarget(e);const n=this.copyText();return this.clearSelection(t?e:void 0,this.window),n&&this.isCopySuccessInIE11()}catch(e){return!1}}isCopySuccessInIE11(){const e=this.window.clipboardData;return!(e&&e.getData&&!e.getData("Text"))}copyFromContent(e,t=this.document.body){if(this.tempTextArea&&!t.contains(this.tempTextArea)&&this.destroy(this.tempTextArea.parentElement||void 0),!this.tempTextArea){this.tempTextArea=this.createTempTextArea(this.document,this.window);try{t.appendChild(this.tempTextArea)}catch(e){throw new Error("Container should be a Dom element")}}this.tempTextArea.value=e;const n=this.copyFromInputElement(this.tempTextArea,!1);return this.config.cleanUpAfterCopy&&this.destroy(this.tempTextArea.parentElement||void 0),n}destroy(e=this.document.body){this.tempTextArea&&(e.removeChild(this.tempTextArea),this.tempTextArea=void 0)}selectTarget(e){return e.select(),e.setSelectionRange(0,e.value.length),e.value.length}copyText(){return this.document.execCommand("copy")}clearSelection(e,t){e&&e.focus(),t.getSelection()?.removeAllRanges()}createTempTextArea(e,t){const n="rtl"===e.documentElement.getAttribute("dir");let r;r=e.createElement("textarea"),r.style.fontSize="12pt",r.style.border="0",r.style.padding="0",r.style.margin="0",r.style.position="absolute",r.style[n?"right":"left"]="-9999px";const o=t.pageYOffset||e.documentElement.scrollTop;return r.style.top=o+"px",r.setAttribute("readonly",""),r}pushCopyResponse(e){this.copySubject.observers.length>0&&this.ngZone.run((()=>{this.copySubject.next(e)}))}pushCopyReponse(e){this.pushCopyResponse(e)}}Pn.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"13.0.1",ngImport:t,type:Pn,deps:[{token:t.NgZone},{token:j},{token:Vn,optional:!0}],target:t.ɵɵFactoryTarget.Injectable}),Pn.ɵprov=t.ɵɵngDeclareInjectable({minVersion:"12.0.0",version:"13.0.1",ngImport:t,type:Pn,providedIn:"root"}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"13.0.1",ngImport:t,type:Pn,decorators:[{type:s,args:[{providedIn:"root"}]}],ctorParameters:function(){return[{type:t.NgZone},{type:void 0,decorators:[{type:m,args:[j]}]},{type:void 0,decorators:[{type:p},{type:m,args:[Vn]}]}]}});class Rn{constructor(e,t,n,o){this.ngZone=e,this.host=t,this.renderer=n,this.clipboardSrv=o,this.cbOnSuccess=new r,this.cbOnError=new r,this.onClick=e=>{this.clipboardSrv.isSupported?this.targetElm&&this.clipboardSrv.isTargetValid(this.targetElm)?this.handleResult(this.clipboardSrv.copyFromInputElement(this.targetElm),this.targetElm.value,e):this.cbContent&&this.handleResult(this.clipboardSrv.copyFromContent(this.cbContent,this.container),this.cbContent,e):this.handleResult(!1,void 0,e)}}ngOnInit(){this.ngZone.runOutsideAngular((()=>{this.clickListener=this.renderer.listen(this.host.nativeElement,"click",this.onClick)}))}ngOnDestroy(){this.clickListener&&this.clickListener(),this.clipboardSrv.destroy(this.container)}handleResult(e,t,n){let r={isSuccess:e,content:t,successMessage:this.cbSuccessMsg,event:n};e?this.cbOnSuccess.observed&&this.ngZone.run((()=>{this.cbOnSuccess.emit(r)})):this.cbOnError.observed&&this.ngZone.run((()=>{this.cbOnError.emit(r)})),this.clipboardSrv.pushCopyResponse(r)}}Rn.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"13.0.1",ngImport:t,type:Rn,deps:[{token:t.NgZone},{token:t.ElementRef},{token:t.Renderer2},{token:Pn}],target:t.ɵɵFactoryTarget.Directive}),Rn.ɵdir=t.ɵɵngDeclareDirective({minVersion:"12.0.0",version:"13.0.1",type:Rn,selector:"[ngxClipboard]",inputs:{targetElm:["ngxClipboard","targetElm"],container:"container",cbContent:"cbContent",cbSuccessMsg:"cbSuccessMsg"},outputs:{cbOnSuccess:"cbOnSuccess",cbOnError:"cbOnError"},ngImport:t}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"13.0.1",ngImport:t,type:Rn,decorators:[{type:d,args:[{selector:"[ngxClipboard]"}]}],ctorParameters:function(){return[{type:t.NgZone},{type:t.ElementRef},{type:t.Renderer2},{type:Pn}]},propDecorators:{targetElm:[{type:i,args:["ngxClipboard"]}],container:[{type:i}],cbContent:[{type:i}],cbSuccessMsg:[{type:i}],cbOnSuccess:[{type:u}],cbOnError:[{type:u}]}});class On{constructor(e,t,n){this._clipboardService=e,this._viewContainerRef=t,this._templateRef=n}ngOnInit(){this._clipboardService.isSupported&&this._viewContainerRef.createEmbeddedView(this._templateRef)}}On.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"13.0.1",ngImport:t,type:On,deps:[{token:Pn},{token:t.ViewContainerRef},{token:t.TemplateRef}],target:t.ɵɵFactoryTarget.Directive}),On.ɵdir=t.ɵɵngDeclareDirective({minVersion:"12.0.0",version:"13.0.1",type:On,selector:"[ngxClipboardIfSupported]",ngImport:t}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"13.0.1",ngImport:t,type:On,decorators:[{type:d,args:[{selector:"[ngxClipboardIfSupported]"}]}],ctorParameters:function(){return[{type:Pn},{type:t.ViewContainerRef},{type:t.TemplateRef}]}});class _n{}_n.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"13.0.1",ngImport:t,type:_n,deps:[],target:t.ɵɵFactoryTarget.NgModule}),_n.ɵmod=t.ɵɵngDeclareNgModule({minVersion:"12.0.0",version:"13.0.1",ngImport:t,type:_n,declarations:[Rn,On],imports:[$],exports:[Rn,On]}),_n.ɵinj=t.ɵɵngDeclareInjector({minVersion:"12.0.0",version:"13.0.1",ngImport:t,type:_n,imports:[[$]]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"13.0.1",ngImport:t,type:_n,decorators:[{type:c,args:[{imports:[$],declarations:[Rn,On],exports:[Rn,On]}]}]});class Bn{set required(e){this.requiredValue!==e&&(this.requiredValue=e,this.updateValidators())}get required(){return this.requiredValue}constructor(e){this.fb=e,this.subscriptSizing="fixed",this.messageTypes=[{name:"Post attributes",value:"POST_ATTRIBUTES_REQUEST"},{name:"Post telemetry",value:"POST_TELEMETRY_REQUEST"},{name:"Custom",value:""}],this.propagateChange=()=>{},this.destroy$=new Ke,this.messageTypeFormGroup=this.fb.group({messageTypeAlias:[null,[O.required]],messageType:[{value:null,disabled:!0},[O.maxLength(255)]]}),this.messageTypeFormGroup.get("messageTypeAlias").valueChanges.pipe(ze(this.destroy$)).subscribe((e=>this.updateMessageTypeValue(e))),this.messageTypeFormGroup.valueChanges.pipe(ze(this.destroy$)).subscribe((()=>this.updateView()))}ngOnDestroy(){this.destroy$.next(),this.destroy$.complete()}registerOnTouched(e){}registerOnChange(e){this.propagateChange=e}writeValue(e){this.modelValue=e;let t=this.messageTypes.find((t=>t.value===e));t||(t=this.messageTypes.find((e=>""===e.value))),this.messageTypeFormGroup.get("messageTypeAlias").patchValue(t,{emitEvent:!1}),this.messageTypeFormGroup.get("messageType").patchValue(e,{emitEvent:!1})}validate(){return this.messageTypeFormGroup.valid?null:{messageTypeInvalid:!0}}setDisabledState(e){this.disabled=e,e?this.messageTypeFormGroup.disable({emitEvent:!1}):(this.messageTypeFormGroup.enable({emitEvent:!1}),"Custom"!==this.messageTypeFormGroup.get("messageTypeAlias").value?.name&&this.messageTypeFormGroup.get("messageType").disable({emitEvent:!1}))}updateView(){const e=this.messageTypeFormGroup.getRawValue().messageType;this.modelValue!==e&&(this.modelValue=e,this.propagateChange(this.modelValue))}updateValidators(){this.messageTypeFormGroup.get("messageType").setValidators(this.required?[O.required,O.maxLength(255)]:[O.maxLength(255)]),this.messageTypeFormGroup.get("messageType").updateValueAndValidity({emitEvent:!1})}updateMessageTypeValue(e){"Custom"!==e?.name?this.messageTypeFormGroup.get("messageType").disable({emitEvent:!1}):this.messageTypeFormGroup.get("messageType").enable({emitEvent:!1}),this.messageTypeFormGroup.get("messageType").patchValue(e.value??null)}}e("OutputMessageTypeAutocompleteComponent",Bn),Bn.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Bn,deps:[{token:R.FormBuilder}],target:t.ɵɵFactoryTarget.Component}),Bn.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:Bn,selector:"tb-output-message-type-autocomplete",inputs:{subscriptSizing:"subscriptSizing",disabled:"disabled",required:"required"},providers:[{provide:B,useExisting:a((()=>Bn)),multi:!0},{provide:K,useExisting:a((()=>Bn)),multi:!0}],ngImport:t,template:'<section class="tb-form-row no-border no-padding tb-standard-fields column-xs" [formGroup]="messageTypeFormGroup">\n  <mat-form-field class="flex" subscriptSizing="{{ subscriptSizing }}" hideRequiredMarker>\n    <mat-label>{{\'tb.rulenode.output-message-type\' | translate}}</mat-label>\n    <mat-select formControlName="messageTypeAlias">\n      <mat-option *ngFor="let msgType of messageTypes" [value]="msgType">\n        {{msgType.name}}\n      </mat-option>\n    </mat-select>\n  </mat-form-field>\n  <mat-form-field class="flex" subscriptSizing="{{ subscriptSizing }}" [hideRequiredMarker]="messageTypeFormGroup.get(\'messageType\').disabled">\n    <mat-label>{{\'tb.rulenode.message-type-value\' | translate}}</mat-label>\n    <input matInput type="text" formControlName="messageType">\n    <button type="button"\n            matSuffix\n            mat-icon-button\n            aria-label="Copy"\n            *ngIf="messageTypeFormGroup.get(\'messageType\').value"\n            ngxClipboard\n            [cbContent]="messageTypeFormGroup.get(\'messageType\').value"\n            matTooltip="{{ \'tb.rulenode.copy-message-type\' | translate }}">\n      <mat-icon aria-hidden="false"\n                aria-label="help-icon">content_copy\n      </mat-icon>\n    </button>\n    <mat-error *ngIf="messageTypeFormGroup.get(\'messageType\').hasError(\'required\')">\n      {{ \'tb.rulenode.message-type-value-required\' | translate }}\n    </mat-error>\n    <mat-error *ngIf="messageTypeFormGroup.get(\'messageType\').hasError(\'maxlength\')">\n      {{ \'tb.rulenode.message-type-value-max-length\' | translate }}\n    </mat-error>\n  </mat-form-field>\n</section>\n\n',dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:de.MatIconButton,selector:"button[mat-icon-button]",inputs:["disabled","disableRipple","color"],exportAs:["matButton"]},{kind:"component",type:ue.MatIcon,selector:"mat-icon",inputs:["color","inline","svgIcon","fontSet","fontIcon"],exportAs:["matIcon"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"directive",type:Y.MatSuffix,selector:"[matSuffix], [matIconSuffix], [matTextSuffix]",inputs:["matTextSuffix"]},{kind:"component",type:X.MatSelect,selector:"mat-select",inputs:["disabled","disableRipple","tabIndex","hideSingleSelectionIndicator"],exportAs:["matSelect"]},{kind:"component",type:ee.MatOption,selector:"mat-option",exportAs:["matOption"]},{kind:"directive",type:ce.MatTooltip,selector:"[matTooltip]",exportAs:["matTooltip"]},{kind:"directive",type:Rn,selector:"[ngxClipboard]",inputs:["ngxClipboard","container","cbContent","cbSuccessMsg"],outputs:["cbOnSuccess","cbOnError"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),Be([N()],Bn.prototype,"disabled",void 0),Be([N()],Bn.prototype,"required",null),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Bn,decorators:[{type:n,args:[{selector:"tb-output-message-type-autocomplete",providers:[{provide:B,useExisting:a((()=>Bn)),multi:!0},{provide:K,useExisting:a((()=>Bn)),multi:!0}],template:'<section class="tb-form-row no-border no-padding tb-standard-fields column-xs" [formGroup]="messageTypeFormGroup">\n  <mat-form-field class="flex" subscriptSizing="{{ subscriptSizing }}" hideRequiredMarker>\n    <mat-label>{{\'tb.rulenode.output-message-type\' | translate}}</mat-label>\n    <mat-select formControlName="messageTypeAlias">\n      <mat-option *ngFor="let msgType of messageTypes" [value]="msgType">\n        {{msgType.name}}\n      </mat-option>\n    </mat-select>\n  </mat-form-field>\n  <mat-form-field class="flex" subscriptSizing="{{ subscriptSizing }}" [hideRequiredMarker]="messageTypeFormGroup.get(\'messageType\').disabled">\n    <mat-label>{{\'tb.rulenode.message-type-value\' | translate}}</mat-label>\n    <input matInput type="text" formControlName="messageType">\n    <button type="button"\n            matSuffix\n            mat-icon-button\n            aria-label="Copy"\n            *ngIf="messageTypeFormGroup.get(\'messageType\').value"\n            ngxClipboard\n            [cbContent]="messageTypeFormGroup.get(\'messageType\').value"\n            matTooltip="{{ \'tb.rulenode.copy-message-type\' | translate }}">\n      <mat-icon aria-hidden="false"\n                aria-label="help-icon">content_copy\n      </mat-icon>\n    </button>\n    <mat-error *ngIf="messageTypeFormGroup.get(\'messageType\').hasError(\'required\')">\n      {{ \'tb.rulenode.message-type-value-required\' | translate }}\n    </mat-error>\n    <mat-error *ngIf="messageTypeFormGroup.get(\'messageType\').hasError(\'maxlength\')">\n      {{ \'tb.rulenode.message-type-value-max-length\' | translate }}\n    </mat-error>\n  </mat-form-field>\n</section>\n\n'}]}],ctorParameters:function(){return[{type:R.FormBuilder}]},propDecorators:{subscriptSizing:[{type:i}],disabled:[{type:i}],required:[{type:i}]}});class Kn{constructor(e,t){this.fb=e,this.translate=t,this.translation=nn,this.propagateChange=()=>{},this.destroy$=new Ke,this.selectOptions=[]}ngOnInit(){this.initOptions(),this.chipControlGroup=this.fb.group({chipControl:[null,[]]}),this.chipControlGroup.get("chipControl").valueChanges.pipe(Ve(this.destroy$)).subscribe((e=>{e&&this.propagateChange(e)}))}ngOnDestroy(){this.destroy$.next(),this.destroy$.complete()}initOptions(){for(const e of this.translation.keys())this.selectOptions.push({value:e,name:this.translate.instant(this.translation.get(e))})}writeValue(e){this.chipControlGroup.get("chipControl").patchValue(e,{emitEvent:!1})}registerOnChange(e){this.propagateChange=e}registerOnTouched(e){}setDisabledState(e){e?this.chipControlGroup.disable({emitEvent:!1}):this.chipControlGroup.enable({emitEvent:!1})}}e("MsgMetadataChipComponent",Kn),Kn.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Kn,deps:[{token:R.FormBuilder},{token:Z.TranslateService}],target:t.ɵɵFactoryTarget.Component}),Kn.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:Kn,selector:"tb-msg-metadata-chip",inputs:{labelText:"labelText",translation:"translation"},providers:[{provide:B,useExisting:a((()=>Kn)),multi:!0}],ngImport:t,template:'<div [formGroup]="chipControlGroup" class="tb-form-row space-between">\n  <div class="fixed-title-width">{{ labelText }}</div>\n  <mat-chip-listbox formControlName="chipControl">\n    <mat-chip-option *ngFor="let option of selectOptions"\n                     selectable="{{ chipControlGroup.get(\'chipControl\').value !== option.value }}"\n                     color="primary"\n                     [value]="option.value">{{ option.name }}</mat-chip-option>\n  </mat-chip-listbox>\n</div>\n',dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"component",type:be.MatChipListbox,selector:"mat-chip-listbox",inputs:["tabIndex","multiple","aria-orientation","selectable","compareWith","required","hideSingleSelectionIndicator","value"],outputs:["change"]},{kind:"component",type:be.MatChipOption,selector:"mat-basic-chip-option, [mat-basic-chip-option], mat-chip-option, [mat-chip-option]",inputs:["color","disabled","disableRipple","tabIndex","selectable","selected"],outputs:["selectionChange"]},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Kn,decorators:[{type:n,args:[{selector:"tb-msg-metadata-chip",providers:[{provide:B,useExisting:a((()=>Kn)),multi:!0}],template:'<div [formGroup]="chipControlGroup" class="tb-form-row space-between">\n  <div class="fixed-title-width">{{ labelText }}</div>\n  <mat-chip-listbox formControlName="chipControl">\n    <mat-chip-option *ngFor="let option of selectOptions"\n                     selectable="{{ chipControlGroup.get(\'chipControl\').value !== option.value }}"\n                     color="primary"\n                     [value]="option.value">{{ option.name }}</mat-chip-option>\n  </mat-chip-listbox>\n</div>\n'}]}],ctorParameters:function(){return[{type:R.FormBuilder},{type:Z.TranslateService}]},propDecorators:{labelText:[{type:i}],translation:[{type:i}]}});class zn extends L{constructor(e,t,n,r){super(e),this.store=e,this.translate=t,this.injector=n,this.fb=r,this.destroy$=new Ke,this.sourceFieldSubcritption=[],this.propagateChange=null,this.disabled=!1,this.required=!1,this.oneMapRequiredValidator=e=>e.get("keyVals").value.length,this.propagateNestedErrors=e=>{if(this.svListFormGroup&&this.svListFormGroup.get("keyVals")&&"VALID"===this.svListFormGroup.get("keyVals")?.status)return null;const t={};if(this.svListFormGroup&&this.svListFormGroup.setErrors(null),e instanceof z||e instanceof U){if(e.errors)for(const n of Object.keys(e.errors))t[n]=!0;for(const n of Object.keys(e.controls)){const r=this.propagateNestedErrors(e.controls[n]);if(r&&Object.keys(r).length)for(const e of Object.keys(r))t[e]=!0}return t}if(e.errors)for(const n of Object.keys(e.errors))t[n]=!0;return ie(t,{})?null:t}}ngOnInit(){this.ngControl=this.injector.get(_),null!=this.ngControl&&(this.ngControl.valueAccessor=this),this.svListFormGroup=this.fb.group({keyVals:this.fb.array([])},{validators:[this.propagateNestedErrors,this.oneMapRequiredValidator]}),this.svListFormGroup.valueChanges.pipe(Ve(this.destroy$)).subscribe((()=>{this.updateModel()}))}ngOnDestroy(){this.destroy$.next(),this.destroy$.complete()}keyValsFormArray(){return this.svListFormGroup.get("keyVals")}registerOnChange(e){this.propagateChange=e}registerOnTouched(e){}setDisabledState(e){this.disabled=e,this.disabled?this.svListFormGroup.disable({emitEvent:!1}):this.svListFormGroup.enable({emitEvent:!1})}writeValue(e){const t=Object.keys(e).map((t=>({key:t,value:e[t]})));if(this.keyValsFormArray().length===t.length)this.keyValsFormArray().patchValue(t,{emitEvent:!1});else{const e=[];t.forEach((t=>{e.push(this.fb.group({key:[t.key,[O.required]],value:[t.value,[O.required,O.pattern(/(?:.|\s)*\S(&:.|\s)*/)]]}))})),this.svListFormGroup.setControl("keyVals",this.fb.array(e,this.propagateNestedErrors),{emitEvent:!1});for(const e of this.keyValsFormArray().controls)this.keyChangeSubscribe(e)}}filterSelectOptions(e){const t=[];for(const e of this.svListFormGroup.get("keyVals").value){const n=this.selectOptions.find((t=>t.value===e.key));n&&t.push(n)}const n=[];for(const r of this.selectOptions)ae(t.find((e=>e.value===r.value)))&&r.value!==e?.get("key").value||n.push(r);return n}removeKeyVal(e){this.keyValsFormArray().removeAt(e),this.sourceFieldSubcritption[e].unsubscribe(),this.sourceFieldSubcritption.splice(e,1)}addKeyVal(){this.keyValsFormArray().push(this.fb.group({key:["",[O.required]],value:["",[O.required,O.pattern(/(?:.|\s)*\S(&:.|\s)*/)]]})),this.keyChangeSubscribe(this.keyValsFormArray().at(this.keyValsFormArray().length-1))}keyChangeSubscribe(e){this.sourceFieldSubcritption.push(e.get("key").valueChanges.pipe(Ve(this.destroy$)).subscribe((t=>{const n=Lt.get(t);e.get("value").patchValue(this.targetKeyPrefix+n[0].toUpperCase()+n.slice(1))})))}validate(e){return!this.svListFormGroup.get("keyVals").value.length&&this.required?{svMapRequired:!0}:this.svListFormGroup.valid?null:{svFieldsRequired:!0}}updateModel(){const e=this.svListFormGroup.get("keyVals").value;if(this.required&&!e.length||!this.svListFormGroup.valid)this.propagateChange(null);else{const t={};e.forEach((e=>{t[e.key]=e.value})),this.propagateChange(t)}}}e("SvMapConfigComponent",zn),zn.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:zn,deps:[{token:P.Store},{token:Z.TranslateService},{token:t.Injector},{token:R.FormBuilder}],target:t.ɵɵFactoryTarget.Component}),zn.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:zn,selector:"tb-sv-map-config",inputs:{selectOptions:"selectOptions",disabled:"disabled",labelText:"labelText",requiredText:"requiredText",targetKeyPrefix:"targetKeyPrefix",selectText:"selectText",selectRequiredText:"selectRequiredText",valText:"valText",valRequiredText:"valRequiredText",hintText:"hintText",popupHelpLink:"popupHelpLink",required:"required"},providers:[{provide:B,useExisting:a((()=>zn)),multi:!0},{provide:K,useExisting:a((()=>zn)),multi:!0}],usesInheritance:!0,ngImport:t,template:'<section [formGroup]="svListFormGroup" class="tb-form-panel stroked">\n  <div class="tb-form-row no-padding no-border space-between">\n    <div class="tb-form-panel-title">{{ labelText }}</div>\n    <div class="tb-form-panel-hint tb-error" translate *ngIf="svListFormGroup.hasError(\'required\')">\n      tb.rulenode.map-fields-required\n    </div>\n    <div class="tb-form-panel-hint tb-error" translate *ngIf="svListFormGroup.hasError(\'svMapRequired\')">\n      {{ requiredText }}\n    </div>\n  </div>\n  <div class="tb-form-panel no-border no-padding">\n    <div class="tb-form-table">\n      <div class="tb-form-table-header">\n        <div class="tb-form-table-header-cell field-space">{{ selectText }}</div>\n        <div class="tb-form-table-header-cell field-space">{{ valText }}</div>\n        <div class="tb-form-table-header-cell actions-header"></div>\n      </div>\n      <div class="tb-form-table-body">\n        <div class="tb-form-table-row"\n             *ngFor="let keyValControl of keyValsFormArray().controls; let $index = index;">\n          <mat-form-field class="tb-inline-field field-space" appearance="outline" subscriptSizing="dynamic">\n            <mat-select [placeholder]="selectText" [formControl]="keyValControl.get(\'key\')" required>\n              <mat-option *ngFor="let option of filterSelectOptions(keyValControl)" [value]="option.value">\n                {{option.name}}\n              </mat-option>\n            </mat-select>\n          </mat-form-field>\n          <mat-form-field class="tb-inline-field field-space" appearance="outline" subscriptSizing="dynamic">\n            <input [placeholder]="valText" [formControl]="keyValControl.get(\'value\')" matInput/>\n          </mat-form-field>\n          <div class="tb-form-table-row-cell-buttons">\n            <button [ngClass]="{\'tb-hidden\': keyValsFormArray().controls.length === 1}"\n                    type="button"\n                    mat-icon-button\n                    (click)="removeKeyVal($index)"\n                    [disabled]="isLoading$ | async"\n                    matTooltip="{{ \'tb.key-val.remove-mapping-entry\' | translate }}"\n                    matTooltipPosition="above">\n              <mat-icon>delete</mat-icon>\n            </button>\n          </div>\n        </div>\n      </div>\n    </div>\n  </div>\n  <div>\n    <button [disabled]="(isLoading$ | async) || keyValsFormArray().length >= selectOptions.length"\n            type="button" mat-stroked-button color="primary" (click)="addKeyVal()">\n      {{ \'tb.key-val.add-mapping-entry\' | translate }}\n    </button>\n  </div>\n  <tb-example-hint [hintText]="hintText" [popupHelpLink]="popupHelpLink"></tb-example-hint>\n</section>\n',styles:[":host .field-space{flex:1 1 50%}:host .actions-header{width:40px}\n",':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n'],dependencies:[{kind:"directive",type:H.NgClass,selector:"[ngClass]",inputs:["class","ngClass"]},{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:de.MatButton,selector:"    button[mat-button], button[mat-raised-button], button[mat-flat-button],    button[mat-stroked-button]  ",inputs:["disabled","disableRipple","color"],exportAs:["matButton"]},{kind:"component",type:de.MatIconButton,selector:"button[mat-icon-button]",inputs:["disabled","disableRipple","color"],exportAs:["matButton"]},{kind:"component",type:ue.MatIcon,selector:"mat-icon",inputs:["color","inline","svgIcon","fontSet","fontIcon"],exportAs:["matIcon"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"component",type:X.MatSelect,selector:"mat-select",inputs:["disabled","disableRipple","tabIndex","hideSingleSelectionIndicator"],exportAs:["matSelect"]},{kind:"component",type:ee.MatOption,selector:"mat-option",exportAs:["matOption"]},{kind:"directive",type:ce.MatTooltip,selector:"[matTooltip]",exportAs:["matTooltip"]},{kind:"directive",type:Se.DefaultClassDirective,selector:"  [ngClass], [ngClass.xs], [ngClass.sm], [ngClass.md], [ngClass.lg], [ngClass.xl],  [ngClass.lt-sm], [ngClass.lt-md], [ngClass.lt-lg], [ngClass.lt-xl],  [ngClass.gt-xs], [ngClass.gt-sm], [ngClass.gt-md], [ngClass.gt-lg]",inputs:["ngClass","ngClass.xs","ngClass.sm","ngClass.md","ngClass.lg","ngClass.xl","ngClass.lt-sm","ngClass.lt-md","ngClass.lt-lg","ngClass.lt-xl","ngClass.gt-xs","ngClass.gt-sm","ngClass.gt-md","ngClass.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.FormControlDirective,selector:"[formControl]",inputs:["formControl","disabled","ngModel"],outputs:["ngModelChange"],exportAs:["ngForm"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"component",type:An,selector:"tb-example-hint",inputs:["hintText","popupHelpLink","textAlign"]},{kind:"pipe",type:H.AsyncPipe,name:"async"},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),Be([N()],zn.prototype,"disabled",void 0),Be([N()],zn.prototype,"required",void 0),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:zn,decorators:[{type:n,args:[{selector:"tb-sv-map-config",providers:[{provide:B,useExisting:a((()=>zn)),multi:!0},{provide:K,useExisting:a((()=>zn)),multi:!0}],template:'<section [formGroup]="svListFormGroup" class="tb-form-panel stroked">\n  <div class="tb-form-row no-padding no-border space-between">\n    <div class="tb-form-panel-title">{{ labelText }}</div>\n    <div class="tb-form-panel-hint tb-error" translate *ngIf="svListFormGroup.hasError(\'required\')">\n      tb.rulenode.map-fields-required\n    </div>\n    <div class="tb-form-panel-hint tb-error" translate *ngIf="svListFormGroup.hasError(\'svMapRequired\')">\n      {{ requiredText }}\n    </div>\n  </div>\n  <div class="tb-form-panel no-border no-padding">\n    <div class="tb-form-table">\n      <div class="tb-form-table-header">\n        <div class="tb-form-table-header-cell field-space">{{ selectText }}</div>\n        <div class="tb-form-table-header-cell field-space">{{ valText }}</div>\n        <div class="tb-form-table-header-cell actions-header"></div>\n      </div>\n      <div class="tb-form-table-body">\n        <div class="tb-form-table-row"\n             *ngFor="let keyValControl of keyValsFormArray().controls; let $index = index;">\n          <mat-form-field class="tb-inline-field field-space" appearance="outline" subscriptSizing="dynamic">\n            <mat-select [placeholder]="selectText" [formControl]="keyValControl.get(\'key\')" required>\n              <mat-option *ngFor="let option of filterSelectOptions(keyValControl)" [value]="option.value">\n                {{option.name}}\n              </mat-option>\n            </mat-select>\n          </mat-form-field>\n          <mat-form-field class="tb-inline-field field-space" appearance="outline" subscriptSizing="dynamic">\n            <input [placeholder]="valText" [formControl]="keyValControl.get(\'value\')" matInput/>\n          </mat-form-field>\n          <div class="tb-form-table-row-cell-buttons">\n            <button [ngClass]="{\'tb-hidden\': keyValsFormArray().controls.length === 1}"\n                    type="button"\n                    mat-icon-button\n                    (click)="removeKeyVal($index)"\n                    [disabled]="isLoading$ | async"\n                    matTooltip="{{ \'tb.key-val.remove-mapping-entry\' | translate }}"\n                    matTooltipPosition="above">\n              <mat-icon>delete</mat-icon>\n            </button>\n          </div>\n        </div>\n      </div>\n    </div>\n  </div>\n  <div>\n    <button [disabled]="(isLoading$ | async) || keyValsFormArray().length >= selectOptions.length"\n            type="button" mat-stroked-button color="primary" (click)="addKeyVal()">\n      {{ \'tb.key-val.add-mapping-entry\' | translate }}\n    </button>\n  </div>\n  <tb-example-hint [hintText]="hintText" [popupHelpLink]="popupHelpLink"></tb-example-hint>\n</section>\n',styles:[":host .field-space{flex:1 1 50%}:host .actions-header{width:40px}\n",':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n']}]}],ctorParameters:function(){return[{type:P.Store},{type:Z.TranslateService},{type:t.Injector},{type:R.FormBuilder}]},propDecorators:{selectOptions:[{type:i}],disabled:[{type:i}],labelText:[{type:i}],requiredText:[{type:i}],targetKeyPrefix:[{type:i}],selectText:[{type:i}],selectRequiredText:[{type:i}],valText:[{type:i}],valRequiredText:[{type:i}],hintText:[{type:i}],popupHelpLink:[{type:i}],required:[{type:i}]}});class Un extends L{get required(){return this.requiredValue}set required(e){this.requiredValue=Le(e)}constructor(e,t){super(e),this.store=e,this.fb=t,this.directionTypes=Object.keys(v),this.directionTypeTranslations=C,this.propagateChange=null}ngOnInit(){this.relationsQueryFormGroup=this.fb.group({fetchLastLevelOnly:[!1,[]],direction:[null,[O.required]],maxLevel:[null,[]],filters:[null]}),this.relationsQueryFormGroup.valueChanges.subscribe((e=>{this.relationsQueryFormGroup.valid?this.propagateChange(e):this.propagateChange(null)}))}registerOnChange(e){this.propagateChange=e}registerOnTouched(e){}setDisabledState(e){this.disabled=e,this.disabled?this.relationsQueryFormGroup.disable({emitEvent:!1}):this.relationsQueryFormGroup.enable({emitEvent:!1})}writeValue(e){this.relationsQueryFormGroup.reset(e||{},{emitEvent:!1})}}e("RelationsQueryConfigOldComponent",Un),Un.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Un,deps:[{token:P.Store},{token:R.FormBuilder}],target:t.ɵɵFactoryTarget.Component}),Un.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:Un,selector:"tb-relations-query-config-old",inputs:{disabled:"disabled",required:"required"},providers:[{provide:B,useExisting:a((()=>Un)),multi:!0}],usesInheritance:!0,ngImport:t,template:'<section fxLayout="column" [formGroup]="relationsQueryFormGroup">\n  <mat-checkbox formControlName="fetchLastLevelOnly">\n    {{ \'alias.last-level-relation\' | translate }}\n  </mat-checkbox>\n  <div fxLayoutGap="8px" fxLayout="row">\n    <mat-form-field class="mat-block" style="min-width: 100px;">\n      <mat-label translate>relation.direction</mat-label>\n      <mat-select required matInput formControlName="direction">\n        <mat-option *ngFor="let type of directionTypes" [value]="type">\n          {{ directionTypeTranslations.get(type) | translate }}\n        </mat-option>\n      </mat-select>\n    </mat-form-field>\n    <mat-form-field fxFlex floatLabel="always" class="mat-block">\n      <mat-label translate>tb.rulenode.max-relation-level</mat-label>\n      <input matInput\n             type="number"\n             min="1"\n             step="1"\n             placeholder="{{ \'tb.rulenode.unlimited-level\' | translate }}"\n             formControlName="maxLevel">\n    </mat-form-field>\n  </div>\n  <div class="mat-caption" style="color: #6e6e6e;" translate>relation.relation-filters</div>\n  <tb-relation-filters\n    formControlName="filters"\n  ></tb-relation-filters>\n</section>\n',dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"component",type:Q.MatCheckbox,selector:"mat-checkbox",inputs:["disableRipple","color","tabIndex"],exportAs:["matCheckbox"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"component",type:X.MatSelect,selector:"mat-select",inputs:["disabled","disableRipple","tabIndex","hideSingleSelectionIndicator"],exportAs:["matSelect"]},{kind:"component",type:ee.MatOption,selector:"mat-option",exportAs:["matOption"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:W.DefaultLayoutGapDirective,selector:"  [fxLayoutGap], [fxLayoutGap.xs], [fxLayoutGap.sm], [fxLayoutGap.md],  [fxLayoutGap.lg], [fxLayoutGap.xl], [fxLayoutGap.lt-sm], [fxLayoutGap.lt-md],  [fxLayoutGap.lt-lg], [fxLayoutGap.lt-xl], [fxLayoutGap.gt-xs], [fxLayoutGap.gt-sm],  [fxLayoutGap.gt-md], [fxLayoutGap.gt-lg]",inputs:["fxLayoutGap","fxLayoutGap.xs","fxLayoutGap.sm","fxLayoutGap.md","fxLayoutGap.lg","fxLayoutGap.xl","fxLayoutGap.lt-sm","fxLayoutGap.lt-md","fxLayoutGap.lt-lg","fxLayoutGap.lt-xl","fxLayoutGap.gt-xs","fxLayoutGap.gt-sm","fxLayoutGap.gt-md","fxLayoutGap.gt-lg"]},{kind:"directive",type:W.DefaultFlexDirective,selector:"  [fxFlex], [fxFlex.xs], [fxFlex.sm], [fxFlex.md],  [fxFlex.lg], [fxFlex.xl], [fxFlex.lt-sm], [fxFlex.lt-md],  [fxFlex.lt-lg], [fxFlex.lt-xl], [fxFlex.gt-xs], [fxFlex.gt-sm],  [fxFlex.gt-md], [fxFlex.gt-lg]",inputs:["fxFlex","fxFlex.xs","fxFlex.sm","fxFlex.md","fxFlex.lg","fxFlex.xl","fxFlex.lt-sm","fxFlex.lt-md","fxFlex.lt-lg","fxFlex.lt-xl","fxFlex.gt-xs","fxFlex.gt-sm","fxFlex.gt-md","fxFlex.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NumberValueAccessor,selector:"input[type=number][formControlName],input[type=number][formControl],input[type=number][ngModel]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.MinValidator,selector:"input[type=number][min][formControlName],input[type=number][min][formControl],input[type=number][min][ngModel]",inputs:["min"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"component",type:Ye.RelationFiltersComponent,selector:"tb-relation-filters",inputs:["disabled","allowedEntityTypes"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Un,decorators:[{type:n,args:[{selector:"tb-relations-query-config-old",providers:[{provide:B,useExisting:a((()=>Un)),multi:!0}],template:'<section fxLayout="column" [formGroup]="relationsQueryFormGroup">\n  <mat-checkbox formControlName="fetchLastLevelOnly">\n    {{ \'alias.last-level-relation\' | translate }}\n  </mat-checkbox>\n  <div fxLayoutGap="8px" fxLayout="row">\n    <mat-form-field class="mat-block" style="min-width: 100px;">\n      <mat-label translate>relation.direction</mat-label>\n      <mat-select required matInput formControlName="direction">\n        <mat-option *ngFor="let type of directionTypes" [value]="type">\n          {{ directionTypeTranslations.get(type) | translate }}\n        </mat-option>\n      </mat-select>\n    </mat-form-field>\n    <mat-form-field fxFlex floatLabel="always" class="mat-block">\n      <mat-label translate>tb.rulenode.max-relation-level</mat-label>\n      <input matInput\n             type="number"\n             min="1"\n             step="1"\n             placeholder="{{ \'tb.rulenode.unlimited-level\' | translate }}"\n             formControlName="maxLevel">\n    </mat-form-field>\n  </div>\n  <div class="mat-caption" style="color: #6e6e6e;" translate>relation.relation-filters</div>\n  <tb-relation-filters\n    formControlName="filters"\n  ></tb-relation-filters>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.FormBuilder}]},propDecorators:{disabled:[{type:i}],required:[{type:i}]}});class Hn{constructor(e,t){this.translate=e,this.fb=t,this.propagateChange=e=>{},this.destroy$=new Ke,this.separatorKeysCodes=[ge,ye,xe],this.onTouched=()=>{}}ngOnInit(){this.attributeControlGroup=this.fb.group({clientAttributeNames:[[],[]],sharedAttributeNames:[[],[]],serverAttributeNames:[[],[]],latestTsKeyNames:[[],[]],getLatestValueWithTs:[!1,[]]},{validators:this.atLeastOne(O.required,["clientAttributeNames","sharedAttributeNames","serverAttributeNames","latestTsKeyNames"])}),this.attributeControlGroup.valueChanges.pipe(Ve(this.destroy$)).subscribe((e=>{this.propagateChange(this.preparePropagateValue(e))}))}preparePropagateValue(e){const t={};for(const n in e)t[n]="getLatestValueWithTs"===n||ae(e[n])?e[n]:[];return t}validate(){return this.attributeControlGroup.valid?null:{atLeastOneRequired:!0}}atLeastOne(e,t=null){return n=>{t||(t=Object.keys(n.controls));return n?.controls&&t.some((t=>!e(n.controls[t])))?null:{atLeastOne:!0}}}writeValue(e){this.attributeControlGroup.setValue(e,{emitEvent:!1})}registerOnChange(e){this.propagateChange=e}registerOnTouched(e){this.onTouched=e}setDisabledState(e){e?this.attributeControlGroup.disable({emitEvent:!1}):this.attributeControlGroup.enable({emitEvent:!1})}ngOnDestroy(){this.destroy$.next(null),this.destroy$.complete()}}e("SelectAttributesComponent",Hn),Hn.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Hn,deps:[{token:Z.TranslateService},{token:R.FormBuilder}],target:t.ɵɵFactoryTarget.Component}),Hn.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:Hn,selector:"tb-select-attributes",inputs:{popupHelpLink:"popupHelpLink"},providers:[{provide:B,useExisting:a((()=>Hn)),multi:!0},{provide:K,useExisting:Hn,multi:!0}],ngImport:t,template:'<div class="tb-form-panel no-padding no-border" [formGroup]="attributeControlGroup">\n  <tb-example-hint [hintText]="\'tb.rulenode.kv-map-pattern-hint\' | translate"\n                   [popupHelpLink]="popupHelpLink"></tb-example-hint>\n  <tb-string-items-list subscriptSizing="dynamic" class="mat-block" editable\n                        (focusout)="onTouched()"\n                        [placeholder]="\'tb.rulenode.add-attribute-key\' | translate"\n                        [label]="\'tb.rulenode.client-attributes\' | translate" formControlName="clientAttributeNames">\n    <ng-container matSuffix *ngTemplateOutlet="helpIcon"></ng-container>\n  </tb-string-items-list>\n  <tb-string-items-list subscriptSizing="dynamic" class="mat-block" editable\n                        (focusout)="onTouched()"\n                        [placeholder]="\'tb.rulenode.add-attribute-key\' | translate"\n                        [label]="\'tb.rulenode.shared-attributes\' | translate" formControlName="sharedAttributeNames">\n    <ng-container matSuffix *ngTemplateOutlet="helpIcon"></ng-container>\n  </tb-string-items-list>\n  <tb-string-items-list subscriptSizing="dynamic" class="mat-block" editable\n                        (focusout)="onTouched()"\n                        [placeholder]="\'tb.rulenode.add-attribute-key\' | translate"\n                        [label]="\'tb.rulenode.server-attributes\' | translate" formControlName="serverAttributeNames">\n    <ng-container matSuffix *ngTemplateOutlet="helpIcon"></ng-container>\n  </tb-string-items-list>\n  <tb-string-items-list subscriptSizing="dynamic" editable class="mat-block"\n                        (focusout)="onTouched()"\n                        [placeholder]="\'tb.rulenode.add-telemetry-key\' | translate"\n                        [label]="\'tb.rulenode.latest-telemetry\' | translate" formControlName="latestTsKeyNames">\n    <ng-container matSuffix *ngTemplateOutlet="helpIcon"></ng-container>\n  </tb-string-items-list>\n  <div tb-hint-tooltip-icon="{{ \'tb.rulenode.fetch-latest-telemetry-with-timestamp-tooltip\' | translate:\n                         { latestTsKeyName:  attributeControlGroup.get(\'latestTsKeyNames\').value[0]} }}"\n       *ngIf="attributeControlGroup.get(\'latestTsKeyNames\').value?.length > 0"\n       class="tb-form-row no-border no-padding">\n    <mat-slide-toggle class="mat-slide" formControlName="getLatestValueWithTs">\n      {{ \'tb.rulenode.fetch-latest-telemetry-with-timestamp\' | translate }}\n    </mat-slide-toggle>\n  </div>\n</div>\n\n<ng-template #helpIcon>\n  <mat-icon class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon"\n            color="primary"\n            matTooltip="{{ \'tb.rulenode.chip-help\' | translate: { inputName: \'tb.rulenode.field-name\' | translate } }}">help</mat-icon>\n</ng-template>\n',styles:[':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n'],dependencies:[{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"directive",type:H.NgTemplateOutlet,selector:"[ngTemplateOutlet]",inputs:["ngTemplateOutletContext","ngTemplateOutlet","ngTemplateOutletInjector"]},{kind:"component",type:et.StringItemsListComponent,selector:"tb-string-items-list",inputs:["required","disabled","label","placeholder","hint","requiredText","floatLabel","appearance","editable","subscriptSizing","predefinedValues"]},{kind:"component",type:ue.MatIcon,selector:"mat-icon",inputs:["color","inline","svgIcon","fontSet","fontIcon"],exportAs:["matIcon"]},{kind:"directive",type:Y.MatSuffix,selector:"[matSuffix], [matIconSuffix], [matTextSuffix]",inputs:["matTextSuffix"]},{kind:"directive",type:ce.MatTooltip,selector:"[matTooltip]",exportAs:["matTooltip"]},{kind:"component",type:te.MatSlideToggle,selector:"mat-slide-toggle",inputs:["disabled","disableRipple","color","tabIndex"],exportAs:["matSlideToggle"]},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"component",type:ne.HintTooltipIconComponent,selector:"[tb-hint-tooltip-icon]",inputs:["tb-hint-tooltip-icon","tooltipPosition","hintIcon"]},{kind:"component",type:An,selector:"tb-example-hint",inputs:["hintText","popupHelpLink","textAlign"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Hn,decorators:[{type:n,args:[{selector:"tb-select-attributes",providers:[{provide:B,useExisting:a((()=>Hn)),multi:!0},{provide:K,useExisting:Hn,multi:!0}],template:'<div class="tb-form-panel no-padding no-border" [formGroup]="attributeControlGroup">\n  <tb-example-hint [hintText]="\'tb.rulenode.kv-map-pattern-hint\' | translate"\n                   [popupHelpLink]="popupHelpLink"></tb-example-hint>\n  <tb-string-items-list subscriptSizing="dynamic" class="mat-block" editable\n                        (focusout)="onTouched()"\n                        [placeholder]="\'tb.rulenode.add-attribute-key\' | translate"\n                        [label]="\'tb.rulenode.client-attributes\' | translate" formControlName="clientAttributeNames">\n    <ng-container matSuffix *ngTemplateOutlet="helpIcon"></ng-container>\n  </tb-string-items-list>\n  <tb-string-items-list subscriptSizing="dynamic" class="mat-block" editable\n                        (focusout)="onTouched()"\n                        [placeholder]="\'tb.rulenode.add-attribute-key\' | translate"\n                        [label]="\'tb.rulenode.shared-attributes\' | translate" formControlName="sharedAttributeNames">\n    <ng-container matSuffix *ngTemplateOutlet="helpIcon"></ng-container>\n  </tb-string-items-list>\n  <tb-string-items-list subscriptSizing="dynamic" class="mat-block" editable\n                        (focusout)="onTouched()"\n                        [placeholder]="\'tb.rulenode.add-attribute-key\' | translate"\n                        [label]="\'tb.rulenode.server-attributes\' | translate" formControlName="serverAttributeNames">\n    <ng-container matSuffix *ngTemplateOutlet="helpIcon"></ng-container>\n  </tb-string-items-list>\n  <tb-string-items-list subscriptSizing="dynamic" editable class="mat-block"\n                        (focusout)="onTouched()"\n                        [placeholder]="\'tb.rulenode.add-telemetry-key\' | translate"\n                        [label]="\'tb.rulenode.latest-telemetry\' | translate" formControlName="latestTsKeyNames">\n    <ng-container matSuffix *ngTemplateOutlet="helpIcon"></ng-container>\n  </tb-string-items-list>\n  <div tb-hint-tooltip-icon="{{ \'tb.rulenode.fetch-latest-telemetry-with-timestamp-tooltip\' | translate:\n                         { latestTsKeyName:  attributeControlGroup.get(\'latestTsKeyNames\').value[0]} }}"\n       *ngIf="attributeControlGroup.get(\'latestTsKeyNames\').value?.length > 0"\n       class="tb-form-row no-border no-padding">\n    <mat-slide-toggle class="mat-slide" formControlName="getLatestValueWithTs">\n      {{ \'tb.rulenode.fetch-latest-telemetry-with-timestamp\' | translate }}\n    </mat-slide-toggle>\n  </div>\n</div>\n\n<ng-template #helpIcon>\n  <mat-icon class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon"\n            color="primary"\n            matTooltip="{{ \'tb.rulenode.chip-help\' | translate: { inputName: \'tb.rulenode.field-name\' | translate } }}">help</mat-icon>\n</ng-template>\n',styles:[':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n']}]}],ctorParameters:function(){return[{type:Z.TranslateService},{type:R.FormBuilder}]},propDecorators:{popupHelpLink:[{type:i}]}});class jn extends L{constructor(e,t){super(e),this.store=e,this.fb=t,this.propagateChange=null,this.destroy$=new Ke,this.alarmStatus=q,this.alarmStatusTranslations=A}ngOnInit(){this.alarmStatusGroup=this.fb.group({alarmStatus:[null,[]]}),this.alarmStatusGroup.get("alarmStatus").valueChanges.pipe(Ve(this.destroy$)).subscribe((e=>{this.propagateChange(e)}))}setDisabledState(e){e?this.alarmStatusGroup.disable({emitEvent:!1}):this.alarmStatusGroup.enable({emitEvent:!1})}registerOnChange(e){this.propagateChange=e}registerOnTouched(e){}ngOnDestroy(){this.destroy$.next(),this.destroy$.complete()}writeValue(e){this.alarmStatusGroup.get("alarmStatus").patchValue(e,{emitEvent:!1})}}e("AlarmStatusSelectComponent",jn),jn.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:jn,deps:[{token:P.Store},{token:R.FormBuilder}],target:t.ɵɵFactoryTarget.Component}),jn.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:jn,selector:"tb-alarm-status-select",providers:[{provide:B,useExisting:a((()=>jn)),multi:!0}],usesInheritance:!0,ngImport:t,template:'<section [formGroup]="alarmStatusGroup" fxLayout="column" fxLayoutAlign="center center">\n  <mat-chip-listbox multiple formControlName="alarmStatus" class="chip-listbox" fxLayout="column">\n    <div class="toggle-column">\n      <mat-chip-option fxFlex class="option" [value]="alarmStatus.ACTIVE_UNACK">\n        {{ alarmStatusTranslations.get(alarmStatus.ACTIVE_UNACK) | translate }}\n      </mat-chip-option>\n      <mat-chip-option fxFlex class="option" [value]="alarmStatus.ACTIVE_ACK">\n        {{ alarmStatusTranslations.get(alarmStatus.ACTIVE_ACK) | translate }}\n      </mat-chip-option>\n    </div>\n    <div class="toggle-column">\n      <mat-chip-option fxFlex class="option" [value]="alarmStatus.CLEARED_UNACK">\n        {{ alarmStatusTranslations.get(alarmStatus.CLEARED_UNACK) | translate }}\n      </mat-chip-option>\n      <mat-chip-option fxFlex class="option" [value]="alarmStatus.CLEARED_ACK">\n        {{ alarmStatusTranslations.get(alarmStatus.CLEARED_ACK) | translate }}\n      </mat-chip-option>\n    </div>\n  </mat-chip-listbox>\n</section>\n',styles:[":host .chip-listbox{max-width:460px;width:100%}:host .chip-listbox .toggle-column{display:flex;flex:1 1 100%;gap:8px}:host .chip-listbox .option{margin:0}@media screen and (max-width: 959px){:host .chip-listbox{max-width:360px}:host .chip-listbox .toggle-column{flex-direction:column}}:host ::ng-deep .chip-listbox .mdc-evolution-chip-set__chips{gap:8px}:host ::ng-deep .chip-listbox .option button{flex-basis:100%;justify-content:start}:host ::ng-deep .chip-listbox .option .mdc-evolution-chip__graphic{flex-grow:0}\n"],dependencies:[{kind:"component",type:be.MatChipListbox,selector:"mat-chip-listbox",inputs:["tabIndex","multiple","aria-orientation","selectable","compareWith","required","hideSingleSelectionIndicator","value"],outputs:["change"]},{kind:"component",type:be.MatChipOption,selector:"mat-basic-chip-option, [mat-basic-chip-option], mat-chip-option, [mat-chip-option]",inputs:["color","disabled","disableRipple","tabIndex","selectable","selected"],outputs:["selectionChange"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:W.DefaultLayoutAlignDirective,selector:"  [fxLayoutAlign], [fxLayoutAlign.xs], [fxLayoutAlign.sm], [fxLayoutAlign.md],  [fxLayoutAlign.lg], [fxLayoutAlign.xl], [fxLayoutAlign.lt-sm], [fxLayoutAlign.lt-md],  [fxLayoutAlign.lt-lg], [fxLayoutAlign.lt-xl], [fxLayoutAlign.gt-xs], [fxLayoutAlign.gt-sm],  [fxLayoutAlign.gt-md], [fxLayoutAlign.gt-lg]",inputs:["fxLayoutAlign","fxLayoutAlign.xs","fxLayoutAlign.sm","fxLayoutAlign.md","fxLayoutAlign.lg","fxLayoutAlign.xl","fxLayoutAlign.lt-sm","fxLayoutAlign.lt-md","fxLayoutAlign.lt-lg","fxLayoutAlign.lt-xl","fxLayoutAlign.gt-xs","fxLayoutAlign.gt-sm","fxLayoutAlign.gt-md","fxLayoutAlign.gt-lg"]},{kind:"directive",type:W.DefaultFlexDirective,selector:"  [fxFlex], [fxFlex.xs], [fxFlex.sm], [fxFlex.md],  [fxFlex.lg], [fxFlex.xl], [fxFlex.lt-sm], [fxFlex.lt-md],  [fxFlex.lt-lg], [fxFlex.lt-xl], [fxFlex.gt-xs], [fxFlex.gt-sm],  [fxFlex.gt-md], [fxFlex.gt-lg]",inputs:["fxFlex","fxFlex.xs","fxFlex.sm","fxFlex.md","fxFlex.lg","fxFlex.xl","fxFlex.lt-sm","fxFlex.lt-md","fxFlex.lt-lg","fxFlex.lt-xl","fxFlex.gt-xs","fxFlex.gt-sm","fxFlex.gt-md","fxFlex.gt-lg"]},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:jn,decorators:[{type:n,args:[{selector:"tb-alarm-status-select",providers:[{provide:B,useExisting:a((()=>jn)),multi:!0}],template:'<section [formGroup]="alarmStatusGroup" fxLayout="column" fxLayoutAlign="center center">\n  <mat-chip-listbox multiple formControlName="alarmStatus" class="chip-listbox" fxLayout="column">\n    <div class="toggle-column">\n      <mat-chip-option fxFlex class="option" [value]="alarmStatus.ACTIVE_UNACK">\n        {{ alarmStatusTranslations.get(alarmStatus.ACTIVE_UNACK) | translate }}\n      </mat-chip-option>\n      <mat-chip-option fxFlex class="option" [value]="alarmStatus.ACTIVE_ACK">\n        {{ alarmStatusTranslations.get(alarmStatus.ACTIVE_ACK) | translate }}\n      </mat-chip-option>\n    </div>\n    <div class="toggle-column">\n      <mat-chip-option fxFlex class="option" [value]="alarmStatus.CLEARED_UNACK">\n        {{ alarmStatusTranslations.get(alarmStatus.CLEARED_UNACK) | translate }}\n      </mat-chip-option>\n      <mat-chip-option fxFlex class="option" [value]="alarmStatus.CLEARED_ACK">\n        {{ alarmStatusTranslations.get(alarmStatus.CLEARED_ACK) | translate }}\n      </mat-chip-option>\n    </div>\n  </mat-chip-listbox>\n</section>\n',styles:[":host .chip-listbox{max-width:460px;width:100%}:host .chip-listbox .toggle-column{display:flex;flex:1 1 100%;gap:8px}:host .chip-listbox .option{margin:0}@media screen and (max-width: 959px){:host .chip-listbox{max-width:360px}:host .chip-listbox .toggle-column{flex-direction:column}}:host ::ng-deep .chip-listbox .mdc-evolution-chip-set__chips{gap:8px}:host ::ng-deep .chip-listbox .option button{flex-basis:100%;justify-content:start}:host ::ng-deep .chip-listbox .option .mdc-evolution-chip__graphic{flex-grow:0}\n"]}]}],ctorParameters:function(){return[{type:P.Store},{type:R.FormBuilder}]}});class $n{}e("RulenodeCoreConfigCommonModule",$n),$n.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:$n,deps:[],target:t.ɵɵFactoryTarget.NgModule}),$n.ɵmod=t.ɵɵngDeclareNgModule({minVersion:"14.0.0",version:"15.2.10",ngImport:t,type:$n,declarations:[Mn,En,Gn,Dn,wn,In,Nn,Bn,Cn,Kn,zn,Un,Hn,jn,An],imports:[$,M,_e],exports:[Mn,En,Gn,Dn,wn,In,Nn,Bn,Cn,Kn,zn,Un,Hn,jn,An]}),$n.ɵinj=t.ɵɵngDeclareInjector({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:$n,imports:[$,M,_e]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:$n,decorators:[{type:c,args:[{declarations:[Mn,En,Gn,Dn,wn,In,Nn,Bn,Cn,Kn,zn,Un,Hn,jn,An],imports:[$,M,_e],exports:[Mn,En,Gn,Dn,wn,In,Nn,Bn,Cn,Kn,zn,Un,Hn,jn,An]}]}]});class Qn{}e("RuleNodeCoreConfigActionModule",Qn),Qn.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Qn,deps:[],target:t.ɵɵFactoryTarget.NgModule}),Qn.ɵmod=t.ɵɵngDeclareNgModule({minVersion:"14.0.0",version:"15.2.10",ngImport:t,type:Qn,declarations:[Tn,ct,kn,vn,fn,ut,ft,gt,yt,yn,xt,ht,cn,gn,hn,Fn,Ln,bt,bn,xn,Sn,qn],imports:[$,M,_e,$n],exports:[Tn,ct,kn,vn,fn,ut,ft,gt,yt,yn,xt,ht,cn,gn,hn,Fn,Ln,bt,bn,xn,Sn,qn]}),Qn.ɵinj=t.ɵɵngDeclareInjector({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Qn,imports:[$,M,_e,$n]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Qn,decorators:[{type:c,args:[{declarations:[Tn,ct,kn,vn,fn,ut,ft,gt,yt,yn,xt,ht,cn,gn,hn,Fn,Ln,bt,bn,xn,Sn,qn],imports:[$,M,_e,$n],exports:[Tn,ct,kn,vn,fn,ut,ft,gt,yt,yn,xt,ht,cn,gn,hn,Fn,Ln,bt,bn,xn,Sn,qn]}]}]});class Jn extends f{constructor(e,t,n){super(e),this.store=e,this.translate=t,this.fb=n,this.separatorKeysCodes=[ge,ye,xe]}configForm(){return this.calculateDeltaConfigForm}onConfigurationSet(e){this.calculateDeltaConfigForm=this.fb.group({inputValueKey:[e.inputValueKey,[O.required,O.pattern(/(?:.|\s)*\S(&:.|\s)*/)]],outputValueKey:[e.outputValueKey,[O.required,O.pattern(/(?:.|\s)*\S(&:.|\s)*/)]],useCache:[e.useCache,[]],addPeriodBetweenMsgs:[e.addPeriodBetweenMsgs,[]],periodValueKey:[e.periodValueKey,[]],round:[e.round,[O.min(0),O.max(15)]],tellFailureIfDeltaIsNegative:[e.tellFailureIfDeltaIsNegative,[]]})}prepareInputConfig(e){return{inputValueKey:ae(e?.inputValueKey)?e.inputValueKey:null,outputValueKey:ae(e?.outputValueKey)?e.outputValueKey:null,useCache:!ae(e?.useCache)||e.useCache,addPeriodBetweenMsgs:!!ae(e?.addPeriodBetweenMsgs)&&e.addPeriodBetweenMsgs,periodValueKey:ae(e?.periodValueKey)?e.periodValueKey:null,round:ae(e?.round)?e.round:null,tellFailureIfDeltaIsNegative:!ae(e?.tellFailureIfDeltaIsNegative)||e.tellFailureIfDeltaIsNegative}}prepareOutputConfig(e){return le(e)}updateValidators(e){this.calculateDeltaConfigForm.get("addPeriodBetweenMsgs").value?this.calculateDeltaConfigForm.get("periodValueKey").setValidators([O.required]):this.calculateDeltaConfigForm.get("periodValueKey").setValidators([]),this.calculateDeltaConfigForm.get("periodValueKey").updateValueAndValidity({emitEvent:e})}validatorTriggers(){return["addPeriodBetweenMsgs"]}}e("CalculateDeltaConfigComponent",Jn),Jn.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Jn,deps:[{token:P.Store},{token:Z.TranslateService},{token:R.FormBuilder}],target:t.ɵɵFactoryTarget.Component}),Jn.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:Jn,selector:"tb-enrichment-node-calculate-delta-config",usesInheritance:!0,ngImport:t,template:"<section [formGroup]=\"calculateDeltaConfigForm\">\n  <div fxLayout.gt-sm=\"row\" fxLayoutGap.gt-sm=\"22px\">\n    <mat-form-field class=\"mat-block\" fxFlex>\n      <mat-label>{{ 'tb.rulenode.input-value-key' | translate }}</mat-label>\n      <input matInput formControlName=\"inputValueKey\">\n      <mat-error *ngIf=\"calculateDeltaConfigForm.get('inputValueKey').hasError('required') ||\n      calculateDeltaConfigForm.get('inputValueKey').hasError('pattern')\">\n        {{ 'tb.rulenode.input-value-key-required' | translate }}\n      </mat-error>\n    </mat-form-field>\n    <mat-form-field class=\"mat-block\" fxFlex>\n      <mat-label>{{ 'tb.rulenode.output-value-key' | translate }}</mat-label>\n      <input matInput formControlName=\"outputValueKey\">\n      <mat-error *ngIf=\"calculateDeltaConfigForm.get('outputValueKey').hasError('required') ||\n      calculateDeltaConfigForm.get('inputValueKey').hasError('pattern')\">\n        {{ 'tb.rulenode.output-value-key-required' | translate }}\n      </mat-error>\n    </mat-form-field>\n  </div>\n  <mat-form-field class=\"mat-block\" fxFlex>\n    <mat-label>{{ 'tb.rulenode.number-of-digits-after-floating-point' | translate }}</mat-label>\n    <input type=\"number\" min=\"0\" max=\"15\" step=\"1\" matInput formControlName=\"round\">\n    <mat-error *ngIf=\"calculateDeltaConfigForm.get('round').hasError('min')\">\n      {{ 'tb.rulenode.number-of-digits-after-floating-point-range' | translate }}\n    </mat-error>\n    <mat-error *ngIf=\"calculateDeltaConfigForm.get('round').hasError('max')\">\n      {{ 'tb.rulenode.number-of-digits-after-floating-point-range' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <div class=\"tb-form-panel no-padding no-border\">\n    <div tb-hint-tooltip-icon=\"{{ 'tb.rulenode.failure-if-delta-negative-tooltip' | translate }}\"\n         class=\"tb-form-row same-padding\">\n      <mat-slide-toggle class=\"mat-slide margin\" formControlName=\"tellFailureIfDeltaIsNegative\">\n        {{ 'tb.rulenode.failure-if-delta-negative' | translate }}\n      </mat-slide-toggle>\n    </div>\n    <div tb-hint-tooltip-icon=\"{{ 'tb.rulenode.use-caching-tooltip' | translate :\n                       { inputValueKey: calculateDeltaConfigForm.get('inputValueKey').valid ?\n                                calculateDeltaConfigForm.get('inputValueKey').value : 'tb.rulenode.input-value-key' | translate } }}\"\n         class=\"tb-form-row same-padding\">\n      <mat-slide-toggle class=\"mat-slide margin\" formControlName=\"useCache\">\n        {{ 'tb.rulenode.use-caching' | translate }}\n      </mat-slide-toggle>\n    </div>\n    <div class=\"tb-form-panel stroked\" [class.no-padding-bottom]=\"calculateDeltaConfigForm.get('addPeriodBetweenMsgs').value\">\n      <div tb-hint-tooltip-icon=\"{{ 'tb.rulenode.add-time-difference-between-readings-tooltip' | translate:\n                           { periodValueKey: (calculateDeltaConfigForm.get('periodValueKey').valid &&\n                           calculateDeltaConfigForm.get('addPeriodBetweenMsgs').value) ? calculateDeltaConfigForm.get('periodValueKey').value :\n                           'periodInMs' } }}\"\n           class=\"tb-form-row no-border no-padding\">\n        <mat-slide-toggle class=\"mat-slide\" formControlName=\"addPeriodBetweenMsgs\">\n          {{ 'tb.rulenode.add-time-difference-between-readings' | translate:\n          { inputValueKey: calculateDeltaConfigForm.get('inputValueKey').valid ?\n                     calculateDeltaConfigForm.get('inputValueKey').value : 'tb.rulenode.input-value-key' | translate } }}\n        </mat-slide-toggle>\n      </div>\n      <mat-form-field class=\"mat-block\" *ngIf=\"calculateDeltaConfigForm.get('addPeriodBetweenMsgs').value\">\n        <mat-label>{{ 'tb.rulenode.period-value-key' | translate }}</mat-label>\n        <input required matInput formControlName=\"periodValueKey\">\n        <mat-error *ngIf=\"calculateDeltaConfigForm.get('periodValueKey').hasError('required')\">\n          {{ 'tb.rulenode.period-value-key-required' | translate }}\n        </mat-error>\n      </mat-form-field>\n    </div>\n  </div>\n</section>\n",dependencies:[{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"component",type:te.MatSlideToggle,selector:"mat-slide-toggle",inputs:["disabled","disableRipple","color","tabIndex"],exportAs:["matSlideToggle"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:W.DefaultLayoutGapDirective,selector:"  [fxLayoutGap], [fxLayoutGap.xs], [fxLayoutGap.sm], [fxLayoutGap.md],  [fxLayoutGap.lg], [fxLayoutGap.xl], [fxLayoutGap.lt-sm], [fxLayoutGap.lt-md],  [fxLayoutGap.lt-lg], [fxLayoutGap.lt-xl], [fxLayoutGap.gt-xs], [fxLayoutGap.gt-sm],  [fxLayoutGap.gt-md], [fxLayoutGap.gt-lg]",inputs:["fxLayoutGap","fxLayoutGap.xs","fxLayoutGap.sm","fxLayoutGap.md","fxLayoutGap.lg","fxLayoutGap.xl","fxLayoutGap.lt-sm","fxLayoutGap.lt-md","fxLayoutGap.lt-lg","fxLayoutGap.lt-xl","fxLayoutGap.gt-xs","fxLayoutGap.gt-sm","fxLayoutGap.gt-md","fxLayoutGap.gt-lg"]},{kind:"directive",type:W.DefaultFlexDirective,selector:"  [fxFlex], [fxFlex.xs], [fxFlex.sm], [fxFlex.md],  [fxFlex.lg], [fxFlex.xl], [fxFlex.lt-sm], [fxFlex.lt-md],  [fxFlex.lt-lg], [fxFlex.lt-xl], [fxFlex.gt-xs], [fxFlex.gt-sm],  [fxFlex.gt-md], [fxFlex.gt-lg]",inputs:["fxFlex","fxFlex.xs","fxFlex.sm","fxFlex.md","fxFlex.lg","fxFlex.xl","fxFlex.lt-sm","fxFlex.lt-md","fxFlex.lt-lg","fxFlex.lt-xl","fxFlex.gt-xs","fxFlex.gt-sm","fxFlex.gt-md","fxFlex.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NumberValueAccessor,selector:"input[type=number][formControlName],input[type=number][formControl],input[type=number][ngModel]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.MinValidator,selector:"input[type=number][min][formControlName],input[type=number][min][formControl],input[type=number][min][ngModel]",inputs:["min"]},{kind:"directive",type:R.MaxValidator,selector:"input[type=number][max][formControlName],input[type=number][max][formControl],input[type=number][max][ngModel]",inputs:["max"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"component",type:ne.HintTooltipIconComponent,selector:"[tb-hint-tooltip-icon]",inputs:["tb-hint-tooltip-icon","tooltipPosition","hintIcon"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Jn,decorators:[{type:n,args:[{selector:"tb-enrichment-node-calculate-delta-config",template:"<section [formGroup]=\"calculateDeltaConfigForm\">\n  <div fxLayout.gt-sm=\"row\" fxLayoutGap.gt-sm=\"22px\">\n    <mat-form-field class=\"mat-block\" fxFlex>\n      <mat-label>{{ 'tb.rulenode.input-value-key' | translate }}</mat-label>\n      <input matInput formControlName=\"inputValueKey\">\n      <mat-error *ngIf=\"calculateDeltaConfigForm.get('inputValueKey').hasError('required') ||\n      calculateDeltaConfigForm.get('inputValueKey').hasError('pattern')\">\n        {{ 'tb.rulenode.input-value-key-required' | translate }}\n      </mat-error>\n    </mat-form-field>\n    <mat-form-field class=\"mat-block\" fxFlex>\n      <mat-label>{{ 'tb.rulenode.output-value-key' | translate }}</mat-label>\n      <input matInput formControlName=\"outputValueKey\">\n      <mat-error *ngIf=\"calculateDeltaConfigForm.get('outputValueKey').hasError('required') ||\n      calculateDeltaConfigForm.get('inputValueKey').hasError('pattern')\">\n        {{ 'tb.rulenode.output-value-key-required' | translate }}\n      </mat-error>\n    </mat-form-field>\n  </div>\n  <mat-form-field class=\"mat-block\" fxFlex>\n    <mat-label>{{ 'tb.rulenode.number-of-digits-after-floating-point' | translate }}</mat-label>\n    <input type=\"number\" min=\"0\" max=\"15\" step=\"1\" matInput formControlName=\"round\">\n    <mat-error *ngIf=\"calculateDeltaConfigForm.get('round').hasError('min')\">\n      {{ 'tb.rulenode.number-of-digits-after-floating-point-range' | translate }}\n    </mat-error>\n    <mat-error *ngIf=\"calculateDeltaConfigForm.get('round').hasError('max')\">\n      {{ 'tb.rulenode.number-of-digits-after-floating-point-range' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <div class=\"tb-form-panel no-padding no-border\">\n    <div tb-hint-tooltip-icon=\"{{ 'tb.rulenode.failure-if-delta-negative-tooltip' | translate }}\"\n         class=\"tb-form-row same-padding\">\n      <mat-slide-toggle class=\"mat-slide margin\" formControlName=\"tellFailureIfDeltaIsNegative\">\n        {{ 'tb.rulenode.failure-if-delta-negative' | translate }}\n      </mat-slide-toggle>\n    </div>\n    <div tb-hint-tooltip-icon=\"{{ 'tb.rulenode.use-caching-tooltip' | translate :\n                       { inputValueKey: calculateDeltaConfigForm.get('inputValueKey').valid ?\n                                calculateDeltaConfigForm.get('inputValueKey').value : 'tb.rulenode.input-value-key' | translate } }}\"\n         class=\"tb-form-row same-padding\">\n      <mat-slide-toggle class=\"mat-slide margin\" formControlName=\"useCache\">\n        {{ 'tb.rulenode.use-caching' | translate }}\n      </mat-slide-toggle>\n    </div>\n    <div class=\"tb-form-panel stroked\" [class.no-padding-bottom]=\"calculateDeltaConfigForm.get('addPeriodBetweenMsgs').value\">\n      <div tb-hint-tooltip-icon=\"{{ 'tb.rulenode.add-time-difference-between-readings-tooltip' | translate:\n                           { periodValueKey: (calculateDeltaConfigForm.get('periodValueKey').valid &&\n                           calculateDeltaConfigForm.get('addPeriodBetweenMsgs').value) ? calculateDeltaConfigForm.get('periodValueKey').value :\n                           'periodInMs' } }}\"\n           class=\"tb-form-row no-border no-padding\">\n        <mat-slide-toggle class=\"mat-slide\" formControlName=\"addPeriodBetweenMsgs\">\n          {{ 'tb.rulenode.add-time-difference-between-readings' | translate:\n          { inputValueKey: calculateDeltaConfigForm.get('inputValueKey').valid ?\n                     calculateDeltaConfigForm.get('inputValueKey').value : 'tb.rulenode.input-value-key' | translate } }}\n        </mat-slide-toggle>\n      </div>\n      <mat-form-field class=\"mat-block\" *ngIf=\"calculateDeltaConfigForm.get('addPeriodBetweenMsgs').value\">\n        <mat-label>{{ 'tb.rulenode.period-value-key' | translate }}</mat-label>\n        <input required matInput formControlName=\"periodValueKey\">\n        <mat-error *ngIf=\"calculateDeltaConfigForm.get('periodValueKey').hasError('required')\">\n          {{ 'tb.rulenode.period-value-key-required' | translate }}\n        </mat-error>\n      </mat-form-field>\n    </div>\n  </div>\n</section>\n"}]}],ctorParameters:function(){return[{type:P.Store},{type:Z.TranslateService},{type:R.FormBuilder}]}});class Yn extends f{constructor(e,t,n){super(e),this.store=e,this.fb=t,this.translate=n,this.fetchToData=[],this.DataToFetch=Pt;for(const e of Rt.keys())e!==Pt.FIELDS&&this.fetchToData.push({value:e,name:this.translate.instant(Rt.get(e))})}configForm(){return this.customerAttributesConfigForm}prepareOutputConfig(e){const t={};for(const n of Object.keys(e.dataMapping))t[n.trim()]=e.dataMapping[n];return e.dataMapping=t,le(e)}prepareInputConfig(e){let t,n;return t=ae(e?.telemetry)?e.telemetry?Pt.LATEST_TELEMETRY:Pt.ATTRIBUTES:ae(e?.dataToFetch)?e.dataToFetch:Pt.ATTRIBUTES,n=ae(e?.attrMapping)?e.attrMapping:ae(e?.dataMapping)?e.dataMapping:null,{dataToFetch:t,dataMapping:n,fetchTo:ae(e?.fetchTo)?e.fetchTo:en.METADATA}}selectTranslation(e,t){return this.customerAttributesConfigForm.get("dataToFetch").value===Pt.LATEST_TELEMETRY?e:t}onConfigurationSet(e){this.customerAttributesConfigForm=this.fb.group({dataToFetch:[e.dataToFetch,[]],dataMapping:[e.dataMapping,[O.required]],fetchTo:[e.fetchTo]})}}e("CustomerAttributesConfigComponent",Yn),Yn.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Yn,deps:[{token:P.Store},{token:R.FormBuilder},{token:Z.TranslateService}],target:t.ɵɵFactoryTarget.Component}),Yn.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:Yn,selector:"tb-enrichment-node-customer-attributes-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="customerAttributesConfigForm" class="tb-form-panel stroked">\n  <div class="tb-form-panel-title" translate>tb.rulenode.mapping-of-customers</div>\n  <div fxFlex fxLayoutAlign="center center">\n    <div class="fetch-to-data-toggle">\n      <tb-toggle-select class="fetch-to-data-toggle" formControlName="dataToFetch" appearance="fill">\n        <tb-toggle-option *ngFor="let data of fetchToData" [value]="data.value">\n          {{ data.name }}\n        </tb-toggle-option>\n      </tb-toggle-select>\n    </div>\n  </div>\n  <tb-kv-map-config\n    required\n    formControlName="dataMapping"\n    [requiredText]="\'tb.rulenode.attr-mapping-required\' | translate"\n    [labelText]="selectTranslation(\'tb.rulenode.latest-telemetry-mapping\',\'tb.rulenode.attributes-mapping\') | translate"\n    [keyText]="selectTranslation(\'tb.rulenode.source-telemetry\',\'tb.rulenode.source-attribute\') | translate"\n    [keyRequiredText]="selectTranslation(\'tb.rulenode.source-telemetry-required\',\'tb.rulenode.source-attribute-required\') | translate"\n    [valText]="\'tb.rulenode.target-key\' | translate"\n    [valRequiredText]="\'tb.rulenode.target-key-required\' | translate"\n    [hintText]="\'tb.rulenode.kv-map-pattern-hint\' | translate"\n    popupHelpLink="rulenode/customer_attributes_node_fields_templatization">\n  </tb-kv-map-config>\n  <tb-msg-metadata-chip\n    [labelText]="customerAttributesConfigForm.get(\'dataToFetch\').value === DataToFetch.LATEST_TELEMETRY ?\n    (\'tb.rulenode.add-mapped-latest-telemetry-to\' | translate) : (\'tb.rulenode.add-mapped-attribute-to\' | translate)"\n    formControlName="fetchTo">\n  </tb-msg-metadata-chip>\n</section>\n',styles:[":host .fetch-to-data-toggle{max-width:420px;width:100%}\n"],dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"directive",type:W.DefaultLayoutAlignDirective,selector:"  [fxLayoutAlign], [fxLayoutAlign.xs], [fxLayoutAlign.sm], [fxLayoutAlign.md],  [fxLayoutAlign.lg], [fxLayoutAlign.xl], [fxLayoutAlign.lt-sm], [fxLayoutAlign.lt-md],  [fxLayoutAlign.lt-lg], [fxLayoutAlign.lt-xl], [fxLayoutAlign.gt-xs], [fxLayoutAlign.gt-sm],  [fxLayoutAlign.gt-md], [fxLayoutAlign.gt-lg]",inputs:["fxLayoutAlign","fxLayoutAlign.xs","fxLayoutAlign.sm","fxLayoutAlign.md","fxLayoutAlign.lg","fxLayoutAlign.xl","fxLayoutAlign.lt-sm","fxLayoutAlign.lt-md","fxLayoutAlign.lt-lg","fxLayoutAlign.lt-xl","fxLayoutAlign.gt-xs","fxLayoutAlign.gt-sm","fxLayoutAlign.gt-md","fxLayoutAlign.gt-lg"]},{kind:"directive",type:W.DefaultFlexDirective,selector:"  [fxFlex], [fxFlex.xs], [fxFlex.sm], [fxFlex.md],  [fxFlex.lg], [fxFlex.xl], [fxFlex.lt-sm], [fxFlex.lt-md],  [fxFlex.lt-lg], [fxFlex.lt-xl], [fxFlex.gt-xs], [fxFlex.gt-sm],  [fxFlex.gt-md], [fxFlex.gt-lg]",inputs:["fxFlex","fxFlex.xs","fxFlex.sm","fxFlex.md","fxFlex.lg","fxFlex.xl","fxFlex.lt-sm","fxFlex.lt-md","fxFlex.lt-lg","fxFlex.lt-xl","fxFlex.gt-xs","fxFlex.gt-sm","fxFlex.gt-md","fxFlex.gt-lg"]},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"directive",type:Fe.ToggleOption,selector:"tb-toggle-option",inputs:["value"]},{kind:"component",type:ke.ToggleSelectComponent,selector:"tb-toggle-select",inputs:["disabled","selectMediaBreakpoint","appearance","disablePagination"]},{kind:"component",type:Mn,selector:"tb-kv-map-config",inputs:["disabled","uniqueKeyValuePairValidator","labelText","requiredText","keyText","keyRequiredText","valText","valRequiredText","hintText","popupHelpLink","required"]},{kind:"component",type:Kn,selector:"tb-msg-metadata-chip",inputs:["labelText","translation"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Yn,decorators:[{type:n,args:[{selector:"tb-enrichment-node-customer-attributes-config",template:'<section [formGroup]="customerAttributesConfigForm" class="tb-form-panel stroked">\n  <div class="tb-form-panel-title" translate>tb.rulenode.mapping-of-customers</div>\n  <div fxFlex fxLayoutAlign="center center">\n    <div class="fetch-to-data-toggle">\n      <tb-toggle-select class="fetch-to-data-toggle" formControlName="dataToFetch" appearance="fill">\n        <tb-toggle-option *ngFor="let data of fetchToData" [value]="data.value">\n          {{ data.name }}\n        </tb-toggle-option>\n      </tb-toggle-select>\n    </div>\n  </div>\n  <tb-kv-map-config\n    required\n    formControlName="dataMapping"\n    [requiredText]="\'tb.rulenode.attr-mapping-required\' | translate"\n    [labelText]="selectTranslation(\'tb.rulenode.latest-telemetry-mapping\',\'tb.rulenode.attributes-mapping\') | translate"\n    [keyText]="selectTranslation(\'tb.rulenode.source-telemetry\',\'tb.rulenode.source-attribute\') | translate"\n    [keyRequiredText]="selectTranslation(\'tb.rulenode.source-telemetry-required\',\'tb.rulenode.source-attribute-required\') | translate"\n    [valText]="\'tb.rulenode.target-key\' | translate"\n    [valRequiredText]="\'tb.rulenode.target-key-required\' | translate"\n    [hintText]="\'tb.rulenode.kv-map-pattern-hint\' | translate"\n    popupHelpLink="rulenode/customer_attributes_node_fields_templatization">\n  </tb-kv-map-config>\n  <tb-msg-metadata-chip\n    [labelText]="customerAttributesConfigForm.get(\'dataToFetch\').value === DataToFetch.LATEST_TELEMETRY ?\n    (\'tb.rulenode.add-mapped-latest-telemetry-to\' | translate) : (\'tb.rulenode.add-mapped-attribute-to\' | translate)"\n    formControlName="fetchTo">\n  </tb-msg-metadata-chip>\n</section>\n',styles:[":host .fetch-to-data-toggle{max-width:420px;width:100%}\n"]}]}],ctorParameters:function(){return[{type:P.Store},{type:R.FormBuilder},{type:Z.TranslateService}]}});class Wn extends f{constructor(e,t,n){super(e),this.store=e,this.translate=t,this.fb=n}configForm(){return this.deviceAttributesConfigForm}onConfigurationSet(e){this.deviceAttributesConfigForm=this.fb.group({deviceRelationsQuery:[e.deviceRelationsQuery,[O.required]],tellFailureIfAbsent:[e.tellFailureIfAbsent,[]],fetchTo:[e.fetchTo,[]],attributesControl:[e.attributesControl,[]]})}prepareInputConfig(e){return se(e)&&(e.attributesControl={clientAttributeNames:ae(e?.clientAttributeNames)?e.clientAttributeNames:[],latestTsKeyNames:ae(e?.latestTsKeyNames)?e.latestTsKeyNames:[],serverAttributeNames:ae(e?.serverAttributeNames)?e.serverAttributeNames:[],sharedAttributeNames:ae(e?.sharedAttributeNames)?e.sharedAttributeNames:[],getLatestValueWithTs:!!ae(e?.getLatestValueWithTs)&&e.getLatestValueWithTs}),{deviceRelationsQuery:ae(e?.deviceRelationsQuery)?e.deviceRelationsQuery:null,tellFailureIfAbsent:!ae(e?.tellFailureIfAbsent)||e.tellFailureIfAbsent,fetchTo:ae(e?.fetchTo)?e.fetchTo:en.METADATA,attributesControl:e?e.attributesControl:null}}prepareOutputConfig(e){for(const t of Object.keys(e.attributesControl))e[t]=e.attributesControl[t];return delete e.attributesControl,e}}e("DeviceAttributesConfigComponent",Wn),Wn.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Wn,deps:[{token:P.Store},{token:Z.TranslateService},{token:R.FormBuilder}],target:t.ɵɵFactoryTarget.Component}),Wn.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:Wn,selector:"tb-enrichment-node-device-attributes-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="deviceAttributesConfigForm" class="tb-form-panel no-padding no-border">\n  <div class="tb-form-panel stroked no-padding-bottom">\n    <div class="tb-form-panel-title" translate>tb.rulenode.device-relations-query</div>\n    <tb-device-relations-query-config\n      required\n      formControlName="deviceRelationsQuery">\n    </tb-device-relations-query-config>\n  </div>\n  <div class="tb-form-panel stroked">\n    <div class="tb-form-row no-padding no-border space-between">\n      <div class="tb-form-panel-title tb-required" translate>tb.rulenode.related-device-attributes</div>\n      <div class="tb-form-panel-hint tb-error" translate\n           [hidden]="!(deviceAttributesConfigForm.get(\'attributesControl\').touched &&\n                        deviceAttributesConfigForm.get(\'attributesControl\').hasError(\'atLeastOneRequired\'))">\n        tb.rulenode.at-least-one-field-required\n      </div>\n    </div>\n    <tb-select-attributes formControlName="attributesControl"\n                          popupHelpLink="rulenode/related_device_attributes_node_fields_templatization"></tb-select-attributes>\n    <tb-msg-metadata-chip formControlName="fetchTo"\n                          [labelText]="\'tb.rulenode.add-selected-attributes-to\' | translate"></tb-msg-metadata-chip>\n  </div>\n  <div tb-hint-tooltip-icon="{{ \'tb.rulenode.tell-failure-tooltip\' | translate }}"\n       class="tb-form-row same-padding">\n    <mat-slide-toggle class="mat-slide margin" formControlName="tellFailureIfAbsent">\n      {{ \'tb.rulenode.tell-failure\' | translate }}\n    </mat-slide-toggle>\n  </div>\n</section>\n',styles:[':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n'],dependencies:[{kind:"component",type:te.MatSlideToggle,selector:"mat-slide-toggle",inputs:["disabled","disableRipple","color","tabIndex"],exportAs:["matSlideToggle"]},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"component",type:ne.HintTooltipIconComponent,selector:"[tb-hint-tooltip-icon]",inputs:["tb-hint-tooltip-icon","tooltipPosition","hintIcon"]},{kind:"component",type:En,selector:"tb-device-relations-query-config",inputs:["disabled","required"]},{kind:"component",type:Kn,selector:"tb-msg-metadata-chip",inputs:["labelText","translation"]},{kind:"component",type:Hn,selector:"tb-select-attributes",inputs:["popupHelpLink"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Wn,decorators:[{type:n,args:[{selector:"tb-enrichment-node-device-attributes-config",template:'<section [formGroup]="deviceAttributesConfigForm" class="tb-form-panel no-padding no-border">\n  <div class="tb-form-panel stroked no-padding-bottom">\n    <div class="tb-form-panel-title" translate>tb.rulenode.device-relations-query</div>\n    <tb-device-relations-query-config\n      required\n      formControlName="deviceRelationsQuery">\n    </tb-device-relations-query-config>\n  </div>\n  <div class="tb-form-panel stroked">\n    <div class="tb-form-row no-padding no-border space-between">\n      <div class="tb-form-panel-title tb-required" translate>tb.rulenode.related-device-attributes</div>\n      <div class="tb-form-panel-hint tb-error" translate\n           [hidden]="!(deviceAttributesConfigForm.get(\'attributesControl\').touched &&\n                        deviceAttributesConfigForm.get(\'attributesControl\').hasError(\'atLeastOneRequired\'))">\n        tb.rulenode.at-least-one-field-required\n      </div>\n    </div>\n    <tb-select-attributes formControlName="attributesControl"\n                          popupHelpLink="rulenode/related_device_attributes_node_fields_templatization"></tb-select-attributes>\n    <tb-msg-metadata-chip formControlName="fetchTo"\n                          [labelText]="\'tb.rulenode.add-selected-attributes-to\' | translate"></tb-msg-metadata-chip>\n  </div>\n  <div tb-hint-tooltip-icon="{{ \'tb.rulenode.tell-failure-tooltip\' | translate }}"\n       class="tb-form-row same-padding">\n    <mat-slide-toggle class="mat-slide margin" formControlName="tellFailureIfAbsent">\n      {{ \'tb.rulenode.tell-failure\' | translate }}\n    </mat-slide-toggle>\n  </div>\n</section>\n',styles:[':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n']}]}],ctorParameters:function(){return[{type:P.Store},{type:Z.TranslateService},{type:R.FormBuilder}]}});class Zn extends f{constructor(e,t,n){super(e),this.store=e,this.translate=t,this.fb=n,this.predefinedValues=[];for(const e of Object.keys(Mt))this.predefinedValues.push({value:Mt[e],name:this.translate.instant(Et.get(Mt[e]))})}ngOnInit(){super.ngOnInit()}configForm(){return this.entityDetailsConfigForm}prepareInputConfig(e){let t;return t=ae(e?.addToMetadata)?e.addToMetadata?en.METADATA:en.DATA:e?.fetchTo?e.fetchTo:en.DATA,{detailsList:ae(e?.detailsList)?e.detailsList:null,fetchTo:t}}onConfigurationSet(e){this.entityDetailsConfigForm=this.fb.group({detailsList:[e.detailsList,[O.required]],fetchTo:[e.fetchTo,[]]})}}e("EntityDetailsConfigComponent",Zn),Zn.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Zn,deps:[{token:P.Store},{token:Z.TranslateService},{token:R.FormBuilder}],target:t.ɵɵFactoryTarget.Component}),Zn.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:Zn,selector:"tb-enrichment-node-entity-details-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="entityDetailsConfigForm">\n  <tb-string-items-list [predefinedValues]="predefinedValues"\n                        class="mat-block" required\n                        [label]="\'tb.rulenode.select-details\' | translate"\n                        [placeholder]="\'tb.rulenode.add-detail\' | translate"\n                        [requiredText]="\'tb.rulenode.entity-details-list-empty\' | translate"\n                        formControlName="detailsList">\n    <mat-icon matSuffix class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon"\n              color="primary"\n              matTooltip="{{ \'tb.rulenode.chip-help\' | translate: { inputName: \'tb.rulenode.detail\' | translate } }}">\n      help\n    </mat-icon>\n  </tb-string-items-list>\n  <tb-msg-metadata-chip\n    [labelText]="\'tb.rulenode.add-selected-details-to\' | translate"\n    formControlName="fetchTo">\n  </tb-msg-metadata-chip>\n</section>\n',styles:[':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n'],dependencies:[{kind:"component",type:et.StringItemsListComponent,selector:"tb-string-items-list",inputs:["required","disabled","label","placeholder","hint","requiredText","floatLabel","appearance","editable","subscriptSizing","predefinedValues"]},{kind:"component",type:ue.MatIcon,selector:"mat-icon",inputs:["color","inline","svgIcon","fontSet","fontIcon"],exportAs:["matIcon"]},{kind:"directive",type:Y.MatSuffix,selector:"[matSuffix], [matIconSuffix], [matTextSuffix]",inputs:["matTextSuffix"]},{kind:"directive",type:ce.MatTooltip,selector:"[matTooltip]",exportAs:["matTooltip"]},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"component",type:Kn,selector:"tb-msg-metadata-chip",inputs:["labelText","translation"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Zn,decorators:[{type:n,args:[{selector:"tb-enrichment-node-entity-details-config",template:'<section [formGroup]="entityDetailsConfigForm">\n  <tb-string-items-list [predefinedValues]="predefinedValues"\n                        class="mat-block" required\n                        [label]="\'tb.rulenode.select-details\' | translate"\n                        [placeholder]="\'tb.rulenode.add-detail\' | translate"\n                        [requiredText]="\'tb.rulenode.entity-details-list-empty\' | translate"\n                        formControlName="detailsList">\n    <mat-icon matSuffix class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon"\n              color="primary"\n              matTooltip="{{ \'tb.rulenode.chip-help\' | translate: { inputName: \'tb.rulenode.detail\' | translate } }}">\n      help\n    </mat-icon>\n  </tb-string-items-list>\n  <tb-msg-metadata-chip\n    [labelText]="\'tb.rulenode.add-selected-details-to\' | translate"\n    formControlName="fetchTo">\n  </tb-msg-metadata-chip>\n</section>\n',styles:[':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n']}]}],ctorParameters:function(){return[{type:P.Store},{type:Z.TranslateService},{type:R.FormBuilder}]}});class Xn extends f{constructor(e,t,n){super(e),this.store=e,this.translate=t,this.fb=n,this.separatorKeysCodes=[ge,ye,xe],this.aggregationTypes=E,this.aggregations=Object.values(E),this.aggregationTypesTranslations=G,this.fetchMode=Gt,this.samplingOrders=Object.values(Vt),this.samplingOrdersTranslate=_t,this.timeUnits=Object.values(Nt),this.timeUnitsTranslationMap=St,this.deduplicationStrategiesHintTranslations=wt,this.headerOptions=[],this.timeUnitMap={[Nt.MILLISECONDS]:1,[Nt.SECONDS]:1e3,[Nt.MINUTES]:6e4,[Nt.HOURS]:36e5,[Nt.DAYS]:864e5},this.intervalValidator=()=>e=>e.get("startInterval").value*this.timeUnitMap[e.get("startIntervalTimeUnit").value]<=e.get("endInterval").value*this.timeUnitMap[e.get("endIntervalTimeUnit").value]?{intervalError:!0}:null;for(const e of Dt.keys())this.headerOptions.push({value:e,name:this.translate.instant(Dt.get(e))})}configForm(){return this.getTelemetryFromDatabaseConfigForm}onConfigurationSet(e){this.getTelemetryFromDatabaseConfigForm=this.fb.group({latestTsKeyNames:[e.latestTsKeyNames,[O.required]],aggregation:[e.aggregation,[O.required]],fetchMode:[e.fetchMode,[O.required]],orderBy:[e.orderBy,[]],limit:[e.limit,[]],useMetadataIntervalPatterns:[e.useMetadataIntervalPatterns,[]],interval:this.fb.group({startInterval:[e.interval.startInterval,[]],startIntervalTimeUnit:[e.interval.startIntervalTimeUnit,[]],endInterval:[e.interval.endInterval,[]],endIntervalTimeUnit:[e.interval.endIntervalTimeUnit,[]]}),startIntervalPattern:[e.startIntervalPattern,[]],endIntervalPattern:[e.endIntervalPattern,[]]})}validatorTriggers(){return["fetchMode","useMetadataIntervalPatterns"]}toggleChange(e){this.getTelemetryFromDatabaseConfigForm.get("fetchMode").patchValue(e,{emitEvent:!0})}prepareOutputConfig(e){return e.startInterval=e.interval.startInterval,e.startIntervalTimeUnit=e.interval.startIntervalTimeUnit,e.endInterval=e.interval.endInterval,e.endIntervalTimeUnit=e.interval.endIntervalTimeUnit,delete e.interval,le(e)}prepareInputConfig(e){return se(e)&&(e.interval={startInterval:e.startInterval,startIntervalTimeUnit:e.startIntervalTimeUnit,endInterval:e.endInterval,endIntervalTimeUnit:e.endIntervalTimeUnit}),{latestTsKeyNames:ae(e?.latestTsKeyNames)?e.latestTsKeyNames:null,aggregation:ae(e?.aggregation)?e.aggregation:E.NONE,fetchMode:ae(e?.fetchMode)?e.fetchMode:Gt.FIRST,orderBy:ae(e?.orderBy)?e.orderBy:Vt.ASC,limit:ae(e?.limit)?e.limit:1e3,useMetadataIntervalPatterns:!!ae(e?.useMetadataIntervalPatterns)&&e.useMetadataIntervalPatterns,interval:{startInterval:ae(e?.interval?.startInterval)?e.interval.startInterval:2,startIntervalTimeUnit:ae(e?.interval?.startIntervalTimeUnit)?e.interval.startIntervalTimeUnit:Nt.MINUTES,endInterval:ae(e?.interval?.endInterval)?e.interval.endInterval:1,endIntervalTimeUnit:ae(e?.interval?.endIntervalTimeUnit)?e.interval.endIntervalTimeUnit:Nt.MINUTES},startIntervalPattern:ae(e?.startIntervalPattern)?e.startIntervalPattern:null,endIntervalPattern:ae(e?.endIntervalPattern)?e.endIntervalPattern:null}}updateValidators(e){const t=this.getTelemetryFromDatabaseConfigForm.get("fetchMode").value,n=this.getTelemetryFromDatabaseConfigForm.get("useMetadataIntervalPatterns").value;t&&t===Gt.ALL?(this.getTelemetryFromDatabaseConfigForm.get("aggregation").setValidators([O.required]),this.getTelemetryFromDatabaseConfigForm.get("orderBy").setValidators([O.required]),this.getTelemetryFromDatabaseConfigForm.get("limit").setValidators([O.required,O.min(2),O.max(1e3)])):(this.getTelemetryFromDatabaseConfigForm.get("aggregation").setValidators([]),this.getTelemetryFromDatabaseConfigForm.get("orderBy").setValidators([]),this.getTelemetryFromDatabaseConfigForm.get("limit").setValidators([])),n?(this.getTelemetryFromDatabaseConfigForm.get("interval.startInterval").setValidators([]),this.getTelemetryFromDatabaseConfigForm.get("interval.startIntervalTimeUnit").setValidators([]),this.getTelemetryFromDatabaseConfigForm.get("interval.endInterval").setValidators([]),this.getTelemetryFromDatabaseConfigForm.get("interval.endIntervalTimeUnit").setValidators([]),this.getTelemetryFromDatabaseConfigForm.get("interval").setValidators([]),this.getTelemetryFromDatabaseConfigForm.get("startIntervalPattern").setValidators([O.required,O.pattern(/(?:.|\s)*\S(&:.|\s)*/)]),this.getTelemetryFromDatabaseConfigForm.get("endIntervalPattern").setValidators([O.required,O.pattern(/(?:.|\s)*\S(&:.|\s)*/)])):(this.getTelemetryFromDatabaseConfigForm.get("interval.startInterval").setValidators([O.required,O.min(1),O.max(2147483647)]),this.getTelemetryFromDatabaseConfigForm.get("interval.startIntervalTimeUnit").setValidators([O.required]),this.getTelemetryFromDatabaseConfigForm.get("interval.endInterval").setValidators([O.required,O.min(1),O.max(2147483647)]),this.getTelemetryFromDatabaseConfigForm.get("interval.endIntervalTimeUnit").setValidators([O.required]),this.getTelemetryFromDatabaseConfigForm.get("interval").setValidators([this.intervalValidator()]),this.getTelemetryFromDatabaseConfigForm.get("startIntervalPattern").setValidators([]),this.getTelemetryFromDatabaseConfigForm.get("endIntervalPattern").setValidators([])),this.getTelemetryFromDatabaseConfigForm.get("aggregation").updateValueAndValidity({emitEvent:e}),this.getTelemetryFromDatabaseConfigForm.get("orderBy").updateValueAndValidity({emitEvent:e}),this.getTelemetryFromDatabaseConfigForm.get("limit").updateValueAndValidity({emitEvent:e}),this.getTelemetryFromDatabaseConfigForm.get("interval.startInterval").updateValueAndValidity({emitEvent:e}),this.getTelemetryFromDatabaseConfigForm.get("interval.startIntervalTimeUnit").updateValueAndValidity({emitEvent:e}),this.getTelemetryFromDatabaseConfigForm.get("interval.endInterval").updateValueAndValidity({emitEvent:e}),this.getTelemetryFromDatabaseConfigForm.get("interval.endIntervalTimeUnit").updateValueAndValidity({emitEvent:e}),this.getTelemetryFromDatabaseConfigForm.get("interval").updateValueAndValidity({emitEvent:e}),this.getTelemetryFromDatabaseConfigForm.get("startIntervalPattern").updateValueAndValidity({emitEvent:e}),this.getTelemetryFromDatabaseConfigForm.get("endIntervalPattern").updateValueAndValidity({emitEvent:e})}removeKey(e,t){const n=this.getTelemetryFromDatabaseConfigForm.get(t).value,r=n.indexOf(e);r>=0&&(n.splice(r,1),this.getTelemetryFromDatabaseConfigForm.get(t).setValue(n,{emitEvent:!0}))}clearChipGrid(){this.getTelemetryFromDatabaseConfigForm.get("latestTsKeyNames").patchValue([],{emitEvent:!0})}addKey(e,t){const n=e.input;let r=e.value;if((r||"").trim()){r=r.trim();let e=this.getTelemetryFromDatabaseConfigForm.get(t).value;e&&-1!==e.indexOf(r)||(e||(e=[]),e.push(r),this.getTelemetryFromDatabaseConfigForm.get(t).setValue(e,{emitEvent:!0}))}n&&(n.value="")}defaultPaddingEnable(){return this.getTelemetryFromDatabaseConfigForm.get("fetchMode").value===Gt.ALL&&this.getTelemetryFromDatabaseConfigForm.get("aggregation").value===E.NONE}}e("GetTelemetryFromDatabaseConfigComponent",Xn),Xn.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Xn,deps:[{token:P.Store},{token:Z.TranslateService},{token:R.FormBuilder}],target:t.ɵɵFactoryTarget.Component}),Xn.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:Xn,selector:"tb-enrichment-node-get-telemetry-from-database",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="getTelemetryFromDatabaseConfigForm" class="tb-form-panel no-padding no-border">\n  <tb-string-items-list class="mat-block" editable [placeholder]="\'tb.rulenode.add-timeseries-key\' | translate"\n                        subscriptSizing="dynamic" required\n                        [requiredText]="\'tb.rulenode.timeseries-keys-required\' | translate"\n                        [label]="\'tb.rulenode.timeseries-keys\' | translate" formControlName="latestTsKeyNames"\n                        [hint]="\'tb.rulenode.general-pattern-hint\' | translate">\n    <div matHintEnd class="see-example" tb-help-popup="{{\'rulenode/originator_telemetry_node_fields_templatization\'}}"\n         hintMode\n         tb-help-popup-placement="right"\n         trigger-style="letter-spacing:0.25px; font-size:12px"\n         [tb-help-popup-style]="{maxWidth: \'820px\'}"\n         trigger-text="{{ \'tb.key-val.see-examples\' | translate }}"></div>\n    <mat-icon matSuffix class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon" color="primary"\n              matTooltip="{{ \'tb.rulenode.chip-help\' | translate: { inputName: \'tb.rulenode.timeseries-key\' | translate } }}">help\n    </mat-icon>\n  </tb-string-items-list>\n  <div class="tb-form-panel stroked">\n    <div class="tb-form-panel-title" translate>tb.rulenode.fetch-interval</div>\n    <div tb-hint-tooltip-icon="{{ \'tb.rulenode.use-metadata-dynamic-interval-tooltip\' | translate }}"\n         class="tb-form-row no-border no-padding">\n      <mat-slide-toggle class="mat-slide" formControlName="useMetadataIntervalPatterns">\n        {{ \'tb.rulenode.use-metadata-dynamic-interval\' | translate }}\n      </mat-slide-toggle>\n    </div>\n    <div formGroupName="interval" fxLayout="column"\n         *ngIf="getTelemetryFromDatabaseConfigForm.get(\'useMetadataIntervalPatterns\').value === false; else intervalPattern">\n      <div fxLayout="column" fxLayout.gt-sm="row" fxLayoutGap="0" fxLayoutGap.gt-sm="16px">\n        <mat-form-field fxFlex="50" class="mat-block">\n          <mat-label>{{ \'tb.rulenode.interval-start\' | translate }}</mat-label>\n          <input type="number" step="1" min="1" max="2147483647" matInput formControlName="startInterval" required>\n          <mat-error *ngIf="getTelemetryFromDatabaseConfigForm.get(\'interval.startInterval\').hasError(\'required\')">\n            {{ \'tb.rulenode.start-interval-value-required\' | translate }}\n          </mat-error>\n          <mat-error *ngIf="getTelemetryFromDatabaseConfigForm.get(\'interval.startInterval\').hasError(\'min\')">\n            {{ \'tb.rulenode.time-value-range\' | translate }}\n          </mat-error>\n          <mat-error *ngIf="getTelemetryFromDatabaseConfigForm.get(\'interval.startInterval\').hasError(\'max\')">\n            {{ \'tb.rulenode.time-value-range\' | translate }}\n          </mat-error>\n        </mat-form-field>\n        <mat-form-field fxFlex="50" class="mat-block" hideRequiredMarker>\n          <mat-label>{{ \'tb.rulenode.time-unit\' | translate }}</mat-label>\n          <mat-select formControlName="startIntervalTimeUnit" required>\n            <mat-option *ngFor="let timeUnit of timeUnits" [value]="timeUnit">\n              {{ timeUnitsTranslationMap.get(timeUnit) | translate }}\n            </mat-option>\n          </mat-select>\n        </mat-form-field>\n      </div>\n      <div fxLayout="column" fxLayout.gt-sm="row" fxLayoutGap="0" fxLayoutGap.gt-sm="16px">\n        <mat-form-field fxFlex="50" class="mat-block">\n          <mat-label>{{ \'tb.rulenode.interval-end\' | translate }}</mat-label>\n          <input type="number" step="1" min="1" max="2147483647" matInput formControlName="endInterval" required>\n          <mat-error *ngIf="getTelemetryFromDatabaseConfigForm.get(\'interval.endInterval\').hasError(\'required\')">\n            {{ \'tb.rulenode.end-interval-value-required\' | translate }}\n          </mat-error>\n          <mat-error *ngIf="getTelemetryFromDatabaseConfigForm.get(\'interval.endInterval\').hasError(\'min\')">\n            {{ \'tb.rulenode.time-value-range\' | translate }}\n          </mat-error>\n          <mat-error *ngIf="getTelemetryFromDatabaseConfigForm.get(\'interval.endInterval\').hasError(\'max\')">\n            {{ \'tb.rulenode.time-value-range\' | translate }}\n          </mat-error>\n        </mat-form-field>\n        <mat-form-field fxFlex="50" class="mat-block" hideRequiredMarker>\n          <mat-label>{{ \'tb.rulenode.time-unit\' | translate }}</mat-label>\n          <mat-select formControlName="endIntervalTimeUnit" required>\n            <mat-option *ngFor="let timeUnit of timeUnits" [value]="timeUnit">\n              {{ timeUnitsTranslationMap.get(timeUnit) | translate }}\n            </mat-option>\n          </mat-select>\n        </mat-form-field>\n      </div>\n      <div class="description-block tb-primary-fill" [class.error]="getTelemetryFromDatabaseConfigForm.get(\'interval\').invalid">\n        <mat-icon class="description-icon">error_outline</mat-icon>\n        <div class="description-text">\n          <ng-container *ngIf="getTelemetryFromDatabaseConfigForm.get(\'interval\').valid; else invalidText">\n            {{ \'tb.rulenode.fetch-timeseries-from-to\' | translate:\n            {\n              startInterval: getTelemetryFromDatabaseConfigForm.get(\'interval.startInterval\').value,\n              endInterval: getTelemetryFromDatabaseConfigForm.get(\'interval.endInterval\').value,\n              startIntervalTimeUnit: getTelemetryFromDatabaseConfigForm.get(\'interval.startIntervalTimeUnit\').value.toLowerCase(),\n              endIntervalTimeUnit: getTelemetryFromDatabaseConfigForm.get(\'interval.endIntervalTimeUnit\').value.toLowerCase()\n            } }}\n          </ng-container>\n          <ng-template #invalidText>\n            {{ "tb.rulenode.fetch-timeseries-from-to-invalid" | translate }}\n          </ng-template>\n        </div>\n      </div>\n    </div>\n    <ng-template #intervalPattern>\n      <div fxLayout="column" class="input-block">\n        <mat-form-field fxFlex class="mat-block">\n          <mat-label>{{ \'tb.rulenode.start-interval\' | translate }}</mat-label>\n          <input matInput formControlName="startIntervalPattern" required>\n          <mat-error *ngIf="getTelemetryFromDatabaseConfigForm.get(\'startIntervalPattern\').hasError(\'required\') ||\n            getTelemetryFromDatabaseConfigForm.get(\'startIntervalPattern\').hasError(\'pattern\')">\n            {{ \'tb.rulenode.start-interval-required\' | translate }}\n          </mat-error>\n        </mat-form-field>\n        <mat-form-field fxFlex class="mat-block">\n          <mat-label>{{ \'tb.rulenode.end-interval\' | translate }}</mat-label>\n          <input matInput formControlName="endIntervalPattern" required>\n          <mat-error *ngIf="getTelemetryFromDatabaseConfigForm.get(\'endIntervalPattern\').hasError(\'required\') ||\n          getTelemetryFromDatabaseConfigForm.get(\'endIntervalPattern\').hasError(\'pattern\')">\n            {{ \'tb.rulenode.end-interval-required\' | translate }}\n          </mat-error>\n        </mat-form-field>\n        <tb-example-hint [hintText]="\'tb.rulenode.metadata-dynamic-interval-hint\' | translate"\n                         popupHelpLink="rulenode/originator_telemetry_node_fields_templatization">\n        </tb-example-hint>\n      </div>\n    </ng-template>\n  </div>\n  <div class="tb-form-panel stroked">\n    <div class="tb-form-panel-title" translate>tb.rulenode.fetch-strategy</div>\n    <div class="tb-form-panel no-border no-padding item-center">\n      <div class="fetch-mod-toggle">\n        <tb-toggle-select formControlName="fetchMode" appearance="fill">\n          <tb-toggle-option *ngFor="let data of headerOptions" [value]="data.value">\n            {{ data.name }}\n          </tb-toggle-option>\n        </tb-toggle-select>\n      </div>\n      <div class="tb-form-hint tb-primary-fill hint-container">\n        {{ deduplicationStrategiesHintTranslations.get(getTelemetryFromDatabaseConfigForm.get(\'fetchMode\').value) | translate }}\n      </div>\n    </div>\n    <div *ngIf="getTelemetryFromDatabaseConfigForm.get(\'fetchMode\').value === fetchMode.ALL">\n      <mat-form-field class="mat-block" hideRequiredMarker\n                      [subscriptSizing]="defaultPaddingEnable() ? \'fixed\' : \'dynamic\'">\n        <mat-label>{{ \'aggregation.function\' | translate }}</mat-label>\n        <mat-select formControlName="aggregation" required>\n          <mat-option *ngFor="let aggregation of aggregations" [value]="aggregation">\n            {{ aggregationTypesTranslations.get(aggregationTypes[aggregation]) | translate }}\n          </mat-option>\n        </mat-select>\n      </mat-form-field>\n      <div *ngIf="getTelemetryFromDatabaseConfigForm.get(\'aggregation\').value === aggregationTypes.NONE">\n        <mat-form-field class="mat-block" hideRequiredMarker>\n          <mat-label> {{ "tb.rulenode.order-by-timestamp" | translate }} </mat-label>\n          <mat-select formControlName="orderBy" required>\n            <mat-option *ngFor="let order of samplingOrders" [value]="order">\n              {{ samplingOrdersTranslate.get(order) | translate }}\n            </mat-option>\n          </mat-select>\n        </mat-form-field>\n        <mat-form-field class="mat-block">\n          <mat-label>{{ "tb.rulenode.limit" | translate }}</mat-label>\n          <input type="number" min="2" max="1000" step="1" matInput formControlName="limit" required>\n          <mat-hint>{{ "tb.rulenode.limit-hint" | translate }}</mat-hint>\n          <mat-error *ngIf="getTelemetryFromDatabaseConfigForm.get(\'limit\').hasError(\'required\')">\n            {{ \'tb.rulenode.limit-required\' | translate }}\n          </mat-error>\n          <mat-error *ngIf="getTelemetryFromDatabaseConfigForm.get(\'limit\').hasError(\'min\')">\n            {{ \'tb.rulenode.limit-range\' | translate }}\n          </mat-error>\n          <mat-error *ngIf="getTelemetryFromDatabaseConfigForm.get(\'limit\').hasError(\'max\')">\n            {{ \'tb.rulenode.limit-range\' | translate }}\n          </mat-error>\n        </mat-form-field>\n      </div>\n    </div>\n  </div>\n</section>\n',styles:[":host .see-example{display:inline-block}:host .description-block{display:flex;align-items:center;border-radius:6px;border:1px solid #EAEAEA}:host .description-block .description-icon{font-size:24px;height:24px;min-height:24px;width:24px;min-width:24px;line-height:24px;color:#d9d9d9;margin:4px}:host .description-block .description-text{font-size:12px;line-height:16px;letter-spacing:.25px;margin:6px}:host .description-block.error{color:var(--mdc-theme-error, #f44336)}:host .description-block.error .description-icon{color:var(--mdc-theme-error, #f44336)}:host .item-center{align-items:center}:host .item-center .fetch-mod-toggle{width:100%}:host .hint-container{width:100%}\n",':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n'],dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:$e.HelpPopupComponent,selector:"[tb-help-popup], [tb-help-popup-content]",inputs:["tb-help-popup","tb-help-popup-content","trigger-text","trigger-style","tb-help-popup-placement","tb-help-popup-style","hintMode"]},{kind:"component",type:et.StringItemsListComponent,selector:"tb-string-items-list",inputs:["required","disabled","label","placeholder","hint","requiredText","floatLabel","appearance","editable","subscriptSizing","predefinedValues"]},{kind:"component",type:ue.MatIcon,selector:"mat-icon",inputs:["color","inline","svgIcon","fontSet","fontIcon"],exportAs:["matIcon"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatHint,selector:"mat-hint",inputs:["align","id"]},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"directive",type:Y.MatSuffix,selector:"[matSuffix], [matIconSuffix], [matTextSuffix]",inputs:["matTextSuffix"]},{kind:"component",type:X.MatSelect,selector:"mat-select",inputs:["disabled","disableRipple","tabIndex","hideSingleSelectionIndicator"],exportAs:["matSelect"]},{kind:"component",type:ee.MatOption,selector:"mat-option",exportAs:["matOption"]},{kind:"directive",type:ce.MatTooltip,selector:"[matTooltip]",exportAs:["matTooltip"]},{kind:"component",type:te.MatSlideToggle,selector:"mat-slide-toggle",inputs:["disabled","disableRipple","color","tabIndex"],exportAs:["matSlideToggle"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:W.DefaultLayoutGapDirective,selector:"  [fxLayoutGap], [fxLayoutGap.xs], [fxLayoutGap.sm], [fxLayoutGap.md],  [fxLayoutGap.lg], [fxLayoutGap.xl], [fxLayoutGap.lt-sm], [fxLayoutGap.lt-md],  [fxLayoutGap.lt-lg], [fxLayoutGap.lt-xl], [fxLayoutGap.gt-xs], [fxLayoutGap.gt-sm],  [fxLayoutGap.gt-md], [fxLayoutGap.gt-lg]",inputs:["fxLayoutGap","fxLayoutGap.xs","fxLayoutGap.sm","fxLayoutGap.md","fxLayoutGap.lg","fxLayoutGap.xl","fxLayoutGap.lt-sm","fxLayoutGap.lt-md","fxLayoutGap.lt-lg","fxLayoutGap.lt-xl","fxLayoutGap.gt-xs","fxLayoutGap.gt-sm","fxLayoutGap.gt-md","fxLayoutGap.gt-lg"]},{kind:"directive",type:W.DefaultFlexDirective,selector:"  [fxFlex], [fxFlex.xs], [fxFlex.sm], [fxFlex.md],  [fxFlex.lg], [fxFlex.xl], [fxFlex.lt-sm], [fxFlex.lt-md],  [fxFlex.lt-lg], [fxFlex.lt-xl], [fxFlex.gt-xs], [fxFlex.gt-sm],  [fxFlex.gt-md], [fxFlex.gt-lg]",inputs:["fxFlex","fxFlex.xs","fxFlex.sm","fxFlex.md","fxFlex.lg","fxFlex.xl","fxFlex.lt-sm","fxFlex.lt-md","fxFlex.lt-lg","fxFlex.lt-xl","fxFlex.gt-xs","fxFlex.gt-sm","fxFlex.gt-md","fxFlex.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NumberValueAccessor,selector:"input[type=number][formControlName],input[type=number][formControl],input[type=number][ngModel]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.MinValidator,selector:"input[type=number][min][formControlName],input[type=number][min][formControl],input[type=number][min][ngModel]",inputs:["min"]},{kind:"directive",type:R.MaxValidator,selector:"input[type=number][max][formControlName],input[type=number][max][formControl],input[type=number][max][ngModel]",inputs:["max"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:R.FormGroupName,selector:"[formGroupName]",inputs:["formGroupName"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"directive",type:Fe.ToggleOption,selector:"tb-toggle-option",inputs:["value"]},{kind:"component",type:ke.ToggleSelectComponent,selector:"tb-toggle-select",inputs:["disabled","selectMediaBreakpoint","appearance","disablePagination"]},{kind:"component",type:ne.HintTooltipIconComponent,selector:"[tb-hint-tooltip-icon]",inputs:["tb-hint-tooltip-icon","tooltipPosition","hintIcon"]},{kind:"component",type:An,selector:"tb-example-hint",inputs:["hintText","popupHelpLink","textAlign"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Xn,decorators:[{type:n,args:[{selector:"tb-enrichment-node-get-telemetry-from-database",template:'<section [formGroup]="getTelemetryFromDatabaseConfigForm" class="tb-form-panel no-padding no-border">\n  <tb-string-items-list class="mat-block" editable [placeholder]="\'tb.rulenode.add-timeseries-key\' | translate"\n                        subscriptSizing="dynamic" required\n                        [requiredText]="\'tb.rulenode.timeseries-keys-required\' | translate"\n                        [label]="\'tb.rulenode.timeseries-keys\' | translate" formControlName="latestTsKeyNames"\n                        [hint]="\'tb.rulenode.general-pattern-hint\' | translate">\n    <div matHintEnd class="see-example" tb-help-popup="{{\'rulenode/originator_telemetry_node_fields_templatization\'}}"\n         hintMode\n         tb-help-popup-placement="right"\n         trigger-style="letter-spacing:0.25px; font-size:12px"\n         [tb-help-popup-style]="{maxWidth: \'820px\'}"\n         trigger-text="{{ \'tb.key-val.see-examples\' | translate }}"></div>\n    <mat-icon matSuffix class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon" color="primary"\n              matTooltip="{{ \'tb.rulenode.chip-help\' | translate: { inputName: \'tb.rulenode.timeseries-key\' | translate } }}">help\n    </mat-icon>\n  </tb-string-items-list>\n  <div class="tb-form-panel stroked">\n    <div class="tb-form-panel-title" translate>tb.rulenode.fetch-interval</div>\n    <div tb-hint-tooltip-icon="{{ \'tb.rulenode.use-metadata-dynamic-interval-tooltip\' | translate }}"\n         class="tb-form-row no-border no-padding">\n      <mat-slide-toggle class="mat-slide" formControlName="useMetadataIntervalPatterns">\n        {{ \'tb.rulenode.use-metadata-dynamic-interval\' | translate }}\n      </mat-slide-toggle>\n    </div>\n    <div formGroupName="interval" fxLayout="column"\n         *ngIf="getTelemetryFromDatabaseConfigForm.get(\'useMetadataIntervalPatterns\').value === false; else intervalPattern">\n      <div fxLayout="column" fxLayout.gt-sm="row" fxLayoutGap="0" fxLayoutGap.gt-sm="16px">\n        <mat-form-field fxFlex="50" class="mat-block">\n          <mat-label>{{ \'tb.rulenode.interval-start\' | translate }}</mat-label>\n          <input type="number" step="1" min="1" max="2147483647" matInput formControlName="startInterval" required>\n          <mat-error *ngIf="getTelemetryFromDatabaseConfigForm.get(\'interval.startInterval\').hasError(\'required\')">\n            {{ \'tb.rulenode.start-interval-value-required\' | translate }}\n          </mat-error>\n          <mat-error *ngIf="getTelemetryFromDatabaseConfigForm.get(\'interval.startInterval\').hasError(\'min\')">\n            {{ \'tb.rulenode.time-value-range\' | translate }}\n          </mat-error>\n          <mat-error *ngIf="getTelemetryFromDatabaseConfigForm.get(\'interval.startInterval\').hasError(\'max\')">\n            {{ \'tb.rulenode.time-value-range\' | translate }}\n          </mat-error>\n        </mat-form-field>\n        <mat-form-field fxFlex="50" class="mat-block" hideRequiredMarker>\n          <mat-label>{{ \'tb.rulenode.time-unit\' | translate }}</mat-label>\n          <mat-select formControlName="startIntervalTimeUnit" required>\n            <mat-option *ngFor="let timeUnit of timeUnits" [value]="timeUnit">\n              {{ timeUnitsTranslationMap.get(timeUnit) | translate }}\n            </mat-option>\n          </mat-select>\n        </mat-form-field>\n      </div>\n      <div fxLayout="column" fxLayout.gt-sm="row" fxLayoutGap="0" fxLayoutGap.gt-sm="16px">\n        <mat-form-field fxFlex="50" class="mat-block">\n          <mat-label>{{ \'tb.rulenode.interval-end\' | translate }}</mat-label>\n          <input type="number" step="1" min="1" max="2147483647" matInput formControlName="endInterval" required>\n          <mat-error *ngIf="getTelemetryFromDatabaseConfigForm.get(\'interval.endInterval\').hasError(\'required\')">\n            {{ \'tb.rulenode.end-interval-value-required\' | translate }}\n          </mat-error>\n          <mat-error *ngIf="getTelemetryFromDatabaseConfigForm.get(\'interval.endInterval\').hasError(\'min\')">\n            {{ \'tb.rulenode.time-value-range\' | translate }}\n          </mat-error>\n          <mat-error *ngIf="getTelemetryFromDatabaseConfigForm.get(\'interval.endInterval\').hasError(\'max\')">\n            {{ \'tb.rulenode.time-value-range\' | translate }}\n          </mat-error>\n        </mat-form-field>\n        <mat-form-field fxFlex="50" class="mat-block" hideRequiredMarker>\n          <mat-label>{{ \'tb.rulenode.time-unit\' | translate }}</mat-label>\n          <mat-select formControlName="endIntervalTimeUnit" required>\n            <mat-option *ngFor="let timeUnit of timeUnits" [value]="timeUnit">\n              {{ timeUnitsTranslationMap.get(timeUnit) | translate }}\n            </mat-option>\n          </mat-select>\n        </mat-form-field>\n      </div>\n      <div class="description-block tb-primary-fill" [class.error]="getTelemetryFromDatabaseConfigForm.get(\'interval\').invalid">\n        <mat-icon class="description-icon">error_outline</mat-icon>\n        <div class="description-text">\n          <ng-container *ngIf="getTelemetryFromDatabaseConfigForm.get(\'interval\').valid; else invalidText">\n            {{ \'tb.rulenode.fetch-timeseries-from-to\' | translate:\n            {\n              startInterval: getTelemetryFromDatabaseConfigForm.get(\'interval.startInterval\').value,\n              endInterval: getTelemetryFromDatabaseConfigForm.get(\'interval.endInterval\').value,\n              startIntervalTimeUnit: getTelemetryFromDatabaseConfigForm.get(\'interval.startIntervalTimeUnit\').value.toLowerCase(),\n              endIntervalTimeUnit: getTelemetryFromDatabaseConfigForm.get(\'interval.endIntervalTimeUnit\').value.toLowerCase()\n            } }}\n          </ng-container>\n          <ng-template #invalidText>\n            {{ "tb.rulenode.fetch-timeseries-from-to-invalid" | translate }}\n          </ng-template>\n        </div>\n      </div>\n    </div>\n    <ng-template #intervalPattern>\n      <div fxLayout="column" class="input-block">\n        <mat-form-field fxFlex class="mat-block">\n          <mat-label>{{ \'tb.rulenode.start-interval\' | translate }}</mat-label>\n          <input matInput formControlName="startIntervalPattern" required>\n          <mat-error *ngIf="getTelemetryFromDatabaseConfigForm.get(\'startIntervalPattern\').hasError(\'required\') ||\n            getTelemetryFromDatabaseConfigForm.get(\'startIntervalPattern\').hasError(\'pattern\')">\n            {{ \'tb.rulenode.start-interval-required\' | translate }}\n          </mat-error>\n        </mat-form-field>\n        <mat-form-field fxFlex class="mat-block">\n          <mat-label>{{ \'tb.rulenode.end-interval\' | translate }}</mat-label>\n          <input matInput formControlName="endIntervalPattern" required>\n          <mat-error *ngIf="getTelemetryFromDatabaseConfigForm.get(\'endIntervalPattern\').hasError(\'required\') ||\n          getTelemetryFromDatabaseConfigForm.get(\'endIntervalPattern\').hasError(\'pattern\')">\n            {{ \'tb.rulenode.end-interval-required\' | translate }}\n          </mat-error>\n        </mat-form-field>\n        <tb-example-hint [hintText]="\'tb.rulenode.metadata-dynamic-interval-hint\' | translate"\n                         popupHelpLink="rulenode/originator_telemetry_node_fields_templatization">\n        </tb-example-hint>\n      </div>\n    </ng-template>\n  </div>\n  <div class="tb-form-panel stroked">\n    <div class="tb-form-panel-title" translate>tb.rulenode.fetch-strategy</div>\n    <div class="tb-form-panel no-border no-padding item-center">\n      <div class="fetch-mod-toggle">\n        <tb-toggle-select formControlName="fetchMode" appearance="fill">\n          <tb-toggle-option *ngFor="let data of headerOptions" [value]="data.value">\n            {{ data.name }}\n          </tb-toggle-option>\n        </tb-toggle-select>\n      </div>\n      <div class="tb-form-hint tb-primary-fill hint-container">\n        {{ deduplicationStrategiesHintTranslations.get(getTelemetryFromDatabaseConfigForm.get(\'fetchMode\').value) | translate }}\n      </div>\n    </div>\n    <div *ngIf="getTelemetryFromDatabaseConfigForm.get(\'fetchMode\').value === fetchMode.ALL">\n      <mat-form-field class="mat-block" hideRequiredMarker\n                      [subscriptSizing]="defaultPaddingEnable() ? \'fixed\' : \'dynamic\'">\n        <mat-label>{{ \'aggregation.function\' | translate }}</mat-label>\n        <mat-select formControlName="aggregation" required>\n          <mat-option *ngFor="let aggregation of aggregations" [value]="aggregation">\n            {{ aggregationTypesTranslations.get(aggregationTypes[aggregation]) | translate }}\n          </mat-option>\n        </mat-select>\n      </mat-form-field>\n      <div *ngIf="getTelemetryFromDatabaseConfigForm.get(\'aggregation\').value === aggregationTypes.NONE">\n        <mat-form-field class="mat-block" hideRequiredMarker>\n          <mat-label> {{ "tb.rulenode.order-by-timestamp" | translate }} </mat-label>\n          <mat-select formControlName="orderBy" required>\n            <mat-option *ngFor="let order of samplingOrders" [value]="order">\n              {{ samplingOrdersTranslate.get(order) | translate }}\n            </mat-option>\n          </mat-select>\n        </mat-form-field>\n        <mat-form-field class="mat-block">\n          <mat-label>{{ "tb.rulenode.limit" | translate }}</mat-label>\n          <input type="number" min="2" max="1000" step="1" matInput formControlName="limit" required>\n          <mat-hint>{{ "tb.rulenode.limit-hint" | translate }}</mat-hint>\n          <mat-error *ngIf="getTelemetryFromDatabaseConfigForm.get(\'limit\').hasError(\'required\')">\n            {{ \'tb.rulenode.limit-required\' | translate }}\n          </mat-error>\n          <mat-error *ngIf="getTelemetryFromDatabaseConfigForm.get(\'limit\').hasError(\'min\')">\n            {{ \'tb.rulenode.limit-range\' | translate }}\n          </mat-error>\n          <mat-error *ngIf="getTelemetryFromDatabaseConfigForm.get(\'limit\').hasError(\'max\')">\n            {{ \'tb.rulenode.limit-range\' | translate }}\n          </mat-error>\n        </mat-form-field>\n      </div>\n    </div>\n  </div>\n</section>\n',styles:[":host .see-example{display:inline-block}:host .description-block{display:flex;align-items:center;border-radius:6px;border:1px solid #EAEAEA}:host .description-block .description-icon{font-size:24px;height:24px;min-height:24px;width:24px;min-width:24px;line-height:24px;color:#d9d9d9;margin:4px}:host .description-block .description-text{font-size:12px;line-height:16px;letter-spacing:.25px;margin:6px}:host .description-block.error{color:var(--mdc-theme-error, #f44336)}:host .description-block.error .description-icon{color:var(--mdc-theme-error, #f44336)}:host .item-center{align-items:center}:host .item-center .fetch-mod-toggle{width:100%}:host .hint-container{width:100%}\n",':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n']}]}],ctorParameters:function(){return[{type:P.Store},{type:Z.TranslateService},{type:R.FormBuilder}]}});class er extends f{constructor(e,t,n){super(e),this.store=e,this.translate=t,this.fb=n}configForm(){return this.originatorAttributesConfigForm}onConfigurationSet(e){this.originatorAttributesConfigForm=this.fb.group({tellFailureIfAbsent:[e.tellFailureIfAbsent,[]],fetchTo:[e.fetchTo,[]],attributesControl:[e.attributesControl,[]]})}prepareInputConfig(e){return se(e)&&(e.attributesControl={clientAttributeNames:ae(e?.clientAttributeNames)?e.clientAttributeNames:[],latestTsKeyNames:ae(e?.latestTsKeyNames)?e.latestTsKeyNames:[],serverAttributeNames:ae(e?.serverAttributeNames)?e.serverAttributeNames:[],sharedAttributeNames:ae(e?.sharedAttributeNames)?e.sharedAttributeNames:[],getLatestValueWithTs:!!ae(e?.getLatestValueWithTs)&&e.getLatestValueWithTs}),{fetchTo:ae(e?.fetchTo)?e.fetchTo:en.METADATA,tellFailureIfAbsent:!!ae(e?.tellFailureIfAbsent)&&e.tellFailureIfAbsent,attributesControl:ae(e?.attributesControl)?e.attributesControl:null}}prepareOutputConfig(e){for(const t of Object.keys(e.attributesControl))e[t]=e.attributesControl[t];return delete e.attributesControl,e}}e("OriginatorAttributesConfigComponent",er),er.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:er,deps:[{token:P.Store},{token:Z.TranslateService},{token:R.FormBuilder}],target:t.ɵɵFactoryTarget.Component}),er.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:er,selector:"tb-enrichment-node-originator-attributes-config",usesInheritance:!0,ngImport:t,template:'<section class="tb-form-panel no-padding no-border" [formGroup]="originatorAttributesConfigForm">\n  <div class="tb-form-panel stroked">\n    <div class="tb-form-row no-padding no-border space-between">\n      <div class="tb-form-panel-title tb-required" translate>tb.rulenode.originator-attributes</div>\n      <div class="tb-form-panel-hint tb-error" translate\n           [hidden]="!(originatorAttributesConfigForm.get(\'attributesControl\').touched &&\n                        originatorAttributesConfigForm.get(\'attributesControl\').hasError(\'atLeastOneRequired\'))">\n        tb.rulenode.at-least-one-field-required\n      </div>\n    </div>\n    <tb-select-attributes formControlName="attributesControl"\n                          popupHelpLink="rulenode/originator_attributes_node_fields_templatization">\n    </tb-select-attributes>\n    <tb-msg-metadata-chip [labelText]="\'tb.rulenode.add-originator-attributes-to\' | translate"\n                          formControlName="fetchTo">\n    </tb-msg-metadata-chip>\n  </div>\n  <div tb-hint-tooltip-icon="{{ \'tb.rulenode.tell-failure-tooltip\' | translate }}" class="tb-form-row same-padding">\n    <mat-slide-toggle class="mat-slide margin" formControlName="tellFailureIfAbsent">\n      {{ \'tb.rulenode.tell-failure\' | translate }}\n    </mat-slide-toggle>\n  </div>\n</section>\n',styles:[':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n'],dependencies:[{kind:"component",type:te.MatSlideToggle,selector:"mat-slide-toggle",inputs:["disabled","disableRipple","color","tabIndex"],exportAs:["matSlideToggle"]},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"component",type:ne.HintTooltipIconComponent,selector:"[tb-hint-tooltip-icon]",inputs:["tb-hint-tooltip-icon","tooltipPosition","hintIcon"]},{kind:"component",type:Kn,selector:"tb-msg-metadata-chip",inputs:["labelText","translation"]},{kind:"component",type:Hn,selector:"tb-select-attributes",inputs:["popupHelpLink"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:er,decorators:[{type:n,args:[{selector:"tb-enrichment-node-originator-attributes-config",template:'<section class="tb-form-panel no-padding no-border" [formGroup]="originatorAttributesConfigForm">\n  <div class="tb-form-panel stroked">\n    <div class="tb-form-row no-padding no-border space-between">\n      <div class="tb-form-panel-title tb-required" translate>tb.rulenode.originator-attributes</div>\n      <div class="tb-form-panel-hint tb-error" translate\n           [hidden]="!(originatorAttributesConfigForm.get(\'attributesControl\').touched &&\n                        originatorAttributesConfigForm.get(\'attributesControl\').hasError(\'atLeastOneRequired\'))">\n        tb.rulenode.at-least-one-field-required\n      </div>\n    </div>\n    <tb-select-attributes formControlName="attributesControl"\n                          popupHelpLink="rulenode/originator_attributes_node_fields_templatization">\n    </tb-select-attributes>\n    <tb-msg-metadata-chip [labelText]="\'tb.rulenode.add-originator-attributes-to\' | translate"\n                          formControlName="fetchTo">\n    </tb-msg-metadata-chip>\n  </div>\n  <div tb-hint-tooltip-icon="{{ \'tb.rulenode.tell-failure-tooltip\' | translate }}" class="tb-form-row same-padding">\n    <mat-slide-toggle class="mat-slide margin" formControlName="tellFailureIfAbsent">\n      {{ \'tb.rulenode.tell-failure\' | translate }}\n    </mat-slide-toggle>\n  </div>\n</section>\n',styles:[':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n']}]}],ctorParameters:function(){return[{type:P.Store},{type:Z.TranslateService},{type:R.FormBuilder}]}});class tr extends f{constructor(e,t,n){super(e),this.store=e,this.fb=t,this.translate=n,this.originatorFields=[];for(const e of kt)this.originatorFields.push({value:e.value,name:this.translate.instant(e.name)})}configForm(){return this.originatorFieldsConfigForm}prepareOutputConfig(e){return le(e)}prepareInputConfig(e){return{dataMapping:ae(e?.dataMapping)?e.dataMapping:null,ignoreNullStrings:ae(e?.ignoreNullStrings)?e.ignoreNullStrings:null,fetchTo:ae(e?.fetchTo)?e.fetchTo:en.METADATA}}onConfigurationSet(e){this.originatorFieldsConfigForm=this.fb.group({dataMapping:[e.dataMapping,[O.required]],ignoreNullStrings:[e.ignoreNullStrings,[]],fetchTo:[e.fetchTo,[]]})}}e("OriginatorFieldsConfigComponent",tr),tr.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:tr,deps:[{token:P.Store},{token:R.FormBuilder},{token:Z.TranslateService}],target:t.ɵɵFactoryTarget.Component}),tr.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:tr,selector:"tb-enrichment-node-originator-fields-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="originatorFieldsConfigForm" class="tb-form-panel no-padding no-border">\n  <tb-sv-map-config\n    required\n    [selectOptions]="originatorFields"\n    targetKeyPrefix="originator"\n    formControlName="dataMapping"\n    [requiredText]="\'tb.rulenode.attr-mapping-required\' | translate"\n    [labelText]="\'tb.rulenode.originator-fields-mapping\' | translate"\n    [selectText]="\'tb.rulenode.source-field\' | translate"\n    [selectRequiredText]="\'tb.rulenode.source-field-required\' | translate"\n    [valText]="\'tb.rulenode.target-key\' | translate"\n    [valRequiredText]="\'tb.rulenode.target-key-required\' | translate"\n    [hintText]="\'tb.rulenode.originator-fields-sv-map-hint\' | translate"\n    popupHelpLink="rulenode/originator_fields_node_fields_templatization">\n  </tb-sv-map-config>\n  <tb-msg-metadata-chip [labelText]="\'tb.rulenode.add-mapped-originator-fields-to\' | translate"\n                        formControlName="fetchTo">\n  </tb-msg-metadata-chip>\n  <div tb-hint-tooltip-icon="{{ \'tb.rulenode.skip-empty-fields-tooltip\' | translate }}" class="tb-form-row same-padding">\n    <mat-slide-toggle class="mat-slide margin" formControlName="ignoreNullStrings">\n      {{ \'tb.rulenode.skip-empty-fields\' | translate }}\n    </mat-slide-toggle>\n  </div>\n</section>\n',dependencies:[{kind:"component",type:te.MatSlideToggle,selector:"mat-slide-toggle",inputs:["disabled","disableRipple","color","tabIndex"],exportAs:["matSlideToggle"]},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"component",type:ne.HintTooltipIconComponent,selector:"[tb-hint-tooltip-icon]",inputs:["tb-hint-tooltip-icon","tooltipPosition","hintIcon"]},{kind:"component",type:Kn,selector:"tb-msg-metadata-chip",inputs:["labelText","translation"]},{kind:"component",type:zn,selector:"tb-sv-map-config",inputs:["selectOptions","disabled","labelText","requiredText","targetKeyPrefix","selectText","selectRequiredText","valText","valRequiredText","hintText","popupHelpLink","required"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:tr,decorators:[{type:n,args:[{selector:"tb-enrichment-node-originator-fields-config",template:'<section [formGroup]="originatorFieldsConfigForm" class="tb-form-panel no-padding no-border">\n  <tb-sv-map-config\n    required\n    [selectOptions]="originatorFields"\n    targetKeyPrefix="originator"\n    formControlName="dataMapping"\n    [requiredText]="\'tb.rulenode.attr-mapping-required\' | translate"\n    [labelText]="\'tb.rulenode.originator-fields-mapping\' | translate"\n    [selectText]="\'tb.rulenode.source-field\' | translate"\n    [selectRequiredText]="\'tb.rulenode.source-field-required\' | translate"\n    [valText]="\'tb.rulenode.target-key\' | translate"\n    [valRequiredText]="\'tb.rulenode.target-key-required\' | translate"\n    [hintText]="\'tb.rulenode.originator-fields-sv-map-hint\' | translate"\n    popupHelpLink="rulenode/originator_fields_node_fields_templatization">\n  </tb-sv-map-config>\n  <tb-msg-metadata-chip [labelText]="\'tb.rulenode.add-mapped-originator-fields-to\' | translate"\n                        formControlName="fetchTo">\n  </tb-msg-metadata-chip>\n  <div tb-hint-tooltip-icon="{{ \'tb.rulenode.skip-empty-fields-tooltip\' | translate }}" class="tb-form-row same-padding">\n    <mat-slide-toggle class="mat-slide margin" formControlName="ignoreNullStrings">\n      {{ \'tb.rulenode.skip-empty-fields\' | translate }}\n    </mat-slide-toggle>\n  </div>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.FormBuilder},{type:Z.TranslateService}]}});class nr extends f{constructor(e,t,n){super(e),this.store=e,this.fb=t,this.translate=n,this.DataToFetch=Pt,this.msgMetadataLabelTranslations=Ot,this.originatorFields=[],this.fetchToData=[];for(const e of Object.keys(kt))this.originatorFields.push({value:kt[e].value,name:this.translate.instant(kt[e].name)});for(const e of Rt.keys())this.fetchToData.push({value:e,name:this.translate.instant(Rt.get(e))})}configForm(){return this.relatedAttributesConfigForm}prepareOutputConfig(e){e.dataToFetch===Pt.FIELDS?(e.dataMapping=e.svMap,delete e.svMap):(e.dataMapping=e.kvMap,delete e.kvMap);const t={};if(e&&e.dataMapping)for(const n of Object.keys(e.dataMapping))t[n.trim()]=e.dataMapping[n];return e.dataMapping=t,delete e.svMap,delete e.kvMap,le(e)}prepareInputConfig(e){let t,n,r={[k.name.value]:`relatedEntity${this.translate.instant(k.name.name)}`},o={serialNumber:"sn"};return t=ae(e?.telemetry)?e.telemetry?Pt.LATEST_TELEMETRY:Pt.ATTRIBUTES:ae(e?.dataToFetch)?e.dataToFetch:Pt.ATTRIBUTES,n=ae(e?.attrMapping)?e.attrMapping:ae(e?.dataMapping)?e.dataMapping:null,t===Pt.FIELDS?r=n:o=n,{relationsQuery:ae(e?.relationsQuery)?e.relationsQuery:null,dataToFetch:t,svMap:r,kvMap:o,fetchTo:ae(e?.fetchTo)?e.fetchTo:en.METADATA}}selectTranslation(e,t){return this.relatedAttributesConfigForm.get("dataToFetch").value===Pt.LATEST_TELEMETRY?e:t}onConfigurationSet(e){this.relatedAttributesConfigForm=this.fb.group({relationsQuery:[e.relationsQuery,[O.required]],dataToFetch:[e.dataToFetch,[]],kvMap:[e.kvMap,[O.required]],svMap:[e.svMap,[O.required]],fetchTo:[e.fetchTo,[]]})}validatorTriggers(){return["dataToFetch"]}updateValidators(e){this.relatedAttributesConfigForm.get("dataToFetch").value===Pt.FIELDS?(this.relatedAttributesConfigForm.get("svMap").enable({emitEvent:!1}),this.relatedAttributesConfigForm.get("kvMap").disable({emitEvent:!1}),this.relatedAttributesConfigForm.get("svMap").updateValueAndValidity()):(this.relatedAttributesConfigForm.get("svMap").disable({emitEvent:!1}),this.relatedAttributesConfigForm.get("kvMap").enable({emitEvent:!1}),this.relatedAttributesConfigForm.get("kvMap").updateValueAndValidity())}}e("RelatedAttributesConfigComponent",nr),nr.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:nr,deps:[{token:P.Store},{token:R.FormBuilder},{token:Z.TranslateService}],target:t.ɵɵFactoryTarget.Component}),nr.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:nr,selector:"tb-enrichment-node-related-attributes-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="relatedAttributesConfigForm" class="tb-form-panel no-padding no-border">\n  <tb-relations-query-config\n    required\n    formControlName="relationsQuery">\n  </tb-relations-query-config>\n  <div class="tb-form-panel stroked">\n    <div class="tb-form-panel-title" translate>tb.rulenode.data-to-fetch</div>\n    <tb-toggle-select formControlName="dataToFetch" appearance="fill">\n      <tb-toggle-option *ngFor="let data of fetchToData" [value]="data.value">\n        {{ data.name }}\n      </tb-toggle-option>\n    </tb-toggle-select>\n    <tb-kv-map-config\n      [hidden]="relatedAttributesConfigForm.get(\'dataToFetch\').value === DataToFetch.FIELDS"\n      required\n      formControlName="kvMap"\n      [requiredText]="\'tb.rulenode.attr-mapping-required\' | translate"\n      [labelText]="selectTranslation(\'tb.rulenode.latest-telemetry-mapping\',\'tb.rulenode.attributes-mapping\') | translate"\n      [keyText]="selectTranslation(\'tb.rulenode.source-telemetry\',\'tb.rulenode.source-attribute\') | translate"\n      [keyRequiredText]="selectTranslation(\'tb.rulenode.source-telemetry-required\',\'tb.rulenode.source-attribute-required\') | translate"\n      [valText]="\'tb.rulenode.target-key\' | translate"\n      [valRequiredText]="\'tb.rulenode.target-key-required\' | translate"\n      [hintText]="\'tb.rulenode.kv-map-pattern-hint\' | translate"\n      popupHelpLink="rulenode/related_entity_data_node_fields_templatization">\n    </tb-kv-map-config>\n    <tb-sv-map-config\n      [hidden]="relatedAttributesConfigForm.get(\'dataToFetch\').value !== DataToFetch.FIELDS"\n      required\n      [labelText]="\'tb.rulenode.fields-mapping\' | translate"\n      targetKeyPrefix="relatedEntity"\n      [selectOptions]="originatorFields"\n      formControlName="svMap"\n      [requiredText]="\'tb.rulenode.attr-mapping-required\' | translate"\n      [selectText]="\'tb.rulenode.source-field\' | translate"\n      [selectRequiredText]="\'tb.rulenode.source-field-required\' | translate"\n      [valText]="\'tb.rulenode.target-key\' | translate"\n      [valRequiredText]="\'tb.rulenode.target-key-required\' | translate"\n      [hintText]="\'tb.rulenode.sv-map-hint\' | translate"\n      popupHelpLink="rulenode/related_entity_data_node_fields_templatization">\n    </tb-sv-map-config>\n    <tb-msg-metadata-chip formControlName="fetchTo"\n                          [labelText]="msgMetadataLabelTranslations.get(relatedAttributesConfigForm.get(\'dataToFetch\').value) | translate">\n    </tb-msg-metadata-chip>\n  </div>\n</section>\n',styles:[':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n'],dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"directive",type:Fe.ToggleOption,selector:"tb-toggle-option",inputs:["value"]},{kind:"component",type:ke.ToggleSelectComponent,selector:"tb-toggle-select",inputs:["disabled","selectMediaBreakpoint","appearance","disablePagination"]},{kind:"component",type:Mn,selector:"tb-kv-map-config",inputs:["disabled","uniqueKeyValuePairValidator","labelText","requiredText","keyText","keyRequiredText","valText","valRequiredText","hintText","popupHelpLink","required"]},{kind:"component",type:Gn,selector:"tb-relations-query-config",inputs:["disabled","required"]},{kind:"component",type:Kn,selector:"tb-msg-metadata-chip",inputs:["labelText","translation"]},{kind:"component",type:zn,selector:"tb-sv-map-config",inputs:["selectOptions","disabled","labelText","requiredText","targetKeyPrefix","selectText","selectRequiredText","valText","valRequiredText","hintText","popupHelpLink","required"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:nr,decorators:[{type:n,args:[{selector:"tb-enrichment-node-related-attributes-config",template:'<section [formGroup]="relatedAttributesConfigForm" class="tb-form-panel no-padding no-border">\n  <tb-relations-query-config\n    required\n    formControlName="relationsQuery">\n  </tb-relations-query-config>\n  <div class="tb-form-panel stroked">\n    <div class="tb-form-panel-title" translate>tb.rulenode.data-to-fetch</div>\n    <tb-toggle-select formControlName="dataToFetch" appearance="fill">\n      <tb-toggle-option *ngFor="let data of fetchToData" [value]="data.value">\n        {{ data.name }}\n      </tb-toggle-option>\n    </tb-toggle-select>\n    <tb-kv-map-config\n      [hidden]="relatedAttributesConfigForm.get(\'dataToFetch\').value === DataToFetch.FIELDS"\n      required\n      formControlName="kvMap"\n      [requiredText]="\'tb.rulenode.attr-mapping-required\' | translate"\n      [labelText]="selectTranslation(\'tb.rulenode.latest-telemetry-mapping\',\'tb.rulenode.attributes-mapping\') | translate"\n      [keyText]="selectTranslation(\'tb.rulenode.source-telemetry\',\'tb.rulenode.source-attribute\') | translate"\n      [keyRequiredText]="selectTranslation(\'tb.rulenode.source-telemetry-required\',\'tb.rulenode.source-attribute-required\') | translate"\n      [valText]="\'tb.rulenode.target-key\' | translate"\n      [valRequiredText]="\'tb.rulenode.target-key-required\' | translate"\n      [hintText]="\'tb.rulenode.kv-map-pattern-hint\' | translate"\n      popupHelpLink="rulenode/related_entity_data_node_fields_templatization">\n    </tb-kv-map-config>\n    <tb-sv-map-config\n      [hidden]="relatedAttributesConfigForm.get(\'dataToFetch\').value !== DataToFetch.FIELDS"\n      required\n      [labelText]="\'tb.rulenode.fields-mapping\' | translate"\n      targetKeyPrefix="relatedEntity"\n      [selectOptions]="originatorFields"\n      formControlName="svMap"\n      [requiredText]="\'tb.rulenode.attr-mapping-required\' | translate"\n      [selectText]="\'tb.rulenode.source-field\' | translate"\n      [selectRequiredText]="\'tb.rulenode.source-field-required\' | translate"\n      [valText]="\'tb.rulenode.target-key\' | translate"\n      [valRequiredText]="\'tb.rulenode.target-key-required\' | translate"\n      [hintText]="\'tb.rulenode.sv-map-hint\' | translate"\n      popupHelpLink="rulenode/related_entity_data_node_fields_templatization">\n    </tb-sv-map-config>\n    <tb-msg-metadata-chip formControlName="fetchTo"\n                          [labelText]="msgMetadataLabelTranslations.get(relatedAttributesConfigForm.get(\'dataToFetch\').value) | translate">\n    </tb-msg-metadata-chip>\n  </div>\n</section>\n',styles:[':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n']}]}],ctorParameters:function(){return[{type:P.Store},{type:R.FormBuilder},{type:Z.TranslateService}]}});class rr extends f{constructor(e,t,n){super(e),this.store=e,this.fb=t,this.translate=n,this.fetchToData=[],this.DataToFetch=Pt;for(const e of Rt.keys())e!==Pt.FIELDS&&this.fetchToData.push({value:e,name:this.translate.instant(Rt.get(e))})}configForm(){return this.tenantAttributesConfigForm}prepareInputConfig(e){let t,n;return t=ae(e?.telemetry)?e.telemetry?Pt.LATEST_TELEMETRY:Pt.ATTRIBUTES:ae(e?.dataToFetch)?e.dataToFetch:Pt.ATTRIBUTES,n=ae(e?.attrMapping)?e.attrMapping:ae(e?.dataMapping)?e.dataMapping:null,{dataToFetch:t,dataMapping:n,fetchTo:ae(e?.fetchTo)?e.fetchTo:en.METADATA}}selectTranslation(e,t){return this.tenantAttributesConfigForm.get("dataToFetch").value===Pt.LATEST_TELEMETRY?e:t}onConfigurationSet(e){this.tenantAttributesConfigForm=this.fb.group({dataToFetch:[e.dataToFetch,[]],dataMapping:[e.dataMapping,[O.required]],fetchTo:[e.fetchTo,[]]})}}e("TenantAttributesConfigComponent",rr),rr.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:rr,deps:[{token:P.Store},{token:R.FormBuilder},{token:Z.TranslateService}],target:t.ɵɵFactoryTarget.Component}),rr.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:rr,selector:"tb-enrichment-node-tenant-attributes-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="tenantAttributesConfigForm" class="tb-form-panel stroked">\n  <div class="tb-form-panel-title" translate>tb.rulenode.mapping-of-tenant</div>\n  <div fxFlex fxLayoutAlign="center center">\n    <div class="fetch-to-data-toggle">\n      <tb-toggle-select class="fetch-to-data-toggle" formControlName="dataToFetch" appearance="fill">\n        <tb-toggle-option *ngFor="let data of fetchToData" [value]="data.value">\n          {{ data.name }}\n        </tb-toggle-option>\n      </tb-toggle-select>\n    </div>\n  </div>\n  <tb-kv-map-config\n    required\n    formControlName="dataMapping"\n    [requiredText]="\'tb.rulenode.attr-mapping-required\' | translate"\n    [labelText]="selectTranslation(\'tb.rulenode.latest-telemetry-mapping\', \'tb.rulenode.attributes-mapping\') | translate"\n    [keyText]="selectTranslation(\'tb.rulenode.source-telemetry\', \'tb.rulenode.source-attribute\') | translate"\n    [keyRequiredText]="selectTranslation(\'tb.rulenode.source-telemetry-required\', \'tb.rulenode.source-attribute-required\') | translate"\n    [valText]="\'tb.rulenode.target-key\' | translate"\n    [valRequiredText]="\'tb.rulenode.target-key-required\' | translate"\n    [hintText]="\'tb.rulenode.kv-map-pattern-hint\' | translate"\n    popupHelpLink="rulenode/tenant_attributes_node_fields_templatization">\n  </tb-kv-map-config>\n  <tb-msg-metadata-chip formControlName="fetchTo"\n                        [labelText]="tenantAttributesConfigForm.get(\'dataToFetch\').value === DataToFetch.LATEST_TELEMETRY ?\n                        (\'tb.rulenode.add-mapped-latest-telemetry-to\' | translate) : (\'tb.rulenode.add-mapped-attribute-to\' | translate)">\n  </tb-msg-metadata-chip>\n</section>\n',styles:[":host .fetch-to-data-toggle{max-width:420px;width:100%}\n"],dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"directive",type:W.DefaultLayoutAlignDirective,selector:"  [fxLayoutAlign], [fxLayoutAlign.xs], [fxLayoutAlign.sm], [fxLayoutAlign.md],  [fxLayoutAlign.lg], [fxLayoutAlign.xl], [fxLayoutAlign.lt-sm], [fxLayoutAlign.lt-md],  [fxLayoutAlign.lt-lg], [fxLayoutAlign.lt-xl], [fxLayoutAlign.gt-xs], [fxLayoutAlign.gt-sm],  [fxLayoutAlign.gt-md], [fxLayoutAlign.gt-lg]",inputs:["fxLayoutAlign","fxLayoutAlign.xs","fxLayoutAlign.sm","fxLayoutAlign.md","fxLayoutAlign.lg","fxLayoutAlign.xl","fxLayoutAlign.lt-sm","fxLayoutAlign.lt-md","fxLayoutAlign.lt-lg","fxLayoutAlign.lt-xl","fxLayoutAlign.gt-xs","fxLayoutAlign.gt-sm","fxLayoutAlign.gt-md","fxLayoutAlign.gt-lg"]},{kind:"directive",type:W.DefaultFlexDirective,selector:"  [fxFlex], [fxFlex.xs], [fxFlex.sm], [fxFlex.md],  [fxFlex.lg], [fxFlex.xl], [fxFlex.lt-sm], [fxFlex.lt-md],  [fxFlex.lt-lg], [fxFlex.lt-xl], [fxFlex.gt-xs], [fxFlex.gt-sm],  [fxFlex.gt-md], [fxFlex.gt-lg]",inputs:["fxFlex","fxFlex.xs","fxFlex.sm","fxFlex.md","fxFlex.lg","fxFlex.xl","fxFlex.lt-sm","fxFlex.lt-md","fxFlex.lt-lg","fxFlex.lt-xl","fxFlex.gt-xs","fxFlex.gt-sm","fxFlex.gt-md","fxFlex.gt-lg"]},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"directive",type:Fe.ToggleOption,selector:"tb-toggle-option",inputs:["value"]},{kind:"component",type:ke.ToggleSelectComponent,selector:"tb-toggle-select",inputs:["disabled","selectMediaBreakpoint","appearance","disablePagination"]},{kind:"component",type:Mn,selector:"tb-kv-map-config",inputs:["disabled","uniqueKeyValuePairValidator","labelText","requiredText","keyText","keyRequiredText","valText","valRequiredText","hintText","popupHelpLink","required"]},{kind:"component",type:Kn,selector:"tb-msg-metadata-chip",inputs:["labelText","translation"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:rr,decorators:[{type:n,args:[{selector:"tb-enrichment-node-tenant-attributes-config",template:'<section [formGroup]="tenantAttributesConfigForm" class="tb-form-panel stroked">\n  <div class="tb-form-panel-title" translate>tb.rulenode.mapping-of-tenant</div>\n  <div fxFlex fxLayoutAlign="center center">\n    <div class="fetch-to-data-toggle">\n      <tb-toggle-select class="fetch-to-data-toggle" formControlName="dataToFetch" appearance="fill">\n        <tb-toggle-option *ngFor="let data of fetchToData" [value]="data.value">\n          {{ data.name }}\n        </tb-toggle-option>\n      </tb-toggle-select>\n    </div>\n  </div>\n  <tb-kv-map-config\n    required\n    formControlName="dataMapping"\n    [requiredText]="\'tb.rulenode.attr-mapping-required\' | translate"\n    [labelText]="selectTranslation(\'tb.rulenode.latest-telemetry-mapping\', \'tb.rulenode.attributes-mapping\') | translate"\n    [keyText]="selectTranslation(\'tb.rulenode.source-telemetry\', \'tb.rulenode.source-attribute\') | translate"\n    [keyRequiredText]="selectTranslation(\'tb.rulenode.source-telemetry-required\', \'tb.rulenode.source-attribute-required\') | translate"\n    [valText]="\'tb.rulenode.target-key\' | translate"\n    [valRequiredText]="\'tb.rulenode.target-key-required\' | translate"\n    [hintText]="\'tb.rulenode.kv-map-pattern-hint\' | translate"\n    popupHelpLink="rulenode/tenant_attributes_node_fields_templatization">\n  </tb-kv-map-config>\n  <tb-msg-metadata-chip formControlName="fetchTo"\n                        [labelText]="tenantAttributesConfigForm.get(\'dataToFetch\').value === DataToFetch.LATEST_TELEMETRY ?\n                        (\'tb.rulenode.add-mapped-latest-telemetry-to\' | translate) : (\'tb.rulenode.add-mapped-attribute-to\' | translate)">\n  </tb-msg-metadata-chip>\n</section>\n',styles:[":host .fetch-to-data-toggle{max-width:420px;width:100%}\n"]}]}],ctorParameters:function(){return[{type:P.Store},{type:R.FormBuilder},{type:Z.TranslateService}]}});class or extends f{constructor(e,t){super(e),this.store=e,this.fb=t}configForm(){return this.fetchDeviceCredentialsConfigForm}prepareInputConfig(e){return{fetchTo:ae(e?.fetchTo)?e.fetchTo:en.METADATA}}onConfigurationSet(e){this.fetchDeviceCredentialsConfigForm=this.fb.group({fetchTo:[e.fetchTo,[]]})}}e("FetchDeviceCredentialsConfigComponent",or),or.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:or,deps:[{token:P.Store},{token:R.FormBuilder}],target:t.ɵɵFactoryTarget.Component}),or.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:or,selector:"./tb-enrichment-node-fetch-device-credentials-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="fetchDeviceCredentialsConfigForm">\n  <tb-msg-metadata-chip\n    [labelText]="\'tb.rulenode.fetch-credentials-to\' | translate"\n    formControlName="fetchTo">\n  </tb-msg-metadata-chip>\n</section>\n',dependencies:[{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"component",type:Kn,selector:"tb-msg-metadata-chip",inputs:["labelText","translation"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:or,decorators:[{type:n,args:[{selector:"./tb-enrichment-node-fetch-device-credentials-config",template:'<section [formGroup]="fetchDeviceCredentialsConfigForm">\n  <tb-msg-metadata-chip\n    [labelText]="\'tb.rulenode.fetch-credentials-to\' | translate"\n    formControlName="fetchTo">\n  </tb-msg-metadata-chip>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.FormBuilder}]}});class ar{}e("RulenodeCoreConfigEnrichmentModule",ar),ar.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:ar,deps:[],target:t.ɵɵFactoryTarget.NgModule}),ar.ɵmod=t.ɵɵngDeclareNgModule({minVersion:"14.0.0",version:"15.2.10",ngImport:t,type:ar,declarations:[Yn,Zn,Wn,er,tr,Xn,nr,rr,Jn,or],imports:[$,M,$n],exports:[Yn,Zn,Wn,er,tr,Xn,nr,rr,Jn,or]}),ar.ɵinj=t.ɵɵngDeclareInjector({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:ar,imports:[$,M,$n]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:ar,decorators:[{type:c,args:[{declarations:[Yn,Zn,Wn,er,tr,Xn,nr,rr,Jn,or],imports:[$,M,$n],exports:[Yn,Zn,Wn,er,tr,Xn,nr,rr,Jn,or]}]}]});class ir extends f{constructor(e,t){super(e),this.store=e,this.fb=t,this.allAzureIotHubCredentialsTypes=Ht,this.azureIotHubCredentialsTypeTranslationsMap=jt}configForm(){return this.azureIotHubConfigForm}onConfigurationSet(e){this.azureIotHubConfigForm=this.fb.group({topicPattern:[e?e.topicPattern:null,[O.required]],host:[e?e.host:null,[O.required]],port:[e?e.port:null,[O.required,O.min(1),O.max(65535)]],connectTimeoutSec:[e?e.connectTimeoutSec:null,[O.required,O.min(1),O.max(200)]],clientId:[e?e.clientId:null,[O.required]],cleanSession:[!!e&&e.cleanSession,[]],ssl:[!!e&&e.ssl,[]],credentials:this.fb.group({type:[e&&e.credentials?e.credentials.type:null,[O.required]],sasKey:[e&&e.credentials?e.credentials.sasKey:null,[]],caCert:[e&&e.credentials?e.credentials.caCert:null,[]],caCertFileName:[e&&e.credentials?e.credentials.caCertFileName:null,[]],privateKey:[e&&e.credentials?e.credentials.privateKey:null,[]],privateKeyFileName:[e&&e.credentials?e.credentials.privateKeyFileName:null,[]],cert:[e&&e.credentials?e.credentials.cert:null,[]],certFileName:[e&&e.credentials?e.credentials.certFileName:null,[]],password:[e&&e.credentials?e.credentials.password:null,[]]})})}prepareOutputConfig(e){const t=e.credentials.type;return"sas"===t&&(e.credentials={type:t,sasKey:e.credentials.sasKey,caCert:e.credentials.caCert,caCertFileName:e.credentials.caCertFileName}),e}validatorTriggers(){return["credentials.type"]}updateValidators(e){const t=this.azureIotHubConfigForm.get("credentials"),n=t.get("type").value;switch(e&&t.reset({type:n},{emitEvent:!1}),t.get("sasKey").setValidators([]),t.get("privateKey").setValidators([]),t.get("privateKeyFileName").setValidators([]),t.get("cert").setValidators([]),t.get("certFileName").setValidators([]),n){case"sas":t.get("sasKey").setValidators([O.required]);break;case"cert.PEM":t.get("privateKey").setValidators([O.required]),t.get("privateKeyFileName").setValidators([O.required]),t.get("cert").setValidators([O.required]),t.get("certFileName").setValidators([O.required])}t.get("sasKey").updateValueAndValidity({emitEvent:e}),t.get("privateKey").updateValueAndValidity({emitEvent:e}),t.get("privateKeyFileName").updateValueAndValidity({emitEvent:e}),t.get("cert").updateValueAndValidity({emitEvent:e}),t.get("certFileName").updateValueAndValidity({emitEvent:e})}}e("AzureIotHubConfigComponent",ir),ir.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:ir,deps:[{token:P.Store},{token:R.UntypedFormBuilder}],target:t.ɵɵFactoryTarget.Component}),ir.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:ir,selector:"tb-external-node-azure-iot-hub-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="azureIotHubConfigForm" fxLayout="column">\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.topic</mat-label>\n    <input required matInput formControlName="topicPattern">\n    <mat-error *ngIf="azureIotHubConfigForm.get(\'topicPattern\').hasError(\'required\')">\n      {{ \'tb.rulenode.topic-required\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.hostname</mat-label>\n    <input required matInput formControlName="host">\n    <mat-error *ngIf="azureIotHubConfigForm.get(\'host\').hasError(\'required\')">\n      {{ \'tb.rulenode.hostname-required\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.device-id</mat-label>\n    <input required matInput formControlName="clientId" autocomplete="new-clientId">\n    <mat-error *ngIf="azureIotHubConfigForm.get(\'clientId\').hasError(\'required\')">\n      {{ \'tb.rulenode.device-id-required\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <mat-accordion>\n    <mat-expansion-panel class="tb-mqtt-credentials-panel-group">\n      <mat-expansion-panel-header>\n        <mat-panel-title class="tb-required" translate>tb.rulenode.credentials</mat-panel-title>\n        <mat-panel-description>\n          {{ azureIotHubCredentialsTypeTranslationsMap.get(azureIotHubConfigForm.get(\'credentials.type\').value) | translate }}\n        </mat-panel-description>\n      </mat-expansion-panel-header>\n      <section formGroupName="credentials" fxLayout="column">\n        <mat-form-field class="mat-block">\n          <mat-label translate>tb.rulenode.credentials-type</mat-label>\n          <mat-select formControlName="type" required>\n            <mat-option *ngFor="let credentialsType of allAzureIotHubCredentialsTypes" [value]="credentialsType">\n              {{ azureIotHubCredentialsTypeTranslationsMap.get(credentialsType) | translate }}\n            </mat-option>\n          </mat-select>\n          <mat-error *ngIf="azureIotHubConfigForm.get(\'credentials.type\').hasError(\'required\')">\n            {{ \'tb.rulenode.credentials-type-required\' | translate }}\n          </mat-error>\n        </mat-form-field>\n        <section fxLayout="column" [ngSwitch]="azureIotHubConfigForm.get(\'credentials.type\').value">\n          <ng-template ngSwitchCase="anonymous">\n          </ng-template>\n          <ng-template ngSwitchCase="sas">\n            <mat-form-field class="mat-block">\n              <mat-label translate>tb.rulenode.sas-key</mat-label>\n              <input type="password" required matInput formControlName="sasKey" autocomplete="new-password">\n              <tb-toggle-password matSuffix></tb-toggle-password>\n              <mat-error *ngIf="azureIotHubConfigForm.get(\'credentials.sasKey\').hasError(\'required\')">\n                {{ \'tb.rulenode.sas-key-required\' | translate }}\n              </mat-error>\n            </mat-form-field>\n            <tb-file-input formControlName="caCert"\n                           inputId="caCertSelect"\n                           [existingFileName]="azureIotHubConfigForm.get(\'credentials.caCertFileName\').value"\n                           (fileNameChanged)="azureIotHubConfigForm.get(\'credentials.caCertFileName\').setValue($event)"\n                           label="{{\'tb.rulenode.azure-ca-cert\' | translate}}"\n                           noFileText="tb.rulenode.no-file"\n                           dropLabel="{{\'tb.rulenode.drop-file\' | translate}}">\n            </tb-file-input>\n          </ng-template>\n          <ng-template ngSwitchCase="cert.PEM">\n            <tb-file-input formControlName="caCert"\n                           inputId="caCertSelect"\n                           [existingFileName]="azureIotHubConfigForm.get(\'credentials.caCertFileName\').value"\n                           (fileNameChanged)="azureIotHubConfigForm.get(\'credentials.caCertFileName\').setValue($event)"\n                           label="{{\'tb.rulenode.azure-ca-cert\' | translate}}"\n                           noFileText="tb.rulenode.no-file"\n                           dropLabel="{{\'tb.rulenode.drop-file\' | translate}}">\n            </tb-file-input>\n            <tb-file-input formControlName="cert"\n                           inputId="CertSelect"\n                           [existingFileName]="azureIotHubConfigForm.get(\'credentials.certFileName\').value"\n                           (fileNameChanged)="azureIotHubConfigForm.get(\'credentials.certFileName\').setValue($event)"\n                           required\n                           requiredAsError\n                           label="{{\'tb.rulenode.cert\' | translate}}"\n                           noFileText="tb.rulenode.no-file"\n                           dropLabel="{{\'tb.rulenode.drop-file\' | translate}}">\n            </tb-file-input>\n            <tb-file-input style="padding-bottom: 8px;"\n                           formControlName="privateKey"\n                           inputId="privateKeySelect"\n                           [existingFileName]="azureIotHubConfigForm.get(\'credentials.privateKeyFileName\').value"\n                           (fileNameChanged)="azureIotHubConfigForm.get(\'credentials.privateKeyFileName\').setValue($event)"\n                           required\n                           requiredAsError\n                           label="{{\'tb.rulenode.private-key\' | translate}}"\n                           noFileText="tb.rulenode.no-file"\n                           dropLabel="{{\'tb.rulenode.drop-file\' | translate}}">\n            </tb-file-input>\n            <mat-form-field class="mat-block">\n              <mat-label translate>tb.rulenode.private-key-password</mat-label>\n              <input type="password" matInput formControlName="password" autocomplete="new-password">\n              <tb-toggle-password matSuffix></tb-toggle-password>\n            </mat-form-field>\n          </ng-template>\n        </section>\n      </section>\n    </mat-expansion-panel>\n  </mat-accordion>\n</section>\n',styles:[":host .tb-mqtt-credentials-panel-group{margin:0 6px}\n",':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n'],dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"directive",type:H.NgSwitch,selector:"[ngSwitch]",inputs:["ngSwitch"]},{kind:"directive",type:H.NgSwitchCase,selector:"[ngSwitchCase]",inputs:["ngSwitchCase"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatHint,selector:"mat-hint",inputs:["align","id"]},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"directive",type:Y.MatSuffix,selector:"[matSuffix], [matIconSuffix], [matTextSuffix]",inputs:["matTextSuffix"]},{kind:"component",type:X.MatSelect,selector:"mat-select",inputs:["disabled","disableRipple","tabIndex","hideSingleSelectionIndicator"],exportAs:["matSelect"]},{kind:"component",type:ee.MatOption,selector:"mat-option",exportAs:["matOption"]},{kind:"directive",type:We.MatAccordion,selector:"mat-accordion",inputs:["multi","hideToggle","displayMode","togglePosition"],exportAs:["matAccordion"]},{kind:"component",type:We.MatExpansionPanel,selector:"mat-expansion-panel",inputs:["disabled","expanded","hideToggle","togglePosition"],outputs:["opened","closed","expandedChange","afterExpand","afterCollapse"],exportAs:["matExpansionPanel"]},{kind:"component",type:We.MatExpansionPanelHeader,selector:"mat-expansion-panel-header",inputs:["tabIndex","expandedHeight","collapsedHeight"]},{kind:"directive",type:We.MatExpansionPanelTitle,selector:"mat-panel-title"},{kind:"directive",type:We.MatExpansionPanelDescription,selector:"mat-panel-description"},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:R.FormGroupName,selector:"[formGroupName]",inputs:["formGroupName"]},{kind:"component",type:Ze.FileInputComponent,selector:"tb-file-input",inputs:["label","hint","accept","noFileText","inputId","allowedExtensions","dropLabel","maxSizeByte","contentConvertFunction","required","requiredAsError","disabled","existingFileName","readAsBinary","workFromFileObj","multipleFile"],outputs:["fileNameChanged"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"component",type:Xe.TogglePasswordComponent,selector:"tb-toggle-password"},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:ir,decorators:[{type:n,args:[{selector:"tb-external-node-azure-iot-hub-config",template:'<section [formGroup]="azureIotHubConfigForm" fxLayout="column">\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.topic</mat-label>\n    <input required matInput formControlName="topicPattern">\n    <mat-error *ngIf="azureIotHubConfigForm.get(\'topicPattern\').hasError(\'required\')">\n      {{ \'tb.rulenode.topic-required\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.hostname</mat-label>\n    <input required matInput formControlName="host">\n    <mat-error *ngIf="azureIotHubConfigForm.get(\'host\').hasError(\'required\')">\n      {{ \'tb.rulenode.hostname-required\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.device-id</mat-label>\n    <input required matInput formControlName="clientId" autocomplete="new-clientId">\n    <mat-error *ngIf="azureIotHubConfigForm.get(\'clientId\').hasError(\'required\')">\n      {{ \'tb.rulenode.device-id-required\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <mat-accordion>\n    <mat-expansion-panel class="tb-mqtt-credentials-panel-group">\n      <mat-expansion-panel-header>\n        <mat-panel-title class="tb-required" translate>tb.rulenode.credentials</mat-panel-title>\n        <mat-panel-description>\n          {{ azureIotHubCredentialsTypeTranslationsMap.get(azureIotHubConfigForm.get(\'credentials.type\').value) | translate }}\n        </mat-panel-description>\n      </mat-expansion-panel-header>\n      <section formGroupName="credentials" fxLayout="column">\n        <mat-form-field class="mat-block">\n          <mat-label translate>tb.rulenode.credentials-type</mat-label>\n          <mat-select formControlName="type" required>\n            <mat-option *ngFor="let credentialsType of allAzureIotHubCredentialsTypes" [value]="credentialsType">\n              {{ azureIotHubCredentialsTypeTranslationsMap.get(credentialsType) | translate }}\n            </mat-option>\n          </mat-select>\n          <mat-error *ngIf="azureIotHubConfigForm.get(\'credentials.type\').hasError(\'required\')">\n            {{ \'tb.rulenode.credentials-type-required\' | translate }}\n          </mat-error>\n        </mat-form-field>\n        <section fxLayout="column" [ngSwitch]="azureIotHubConfigForm.get(\'credentials.type\').value">\n          <ng-template ngSwitchCase="anonymous">\n          </ng-template>\n          <ng-template ngSwitchCase="sas">\n            <mat-form-field class="mat-block">\n              <mat-label translate>tb.rulenode.sas-key</mat-label>\n              <input type="password" required matInput formControlName="sasKey" autocomplete="new-password">\n              <tb-toggle-password matSuffix></tb-toggle-password>\n              <mat-error *ngIf="azureIotHubConfigForm.get(\'credentials.sasKey\').hasError(\'required\')">\n                {{ \'tb.rulenode.sas-key-required\' | translate }}\n              </mat-error>\n            </mat-form-field>\n            <tb-file-input formControlName="caCert"\n                           inputId="caCertSelect"\n                           [existingFileName]="azureIotHubConfigForm.get(\'credentials.caCertFileName\').value"\n                           (fileNameChanged)="azureIotHubConfigForm.get(\'credentials.caCertFileName\').setValue($event)"\n                           label="{{\'tb.rulenode.azure-ca-cert\' | translate}}"\n                           noFileText="tb.rulenode.no-file"\n                           dropLabel="{{\'tb.rulenode.drop-file\' | translate}}">\n            </tb-file-input>\n          </ng-template>\n          <ng-template ngSwitchCase="cert.PEM">\n            <tb-file-input formControlName="caCert"\n                           inputId="caCertSelect"\n                           [existingFileName]="azureIotHubConfigForm.get(\'credentials.caCertFileName\').value"\n                           (fileNameChanged)="azureIotHubConfigForm.get(\'credentials.caCertFileName\').setValue($event)"\n                           label="{{\'tb.rulenode.azure-ca-cert\' | translate}}"\n                           noFileText="tb.rulenode.no-file"\n                           dropLabel="{{\'tb.rulenode.drop-file\' | translate}}">\n            </tb-file-input>\n            <tb-file-input formControlName="cert"\n                           inputId="CertSelect"\n                           [existingFileName]="azureIotHubConfigForm.get(\'credentials.certFileName\').value"\n                           (fileNameChanged)="azureIotHubConfigForm.get(\'credentials.certFileName\').setValue($event)"\n                           required\n                           requiredAsError\n                           label="{{\'tb.rulenode.cert\' | translate}}"\n                           noFileText="tb.rulenode.no-file"\n                           dropLabel="{{\'tb.rulenode.drop-file\' | translate}}">\n            </tb-file-input>\n            <tb-file-input style="padding-bottom: 8px;"\n                           formControlName="privateKey"\n                           inputId="privateKeySelect"\n                           [existingFileName]="azureIotHubConfigForm.get(\'credentials.privateKeyFileName\').value"\n                           (fileNameChanged)="azureIotHubConfigForm.get(\'credentials.privateKeyFileName\').setValue($event)"\n                           required\n                           requiredAsError\n                           label="{{\'tb.rulenode.private-key\' | translate}}"\n                           noFileText="tb.rulenode.no-file"\n                           dropLabel="{{\'tb.rulenode.drop-file\' | translate}}">\n            </tb-file-input>\n            <mat-form-field class="mat-block">\n              <mat-label translate>tb.rulenode.private-key-password</mat-label>\n              <input type="password" matInput formControlName="password" autocomplete="new-password">\n              <tb-toggle-password matSuffix></tb-toggle-password>\n            </mat-form-field>\n          </ng-template>\n        </section>\n      </section>\n    </mat-expansion-panel>\n  </mat-accordion>\n</section>\n',styles:[":host .tb-mqtt-credentials-panel-group{margin:0 6px}\n",':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n']}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder}]}});class lr extends f{constructor(e,t){super(e),this.store=e,this.fb=t,this.ackValues=["all","-1","0","1"],this.ToByteStandartCharsetTypesValues=Qt,this.ToByteStandartCharsetTypeTranslationMap=Jt}configForm(){return this.kafkaConfigForm}onConfigurationSet(e){this.kafkaConfigForm=this.fb.group({topicPattern:[e?e.topicPattern:null,[O.required]],keyPattern:[e?e.keyPattern:null],bootstrapServers:[e?e.bootstrapServers:null,[O.required]],retries:[e?e.retries:null,[O.min(0)]],batchSize:[e?e.batchSize:null,[O.min(0)]],linger:[e?e.linger:null,[O.min(0)]],bufferMemory:[e?e.bufferMemory:null,[O.min(0)]],acks:[e?e.acks:null,[O.required]],keySerializer:[e?e.keySerializer:null,[O.required]],valueSerializer:[e?e.valueSerializer:null,[O.required]],otherProperties:[e?e.otherProperties:null,[]],addMetadataKeyValuesAsKafkaHeaders:[!!e&&e.addMetadataKeyValuesAsKafkaHeaders,[]],kafkaHeadersCharset:[e?e.kafkaHeadersCharset:null,[]]})}validatorTriggers(){return["addMetadataKeyValuesAsKafkaHeaders"]}updateValidators(e){this.kafkaConfigForm.get("addMetadataKeyValuesAsKafkaHeaders").value?this.kafkaConfigForm.get("kafkaHeadersCharset").setValidators([O.required]):this.kafkaConfigForm.get("kafkaHeadersCharset").setValidators([]),this.kafkaConfigForm.get("kafkaHeadersCharset").updateValueAndValidity({emitEvent:e})}}e("KafkaConfigComponent",lr),lr.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:lr,deps:[{token:P.Store},{token:R.UntypedFormBuilder}],target:t.ɵɵFactoryTarget.Component}),lr.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:lr,selector:"tb-external-node-kafka-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="kafkaConfigForm" fxLayout="column">\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.topic-pattern</mat-label>\n    <input required matInput formControlName="topicPattern">\n    <mat-error *ngIf="kafkaConfigForm.get(\'topicPattern\').hasError(\'required\')">\n      {{ \'tb.rulenode.topic-pattern-required\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n  </mat-form-field>\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.key-pattern</mat-label>\n    <input matInput formControlName="keyPattern">\n    <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n  </mat-form-field>\n  <div class="tb-hint" translate>tb.rulenode.key-pattern-hint</div>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.bootstrap-servers</mat-label>\n    <input required matInput formControlName="bootstrapServers">\n    <mat-error *ngIf="kafkaConfigForm.get(\'bootstrapServers\').hasError(\'required\')">\n      {{ \'tb.rulenode.bootstrap-servers-required\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.retries</mat-label>\n    <input type="number" step="1" min="0" matInput formControlName="retries">\n    <mat-error *ngIf="kafkaConfigForm.get(\'retries\').hasError(\'min\')">\n      {{ \'tb.rulenode.min-retries-message\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.batch-size-bytes</mat-label>\n    <input type="number" step="1" min="0" matInput formControlName="batchSize">\n    <mat-error *ngIf="kafkaConfigForm.get(\'batchSize\').hasError(\'min\')">\n      {{ \'tb.rulenode.min-batch-size-bytes-message\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.linger-ms</mat-label>\n    <input type="number" step="1" min="0" matInput formControlName="linger">\n    <mat-error *ngIf="kafkaConfigForm.get(\'linger\').hasError(\'min\')">\n      {{ \'tb.rulenode.min-linger-ms-message\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.buffer-memory-bytes</mat-label>\n    <input type="number" step="1" min="0" matInput formControlName="bufferMemory">\n    <mat-error *ngIf="kafkaConfigForm.get(\'bufferMemory\').hasError(\'min\')">\n      {{ \'tb.rulenode.min-buffer-memory-bytes-message\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.acks</mat-label>\n    <mat-select formControlName="acks" required>\n      <mat-option *ngFor="let ackValue of ackValues" [value]="ackValue">\n        {{ ackValue }}\n      </mat-option>\n    </mat-select>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.key-serializer</mat-label>\n    <input required matInput formControlName="keySerializer">\n    <mat-error *ngIf="kafkaConfigForm.get(\'keySerializer\').hasError(\'required\')">\n      {{ \'tb.rulenode.key-serializer-required\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.value-serializer</mat-label>\n    <input required matInput formControlName="valueSerializer">\n    <mat-error *ngIf="kafkaConfigForm.get(\'valueSerializer\').hasError(\'required\')">\n      {{ \'tb.rulenode.value-serializer-required\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <label translate class="tb-title">tb.rulenode.other-properties</label>\n  <tb-kv-map-config-old\n    required="false"\n    formControlName="otherProperties"\n    keyText="tb.rulenode.key"\n    keyRequiredText="tb.rulenode.key-required"\n    valText="tb.rulenode.value"\n    valRequiredText="tb.rulenode.value-required">\n  </tb-kv-map-config-old>\n  <mat-checkbox fxFlex formControlName="addMetadataKeyValuesAsKafkaHeaders">\n    {{ \'tb.rulenode.add-metadata-key-values-as-kafka-headers\' | translate }}\n  </mat-checkbox>\n  <div class="tb-hint" translate>tb.rulenode.add-metadata-key-values-as-kafka-headers-hint</div>\n  <mat-form-field fxFlex class="mat-block" *ngIf="kafkaConfigForm.get(\'addMetadataKeyValuesAsKafkaHeaders\').value">\n    <mat-label translate>tb.rulenode.charset-encoding</mat-label>\n    <mat-select formControlName="kafkaHeadersCharset" required>\n      <mat-option *ngFor="let charset of ToByteStandartCharsetTypesValues" [value]="charset">\n        {{ ToByteStandartCharsetTypeTranslationMap.get(charset) | translate }}\n      </mat-option>\n    </mat-select>\n  </mat-form-field>\n</section>\n',dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:Q.MatCheckbox,selector:"mat-checkbox",inputs:["disableRipple","color","tabIndex"],exportAs:["matCheckbox"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatHint,selector:"mat-hint",inputs:["align","id"]},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"component",type:X.MatSelect,selector:"mat-select",inputs:["disabled","disableRipple","tabIndex","hideSingleSelectionIndicator"],exportAs:["matSelect"]},{kind:"component",type:ee.MatOption,selector:"mat-option",exportAs:["matOption"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:W.DefaultFlexDirective,selector:"  [fxFlex], [fxFlex.xs], [fxFlex.sm], [fxFlex.md],  [fxFlex.lg], [fxFlex.xl], [fxFlex.lt-sm], [fxFlex.lt-md],  [fxFlex.lt-lg], [fxFlex.lt-xl], [fxFlex.gt-xs], [fxFlex.gt-sm],  [fxFlex.gt-md], [fxFlex.gt-lg]",inputs:["fxFlex","fxFlex.xs","fxFlex.sm","fxFlex.md","fxFlex.lg","fxFlex.xl","fxFlex.lt-sm","fxFlex.lt-md","fxFlex.lt-lg","fxFlex.lt-xl","fxFlex.gt-xs","fxFlex.gt-sm","fxFlex.gt-md","fxFlex.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NumberValueAccessor,selector:"input[type=number][formControlName],input[type=number][formControl],input[type=number][ngModel]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.MinValidator,selector:"input[type=number][min][formControlName],input[type=number][min][formControl],input[type=number][min][ngModel]",inputs:["min"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"component",type:Cn,selector:"tb-kv-map-config-old",inputs:["disabled","uniqueKeyValuePairValidator","requiredText","keyText","keyRequiredText","valText","valRequiredText","hintText","required"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:lr,decorators:[{type:n,args:[{selector:"tb-external-node-kafka-config",template:'<section [formGroup]="kafkaConfigForm" fxLayout="column">\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.topic-pattern</mat-label>\n    <input required matInput formControlName="topicPattern">\n    <mat-error *ngIf="kafkaConfigForm.get(\'topicPattern\').hasError(\'required\')">\n      {{ \'tb.rulenode.topic-pattern-required\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n  </mat-form-field>\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.key-pattern</mat-label>\n    <input matInput formControlName="keyPattern">\n    <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n  </mat-form-field>\n  <div class="tb-hint" translate>tb.rulenode.key-pattern-hint</div>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.bootstrap-servers</mat-label>\n    <input required matInput formControlName="bootstrapServers">\n    <mat-error *ngIf="kafkaConfigForm.get(\'bootstrapServers\').hasError(\'required\')">\n      {{ \'tb.rulenode.bootstrap-servers-required\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.retries</mat-label>\n    <input type="number" step="1" min="0" matInput formControlName="retries">\n    <mat-error *ngIf="kafkaConfigForm.get(\'retries\').hasError(\'min\')">\n      {{ \'tb.rulenode.min-retries-message\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.batch-size-bytes</mat-label>\n    <input type="number" step="1" min="0" matInput formControlName="batchSize">\n    <mat-error *ngIf="kafkaConfigForm.get(\'batchSize\').hasError(\'min\')">\n      {{ \'tb.rulenode.min-batch-size-bytes-message\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.linger-ms</mat-label>\n    <input type="number" step="1" min="0" matInput formControlName="linger">\n    <mat-error *ngIf="kafkaConfigForm.get(\'linger\').hasError(\'min\')">\n      {{ \'tb.rulenode.min-linger-ms-message\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.buffer-memory-bytes</mat-label>\n    <input type="number" step="1" min="0" matInput formControlName="bufferMemory">\n    <mat-error *ngIf="kafkaConfigForm.get(\'bufferMemory\').hasError(\'min\')">\n      {{ \'tb.rulenode.min-buffer-memory-bytes-message\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.acks</mat-label>\n    <mat-select formControlName="acks" required>\n      <mat-option *ngFor="let ackValue of ackValues" [value]="ackValue">\n        {{ ackValue }}\n      </mat-option>\n    </mat-select>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.key-serializer</mat-label>\n    <input required matInput formControlName="keySerializer">\n    <mat-error *ngIf="kafkaConfigForm.get(\'keySerializer\').hasError(\'required\')">\n      {{ \'tb.rulenode.key-serializer-required\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.value-serializer</mat-label>\n    <input required matInput formControlName="valueSerializer">\n    <mat-error *ngIf="kafkaConfigForm.get(\'valueSerializer\').hasError(\'required\')">\n      {{ \'tb.rulenode.value-serializer-required\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <label translate class="tb-title">tb.rulenode.other-properties</label>\n  <tb-kv-map-config-old\n    required="false"\n    formControlName="otherProperties"\n    keyText="tb.rulenode.key"\n    keyRequiredText="tb.rulenode.key-required"\n    valText="tb.rulenode.value"\n    valRequiredText="tb.rulenode.value-required">\n  </tb-kv-map-config-old>\n  <mat-checkbox fxFlex formControlName="addMetadataKeyValuesAsKafkaHeaders">\n    {{ \'tb.rulenode.add-metadata-key-values-as-kafka-headers\' | translate }}\n  </mat-checkbox>\n  <div class="tb-hint" translate>tb.rulenode.add-metadata-key-values-as-kafka-headers-hint</div>\n  <mat-form-field fxFlex class="mat-block" *ngIf="kafkaConfigForm.get(\'addMetadataKeyValuesAsKafkaHeaders\').value">\n    <mat-label translate>tb.rulenode.charset-encoding</mat-label>\n    <mat-select formControlName="kafkaHeadersCharset" required>\n      <mat-option *ngFor="let charset of ToByteStandartCharsetTypesValues" [value]="charset">\n        {{ ToByteStandartCharsetTypeTranslationMap.get(charset) | translate }}\n      </mat-option>\n    </mat-select>\n  </mat-form-field>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder}]}});class sr extends f{constructor(e,t){super(e),this.store=e,this.fb=t}configForm(){return this.mqttConfigForm}onConfigurationSet(e){this.mqttConfigForm=this.fb.group({topicPattern:[e?e.topicPattern:null,[O.required]],host:[e?e.host:null,[O.required]],port:[e?e.port:null,[O.required,O.min(1),O.max(65535)]],connectTimeoutSec:[e?e.connectTimeoutSec:null,[O.required,O.min(1),O.max(200)]],clientId:[e?e.clientId:null,[]],appendClientIdSuffix:[{value:!!e&&e.appendClientIdSuffix,disabled:!(e&&me(e.clientId))},[]],cleanSession:[!!e&&e.cleanSession,[]],retainedMessage:[!!e&&e.retainedMessage,[]],ssl:[!!e&&e.ssl,[]],credentials:[e?e.credentials:null,[]]})}updateValidators(e){me(this.mqttConfigForm.get("clientId").value)?this.mqttConfigForm.get("appendClientIdSuffix").enable({emitEvent:!1}):this.mqttConfigForm.get("appendClientIdSuffix").disable({emitEvent:!1}),this.mqttConfigForm.get("appendClientIdSuffix").updateValueAndValidity({emitEvent:e})}validatorTriggers(){return["clientId"]}}e("MqttConfigComponent",sr),sr.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:sr,deps:[{token:P.Store},{token:R.UntypedFormBuilder}],target:t.ɵɵFactoryTarget.Component}),sr.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:sr,selector:"tb-external-node-mqtt-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="mqttConfigForm" fxLayout="column">\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.topic-pattern</mat-label>\n    <input required matInput formControlName="topicPattern">\n    <mat-error *ngIf="mqttConfigForm.get(\'topicPattern\').hasError(\'required\')">\n      {{ \'tb.rulenode.topic-pattern-required\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n  </mat-form-field>\n  <div fxFlex fxLayout="column" fxLayout.gt-sm="row" fxLayoutGap.gt-sm="8px">\n    <mat-form-field fxFlex="60" class="mat-block">\n      <mat-label translate>tb.rulenode.host</mat-label>\n      <input required matInput formControlName="host">\n      <mat-error *ngIf="mqttConfigForm.get(\'host\').hasError(\'required\')">\n        {{ \'tb.rulenode.host-required\' | translate }}\n      </mat-error>\n    </mat-form-field>\n    <mat-form-field fxFlex="40" class="mat-block">\n      <mat-label translate>tb.rulenode.port</mat-label>\n      <input required type="number" step="1" min="1" max="65535" matInput formControlName="port">\n      <mat-error *ngIf="mqttConfigForm.get(\'port\').hasError(\'required\')">\n        {{ \'tb.rulenode.port-required\' | translate }}\n      </mat-error>\n      <mat-error *ngIf="mqttConfigForm.get(\'port\').hasError(\'min\')">\n        {{ \'tb.rulenode.port-range\' | translate }}\n      </mat-error>\n      <mat-error *ngIf="mqttConfigForm.get(\'port\').hasError(\'max\')">\n        {{ \'tb.rulenode.port-range\' | translate }}\n      </mat-error>\n    </mat-form-field>\n    <mat-form-field fxFlex="40" class="mat-block">\n      <mat-label translate>tb.rulenode.connect-timeout</mat-label>\n      <input required type="number" step="1" min="1" max="200" matInput formControlName="connectTimeoutSec">\n      <mat-error *ngIf="mqttConfigForm.get(\'connectTimeoutSec\').hasError(\'required\')">\n        {{ \'tb.rulenode.connect-timeout-required\' | translate }}\n      </mat-error>\n      <mat-error *ngIf="mqttConfigForm.get(\'connectTimeoutSec\').hasError(\'min\')">\n        {{ \'tb.rulenode.connect-timeout-range\' | translate }}\n      </mat-error>\n      <mat-error *ngIf="mqttConfigForm.get(\'connectTimeoutSec\').hasError(\'max\')">\n        {{ \'tb.rulenode.connect-timeout-range\' | translate }}\n      </mat-error>\n    </mat-form-field>\n  </div>\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.client-id</mat-label>\n    <input matInput formControlName="clientId">\n    <mat-hint>{{\'tb.rulenode.client-id-hint\' | translate}}</mat-hint>\n  </mat-form-field>\n  <mat-checkbox formControlName="appendClientIdSuffix">\n    {{ \'tb.rulenode.append-client-id-suffix\' | translate }}\n  </mat-checkbox>\n  <div class="tb-hint">{{ "tb.rulenode.client-id-suffix-hint" | translate }}</div>\n  <mat-checkbox formControlName="cleanSession">\n    {{ \'tb.rulenode.clean-session\' | translate }}\n  </mat-checkbox>\n  <mat-checkbox formControlName="retainedMessage">\n    {{ "tb.rulenode.retained-message" | translate }}\n  </mat-checkbox>\n  <mat-checkbox formControlName="ssl">\n    {{ \'tb.rulenode.enable-ssl\' | translate }}\n  </mat-checkbox>\n  <tb-credentials-config formControlName="credentials" [passwordFieldRequired]="false"></tb-credentials-config>\n</section>\n',styles:[":host .tb-mqtt-credentials-panel-group{margin:0 6px}\n"],dependencies:[{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:Q.MatCheckbox,selector:"mat-checkbox",inputs:["disableRipple","color","tabIndex"],exportAs:["matCheckbox"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatHint,selector:"mat-hint",inputs:["align","id"]},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:W.DefaultLayoutGapDirective,selector:"  [fxLayoutGap], [fxLayoutGap.xs], [fxLayoutGap.sm], [fxLayoutGap.md],  [fxLayoutGap.lg], [fxLayoutGap.xl], [fxLayoutGap.lt-sm], [fxLayoutGap.lt-md],  [fxLayoutGap.lt-lg], [fxLayoutGap.lt-xl], [fxLayoutGap.gt-xs], [fxLayoutGap.gt-sm],  [fxLayoutGap.gt-md], [fxLayoutGap.gt-lg]",inputs:["fxLayoutGap","fxLayoutGap.xs","fxLayoutGap.sm","fxLayoutGap.md","fxLayoutGap.lg","fxLayoutGap.xl","fxLayoutGap.lt-sm","fxLayoutGap.lt-md","fxLayoutGap.lt-lg","fxLayoutGap.lt-xl","fxLayoutGap.gt-xs","fxLayoutGap.gt-sm","fxLayoutGap.gt-md","fxLayoutGap.gt-lg"]},{kind:"directive",type:W.DefaultFlexDirective,selector:"  [fxFlex], [fxFlex.xs], [fxFlex.sm], [fxFlex.md],  [fxFlex.lg], [fxFlex.xl], [fxFlex.lt-sm], [fxFlex.lt-md],  [fxFlex.lt-lg], [fxFlex.lt-xl], [fxFlex.gt-xs], [fxFlex.gt-sm],  [fxFlex.gt-md], [fxFlex.gt-lg]",inputs:["fxFlex","fxFlex.xs","fxFlex.sm","fxFlex.md","fxFlex.lg","fxFlex.xl","fxFlex.lt-sm","fxFlex.lt-md","fxFlex.lt-lg","fxFlex.lt-xl","fxFlex.gt-xs","fxFlex.gt-sm","fxFlex.gt-md","fxFlex.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NumberValueAccessor,selector:"input[type=number][formControlName],input[type=number][formControl],input[type=number][ngModel]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.MinValidator,selector:"input[type=number][min][formControlName],input[type=number][min][formControl],input[type=number][min][ngModel]",inputs:["min"]},{kind:"directive",type:R.MaxValidator,selector:"input[type=number][max][formControlName],input[type=number][max][formControl],input[type=number][max][ngModel]",inputs:["max"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"component",type:wn,selector:"tb-credentials-config",inputs:["required","disableCertPemCredentials","passwordFieldRequired"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:sr,decorators:[{type:n,args:[{selector:"tb-external-node-mqtt-config",template:'<section [formGroup]="mqttConfigForm" fxLayout="column">\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.topic-pattern</mat-label>\n    <input required matInput formControlName="topicPattern">\n    <mat-error *ngIf="mqttConfigForm.get(\'topicPattern\').hasError(\'required\')">\n      {{ \'tb.rulenode.topic-pattern-required\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n  </mat-form-field>\n  <div fxFlex fxLayout="column" fxLayout.gt-sm="row" fxLayoutGap.gt-sm="8px">\n    <mat-form-field fxFlex="60" class="mat-block">\n      <mat-label translate>tb.rulenode.host</mat-label>\n      <input required matInput formControlName="host">\n      <mat-error *ngIf="mqttConfigForm.get(\'host\').hasError(\'required\')">\n        {{ \'tb.rulenode.host-required\' | translate }}\n      </mat-error>\n    </mat-form-field>\n    <mat-form-field fxFlex="40" class="mat-block">\n      <mat-label translate>tb.rulenode.port</mat-label>\n      <input required type="number" step="1" min="1" max="65535" matInput formControlName="port">\n      <mat-error *ngIf="mqttConfigForm.get(\'port\').hasError(\'required\')">\n        {{ \'tb.rulenode.port-required\' | translate }}\n      </mat-error>\n      <mat-error *ngIf="mqttConfigForm.get(\'port\').hasError(\'min\')">\n        {{ \'tb.rulenode.port-range\' | translate }}\n      </mat-error>\n      <mat-error *ngIf="mqttConfigForm.get(\'port\').hasError(\'max\')">\n        {{ \'tb.rulenode.port-range\' | translate }}\n      </mat-error>\n    </mat-form-field>\n    <mat-form-field fxFlex="40" class="mat-block">\n      <mat-label translate>tb.rulenode.connect-timeout</mat-label>\n      <input required type="number" step="1" min="1" max="200" matInput formControlName="connectTimeoutSec">\n      <mat-error *ngIf="mqttConfigForm.get(\'connectTimeoutSec\').hasError(\'required\')">\n        {{ \'tb.rulenode.connect-timeout-required\' | translate }}\n      </mat-error>\n      <mat-error *ngIf="mqttConfigForm.get(\'connectTimeoutSec\').hasError(\'min\')">\n        {{ \'tb.rulenode.connect-timeout-range\' | translate }}\n      </mat-error>\n      <mat-error *ngIf="mqttConfigForm.get(\'connectTimeoutSec\').hasError(\'max\')">\n        {{ \'tb.rulenode.connect-timeout-range\' | translate }}\n      </mat-error>\n    </mat-form-field>\n  </div>\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.client-id</mat-label>\n    <input matInput formControlName="clientId">\n    <mat-hint>{{\'tb.rulenode.client-id-hint\' | translate}}</mat-hint>\n  </mat-form-field>\n  <mat-checkbox formControlName="appendClientIdSuffix">\n    {{ \'tb.rulenode.append-client-id-suffix\' | translate }}\n  </mat-checkbox>\n  <div class="tb-hint">{{ "tb.rulenode.client-id-suffix-hint" | translate }}</div>\n  <mat-checkbox formControlName="cleanSession">\n    {{ \'tb.rulenode.clean-session\' | translate }}\n  </mat-checkbox>\n  <mat-checkbox formControlName="retainedMessage">\n    {{ "tb.rulenode.retained-message" | translate }}\n  </mat-checkbox>\n  <mat-checkbox formControlName="ssl">\n    {{ \'tb.rulenode.enable-ssl\' | translate }}\n  </mat-checkbox>\n  <tb-credentials-config formControlName="credentials" [passwordFieldRequired]="false"></tb-credentials-config>\n</section>\n',styles:[":host .tb-mqtt-credentials-panel-group{margin:0 6px}\n"]}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder}]}});class mr extends f{constructor(e,t){super(e),this.store=e,this.fb=t,this.notificationType=D,this.entityType=F}configForm(){return this.notificationConfigForm}onConfigurationSet(e){this.notificationConfigForm=this.fb.group({templateId:[e?e.templateId:null,[O.required]],targets:[e?e.targets:[],[O.required]]})}}e("NotificationConfigComponent",mr),mr.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:mr,deps:[{token:P.Store},{token:R.FormBuilder}],target:t.ɵɵFactoryTarget.Component}),mr.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:mr,selector:"tb-external-node-notification-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="notificationConfigForm" fxLayout="column">\n  <tb-template-autocomplete\n    required\n    allowCreate\n    formControlName="templateId"\n    [notificationTypes]="notificationType.RULE_NODE">\n  </tb-template-autocomplete>\n  <tb-entity-list\n    required\n    formControlName="targets"\n    labelText="{{ \'notification.recipients\' | translate }}"\n    placeholderText="{{ \'notification.recipient\' | translate }}"\n    requiredText="{{ \'notification.recipients-required\' | translate }}"\n    entityType="{{ entityType.NOTIFICATION_TARGET }}"\n    subType="{{ notificationType.RULE_NODE }}">\n  </tb-entity-list>\n</section>\n',dependencies:[{kind:"component",type:tt.EntityListComponent,selector:"tb-entity-list",inputs:["entityType","subType","labelText","placeholderText","requiredText","required","disabled","subscriptSizing","hint"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"component",type:nt.TemplateAutocompleteComponent,selector:"tb-template-autocomplete",inputs:["required","allowCreate","allowEdit","disabled","notificationTypes"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:mr,decorators:[{type:n,args:[{selector:"tb-external-node-notification-config",template:'<section [formGroup]="notificationConfigForm" fxLayout="column">\n  <tb-template-autocomplete\n    required\n    allowCreate\n    formControlName="templateId"\n    [notificationTypes]="notificationType.RULE_NODE">\n  </tb-template-autocomplete>\n  <tb-entity-list\n    required\n    formControlName="targets"\n    labelText="{{ \'notification.recipients\' | translate }}"\n    placeholderText="{{ \'notification.recipient\' | translate }}"\n    requiredText="{{ \'notification.recipients-required\' | translate }}"\n    entityType="{{ entityType.NOTIFICATION_TARGET }}"\n    subType="{{ notificationType.RULE_NODE }}">\n  </tb-entity-list>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.FormBuilder}]}});class pr extends f{constructor(e,t){super(e),this.store=e,this.fb=t}configForm(){return this.pubSubConfigForm}onConfigurationSet(e){this.pubSubConfigForm=this.fb.group({projectId:[e?e.projectId:null,[O.required]],topicName:[e?e.topicName:null,[O.required]],serviceAccountKey:[e?e.serviceAccountKey:null,[O.required]],serviceAccountKeyFileName:[e?e.serviceAccountKeyFileName:null,[O.required]],messageAttributes:[e?e.messageAttributes:null,[]]})}}e("PubSubConfigComponent",pr),pr.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:pr,deps:[{token:P.Store},{token:R.UntypedFormBuilder}],target:t.ɵɵFactoryTarget.Component}),pr.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:pr,selector:"tb-external-node-pub-sub-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="pubSubConfigForm" fxLayout="column">\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.gcp-project-id</mat-label>\n    <input required matInput formControlName="projectId">\n    <mat-error *ngIf="pubSubConfigForm.get(\'projectId\').hasError(\'required\')">\n      {{ \'tb.rulenode.gcp-project-id-required\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.pubsub-topic-name</mat-label>\n    <input required matInput formControlName="topicName">\n    <mat-error *ngIf="pubSubConfigForm.get(\'topicName\').hasError(\'required\')">\n      {{ \'tb.rulenode.pubsub-topic-name-required\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <tb-file-input style="padding-bottom: 24px;"\n                 formControlName="serviceAccountKey"\n                 [existingFileName]="pubSubConfigForm.get(\'serviceAccountKeyFileName\').value"\n                 (fileNameChanged)="pubSubConfigForm.get(\'serviceAccountKeyFileName\').setValue($event)"\n                 required\n                 requiredAsError\n                 label="{{\'tb.rulenode.gcp-service-account-key\' | translate}}"\n                 noFileText="tb.rulenode.no-file"\n                 dropLabel="{{\'tb.rulenode.drop-file\' | translate}}">\n  </tb-file-input>\n  <label translate class="tb-title">tb.rulenode.message-attributes</label>\n  <div class="tb-hint" [innerHTML]="\'tb.rulenode.message-attributes-hint\' | translate | safe: \'html\'"></div>\n  <tb-kv-map-config-old\n    required="false"\n    formControlName="messageAttributes"\n    keyText="tb.rulenode.name"\n    keyRequiredText="tb.rulenode.name-required"\n    valText="tb.rulenode.value"\n    valRequiredText="tb.rulenode.value-required">\n  </tb-kv-map-config-old>\n</section>\n',dependencies:[{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"component",type:Ze.FileInputComponent,selector:"tb-file-input",inputs:["label","hint","accept","noFileText","inputId","allowedExtensions","dropLabel","maxSizeByte","contentConvertFunction","required","requiredAsError","disabled","existingFileName","readAsBinary","workFromFileObj","multipleFile"],outputs:["fileNameChanged"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"component",type:Cn,selector:"tb-kv-map-config-old",inputs:["disabled","uniqueKeyValuePairValidator","requiredText","keyText","keyRequiredText","valText","valRequiredText","hintText","required"]},{kind:"pipe",type:he.SafePipe,name:"safe"},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:pr,decorators:[{type:n,args:[{selector:"tb-external-node-pub-sub-config",template:'<section [formGroup]="pubSubConfigForm" fxLayout="column">\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.gcp-project-id</mat-label>\n    <input required matInput formControlName="projectId">\n    <mat-error *ngIf="pubSubConfigForm.get(\'projectId\').hasError(\'required\')">\n      {{ \'tb.rulenode.gcp-project-id-required\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.pubsub-topic-name</mat-label>\n    <input required matInput formControlName="topicName">\n    <mat-error *ngIf="pubSubConfigForm.get(\'topicName\').hasError(\'required\')">\n      {{ \'tb.rulenode.pubsub-topic-name-required\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <tb-file-input style="padding-bottom: 24px;"\n                 formControlName="serviceAccountKey"\n                 [existingFileName]="pubSubConfigForm.get(\'serviceAccountKeyFileName\').value"\n                 (fileNameChanged)="pubSubConfigForm.get(\'serviceAccountKeyFileName\').setValue($event)"\n                 required\n                 requiredAsError\n                 label="{{\'tb.rulenode.gcp-service-account-key\' | translate}}"\n                 noFileText="tb.rulenode.no-file"\n                 dropLabel="{{\'tb.rulenode.drop-file\' | translate}}">\n  </tb-file-input>\n  <label translate class="tb-title">tb.rulenode.message-attributes</label>\n  <div class="tb-hint" [innerHTML]="\'tb.rulenode.message-attributes-hint\' | translate | safe: \'html\'"></div>\n  <tb-kv-map-config-old\n    required="false"\n    formControlName="messageAttributes"\n    keyText="tb.rulenode.name"\n    keyRequiredText="tb.rulenode.name-required"\n    valText="tb.rulenode.value"\n    valRequiredText="tb.rulenode.value-required">\n  </tb-kv-map-config-old>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder}]}});class dr extends f{constructor(e,t){super(e),this.store=e,this.fb=t,this.messageProperties=[null,"BASIC","TEXT_PLAIN","MINIMAL_BASIC","MINIMAL_PERSISTENT_BASIC","PERSISTENT_BASIC","PERSISTENT_TEXT_PLAIN"]}configForm(){return this.rabbitMqConfigForm}onConfigurationSet(e){this.rabbitMqConfigForm=this.fb.group({exchangeNamePattern:[e?e.exchangeNamePattern:null,[]],routingKeyPattern:[e?e.routingKeyPattern:null,[]],messageProperties:[e?e.messageProperties:null,[]],host:[e?e.host:null,[O.required]],port:[e?e.port:null,[O.required,O.min(1),O.max(65535)]],virtualHost:[e?e.virtualHost:null,[]],username:[e?e.username:null,[]],password:[e?e.password:null,[]],automaticRecoveryEnabled:[!!e&&e.automaticRecoveryEnabled,[]],connectionTimeout:[e?e.connectionTimeout:null,[O.min(0)]],handshakeTimeout:[e?e.handshakeTimeout:null,[O.min(0)]],clientProperties:[e?e.clientProperties:null,[]]})}}e("RabbitMqConfigComponent",dr),dr.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:dr,deps:[{token:P.Store},{token:R.UntypedFormBuilder}],target:t.ɵɵFactoryTarget.Component}),dr.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:dr,selector:"tb-external-node-rabbit-mq-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="rabbitMqConfigForm" fxLayout="column">\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.exchange-name-pattern</mat-label>\n    <input matInput formControlName="exchangeNamePattern">\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.routing-key-pattern</mat-label>\n    <input matInput formControlName="routingKeyPattern">\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.message-properties</mat-label>\n    <mat-select formControlName="messageProperties">\n      <mat-option *ngFor="let property of messageProperties" [value]="property">\n        {{ property }}\n      </mat-option>\n    </mat-select>\n  </mat-form-field>\n  <div fxLayout.gt-sm="row" fxLayoutGap.gt-sm="8px">\n    <mat-form-field fxFlex="100" fxFlex.gt-sm="60" class="mat-block">\n      <mat-label translate>tb.rulenode.host</mat-label>\n      <input required matInput formControlName="host">\n      <mat-error *ngIf="rabbitMqConfigForm.get(\'host\').hasError(\'required\')">\n        {{ \'tb.rulenode.host-required\' | translate }}\n      </mat-error>\n    </mat-form-field>\n    <mat-form-field fxFlex="100" fxFlex.gt-sm="40" class="mat-block">\n      <mat-label translate>tb.rulenode.port</mat-label>\n      <input required type="number" step="1" min="1" max="65535" matInput formControlName="port">\n      <mat-error *ngIf="rabbitMqConfigForm.get(\'port\').hasError(\'required\')">\n        {{ \'tb.rulenode.port-required\' | translate }}\n      </mat-error>\n      <mat-error *ngIf="rabbitMqConfigForm.get(\'port\').hasError(\'min\')">\n        {{ \'tb.rulenode.port-range\' | translate }}\n      </mat-error>\n      <mat-error *ngIf="rabbitMqConfigForm.get(\'port\').hasError(\'max\')">\n        {{ \'tb.rulenode.port-range\' | translate }}\n      </mat-error>\n    </mat-form-field>\n  </div>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.virtual-host</mat-label>\n    <input matInput formControlName="virtualHost">\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.username</mat-label>\n    <input matInput formControlName="username">\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.password</mat-label>\n    <input type="password" matInput formControlName="password">\n    <tb-toggle-password matSuffix></tb-toggle-password>\n  </mat-form-field>\n  <mat-checkbox formControlName="automaticRecoveryEnabled">\n    {{ \'tb.rulenode.automatic-recovery\' | translate }}\n  </mat-checkbox>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.connection-timeout-ms</mat-label>\n    <input type="number" step="1" min="0" matInput formControlName="connectionTimeout">\n    <mat-error *ngIf="rabbitMqConfigForm.get(\'connectionTimeout\').hasError(\'min\')">\n      {{ \'tb.rulenode.min-connection-timeout-ms-message\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.handshake-timeout-ms</mat-label>\n    <input type="number" step="1" min="0" matInput formControlName="handshakeTimeout">\n    <mat-error *ngIf="rabbitMqConfigForm.get(\'handshakeTimeout\').hasError(\'min\')">\n      {{ \'tb.rulenode.min-handshake-timeout-ms-message\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <label translate class="tb-title">tb.rulenode.client-properties</label>\n  <tb-kv-map-config-old\n    required="false"\n    formControlName="clientProperties"\n    keyText="tb.rulenode.key"\n    keyRequiredText="tb.rulenode.key-required"\n    valText="tb.rulenode.value"\n    valRequiredText="tb.rulenode.value-required">\n  </tb-kv-map-config-old>\n</section>\n',dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:Q.MatCheckbox,selector:"mat-checkbox",inputs:["disableRipple","color","tabIndex"],exportAs:["matCheckbox"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"directive",type:Y.MatSuffix,selector:"[matSuffix], [matIconSuffix], [matTextSuffix]",inputs:["matTextSuffix"]},{kind:"component",type:X.MatSelect,selector:"mat-select",inputs:["disabled","disableRipple","tabIndex","hideSingleSelectionIndicator"],exportAs:["matSelect"]},{kind:"component",type:ee.MatOption,selector:"mat-option",exportAs:["matOption"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:W.DefaultLayoutGapDirective,selector:"  [fxLayoutGap], [fxLayoutGap.xs], [fxLayoutGap.sm], [fxLayoutGap.md],  [fxLayoutGap.lg], [fxLayoutGap.xl], [fxLayoutGap.lt-sm], [fxLayoutGap.lt-md],  [fxLayoutGap.lt-lg], [fxLayoutGap.lt-xl], [fxLayoutGap.gt-xs], [fxLayoutGap.gt-sm],  [fxLayoutGap.gt-md], [fxLayoutGap.gt-lg]",inputs:["fxLayoutGap","fxLayoutGap.xs","fxLayoutGap.sm","fxLayoutGap.md","fxLayoutGap.lg","fxLayoutGap.xl","fxLayoutGap.lt-sm","fxLayoutGap.lt-md","fxLayoutGap.lt-lg","fxLayoutGap.lt-xl","fxLayoutGap.gt-xs","fxLayoutGap.gt-sm","fxLayoutGap.gt-md","fxLayoutGap.gt-lg"]},{kind:"directive",type:W.DefaultFlexDirective,selector:"  [fxFlex], [fxFlex.xs], [fxFlex.sm], [fxFlex.md],  [fxFlex.lg], [fxFlex.xl], [fxFlex.lt-sm], [fxFlex.lt-md],  [fxFlex.lt-lg], [fxFlex.lt-xl], [fxFlex.gt-xs], [fxFlex.gt-sm],  [fxFlex.gt-md], [fxFlex.gt-lg]",inputs:["fxFlex","fxFlex.xs","fxFlex.sm","fxFlex.md","fxFlex.lg","fxFlex.xl","fxFlex.lt-sm","fxFlex.lt-md","fxFlex.lt-lg","fxFlex.lt-xl","fxFlex.gt-xs","fxFlex.gt-sm","fxFlex.gt-md","fxFlex.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NumberValueAccessor,selector:"input[type=number][formControlName],input[type=number][formControl],input[type=number][ngModel]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.MinValidator,selector:"input[type=number][min][formControlName],input[type=number][min][formControl],input[type=number][min][ngModel]",inputs:["min"]},{kind:"directive",type:R.MaxValidator,selector:"input[type=number][max][formControlName],input[type=number][max][formControl],input[type=number][max][ngModel]",inputs:["max"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"component",type:Xe.TogglePasswordComponent,selector:"tb-toggle-password"},{kind:"component",type:Cn,selector:"tb-kv-map-config-old",inputs:["disabled","uniqueKeyValuePairValidator","requiredText","keyText","keyRequiredText","valText","valRequiredText","hintText","required"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:dr,decorators:[{type:n,args:[{selector:"tb-external-node-rabbit-mq-config",template:'<section [formGroup]="rabbitMqConfigForm" fxLayout="column">\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.exchange-name-pattern</mat-label>\n    <input matInput formControlName="exchangeNamePattern">\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.routing-key-pattern</mat-label>\n    <input matInput formControlName="routingKeyPattern">\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.message-properties</mat-label>\n    <mat-select formControlName="messageProperties">\n      <mat-option *ngFor="let property of messageProperties" [value]="property">\n        {{ property }}\n      </mat-option>\n    </mat-select>\n  </mat-form-field>\n  <div fxLayout.gt-sm="row" fxLayoutGap.gt-sm="8px">\n    <mat-form-field fxFlex="100" fxFlex.gt-sm="60" class="mat-block">\n      <mat-label translate>tb.rulenode.host</mat-label>\n      <input required matInput formControlName="host">\n      <mat-error *ngIf="rabbitMqConfigForm.get(\'host\').hasError(\'required\')">\n        {{ \'tb.rulenode.host-required\' | translate }}\n      </mat-error>\n    </mat-form-field>\n    <mat-form-field fxFlex="100" fxFlex.gt-sm="40" class="mat-block">\n      <mat-label translate>tb.rulenode.port</mat-label>\n      <input required type="number" step="1" min="1" max="65535" matInput formControlName="port">\n      <mat-error *ngIf="rabbitMqConfigForm.get(\'port\').hasError(\'required\')">\n        {{ \'tb.rulenode.port-required\' | translate }}\n      </mat-error>\n      <mat-error *ngIf="rabbitMqConfigForm.get(\'port\').hasError(\'min\')">\n        {{ \'tb.rulenode.port-range\' | translate }}\n      </mat-error>\n      <mat-error *ngIf="rabbitMqConfigForm.get(\'port\').hasError(\'max\')">\n        {{ \'tb.rulenode.port-range\' | translate }}\n      </mat-error>\n    </mat-form-field>\n  </div>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.virtual-host</mat-label>\n    <input matInput formControlName="virtualHost">\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.username</mat-label>\n    <input matInput formControlName="username">\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.password</mat-label>\n    <input type="password" matInput formControlName="password">\n    <tb-toggle-password matSuffix></tb-toggle-password>\n  </mat-form-field>\n  <mat-checkbox formControlName="automaticRecoveryEnabled">\n    {{ \'tb.rulenode.automatic-recovery\' | translate }}\n  </mat-checkbox>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.connection-timeout-ms</mat-label>\n    <input type="number" step="1" min="0" matInput formControlName="connectionTimeout">\n    <mat-error *ngIf="rabbitMqConfigForm.get(\'connectionTimeout\').hasError(\'min\')">\n      {{ \'tb.rulenode.min-connection-timeout-ms-message\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.handshake-timeout-ms</mat-label>\n    <input type="number" step="1" min="0" matInput formControlName="handshakeTimeout">\n    <mat-error *ngIf="rabbitMqConfigForm.get(\'handshakeTimeout\').hasError(\'min\')">\n      {{ \'tb.rulenode.min-handshake-timeout-ms-message\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <label translate class="tb-title">tb.rulenode.client-properties</label>\n  <tb-kv-map-config-old\n    required="false"\n    formControlName="clientProperties"\n    keyText="tb.rulenode.key"\n    keyRequiredText="tb.rulenode.key-required"\n    valText="tb.rulenode.value"\n    valRequiredText="tb.rulenode.value-required">\n  </tb-kv-map-config-old>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder}]}});class ur extends f{constructor(e,t){super(e),this.store=e,this.fb=t,this.proxySchemes=["http","https"],this.httpRequestTypes=Object.keys($t)}configForm(){return this.restApiCallConfigForm}onConfigurationSet(e){this.restApiCallConfigForm=this.fb.group({restEndpointUrlPattern:[e?e.restEndpointUrlPattern:null,[O.required]],requestMethod:[e?e.requestMethod:null,[O.required]],useSimpleClientHttpFactory:[!!e&&e.useSimpleClientHttpFactory,[]],parseToPlainText:[!!e&&e.parseToPlainText,[]],ignoreRequestBody:[!!e&&e.ignoreRequestBody,[]],enableProxy:[!!e&&e.enableProxy,[]],useSystemProxyProperties:[!!e&&e.enableProxy,[]],proxyScheme:[e?e.proxyHost:null,[]],proxyHost:[e?e.proxyHost:null,[]],proxyPort:[e?e.proxyPort:null,[]],proxyUser:[e?e.proxyUser:null,[]],proxyPassword:[e?e.proxyPassword:null,[]],readTimeoutMs:[e?e.readTimeoutMs:null,[]],maxParallelRequestsCount:[e?e.maxParallelRequestsCount:null,[O.min(0)]],headers:[e?e.headers:null,[]],useRedisQueueForMsgPersistence:[!!e&&e.useRedisQueueForMsgPersistence,[]],trimQueue:[!!e&&e.trimQueue,[]],maxQueueSize:[e?e.maxQueueSize:null,[]],credentials:[e?e.credentials:null,[]]})}validatorTriggers(){return["useSimpleClientHttpFactory","useRedisQueueForMsgPersistence","enableProxy","useSystemProxyProperties"]}updateValidators(e){const t=this.restApiCallConfigForm.get("useSimpleClientHttpFactory").value,n=this.restApiCallConfigForm.get("useRedisQueueForMsgPersistence").value,r=this.restApiCallConfigForm.get("enableProxy").value,o=this.restApiCallConfigForm.get("useSystemProxyProperties").value;r&&!o?(this.restApiCallConfigForm.get("proxyHost").setValidators(r?[O.required]:[]),this.restApiCallConfigForm.get("proxyPort").setValidators(r?[O.required,O.min(1),O.max(65535)]:[])):(this.restApiCallConfigForm.get("proxyHost").setValidators([]),this.restApiCallConfigForm.get("proxyPort").setValidators([]),t?this.restApiCallConfigForm.get("readTimeoutMs").setValidators([]):this.restApiCallConfigForm.get("readTimeoutMs").setValidators([O.min(0)])),n?this.restApiCallConfigForm.get("maxQueueSize").setValidators([O.min(0)]):this.restApiCallConfigForm.get("maxQueueSize").setValidators([]),this.restApiCallConfigForm.get("readTimeoutMs").updateValueAndValidity({emitEvent:e}),this.restApiCallConfigForm.get("maxQueueSize").updateValueAndValidity({emitEvent:e}),this.restApiCallConfigForm.get("proxyHost").updateValueAndValidity({emitEvent:e}),this.restApiCallConfigForm.get("proxyPort").updateValueAndValidity({emitEvent:e}),this.restApiCallConfigForm.get("credentials").updateValueAndValidity({emitEvent:e})}}e("RestApiCallConfigComponent",ur),ur.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:ur,deps:[{token:P.Store},{token:R.UntypedFormBuilder}],target:t.ɵɵFactoryTarget.Component}),ur.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:ur,selector:"tb-external-node-rest-api-call-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="restApiCallConfigForm" fxLayout="column">\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.endpoint-url-pattern</mat-label>\n    <input required matInput formControlName="restEndpointUrlPattern">\n    <mat-error *ngIf="restApiCallConfigForm.get(\'restEndpointUrlPattern\').hasError(\'required\')">\n      {{ \'tb.rulenode.endpoint-url-pattern-required\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.request-method</mat-label>\n    <mat-select formControlName="requestMethod">\n      <mat-option *ngFor="let requestType of httpRequestTypes" [value]="requestType">\n        {{ requestType }}\n      </mat-option>\n    </mat-select>\n  </mat-form-field>\n  <mat-checkbox formControlName="enableProxy">\n    {{ \'tb.rulenode.enable-proxy\' | translate }}\n  </mat-checkbox>\n  <mat-checkbox *ngIf="!restApiCallConfigForm.get(\'enableProxy\').value" formControlName="useSimpleClientHttpFactory">\n    {{ \'tb.rulenode.use-simple-client-http-factory\' | translate }}\n  </mat-checkbox>\n  <mat-checkbox formControlName="parseToPlainText">\n    {{ \'tb.rulenode.parse-to-plain-text\' | translate }}\n  </mat-checkbox>\n  <div class="tb-hint" style="padding-bottom: 5px;" translate>tb.rulenode.parse-to-plain-text-hint</div>\n  <mat-checkbox formControlName="ignoreRequestBody">\n    {{ \'tb.rulenode.ignore-request-body\' | translate }}\n  </mat-checkbox>\n  <div *ngIf="restApiCallConfigForm.get(\'enableProxy\').value">\n    <mat-checkbox formControlName="useSystemProxyProperties">\n      {{ \'tb.rulenode.use-system-proxy-properties\' | translate }}\n    </mat-checkbox>\n    <div *ngIf="!restApiCallConfigForm.get(\'useSystemProxyProperties\').value">\n      <div fxLayout.gt-sm="row" fxLayoutGap.gt-sm="8px">\n        <mat-form-field class="mat-block" fxFlex="100" fxFlex.gt-sm="10">\n          <mat-label translate>tb.rulenode.proxy-scheme</mat-label>\n          <mat-select formControlName="proxyScheme">\n            <mat-option *ngFor="let proxyScheme of proxySchemes" [value]="proxyScheme">\n              {{ proxyScheme }}\n            </mat-option>\n          </mat-select>\n        </mat-form-field>\n        <mat-form-field class="md-block" fxFlex="100" fxFlex.gt-sm="50">\n          <mat-label translate>tb.rulenode.proxy-host</mat-label>\n          <input matInput required formControlName="proxyHost">\n          <mat-error *ngIf="restApiCallConfigForm.get(\'proxyHost\').hasError(\'required\')">\n            {{ \'tb.rulenode.proxy-host-required\' | translate }}\n          </mat-error>\n        </mat-form-field>\n        <mat-form-field class="mat-block" fxFlex="100" fxFlex.gt-sm="40">\n          <mat-label translate>tb.rulenode.proxy-port</mat-label>\n          <input matInput required formControlName="proxyPort" type="number" step="1">\n          <mat-error *ngIf="restApiCallConfigForm.get(\'proxyPort\').hasError(\'required\')">\n            {{ \'tb.rulenode.proxy-port-required\' | translate }}\n          </mat-error>\n          <mat-error\n            *ngIf="restApiCallConfigForm.get(\'proxyPort\').hasError(\'min\') || restApiCallConfigForm.get(\'proxyPort\').hasError(\'max\')">\n            {{ \'tb.rulenode.proxy-port-range\' | translate }}\n          </mat-error>\n        </mat-form-field>\n      </div>\n      <mat-form-field class="mat-block">\n        <mat-label translate>tb.rulenode.proxy-user</mat-label>\n        <input matInput formControlName="proxyUser">\n      </mat-form-field>\n      <mat-form-field class="mat-block">\n        <mat-label translate>tb.rulenode.proxy-password</mat-label>\n        <input matInput formControlName="proxyPassword">\n      </mat-form-field>\n    </div>\n  </div>\n  <mat-form-field *ngIf="!restApiCallConfigForm.get(\'useSimpleClientHttpFactory\').value || restApiCallConfigForm.get(\'enableProxy\').value" class="mat-block"\n                  subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.read-timeout</mat-label>\n    <input type="number" step="1" min="0" matInput formControlName="readTimeoutMs">\n    <mat-hint translate>tb.rulenode.read-timeout-hint</mat-hint>\n  </mat-form-field>\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.max-parallel-requests-count</mat-label>\n    <input type="number" step="1" min="0" matInput formControlName="maxParallelRequestsCount">\n    <mat-hint translate>tb.rulenode.max-parallel-requests-count-hint</mat-hint>\n  </mat-form-field>\n  <label translate class="tb-title">tb.rulenode.headers</label>\n  <div class="tb-hint" [innerHTML]="\'tb.rulenode.headers-hint\' | translate | safe: \'html\'">  </div>\n  <tb-kv-map-config-old\n    required="false"\n    formControlName="headers"\n    keyText="tb.rulenode.header"\n    keyRequiredText="tb.rulenode.header-required"\n    valText="tb.rulenode.value"\n    valRequiredText="tb.rulenode.value-required">\n  </tb-kv-map-config-old>\n  <mat-checkbox formControlName="useRedisQueueForMsgPersistence">\n    {{ \'tb.rulenode.use-redis-queue\' | translate }}\n  </mat-checkbox>\n  <div fxLayout="column" *ngIf="restApiCallConfigForm.get(\'useRedisQueueForMsgPersistence\').value === true">\n    <mat-checkbox formControlName="trimQueue">\n      {{ \'tb.rulenode.trim-redis-queue\' | translate }}\n    </mat-checkbox>\n    <mat-form-field class="mat-block">\n      <mat-label translate>tb.rulenode.redis-queue-max-size</mat-label>\n      <input type="number" step="1" min="0" matInput formControlName="maxQueueSize">\n    </mat-form-field>\n  </div>\n  <tb-credentials-config formControlName="credentials" [disableCertPemCredentials]="restApiCallConfigForm.get(\'useSimpleClientHttpFactory\').value"></tb-credentials-config>\n</section>\n',dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:Q.MatCheckbox,selector:"mat-checkbox",inputs:["disableRipple","color","tabIndex"],exportAs:["matCheckbox"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatHint,selector:"mat-hint",inputs:["align","id"]},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"component",type:X.MatSelect,selector:"mat-select",inputs:["disabled","disableRipple","tabIndex","hideSingleSelectionIndicator"],exportAs:["matSelect"]},{kind:"component",type:ee.MatOption,selector:"mat-option",exportAs:["matOption"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:W.DefaultLayoutGapDirective,selector:"  [fxLayoutGap], [fxLayoutGap.xs], [fxLayoutGap.sm], [fxLayoutGap.md],  [fxLayoutGap.lg], [fxLayoutGap.xl], [fxLayoutGap.lt-sm], [fxLayoutGap.lt-md],  [fxLayoutGap.lt-lg], [fxLayoutGap.lt-xl], [fxLayoutGap.gt-xs], [fxLayoutGap.gt-sm],  [fxLayoutGap.gt-md], [fxLayoutGap.gt-lg]",inputs:["fxLayoutGap","fxLayoutGap.xs","fxLayoutGap.sm","fxLayoutGap.md","fxLayoutGap.lg","fxLayoutGap.xl","fxLayoutGap.lt-sm","fxLayoutGap.lt-md","fxLayoutGap.lt-lg","fxLayoutGap.lt-xl","fxLayoutGap.gt-xs","fxLayoutGap.gt-sm","fxLayoutGap.gt-md","fxLayoutGap.gt-lg"]},{kind:"directive",type:W.DefaultFlexDirective,selector:"  [fxFlex], [fxFlex.xs], [fxFlex.sm], [fxFlex.md],  [fxFlex.lg], [fxFlex.xl], [fxFlex.lt-sm], [fxFlex.lt-md],  [fxFlex.lt-lg], [fxFlex.lt-xl], [fxFlex.gt-xs], [fxFlex.gt-sm],  [fxFlex.gt-md], [fxFlex.gt-lg]",inputs:["fxFlex","fxFlex.xs","fxFlex.sm","fxFlex.md","fxFlex.lg","fxFlex.xl","fxFlex.lt-sm","fxFlex.lt-md","fxFlex.lt-lg","fxFlex.lt-xl","fxFlex.gt-xs","fxFlex.gt-sm","fxFlex.gt-md","fxFlex.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NumberValueAccessor,selector:"input[type=number][formControlName],input[type=number][formControl],input[type=number][ngModel]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.MinValidator,selector:"input[type=number][min][formControlName],input[type=number][min][formControl],input[type=number][min][ngModel]",inputs:["min"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"component",type:wn,selector:"tb-credentials-config",inputs:["required","disableCertPemCredentials","passwordFieldRequired"]},{kind:"component",type:Cn,selector:"tb-kv-map-config-old",inputs:["disabled","uniqueKeyValuePairValidator","requiredText","keyText","keyRequiredText","valText","valRequiredText","hintText","required"]},{kind:"pipe",type:he.SafePipe,name:"safe"},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:ur,decorators:[{type:n,args:[{selector:"tb-external-node-rest-api-call-config",template:'<section [formGroup]="restApiCallConfigForm" fxLayout="column">\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.endpoint-url-pattern</mat-label>\n    <input required matInput formControlName="restEndpointUrlPattern">\n    <mat-error *ngIf="restApiCallConfigForm.get(\'restEndpointUrlPattern\').hasError(\'required\')">\n      {{ \'tb.rulenode.endpoint-url-pattern-required\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.request-method</mat-label>\n    <mat-select formControlName="requestMethod">\n      <mat-option *ngFor="let requestType of httpRequestTypes" [value]="requestType">\n        {{ requestType }}\n      </mat-option>\n    </mat-select>\n  </mat-form-field>\n  <mat-checkbox formControlName="enableProxy">\n    {{ \'tb.rulenode.enable-proxy\' | translate }}\n  </mat-checkbox>\n  <mat-checkbox *ngIf="!restApiCallConfigForm.get(\'enableProxy\').value" formControlName="useSimpleClientHttpFactory">\n    {{ \'tb.rulenode.use-simple-client-http-factory\' | translate }}\n  </mat-checkbox>\n  <mat-checkbox formControlName="parseToPlainText">\n    {{ \'tb.rulenode.parse-to-plain-text\' | translate }}\n  </mat-checkbox>\n  <div class="tb-hint" style="padding-bottom: 5px;" translate>tb.rulenode.parse-to-plain-text-hint</div>\n  <mat-checkbox formControlName="ignoreRequestBody">\n    {{ \'tb.rulenode.ignore-request-body\' | translate }}\n  </mat-checkbox>\n  <div *ngIf="restApiCallConfigForm.get(\'enableProxy\').value">\n    <mat-checkbox formControlName="useSystemProxyProperties">\n      {{ \'tb.rulenode.use-system-proxy-properties\' | translate }}\n    </mat-checkbox>\n    <div *ngIf="!restApiCallConfigForm.get(\'useSystemProxyProperties\').value">\n      <div fxLayout.gt-sm="row" fxLayoutGap.gt-sm="8px">\n        <mat-form-field class="mat-block" fxFlex="100" fxFlex.gt-sm="10">\n          <mat-label translate>tb.rulenode.proxy-scheme</mat-label>\n          <mat-select formControlName="proxyScheme">\n            <mat-option *ngFor="let proxyScheme of proxySchemes" [value]="proxyScheme">\n              {{ proxyScheme }}\n            </mat-option>\n          </mat-select>\n        </mat-form-field>\n        <mat-form-field class="md-block" fxFlex="100" fxFlex.gt-sm="50">\n          <mat-label translate>tb.rulenode.proxy-host</mat-label>\n          <input matInput required formControlName="proxyHost">\n          <mat-error *ngIf="restApiCallConfigForm.get(\'proxyHost\').hasError(\'required\')">\n            {{ \'tb.rulenode.proxy-host-required\' | translate }}\n          </mat-error>\n        </mat-form-field>\n        <mat-form-field class="mat-block" fxFlex="100" fxFlex.gt-sm="40">\n          <mat-label translate>tb.rulenode.proxy-port</mat-label>\n          <input matInput required formControlName="proxyPort" type="number" step="1">\n          <mat-error *ngIf="restApiCallConfigForm.get(\'proxyPort\').hasError(\'required\')">\n            {{ \'tb.rulenode.proxy-port-required\' | translate }}\n          </mat-error>\n          <mat-error\n            *ngIf="restApiCallConfigForm.get(\'proxyPort\').hasError(\'min\') || restApiCallConfigForm.get(\'proxyPort\').hasError(\'max\')">\n            {{ \'tb.rulenode.proxy-port-range\' | translate }}\n          </mat-error>\n        </mat-form-field>\n      </div>\n      <mat-form-field class="mat-block">\n        <mat-label translate>tb.rulenode.proxy-user</mat-label>\n        <input matInput formControlName="proxyUser">\n      </mat-form-field>\n      <mat-form-field class="mat-block">\n        <mat-label translate>tb.rulenode.proxy-password</mat-label>\n        <input matInput formControlName="proxyPassword">\n      </mat-form-field>\n    </div>\n  </div>\n  <mat-form-field *ngIf="!restApiCallConfigForm.get(\'useSimpleClientHttpFactory\').value || restApiCallConfigForm.get(\'enableProxy\').value" class="mat-block"\n                  subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.read-timeout</mat-label>\n    <input type="number" step="1" min="0" matInput formControlName="readTimeoutMs">\n    <mat-hint translate>tb.rulenode.read-timeout-hint</mat-hint>\n  </mat-form-field>\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.max-parallel-requests-count</mat-label>\n    <input type="number" step="1" min="0" matInput formControlName="maxParallelRequestsCount">\n    <mat-hint translate>tb.rulenode.max-parallel-requests-count-hint</mat-hint>\n  </mat-form-field>\n  <label translate class="tb-title">tb.rulenode.headers</label>\n  <div class="tb-hint" [innerHTML]="\'tb.rulenode.headers-hint\' | translate | safe: \'html\'">  </div>\n  <tb-kv-map-config-old\n    required="false"\n    formControlName="headers"\n    keyText="tb.rulenode.header"\n    keyRequiredText="tb.rulenode.header-required"\n    valText="tb.rulenode.value"\n    valRequiredText="tb.rulenode.value-required">\n  </tb-kv-map-config-old>\n  <mat-checkbox formControlName="useRedisQueueForMsgPersistence">\n    {{ \'tb.rulenode.use-redis-queue\' | translate }}\n  </mat-checkbox>\n  <div fxLayout="column" *ngIf="restApiCallConfigForm.get(\'useRedisQueueForMsgPersistence\').value === true">\n    <mat-checkbox formControlName="trimQueue">\n      {{ \'tb.rulenode.trim-redis-queue\' | translate }}\n    </mat-checkbox>\n    <mat-form-field class="mat-block">\n      <mat-label translate>tb.rulenode.redis-queue-max-size</mat-label>\n      <input type="number" step="1" min="0" matInput formControlName="maxQueueSize">\n    </mat-form-field>\n  </div>\n  <tb-credentials-config formControlName="credentials" [disableCertPemCredentials]="restApiCallConfigForm.get(\'useSimpleClientHttpFactory\').value"></tb-credentials-config>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder}]}});class cr extends f{constructor(e,t){super(e),this.store=e,this.fb=t,this.smtpProtocols=["smtp","smtps"],this.tlsVersions=["TLSv1","TLSv1.1","TLSv1.2","TLSv1.3"]}configForm(){return this.sendEmailConfigForm}onConfigurationSet(e){this.sendEmailConfigForm=this.fb.group({useSystemSmtpSettings:[!!e&&e.useSystemSmtpSettings,[]],smtpProtocol:[e?e.smtpProtocol:null,[]],smtpHost:[e?e.smtpHost:null,[]],smtpPort:[e?e.smtpPort:null,[]],timeout:[e?e.timeout:null,[]],enableTls:[!!e&&e.enableTls,[]],tlsVersion:[e?e.tlsVersion:null,[]],enableProxy:[!!e&&e.enableProxy,[]],proxyHost:[e?e.proxyHost:null,[]],proxyPort:[e?e.proxyPort:null,[]],proxyUser:[e?e.proxyUser:null,[]],proxyPassword:[e?e.proxyPassword:null,[]],username:[e?e.username:null,[]],password:[e?e.password:null,[]]})}validatorTriggers(){return["useSystemSmtpSettings","enableProxy"]}updateValidators(e){const t=this.sendEmailConfigForm.get("useSystemSmtpSettings").value,n=this.sendEmailConfigForm.get("enableProxy").value;t?(this.sendEmailConfigForm.get("smtpProtocol").setValidators([]),this.sendEmailConfigForm.get("smtpHost").setValidators([]),this.sendEmailConfigForm.get("smtpPort").setValidators([]),this.sendEmailConfigForm.get("timeout").setValidators([]),this.sendEmailConfigForm.get("proxyHost").setValidators([]),this.sendEmailConfigForm.get("proxyPort").setValidators([])):(this.sendEmailConfigForm.get("smtpProtocol").setValidators([O.required]),this.sendEmailConfigForm.get("smtpHost").setValidators([O.required]),this.sendEmailConfigForm.get("smtpPort").setValidators([O.required,O.min(1),O.max(65535)]),this.sendEmailConfigForm.get("timeout").setValidators([O.required,O.min(0)]),this.sendEmailConfigForm.get("proxyHost").setValidators(n?[O.required]:[]),this.sendEmailConfigForm.get("proxyPort").setValidators(n?[O.required,O.min(1),O.max(65535)]:[])),this.sendEmailConfigForm.get("smtpProtocol").updateValueAndValidity({emitEvent:e}),this.sendEmailConfigForm.get("smtpHost").updateValueAndValidity({emitEvent:e}),this.sendEmailConfigForm.get("smtpPort").updateValueAndValidity({emitEvent:e}),this.sendEmailConfigForm.get("timeout").updateValueAndValidity({emitEvent:e}),this.sendEmailConfigForm.get("proxyHost").updateValueAndValidity({emitEvent:e}),this.sendEmailConfigForm.get("proxyPort").updateValueAndValidity({emitEvent:e})}}e("SendEmailConfigComponent",cr),cr.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:cr,deps:[{token:P.Store},{token:R.UntypedFormBuilder}],target:t.ɵɵFactoryTarget.Component}),cr.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:cr,selector:"tb-external-node-send-email-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="sendEmailConfigForm" fxLayout="column">\n  <mat-checkbox formControlName="useSystemSmtpSettings">\n    {{ \'tb.rulenode.use-system-smtp-settings\' | translate }}\n  </mat-checkbox>\n  <section fxLayout="column" *ngIf="sendEmailConfigForm.get(\'useSystemSmtpSettings\').value === false">\n    <mat-form-field class="mat-block">\n      <mat-label translate>tb.rulenode.smtp-protocol</mat-label>\n      <mat-select formControlName="smtpProtocol">\n        <mat-option *ngFor="let smtpProtocol of smtpProtocols" [value]="smtpProtocol">\n          {{ smtpProtocol.toUpperCase() }}\n        </mat-option>\n      </mat-select>\n    </mat-form-field>\n    <div fxLayout.gt-sm="row" fxLayoutGap.gt-sm="8px">\n      <mat-form-field fxFlex="100" fxFlex.gt-sm="60" class="mat-block">\n        <mat-label translate>tb.rulenode.smtp-host</mat-label>\n        <input required matInput formControlName="smtpHost">\n        <mat-error *ngIf="sendEmailConfigForm.get(\'smtpHost\').hasError(\'required\')">\n          {{ \'tb.rulenode.smtp-host-required\' | translate }}\n        </mat-error>\n      </mat-form-field>\n      <mat-form-field fxFlex="100" fxFlex.gt-sm="40" class="mat-block">\n        <mat-label translate>tb.rulenode.smtp-port</mat-label>\n        <input required type="number" step="1" min="1" max="65535" matInput formControlName="smtpPort">\n        <mat-error *ngIf="sendEmailConfigForm.get(\'smtpPort\').hasError(\'required\')">\n          {{ \'tb.rulenode.smtp-port-required\' | translate }}\n        </mat-error>\n        <mat-error *ngIf="sendEmailConfigForm.get(\'smtpPort\').hasError(\'min\')">\n          {{ \'tb.rulenode.smtp-port-range\' | translate }}\n        </mat-error>\n        <mat-error *ngIf="sendEmailConfigForm.get(\'smtpPort\').hasError(\'max\')">\n          {{ \'tb.rulenode.smtp-port-range\' | translate }}\n        </mat-error>\n      </mat-form-field>\n    </div>\n    <mat-form-field class="mat-block">\n      <mat-label translate>tb.rulenode.timeout-msec</mat-label>\n      <input required type="number" step="1" min="0" matInput formControlName="timeout">\n      <mat-error *ngIf="sendEmailConfigForm.get(\'timeout\').hasError(\'required\')">\n        {{ \'tb.rulenode.timeout-required\' | translate }}\n      </mat-error>\n      <mat-error *ngIf="sendEmailConfigForm.get(\'timeout\').hasError(\'min\')">\n        {{ \'tb.rulenode.min-timeout-msec-message\' | translate }}\n      </mat-error>\n    </mat-form-field>\n    <mat-checkbox formControlName="enableTls">\n      {{ \'tb.rulenode.enable-tls\' | translate }}\n    </mat-checkbox>\n    <mat-form-field class="mat-block" *ngIf="sendEmailConfigForm.get(\'enableTls\').value === true">\n      <mat-label translate>tb.rulenode.tls-version</mat-label>\n      <mat-select formControlName="tlsVersion">\n        <mat-option *ngFor="let tlsVersion of tlsVersions" [value]="tlsVersion">\n          {{ tlsVersion }}\n        </mat-option>\n      </mat-select>\n    </mat-form-field>\n    <tb-checkbox formControlName="enableProxy">\n      {{ \'tb.rulenode.enable-proxy\' | translate }}\n    </tb-checkbox>\n    <div *ngIf="sendEmailConfigForm.get(\'enableProxy\').value">\n      <div fxLayout.gt-sm="row" fxLayoutGap.gt-sm="8px">\n        <mat-form-field class="mat-block" fxFlex="100" fxFlex.gt-sm="60">\n          <mat-label translate>tb.rulenode.proxy-host</mat-label>\n          <input matInput required formControlName="proxyHost">\n          <mat-error *ngIf="sendEmailConfigForm.get(\'proxyHost\').hasError(\'required\')">\n            {{ \'tb.rulenode.proxy-host-required\' | translate }}\n          </mat-error>\n        </mat-form-field>\n        <mat-form-field class="mat-block" fxFlex="100" fxFlex.gt-sm="40">\n          <mat-label translate>tb.rulenode.proxy-port</mat-label>\n          <input matInput required formControlName="proxyPort" type="number" step="1" min="1" max="65535">\n          <mat-error *ngIf="sendEmailConfigForm.get(\'proxyPort\').hasError(\'required\')">\n            {{ \'tb.rulenode.proxy-port-required\' | translate }}\n          </mat-error>\n          <mat-error *ngIf="sendEmailConfigForm.get(\'proxyPort\').hasError(\'min\') || sendEmailConfigForm.get(\'proxyPort\').hasError(\'max\')">\n            {{ \'tb.rulenode.proxy-port-range\' | translate }}\n          </mat-error>\n        </mat-form-field>\n      </div>\n      <mat-form-field class="mat-block">\n        <mat-label translate>tb.rulenode.proxy-user</mat-label>\n        <input matInput formControlName="proxyUser">\n      </mat-form-field>\n      <mat-form-field class="mat-block">\n        <mat-label translate>tb.rulenode.proxy-password</mat-label>\n        <input matInput formControlName="proxyPassword">\n      </mat-form-field>\n    </div>\n    <mat-form-field class="mat-block" floatLabel="always">\n      <mat-label translate>tb.rulenode.username</mat-label>\n      <input matInput placeholder="{{ \'tb.rulenode.enter-username\' | translate }}" formControlName="username">\n    </mat-form-field>\n    <mat-form-field class="mat-block" floatLabel="always">\n      <mat-label translate>tb.rulenode.password</mat-label>\n      <input matInput type="password" placeholder="{{ \'tb.rulenode.enter-password\' | translate }}" formControlName="password">\n      <tb-toggle-password matSuffix></tb-toggle-password>\n    </mat-form-field>\n  </section>\n</section>\n',dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:rt.TbCheckboxComponent,selector:"tb-checkbox",inputs:["disabled","trueValue","falseValue"],outputs:["valueChange"]},{kind:"component",type:Q.MatCheckbox,selector:"mat-checkbox",inputs:["disableRipple","color","tabIndex"],exportAs:["matCheckbox"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"directive",type:Y.MatSuffix,selector:"[matSuffix], [matIconSuffix], [matTextSuffix]",inputs:["matTextSuffix"]},{kind:"component",type:X.MatSelect,selector:"mat-select",inputs:["disabled","disableRipple","tabIndex","hideSingleSelectionIndicator"],exportAs:["matSelect"]},{kind:"component",type:ee.MatOption,selector:"mat-option",exportAs:["matOption"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:W.DefaultLayoutGapDirective,selector:"  [fxLayoutGap], [fxLayoutGap.xs], [fxLayoutGap.sm], [fxLayoutGap.md],  [fxLayoutGap.lg], [fxLayoutGap.xl], [fxLayoutGap.lt-sm], [fxLayoutGap.lt-md],  [fxLayoutGap.lt-lg], [fxLayoutGap.lt-xl], [fxLayoutGap.gt-xs], [fxLayoutGap.gt-sm],  [fxLayoutGap.gt-md], [fxLayoutGap.gt-lg]",inputs:["fxLayoutGap","fxLayoutGap.xs","fxLayoutGap.sm","fxLayoutGap.md","fxLayoutGap.lg","fxLayoutGap.xl","fxLayoutGap.lt-sm","fxLayoutGap.lt-md","fxLayoutGap.lt-lg","fxLayoutGap.lt-xl","fxLayoutGap.gt-xs","fxLayoutGap.gt-sm","fxLayoutGap.gt-md","fxLayoutGap.gt-lg"]},{kind:"directive",type:W.DefaultFlexDirective,selector:"  [fxFlex], [fxFlex.xs], [fxFlex.sm], [fxFlex.md],  [fxFlex.lg], [fxFlex.xl], [fxFlex.lt-sm], [fxFlex.lt-md],  [fxFlex.lt-lg], [fxFlex.lt-xl], [fxFlex.gt-xs], [fxFlex.gt-sm],  [fxFlex.gt-md], [fxFlex.gt-lg]",inputs:["fxFlex","fxFlex.xs","fxFlex.sm","fxFlex.md","fxFlex.lg","fxFlex.xl","fxFlex.lt-sm","fxFlex.lt-md","fxFlex.lt-lg","fxFlex.lt-xl","fxFlex.gt-xs","fxFlex.gt-sm","fxFlex.gt-md","fxFlex.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NumberValueAccessor,selector:"input[type=number][formControlName],input[type=number][formControl],input[type=number][ngModel]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.MinValidator,selector:"input[type=number][min][formControlName],input[type=number][min][formControl],input[type=number][min][ngModel]",inputs:["min"]},{kind:"directive",type:R.MaxValidator,selector:"input[type=number][max][formControlName],input[type=number][max][formControl],input[type=number][max][ngModel]",inputs:["max"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"component",type:Xe.TogglePasswordComponent,selector:"tb-toggle-password"},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:cr,decorators:[{type:n,args:[{selector:"tb-external-node-send-email-config",template:'<section [formGroup]="sendEmailConfigForm" fxLayout="column">\n  <mat-checkbox formControlName="useSystemSmtpSettings">\n    {{ \'tb.rulenode.use-system-smtp-settings\' | translate }}\n  </mat-checkbox>\n  <section fxLayout="column" *ngIf="sendEmailConfigForm.get(\'useSystemSmtpSettings\').value === false">\n    <mat-form-field class="mat-block">\n      <mat-label translate>tb.rulenode.smtp-protocol</mat-label>\n      <mat-select formControlName="smtpProtocol">\n        <mat-option *ngFor="let smtpProtocol of smtpProtocols" [value]="smtpProtocol">\n          {{ smtpProtocol.toUpperCase() }}\n        </mat-option>\n      </mat-select>\n    </mat-form-field>\n    <div fxLayout.gt-sm="row" fxLayoutGap.gt-sm="8px">\n      <mat-form-field fxFlex="100" fxFlex.gt-sm="60" class="mat-block">\n        <mat-label translate>tb.rulenode.smtp-host</mat-label>\n        <input required matInput formControlName="smtpHost">\n        <mat-error *ngIf="sendEmailConfigForm.get(\'smtpHost\').hasError(\'required\')">\n          {{ \'tb.rulenode.smtp-host-required\' | translate }}\n        </mat-error>\n      </mat-form-field>\n      <mat-form-field fxFlex="100" fxFlex.gt-sm="40" class="mat-block">\n        <mat-label translate>tb.rulenode.smtp-port</mat-label>\n        <input required type="number" step="1" min="1" max="65535" matInput formControlName="smtpPort">\n        <mat-error *ngIf="sendEmailConfigForm.get(\'smtpPort\').hasError(\'required\')">\n          {{ \'tb.rulenode.smtp-port-required\' | translate }}\n        </mat-error>\n        <mat-error *ngIf="sendEmailConfigForm.get(\'smtpPort\').hasError(\'min\')">\n          {{ \'tb.rulenode.smtp-port-range\' | translate }}\n        </mat-error>\n        <mat-error *ngIf="sendEmailConfigForm.get(\'smtpPort\').hasError(\'max\')">\n          {{ \'tb.rulenode.smtp-port-range\' | translate }}\n        </mat-error>\n      </mat-form-field>\n    </div>\n    <mat-form-field class="mat-block">\n      <mat-label translate>tb.rulenode.timeout-msec</mat-label>\n      <input required type="number" step="1" min="0" matInput formControlName="timeout">\n      <mat-error *ngIf="sendEmailConfigForm.get(\'timeout\').hasError(\'required\')">\n        {{ \'tb.rulenode.timeout-required\' | translate }}\n      </mat-error>\n      <mat-error *ngIf="sendEmailConfigForm.get(\'timeout\').hasError(\'min\')">\n        {{ \'tb.rulenode.min-timeout-msec-message\' | translate }}\n      </mat-error>\n    </mat-form-field>\n    <mat-checkbox formControlName="enableTls">\n      {{ \'tb.rulenode.enable-tls\' | translate }}\n    </mat-checkbox>\n    <mat-form-field class="mat-block" *ngIf="sendEmailConfigForm.get(\'enableTls\').value === true">\n      <mat-label translate>tb.rulenode.tls-version</mat-label>\n      <mat-select formControlName="tlsVersion">\n        <mat-option *ngFor="let tlsVersion of tlsVersions" [value]="tlsVersion">\n          {{ tlsVersion }}\n        </mat-option>\n      </mat-select>\n    </mat-form-field>\n    <tb-checkbox formControlName="enableProxy">\n      {{ \'tb.rulenode.enable-proxy\' | translate }}\n    </tb-checkbox>\n    <div *ngIf="sendEmailConfigForm.get(\'enableProxy\').value">\n      <div fxLayout.gt-sm="row" fxLayoutGap.gt-sm="8px">\n        <mat-form-field class="mat-block" fxFlex="100" fxFlex.gt-sm="60">\n          <mat-label translate>tb.rulenode.proxy-host</mat-label>\n          <input matInput required formControlName="proxyHost">\n          <mat-error *ngIf="sendEmailConfigForm.get(\'proxyHost\').hasError(\'required\')">\n            {{ \'tb.rulenode.proxy-host-required\' | translate }}\n          </mat-error>\n        </mat-form-field>\n        <mat-form-field class="mat-block" fxFlex="100" fxFlex.gt-sm="40">\n          <mat-label translate>tb.rulenode.proxy-port</mat-label>\n          <input matInput required formControlName="proxyPort" type="number" step="1" min="1" max="65535">\n          <mat-error *ngIf="sendEmailConfigForm.get(\'proxyPort\').hasError(\'required\')">\n            {{ \'tb.rulenode.proxy-port-required\' | translate }}\n          </mat-error>\n          <mat-error *ngIf="sendEmailConfigForm.get(\'proxyPort\').hasError(\'min\') || sendEmailConfigForm.get(\'proxyPort\').hasError(\'max\')">\n            {{ \'tb.rulenode.proxy-port-range\' | translate }}\n          </mat-error>\n        </mat-form-field>\n      </div>\n      <mat-form-field class="mat-block">\n        <mat-label translate>tb.rulenode.proxy-user</mat-label>\n        <input matInput formControlName="proxyUser">\n      </mat-form-field>\n      <mat-form-field class="mat-block">\n        <mat-label translate>tb.rulenode.proxy-password</mat-label>\n        <input matInput formControlName="proxyPassword">\n      </mat-form-field>\n    </div>\n    <mat-form-field class="mat-block" floatLabel="always">\n      <mat-label translate>tb.rulenode.username</mat-label>\n      <input matInput placeholder="{{ \'tb.rulenode.enter-username\' | translate }}" formControlName="username">\n    </mat-form-field>\n    <mat-form-field class="mat-block" floatLabel="always">\n      <mat-label translate>tb.rulenode.password</mat-label>\n      <input matInput type="password" placeholder="{{ \'tb.rulenode.enter-password\' | translate }}" formControlName="password">\n      <tb-toggle-password matSuffix></tb-toggle-password>\n    </mat-form-field>\n  </section>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder}]}});class fr extends f{constructor(e,t){super(e),this.store=e,this.fb=t}configForm(){return this.sendSmsConfigForm}onConfigurationSet(e){this.sendSmsConfigForm=this.fb.group({numbersToTemplate:[e?e.numbersToTemplate:null,[O.required]],smsMessageTemplate:[e?e.smsMessageTemplate:null,[O.required]],useSystemSmsSettings:[!!e&&e.useSystemSmsSettings,[]],smsProviderConfiguration:[e?e.smsProviderConfiguration:null,[]]})}validatorTriggers(){return["useSystemSmsSettings"]}updateValidators(e){this.sendSmsConfigForm.get("useSystemSmsSettings").value?this.sendSmsConfigForm.get("smsProviderConfiguration").setValidators([]):this.sendSmsConfigForm.get("smsProviderConfiguration").setValidators([O.required]),this.sendSmsConfigForm.get("smsProviderConfiguration").updateValueAndValidity({emitEvent:e})}}e("SendSmsConfigComponent",fr),fr.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:fr,deps:[{token:P.Store},{token:R.UntypedFormBuilder}],target:t.ɵɵFactoryTarget.Component}),fr.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:fr,selector:"tb-external-node-send-sms-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="sendSmsConfigForm" fxLayout="column">\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.numbers-to-template</mat-label>\n    <input required matInput formControlName="numbersToTemplate">\n    <mat-error *ngIf="sendSmsConfigForm.get(\'numbersToTemplate\').hasError(\'required\')">\n      {{ \'tb.rulenode.numbers-to-template-required\' | translate }}\n    </mat-error>\n    <mat-hint [innerHTML]="\'tb.rulenode.numbers-to-template-hint\' | translate | safe: \'html\'"></mat-hint>\n  </mat-form-field>\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.sms-message-template</mat-label>\n    <textarea required matInput formControlName="smsMessageTemplate" rows="6"></textarea>\n    <mat-error *ngIf="sendSmsConfigForm.get(\'smsMessageTemplate\').hasError(\'required\')">\n      {{ \'tb.rulenode.sms-message-template-required\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n  </mat-form-field>\n  <mat-checkbox formControlName="useSystemSmsSettings">\n    {{ \'tb.rulenode.use-system-sms-settings\' | translate }}\n  </mat-checkbox>\n  <tb-sms-provider-configuration\n    *ngIf="sendSmsConfigForm.get(\'useSystemSmsSettings\').value === false"\n    formControlName="smsProviderConfiguration"\n    required>\n  </tb-sms-provider-configuration>\n</section>\n',dependencies:[{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:Q.MatCheckbox,selector:"mat-checkbox",inputs:["disableRipple","color","tabIndex"],exportAs:["matCheckbox"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatHint,selector:"mat-hint",inputs:["align","id"]},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"component",type:ot.SmsProviderConfigurationComponent,selector:"tb-sms-provider-configuration",inputs:["required","disabled"]},{kind:"pipe",type:he.SafePipe,name:"safe"},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:fr,decorators:[{type:n,args:[{selector:"tb-external-node-send-sms-config",template:'<section [formGroup]="sendSmsConfigForm" fxLayout="column">\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.numbers-to-template</mat-label>\n    <input required matInput formControlName="numbersToTemplate">\n    <mat-error *ngIf="sendSmsConfigForm.get(\'numbersToTemplate\').hasError(\'required\')">\n      {{ \'tb.rulenode.numbers-to-template-required\' | translate }}\n    </mat-error>\n    <mat-hint [innerHTML]="\'tb.rulenode.numbers-to-template-hint\' | translate | safe: \'html\'"></mat-hint>\n  </mat-form-field>\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.sms-message-template</mat-label>\n    <textarea required matInput formControlName="smsMessageTemplate" rows="6"></textarea>\n    <mat-error *ngIf="sendSmsConfigForm.get(\'smsMessageTemplate\').hasError(\'required\')">\n      {{ \'tb.rulenode.sms-message-template-required\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n  </mat-form-field>\n  <mat-checkbox formControlName="useSystemSmsSettings">\n    {{ \'tb.rulenode.use-system-sms-settings\' | translate }}\n  </mat-checkbox>\n  <tb-sms-provider-configuration\n    *ngIf="sendSmsConfigForm.get(\'useSystemSmsSettings\').value === false"\n    formControlName="smsProviderConfiguration"\n    required>\n  </tb-sms-provider-configuration>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder}]}});class gr extends f{constructor(e,t){super(e),this.store=e,this.fb=t,this.slackChanelTypes=Object.keys(w),this.slackChanelTypesTranslateMap=V}configForm(){return this.slackConfigForm}onConfigurationSet(e){this.slackConfigForm=this.fb.group({botToken:[e?e.botToken:null],useSystemSettings:[!!e&&e.useSystemSettings],messageTemplate:[e?e.messageTemplate:null,[O.required]],conversationType:[e?e.conversationType:null,[O.required]],conversation:[e?e.conversation:null,[O.required]]})}validatorTriggers(){return["useSystemSettings"]}updateValidators(e){this.slackConfigForm.get("useSystemSettings").value?this.slackConfigForm.get("botToken").clearValidators():this.slackConfigForm.get("botToken").setValidators([O.required]),this.slackConfigForm.get("botToken").updateValueAndValidity({emitEvent:e})}}e("SlackConfigComponent",gr),gr.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:gr,deps:[{token:P.Store},{token:R.FormBuilder}],target:t.ɵɵFactoryTarget.Component}),gr.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:gr,selector:"tb-external-node-slack-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="slackConfigForm" fxLayout="column">\n  <mat-form-field fxFlex class="mat-block">\n    <mat-label translate>tb.rulenode.message-template</mat-label>\n    <input required matInput formControlName="messageTemplate">\n    <mat-error *ngIf="slackConfigForm.get(\'messageTemplate\').hasError(\'required\')">\n      {{ \'tb.rulenode.message-template-required\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n  </mat-form-field>\n  <mat-checkbox formControlName="useSystemSettings">\n    {{ \'tb.rulenode.use-system-slack-settings\' | translate }}\n  </mat-checkbox>\n  <mat-form-field *ngIf="!slackConfigForm.get(\'useSystemSettings\').value" class="mat-block">\n    <mat-label translate>tb.rulenode.slack-api-token</mat-label>\n    <input required matInput formControlName="botToken">\n    <mat-error *ngIf="slackConfigForm.get(\'botToken\').hasError(\'required\')">\n      {{ \'tb.rulenode.slack-api-token-required\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <label class="tb-title">{{ \'notification.slack-chanel-type\' | translate }}</label>\n  <mat-radio-group formControlName="conversationType">\n    <mat-radio-button *ngFor="let slackChanelType of slackChanelTypes" [value]="slackChanelType">\n      {{ slackChanelTypesTranslateMap.get(slackChanelType) | translate }}\n    </mat-radio-button>\n  </mat-radio-group>\n  <tb-slack-conversation-autocomplete\n    formControlName="conversation"\n    required\n    [token]="slackConfigForm.get(\'useSystemSettings\').value ? \'\' : slackConfigForm.get(\'botToken\').value"\n    [slackChanelType]="slackConfigForm.get(\'conversationType\').value">\n  </tb-slack-conversation-autocomplete>\n</section>\n',styles:[":host .tb-title{display:block;padding-bottom:6px}:host ::ng-deep .mat-mdc-radio-group{display:flex;flex-direction:row;margin-bottom:22px;gap:12px}:host ::ng-deep .mat-mdc-radio-group .mat-mdc-radio-button{flex:1 1 100%;padding:4px;border:1px solid rgba(0,0,0,.12);border-radius:6px}@media screen and (max-width: 599px){:host ::ng-deep .mat-mdc-radio-group{flex-direction:column}}\n"],dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:Q.MatCheckbox,selector:"mat-checkbox",inputs:["disableRipple","color","tabIndex"],exportAs:["matCheckbox"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatHint,selector:"mat-hint",inputs:["align","id"]},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"directive",type:at.MatRadioGroup,selector:"mat-radio-group",exportAs:["matRadioGroup"]},{kind:"component",type:at.MatRadioButton,selector:"mat-radio-button",inputs:["disableRipple","tabIndex"],exportAs:["matRadioButton"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:W.DefaultFlexDirective,selector:"  [fxFlex], [fxFlex.xs], [fxFlex.sm], [fxFlex.md],  [fxFlex.lg], [fxFlex.xl], [fxFlex.lt-sm], [fxFlex.lt-md],  [fxFlex.lt-lg], [fxFlex.lt-xl], [fxFlex.gt-xs], [fxFlex.gt-sm],  [fxFlex.gt-md], [fxFlex.gt-lg]",inputs:["fxFlex","fxFlex.xs","fxFlex.sm","fxFlex.md","fxFlex.lg","fxFlex.xl","fxFlex.lt-sm","fxFlex.lt-md","fxFlex.lt-lg","fxFlex.lt-xl","fxFlex.gt-xs","fxFlex.gt-sm","fxFlex.gt-md","fxFlex.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"component",type:it.SlackConversationAutocompleteComponent,selector:"tb-slack-conversation-autocomplete",inputs:["labelText","requiredText","required","disabled","slackChanelType","token"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:gr,decorators:[{type:n,args:[{selector:"tb-external-node-slack-config",template:'<section [formGroup]="slackConfigForm" fxLayout="column">\n  <mat-form-field fxFlex class="mat-block">\n    <mat-label translate>tb.rulenode.message-template</mat-label>\n    <input required matInput formControlName="messageTemplate">\n    <mat-error *ngIf="slackConfigForm.get(\'messageTemplate\').hasError(\'required\')">\n      {{ \'tb.rulenode.message-template-required\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n  </mat-form-field>\n  <mat-checkbox formControlName="useSystemSettings">\n    {{ \'tb.rulenode.use-system-slack-settings\' | translate }}\n  </mat-checkbox>\n  <mat-form-field *ngIf="!slackConfigForm.get(\'useSystemSettings\').value" class="mat-block">\n    <mat-label translate>tb.rulenode.slack-api-token</mat-label>\n    <input required matInput formControlName="botToken">\n    <mat-error *ngIf="slackConfigForm.get(\'botToken\').hasError(\'required\')">\n      {{ \'tb.rulenode.slack-api-token-required\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <label class="tb-title">{{ \'notification.slack-chanel-type\' | translate }}</label>\n  <mat-radio-group formControlName="conversationType">\n    <mat-radio-button *ngFor="let slackChanelType of slackChanelTypes" [value]="slackChanelType">\n      {{ slackChanelTypesTranslateMap.get(slackChanelType) | translate }}\n    </mat-radio-button>\n  </mat-radio-group>\n  <tb-slack-conversation-autocomplete\n    formControlName="conversation"\n    required\n    [token]="slackConfigForm.get(\'useSystemSettings\').value ? \'\' : slackConfigForm.get(\'botToken\').value"\n    [slackChanelType]="slackConfigForm.get(\'conversationType\').value">\n  </tb-slack-conversation-autocomplete>\n</section>\n',styles:[":host .tb-title{display:block;padding-bottom:6px}:host ::ng-deep .mat-mdc-radio-group{display:flex;flex-direction:row;margin-bottom:22px;gap:12px}:host ::ng-deep .mat-mdc-radio-group .mat-mdc-radio-button{flex:1 1 100%;padding:4px;border:1px solid rgba(0,0,0,.12);border-radius:6px}@media screen and (max-width: 599px){:host ::ng-deep .mat-mdc-radio-group{flex-direction:column}}\n"]}]}],ctorParameters:function(){return[{type:P.Store},{type:R.FormBuilder}]}});class yr extends f{constructor(e,t){super(e),this.store=e,this.fb=t}configForm(){return this.snsConfigForm}onConfigurationSet(e){this.snsConfigForm=this.fb.group({topicArnPattern:[e?e.topicArnPattern:null,[O.required]],accessKeyId:[e?e.accessKeyId:null,[O.required]],secretAccessKey:[e?e.secretAccessKey:null,[O.required]],region:[e?e.region:null,[O.required]]})}}e("SnsConfigComponent",yr),yr.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:yr,deps:[{token:P.Store},{token:R.UntypedFormBuilder}],target:t.ɵɵFactoryTarget.Component}),yr.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:yr,selector:"tb-external-node-sns-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="snsConfigForm" fxLayout="column">\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.topic-arn-pattern</mat-label>\n    <input required matInput formControlName="topicArnPattern">\n    <mat-error *ngIf="snsConfigForm.get(\'topicArnPattern\').hasError(\'required\')">\n      {{ \'tb.rulenode.topic-arn-pattern-required\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.aws-access-key-id</mat-label>\n    <input required matInput formControlName="accessKeyId">\n    <mat-error *ngIf="snsConfigForm.get(\'accessKeyId\').hasError(\'required\')">\n      {{ \'tb.rulenode.aws-access-key-id-required\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.aws-secret-access-key</mat-label>\n    <input required matInput formControlName="secretAccessKey">\n    <mat-error *ngIf="snsConfigForm.get(\'secretAccessKey\').hasError(\'required\')">\n      {{ \'tb.rulenode.aws-secret-access-key-required\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.aws-region</mat-label>\n    <input required matInput formControlName="region">\n    <mat-error *ngIf="snsConfigForm.get(\'region\').hasError(\'required\')">\n      {{ \'tb.rulenode.aws-region-required\' | translate }}\n    </mat-error>\n  </mat-form-field>\n</section>\n',dependencies:[{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatHint,selector:"mat-hint",inputs:["align","id"]},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:yr,decorators:[{type:n,args:[{selector:"tb-external-node-sns-config",template:'<section [formGroup]="snsConfigForm" fxLayout="column">\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.topic-arn-pattern</mat-label>\n    <input required matInput formControlName="topicArnPattern">\n    <mat-error *ngIf="snsConfigForm.get(\'topicArnPattern\').hasError(\'required\')">\n      {{ \'tb.rulenode.topic-arn-pattern-required\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.aws-access-key-id</mat-label>\n    <input required matInput formControlName="accessKeyId">\n    <mat-error *ngIf="snsConfigForm.get(\'accessKeyId\').hasError(\'required\')">\n      {{ \'tb.rulenode.aws-access-key-id-required\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.aws-secret-access-key</mat-label>\n    <input required matInput formControlName="secretAccessKey">\n    <mat-error *ngIf="snsConfigForm.get(\'secretAccessKey\').hasError(\'required\')">\n      {{ \'tb.rulenode.aws-secret-access-key-required\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.aws-region</mat-label>\n    <input required matInput formControlName="region">\n    <mat-error *ngIf="snsConfigForm.get(\'region\').hasError(\'required\')">\n      {{ \'tb.rulenode.aws-region-required\' | translate }}\n    </mat-error>\n  </mat-form-field>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder}]}});class xr extends f{constructor(e,t){super(e),this.store=e,this.fb=t,this.sqsQueueType=Bt,this.sqsQueueTypes=Object.keys(Bt),this.sqsQueueTypeTranslationsMap=Kt}configForm(){return this.sqsConfigForm}onConfigurationSet(e){this.sqsConfigForm=this.fb.group({queueType:[e?e.queueType:null,[O.required]],queueUrlPattern:[e?e.queueUrlPattern:null,[O.required]],delaySeconds:[e?e.delaySeconds:null,[O.min(0),O.max(900)]],messageAttributes:[e?e.messageAttributes:null,[]],accessKeyId:[e?e.accessKeyId:null,[O.required]],secretAccessKey:[e?e.secretAccessKey:null,[O.required]],region:[e?e.region:null,[O.required]]})}}e("SqsConfigComponent",xr),xr.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:xr,deps:[{token:P.Store},{token:R.UntypedFormBuilder}],target:t.ɵɵFactoryTarget.Component}),xr.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:xr,selector:"tb-external-node-sqs-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="sqsConfigForm" fxLayout="column">\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.queue-type</mat-label>\n    <mat-select formControlName="queueType" required>\n      <mat-option *ngFor="let type of sqsQueueTypes" [value]="type">\n        {{ sqsQueueTypeTranslationsMap.get(type) | translate }}\n      </mat-option>\n    </mat-select>\n  </mat-form-field>\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.queue-url-pattern</mat-label>\n    <input required matInput formControlName="queueUrlPattern">\n    <mat-error *ngIf="sqsConfigForm.get(\'queueUrlPattern\').hasError(\'required\')">\n      {{ \'tb.rulenode.queue-url-pattern-required\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n  </mat-form-field>\n  <mat-form-field *ngIf="sqsConfigForm.get(\'queueType\').value === sqsQueueType.STANDARD" class="mat-block">\n    <mat-label translate>tb.rulenode.delay-seconds</mat-label>\n    <input required type="number" min="0" max="900" step="1" matInput formControlName="delaySeconds">\n    <mat-error *ngIf="sqsConfigForm.get(\'delaySeconds\').hasError(\'min\')">\n      {{ \'tb.rulenode.min-delay-seconds-message\' | translate }}\n    </mat-error>\n    <mat-error *ngIf="sqsConfigForm.get(\'delaySeconds\').hasError(\'max\')">\n      {{ \'tb.rulenode.max-delay-seconds-message\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <label translate class="tb-title">tb.rulenode.message-attributes</label>\n  <div class="tb-hint" [innerHTML]="\'tb.rulenode.message-attributes-hint\' | translate | safe: \'html\'"></div>\n  <tb-kv-map-config-old\n    required="false"\n    formControlName="messageAttributes"\n    keyText="tb.rulenode.name"\n    keyRequiredText="tb.rulenode.name-required"\n    valText="tb.rulenode.value"\n    valRequiredText="tb.rulenode.value-required">\n  </tb-kv-map-config-old>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.aws-access-key-id</mat-label>\n    <input required matInput formControlName="accessKeyId">\n    <mat-error *ngIf="sqsConfigForm.get(\'accessKeyId\').hasError(\'required\')">\n      {{ \'tb.rulenode.aws-access-key-id-required\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.aws-secret-access-key</mat-label>\n    <input required matInput formControlName="secretAccessKey">\n    <mat-error *ngIf="sqsConfigForm.get(\'secretAccessKey\').hasError(\'required\')">\n      {{ \'tb.rulenode.aws-secret-access-key-required\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.aws-region</mat-label>\n    <input required matInput formControlName="region">\n    <mat-error *ngIf="sqsConfigForm.get(\'region\').hasError(\'required\')">\n      {{ \'tb.rulenode.aws-region-required\' | translate }}\n    </mat-error>\n  </mat-form-field>\n</section>\n',dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatHint,selector:"mat-hint",inputs:["align","id"]},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"component",type:X.MatSelect,selector:"mat-select",inputs:["disabled","disableRipple","tabIndex","hideSingleSelectionIndicator"],exportAs:["matSelect"]},{kind:"component",type:ee.MatOption,selector:"mat-option",exportAs:["matOption"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NumberValueAccessor,selector:"input[type=number][formControlName],input[type=number][formControl],input[type=number][ngModel]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.MinValidator,selector:"input[type=number][min][formControlName],input[type=number][min][formControl],input[type=number][min][ngModel]",inputs:["min"]},{kind:"directive",type:R.MaxValidator,selector:"input[type=number][max][formControlName],input[type=number][max][formControl],input[type=number][max][ngModel]",inputs:["max"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"component",type:Cn,selector:"tb-kv-map-config-old",inputs:["disabled","uniqueKeyValuePairValidator","requiredText","keyText","keyRequiredText","valText","valRequiredText","hintText","required"]},{kind:"pipe",type:he.SafePipe,name:"safe"},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:xr,decorators:[{type:n,args:[{selector:"tb-external-node-sqs-config",template:'<section [formGroup]="sqsConfigForm" fxLayout="column">\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.queue-type</mat-label>\n    <mat-select formControlName="queueType" required>\n      <mat-option *ngFor="let type of sqsQueueTypes" [value]="type">\n        {{ sqsQueueTypeTranslationsMap.get(type) | translate }}\n      </mat-option>\n    </mat-select>\n  </mat-form-field>\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.queue-url-pattern</mat-label>\n    <input required matInput formControlName="queueUrlPattern">\n    <mat-error *ngIf="sqsConfigForm.get(\'queueUrlPattern\').hasError(\'required\')">\n      {{ \'tb.rulenode.queue-url-pattern-required\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n  </mat-form-field>\n  <mat-form-field *ngIf="sqsConfigForm.get(\'queueType\').value === sqsQueueType.STANDARD" class="mat-block">\n    <mat-label translate>tb.rulenode.delay-seconds</mat-label>\n    <input required type="number" min="0" max="900" step="1" matInput formControlName="delaySeconds">\n    <mat-error *ngIf="sqsConfigForm.get(\'delaySeconds\').hasError(\'min\')">\n      {{ \'tb.rulenode.min-delay-seconds-message\' | translate }}\n    </mat-error>\n    <mat-error *ngIf="sqsConfigForm.get(\'delaySeconds\').hasError(\'max\')">\n      {{ \'tb.rulenode.max-delay-seconds-message\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <label translate class="tb-title">tb.rulenode.message-attributes</label>\n  <div class="tb-hint" [innerHTML]="\'tb.rulenode.message-attributes-hint\' | translate | safe: \'html\'"></div>\n  <tb-kv-map-config-old\n    required="false"\n    formControlName="messageAttributes"\n    keyText="tb.rulenode.name"\n    keyRequiredText="tb.rulenode.name-required"\n    valText="tb.rulenode.value"\n    valRequiredText="tb.rulenode.value-required">\n  </tb-kv-map-config-old>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.aws-access-key-id</mat-label>\n    <input required matInput formControlName="accessKeyId">\n    <mat-error *ngIf="sqsConfigForm.get(\'accessKeyId\').hasError(\'required\')">\n      {{ \'tb.rulenode.aws-access-key-id-required\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.aws-secret-access-key</mat-label>\n    <input required matInput formControlName="secretAccessKey">\n    <mat-error *ngIf="sqsConfigForm.get(\'secretAccessKey\').hasError(\'required\')">\n      {{ \'tb.rulenode.aws-secret-access-key-required\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.aws-region</mat-label>\n    <input required matInput formControlName="region">\n    <mat-error *ngIf="sqsConfigForm.get(\'region\').hasError(\'required\')">\n      {{ \'tb.rulenode.aws-region-required\' | translate }}\n    </mat-error>\n  </mat-form-field>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder}]}});class br{}e("RulenodeCoreConfigExternalModule",br),br.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:br,deps:[],target:t.ɵɵFactoryTarget.NgModule}),br.ɵmod=t.ɵɵngDeclareNgModule({minVersion:"14.0.0",version:"15.2.10",ngImport:t,type:br,declarations:[yr,xr,pr,lr,sr,mr,dr,ur,cr,ir,fr,gr],imports:[$,M,_e,$n],exports:[yr,xr,pr,lr,sr,mr,dr,ur,cr,ir,fr,gr]}),br.ɵinj=t.ɵɵngDeclareInjector({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:br,imports:[$,M,_e,$n]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:br,decorators:[{type:c,args:[{declarations:[yr,xr,pr,lr,sr,mr,dr,ur,cr,ir,fr,gr],imports:[$,M,_e,$n],exports:[yr,xr,pr,lr,sr,mr,dr,ur,cr,ir,fr,gr]}]}]});class hr extends f{constructor(e,t){super(e),this.store=e,this.fb=t,this.searchText=""}configForm(){return this.alarmStatusConfigForm}prepareInputConfig(e){return{alarmStatusList:ae(e?.alarmStatusList)?e.alarmStatusList:null}}onConfigurationSet(e){this.alarmStatusConfigForm=this.fb.group({alarmStatusList:[e.alarmStatusList,[O.required]]})}}e("CheckAlarmStatusComponent",hr),hr.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:hr,deps:[{token:P.Store},{token:R.FormBuilder}],target:t.ɵɵFactoryTarget.Component}),hr.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:hr,selector:"tb-filter-node-check-alarm-status-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="alarmStatusConfigForm" class="tb-form-panel stroked">\n  <div class="tb-form-row no-padding no-border space-between">\n    <div class="tb-form-panel-title tb-required" translate>tb.rulenode.alarm-status</div>\n    <div class="tb-form-panel-hint tb-error" translate [hidden]="alarmStatusConfigForm.get(\'alarmStatusList\').valid">\n      tb.rulenode.alarm-required\n    </div>\n  </div>\n  <tb-alarm-status-select formControlName="alarmStatusList"></tb-alarm-status-select>\n</section>\n\n\n\n',styles:[':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n'],dependencies:[{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"component",type:jn,selector:"tb-alarm-status-select"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:hr,decorators:[{type:n,args:[{selector:"tb-filter-node-check-alarm-status-config",template:'<section [formGroup]="alarmStatusConfigForm" class="tb-form-panel stroked">\n  <div class="tb-form-row no-padding no-border space-between">\n    <div class="tb-form-panel-title tb-required" translate>tb.rulenode.alarm-status</div>\n    <div class="tb-form-panel-hint tb-error" translate [hidden]="alarmStatusConfigForm.get(\'alarmStatusList\').valid">\n      tb.rulenode.alarm-required\n    </div>\n  </div>\n  <tb-alarm-status-select formControlName="alarmStatusList"></tb-alarm-status-select>\n</section>\n\n\n\n',styles:[':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n']}]}],ctorParameters:function(){return[{type:P.Store},{type:R.FormBuilder}]}});class vr extends f{constructor(e,t){super(e),this.store=e,this.fb=t}configForm(){return this.checkMessageConfigForm}prepareInputConfig(e){return{messageNames:ae(e?.messageNames)?e.messageNames:[],metadataNames:ae(e?.metadataNames)?e.metadataNames:[],checkAllKeys:!!ae(e?.checkAllKeys)&&e.checkAllKeys}}prepareOutputConfig(e){return{messageNames:ae(e?.messageNames)?e.messageNames:[],metadataNames:ae(e?.metadataNames)?e.metadataNames:[],checkAllKeys:e.checkAllKeys}}atLeastOne(e,t=null){return n=>{t||(t=Object.keys(n.controls));return n?.controls&&t.some((t=>!e(n.controls[t])))?null:{atLeastOne:!0}}}onConfigurationSet(e){this.checkMessageConfigForm=this.fb.group({messageNames:[e.messageNames,[]],metadataNames:[e.metadataNames,[]],checkAllKeys:[e.checkAllKeys,[]]},{validators:this.atLeastOne(O.required,["messageNames","metadataNames"])})}get touchedValidationControl(){return["messageNames","metadataNames"].some((e=>this.checkMessageConfigForm.get(e).touched))}}e("CheckMessageConfigComponent",vr),vr.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:vr,deps:[{token:P.Store},{token:R.FormBuilder}],target:t.ɵɵFactoryTarget.Component}),vr.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:vr,selector:"tb-filter-node-check-message-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="checkMessageConfigForm" class="tb-form-panel stroked">\n  <div class="tb-form-row no-padding no-border space-between">\n    <div class="tb-form-panel-title tb-required" translate>tb.rulenode.fields-to-check</div>\n    <div class="tb-form-panel-hint tb-error" translate [hidden]="!(touchedValidationControl && checkMessageConfigForm.hasError(\'atLeastOne\'))">\n      tb.rulenode.at-least-one-field-required\n    </div>\n  </div>\n  <tb-string-items-list editable subscriptSizing="dynamic"\n                        [label]="\'tb.rulenode.data-keys\' | translate"\n                        [placeholder]="\'tb.rulenode.add-message-field\' | translate"\n                        formControlName="messageNames">\n    <mat-icon matSuffix color="primary" class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon"\n              matTooltip="{{ \'tb.rulenode.chip-help\' | translate: { inputName: \'tb.rulenode.field-name\' | translate } }}">help</mat-icon>\n  </tb-string-items-list>\n  <tb-string-items-list editable subscriptSizing="dynamic"\n                        [label]="\'tb.rulenode.metadata-keys\' | translate"\n                        [placeholder]="\'tb.rulenode.add-metadata-field\' | translate"\n                        formControlName="metadataNames">\n    <mat-icon matSuffix color="primary" class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon"\n              matTooltip="{{ \'tb.rulenode.chip-help\' | translate: { inputName: \'tb.rulenode.field-name\' | translate } }}">help</mat-icon>\n  </tb-string-items-list>\n  <div tb-hint-tooltip-icon="{{ \'tb.rulenode.check-all-keys-tooltip\' | translate }}"\n       class="tb-form-row no-border no-padding">\n    <mat-slide-toggle class="mat-slide" formControlName="checkAllKeys">\n      {{ \'tb.rulenode.check-all-keys\' | translate }}\n    </mat-slide-toggle>\n  </div>\n</section>\n',styles:[':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n'],dependencies:[{kind:"component",type:et.StringItemsListComponent,selector:"tb-string-items-list",inputs:["required","disabled","label","placeholder","hint","requiredText","floatLabel","appearance","editable","subscriptSizing","predefinedValues"]},{kind:"component",type:ue.MatIcon,selector:"mat-icon",inputs:["color","inline","svgIcon","fontSet","fontIcon"],exportAs:["matIcon"]},{kind:"directive",type:Y.MatSuffix,selector:"[matSuffix], [matIconSuffix], [matTextSuffix]",inputs:["matTextSuffix"]},{kind:"directive",type:ce.MatTooltip,selector:"[matTooltip]",exportAs:["matTooltip"]},{kind:"component",type:te.MatSlideToggle,selector:"mat-slide-toggle",inputs:["disabled","disableRipple","color","tabIndex"],exportAs:["matSlideToggle"]},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"component",type:ne.HintTooltipIconComponent,selector:"[tb-hint-tooltip-icon]",inputs:["tb-hint-tooltip-icon","tooltipPosition","hintIcon"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:vr,decorators:[{type:n,args:[{selector:"tb-filter-node-check-message-config",template:'<section [formGroup]="checkMessageConfigForm" class="tb-form-panel stroked">\n  <div class="tb-form-row no-padding no-border space-between">\n    <div class="tb-form-panel-title tb-required" translate>tb.rulenode.fields-to-check</div>\n    <div class="tb-form-panel-hint tb-error" translate [hidden]="!(touchedValidationControl && checkMessageConfigForm.hasError(\'atLeastOne\'))">\n      tb.rulenode.at-least-one-field-required\n    </div>\n  </div>\n  <tb-string-items-list editable subscriptSizing="dynamic"\n                        [label]="\'tb.rulenode.data-keys\' | translate"\n                        [placeholder]="\'tb.rulenode.add-message-field\' | translate"\n                        formControlName="messageNames">\n    <mat-icon matSuffix color="primary" class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon"\n              matTooltip="{{ \'tb.rulenode.chip-help\' | translate: { inputName: \'tb.rulenode.field-name\' | translate } }}">help</mat-icon>\n  </tb-string-items-list>\n  <tb-string-items-list editable subscriptSizing="dynamic"\n                        [label]="\'tb.rulenode.metadata-keys\' | translate"\n                        [placeholder]="\'tb.rulenode.add-metadata-field\' | translate"\n                        formControlName="metadataNames">\n    <mat-icon matSuffix color="primary" class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon"\n              matTooltip="{{ \'tb.rulenode.chip-help\' | translate: { inputName: \'tb.rulenode.field-name\' | translate } }}">help</mat-icon>\n  </tb-string-items-list>\n  <div tb-hint-tooltip-icon="{{ \'tb.rulenode.check-all-keys-tooltip\' | translate }}"\n       class="tb-form-row no-border no-padding">\n    <mat-slide-toggle class="mat-slide" formControlName="checkAllKeys">\n      {{ \'tb.rulenode.check-all-keys\' | translate }}\n    </mat-slide-toggle>\n  </div>\n</section>\n',styles:[':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n']}]}],ctorParameters:function(){return[{type:P.Store},{type:R.FormBuilder}]}});class Cr extends f{constructor(e,t){super(e),this.store=e,this.fb=t,this.entitySearchDirection=Object.values(v),this.entitySearchDirectionTranslationsMap=C}configForm(){return this.checkRelationConfigForm}prepareInputConfig(e){return{checkForSingleEntity:!!ae(e?.checkForSingleEntity)&&e.checkForSingleEntity,direction:ae(e?.direction)?e.direction:null,entityType:ae(e?.entityType)?e.entityType:null,entityId:ae(e?.entityId)?e.entityId:null,relationType:ae(e?.relationType)?e.relationType:null}}onConfigurationSet(e){this.checkRelationConfigForm=this.fb.group({checkForSingleEntity:[e.checkForSingleEntity,[]],direction:[e.direction,[]],entityType:[e.entityType,e&&e.checkForSingleEntity?[O.required]:[]],entityId:[e.entityId,e&&e.checkForSingleEntity?[O.required]:[]],relationType:[e.relationType,[O.required]]})}validatorTriggers(){return["checkForSingleEntity"]}updateValidators(e){const t=this.checkRelationConfigForm.get("checkForSingleEntity").value;this.checkRelationConfigForm.get("entityType").setValidators(t?[O.required]:[]),this.checkRelationConfigForm.get("entityType").updateValueAndValidity({emitEvent:e}),this.checkRelationConfigForm.get("entityId").setValidators(t?[O.required]:[]),this.checkRelationConfigForm.get("entityId").updateValueAndValidity({emitEvent:e})}}e("CheckRelationConfigComponent",Cr),Cr.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Cr,deps:[{token:P.Store},{token:R.UntypedFormBuilder}],target:t.ɵɵFactoryTarget.Component}),Cr.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:Cr,selector:"tb-filter-node-check-relation-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="checkRelationConfigForm" class="tb-form-panel stroked no-padding-bottom">\n  <div class="tb-form-panel-title" translate>tb.rulenode.relation-search-parameters</div>\n  <div fxLayout="column">\n    <mat-form-field class="mat-block" hideRequiredMarker>\n      <mat-label>{{ \'relation.direction\' | translate }}</mat-label>\n      <mat-select formControlName="direction" required>\n        <mat-option *ngFor="let direction of entitySearchDirection" [value]="direction">\n          {{ entitySearchDirectionTranslationsMap.get(direction) | translate }} <span translate>tb.rulenode.relations-query-config-direction-suffix</span>\n        </mat-option>\n      </mat-select>\n    </mat-form-field>\n    <tb-relation-type-autocomplete\n      required\n      formControlName="relationType">\n    </tb-relation-type-autocomplete>\n    <div tb-hint-tooltip-icon="{{ \'tb.rulenode.check-relation-to-specific-entity-tooltip\' | translate }}"\n         class="tb-form-row no-border no-padding slide-toggle">\n      <mat-slide-toggle class="mat-slide" formControlName="checkForSingleEntity">\n        {{ \'tb.rulenode.check-relation-to-specific-entity\' | translate }}\n      </mat-slide-toggle>\n    </div>\n    <div *ngIf="checkRelationConfigForm.get(\'checkForSingleEntity\').value" class="same-width-component-row">\n      <tb-entity-type-select\n        style="min-width: 100px; flex: 1;"\n        showLabel\n        required\n        formControlName="entityType">\n      </tb-entity-type-select>\n      <tb-entity-autocomplete\n        fxFlex\n        required\n        *ngIf="checkRelationConfigForm.get(\'entityType\').value"\n        [entityType]="checkRelationConfigForm.get(\'entityType\').value"\n        formControlName="entityId">\n      </tb-entity-autocomplete>\n    </div>\n  </div>\n</section>\n',styles:[":host .slide-toggle{margin-bottom:18px}\n",':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n'],dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:lt.EntityAutocompleteComponent,selector:"tb-entity-autocomplete",inputs:["entityType","entitySubtype","excludeEntityIds","labelText","requiredText","useFullEntityId","appearance","required","disabled"],outputs:["entityChanged"]},{kind:"component",type:ve.EntityTypeSelectComponent,selector:"tb-entity-type-select",inputs:["allowedEntityTypes","useAliasEntityTypes","filterAllowedEntityTypes","showLabel","required","disabled"]},{kind:"component",type:Je.RelationTypeAutocompleteComponent,selector:"tb-relation-type-autocomplete",inputs:["showLabel","additionalClasses","appearance","required","disabled","subscriptSizing"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"component",type:X.MatSelect,selector:"mat-select",inputs:["disabled","disableRipple","tabIndex","hideSingleSelectionIndicator"],exportAs:["matSelect"]},{kind:"component",type:ee.MatOption,selector:"mat-option",exportAs:["matOption"]},{kind:"component",type:te.MatSlideToggle,selector:"mat-slide-toggle",inputs:["disabled","disableRipple","color","tabIndex"],exportAs:["matSlideToggle"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:W.DefaultFlexDirective,selector:"  [fxFlex], [fxFlex.xs], [fxFlex.sm], [fxFlex.md],  [fxFlex.lg], [fxFlex.xl], [fxFlex.lt-sm], [fxFlex.lt-md],  [fxFlex.lt-lg], [fxFlex.lt-xl], [fxFlex.gt-xs], [fxFlex.gt-sm],  [fxFlex.gt-md], [fxFlex.gt-lg]",inputs:["fxFlex","fxFlex.xs","fxFlex.sm","fxFlex.md","fxFlex.lg","fxFlex.xl","fxFlex.lt-sm","fxFlex.lt-md","fxFlex.lt-lg","fxFlex.lt-xl","fxFlex.gt-xs","fxFlex.gt-sm","fxFlex.gt-md","fxFlex.gt-lg"]},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"component",type:ne.HintTooltipIconComponent,selector:"[tb-hint-tooltip-icon]",inputs:["tb-hint-tooltip-icon","tooltipPosition","hintIcon"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Cr,decorators:[{type:n,args:[{selector:"tb-filter-node-check-relation-config",template:'<section [formGroup]="checkRelationConfigForm" class="tb-form-panel stroked no-padding-bottom">\n  <div class="tb-form-panel-title" translate>tb.rulenode.relation-search-parameters</div>\n  <div fxLayout="column">\n    <mat-form-field class="mat-block" hideRequiredMarker>\n      <mat-label>{{ \'relation.direction\' | translate }}</mat-label>\n      <mat-select formControlName="direction" required>\n        <mat-option *ngFor="let direction of entitySearchDirection" [value]="direction">\n          {{ entitySearchDirectionTranslationsMap.get(direction) | translate }} <span translate>tb.rulenode.relations-query-config-direction-suffix</span>\n        </mat-option>\n      </mat-select>\n    </mat-form-field>\n    <tb-relation-type-autocomplete\n      required\n      formControlName="relationType">\n    </tb-relation-type-autocomplete>\n    <div tb-hint-tooltip-icon="{{ \'tb.rulenode.check-relation-to-specific-entity-tooltip\' | translate }}"\n         class="tb-form-row no-border no-padding slide-toggle">\n      <mat-slide-toggle class="mat-slide" formControlName="checkForSingleEntity">\n        {{ \'tb.rulenode.check-relation-to-specific-entity\' | translate }}\n      </mat-slide-toggle>\n    </div>\n    <div *ngIf="checkRelationConfigForm.get(\'checkForSingleEntity\').value" class="same-width-component-row">\n      <tb-entity-type-select\n        style="min-width: 100px; flex: 1;"\n        showLabel\n        required\n        formControlName="entityType">\n      </tb-entity-type-select>\n      <tb-entity-autocomplete\n        fxFlex\n        required\n        *ngIf="checkRelationConfigForm.get(\'entityType\').value"\n        [entityType]="checkRelationConfigForm.get(\'entityType\').value"\n        formControlName="entityId">\n      </tb-entity-autocomplete>\n    </div>\n  </div>\n</section>\n',styles:[":host .slide-toggle{margin-bottom:18px}\n",':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n']}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder}]}});class Fr extends f{constructor(e,t){super(e),this.store=e,this.fb=t,this.perimeterType=Tt,this.perimeterTypes=Object.values(Tt),this.perimeterTypeTranslationMap=It,this.rangeUnits=Object.values(qt),this.rangeUnitTranslationMap=At,this.defaultPaddingEnable=!0}configForm(){return this.geoFilterConfigForm}prepareInputConfig(e){return{latitudeKeyName:ae(e?.latitudeKeyName)?e.latitudeKeyName:null,longitudeKeyName:ae(e?.longitudeKeyName)?e.longitudeKeyName:null,perimeterType:ae(e?.perimeterType)?e.perimeterType:null,fetchPerimeterInfoFromMessageMetadata:!!ae(e?.fetchPerimeterInfoFromMessageMetadata)&&e.fetchPerimeterInfoFromMessageMetadata,perimeterKeyName:ae(e?.perimeterKeyName)?e.perimeterKeyName:null,centerLatitude:ae(e?.centerLatitude)?e.centerLatitude:null,centerLongitude:ae(e?.centerLongitude)?e.centerLongitude:null,range:ae(e?.range)?e.range:null,rangeUnit:ae(e?.rangeUnit)?e.rangeUnit:null,polygonsDefinition:ae(e?.polygonsDefinition)?e.polygonsDefinition:null}}onConfigurationSet(e){this.geoFilterConfigForm=this.fb.group({latitudeKeyName:[e.latitudeKeyName,[O.required]],longitudeKeyName:[e.longitudeKeyName,[O.required]],perimeterType:[e.perimeterType,[O.required]],fetchPerimeterInfoFromMessageMetadata:[e.fetchPerimeterInfoFromMessageMetadata,[]],perimeterKeyName:[e.perimeterKeyName,[]],centerLatitude:[e.centerLatitude,[]],centerLongitude:[e.centerLongitude,[]],range:[e.range,[]],rangeUnit:[e.rangeUnit,[]],polygonsDefinition:[e.polygonsDefinition,[]]})}validatorTriggers(){return["fetchPerimeterInfoFromMessageMetadata","perimeterType"]}updateValidators(e){const t=this.geoFilterConfigForm.get("fetchPerimeterInfoFromMessageMetadata").value,n=this.geoFilterConfigForm.get("perimeterType").value;t?this.geoFilterConfigForm.get("perimeterKeyName").setValidators([O.required]):this.geoFilterConfigForm.get("perimeterKeyName").setValidators([]),t||n!==Tt.CIRCLE?(this.geoFilterConfigForm.get("centerLatitude").setValidators([]),this.geoFilterConfigForm.get("centerLongitude").setValidators([]),this.geoFilterConfigForm.get("range").setValidators([]),this.geoFilterConfigForm.get("rangeUnit").setValidators([]),this.defaultPaddingEnable=!0):(this.geoFilterConfigForm.get("centerLatitude").setValidators([O.required,O.min(-90),O.max(90)]),this.geoFilterConfigForm.get("centerLongitude").setValidators([O.required,O.min(-180),O.max(180)]),this.geoFilterConfigForm.get("range").setValidators([O.required,O.min(0)]),this.geoFilterConfigForm.get("rangeUnit").setValidators([O.required]),this.defaultPaddingEnable=!1),t||n!==Tt.POLYGON?this.geoFilterConfigForm.get("polygonsDefinition").setValidators([]):this.geoFilterConfigForm.get("polygonsDefinition").setValidators([O.required]),this.geoFilterConfigForm.get("perimeterKeyName").updateValueAndValidity({emitEvent:e}),this.geoFilterConfigForm.get("centerLatitude").updateValueAndValidity({emitEvent:e}),this.geoFilterConfigForm.get("centerLongitude").updateValueAndValidity({emitEvent:e}),this.geoFilterConfigForm.get("range").updateValueAndValidity({emitEvent:e}),this.geoFilterConfigForm.get("rangeUnit").updateValueAndValidity({emitEvent:e}),this.geoFilterConfigForm.get("polygonsDefinition").updateValueAndValidity({emitEvent:e})}}e("GpsGeoFilterConfigComponent",Fr),Fr.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Fr,deps:[{token:P.Store},{token:R.FormBuilder}],target:t.ɵɵFactoryTarget.Component}),Fr.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:Fr,selector:"tb-filter-node-gps-geofencing-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="geoFilterConfigForm" class="tb-form-panel no-border no-padding">\n  <section class="tb-form-panel stroked">\n    <div class="tb-form-panel-title" translate>tb.rulenode.coordinate-field-names</div>\n    <section>\n      <div fxLayout="row" fxLayoutGap="16px">\n        <mat-form-field fxFlex="50" class="mat-block">\n          <mat-label>{{ \'tb.rulenode.latitude-field-name\' | translate }}</mat-label>\n          <input matInput formControlName="latitudeKeyName" required>\n          <mat-error *ngIf="geoFilterConfigForm.get(\'latitudeKeyName\').hasError(\'required\')">\n            {{ \'tb.rulenode.latitude-field-name-required\' | translate }}\n          </mat-error>\n        </mat-form-field>\n        <mat-form-field fxFlex="50" class="mat-block">\n          <mat-label>{{ \'tb.rulenode.longitude-field-name\' | translate }}</mat-label>\n          <input matInput formControlName="longitudeKeyName" required>\n          <mat-error *ngIf="geoFilterConfigForm.get(\'longitudeKeyName\').hasError(\'required\')">\n            {{ \'tb.rulenode.longitude-field-name-required\' | translate }}\n          </mat-error>\n        </mat-form-field>\n      </div>\n    <div class="tb-form-hint tb-primary-fill" translate>tb.rulenode.coordinate-field-hint</div>\n    </section>\n  </section>\n  <section class="tb-form-panel stroked" [class.no-padding-bottom]="!defaultPaddingEnable">\n    <div class="tb-form-panel-title" translate>tb.rulenode.geofence-configuration</div>\n    <section fxLayout="column">\n      <mat-form-field fxFlex class="mat-block" hideRequiredMarker>\n        <mat-label>{{ \'tb.rulenode.perimeter-type\' | translate }}</mat-label>\n        <mat-select formControlName="perimeterType">\n          <mat-option *ngFor="let type of perimeterTypes" [value]="type">\n            {{ perimeterTypeTranslationMap.get(type) | translate }}\n          </mat-option>\n        </mat-select>\n      </mat-form-field>\n      <div tb-hint-tooltip-icon="{{ geoFilterConfigForm.get(\'perimeterType\').value === perimeterType.CIRCLE\n        ? (\'tb.rulenode.fetch-circle-parameter-info-from-metadata-hint\'\n            | translate : { perimeterKeyName: geoFilterConfigForm.get(\'perimeterKeyName\').valid\n                              ? geoFilterConfigForm.get(\'perimeterKeyName\').value\n                              : \'ss_perimeter\'})\n        : (\'tb.rulenode.fetch-poligon-parameter-info-from-metadata-hint\'\n            | translate : { perimeterKeyName: geoFilterConfigForm.get(\'perimeterKeyName\').valid\n                              ? geoFilterConfigForm.get(\'perimeterKeyName\').value\n                              : \'ss_perimeter\'}) }}"\n           class="tb-form-row no-border no-padding slide-toggle">\n        <mat-slide-toggle class="mat-slide" formControlName="fetchPerimeterInfoFromMessageMetadata">\n          {{ \'tb.rulenode.fetch-perimeter-info-from-metadata\' | translate }}\n        </mat-slide-toggle>\n      </div>\n      <mat-form-field *ngIf="geoFilterConfigForm.get(\'fetchPerimeterInfoFromMessageMetadata\').value" class="mat-block">\n        <mat-label>{{ \'tb.rulenode.perimeter-key-name\' | translate }}</mat-label>\n        <input matInput formControlName="perimeterKeyName" required>\n        <mat-error *ngIf="geoFilterConfigForm.get(\'perimeterKeyName\').hasError(\'required\')">\n          {{ \'tb.rulenode.perimeter-key-name-required\' | translate }}\n        </mat-error>\n        <mat-hint>{{ \'tb.rulenode.perimeter-key-name-hint\' | translate }}</mat-hint>\n      </mat-form-field>\n      <div fxLayout="column"\n           *ngIf="geoFilterConfigForm.get(\'perimeterType\').value === perimeterType.CIRCLE &&\n                    !geoFilterConfigForm.get(\'fetchPerimeterInfoFromMessageMetadata\').value">\n        <div fxLayout="row" fxLayoutGap="16px">\n          <mat-form-field fxFlex>\n            <mat-label>{{ \'tb.rulenode.circle-center-latitude\' | translate }}</mat-label>\n            <input type="number" min="-90" max="90" step="0.1" matInput formControlName="centerLatitude" required>\n            <mat-error *ngIf="geoFilterConfigForm.get(\'centerLatitude\').hasError(\'required\')">\n              {{ \'tb.rulenode.circle-center-latitude-required\' | translate }}\n            </mat-error>\n          </mat-form-field>\n          <mat-form-field fxFlex>\n            <mat-label>{{ \'tb.rulenode.circle-center-longitude\' | translate }}</mat-label>\n            <input type="number" min="-180" max="180" step="0.1" matInput formControlName="centerLongitude" required>\n            <mat-error *ngIf="geoFilterConfigForm.get(\'centerLongitude\').hasError(\'required\')">\n              {{ \'tb.rulenode.circle-center-longitude-required\' | translate }}\n            </mat-error>\n          </mat-form-field>\n        </div>\n        <div fxLayout="row" fxLayoutGap="16px">\n          <mat-form-field fxFlex>\n            <mat-label>{{ \'tb.rulenode.range\' | translate }}</mat-label>\n            <input type="number" min="0" step="0.1" matInput formControlName="range" required>\n            <mat-error *ngIf="geoFilterConfigForm.get(\'range\').hasError(\'required\')">\n              {{ \'tb.rulenode.range-required\' | translate }}\n            </mat-error>\n          </mat-form-field>\n          <mat-form-field fxFlex>\n            <mat-label>{{ \'tb.rulenode.range-units\' | translate }}</mat-label>\n            <mat-select formControlName="rangeUnit" required>\n              <mat-option *ngFor="let type of rangeUnits" [value]="type">\n                {{ rangeUnitTranslationMap.get(type) | translate }}\n              </mat-option>\n            </mat-select>\n            <mat-error *ngIf="geoFilterConfigForm.get(\'rangeUnit\').hasError(\'required\')">\n              {{ \'tb.rulenode.range-units-required\' | translate }}\n            </mat-error>\n          </mat-form-field>\n        </div>\n      </div>\n      <mat-form-field class="mat-block" subscriptSizing="dynamic"\n                      *ngIf="geoFilterConfigForm.get(\'perimeterType\').value === perimeterType.POLYGON &&\n                         !geoFilterConfigForm.get(\'fetchPerimeterInfoFromMessageMetadata\').value">\n        <mat-label>{{ \'tb.rulenode.polygon-definition\' | translate }}</mat-label>\n        <input matInput formControlName="polygonsDefinition" required>\n        <mat-hint>{{ \'tb.rulenode.polygon-definition-hint\' | translate }}</mat-hint>\n        <mat-error *ngIf="geoFilterConfigForm.get(\'polygonsDefinition\').hasError(\'required\')">\n          {{ \'tb.rulenode.polygon-definition-required\' | translate }}\n        </mat-error>\n      </mat-form-field>\n    </section>\n  </section>\n</section>\n',styles:[":host .slide-toggle{margin-bottom:18px}\n",':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n'],dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatHint,selector:"mat-hint",inputs:["align","id"]},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"component",type:X.MatSelect,selector:"mat-select",inputs:["disabled","disableRipple","tabIndex","hideSingleSelectionIndicator"],exportAs:["matSelect"]},{kind:"component",type:ee.MatOption,selector:"mat-option",exportAs:["matOption"]},{kind:"component",type:te.MatSlideToggle,selector:"mat-slide-toggle",inputs:["disabled","disableRipple","color","tabIndex"],exportAs:["matSlideToggle"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:W.DefaultLayoutGapDirective,selector:"  [fxLayoutGap], [fxLayoutGap.xs], [fxLayoutGap.sm], [fxLayoutGap.md],  [fxLayoutGap.lg], [fxLayoutGap.xl], [fxLayoutGap.lt-sm], [fxLayoutGap.lt-md],  [fxLayoutGap.lt-lg], [fxLayoutGap.lt-xl], [fxLayoutGap.gt-xs], [fxLayoutGap.gt-sm],  [fxLayoutGap.gt-md], [fxLayoutGap.gt-lg]",inputs:["fxLayoutGap","fxLayoutGap.xs","fxLayoutGap.sm","fxLayoutGap.md","fxLayoutGap.lg","fxLayoutGap.xl","fxLayoutGap.lt-sm","fxLayoutGap.lt-md","fxLayoutGap.lt-lg","fxLayoutGap.lt-xl","fxLayoutGap.gt-xs","fxLayoutGap.gt-sm","fxLayoutGap.gt-md","fxLayoutGap.gt-lg"]},{kind:"directive",type:W.DefaultFlexDirective,selector:"  [fxFlex], [fxFlex.xs], [fxFlex.sm], [fxFlex.md],  [fxFlex.lg], [fxFlex.xl], [fxFlex.lt-sm], [fxFlex.lt-md],  [fxFlex.lt-lg], [fxFlex.lt-xl], [fxFlex.gt-xs], [fxFlex.gt-sm],  [fxFlex.gt-md], [fxFlex.gt-lg]",inputs:["fxFlex","fxFlex.xs","fxFlex.sm","fxFlex.md","fxFlex.lg","fxFlex.xl","fxFlex.lt-sm","fxFlex.lt-md","fxFlex.lt-lg","fxFlex.lt-xl","fxFlex.gt-xs","fxFlex.gt-sm","fxFlex.gt-md","fxFlex.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NumberValueAccessor,selector:"input[type=number][formControlName],input[type=number][formControl],input[type=number][ngModel]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.MinValidator,selector:"input[type=number][min][formControlName],input[type=number][min][formControl],input[type=number][min][ngModel]",inputs:["min"]},{kind:"directive",type:R.MaxValidator,selector:"input[type=number][max][formControlName],input[type=number][max][formControl],input[type=number][max][ngModel]",inputs:["max"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"component",type:ne.HintTooltipIconComponent,selector:"[tb-hint-tooltip-icon]",inputs:["tb-hint-tooltip-icon","tooltipPosition","hintIcon"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Fr,decorators:[{type:n,args:[{selector:"tb-filter-node-gps-geofencing-config",template:'<section [formGroup]="geoFilterConfigForm" class="tb-form-panel no-border no-padding">\n  <section class="tb-form-panel stroked">\n    <div class="tb-form-panel-title" translate>tb.rulenode.coordinate-field-names</div>\n    <section>\n      <div fxLayout="row" fxLayoutGap="16px">\n        <mat-form-field fxFlex="50" class="mat-block">\n          <mat-label>{{ \'tb.rulenode.latitude-field-name\' | translate }}</mat-label>\n          <input matInput formControlName="latitudeKeyName" required>\n          <mat-error *ngIf="geoFilterConfigForm.get(\'latitudeKeyName\').hasError(\'required\')">\n            {{ \'tb.rulenode.latitude-field-name-required\' | translate }}\n          </mat-error>\n        </mat-form-field>\n        <mat-form-field fxFlex="50" class="mat-block">\n          <mat-label>{{ \'tb.rulenode.longitude-field-name\' | translate }}</mat-label>\n          <input matInput formControlName="longitudeKeyName" required>\n          <mat-error *ngIf="geoFilterConfigForm.get(\'longitudeKeyName\').hasError(\'required\')">\n            {{ \'tb.rulenode.longitude-field-name-required\' | translate }}\n          </mat-error>\n        </mat-form-field>\n      </div>\n    <div class="tb-form-hint tb-primary-fill" translate>tb.rulenode.coordinate-field-hint</div>\n    </section>\n  </section>\n  <section class="tb-form-panel stroked" [class.no-padding-bottom]="!defaultPaddingEnable">\n    <div class="tb-form-panel-title" translate>tb.rulenode.geofence-configuration</div>\n    <section fxLayout="column">\n      <mat-form-field fxFlex class="mat-block" hideRequiredMarker>\n        <mat-label>{{ \'tb.rulenode.perimeter-type\' | translate }}</mat-label>\n        <mat-select formControlName="perimeterType">\n          <mat-option *ngFor="let type of perimeterTypes" [value]="type">\n            {{ perimeterTypeTranslationMap.get(type) | translate }}\n          </mat-option>\n        </mat-select>\n      </mat-form-field>\n      <div tb-hint-tooltip-icon="{{ geoFilterConfigForm.get(\'perimeterType\').value === perimeterType.CIRCLE\n        ? (\'tb.rulenode.fetch-circle-parameter-info-from-metadata-hint\'\n            | translate : { perimeterKeyName: geoFilterConfigForm.get(\'perimeterKeyName\').valid\n                              ? geoFilterConfigForm.get(\'perimeterKeyName\').value\n                              : \'ss_perimeter\'})\n        : (\'tb.rulenode.fetch-poligon-parameter-info-from-metadata-hint\'\n            | translate : { perimeterKeyName: geoFilterConfigForm.get(\'perimeterKeyName\').valid\n                              ? geoFilterConfigForm.get(\'perimeterKeyName\').value\n                              : \'ss_perimeter\'}) }}"\n           class="tb-form-row no-border no-padding slide-toggle">\n        <mat-slide-toggle class="mat-slide" formControlName="fetchPerimeterInfoFromMessageMetadata">\n          {{ \'tb.rulenode.fetch-perimeter-info-from-metadata\' | translate }}\n        </mat-slide-toggle>\n      </div>\n      <mat-form-field *ngIf="geoFilterConfigForm.get(\'fetchPerimeterInfoFromMessageMetadata\').value" class="mat-block">\n        <mat-label>{{ \'tb.rulenode.perimeter-key-name\' | translate }}</mat-label>\n        <input matInput formControlName="perimeterKeyName" required>\n        <mat-error *ngIf="geoFilterConfigForm.get(\'perimeterKeyName\').hasError(\'required\')">\n          {{ \'tb.rulenode.perimeter-key-name-required\' | translate }}\n        </mat-error>\n        <mat-hint>{{ \'tb.rulenode.perimeter-key-name-hint\' | translate }}</mat-hint>\n      </mat-form-field>\n      <div fxLayout="column"\n           *ngIf="geoFilterConfigForm.get(\'perimeterType\').value === perimeterType.CIRCLE &&\n                    !geoFilterConfigForm.get(\'fetchPerimeterInfoFromMessageMetadata\').value">\n        <div fxLayout="row" fxLayoutGap="16px">\n          <mat-form-field fxFlex>\n            <mat-label>{{ \'tb.rulenode.circle-center-latitude\' | translate }}</mat-label>\n            <input type="number" min="-90" max="90" step="0.1" matInput formControlName="centerLatitude" required>\n            <mat-error *ngIf="geoFilterConfigForm.get(\'centerLatitude\').hasError(\'required\')">\n              {{ \'tb.rulenode.circle-center-latitude-required\' | translate }}\n            </mat-error>\n          </mat-form-field>\n          <mat-form-field fxFlex>\n            <mat-label>{{ \'tb.rulenode.circle-center-longitude\' | translate }}</mat-label>\n            <input type="number" min="-180" max="180" step="0.1" matInput formControlName="centerLongitude" required>\n            <mat-error *ngIf="geoFilterConfigForm.get(\'centerLongitude\').hasError(\'required\')">\n              {{ \'tb.rulenode.circle-center-longitude-required\' | translate }}\n            </mat-error>\n          </mat-form-field>\n        </div>\n        <div fxLayout="row" fxLayoutGap="16px">\n          <mat-form-field fxFlex>\n            <mat-label>{{ \'tb.rulenode.range\' | translate }}</mat-label>\n            <input type="number" min="0" step="0.1" matInput formControlName="range" required>\n            <mat-error *ngIf="geoFilterConfigForm.get(\'range\').hasError(\'required\')">\n              {{ \'tb.rulenode.range-required\' | translate }}\n            </mat-error>\n          </mat-form-field>\n          <mat-form-field fxFlex>\n            <mat-label>{{ \'tb.rulenode.range-units\' | translate }}</mat-label>\n            <mat-select formControlName="rangeUnit" required>\n              <mat-option *ngFor="let type of rangeUnits" [value]="type">\n                {{ rangeUnitTranslationMap.get(type) | translate }}\n              </mat-option>\n            </mat-select>\n            <mat-error *ngIf="geoFilterConfigForm.get(\'rangeUnit\').hasError(\'required\')">\n              {{ \'tb.rulenode.range-units-required\' | translate }}\n            </mat-error>\n          </mat-form-field>\n        </div>\n      </div>\n      <mat-form-field class="mat-block" subscriptSizing="dynamic"\n                      *ngIf="geoFilterConfigForm.get(\'perimeterType\').value === perimeterType.POLYGON &&\n                         !geoFilterConfigForm.get(\'fetchPerimeterInfoFromMessageMetadata\').value">\n        <mat-label>{{ \'tb.rulenode.polygon-definition\' | translate }}</mat-label>\n        <input matInput formControlName="polygonsDefinition" required>\n        <mat-hint>{{ \'tb.rulenode.polygon-definition-hint\' | translate }}</mat-hint>\n        <mat-error *ngIf="geoFilterConfigForm.get(\'polygonsDefinition\').hasError(\'required\')">\n          {{ \'tb.rulenode.polygon-definition-required\' | translate }}\n        </mat-error>\n      </mat-form-field>\n    </section>\n  </section>\n</section>\n',styles:[":host .slide-toggle{margin-bottom:18px}\n",':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n']}]}],ctorParameters:function(){return[{type:P.Store},{type:R.FormBuilder}]}});class kr extends f{constructor(e,t){super(e),this.store=e,this.fb=t}configForm(){return this.messageTypeConfigForm}prepareInputConfig(e){return{messageTypes:ae(e?.messageTypes)?e.messageTypes:null}}onConfigurationSet(e){this.messageTypeConfigForm=this.fb.group({messageTypes:[e.messageTypes,[O.required]]})}}e("MessageTypeConfigComponent",kr),kr.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:kr,deps:[{token:P.Store},{token:R.UntypedFormBuilder}],target:t.ɵɵFactoryTarget.Component}),kr.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:kr,selector:"tb-filter-node-message-type-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="messageTypeConfigForm">\n  <tb-message-types-config\n    required\n    [label]="\'tb.rulenode.select-message-types\' | translate"\n    formControlName="messageTypes">\n  </tb-message-types-config>\n</section>\n',dependencies:[{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"component",type:Dn,selector:"tb-message-types-config",inputs:["required","label","placeholder","disabled"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:kr,decorators:[{type:n,args:[{selector:"tb-filter-node-message-type-config",template:'<section [formGroup]="messageTypeConfigForm">\n  <tb-message-types-config\n    required\n    [label]="\'tb.rulenode.select-message-types\' | translate"\n    formControlName="messageTypes">\n  </tb-message-types-config>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder}]}});class Lr extends f{constructor(e,t){super(e),this.store=e,this.fb=t,this.allowedEntityTypes=[F.DEVICE,F.ASSET,F.ENTITY_VIEW,F.TENANT,F.CUSTOMER,F.USER,F.DASHBOARD,F.RULE_CHAIN,F.RULE_NODE,F.EDGE]}configForm(){return this.originatorTypeConfigForm}prepareInputConfig(e){return{originatorTypes:ae(e?.originatorTypes)?e.originatorTypes:null}}onConfigurationSet(e){this.originatorTypeConfigForm=this.fb.group({originatorTypes:[e.originatorTypes,[O.required]]})}}e("OriginatorTypeConfigComponent",Lr),Lr.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Lr,deps:[{token:P.Store},{token:R.UntypedFormBuilder}],target:t.ɵɵFactoryTarget.Component}),Lr.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:Lr,selector:"tb-filter-node-originator-type-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="originatorTypeConfigForm">\n  <tb-entity-type-list fxFlex\n                       formControlName="originatorTypes"\n                       [allowedEntityTypes]="allowedEntityTypes"\n                       [ignoreAuthorityFilter]="true"\n                       [emptyInputPlaceholder]="\'tb.rulenode.add-entity-type\' | translate"\n                       [filledInputPlaceholder]="\'tb.rulenode.add-entity-type\' | translate"\n                       [label]="\'tb.rulenode.select-entity-types\' | translate"\n                       required>\n    <mat-icon matSuffix class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon"\n              color="primary"\n              matTooltip="{{ \'tb.rulenode.chip-help\' | translate: { inputName: \'tb.rulenode.entity-type\' | translate } }}">help</mat-icon>\n  </tb-entity-type-list>\n</section>\n',styles:[':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n'],dependencies:[{kind:"component",type:st.EntityTypeListComponent,selector:"tb-entity-type-list",inputs:["required","additionalClasses","appearance","label","floatLabel","disabled","subscriptSizing","allowedEntityTypes","emptyInputPlaceholder","filledInputPlaceholder","ignoreAuthorityFilter"]},{kind:"component",type:ue.MatIcon,selector:"mat-icon",inputs:["color","inline","svgIcon","fontSet","fontIcon"],exportAs:["matIcon"]},{kind:"directive",type:Y.MatSuffix,selector:"[matSuffix], [matIconSuffix], [matTextSuffix]",inputs:["matTextSuffix"]},{kind:"directive",type:ce.MatTooltip,selector:"[matTooltip]",exportAs:["matTooltip"]},{kind:"directive",type:W.DefaultFlexDirective,selector:"  [fxFlex], [fxFlex.xs], [fxFlex.sm], [fxFlex.md],  [fxFlex.lg], [fxFlex.xl], [fxFlex.lt-sm], [fxFlex.lt-md],  [fxFlex.lt-lg], [fxFlex.lt-xl], [fxFlex.gt-xs], [fxFlex.gt-sm],  [fxFlex.gt-md], [fxFlex.gt-lg]",inputs:["fxFlex","fxFlex.xs","fxFlex.sm","fxFlex.md","fxFlex.lg","fxFlex.xl","fxFlex.lt-sm","fxFlex.lt-md","fxFlex.lt-lg","fxFlex.lt-xl","fxFlex.gt-xs","fxFlex.gt-sm","fxFlex.gt-md","fxFlex.gt-lg"]},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Lr,decorators:[{type:n,args:[{selector:"tb-filter-node-originator-type-config",template:'<section [formGroup]="originatorTypeConfigForm">\n  <tb-entity-type-list fxFlex\n                       formControlName="originatorTypes"\n                       [allowedEntityTypes]="allowedEntityTypes"\n                       [ignoreAuthorityFilter]="true"\n                       [emptyInputPlaceholder]="\'tb.rulenode.add-entity-type\' | translate"\n                       [filledInputPlaceholder]="\'tb.rulenode.add-entity-type\' | translate"\n                       [label]="\'tb.rulenode.select-entity-types\' | translate"\n                       required>\n    <mat-icon matSuffix class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon"\n              color="primary"\n              matTooltip="{{ \'tb.rulenode.chip-help\' | translate: { inputName: \'tb.rulenode.entity-type\' | translate } }}">help</mat-icon>\n  </tb-entity-type-list>\n</section>\n',styles:[':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n']}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder}]}});class Tr extends f{constructor(e,t,n,o){super(e),this.store=e,this.fb=t,this.nodeScriptTestService=n,this.translate=o,this.tbelEnabled=re(this.store).tbelEnabled,this.scriptLanguage=x,this.changeScript=new r,this.hasScript=!0,this.testScriptLabel="tb.rulenode.test-filter-function"}configForm(){return this.scriptConfigForm}onConfigurationSet(e){this.scriptConfigForm=this.fb.group({scriptLang:[e.scriptLang,[O.required]],jsScript:[e.jsScript,[]],tbelScript:[e.tbelScript,[]]})}validatorTriggers(){return["scriptLang"]}updateValidators(e){let t=this.scriptConfigForm.get("scriptLang").value;t!==x.TBEL||this.tbelEnabled||(t=x.JS,this.scriptConfigForm.get("scriptLang").patchValue(t,{emitEvent:!1}),setTimeout((()=>{this.scriptConfigForm.updateValueAndValidity({emitEvent:!0})}))),this.scriptConfigForm.get("jsScript").setValidators(t===x.JS?[O.required]:[]),this.scriptConfigForm.get("jsScript").updateValueAndValidity({emitEvent:e}),this.scriptConfigForm.get("tbelScript").setValidators(t===x.TBEL?[O.required]:[]),this.scriptConfigForm.get("tbelScript").updateValueAndValidity({emitEvent:e})}prepareInputConfig(e){return e&&(e.scriptLang||(e.scriptLang=x.JS)),{scriptLang:ae(e?.scriptLang)?e.scriptLang:x.JS,jsScript:ae(e?.jsScript)?e.jsScript:null,tbelScript:ae(e?.tbelScript)?e.tbelScript:null}}testScript(e){const t=this.scriptConfigForm.get("scriptLang").value,n=t===x.JS?"jsScript":"tbelScript",r=t===x.JS?"rulenode/filter_node_script_fn":"rulenode/tbel/filter_node_script_fn",o=this.scriptConfigForm.get(n).value;this.nodeScriptTestService.testNodeScript(o,"filter",this.translate.instant("tb.rulenode.filter"),"Filter",["msg","metadata","msgType"],this.ruleNodeId,r,t,e).subscribe((e=>{e&&(this.scriptConfigForm.get(n).setValue(e),this.changeScript.emit())}))}onValidate(){this.scriptConfigForm.get("scriptLang").value===x.JS&&this.jsFuncComponent.validateOnSubmit()}}e("ScriptConfigComponent",Tr),Tr.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Tr,deps:[{token:P.Store},{token:R.UntypedFormBuilder},{token:oe.NodeScriptTestService},{token:Z.TranslateService}],target:t.ɵɵFactoryTarget.Component}),Tr.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:Tr,selector:"tb-filter-node-script-config",viewQueries:[{propertyName:"jsFuncComponent",first:!0,predicate:["jsFuncComponent"],descendants:!0},{propertyName:"tbelFuncComponent",first:!0,predicate:["tbelFuncComponent"],descendants:!0}],usesInheritance:!0,ngImport:t,template:'<section [formGroup]="scriptConfigForm">\n  <tb-script-lang formControlName="scriptLang" *ngIf="tbelEnabled"></tb-script-lang>\n  <tb-js-func *ngIf="scriptConfigForm.get(\'scriptLang\').value === scriptLanguage.JS"\n              #jsFuncComponent\n              formControlName="jsScript"\n              functionName="Filter"\n              [functionArgs]="[\'msg\', \'metadata\', \'msgType\']"\n              helpId="rulenode/filter_node_script_fn"\n              noValidate="true">\n    <button toolbarSuffixButton\n            mat-icon-button\n            matTooltip="{{ testScriptLabel | translate }}"\n            matTooltipPosition="above"\n            class="tb-mat-32"\n            (click)="testScript()">\n      <mat-icon class="material-icons" color="primary">bug_report</mat-icon>\n    </button>\n  </tb-js-func>\n  <tb-js-func *ngIf="scriptConfigForm.get(\'scriptLang\').value === scriptLanguage.TBEL"\n              #tbelFuncComponent\n              formControlName="tbelScript"\n              functionName="Filter"\n              [functionArgs]="[\'msg\', \'metadata\', \'msgType\']"\n              [disableUndefinedCheck]="true"\n              [scriptLanguage]="scriptLanguage.TBEL"\n              helpId="rulenode/tbel/filter_node_script_fn"\n              noValidate="true">\n    <button toolbarSuffixButton\n            mat-icon-button\n            matTooltip="{{ testScriptLabel | translate }}"\n            matTooltipPosition="above"\n            class="tb-mat-32"\n            (click)="testScript()">\n      <mat-icon class="material-icons" color="primary">bug_report</mat-icon>\n    </button>\n  </tb-js-func>\n  <button mat-button mat-raised-button color="primary" (click)="testScript()">\n    {{ testScriptLabel | translate }}\n  </button>\n</section>\n',dependencies:[{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:pe.JsFuncComponent,selector:"tb-js-func",inputs:["functionTitle","functionName","functionArgs","validationArgs","resultType","disabled","fillHeight","minHeight","editorCompleter","globalVariables","disableUndefinedCheck","helpId","scriptLanguage","noValidate","required"]},{kind:"component",type:de.MatButton,selector:"    button[mat-button], button[mat-raised-button], button[mat-flat-button],    button[mat-stroked-button]  ",inputs:["disabled","disableRipple","color"],exportAs:["matButton"]},{kind:"component",type:de.MatIconButton,selector:"button[mat-icon-button]",inputs:["disabled","disableRipple","color"],exportAs:["matButton"]},{kind:"component",type:ue.MatIcon,selector:"mat-icon",inputs:["color","inline","svgIcon","fontSet","fontIcon"],exportAs:["matIcon"]},{kind:"directive",type:ce.MatTooltip,selector:"[matTooltip]",exportAs:["matTooltip"]},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"component",type:fe.TbScriptLangComponent,selector:"tb-script-lang",inputs:["disabled"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Tr,decorators:[{type:n,args:[{selector:"tb-filter-node-script-config",template:'<section [formGroup]="scriptConfigForm">\n  <tb-script-lang formControlName="scriptLang" *ngIf="tbelEnabled"></tb-script-lang>\n  <tb-js-func *ngIf="scriptConfigForm.get(\'scriptLang\').value === scriptLanguage.JS"\n              #jsFuncComponent\n              formControlName="jsScript"\n              functionName="Filter"\n              [functionArgs]="[\'msg\', \'metadata\', \'msgType\']"\n              helpId="rulenode/filter_node_script_fn"\n              noValidate="true">\n    <button toolbarSuffixButton\n            mat-icon-button\n            matTooltip="{{ testScriptLabel | translate }}"\n            matTooltipPosition="above"\n            class="tb-mat-32"\n            (click)="testScript()">\n      <mat-icon class="material-icons" color="primary">bug_report</mat-icon>\n    </button>\n  </tb-js-func>\n  <tb-js-func *ngIf="scriptConfigForm.get(\'scriptLang\').value === scriptLanguage.TBEL"\n              #tbelFuncComponent\n              formControlName="tbelScript"\n              functionName="Filter"\n              [functionArgs]="[\'msg\', \'metadata\', \'msgType\']"\n              [disableUndefinedCheck]="true"\n              [scriptLanguage]="scriptLanguage.TBEL"\n              helpId="rulenode/tbel/filter_node_script_fn"\n              noValidate="true">\n    <button toolbarSuffixButton\n            mat-icon-button\n            matTooltip="{{ testScriptLabel | translate }}"\n            matTooltipPosition="above"\n            class="tb-mat-32"\n            (click)="testScript()">\n      <mat-icon class="material-icons" color="primary">bug_report</mat-icon>\n    </button>\n  </tb-js-func>\n  <button mat-button mat-raised-button color="primary" (click)="testScript()">\n    {{ testScriptLabel | translate }}\n  </button>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder},{type:oe.NodeScriptTestService},{type:Z.TranslateService}]},propDecorators:{jsFuncComponent:[{type:o,args:["jsFuncComponent",{static:!1}]}],tbelFuncComponent:[{type:o,args:["tbelFuncComponent",{static:!1}]}]}});class Ir extends f{constructor(e,t,n,o){super(e),this.store=e,this.fb=t,this.nodeScriptTestService=n,this.translate=o,this.tbelEnabled=re(this.store).tbelEnabled,this.scriptLanguage=x,this.changeScript=new r,this.hasScript=!0,this.testScriptLabel="tb.rulenode.test-switch-function"}configForm(){return this.switchConfigForm}onConfigurationSet(e){this.switchConfigForm=this.fb.group({scriptLang:[e.scriptLang,[O.required]],jsScript:[e.jsScript,[]],tbelScript:[e.tbelScript,[]]})}validatorTriggers(){return["scriptLang"]}updateValidators(e){let t=this.switchConfigForm.get("scriptLang").value;t!==x.TBEL||this.tbelEnabled||(t=x.JS,this.switchConfigForm.get("scriptLang").patchValue(t,{emitEvent:!1}),setTimeout((()=>{this.switchConfigForm.updateValueAndValidity({emitEvent:!0})}))),this.switchConfigForm.get("jsScript").setValidators(t===x.JS?[O.required]:[]),this.switchConfigForm.get("jsScript").updateValueAndValidity({emitEvent:e}),this.switchConfigForm.get("tbelScript").setValidators(t===x.TBEL?[O.required]:[]),this.switchConfigForm.get("tbelScript").updateValueAndValidity({emitEvent:e})}prepareInputConfig(e){return e&&(e.scriptLang||(e.scriptLang=x.JS)),{scriptLang:ae(e?.scriptLang)?e.scriptLang:x.JS,jsScript:ae(e?.jsScript)?e.jsScript:null,tbelScript:ae(e?.tbelScript)?e.tbelScript:null}}testScript(e){const t=this.switchConfigForm.get("scriptLang").value,n=t===x.JS?"jsScript":"tbelScript",r=t===x.JS?"rulenode/switch_node_script_fn":"rulenode/tbel/switch_node_script_fn",o=this.switchConfigForm.get(n).value;this.nodeScriptTestService.testNodeScript(o,"switch",this.translate.instant("tb.rulenode.switch"),"Switch",["msg","metadata","msgType"],this.ruleNodeId,r,t,e).subscribe((e=>{e&&(this.switchConfigForm.get(n).setValue(e),this.changeScript.emit())}))}onValidate(){this.switchConfigForm.get("scriptLang").value===x.JS&&this.jsFuncComponent.validateOnSubmit()}}e("SwitchConfigComponent",Ir),Ir.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Ir,deps:[{token:P.Store},{token:R.UntypedFormBuilder},{token:oe.NodeScriptTestService},{token:Z.TranslateService}],target:t.ɵɵFactoryTarget.Component}),Ir.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:Ir,selector:"tb-filter-node-switch-config",viewQueries:[{propertyName:"jsFuncComponent",first:!0,predicate:["jsFuncComponent"],descendants:!0},{propertyName:"tbelFuncComponent",first:!0,predicate:["tbelFuncComponent"],descendants:!0}],usesInheritance:!0,ngImport:t,template:'<section [formGroup]="switchConfigForm">\n  <tb-script-lang formControlName="scriptLang" *ngIf="tbelEnabled"></tb-script-lang>\n  <tb-js-func *ngIf="switchConfigForm.get(\'scriptLang\').value === scriptLanguage.JS"\n              #jsFuncComponent\n              formControlName="jsScript"\n              functionName="Switch"\n              [functionArgs]="[\'msg\', \'metadata\', \'msgType\']"\n              helpId="rulenode/switch_node_script_fn"\n              noValidate="true">\n    <button toolbarSuffixButton\n            mat-icon-button\n            matTooltip="{{ testScriptLabel | translate }}"\n            matTooltipPosition="above"\n            class="tb-mat-32"\n            (click)="testScript()">\n      <mat-icon class="material-icons" color="primary">bug_report</mat-icon>\n    </button>\n  </tb-js-func>\n  <tb-js-func *ngIf="switchConfigForm.get(\'scriptLang\').value === scriptLanguage.TBEL"\n              #tbelFuncComponent\n              formControlName="tbelScript"\n              functionName="Switch"\n              [functionArgs]="[\'msg\', \'metadata\', \'msgType\']"\n              [disableUndefinedCheck]="true"\n              [scriptLanguage]="scriptLanguage.TBEL"\n              helpId="rulenode/tbel/switch_node_script_fn"\n              noValidate="true">\n    <button toolbarSuffixButton\n            mat-icon-button\n            matTooltip="{{ testScriptLabel | translate }}"\n            matTooltipPosition="above"\n            class="tb-mat-32"\n            (click)="testScript()">\n      <mat-icon class="material-icons" color="primary">bug_report</mat-icon>\n    </button>\n  </tb-js-func>\n  <button mat-button mat-raised-button color="primary" (click)="testScript()">\n    {{ testScriptLabel | translate }}\n  </button>\n</section>\n',dependencies:[{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:pe.JsFuncComponent,selector:"tb-js-func",inputs:["functionTitle","functionName","functionArgs","validationArgs","resultType","disabled","fillHeight","minHeight","editorCompleter","globalVariables","disableUndefinedCheck","helpId","scriptLanguage","noValidate","required"]},{kind:"component",type:de.MatButton,selector:"    button[mat-button], button[mat-raised-button], button[mat-flat-button],    button[mat-stroked-button]  ",inputs:["disabled","disableRipple","color"],exportAs:["matButton"]},{kind:"component",type:de.MatIconButton,selector:"button[mat-icon-button]",inputs:["disabled","disableRipple","color"],exportAs:["matButton"]},{kind:"component",type:ue.MatIcon,selector:"mat-icon",inputs:["color","inline","svgIcon","fontSet","fontIcon"],exportAs:["matIcon"]},{kind:"directive",type:ce.MatTooltip,selector:"[matTooltip]",exportAs:["matTooltip"]},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"component",type:fe.TbScriptLangComponent,selector:"tb-script-lang",inputs:["disabled"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Ir,decorators:[{type:n,args:[{selector:"tb-filter-node-switch-config",template:'<section [formGroup]="switchConfigForm">\n  <tb-script-lang formControlName="scriptLang" *ngIf="tbelEnabled"></tb-script-lang>\n  <tb-js-func *ngIf="switchConfigForm.get(\'scriptLang\').value === scriptLanguage.JS"\n              #jsFuncComponent\n              formControlName="jsScript"\n              functionName="Switch"\n              [functionArgs]="[\'msg\', \'metadata\', \'msgType\']"\n              helpId="rulenode/switch_node_script_fn"\n              noValidate="true">\n    <button toolbarSuffixButton\n            mat-icon-button\n            matTooltip="{{ testScriptLabel | translate }}"\n            matTooltipPosition="above"\n            class="tb-mat-32"\n            (click)="testScript()">\n      <mat-icon class="material-icons" color="primary">bug_report</mat-icon>\n    </button>\n  </tb-js-func>\n  <tb-js-func *ngIf="switchConfigForm.get(\'scriptLang\').value === scriptLanguage.TBEL"\n              #tbelFuncComponent\n              formControlName="tbelScript"\n              functionName="Switch"\n              [functionArgs]="[\'msg\', \'metadata\', \'msgType\']"\n              [disableUndefinedCheck]="true"\n              [scriptLanguage]="scriptLanguage.TBEL"\n              helpId="rulenode/tbel/switch_node_script_fn"\n              noValidate="true">\n    <button toolbarSuffixButton\n            mat-icon-button\n            matTooltip="{{ testScriptLabel | translate }}"\n            matTooltipPosition="above"\n            class="tb-mat-32"\n            (click)="testScript()">\n      <mat-icon class="material-icons" color="primary">bug_report</mat-icon>\n    </button>\n  </tb-js-func>\n  <button mat-button mat-raised-button color="primary" (click)="testScript()">\n    {{ testScriptLabel | translate }}\n  </button>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder},{type:oe.NodeScriptTestService},{type:Z.TranslateService}]},propDecorators:{jsFuncComponent:[{type:o,args:["jsFuncComponent",{static:!1}]}],tbelFuncComponent:[{type:o,args:["tbelFuncComponent",{static:!1}]}]}});class Nr{}e("RuleNodeCoreConfigFilterModule",Nr),Nr.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Nr,deps:[],target:t.ɵɵFactoryTarget.NgModule}),Nr.ɵmod=t.ɵɵngDeclareNgModule({minVersion:"14.0.0",version:"15.2.10",ngImport:t,type:Nr,declarations:[vr,Cr,Fr,kr,Lr,Tr,Ir,hr],imports:[$,M,$n],exports:[vr,Cr,Fr,kr,Lr,Tr,Ir,hr]}),Nr.ɵinj=t.ɵɵngDeclareInjector({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Nr,imports:[$,M,$n]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Nr,decorators:[{type:c,args:[{declarations:[vr,Cr,Fr,kr,Lr,Tr,Ir,hr],imports:[$,M,$n],exports:[vr,Cr,Fr,kr,Lr,Tr,Ir,hr]}]}]});class Sr extends f{constructor(e,t){super(e),this.store=e,this.fb=t,this.originatorSource=vt,this.originatorSources=Object.keys(vt),this.originatorSourceTranslationMap=Ct,this.originatorSourceDescTranslationMap=Ft,this.allowedEntityTypes=[F.DEVICE,F.ASSET,F.ENTITY_VIEW,F.USER,F.EDGE]}configForm(){return this.changeOriginatorConfigForm}onConfigurationSet(e){this.changeOriginatorConfigForm=this.fb.group({originatorSource:[e?e.originatorSource:null,[O.required]],entityType:[e?e.entityType:null,[]],entityNamePattern:[e?e.entityNamePattern:null,[]],relationsQuery:[e?e.relationsQuery:null,[]]})}validatorTriggers(){return["originatorSource"]}updateValidators(e){const t=this.changeOriginatorConfigForm.get("originatorSource").value;t===vt.RELATED?this.changeOriginatorConfigForm.get("relationsQuery").setValidators([O.required]):this.changeOriginatorConfigForm.get("relationsQuery").setValidators([]),t===vt.ENTITY?(this.changeOriginatorConfigForm.get("entityType").setValidators([O.required]),this.changeOriginatorConfigForm.get("entityNamePattern").setValidators([O.required,O.pattern(/.*\S.*/)])):(this.changeOriginatorConfigForm.get("entityType").patchValue(null,{emitEvent:e}),this.changeOriginatorConfigForm.get("entityNamePattern").patchValue(null,{emitEvent:e}),this.changeOriginatorConfigForm.get("entityType").setValidators([]),this.changeOriginatorConfigForm.get("entityNamePattern").setValidators([])),this.changeOriginatorConfigForm.get("relationsQuery").updateValueAndValidity({emitEvent:e}),this.changeOriginatorConfigForm.get("entityType").updateValueAndValidity({emitEvent:e}),this.changeOriginatorConfigForm.get("entityNamePattern").updateValueAndValidity({emitEvent:e})}}e("ChangeOriginatorConfigComponent",Sr),Sr.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Sr,deps:[{token:P.Store},{token:R.FormBuilder}],target:t.ɵɵFactoryTarget.Component}),Sr.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:Sr,selector:"tb-transformation-node-change-originator-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="changeOriginatorConfigForm" class="tb-form-panel no-border no-padding">\n  <mat-form-field class="mat-block" subscriptSizing="dynamic" hideRequiredMarker>\n    <mat-label translate>tb.rulenode.new-originator</mat-label>\n    <mat-select formControlName="originatorSource" required>\n      <mat-select-trigger>\n        <span *ngIf="originatorSourceTranslationMap.get(changeOriginatorConfigForm.get(\'originatorSource\').value)">\n          {{ originatorSourceTranslationMap.get(changeOriginatorConfigForm.get(\'originatorSource\').value) | translate }}\n        </span>\n      </mat-select-trigger>\n      <mat-option *ngFor="let source of originatorSources" [value]="source">\n        <span matListItemTitle>\n          {{ originatorSourceTranslationMap.get(source) | translate }}\n        </span>\n        <br>\n        <small matListItemMeta style="color: inherit">\n          {{ originatorSourceDescTranslationMap.get(source) | translate }}\n        </small>\n      </mat-option>\n    </mat-select>\n  </mat-form-field>\n  <div class="tb-form-panel stroked no-padding-bottom"\n        *ngIf="changeOriginatorConfigForm.get(\'originatorSource\').value === \'ENTITY\'">\n    <tb-example-hint [hintText]="\'tb.rulenode.entity-name-pattern-hint\' | translate"\n                      popupHelpLink="rulenode/change_originator_node_fields_templatization">\n    </tb-example-hint>\n    <div class="tb-form-row no-border no-padding tb-standard-fields">\n      <tb-entity-type-select\n        showLabel\n        required\n        [allowedEntityTypes] = "allowedEntityTypes"\n        formControlName="entityType"\n        class="mat-mdc-form-field flex">\n      </tb-entity-type-select>\n      <mat-form-field class="flex">\n        <mat-label translate>tb.rulenode.entity-name-pattern</mat-label>\n        <input required matInput formControlName="entityNamePattern">\n        <mat-error *ngIf="changeOriginatorConfigForm.get(\'entityNamePattern\').hasError(\'required\') ||\n                          changeOriginatorConfigForm.get(\'entityNamePattern\').hasError(\'pattern\')">\n          {{ \'tb.rulenode.entity-name-pattern-required\' | translate }}\n        </mat-error>\n      </mat-form-field>\n    </div>\n  </div>\n  <tb-relations-query-config\n    required\n    *ngIf="changeOriginatorConfigForm.get(\'originatorSource\').value === originatorSource.RELATED"\n    formControlName="relationsQuery">\n  </tb-relations-query-config>\n</section>\n',dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:ve.EntityTypeSelectComponent,selector:"tb-entity-type-select",inputs:["allowedEntityTypes","useAliasEntityTypes","filterAllowedEntityTypes","showLabel","required","disabled"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"component",type:X.MatSelect,selector:"mat-select",inputs:["disabled","disableRipple","tabIndex","hideSingleSelectionIndicator"],exportAs:["matSelect"]},{kind:"directive",type:X.MatSelectTrigger,selector:"mat-select-trigger"},{kind:"component",type:ee.MatOption,selector:"mat-option",exportAs:["matOption"]},{kind:"directive",type:qe.MatListItemTitle,selector:"[matListItemTitle]"},{kind:"directive",type:qe.MatListItemMeta,selector:"[matListItemMeta]"},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"component",type:Gn,selector:"tb-relations-query-config",inputs:["disabled","required"]},{kind:"component",type:An,selector:"tb-example-hint",inputs:["hintText","popupHelpLink","textAlign"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Sr,decorators:[{type:n,args:[{selector:"tb-transformation-node-change-originator-config",template:'<section [formGroup]="changeOriginatorConfigForm" class="tb-form-panel no-border no-padding">\n  <mat-form-field class="mat-block" subscriptSizing="dynamic" hideRequiredMarker>\n    <mat-label translate>tb.rulenode.new-originator</mat-label>\n    <mat-select formControlName="originatorSource" required>\n      <mat-select-trigger>\n        <span *ngIf="originatorSourceTranslationMap.get(changeOriginatorConfigForm.get(\'originatorSource\').value)">\n          {{ originatorSourceTranslationMap.get(changeOriginatorConfigForm.get(\'originatorSource\').value) | translate }}\n        </span>\n      </mat-select-trigger>\n      <mat-option *ngFor="let source of originatorSources" [value]="source">\n        <span matListItemTitle>\n          {{ originatorSourceTranslationMap.get(source) | translate }}\n        </span>\n        <br>\n        <small matListItemMeta style="color: inherit">\n          {{ originatorSourceDescTranslationMap.get(source) | translate }}\n        </small>\n      </mat-option>\n    </mat-select>\n  </mat-form-field>\n  <div class="tb-form-panel stroked no-padding-bottom"\n        *ngIf="changeOriginatorConfigForm.get(\'originatorSource\').value === \'ENTITY\'">\n    <tb-example-hint [hintText]="\'tb.rulenode.entity-name-pattern-hint\' | translate"\n                      popupHelpLink="rulenode/change_originator_node_fields_templatization">\n    </tb-example-hint>\n    <div class="tb-form-row no-border no-padding tb-standard-fields">\n      <tb-entity-type-select\n        showLabel\n        required\n        [allowedEntityTypes] = "allowedEntityTypes"\n        formControlName="entityType"\n        class="mat-mdc-form-field flex">\n      </tb-entity-type-select>\n      <mat-form-field class="flex">\n        <mat-label translate>tb.rulenode.entity-name-pattern</mat-label>\n        <input required matInput formControlName="entityNamePattern">\n        <mat-error *ngIf="changeOriginatorConfigForm.get(\'entityNamePattern\').hasError(\'required\') ||\n                          changeOriginatorConfigForm.get(\'entityNamePattern\').hasError(\'pattern\')">\n          {{ \'tb.rulenode.entity-name-pattern-required\' | translate }}\n        </mat-error>\n      </mat-form-field>\n    </div>\n  </div>\n  <tb-relations-query-config\n    required\n    *ngIf="changeOriginatorConfigForm.get(\'originatorSource\').value === originatorSource.RELATED"\n    formControlName="relationsQuery">\n  </tb-relations-query-config>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.FormBuilder}]}});class qr extends f{constructor(e,t,n,o){super(e),this.store=e,this.fb=t,this.nodeScriptTestService=n,this.translate=o,this.tbelEnabled=re(this.store).tbelEnabled,this.scriptLanguage=x,this.changeScript=new r,this.hasScript=!0,this.testScriptLabel="tb.rulenode.test-transformer-function"}configForm(){return this.scriptConfigForm}onConfigurationSet(e){this.scriptConfigForm=this.fb.group({scriptLang:[e?e.scriptLang:x.JS,[O.required]],jsScript:[e?e.jsScript:null,[O.required]],tbelScript:[e?e.tbelScript:null,[]]})}validatorTriggers(){return["scriptLang"]}updateValidators(e){let t=this.scriptConfigForm.get("scriptLang").value;t!==x.TBEL||this.tbelEnabled||(t=x.JS,this.scriptConfigForm.get("scriptLang").patchValue(t,{emitEvent:!1}),setTimeout((()=>{this.scriptConfigForm.updateValueAndValidity({emitEvent:!0})}))),this.scriptConfigForm.get("jsScript").setValidators(t===x.JS?[O.required]:[]),this.scriptConfigForm.get("jsScript").updateValueAndValidity({emitEvent:e}),this.scriptConfigForm.get("tbelScript").setValidators(t===x.TBEL?[O.required]:[]),this.scriptConfigForm.get("tbelScript").updateValueAndValidity({emitEvent:e})}prepareInputConfig(e){return e&&(e.scriptLang||(e.scriptLang=x.JS)),e}testScript(e){const t=this.scriptConfigForm.get("scriptLang").value,n=t===x.JS?"jsScript":"tbelScript",r=t===x.JS?"rulenode/transformation_node_script_fn":"rulenode/tbel/transformation_node_script_fn",o=this.scriptConfigForm.get(n).value;this.nodeScriptTestService.testNodeScript(o,"update",this.translate.instant("tb.rulenode.transformer"),"Transform",["msg","metadata","msgType"],this.ruleNodeId,r,t,e).subscribe((e=>{e&&(this.scriptConfigForm.get(n).setValue(e),this.changeScript.emit())}))}onValidate(){this.scriptConfigForm.get("scriptLang").value===x.JS&&this.jsFuncComponent.validateOnSubmit()}}e("TransformScriptConfigComponent",qr),qr.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:qr,deps:[{token:P.Store},{token:R.FormBuilder},{token:oe.NodeScriptTestService},{token:Z.TranslateService}],target:t.ɵɵFactoryTarget.Component}),qr.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:qr,selector:"tb-transformation-node-script-config",viewQueries:[{propertyName:"jsFuncComponent",first:!0,predicate:["jsFuncComponent"],descendants:!0},{propertyName:"tbelFuncComponent",first:!0,predicate:["tbelFuncComponent"],descendants:!0}],usesInheritance:!0,ngImport:t,template:'<section [formGroup]="scriptConfigForm">\n  <tb-script-lang formControlName="scriptLang" *ngIf="tbelEnabled"></tb-script-lang>\n  <tb-js-func *ngIf="scriptConfigForm.get(\'scriptLang\').value === scriptLanguage.JS"\n              #jsFuncComponent\n              formControlName="jsScript"\n              functionName="Transform"\n              helpId="rulenode/transformation_node_script_fn"\n              [functionArgs]="[\'msg\', \'metadata\', \'msgType\']"\n              noValidate="true">\n    <button toolbarSuffixButton\n            mat-icon-button\n            matTooltip="{{ testScriptLabel | translate }}"\n            matTooltipPosition="above"\n            class="tb-mat-32"\n            (click)="testScript()">\n      <mat-icon class="material-icons" color="primary">bug_report</mat-icon>\n    </button>\n  </tb-js-func>\n  <tb-js-func *ngIf="scriptConfigForm.get(\'scriptLang\').value === scriptLanguage.TBEL"\n              #tbelFuncComponent\n              formControlName="tbelScript"\n              functionName="Transform"\n              helpId="rulenode/tbel/transformation_node_script_fn"\n              [functionArgs]="[\'msg\', \'metadata\', \'msgType\']"\n              [disableUndefinedCheck]="true"\n              [scriptLanguage]="scriptLanguage.TBEL"\n              noValidate="true">\n    <button toolbarSuffixButton\n            mat-icon-button\n            matTooltip="{{ testScriptLabel | translate }}"\n            matTooltipPosition="above"\n            class="tb-mat-32"\n            (click)="testScript()">\n      <mat-icon class="material-icons" color="primary">bug_report</mat-icon>\n    </button>\n  </tb-js-func>\n  <div>\n    <button mat-button mat-raised-button color="primary" (click)="testScript()">\n      {{ testScriptLabel | translate }}\n    </button>\n  </div>\n</section>\n',dependencies:[{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:pe.JsFuncComponent,selector:"tb-js-func",inputs:["functionTitle","functionName","functionArgs","validationArgs","resultType","disabled","fillHeight","minHeight","editorCompleter","globalVariables","disableUndefinedCheck","helpId","scriptLanguage","noValidate","required"]},{kind:"component",type:de.MatButton,selector:"    button[mat-button], button[mat-raised-button], button[mat-flat-button],    button[mat-stroked-button]  ",inputs:["disabled","disableRipple","color"],exportAs:["matButton"]},{kind:"component",type:de.MatIconButton,selector:"button[mat-icon-button]",inputs:["disabled","disableRipple","color"],exportAs:["matButton"]},{kind:"component",type:ue.MatIcon,selector:"mat-icon",inputs:["color","inline","svgIcon","fontSet","fontIcon"],exportAs:["matIcon"]},{kind:"directive",type:ce.MatTooltip,selector:"[matTooltip]",exportAs:["matTooltip"]},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"component",type:fe.TbScriptLangComponent,selector:"tb-script-lang",inputs:["disabled"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:qr,decorators:[{type:n,args:[{selector:"tb-transformation-node-script-config",template:'<section [formGroup]="scriptConfigForm">\n  <tb-script-lang formControlName="scriptLang" *ngIf="tbelEnabled"></tb-script-lang>\n  <tb-js-func *ngIf="scriptConfigForm.get(\'scriptLang\').value === scriptLanguage.JS"\n              #jsFuncComponent\n              formControlName="jsScript"\n              functionName="Transform"\n              helpId="rulenode/transformation_node_script_fn"\n              [functionArgs]="[\'msg\', \'metadata\', \'msgType\']"\n              noValidate="true">\n    <button toolbarSuffixButton\n            mat-icon-button\n            matTooltip="{{ testScriptLabel | translate }}"\n            matTooltipPosition="above"\n            class="tb-mat-32"\n            (click)="testScript()">\n      <mat-icon class="material-icons" color="primary">bug_report</mat-icon>\n    </button>\n  </tb-js-func>\n  <tb-js-func *ngIf="scriptConfigForm.get(\'scriptLang\').value === scriptLanguage.TBEL"\n              #tbelFuncComponent\n              formControlName="tbelScript"\n              functionName="Transform"\n              helpId="rulenode/tbel/transformation_node_script_fn"\n              [functionArgs]="[\'msg\', \'metadata\', \'msgType\']"\n              [disableUndefinedCheck]="true"\n              [scriptLanguage]="scriptLanguage.TBEL"\n              noValidate="true">\n    <button toolbarSuffixButton\n            mat-icon-button\n            matTooltip="{{ testScriptLabel | translate }}"\n            matTooltipPosition="above"\n            class="tb-mat-32"\n            (click)="testScript()">\n      <mat-icon class="material-icons" color="primary">bug_report</mat-icon>\n    </button>\n  </tb-js-func>\n  <div>\n    <button mat-button mat-raised-button color="primary" (click)="testScript()">\n      {{ testScriptLabel | translate }}\n    </button>\n  </div>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.FormBuilder},{type:oe.NodeScriptTestService},{type:Z.TranslateService}]},propDecorators:{jsFuncComponent:[{type:o,args:["jsFuncComponent",{static:!1}]}],tbelFuncComponent:[{type:o,args:["tbelFuncComponent",{static:!1}]}]}});
-        /**
-         * @license
-         * Copyright Google LLC All Rights Reserved.
-         *
-         * Use of this source code is governed by an MIT-style license that can be
-         * found in the LICENSE file at https://angular.io/license
-         */
-        const Ar=mt({passive:!0});class Mr{constructor(e,t){this._platform=e,this._ngZone=t,this._monitoredElements=new Map}monitor(e){if(!this._platform.isBrowser)return He;const t=Te(e),n=this._monitoredElements.get(t);if(n)return n.subject;const r=new Ke,o="cdk-text-field-autofilled",a=e=>{"cdk-text-field-autofill-start"!==e.animationName||t.classList.contains(o)?"cdk-text-field-autofill-end"===e.animationName&&t.classList.contains(o)&&(t.classList.remove(o),this._ngZone.run((()=>r.next({target:e.target,isAutofilled:!1})))):(t.classList.add(o),this._ngZone.run((()=>r.next({target:e.target,isAutofilled:!0}))))};return this._ngZone.runOutsideAngular((()=>{t.addEventListener("animationstart",a,Ar),t.classList.add("cdk-text-field-autofill-monitored")})),this._monitoredElements.set(t,{subject:r,unlisten:()=>{t.removeEventListener("animationstart",a,Ar)}}),r}stopMonitoring(e){const t=Te(e),n=this._monitoredElements.get(t);n&&(n.unlisten(),n.subject.complete(),t.classList.remove("cdk-text-field-autofill-monitored"),t.classList.remove("cdk-text-field-autofilled"),this._monitoredElements.delete(t))}ngOnDestroy(){this._monitoredElements.forEach(((e,t)=>this.stopMonitoring(t)))}}Mr.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.0-rc.0",ngImport:t,type:Mr,deps:[{token:pt.Platform},{token:t.NgZone}],target:t.ɵɵFactoryTarget.Injectable}),Mr.ɵprov=t.ɵɵngDeclareInjectable({minVersion:"12.0.0",version:"15.2.0-rc.0",ngImport:t,type:Mr,providedIn:"root"}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.0-rc.0",ngImport:t,type:Mr,decorators:[{type:s,args:[{providedIn:"root"}]}],ctorParameters:function(){return[{type:pt.Platform},{type:t.NgZone}]}});class Er{constructor(e,t){this._elementRef=e,this._autofillMonitor=t,this.cdkAutofill=new r}ngOnInit(){this._autofillMonitor.monitor(this._elementRef).subscribe((e=>this.cdkAutofill.emit(e)))}ngOnDestroy(){this._autofillMonitor.stopMonitoring(this._elementRef)}}Er.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.0-rc.0",ngImport:t,type:Er,deps:[{token:t.ElementRef},{token:Mr}],target:t.ɵɵFactoryTarget.Directive}),Er.ɵdir=t.ɵɵngDeclareDirective({minVersion:"14.0.0",version:"15.2.0-rc.0",type:Er,selector:"[cdkAutofill]",outputs:{cdkAutofill:"cdkAutofill"},ngImport:t}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.0-rc.0",ngImport:t,type:Er,decorators:[{type:d,args:[{selector:"[cdkAutofill]"}]}],ctorParameters:function(){return[{type:t.ElementRef},{type:Mr}]},propDecorators:{cdkAutofill:[{type:u}]}});
-        /**
-         * @license
-         * Copyright Google LLC All Rights Reserved.
-         *
-         * Use of this source code is governed by an MIT-style license that can be
-         * found in the LICENSE file at https://angular.io/license
-         */
-        class Gr{get minRows(){return this._minRows}set minRows(e){this._minRows=Ie(e),this._setMinHeight()}get maxRows(){return this._maxRows}set maxRows(e){this._maxRows=Ie(e),this._setMaxHeight()}get enabled(){return this._enabled}set enabled(e){e=Le(e),this._enabled!==e&&((this._enabled=e)?this.resizeToFitContent(!0):this.reset())}get placeholder(){return this._textareaElement.placeholder}set placeholder(e){this._cachedPlaceholderHeight=void 0,e?this._textareaElement.setAttribute("placeholder",e):this._textareaElement.removeAttribute("placeholder"),this._cacheTextareaPlaceholderHeight()}constructor(e,t,n,r){this._elementRef=e,this._platform=t,this._ngZone=n,this._destroyed=new Ke,this._enabled=!0,this._previousMinRows=-1,this._isViewInited=!1,this._handleFocusEvent=e=>{this._hasFocus="focus"===e.type},this._document=r,this._textareaElement=this._elementRef.nativeElement}_setMinHeight(){const e=this.minRows&&this._cachedLineHeight?this.minRows*this._cachedLineHeight+"px":null;e&&(this._textareaElement.style.minHeight=e)}_setMaxHeight(){const e=this.maxRows&&this._cachedLineHeight?this.maxRows*this._cachedLineHeight+"px":null;e&&(this._textareaElement.style.maxHeight=e)}ngAfterViewInit(){this._platform.isBrowser&&(this._initialHeight=this._textareaElement.style.height,this.resizeToFitContent(),this._ngZone.runOutsideAngular((()=>{const e=this._getWindow();je(e,"resize").pipe(Pe(16),Ve(this._destroyed)).subscribe((()=>this.resizeToFitContent(!0))),this._textareaElement.addEventListener("focus",this._handleFocusEvent),this._textareaElement.addEventListener("blur",this._handleFocusEvent)})),this._isViewInited=!0,this.resizeToFitContent(!0))}ngOnDestroy(){this._textareaElement.removeEventListener("focus",this._handleFocusEvent),this._textareaElement.removeEventListener("blur",this._handleFocusEvent),this._destroyed.next(),this._destroyed.complete()}_cacheTextareaLineHeight(){if(this._cachedLineHeight)return;let e=this._textareaElement.cloneNode(!1);e.rows=1,e.style.position="absolute",e.style.visibility="hidden",e.style.border="none",e.style.padding="0",e.style.height="",e.style.minHeight="",e.style.maxHeight="",e.style.overflow="hidden",this._textareaElement.parentNode.appendChild(e),this._cachedLineHeight=e.clientHeight,e.remove(),this._setMinHeight(),this._setMaxHeight()}_measureScrollHeight(){const e=this._textareaElement,t=e.style.marginBottom||"",n=this._platform.FIREFOX,r=n&&this._hasFocus,o=n?"cdk-textarea-autosize-measuring-firefox":"cdk-textarea-autosize-measuring";r&&(e.style.marginBottom=`${e.clientHeight}px`),e.classList.add(o);const a=e.scrollHeight-4;return e.classList.remove(o),r&&(e.style.marginBottom=t),a}_cacheTextareaPlaceholderHeight(){if(!this._isViewInited||null!=this._cachedPlaceholderHeight)return;if(!this.placeholder)return void(this._cachedPlaceholderHeight=0);const e=this._textareaElement.value;this._textareaElement.value=this._textareaElement.placeholder,this._cachedPlaceholderHeight=this._measureScrollHeight(),this._textareaElement.value=e}ngDoCheck(){this._platform.isBrowser&&this.resizeToFitContent()}resizeToFitContent(e=!1){if(!this._enabled)return;if(this._cacheTextareaLineHeight(),this._cacheTextareaPlaceholderHeight(),!this._cachedLineHeight)return;const t=this._elementRef.nativeElement,n=t.value;if(!e&&this._minRows===this._previousMinRows&&n===this._previousValue)return;const r=this._measureScrollHeight(),o=Math.max(r,this._cachedPlaceholderHeight||0);t.style.height=`${o}px`,this._ngZone.runOutsideAngular((()=>{"undefined"!=typeof requestAnimationFrame?requestAnimationFrame((()=>this._scrollToCaretPosition(t))):setTimeout((()=>this._scrollToCaretPosition(t)))})),this._previousValue=n,this._previousMinRows=this._minRows}reset(){void 0!==this._initialHeight&&(this._textareaElement.style.height=this._initialHeight)}_noopInputHandler(){}_getDocument(){return this._document||document}_getWindow(){return this._getDocument().defaultView||window}_scrollToCaretPosition(e){const{selectionStart:t,selectionEnd:n}=e;!this._destroyed.isStopped&&this._hasFocus&&e.setSelectionRange(t,n)}}Gr.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.0-rc.0",ngImport:t,type:Gr,deps:[{token:t.ElementRef},{token:pt.Platform},{token:t.NgZone},{token:j,optional:!0}],target:t.ɵɵFactoryTarget.Directive}),Gr.ɵdir=t.ɵɵngDeclareDirective({minVersion:"14.0.0",version:"15.2.0-rc.0",type:Gr,selector:"textarea[cdkTextareaAutosize]",inputs:{minRows:["cdkAutosizeMinRows","minRows"],maxRows:["cdkAutosizeMaxRows","maxRows"],enabled:["cdkTextareaAutosize","enabled"],placeholder:"placeholder"},host:{attributes:{rows:"1"},listeners:{input:"_noopInputHandler()"},classAttribute:"cdk-textarea-autosize"},exportAs:["cdkTextareaAutosize"],ngImport:t}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.0-rc.0",ngImport:t,type:Gr,decorators:[{type:d,args:[{selector:"textarea[cdkTextareaAutosize]",exportAs:"cdkTextareaAutosize",host:{class:"cdk-textarea-autosize",rows:"1","(input)":"_noopInputHandler()"}}]}],ctorParameters:function(){return[{type:t.ElementRef},{type:pt.Platform},{type:t.NgZone},{type:void 0,decorators:[{type:p},{type:m,args:[j]}]}]},propDecorators:{minRows:[{type:i,args:["cdkAutosizeMinRows"]}],maxRows:[{type:i,args:["cdkAutosizeMaxRows"]}],enabled:[{type:i,args:["cdkTextareaAutosize"]}],placeholder:[{type:i}]}});
-        /**
-         * @license
-         * Copyright Google LLC All Rights Reserved.
-         *
-         * Use of this source code is governed by an MIT-style license that can be
-         * found in the LICENSE file at https://angular.io/license
-         */
-        class Dr{}Dr.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.0-rc.0",ngImport:t,type:Dr,deps:[],target:t.ɵɵFactoryTarget.NgModule}),Dr.ɵmod=t.ɵɵngDeclareNgModule({minVersion:"14.0.0",version:"15.2.0-rc.0",ngImport:t,type:Dr,declarations:[Er,Gr],exports:[Er,Gr]}),Dr.ɵinj=t.ɵɵngDeclareInjector({minVersion:"12.0.0",version:"15.2.0-rc.0",ngImport:t,type:Dr}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.0-rc.0",ngImport:t,type:Dr,decorators:[{type:c,args:[{declarations:[Er,Gr],exports:[Er,Gr]}]}]});class wr extends f{constructor(e,t){super(e),this.store=e,this.fb=t,this.mailBodyTypes=[{name:"tb.mail-body-type.plain-text",description:"tb.mail-body-type.plain-text-description",value:"false"},{name:"tb.mail-body-type.html",description:"tb.mail-body-type.html-text-description",value:"true"},{name:"tb.mail-body-type.use-body-type-template",description:"tb.mail-body-type.dynamic-text-description",value:"dynamic"}]}configForm(){return this.toEmailConfigForm}onConfigurationSet(e){this.toEmailConfigForm=this.fb.group({fromTemplate:[e?e.fromTemplate:null,[O.required]],toTemplate:[e?e.toTemplate:null,[O.required]],ccTemplate:[e?e.ccTemplate:null,[]],bccTemplate:[e?e.bccTemplate:null,[]],subjectTemplate:[e?e.subjectTemplate:null,[O.required]],mailBodyType:[e?e.mailBodyType:null],isHtmlTemplate:[e?e.isHtmlTemplate:null,[O.required]],bodyTemplate:[e?e.bodyTemplate:null,[O.required]]})}prepareInputConfig(e){return{fromTemplate:ae(e?.fromTemplate)?e.fromTemplate:null,toTemplate:ae(e?.toTemplate)?e.toTemplate:null,ccTemplate:ae(e?.ccTemplate)?e.ccTemplate:null,bccTemplate:ae(e?.bccTemplate)?e.bccTemplate:null,subjectTemplate:ae(e?.subjectTemplate)?e.subjectTemplate:null,mailBodyType:ae(e?.mailBodyType)?e.mailBodyType:null,isHtmlTemplate:ae(e?.isHtmlTemplate)?e.isHtmlTemplate:null,bodyTemplate:ae(e?.bodyTemplate)?e.bodyTemplate:null}}updateValidators(e){"dynamic"===this.toEmailConfigForm.get("mailBodyType").value?this.toEmailConfigForm.get("isHtmlTemplate").enable({emitEvent:!1}):this.toEmailConfigForm.get("isHtmlTemplate").disable({emitEvent:!1}),this.toEmailConfigForm.get("isHtmlTemplate").updateValueAndValidity({emitEvent:e})}validatorTriggers(){return["mailBodyType"]}getBodyTypeName(){return this.mailBodyTypes.find((e=>e.value===this.toEmailConfigForm.get("mailBodyType").value)).name}}e("ToEmailConfigComponent",wr),wr.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:wr,deps:[{token:P.Store},{token:R.FormBuilder}],target:t.ɵɵFactoryTarget.Component}),wr.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:wr,selector:"tb-transformation-node-to-email-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="toEmailConfigForm" class="tb-form-panel no-border no-padding">\n  <div class="tb-form-panel stroked">\n    <div class="tb-form-panel-title" translate>tb.rulenode.email-sender</div>\n    <div class="tb-form-row no-border no-padding tb-standard-fields">\n      <mat-form-field class="flex" subscriptSizing="dynamic">\n        <mat-label translate>tb.rulenode.from-template</mat-label>\n        <input required matInput formControlName="fromTemplate">\n        <mat-hint align="start">\n          {{ \'tb.rulenode.email-from-template-hint\' | translate }}\n        </mat-hint>\n        <mat-hint align="end">\n          <div class="input-bottom-double-hint">\n            <div class="see-example"\n                hintMode\n                tb-help-popup="{{\'rulenode/to_email_node_fields_templatization\'}}"\n                tb-help-popup-placement="right"\n                trigger-style="letter-spacing:0.25px; font-size:12px;"\n                [tb-help-popup-style]="{maxWidth: \'820px\'}"\n                trigger-text="{{ \'tb.key-val.see-examples\' | translate }}"></div>\n          </div>\n        </mat-hint>\n        <mat-error *ngIf="toEmailConfigForm.get(\'fromTemplate\').hasError(\'required\')">\n          {{ \'tb.rulenode.from-template-required\' | translate }}\n        </mat-error>\n      </mat-form-field>\n    </div>\n  </div>\n  <div class="tb-form-panel stroked">\n    <div class="tb-form-panel no-padding no-border">\n      <div class="tb-form-panel-title" translate>tb.rulenode.recipients</div>\n      <tb-example-hint [hintText]="\'tb.rulenode.recipients-block-main-hint\' | translate"\n                        popupHelpLink="rulenode/to_email_node_fields_templatization">\n      </tb-example-hint>\n    </div>\n    <div class="tb-form-row no-border no-padding tb-standard-fields">\n      <mat-form-field class="flex">\n        <mat-label translate>tb.rulenode.to-template</mat-label>\n        <textarea required\n                  matInput\n                  class="tb-enable-vertical-resize"\n                  formControlName="toTemplate"\n                  cdkTextareaAutosize\n                  cdkAutosizeMinRows="1"></textarea>\n        <mat-error *ngIf="toEmailConfigForm.get(\'toTemplate\').hasError(\'required\')">\n          {{ \'tb.rulenode.to-template-required\' | translate }}\n        </mat-error>\n      </mat-form-field>\n      <mat-form-field class="flex">\n        <mat-label translate>tb.rulenode.cc-template</mat-label>\n        <textarea matInput\n                  formControlName="ccTemplate"\n                  class="tb-enable-vertical-resize"\n                  cdkTextareaAutosize\n                  cdkAutosizeMinRows="1"></textarea>\n      </mat-form-field>\n      <mat-form-field class="flex">\n        <mat-label translate>tb.rulenode.bcc-template</mat-label>\n        <textarea matInput\n                  formControlName="bccTemplate"\n                  class="tb-enable-vertical-resize"\n                  cdkTextareaAutosize\n                  cdkAutosizeMinRows="1"></textarea>\n      </mat-form-field>\n    </div>\n  </div>\n  <div class="tb-form-panel stroked">\n    <div class="tb-form-panel-title" translate>tb.rulenode.message-subject-and-content</div>\n    <tb-example-hint [hintText]="\'tb.rulenode.kv-map-pattern-hint\' | translate"\n                      popupHelpLink="rulenode/to_email_node_fields_templatization">\n    </tb-example-hint>\n    <section>\n      <mat-form-field class="mat-block">\n        <mat-label translate>tb.rulenode.subject-template</mat-label>\n        <textarea required\n                  matInput\n                  formControlName="subjectTemplate"\n                  class="tb-enable-vertical-resize"\n                  cdkTextareaAutosize\n                  cdkAutosizeMinRows="1"></textarea>\n        <mat-error *ngIf="toEmailConfigForm.get(\'subjectTemplate\').hasError(\'required\')">\n          {{ \'tb.rulenode.subject-template-required\' | translate }}\n        </mat-error>\n      </mat-form-field>\n      <mat-form-field class="mat-block">\n        <mat-label translate>tb.rulenode.mail-body-type</mat-label>\n        <mat-select formControlName="mailBodyType">\n          <mat-select-trigger>\n            <span *ngIf="toEmailConfigForm.get(\'mailBodyType\').value">\n              {{ getBodyTypeName() | translate }}\n            </span>\n          </mat-select-trigger>\n          <mat-option *ngFor="let type of mailBodyTypes" [value]="type.value">\n            <span matListItemTitle>\n              {{ type.name | translate }}\n            </span>\n            <br>\n            <small matListItemMeta style="color: inherit">\n              {{ type.description | translate }}\n            </small>\n          </mat-option>\n        </mat-select>\n      </mat-form-field>\n      <mat-form-field class="mat-block" *ngIf="toEmailConfigForm.get(\'mailBodyType\').value === \'dynamic\'">\n        <mat-label translate>tb.rulenode.body-type-template</mat-label>\n        <input required matInput formControlName="isHtmlTemplate">\n        <mat-hint translate>tb.mail-body-type.after-template-evaluation-hint</mat-hint>\n      </mat-form-field>\n      <mat-form-field class="mat-block">\n        <mat-label translate>tb.rulenode.body-template</mat-label>\n        <textarea required\n                  matInput\n                  formControlName="bodyTemplate"\n                  class="tb-enable-vertical-resize"\n                  cdkTextareaAutosize\n                  cdkAutosizeMinRows="2"></textarea>\n        <mat-error *ngIf="toEmailConfigForm.get(\'bodyTemplate\').hasError(\'required\')">\n          {{ \'tb.rulenode.body-template-required\' | translate }}\n        </mat-error>\n      </mat-form-field>\n    </section>\n  </div>\n</section>\n',styles:[":host .input-bottom-double-hint{display:inline-flex}:host .input-bottom-double-hint .see-example{flex-shrink:0;padding-right:16px}:host textarea.tb-enable-vertical-resize{resize:vertical}\n"],dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:$e.HelpPopupComponent,selector:"[tb-help-popup], [tb-help-popup-content]",inputs:["tb-help-popup","tb-help-popup-content","trigger-text","trigger-style","tb-help-popup-placement","tb-help-popup-style","hintMode"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatHint,selector:"mat-hint",inputs:["align","id"]},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"directive",type:Gr,selector:"textarea[cdkTextareaAutosize]",inputs:["cdkAutosizeMinRows","cdkAutosizeMaxRows","cdkTextareaAutosize","placeholder"],exportAs:["cdkTextareaAutosize"]},{kind:"component",type:X.MatSelect,selector:"mat-select",inputs:["disabled","disableRipple","tabIndex","hideSingleSelectionIndicator"],exportAs:["matSelect"]},{kind:"directive",type:X.MatSelectTrigger,selector:"mat-select-trigger"},{kind:"component",type:ee.MatOption,selector:"mat-option",exportAs:["matOption"]},{kind:"directive",type:qe.MatListItemTitle,selector:"[matListItemTitle]"},{kind:"directive",type:qe.MatListItemMeta,selector:"[matListItemMeta]"},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"component",type:An,selector:"tb-example-hint",inputs:["hintText","popupHelpLink","textAlign"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:wr,decorators:[{type:n,args:[{selector:"tb-transformation-node-to-email-config",template:'<section [formGroup]="toEmailConfigForm" class="tb-form-panel no-border no-padding">\n  <div class="tb-form-panel stroked">\n    <div class="tb-form-panel-title" translate>tb.rulenode.email-sender</div>\n    <div class="tb-form-row no-border no-padding tb-standard-fields">\n      <mat-form-field class="flex" subscriptSizing="dynamic">\n        <mat-label translate>tb.rulenode.from-template</mat-label>\n        <input required matInput formControlName="fromTemplate">\n        <mat-hint align="start">\n          {{ \'tb.rulenode.email-from-template-hint\' | translate }}\n        </mat-hint>\n        <mat-hint align="end">\n          <div class="input-bottom-double-hint">\n            <div class="see-example"\n                hintMode\n                tb-help-popup="{{\'rulenode/to_email_node_fields_templatization\'}}"\n                tb-help-popup-placement="right"\n                trigger-style="letter-spacing:0.25px; font-size:12px;"\n                [tb-help-popup-style]="{maxWidth: \'820px\'}"\n                trigger-text="{{ \'tb.key-val.see-examples\' | translate }}"></div>\n          </div>\n        </mat-hint>\n        <mat-error *ngIf="toEmailConfigForm.get(\'fromTemplate\').hasError(\'required\')">\n          {{ \'tb.rulenode.from-template-required\' | translate }}\n        </mat-error>\n      </mat-form-field>\n    </div>\n  </div>\n  <div class="tb-form-panel stroked">\n    <div class="tb-form-panel no-padding no-border">\n      <div class="tb-form-panel-title" translate>tb.rulenode.recipients</div>\n      <tb-example-hint [hintText]="\'tb.rulenode.recipients-block-main-hint\' | translate"\n                        popupHelpLink="rulenode/to_email_node_fields_templatization">\n      </tb-example-hint>\n    </div>\n    <div class="tb-form-row no-border no-padding tb-standard-fields">\n      <mat-form-field class="flex">\n        <mat-label translate>tb.rulenode.to-template</mat-label>\n        <textarea required\n                  matInput\n                  class="tb-enable-vertical-resize"\n                  formControlName="toTemplate"\n                  cdkTextareaAutosize\n                  cdkAutosizeMinRows="1"></textarea>\n        <mat-error *ngIf="toEmailConfigForm.get(\'toTemplate\').hasError(\'required\')">\n          {{ \'tb.rulenode.to-template-required\' | translate }}\n        </mat-error>\n      </mat-form-field>\n      <mat-form-field class="flex">\n        <mat-label translate>tb.rulenode.cc-template</mat-label>\n        <textarea matInput\n                  formControlName="ccTemplate"\n                  class="tb-enable-vertical-resize"\n                  cdkTextareaAutosize\n                  cdkAutosizeMinRows="1"></textarea>\n      </mat-form-field>\n      <mat-form-field class="flex">\n        <mat-label translate>tb.rulenode.bcc-template</mat-label>\n        <textarea matInput\n                  formControlName="bccTemplate"\n                  class="tb-enable-vertical-resize"\n                  cdkTextareaAutosize\n                  cdkAutosizeMinRows="1"></textarea>\n      </mat-form-field>\n    </div>\n  </div>\n  <div class="tb-form-panel stroked">\n    <div class="tb-form-panel-title" translate>tb.rulenode.message-subject-and-content</div>\n    <tb-example-hint [hintText]="\'tb.rulenode.kv-map-pattern-hint\' | translate"\n                      popupHelpLink="rulenode/to_email_node_fields_templatization">\n    </tb-example-hint>\n    <section>\n      <mat-form-field class="mat-block">\n        <mat-label translate>tb.rulenode.subject-template</mat-label>\n        <textarea required\n                  matInput\n                  formControlName="subjectTemplate"\n                  class="tb-enable-vertical-resize"\n                  cdkTextareaAutosize\n                  cdkAutosizeMinRows="1"></textarea>\n        <mat-error *ngIf="toEmailConfigForm.get(\'subjectTemplate\').hasError(\'required\')">\n          {{ \'tb.rulenode.subject-template-required\' | translate }}\n        </mat-error>\n      </mat-form-field>\n      <mat-form-field class="mat-block">\n        <mat-label translate>tb.rulenode.mail-body-type</mat-label>\n        <mat-select formControlName="mailBodyType">\n          <mat-select-trigger>\n            <span *ngIf="toEmailConfigForm.get(\'mailBodyType\').value">\n              {{ getBodyTypeName() | translate }}\n            </span>\n          </mat-select-trigger>\n          <mat-option *ngFor="let type of mailBodyTypes" [value]="type.value">\n            <span matListItemTitle>\n              {{ type.name | translate }}\n            </span>\n            <br>\n            <small matListItemMeta style="color: inherit">\n              {{ type.description | translate }}\n            </small>\n          </mat-option>\n        </mat-select>\n      </mat-form-field>\n      <mat-form-field class="mat-block" *ngIf="toEmailConfigForm.get(\'mailBodyType\').value === \'dynamic\'">\n        <mat-label translate>tb.rulenode.body-type-template</mat-label>\n        <input required matInput formControlName="isHtmlTemplate">\n        <mat-hint translate>tb.mail-body-type.after-template-evaluation-hint</mat-hint>\n      </mat-form-field>\n      <mat-form-field class="mat-block">\n        <mat-label translate>tb.rulenode.body-template</mat-label>\n        <textarea required\n                  matInput\n                  formControlName="bodyTemplate"\n                  class="tb-enable-vertical-resize"\n                  cdkTextareaAutosize\n                  cdkAutosizeMinRows="2"></textarea>\n        <mat-error *ngIf="toEmailConfigForm.get(\'bodyTemplate\').hasError(\'required\')">\n          {{ \'tb.rulenode.body-template-required\' | translate }}\n        </mat-error>\n      </mat-form-field>\n    </section>\n  </div>\n</section>\n',styles:[":host .input-bottom-double-hint{display:inline-flex}:host .input-bottom-double-hint .see-example{flex-shrink:0;padding-right:16px}:host textarea.tb-enable-vertical-resize{resize:vertical}\n"]}]}],ctorParameters:function(){return[{type:P.Store},{type:R.FormBuilder}]}});class Vr extends f{constructor(e,t,n){super(e),this.store=e,this.fb=t,this.translate=n,this.copyFrom=[],this.translation=tn;for(const e of this.translation.keys())this.copyFrom.push({value:e,name:this.translate.instant(this.translation.get(e))})}onConfigurationSet(e){this.copyKeysConfigForm=this.fb.group({copyFrom:[e.copyFrom,[O.required]],keys:[e?e.keys:null,[O.required]]})}configForm(){return this.copyKeysConfigForm}prepareInputConfig(e){let t;return t=ae(e?.fromMetadata)?e.copyFrom?en.METADATA:en.DATA:ae(e?.copyFrom)?e.copyFrom:en.DATA,{keys:ae(e?.keys)?e.keys:null,copyFrom:t}}}e("CopyKeysConfigComponent",Vr),Vr.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Vr,deps:[{token:P.Store},{token:R.FormBuilder},{token:Z.TranslateService}],target:t.ɵɵFactoryTarget.Component}),Vr.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:Vr,selector:"tb-transformation-node-copy-keys-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="copyKeysConfigForm" class="tb-form-panel no-padding no-border">\n  <tb-msg-metadata-chip\n    [labelText]="(\'tb.key-val.copy-key-values-from\' | translate)"\n    [translation]="translation"\n    formControlName="copyFrom">\n  </tb-msg-metadata-chip>\n  <tb-string-items-list class="mat-block"\n                        required\n                        [label]="\'tb.rulenode.keys\' | translate"\n                        [placeholder]="\'tb.rulenode.add-key\' | translate"\n                        [requiredText]="\'tb.key-val.at-least-one-key-error\' | translate"\n                        formControlName="keys">\n    <mat-icon matSuffix class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon"\n              color="primary"\n              matTooltip="{{ \'tb.rulenode.use-regular-expression-hint\' | translate }}">\n      help\n    </mat-icon>\n  </tb-string-items-list>\n</section>\n',styles:[':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n'],dependencies:[{kind:"component",type:et.StringItemsListComponent,selector:"tb-string-items-list",inputs:["required","disabled","label","placeholder","hint","requiredText","floatLabel","appearance","editable","subscriptSizing","predefinedValues"]},{kind:"component",type:ue.MatIcon,selector:"mat-icon",inputs:["color","inline","svgIcon","fontSet","fontIcon"],exportAs:["matIcon"]},{kind:"directive",type:Y.MatSuffix,selector:"[matSuffix], [matIconSuffix], [matTextSuffix]",inputs:["matTextSuffix"]},{kind:"directive",type:ce.MatTooltip,selector:"[matTooltip]",exportAs:["matTooltip"]},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"component",type:Kn,selector:"tb-msg-metadata-chip",inputs:["labelText","translation"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Vr,decorators:[{type:n,args:[{selector:"tb-transformation-node-copy-keys-config",template:'<section [formGroup]="copyKeysConfigForm" class="tb-form-panel no-padding no-border">\n  <tb-msg-metadata-chip\n    [labelText]="(\'tb.key-val.copy-key-values-from\' | translate)"\n    [translation]="translation"\n    formControlName="copyFrom">\n  </tb-msg-metadata-chip>\n  <tb-string-items-list class="mat-block"\n                        required\n                        [label]="\'tb.rulenode.keys\' | translate"\n                        [placeholder]="\'tb.rulenode.add-key\' | translate"\n                        [requiredText]="\'tb.key-val.at-least-one-key-error\' | translate"\n                        formControlName="keys">\n    <mat-icon matSuffix class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon"\n              color="primary"\n              matTooltip="{{ \'tb.rulenode.use-regular-expression-hint\' | translate }}">\n      help\n    </mat-icon>\n  </tb-string-items-list>\n</section>\n',styles:[':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n']}]}],ctorParameters:function(){return[{type:P.Store},{type:R.FormBuilder},{type:Z.TranslateService}]}});class Pr extends f{constructor(e,t,n){super(e),this.store=e,this.fb=t,this.translate=n,this.renameIn=[],this.translation=rn;for(const e of this.translation.keys())this.renameIn.push({value:e,name:this.translate.instant(this.translation.get(e))})}configForm(){return this.renameKeysConfigForm}onConfigurationSet(e){this.renameKeysConfigForm=this.fb.group({renameIn:[e?e.renameIn:null,[O.required]],renameKeysMapping:[e?e.renameKeysMapping:null,[O.required]]})}prepareInputConfig(e){let t;return t=ae(e?.fromMetadata)?e.fromMetadata?en.METADATA:en.DATA:ae(e?.renameIn)?e?.renameIn:en.DATA,{renameKeysMapping:ae(e?.renameKeysMapping)?e.renameKeysMapping:null,renameIn:t}}}e("RenameKeysConfigComponent",Pr),Pr.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Pr,deps:[{token:P.Store},{token:R.FormBuilder},{token:Z.TranslateService}],target:t.ɵɵFactoryTarget.Component}),Pr.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:Pr,selector:"tb-transformation-node-rename-keys-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="renameKeysConfigForm" class="tb-form-panel stroked">\n  <div class="tb-form-panel-title" translate>tb.rulenode.rename-keys-in</div>\n  <div class="fx-centered">\n    <div class="fetch-to-data-toggle">\n      <tb-toggle-select class="fetch-to-data-toggle" formControlName="renameIn" appearance="fill">\n        <tb-toggle-option *ngFor="let data of renameIn" [value]="data.value">\n          {{ data.name }}\n        </tb-toggle-option>\n      </tb-toggle-select>\n    </div>\n  </div>\n  <tb-kv-map-config\n    required\n    labelText="{{ translation.get(renameKeysConfigForm.get(\'renameIn\').value) | translate }} {{\'tb.rulenode.keys-mapping\' | translate}}"\n    formControlName="renameKeysMapping"\n    uniqueKeyValuePairValidator\n    requiredText="{{\'tb.rulenode.attr-mapping-required\' | translate}}"\n    keyText="{{\'tb.rulenode.current-key-name\' | translate}}"\n    keyRequiredText="{{\'tb.rulenode.key-name-required\' | translate}}"\n    valText="{{\'tb.rulenode.new-key-name\' | translate}}"\n    valRequiredText="{{\'tb.rulenode.new-key-name-required\' | translate}}">\n  </tb-kv-map-config>\n</section>\n',styles:[":host .fetch-to-data-toggle{max-width:420px;width:100%}:host .fx-centered{display:flex;width:100%;justify-content:space-around}\n"],dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"directive",type:Fe.ToggleOption,selector:"tb-toggle-option",inputs:["value"]},{kind:"component",type:ke.ToggleSelectComponent,selector:"tb-toggle-select",inputs:["disabled","selectMediaBreakpoint","appearance","disablePagination"]},{kind:"component",type:Mn,selector:"tb-kv-map-config",inputs:["disabled","uniqueKeyValuePairValidator","labelText","requiredText","keyText","keyRequiredText","valText","valRequiredText","hintText","popupHelpLink","required"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Pr,decorators:[{type:n,args:[{selector:"tb-transformation-node-rename-keys-config",template:'<section [formGroup]="renameKeysConfigForm" class="tb-form-panel stroked">\n  <div class="tb-form-panel-title" translate>tb.rulenode.rename-keys-in</div>\n  <div class="fx-centered">\n    <div class="fetch-to-data-toggle">\n      <tb-toggle-select class="fetch-to-data-toggle" formControlName="renameIn" appearance="fill">\n        <tb-toggle-option *ngFor="let data of renameIn" [value]="data.value">\n          {{ data.name }}\n        </tb-toggle-option>\n      </tb-toggle-select>\n    </div>\n  </div>\n  <tb-kv-map-config\n    required\n    labelText="{{ translation.get(renameKeysConfigForm.get(\'renameIn\').value) | translate }} {{\'tb.rulenode.keys-mapping\' | translate}}"\n    formControlName="renameKeysMapping"\n    uniqueKeyValuePairValidator\n    requiredText="{{\'tb.rulenode.attr-mapping-required\' | translate}}"\n    keyText="{{\'tb.rulenode.current-key-name\' | translate}}"\n    keyRequiredText="{{\'tb.rulenode.key-name-required\' | translate}}"\n    valText="{{\'tb.rulenode.new-key-name\' | translate}}"\n    valRequiredText="{{\'tb.rulenode.new-key-name-required\' | translate}}">\n  </tb-kv-map-config>\n</section>\n',styles:[":host .fetch-to-data-toggle{max-width:420px;width:100%}:host .fx-centered{display:flex;width:100%;justify-content:space-around}\n"]}]}],ctorParameters:function(){return[{type:P.Store},{type:R.FormBuilder},{type:Z.TranslateService}]}});class Rr extends f{constructor(e,t){super(e),this.store=e,this.fb=t}configForm(){return this.jsonPathConfigForm}onConfigurationSet(e){this.jsonPathConfigForm=this.fb.group({jsonPath:[e?e.jsonPath:null,[O.required]]})}}e("NodeJsonPathConfigComponent",Rr),Rr.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Rr,deps:[{token:P.Store},{token:R.FormBuilder}],target:t.ɵɵFactoryTarget.Component}),Rr.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:Rr,selector:"tb-transformation-node-json-path-config",usesInheritance:!0,ngImport:t,template:"<section [formGroup]=\"jsonPathConfigForm\">\n  <mat-form-field subscriptSizing=\"dynamic\" class=\"mat-block\">\n    <mat-label>{{ 'tb.rulenode.json-path-expression' | translate }}</mat-label>\n    <input matInput formControlName=\"jsonPath\" required/>\n    <mat-hint>{{ 'tb.rulenode.json-path-expression-hint' | translate }}</mat-hint>\n    <mat-error *ngIf=\"jsonPathConfigForm.get('jsonPath').hasError('required')\">{{ 'tb.rulenode.json-path-expression-required' | translate }}</mat-error>\n  </mat-form-field>\n</section>\n",dependencies:[{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatHint,selector:"mat-hint",inputs:["align","id"]},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Rr,decorators:[{type:n,args:[{selector:"tb-transformation-node-json-path-config",template:"<section [formGroup]=\"jsonPathConfigForm\">\n  <mat-form-field subscriptSizing=\"dynamic\" class=\"mat-block\">\n    <mat-label>{{ 'tb.rulenode.json-path-expression' | translate }}</mat-label>\n    <input matInput formControlName=\"jsonPath\" required/>\n    <mat-hint>{{ 'tb.rulenode.json-path-expression-hint' | translate }}</mat-hint>\n    <mat-error *ngIf=\"jsonPathConfigForm.get('jsonPath').hasError('required')\">{{ 'tb.rulenode.json-path-expression-required' | translate }}</mat-error>\n  </mat-form-field>\n</section>\n"}]}],ctorParameters:function(){return[{type:P.Store},{type:R.FormBuilder}]}});class Or extends f{constructor(e,t,n){super(e),this.store=e,this.fb=t,this.translate=n,this.deleteFrom=[],this.translation=nn;for(const e of this.translation.keys())this.deleteFrom.push({value:e,name:this.translate.instant(this.translation.get(e))})}onConfigurationSet(e){this.deleteKeysConfigForm=this.fb.group({deleteFrom:[e.deleteFrom,[O.required]],keys:[e?e.keys:null,[O.required]]})}prepareInputConfig(e){let t;return t=ae(e?.fromMetadata)?e.fromMetadata?en.METADATA:en.DATA:ae(e?.deleteFrom)?e?.deleteFrom:en.DATA,{keys:ae(e?.keys)?e.keys:null,deleteFrom:t}}configForm(){return this.deleteKeysConfigForm}}e("DeleteKeysConfigComponent",Or),Or.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Or,deps:[{token:P.Store},{token:R.FormBuilder},{token:Z.TranslateService}],target:t.ɵɵFactoryTarget.Component}),Or.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:Or,selector:"tb-transformation-node-delete-keys-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="deleteKeysConfigForm" class="tb-form-panel no-border no-padding">\n  <tb-msg-metadata-chip\n    [labelText]="(\'tb.key-val.delete-key-values-from\' | translate)"\n    formControlName="deleteFrom">\n  </tb-msg-metadata-chip>\n  <tb-string-items-list class="mat-block"\n                        required\n                        [label]="\'tb.rulenode.keys\' | translate"\n                        [placeholder]="\'tb.rulenode.add-key\' | translate"\n                        [requiredText]="\'tb.key-val.at-least-one-key-error\' | translate"\n                        formControlName="keys">\n    <mat-icon matSuffix class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon"\n              color="primary"\n              matTooltip="{{ \'tb.rulenode.use-regular-expression-delete-hint\' | translate }}">\n      help\n    </mat-icon>\n  </tb-string-items-list>\n</section>\n',styles:[':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n'],dependencies:[{kind:"component",type:et.StringItemsListComponent,selector:"tb-string-items-list",inputs:["required","disabled","label","placeholder","hint","requiredText","floatLabel","appearance","editable","subscriptSizing","predefinedValues"]},{kind:"component",type:ue.MatIcon,selector:"mat-icon",inputs:["color","inline","svgIcon","fontSet","fontIcon"],exportAs:["matIcon"]},{kind:"directive",type:Y.MatSuffix,selector:"[matSuffix], [matIconSuffix], [matTextSuffix]",inputs:["matTextSuffix"]},{kind:"directive",type:ce.MatTooltip,selector:"[matTooltip]",exportAs:["matTooltip"]},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"component",type:Kn,selector:"tb-msg-metadata-chip",inputs:["labelText","translation"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Or,decorators:[{type:n,args:[{selector:"tb-transformation-node-delete-keys-config",template:'<section [formGroup]="deleteKeysConfigForm" class="tb-form-panel no-border no-padding">\n  <tb-msg-metadata-chip\n    [labelText]="(\'tb.key-val.delete-key-values-from\' | translate)"\n    formControlName="deleteFrom">\n  </tb-msg-metadata-chip>\n  <tb-string-items-list class="mat-block"\n                        required\n                        [label]="\'tb.rulenode.keys\' | translate"\n                        [placeholder]="\'tb.rulenode.add-key\' | translate"\n                        [requiredText]="\'tb.key-val.at-least-one-key-error\' | translate"\n                        formControlName="keys">\n    <mat-icon matSuffix class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon"\n              color="primary"\n              matTooltip="{{ \'tb.rulenode.use-regular-expression-delete-hint\' | translate }}">\n      help\n    </mat-icon>\n  </tb-string-items-list>\n</section>\n',styles:[':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n']}]}],ctorParameters:function(){return[{type:P.Store},{type:R.FormBuilder},{type:Z.TranslateService}]}});class _r extends f{constructor(e,t){super(e),this.store=e,this.fb=t,this.deduplicationStrategie=Gt,this.deduplicationStrategies=Object.keys(this.deduplicationStrategie),this.deduplicationStrategiesTranslations=Dt}configForm(){return this.deduplicationConfigForm}onConfigurationSet(e){this.deduplicationConfigForm=this.fb.group({interval:[ae(e?.interval)?e.interval:null,[O.required,O.min(1)]],strategy:[ae(e?.strategy)?e.strategy:null,[O.required]],outMsgType:[ae(e?.outMsgType)?e.outMsgType:null,[O.required]],maxPendingMsgs:[ae(e?.maxPendingMsgs)?e.maxPendingMsgs:null,[O.required,O.min(1),O.max(1e3)]],maxRetries:[ae(e?.maxRetries)?e.maxRetries:null,[O.required,O.min(0),O.max(100)]]})}prepareInputConfig(e){return e||(e={}),e.outMsgType||(e.outMsgType="POST_TELEMETRY_REQUEST"),super.prepareInputConfig(e)}updateValidators(e){this.deduplicationConfigForm.get("strategy").value===this.deduplicationStrategie.ALL?this.deduplicationConfigForm.get("outMsgType").enable({emitEvent:!1}):this.deduplicationConfigForm.get("outMsgType").disable({emitEvent:!1}),this.deduplicationConfigForm.get("outMsgType").updateValueAndValidity({emitEvent:e})}validatorTriggers(){return["strategy"]}}e("DeduplicationConfigComponent",_r),_r.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:_r,deps:[{token:P.Store},{token:R.FormBuilder}],target:t.ɵɵFactoryTarget.Component}),_r.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:_r,selector:"tb-action-node-msg-deduplication-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="deduplicationConfigForm">\n  <mat-form-field class="mat-block">\n    <mat-label>{{\'tb.rulenode.interval\' | translate}}</mat-label>\n    <input type=\'number\' required matInput formControlName="interval">\n    <mat-error *ngIf="deduplicationConfigForm.get(\'interval\').hasError(\'required\')">\n      {{\'tb.rulenode.interval-required\' | translate}}\n    </mat-error>\n    <mat-error *ngIf="deduplicationConfigForm.get(\'interval\').hasError(\'min\')">\n      {{\'tb.rulenode.interval-min-error\' | translate}}\n    </mat-error>\n    <mat-icon matSuffix class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon"\n              color="primary"\n              matTooltip="{{ \'tb.rulenode.interval-hint\' | translate }}">help</mat-icon>\n  </mat-form-field>\n  <div class="tb-form-panel no-padding no-border">\n    <div class="tb-form-panel stroked">\n      <div class="tb-form-panel-title  tb-required" translate>tb.rulenode.strategy</div>\n      <tb-toggle-select class="fetch-to-data-toggle" formControlName="strategy" appearance="fill">\n        <tb-toggle-option *ngFor="let strategy of deduplicationStrategies" [value]="strategy">\n          {{ deduplicationStrategiesTranslations.get(strategy) | translate }}\n        </tb-toggle-option>\n      </tb-toggle-select>\n      <tb-example-hint [hintText]="\'tb.rulenode.strategy-all-hint\' | translate"\n                       *ngIf="deduplicationConfigForm.get(\'strategy\').value === \'ALL\'">\n      </tb-example-hint>\n      <tb-example-hint [hintText]="\'tb.rulenode.strategy-first-hint\' | translate"\n                        textAlign="\'center\'"\n                       *ngIf="deduplicationConfigForm.get(\'strategy\').value === \'FIRST\'">\n      </tb-example-hint>\n      <tb-example-hint [hintText]="\'tb.rulenode.strategy-last-hint\' | translate"\n                        textAlign="\'center\'"\n                       *ngIf="deduplicationConfigForm.get(\'strategy\').value === \'LAST\'">\n      </tb-example-hint>\n      <div *ngIf="deduplicationConfigForm.get(\'strategy\').value === deduplicationStrategie.ALL">\n        <tb-output-message-type-autocomplete\n          required\n          formControlName="outMsgType">\n        </tb-output-message-type-autocomplete>\n      </div>\n    </div>\n    <section class="tb-form-panel stroked">\n      <mat-expansion-panel class="tb-settings">\n        <mat-expansion-panel-header>\n          <mat-panel-title translate>tb.rulenode.advanced-settings</mat-panel-title>\n        </mat-expansion-panel-header>\n        <div class="tb-form-row no-border no-padding tb-standard-fields">\n          <mat-form-field class="flex">\n            <mat-label>{{\'tb.rulenode.max-pending-msgs\' | translate}}</mat-label>\n            <input type = \'number\' required matInput formControlName="maxPendingMsgs">\n            <mat-error *ngIf="deduplicationConfigForm.get(\'maxPendingMsgs\').hasError(\'required\')">\n              {{\'tb.rulenode.max-pending-msgs-required\' | translate}}\n            </mat-error>\n            <mat-error *ngIf="deduplicationConfigForm.get(\'maxPendingMsgs\').hasError(\'max\')">\n              {{\'tb.rulenode.max-pending-msgs-max-error\' | translate}}\n            </mat-error>\n            <mat-error *ngIf="deduplicationConfigForm.get(\'maxPendingMsgs\').hasError(\'min\')">\n              {{\'tb.rulenode.max-pending-msgs-min-error\' | translate}}\n            </mat-error>\n            <mat-icon matSuffix class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon"\n                      color="primary"\n                      matTooltip="{{ \'tb.rulenode.max-pending-msgs-hint\' | translate }}">help</mat-icon>\n          </mat-form-field>\n          <mat-form-field class="flex">\n            <mat-label>{{\'tb.rulenode.max-retries\' | translate}}</mat-label>\n            <input type = \'number\' required matInput formControlName="maxRetries">\n            <mat-error *ngIf="deduplicationConfigForm.get(\'maxRetries\').hasError(\'required\')">\n              {{\'tb.rulenode.max-retries-required\' | translate}}\n            </mat-error>\n            <mat-error *ngIf="deduplicationConfigForm.get(\'maxRetries\').hasError(\'max\')">\n              {{\'tb.rulenode.max-retries-max-error\' | translate}}\n            </mat-error>\n            <mat-error *ngIf="deduplicationConfigForm.get(\'maxRetries\').hasError(\'min\')">\n              {{\'tb.rulenode.max-retries-min-error\' | translate}}\n            </mat-error>\n            <mat-icon matSuffix class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon"\n                      color="primary"\n                      matTooltip="{{ \'tb.rulenode.max-retries-hint\' | translate }}">help</mat-icon>\n          </mat-form-field>\n        </div>\n      </mat-expansion-panel>\n    </section>\n  </div>\n</section>\n',styles:[':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n'],dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:ue.MatIcon,selector:"mat-icon",inputs:["color","inline","svgIcon","fontSet","fontIcon"],exportAs:["matIcon"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"directive",type:Y.MatSuffix,selector:"[matSuffix], [matIconSuffix], [matTextSuffix]",inputs:["matTextSuffix"]},{kind:"directive",type:ce.MatTooltip,selector:"[matTooltip]",exportAs:["matTooltip"]},{kind:"component",type:We.MatExpansionPanel,selector:"mat-expansion-panel",inputs:["disabled","expanded","hideToggle","togglePosition"],outputs:["opened","closed","expandedChange","afterExpand","afterCollapse"],exportAs:["matExpansionPanel"]},{kind:"component",type:We.MatExpansionPanelHeader,selector:"mat-expansion-panel-header",inputs:["tabIndex","expandedHeight","collapsedHeight"]},{kind:"directive",type:We.MatExpansionPanelTitle,selector:"mat-panel-title"},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NumberValueAccessor,selector:"input[type=number][formControlName],input[type=number][formControl],input[type=number][ngModel]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"directive",type:Fe.ToggleOption,selector:"tb-toggle-option",inputs:["value"]},{kind:"component",type:ke.ToggleSelectComponent,selector:"tb-toggle-select",inputs:["disabled","selectMediaBreakpoint","appearance","disablePagination"]},{kind:"component",type:Bn,selector:"tb-output-message-type-autocomplete",inputs:["subscriptSizing","disabled","required"]},{kind:"component",type:An,selector:"tb-example-hint",inputs:["hintText","popupHelpLink","textAlign"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:_r,decorators:[{type:n,args:[{selector:"tb-action-node-msg-deduplication-config",template:'<section [formGroup]="deduplicationConfigForm">\n  <mat-form-field class="mat-block">\n    <mat-label>{{\'tb.rulenode.interval\' | translate}}</mat-label>\n    <input type=\'number\' required matInput formControlName="interval">\n    <mat-error *ngIf="deduplicationConfigForm.get(\'interval\').hasError(\'required\')">\n      {{\'tb.rulenode.interval-required\' | translate}}\n    </mat-error>\n    <mat-error *ngIf="deduplicationConfigForm.get(\'interval\').hasError(\'min\')">\n      {{\'tb.rulenode.interval-min-error\' | translate}}\n    </mat-error>\n    <mat-icon matSuffix class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon"\n              color="primary"\n              matTooltip="{{ \'tb.rulenode.interval-hint\' | translate }}">help</mat-icon>\n  </mat-form-field>\n  <div class="tb-form-panel no-padding no-border">\n    <div class="tb-form-panel stroked">\n      <div class="tb-form-panel-title  tb-required" translate>tb.rulenode.strategy</div>\n      <tb-toggle-select class="fetch-to-data-toggle" formControlName="strategy" appearance="fill">\n        <tb-toggle-option *ngFor="let strategy of deduplicationStrategies" [value]="strategy">\n          {{ deduplicationStrategiesTranslations.get(strategy) | translate }}\n        </tb-toggle-option>\n      </tb-toggle-select>\n      <tb-example-hint [hintText]="\'tb.rulenode.strategy-all-hint\' | translate"\n                       *ngIf="deduplicationConfigForm.get(\'strategy\').value === \'ALL\'">\n      </tb-example-hint>\n      <tb-example-hint [hintText]="\'tb.rulenode.strategy-first-hint\' | translate"\n                        textAlign="\'center\'"\n                       *ngIf="deduplicationConfigForm.get(\'strategy\').value === \'FIRST\'">\n      </tb-example-hint>\n      <tb-example-hint [hintText]="\'tb.rulenode.strategy-last-hint\' | translate"\n                        textAlign="\'center\'"\n                       *ngIf="deduplicationConfigForm.get(\'strategy\').value === \'LAST\'">\n      </tb-example-hint>\n      <div *ngIf="deduplicationConfigForm.get(\'strategy\').value === deduplicationStrategie.ALL">\n        <tb-output-message-type-autocomplete\n          required\n          formControlName="outMsgType">\n        </tb-output-message-type-autocomplete>\n      </div>\n    </div>\n    <section class="tb-form-panel stroked">\n      <mat-expansion-panel class="tb-settings">\n        <mat-expansion-panel-header>\n          <mat-panel-title translate>tb.rulenode.advanced-settings</mat-panel-title>\n        </mat-expansion-panel-header>\n        <div class="tb-form-row no-border no-padding tb-standard-fields">\n          <mat-form-field class="flex">\n            <mat-label>{{\'tb.rulenode.max-pending-msgs\' | translate}}</mat-label>\n            <input type = \'number\' required matInput formControlName="maxPendingMsgs">\n            <mat-error *ngIf="deduplicationConfigForm.get(\'maxPendingMsgs\').hasError(\'required\')">\n              {{\'tb.rulenode.max-pending-msgs-required\' | translate}}\n            </mat-error>\n            <mat-error *ngIf="deduplicationConfigForm.get(\'maxPendingMsgs\').hasError(\'max\')">\n              {{\'tb.rulenode.max-pending-msgs-max-error\' | translate}}\n            </mat-error>\n            <mat-error *ngIf="deduplicationConfigForm.get(\'maxPendingMsgs\').hasError(\'min\')">\n              {{\'tb.rulenode.max-pending-msgs-min-error\' | translate}}\n            </mat-error>\n            <mat-icon matSuffix class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon"\n                      color="primary"\n                      matTooltip="{{ \'tb.rulenode.max-pending-msgs-hint\' | translate }}">help</mat-icon>\n          </mat-form-field>\n          <mat-form-field class="flex">\n            <mat-label>{{\'tb.rulenode.max-retries\' | translate}}</mat-label>\n            <input type = \'number\' required matInput formControlName="maxRetries">\n            <mat-error *ngIf="deduplicationConfigForm.get(\'maxRetries\').hasError(\'required\')">\n              {{\'tb.rulenode.max-retries-required\' | translate}}\n            </mat-error>\n            <mat-error *ngIf="deduplicationConfigForm.get(\'maxRetries\').hasError(\'max\')">\n              {{\'tb.rulenode.max-retries-max-error\' | translate}}\n            </mat-error>\n            <mat-error *ngIf="deduplicationConfigForm.get(\'maxRetries\').hasError(\'min\')">\n              {{\'tb.rulenode.max-retries-min-error\' | translate}}\n            </mat-error>\n            <mat-icon matSuffix class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon"\n                      color="primary"\n                      matTooltip="{{ \'tb.rulenode.max-retries-hint\' | translate }}">help</mat-icon>\n          </mat-form-field>\n        </div>\n      </mat-expansion-panel>\n    </section>\n  </div>\n</section>\n',styles:[':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n']}]}],ctorParameters:function(){return[{type:P.Store},{type:R.FormBuilder}]}});class Br{}e("RulenodeCoreConfigTransformModule",Br),Br.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Br,deps:[],target:t.ɵɵFactoryTarget.NgModule}),Br.ɵmod=t.ɵɵngDeclareNgModule({minVersion:"14.0.0",version:"15.2.10",ngImport:t,type:Br,declarations:[Sr,qr,wr,Vr,Pr,Rr,Or,_r],imports:[$,M,$n],exports:[Sr,qr,wr,Vr,Pr,Rr,Or,_r]}),Br.ɵinj=t.ɵɵngDeclareInjector({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Br,imports:[$,M,$n]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Br,decorators:[{type:c,args:[{declarations:[Sr,qr,wr,Vr,Pr,Rr,Or,_r],imports:[$,M,$n],exports:[Sr,qr,wr,Vr,Pr,Rr,Or,_r]}]}]});class Kr extends f{constructor(e,t){super(e),this.store=e,this.fb=t,this.entityType=F}configForm(){return this.ruleChainInputConfigForm}onConfigurationSet(e){this.ruleChainInputConfigForm=this.fb.group({ruleChainId:[e?e.ruleChainId:null,[O.required]]})}}e("RuleChainInputComponent",Kr),Kr.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Kr,deps:[{token:P.Store},{token:R.UntypedFormBuilder}],target:t.ɵɵFactoryTarget.Component}),Kr.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:Kr,selector:"tb-flow-node-rule-chain-input-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="ruleChainInputConfigForm" fxLayout="column">\n  <tb-entity-autocomplete required\n                          [excludeEntityIds]="[ruleChainId]"\n                          [entityType]="entityType.RULE_CHAIN"\n                          [entitySubtype]="ruleChainType"\n                          formControlName="ruleChainId">\n  </tb-entity-autocomplete>\n</section>\n',dependencies:[{kind:"component",type:lt.EntityAutocompleteComponent,selector:"tb-entity-autocomplete",inputs:["entityType","entitySubtype","excludeEntityIds","labelText","requiredText","useFullEntityId","appearance","required","disabled"],outputs:["entityChanged"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Kr,decorators:[{type:n,args:[{selector:"tb-flow-node-rule-chain-input-config",template:'<section [formGroup]="ruleChainInputConfigForm" fxLayout="column">\n  <tb-entity-autocomplete required\n                          [excludeEntityIds]="[ruleChainId]"\n                          [entityType]="entityType.RULE_CHAIN"\n                          [entitySubtype]="ruleChainType"\n                          formControlName="ruleChainId">\n  </tb-entity-autocomplete>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder}]}});class zr extends f{constructor(e,t){super(e),this.store=e,this.fb=t}configForm(){return this.ruleChainOutputConfigForm}onConfigurationSet(e){this.ruleChainOutputConfigForm=this.fb.group({})}}e("RuleChainOutputComponent",zr),zr.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:zr,deps:[{token:P.Store},{token:R.UntypedFormBuilder}],target:t.ɵɵFactoryTarget.Component}),zr.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:zr,selector:"tb-flow-node-rule-chain-output-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="ruleChainOutputConfigForm" fxLayout="column">\n  <div innerHTML="{{ \'tb.rulenode.output-node-name-hint\' | translate }}"></div>\n</section>\n',dependencies:[{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:zr,decorators:[{type:n,args:[{selector:"tb-flow-node-rule-chain-output-config",template:'<section [formGroup]="ruleChainOutputConfigForm" fxLayout="column">\n  <div innerHTML="{{ \'tb.rulenode.output-node-name-hint\' | translate }}"></div>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder}]}});class Ur{}e("RuleNodeCoreConfigFlowModule",Ur),Ur.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Ur,deps:[],target:t.ɵɵFactoryTarget.NgModule}),Ur.ɵmod=t.ɵɵngDeclareNgModule({minVersion:"14.0.0",version:"15.2.10",ngImport:t,type:Ur,declarations:[Kr,zr],imports:[$,M,$n],exports:[Kr,zr]}),Ur.ɵinj=t.ɵɵngDeclareInjector({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Ur,imports:[$,M,$n]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Ur,decorators:[{type:c,args:[{declarations:[Kr,zr],imports:[$,M,$n],exports:[Kr,zr]}]}]});class Hr{constructor(e){!function(e){e.setTranslation("en_US",{tb:{rulenode:{id:"Id","additional-info":"Additional Info","advanced-settings":"Advanced settings","create-entity-if-not-exists":"Create new entity if not exists","create-entity-if-not-exists-hint":"Create a new entity set above if it does not exist.","select-device-connectivity-event":"Select device connectivity event","entity-name-pattern":"Name pattern","entity-name-pattern-required":"Name pattern is required","entity-name-pattern-hint":"Name pattern field support templatization. Use $[messageKey] to extract value from the message and ${metadataKey} to extract value from the metadata.","copy-message-type":"Copy message type","entity-type-pattern":"Type pattern","entity-type-pattern-required":"Type pattern is required","message-type-value":"Message type value","message-type-value-required":"Message type value is required","message-type-value-max-length":"Message type value should be less than 256","output-message-type":"Output message type","entity-cache-expiration":"Entities cache expiration time (sec)","entity-cache-expiration-hint":"Specifies maximum time interval allowed to store found entity records. 0 value means that records will never expire.","entity-cache-expiration-required":"Entities cache expiration time is required.","entity-cache-expiration-range":"Entities cache expiration time should be greater than or equal to 0.","customer-name-pattern":"Customer name pattern","customer-name-pattern-required":"Customer name pattern is required","create-customer-if-not-exists":"Create new customer if not exists","customer-cache-expiration":"Customers cache expiration time (sec)","customer-cache-expiration-hint":"Specifies maximum time interval allowed to store found customer records. 0 value means that records will never expire.","customer-cache-expiration-required":"Customers cache expiration time is required.","customer-cache-expiration-range":"Customers cache expiration time should be greater than or equal to 0.","interval-start":"Interval start","interval-end":"Interval end","time-unit":"Time unit","fetch-mode":"Fetch mode","order-by-timestamp":"Order by timestamp",limit:"Limit","limit-hint":"Min limit value is 2, max - 1000. If you want to fetch a single entry, select fetch mode 'First' or 'Last'.","limit-required":"Limit is required.","limit-range":"Limit should be in a range from 2 to 1000.","time-unit-milliseconds":"Milliseconds","time-unit-seconds":"Seconds","time-unit-minutes":"Minutes","time-unit-hours":"Hours","time-unit-days":"Days","time-value-range":"Allowing range from 1 to 2147483647.","start-interval-value-required":"Interval start is required.","end-interval-value-required":"Interval end is required.",filter:"Filter",switch:"Switch","math-templatization-tooltip":"This field support templatization. Use $[messageKey] to extract value from the message and ${metadataKey} to extract value from the metadata.","add-message-type":"Add message type","select-message-types-required":"At least one message type should be selected.","select-message-types":"Select message types","no-message-types-found":"No message types found","no-message-type-matching":"'{{messageType}}' not found.","create-new-message-type":"Create a new one.","message-types-required":"Message types are required.","client-attributes":"Client attributes","shared-attributes":"Shared attributes","server-attributes":"Server attributes","attributes-keys":"Attributes keys","attributes-keys-required":"Attributes keys are required","notify-device":"Force notification to the device","send-attributes-updated-notification":"Send attributes updated notification","send-attributes-updated-notification-hint":"Send notification about updated attributes as a separate message to the rule engine queue.","send-attributes-deleted-notification":"Send attributes deleted notification","send-attributes-deleted-notification-hint":"Send notification about deleted attributes as a separate message to the rule engine queue.","update-attributes-only-on-value-change":"Save attributes only if the value changes","update-attributes-only-on-value-change-hint":"Updates the attributes on every incoming message disregarding if their value has changed. Increases API usage and reduces performance.","update-attributes-only-on-value-change-hint-enabled":"Updates the attributes only if their value has changed. If the value is not changed, no update to the attribute timestamp nor attribute change notification will be sent.","fetch-credentials-to-metadata":"Fetch credentials to metadata","notify-device-on-update-hint":"If enabled, force notification to the device about shared attributes update. If disabled, the notification behavior is controlled by the 'notifyDevice' parameter from the incoming message metadata. To turn off the notification, the message metadata must contain the 'notifyDevice' parameter set to 'false'. Any other case will trigger the notification to the device.","notify-device-on-delete-hint":"If enabled, force notification to the device about shared attributes removal. If disabled, the notification behavior is controlled by the 'notifyDevice' parameter from the incoming message metadata. To turn on the notification, the message metadata must contain the 'notifyDevice' parameter set to 'true'. In any other case, the notification will not be triggered to the device.","latest-timeseries":"Latest time-series data keys","timeseries-keys":"Timeseries keys","timeseries-keys-required":"At least one timeseries key should be selected.","add-timeseries-key":"Add timeseries key","add-message-field":"Add message field","relation-search-parameters":"Relation search parameters","add-metadata-field":"Add metadata field","data-keys":"Message field names","copy-from":"Copy from","data-to-metadata":"Data to metadata","metadata-to-data":"Metadata to data","use-regular-expression-hint":"Use regular expression to copy keys by pattern.\n\nTips & tricks:\nPress 'Enter' to complete field name input.\nPress 'Backspace' to delete field name. Multiple field names supported.",interval:"Interval","interval-required":"Interval is required","interval-hint":"Deduplication interval in seconds.","interval-min-error":"Min allowed value is 1","max-pending-msgs":"Max pending messages","max-pending-msgs-hint":"Maximum number of messages that are stored in memory for each unique deduplication id.","max-pending-msgs-required":"Max pending messages is required","max-pending-msgs-max-error":"Max allowed value is 1000","max-pending-msgs-min-error":"Min allowed value is 1","max-retries":"Max retries","max-retries-required":"Max retries is required","max-retries-hint":"Maximum number of retries to push the deduplicated messages into the queue. 10 seconds delay is used between retries","max-retries-max-error":"Max allowed value is 100","max-retries-min-error":"Min allowed value is 0",strategy:"Strategy","strategy-required":"Strategy is required","strategy-all-hint":"Return all messages that arrived during deduplication period as a single JSON array message. Where each element represents object with msg and metadata inner properties.","strategy-first-hint":"Return first message that arrived during deduplication period.","strategy-last-hint":"Return last message that arrived during deduplication period.",first:"First",last:"Last",all:"All","output-msg-type-hint":"The message type of the deduplication result.","queue-name-hint":"The queue name where the deduplication result will be published.",keys:"Keys","keys-required":"Keys are required","rename-keys-in":"Rename keys in",data:"Data",message:"Message",metadata:"Metadata","current-key-name":"Current key name","key-name-required":"Key name is required","new-key-name":"New key name","new-key-name-required":"New key name is required","metadata-keys":"Metadata field names","json-path-expression":"JSON path expression","json-path-expression-required":"JSON path expression is required","json-path-expression-hint":"JSONPath specifies a path to an element or a set of elements in a JSON structure. '$' represents the root object or array.","relations-query":"Relations query","device-relations-query":"Device relations query","max-relation-level":"Max relation level","max-relation-level-error":"Value should be greater than 0 or unspecified.","relation-type":"Relation type","relation-type-pattern":"Relation type pattern","relation-type-pattern-required":"Relation type pattern is required","relation-types-list":"Relation types to propagate","relation-types-list-hint":"If Propagate relation types are not selected, alarms will be propagated without filtering by relation type.","unlimited-level":"Unlimited level","latest-telemetry":"Latest telemetry","add-telemetry-key":"Add telemetry key","delete-from":"Delete from","use-regular-expression-delete-hint":"Use regular expression to delete keys by pattern.\n\nTips & tricks:\nPress 'Enter' to complete field name input.\nPress 'Backspace' to delete field name.\nMultiple field names supported.","fetch-into":"Fetch into","attr-mapping":"Attributes mapping:","source-attribute":"Source attribute key","source-attribute-required":"Source attribute key is required.","source-telemetry":"Source telemetry key","source-telemetry-required":"Source telemetry key is required.","target-key":"Target key","target-key-required":"Target key is required.","attr-mapping-required":"At least one mapping entry should be specified.","fields-mapping":"Fields mapping","relations-query-config-direction-suffix":"originator","profile-name":"Profile name","fetch-circle-parameter-info-from-metadata-hint":'Metadata field \'{{perimeterKeyName}}\' should be defined in next format: {"latitude":48.196, "longitude":24.6532, "radius":100.0, "radiusUnit":"METER"}',"fetch-poligon-parameter-info-from-metadata-hint":"Metadata field '{{perimeterKeyName}}' should be defined in next format: [[48.19736,24.65235],[48.19800,24.65060],...,[48.19849,24.65420]]","short-templatization-tooltip":"Use $[messageKey] to extract value from the message and ${metadataKey} to extract value from the metadata.","fields-mapping-required":"At least one field mapping should be specified.","at-least-one-field-required":"At least one input field must have a value(s) provided.","originator-fields-sv-map-hint":"Target key fields support templatization. Use $[messageKey] to extract value from the message and ${metadataKey} to extract value from the metadata.","sv-map-hint":"Only target key fields support templatization. Use $[messageKey] to extract value from the message and ${metadataKey} to extract value from the metadata.","source-field":"Source field","source-field-required":"Source field is required.","originator-source":"Originator source","new-originator":"New originator","originator-customer":"Customer","originator-tenant":"Tenant","originator-related":"Related entity","originator-alarm-originator":"Alarm Originator","originator-entity":"Entity by name pattern","clone-message":"Clone message",transform:"Transform","default-ttl":"Default TTL in seconds","default-ttl-required":"Default TTL is required.","min-default-ttl-message":"Only 0 minimum TTL is allowed.","message-count":"Message count (0 - unlimited)","message-count-required":"Message count is required.","min-message-count-message":"Only 0 minimum message count is allowed.","period-seconds":"Period in seconds","period-seconds-required":"Period is required.","use-metadata-period-in-seconds-patterns":"Use period in seconds pattern","use-metadata-period-in-seconds-patterns-hint":"If selected, rule node use period in seconds interval pattern from message metadata or data assuming that intervals are in the seconds.","period-in-seconds-pattern":"Period in seconds pattern","period-in-seconds-pattern-required":"Period in seconds pattern is required","min-period-seconds-message":"Only 1 second minimum period is allowed.",originator:"Originator","message-body":"Message body","message-metadata":"Message metadata",generate:"Generate","test-generator-function":"Test generator function",generator:"Generator","test-filter-function":"Test filter function","test-switch-function":"Test switch function","test-transformer-function":"Test transformer function",transformer:"Transformer","alarm-create-condition":"Alarm create condition","test-condition-function":"Test condition function","alarm-clear-condition":"Alarm clear condition","alarm-details-builder":"Alarm details builder","test-details-function":"Test details function","alarm-type":"Alarm type","select-entity-types":"Select entity types","alarm-type-required":"Alarm type is required.","alarm-severity":"Alarm severity","alarm-severity-required":"Alarm severity is required","alarm-severity-pattern":"Alarm severity pattern","alarm-status-filter":"Alarm status filter","alarm-status-list-empty":"Alarm status list is empty","no-alarm-status-matching":"No alarm status matching were found.",propagate:"Propagate alarm to related entities","propagate-to-owner":"Propagate alarm to entity owner (Customer or Tenant)","propagate-to-tenant":"Propagate alarm to Tenant",condition:"Condition",details:"Details","to-string":"To string","test-to-string-function":"Test to string function","from-template":"From","from-template-required":"From is required","message-to-metadata":"Message to metadata","metadata-to-message":"Metadata to message","from-message":"From message","from-metadata":"From metadata","to-template":"To","to-template-required":"To Template is required","mail-address-list-template-hint":'Comma separated address list, use <code><span style="color: #000;">$&#123;</span>metadataKey<span style="color: #000;">&#125;</span></code> for value from metadata, <code><span style="color: #000;">$[</span>messageKey<span style="color: #000;">]</span></code> for value from message body',"cc-template":"Cc","bcc-template":"Bcc","subject-template":"Subject","subject-template-required":"Subject Template is required","body-template":"Body","body-template-required":"Body Template is required","dynamic-mail-body-type":"Dynamic mail body type","mail-body-type":"Mail body type","body-type-template":"Body type template","request-id-metadata-attribute":"Request Id Metadata attribute name","timeout-sec":"Timeout in seconds","timeout-required":"Timeout is required","min-timeout-message":"Only 0 minimum timeout value is allowed.","endpoint-url-pattern":"Endpoint URL pattern","endpoint-url-pattern-required":"Endpoint URL pattern is required","request-method":"Request method","use-simple-client-http-factory":"Use simple client HTTP factory","ignore-request-body":"Without request body","parse-to-plain-text":"Parse to plain text","parse-to-plain-text-hint":'If selected, request body message payload will be transformed from JSON string to plain text, e.g. msg = "Hello,\\t\\"world\\"" will be parsed to Hello, "world"',"read-timeout":"Read timeout in millis","read-timeout-hint":"The value of 0 means an infinite timeout","max-parallel-requests-count":"Max number of parallel requests","max-parallel-requests-count-hint":"The value of 0 specifies no limit in parallel processing",headers:"Headers","headers-hint":'Use <code><span style="color: #000;">$&#123;</span>metadataKey<span style="color: #000;">&#125;</span></code> for value from metadata, <code><span style="color: #000;">$[</span>messageKey<span style="color: #000;">]</span></code> for value from message body in header/value fields',header:"Header","header-required":"Header is required",value:"Value","value-required":"Value is required","topic-pattern":"Topic pattern","key-pattern":"Key pattern","key-pattern-hint":"Optional. If a valid partition number is specified, it will be used when sending the record. If no partition is specified, the key will be used instead. If neither is specified, a partition will be assigned in a round-robin fashion.","topic-pattern-required":"Topic pattern is required",topic:"Topic","topic-required":"Topic is required","bootstrap-servers":"Bootstrap servers","bootstrap-servers-required":"Bootstrap servers value is required","other-properties":"Other properties",key:"Key","key-required":"Key is required",retries:"Automatically retry times if fails","min-retries-message":"Only 0 minimum retries is allowed.","batch-size-bytes":"Produces batch size in bytes","min-batch-size-bytes-message":"Only 0 minimum batch size is allowed.","linger-ms":"Time to buffer locally (ms)","min-linger-ms-message":"Only 0 ms minimum value is allowed.","buffer-memory-bytes":"Client buffer max size in bytes","min-buffer-memory-message":"Only 0 minimum buffer size is allowed.",acks:"Number of acknowledgments","key-serializer":"Key serializer","key-serializer-required":"Key serializer is required","value-serializer":"Value serializer","value-serializer-required":"Value serializer is required","topic-arn-pattern":"Topic ARN pattern","topic-arn-pattern-required":"Topic ARN pattern is required","aws-access-key-id":"AWS Access Key ID","aws-access-key-id-required":"AWS Access Key ID is required","aws-secret-access-key":"AWS Secret Access Key","aws-secret-access-key-required":"AWS Secret Access Key is required","aws-region":"AWS Region","aws-region-required":"AWS Region is required","exchange-name-pattern":"Exchange name pattern","routing-key-pattern":"Routing key pattern","message-properties":"Message properties",host:"Host","host-required":"Host is required",port:"Port","port-required":"Port is required","port-range":"Port should be in a range from 1 to 65535.","virtual-host":"Virtual host",username:"Username",password:"Password","automatic-recovery":"Automatic recovery","connection-timeout-ms":"Connection timeout (ms)","min-connection-timeout-ms-message":"Only 0 ms minimum value is allowed.","handshake-timeout-ms":"Handshake timeout (ms)","min-handshake-timeout-ms-message":"Only 0 ms minimum value is allowed.","client-properties":"Client properties","queue-url-pattern":"Queue URL pattern","queue-url-pattern-required":"Queue URL pattern is required","delay-seconds":"Delay (seconds)","min-delay-seconds-message":"Only 0 seconds minimum value is allowed.","max-delay-seconds-message":"Only 900 seconds maximum value is allowed.",name:"Name","name-required":"Name is required","queue-type":"Queue type","sqs-queue-standard":"Standard","sqs-queue-fifo":"FIFO","gcp-project-id":"GCP project ID","gcp-project-id-required":"GCP project ID is required","gcp-service-account-key":"GCP service account key file","gcp-service-account-key-required":"GCP service account key file is required","pubsub-topic-name":"Topic name","pubsub-topic-name-required":"Topic name is required","message-attributes":"Message attributes","message-attributes-hint":'Use <code><span style="color: #000;">$&#123;</span>metadataKey<span style="color: #000000;">&#125;</span></code> for value from metadata, <code><span style="color: #000;">$[</span>messageKey<span style="color: #000;">]</span></code> for value from message body in name/value fields',"connect-timeout":"Connection timeout (sec)","connect-timeout-required":"Connection timeout is required.","connect-timeout-range":"Connection timeout should be in a range from 1 to 200.","client-id":"Client ID","client-id-hint":'Optional. Leave empty for auto-generated Client ID. Be careful when specifying the Client ID. Majority of the MQTT brokers will not allow multiple connections with the same Client ID. To connect to such brokers, your mqtt Client ID must be unique. When platform is running in a micro-services mode, the copy of rule node is launched in each micro-service. This will automatically lead to multiple mqtt clients with the same ID and may cause failures of the rule node. To avoid such failures enable "Add Service ID as suffix to Client ID" option below.',"append-client-id-suffix":"Add Service ID as suffix to Client ID","client-id-suffix-hint":'Optional. Applied when "Client ID" specified explicitly. If selected then Service ID will be added to Client ID as a suffix. Helps to avoid failures when platform is running in a micro-services mode.',"device-id":"Device ID","device-id-required":"Device ID is required.","clean-session":"Clean session","enable-ssl":"Enable SSL",credentials:"Credentials","credentials-type":"Credentials type","credentials-type-required":"Credentials type is required.","credentials-anonymous":"Anonymous","credentials-basic":"Basic","credentials-pem":"PEM","credentials-pem-hint":"At least Server CA certificate file or a pair of Client certificate and Client private key files are required","credentials-sas":"Shared Access Signature","sas-key":"SAS Key","sas-key-required":"SAS Key is required.",hostname:"Hostname","hostname-required":"Hostname is required.","azure-ca-cert":"CA certificate file","username-required":"Username is required.","password-required":"Password is required.","ca-cert":"Server CA certificate file","private-key":"Client private key file",cert:"Client certificate file","no-file":"No file selected.","drop-file":"Drop a file or click to select a file to upload.","private-key-password":"Private key password","use-system-smtp-settings":"Use system SMTP settings","use-metadata-dynamic-interval":"Use dynamic interval","metadata-dynamic-interval-hint":"Interval start and end input fields support templatization. Note that the substituted template value should be set in milliseconds. Use $[messageKey] to extract value from the message and ${metadataKey} to extract value from the metadata.","use-metadata-interval-patterns-hint":"If selected, rule node use start and end interval patterns from message metadata or data assuming that intervals are in the milliseconds.","use-message-alarm-data":"Use message alarm data","overwrite-alarm-details":"Overwrite alarm details","use-alarm-severity-pattern":"Use alarm severity pattern","check-all-keys":"Check that all specified fields are present","check-all-keys-hint":"If selected, checks that all specified keys are present in the message data and metadata.","check-relation-to-specific-entity":"Check relation to specific entity","check-relation-to-specific-entity-tooltip":"If enabled, checks the presence of relation with a specific entity otherwise, checks the presence of relation with any entity. In both cases, relation lookup is based on configured direction and type.","check-relation-hint":"Checks existence of relation to specific entity or to any entity based on direction and relation type.","delete-relation-to-specific-entity":"Delete relation to specific entity","delete-relation-hint":"Deletes relation from the originator of the incoming message to the specified entity or list of entities based on direction and type.","remove-current-relations":"Remove current relations","remove-current-relations-hint":"Removes current relations from the originator of the incoming message based on direction and type.","change-originator-to-related-entity":"Change originator to related entity","change-originator-to-related-entity-hint":"Used to process submitted message as a message from another entity.","start-interval":"Interval start","end-interval":"Interval end","start-interval-required":"Interval start is required.","end-interval-required":"Interval end is required.","smtp-protocol":"Protocol","smtp-host":"SMTP host","smtp-host-required":"SMTP host is required.","smtp-port":"SMTP port","smtp-port-required":"You must supply a smtp port.","smtp-port-range":"SMTP port should be in a range from 1 to 65535.","timeout-msec":"Timeout ms","min-timeout-msec-message":"Only 0 ms minimum value is allowed.","enter-username":"Enter username","enter-password":"Enter password","enable-tls":"Enable TLS","tls-version":"TLS version","enable-proxy":"Enable proxy","use-system-proxy-properties":"Use system proxy properties","proxy-host":"Proxy host","proxy-host-required":"Proxy host is required.","proxy-port":"Proxy port","proxy-port-required":"Proxy port is required.","proxy-port-range":"Proxy port should be in a range from 1 to 65535.","proxy-user":"Proxy user","proxy-password":"Proxy password","proxy-scheme":"Proxy scheme","numbers-to-template":"Phone Numbers To Template","numbers-to-template-required":"Phone Numbers To Template is required","numbers-to-template-hint":'Comma separated Phone Numbers, use <code><span style="color: #000;">$&#123;</span>metadataKey<span style="color: #000;">&#125;</span></code> for value from metadata, <code><span style="color: #000;">$[</span>messageKey<span style="color: #000;">]</span></code> for value from message body',"sms-message-template":"SMS message Template","sms-message-template-required":"SMS message Template is required","use-system-sms-settings":"Use system SMS provider settings","min-period-0-seconds-message":"Only 0 second minimum period is allowed.","max-pending-messages":"Maximum pending messages","max-pending-messages-required":"Maximum pending messages is required.","max-pending-messages-range":"Maximum pending messages should be in a range from 1 to 100000.","originator-types-filter":"Originator types filter","interval-seconds":"Interval in seconds","interval-seconds-required":"Interval is required.","min-interval-seconds-message":"Only 1 second minimum interval is allowed.","output-timeseries-key-prefix":"Output timeseries key prefix","output-timeseries-key-prefix-required":"Output timeseries key prefix required.","separator-hint":'Press "Enter" to complete field input.',"select-details":"Select details","entity-details-id":"Id","entity-details-title":"Title","entity-details-country":"Country","entity-details-state":"State","entity-details-city":"City","entity-details-zip":"Zip","entity-details-address":"Address","entity-details-address2":"Address2","entity-details-additional_info":"Additional Info","entity-details-phone":"Phone","entity-details-email":"Email","email-sender":"Email sender","fields-to-check":"Fields to check","add-detail":"Add detail","check-all-keys-tooltip":"If enabled, checks the presence of all fields listed in the message and metadata field names within the incoming message and its metadata.","fields-to-check-hint":'Press "Enter" to complete field name input. Multiple field names supported.',"entity-details-list-empty":"At least one detail should be selected.","alarm-status":"Alarm status","alarm-required":"At least one alarm status should be selected.","no-entity-details-matching":"No entity details matching were found.","custom-table-name":"Custom table name","custom-table-name-required":"Table Name is required","custom-table-hint":"Enter the table name without prefix 'cs_tb_'.","message-field":"Message field","message-field-required":"Message field is required.","table-col":"Table column","table-col-required":"Table column is required.","latitude-field-name":"Latitude field name","longitude-field-name":"Longitude field name","latitude-field-name-required":"Latitude field name is required.","longitude-field-name-required":"Longitude field name is required.","fetch-perimeter-info-from-metadata":"Fetch perimeter information from metadata","fetch-perimeter-info-from-metadata-tooltip":"If perimeter type is set to 'Polygon' the value of metadata field '{{perimeterKeyName}}' will be set as perimeter definition without additional parsing of the value. Otherwise, if perimeter type is set to 'Circle' the value of '{{perimeterKeyName}}' metadata field will be parsed to extract 'latitude', 'longitude',  'radius', 'radiusUnit' fields that uses for circle perimeter definition.","perimeter-key-name":"Perimeter key name","perimeter-key-name-hint":"Metadata field name that includes perimeter information.","perimeter-key-name-required":"Perimeter key name is required.","perimeter-circle":"Circle","perimeter-polygon":"Polygon","perimeter-type":"Perimeter type","circle-center-latitude":"Center latitude","circle-center-latitude-required":"Center latitude is required.","circle-center-longitude":"Center longitude","circle-center-longitude-required":"Center longitude is required.","range-unit-meter":"Meter","range-unit-kilometer":"Kilometer","range-unit-foot":"Foot","range-unit-mile":"Mile","range-unit-nautical-mile":"Nautical mile","range-units":"Range units","range-units-required":"Range units is required.",range:"Range","range-required":"Range is required.","polygon-definition":"Polygon definition","polygon-definition-required":"Polygon definition is required.","polygon-definition-hint":"Use the following format for manual definition of polygon: [[lat1,lon1],[lat2,lon2], ... ,[latN,lonN]].","min-inside-duration":"Minimal inside duration","min-inside-duration-value-required":"Minimal inside duration is required","min-inside-duration-time-unit":"Minimal inside duration time unit","min-outside-duration":"Minimal outside duration","min-outside-duration-value-required":"Minimal outside duration is required","min-outside-duration-time-unit":"Minimal outside duration time unit","tell-failure-if-absent":"Tell Failure","tell-failure-if-absent-hint":'If at least one selected key doesn\'t exist the outbound message will report "Failure".',"get-latest-value-with-ts":"Fetch timestamp for the latest telemetry values","get-latest-value-with-ts-hint":'If selected, the latest telemetry values will also include timestamp, e.g: "temp": "&#123;"ts":1574329385897, "value":42&#125;"',"use-redis-queue":"Use redis queue for message persistence","ignore-null-strings":"Ignore null strings","ignore-null-strings-hint":"If selected rule node will ignore entity fields with empty value.","trim-redis-queue":"Trim redis queue","redis-queue-max-size":"Redis queue max size","add-metadata-key-values-as-kafka-headers":"Add Message metadata key-value pairs to Kafka record headers","add-metadata-key-values-as-kafka-headers-hint":"If selected, key-value pairs from message metadata will be added to the outgoing records headers as byte arrays with predefined charset encoding.","charset-encoding":"Charset encoding","charset-encoding-required":"Charset encoding is required.","charset-us-ascii":"US-ASCII","charset-iso-8859-1":"ISO-8859-1","charset-utf-8":"UTF-8","charset-utf-16be":"UTF-16BE","charset-utf-16le":"UTF-16LE","charset-utf-16":"UTF-16","select-queue-hint":"The queue name can be selected from a drop-down list or add a custom name.","persist-alarm-rules":"Persist state of alarm rules","fetch-alarm-rules":"Fetch state of alarm rules","input-value-key":"Input value key","input-value-key-required":"Input value key is required.","output-value-key":"Output value key","output-value-key-required":"Output value key is required.","number-of-digits-after-floating-point":"Number of digits after floating point","number-of-digits-after-floating-point-range":"Number of digits after floating point should be in a range from 0 to 15.","failure-if-delta-negative":"Tell Failure if delta is negative","failure-if-delta-negative-tooltip":"Rule node forces failure of message processing if delta value is negative.","use-caching":"Use caching","use-caching-tooltip":'Rule node will cache the value of "{{inputValueKey}}" that arrives from the incoming message to improve performance. Note that the cache will not be updated if you modify the "{{inputValueKey}}" value elsewhere.',"add-time-difference-between-readings":'Add the time difference between "{{inputValueKey}}" readings',"add-time-difference-between-readings-tooltip":'If enabled, the rule node will add the "{{periodValueKey}}" to the outbound message.',"period-value-key":"Period value key","period-value-key-required":"Period value key is required.","general-pattern-hint":"Use ${metadataKey} for value from metadata, $[messageKey] for value from message body.","alarm-severity-pattern-hint":'Use <code><span style="color: #000;">$&#123;</span>metadataKey<span style="color: #000;">&#125;</span></code> for value from metadata, <code><span style="color: #000;">$[</span>messageKey<span style="color: #000;">]</span></code> for value from message body. Alarm severity should be system (CRITICAL, MAJOR etc.)',"output-node-name-hint":"The <b>rule node name</b> corresponds to the <b>relation type</b> of the output message, and it is used to forward messages to other rule nodes in the caller rule chain.","skip-latest-persistence":"Skip latest persistence","use-server-ts":"Use server ts","use-server-ts-hint":"Enable this setting to use the timestamp of the message processing instead of the timestamp from the message. Useful for all sorts of sequential processing if you merge messages from multiple sources (devices, assets, etc).","kv-map-pattern-hint":"All input fields support templatization. Use $[messageKey] to extract value from the message and ${metadataKey} to extract value from the metadata.","shared-scope":"Shared scope","server-scope":"Server scope","client-scope":"Client scope","attribute-type":"Attribute","constant-type":"Constant","time-series-type":"Time-series","message-body-type":"Message","message-metadata-type":"Metadata","argument-tile":"Arguments","no-arguments-prompt":"No arguments configured","result-title":"Result","functions-field-input":"Functions","no-option-found":"No option found","argument-source-field-input":"Source","argument-source-field-input-required":"Argument source is required.","argument-key-field-input":"Key","argument-key-field-input-required":"Argument key is required.","constant-value-field-input":"Constant value","constant-value-field-input-required":"Constant value is required.","attribute-scope-field-input":"Attribute scope","attribute-scope-field-input-required":"Attribute scope os required.","default-value-field-input":"Default value","type-field-input":"Type","type-field-input-required":"Type is required.","key-field-input":"Key","add-entity-type":"Add entity type","add-device-profile":"Add device profile","key-field-input-required":"Key is required.","number-floating-point-field-input":"Number of digits after floating point","number-floating-point-field-input-hint":"Use <i>0</i> to convert result to integer","add-to-message-field-input":"Add to message","add-to-metadata-field-input":"Add to metadata","custom-expression-field-input":"Mathematical Expression","custom-expression-field-input-required":"Mathematical expression is required","custom-expression-field-input-hint":"Specify a mathematical expression to evaluate. Default expression demonstrates how to transform Fahrenheit to Celsius","retained-message":"Retained","attributes-mapping":"Attributes mapping","latest-telemetry-mapping":"Latest telemetry mapping","add-mapped-attribute-to":"Add mapped attributes to","add-mapped-latest-telemetry-to":"Add mapped latest telemetry to","add-mapped-fields-to":"Add mapped fields to","add-selected-details-to":"Add selected details to","clear-selected-types":"Clear selected types","clear-selected-details":"Clear selected details","clear-selected-fields":"Clear selected fields","clear-selected-keys":"Clear selected keys","geofence-configuration":"Geofence configuration","coordinate-field-names":"Coordinate field names","coordinate-field-hint":"Rule node tries to retrieve the specified fields from the message. If they are not present, it will look them up in the metadata.","presence-monitoring-strategy":"Presence monitoring strategy","presence-monitoring-strategy-on-first-message":"On first message","presence-monitoring-strategy-on-each-message":"On each message","presence-monitoring-strategy-on-first-message-hint":"Reports presence status 'Inside' or 'Outside' on the first message after the configured minimal duration has passed since previous presence status 'Entered' or 'Left' update.","presence-monitoring-strategy-on-each-message-hint":"Reports presence status 'Inside' or 'Outside' on each message after presence status 'Entered' or 'Left' update.","fetch-credentials-to":"Fetch credentials to","add-originator-attributes-to":"Add originator attributes to","originator-attributes":"Originator attributes","fetch-latest-telemetry-with-timestamp":"Fetch latest telemetry with timestamp","fetch-latest-telemetry-with-timestamp-tooltip":'If selected, latest telemetry values will be added to the outbound metadata with timestamp, e.g: "{{latestTsKeyName}}": "{"ts":1574329385897, "value":42}"',"tell-failure":"Tell failure if any of the attributes are missing","tell-failure-tooltip":'If at least one selected key doesn\'t exist the outbound message will report "Failure".',"created-time":"Created time","chip-help":"Press 'Enter' to complete {{inputName}} input. \nPress 'Backspace' to delete {{inputName}}. \nMultiple values supported.",detail:"detail","field-name":"field name","device-profile":"device profile","entity-type":"entity type","message-type":"message type","timeseries-key":"timeseries key",type:"Type","first-name":"First name","last-name":"Last name",label:"Label","originator-fields-mapping":"Originator fields mapping","add-mapped-originator-fields-to":"Add mapped originator fields to",fields:"Fields","skip-empty-fields":"Skip empty fields","skip-empty-fields-tooltip":"Fields with empty values will not be added to the output message/output metadata.","fetch-interval":"Fetch interval","fetch-strategy":"Fetch strategy","fetch-timeseries-from-to":"Fetch timeseries from {{startInterval}} {{startIntervalTimeUnit}} ago to {{endInterval}} {{endIntervalTimeUnit}} ago.","fetch-timeseries-from-to-invalid":'Fetch timeseries invalid ("Interval start" should be less than "Interval end").',"use-metadata-dynamic-interval-tooltip":"If selected, the rule node will use dynamic interval start and end based on the message and metadata patterns.","all-mode-hint":'If selected fetch mode "All" rule node will retrieve telemetry from the fetch interval with configurable query parameters.',"first-mode-hint":'If selected fetch mode "First" rule node will retrieve the closest telemetry to the fetch interval\'s start.',"last-mode-hint":'If selected fetch mode "Last" rule node will retrieve the closest telemetry to the fetch interval\'s end.',ascending:"Ascending",descending:"Descending",min:"Min",max:"Max",average:"Average",sum:"Sum",count:"Count",none:"None","last-level-relation-tooltip":"If selected, the rule node will search related entities only on the level set in the max relation level.","last-level-device-relation-tooltip":"If selected, the rule node will search related devices only on the level set in the max relation level.","data-to-fetch":"Data to fetch","mapping-of-customers":"Mapping of customer's","map-fields-required":"All mapping fields are required.",attributes:"Attributes","related-device-attributes":"Related device attributes","add-selected-attributes-to":"Add selected attributes to","device-profiles":"Device profiles","mapping-of-tenant":"Mapping of tenant's","add-attribute-key":"Add attribute key","message-template":"Message template","message-template-required":"Message template is required","use-system-slack-settings":"Use system slack settings","slack-api-token":"Slack API token","slack-api-token-required":"Slack API token is required","keys-mapping":"keys mapping","add-key":"Add key",recipients:"Recipients","message-subject-and-content":"Message subject and content","template-rules-hint":"Both input fields support templatization. Use $[messageKey] to extract value from the message and ${metadataKey} to extract value from the metadata.","originator-customer-desc":"Use customer of incoming message originator as new originator.","originator-tenant-desc":"Use current tenant as new originator.","originator-related-entity-desc":"Use related entity as new originator. Lookup based on configured relation type and direction.","originator-alarm-originator-desc":"Use alarm originator as new originator. Only if incoming message originator is alarm entity.","originator-entity-by-name-pattern-desc":"Use entity fetched from DB as new originator. Lookup based on entity type and specified name pattern.","email-from-template-hint":"Use $[messageKey] to extract value from the message and ${metadataKey} to extract value from the metadata.","recipients-block-main-hint":"Comma-separated address list. All input fields support templatization. Use $[messageKey] to extract value from the message and ${metadataKey} to extract value from the metadata."},"key-val":{key:"Key",value:"Value","see-examples":"See examples.","remove-entry":"Remove entry","remove-mapping-entry":"Remove mapping entry","add-mapping-entry":"Add mapping","add-entry":"Add entry","copy-key-values-from":"Copy key-values from","delete-key-values":"Delete key-values","delete-key-values-from":"Delete key-values from","at-least-one-key-error":"At least one key should be selected.","unique-key-value-pair-error":"'{{keyText}}' must be different from the '{{valText}}'!"},"mail-body-type":{"plain-text":"Plain text",html:"HTML",dynamic:"Dynamic","use-body-type-template":"Use body type template","plain-text-description":"Simple, unformatted text with no special styling or formating.","html-text-description":"Allows you to use HTML tags for formatting, links and images in your mai body.","dynamic-text-description":"Allows to use Plain Text or HTML body type dynamically based on templatization feature.","after-template-evaluation-hint":"After template evaluation value should be true for HTML, and false for Plain text."}}},!0)}(e)}}e("RuleNodeCoreConfigModule",Hr),Hr.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Hr,deps:[{token:Z.TranslateService}],target:t.ɵɵFactoryTarget.NgModule}),Hr.ɵmod=t.ɵɵngDeclareNgModule({minVersion:"14.0.0",version:"15.2.10",ngImport:t,type:Hr,declarations:[dt],imports:[$,M],exports:[Qn,Nr,ar,br,Br,Ur,dt]}),Hr.ɵinj=t.ɵɵngDeclareInjector({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Hr,imports:[$,M,Qn,Nr,ar,br,Br,Ur]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Hr,decorators:[{type:c,args:[{declarations:[dt],imports:[$,M],exports:[Qn,Nr,ar,br,Br,Ur,dt]}]}],ctorParameters:function(){return[{type:Z.TranslateService}]}})}}}));//# sourceMappingURL=rulenode-core-config.js.map
+System.register(["@angular/core","@shared/public-api","@ngrx/store","@angular/forms","@angular/common","@angular/material/checkbox","@angular/material/input","@angular/material/form-field","@angular/flex-layout/flex","@ngx-translate/core","@angular/material/select","@angular/material/core","@angular/material/slide-toggle","@shared/components/hint-tooltip-icon.component","@core/public-api","@shared/components/js-func.component","@angular/material/button","@angular/material/icon","@angular/material/tooltip","@shared/components/script-lang.component","@angular/cdk/keycodes","@angular/material/chips","@shared/pipe/safe.pipe","@shared/components/entity/entity-type-select.component","@shared/components/entity/entity-select.component","@shared/components/toggle-header.component","@shared/components/toggle-select.component","@angular/cdk/coercion","@shared/components/tb-error.component","@angular/flex-layout/extended","@angular/material/list","@angular/cdk/drag-drop","rxjs/operators","@angular/material/autocomplete","@shared/pipe/highlight.pipe","@home/components/public-api","tslib","rxjs","@shared/components/help-popup.component","@shared/components/entity/entity-subtype-list.component","@shared/components/relation/relation-type-autocomplete.component","@home/components/relation/relation-filters.component","@angular/material/expansion","@shared/components/file-input.component","@shared/components/button/toggle-password.component","@shared/components/string-items-list.component","@shared/components/entity/entity-list.component","@shared/components/notification/template-autocomplete.component","@shared/components/tb-checkbox.component","@home/components/sms/sms-provider-configuration.component","@angular/material/radio","@shared/components/slack-conversation-autocomplete.component","@shared/components/entity/entity-autocomplete.component","@shared/components/entity/entity-type-list.component","@angular/cdk/platform"],(function(e){"use strict";var t,n,r,o,a,i,l,s,m,p,d,u,c,f,g,y,x,b,h,v,C,F,k,L,T,I,N,S,q,A,M,E,G,D,w,V,P,R,O,_,B,K,z,U,H,j,$,Q,J,Y,W,Z,X,ee,te,ne,re,oe,ae,ie,le,se,me,pe,de,ue,ce,fe,ge,ye,xe,be,he,ve,Ce,Fe,ke,Le,Te,Ie,Ne,Se,qe,Ae,Me,Ee,Ge,De,we,Ve,Pe,Re,Oe,_e,Be,Ke,ze,Ue,He,je,$e,Qe,Je,Ye,We,Ze,Xe,et,tt,nt,rt,ot,at,it,lt,st,mt,pt;return{setters:[function(e){t=e,n=e.Component,r=e.EventEmitter,o=e.ViewChild,a=e.forwardRef,i=e.Input,l=e.InjectionToken,s=e.Injectable,m=e.Inject,p=e.Optional,d=e.Directive,u=e.Output,c=e.NgModule},function(e){f=e.RuleNodeConfigurationComponent,g=e.AttributeScope,y=e.telemetryTypeTranslations,x=e.ScriptLanguage,b=e.AlarmSeverity,h=e.alarmSeverityTranslations,v=e.EntitySearchDirection,C=e.entitySearchDirectionTranslations,F=e.EntityType,k=e.entityFields,L=e.PageComponent,T=e.messageTypeNames,I=e.MessageType,N=e.coerceBoolean,S=e,q=e.AlarmStatus,A=e.alarmStatusTranslations,M=e.SharedModule,E=e.AggregationType,G=e.aggregationTranslations,D=e.NotificationType,w=e.SlackChanelType,V=e.SlackChanelTypesTranslateMap},function(e){P=e},function(e){R=e,O=e.Validators,_=e.NgControl,B=e.NG_VALUE_ACCESSOR,K=e.NG_VALIDATORS,z=e.FormArray,U=e.FormGroup},function(e){H=e,j=e.DOCUMENT,$=e.CommonModule},function(e){Q=e},function(e){J=e},function(e){Y=e},function(e){W=e},function(e){Z=e},function(e){X=e},function(e){ee=e},function(e){te=e},function(e){ne=e},function(e){re=e.getCurrentAuthState,oe=e,ae=e.isDefinedAndNotNull,ie=e.isEqual,le=e.deepTrim,se=e.isObject,me=e.isNotEmptyStr},function(e){pe=e},function(e){de=e},function(e){ue=e},function(e){ce=e},function(e){fe=e},function(e){ge=e.ENTER,ye=e.COMMA,xe=e.SEMICOLON},function(e){be=e},function(e){he=e},function(e){ve=e},function(e){Ce=e},function(e){Fe=e},function(e){ke=e},function(e){Le=e.coerceBooleanProperty,Te=e.coerceElement,Ie=e.coerceNumberProperty},function(e){Ne=e},function(e){Se=e},function(e){qe=e},function(e){Ae=e},function(e){Me=e.tap,Ee=e.map,Ge=e.startWith,De=e.mergeMap,we=e.share,Ve=e.takeUntil,Pe=e.auditTime},function(e){Re=e},function(e){Oe=e},function(e){_e=e.HomeComponentsModule},function(e){Be=e.__decorate},function(e){Ke=e.Subject,ze=e.takeUntil,Ue=e.of,He=e.EMPTY,je=e.fromEvent},function(e){$e=e},function(e){Qe=e},function(e){Je=e},function(e){Ye=e},function(e){We=e},function(e){Ze=e},function(e){Xe=e},function(e){et=e},function(e){tt=e},function(e){nt=e},function(e){rt=e},function(e){ot=e},function(e){at=e},function(e){it=e},function(e){lt=e},function(e){st=e},function(e){mt=e.normalizePassiveListenerOptions,pt=e}],execute:function(){class dt extends f{constructor(e,t){super(e),this.store=e,this.fb=t}configForm(){return this.emptyConfigForm}onConfigurationSet(e){this.emptyConfigForm=this.fb.group({})}}e("EmptyConfigComponent",dt),dt.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:dt,deps:[{token:P.Store},{token:R.UntypedFormBuilder}],target:t.ɵɵFactoryTarget.Component}),dt.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:dt,selector:"tb-node-empty-config",usesInheritance:!0,ngImport:t,template:"<div></div>",isInline:!0}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:dt,decorators:[{type:n,args:[{selector:"tb-node-empty-config",template:"<div></div>"}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder}]}});class ut extends f{constructor(e,t){super(e),this.store=e,this.fb=t}configForm(){return this.assignCustomerConfigForm}onConfigurationSet(e){this.assignCustomerConfigForm=this.fb.group({customerNamePattern:[e?e.customerNamePattern:null,[O.required,O.pattern(/.*\S.*/)]],createCustomerIfNotExists:[!!e&&e.createCustomerIfNotExists,[]],customerCacheExpiration:[e?e.customerCacheExpiration:null,[O.required,O.min(0)]]})}prepareOutputConfig(e){return e.customerNamePattern=e.customerNamePattern.trim(),e}}e("AssignCustomerConfigComponent",ut),ut.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:ut,deps:[{token:P.Store},{token:R.UntypedFormBuilder}],target:t.ɵɵFactoryTarget.Component}),ut.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:ut,selector:"tb-action-node-assign-to-customer-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="assignCustomerConfigForm" fxLayout="column">\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.customer-name-pattern</mat-label>\n    <input required matInput formControlName="customerNamePattern">\n    <mat-error *ngIf="assignCustomerConfigForm.get(\'customerNamePattern\').hasError(\'required\') ||\n                      assignCustomerConfigForm.get(\'customerNamePattern\').hasError(\'pattern\')">\n      {{ \'tb.rulenode.customer-name-pattern-required\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n  </mat-form-field>\n  <mat-checkbox fxFlex formControlName="createCustomerIfNotExists">\n    {{ \'tb.rulenode.create-customer-if-not-exists\' | translate }}\n  </mat-checkbox>\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.customer-cache-expiration</mat-label>\n    <input required type="number" min="0" step="1" matInput formControlName="customerCacheExpiration">\n    <mat-error *ngIf="assignCustomerConfigForm.get(\'customerCacheExpiration\').hasError(\'required\')">\n      {{ \'tb.rulenode.customer-cache-expiration-required\' | translate }}\n    </mat-error>\n    <mat-error *ngIf="assignCustomerConfigForm.get(\'customerCacheExpiration\').hasError(\'min\')">\n      {{ \'tb.rulenode.customer-cache-expiration-range\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.customer-cache-expiration-hint</mat-hint>\n  </mat-form-field>\n</section>\n',dependencies:[{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:Q.MatCheckbox,selector:"mat-checkbox",inputs:["disableRipple","color","tabIndex"],exportAs:["matCheckbox"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatHint,selector:"mat-hint",inputs:["align","id"]},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:W.DefaultFlexDirective,selector:"  [fxFlex], [fxFlex.xs], [fxFlex.sm], [fxFlex.md],  [fxFlex.lg], [fxFlex.xl], [fxFlex.lt-sm], [fxFlex.lt-md],  [fxFlex.lt-lg], [fxFlex.lt-xl], [fxFlex.gt-xs], [fxFlex.gt-sm],  [fxFlex.gt-md], [fxFlex.gt-lg]",inputs:["fxFlex","fxFlex.xs","fxFlex.sm","fxFlex.md","fxFlex.lg","fxFlex.xl","fxFlex.lt-sm","fxFlex.lt-md","fxFlex.lt-lg","fxFlex.lt-xl","fxFlex.gt-xs","fxFlex.gt-sm","fxFlex.gt-md","fxFlex.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NumberValueAccessor,selector:"input[type=number][formControlName],input[type=number][formControl],input[type=number][ngModel]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.MinValidator,selector:"input[type=number][min][formControlName],input[type=number][min][formControl],input[type=number][min][ngModel]",inputs:["min"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:ut,decorators:[{type:n,args:[{selector:"tb-action-node-assign-to-customer-config",template:'<section [formGroup]="assignCustomerConfigForm" fxLayout="column">\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.customer-name-pattern</mat-label>\n    <input required matInput formControlName="customerNamePattern">\n    <mat-error *ngIf="assignCustomerConfigForm.get(\'customerNamePattern\').hasError(\'required\') ||\n                      assignCustomerConfigForm.get(\'customerNamePattern\').hasError(\'pattern\')">\n      {{ \'tb.rulenode.customer-name-pattern-required\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n  </mat-form-field>\n  <mat-checkbox fxFlex formControlName="createCustomerIfNotExists">\n    {{ \'tb.rulenode.create-customer-if-not-exists\' | translate }}\n  </mat-checkbox>\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.customer-cache-expiration</mat-label>\n    <input required type="number" min="0" step="1" matInput formControlName="customerCacheExpiration">\n    <mat-error *ngIf="assignCustomerConfigForm.get(\'customerCacheExpiration\').hasError(\'required\')">\n      {{ \'tb.rulenode.customer-cache-expiration-required\' | translate }}\n    </mat-error>\n    <mat-error *ngIf="assignCustomerConfigForm.get(\'customerCacheExpiration\').hasError(\'min\')">\n      {{ \'tb.rulenode.customer-cache-expiration-range\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.customer-cache-expiration-hint</mat-hint>\n  </mat-form-field>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder}]}});class ct extends f{constructor(e,t){super(e),this.store=e,this.fb=t,this.attributeScopeMap=g,this.attributeScopes=Object.keys(g),this.telemetryTypeTranslationsMap=y}configForm(){return this.attributesConfigForm}onConfigurationSet(e){this.attributesConfigForm=this.fb.group({scope:[e?e.scope:null,[O.required]],notifyDevice:[!e||e.notifyDevice,[]],sendAttributesUpdatedNotification:[!!e&&e.sendAttributesUpdatedNotification,[]],updateAttributesOnlyOnValueChange:[!!e&&e.updateAttributesOnlyOnValueChange,[]]}),this.attributesConfigForm.get("scope").valueChanges.subscribe((e=>{e!==g.SHARED_SCOPE&&this.attributesConfigForm.get("notifyDevice").patchValue(!1,{emitEvent:!1}),e===g.CLIENT_SCOPE&&this.attributesConfigForm.get("sendAttributesUpdatedNotification").patchValue(!1,{emitEvent:!1}),this.attributesConfigForm.get("updateAttributesOnlyOnValueChange").patchValue(!1,{emitEvent:!1})}))}}e("AttributesConfigComponent",ct),ct.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:ct,deps:[{token:P.Store},{token:R.UntypedFormBuilder}],target:t.ɵɵFactoryTarget.Component}),ct.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:ct,selector:"tb-action-node-attributes-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="attributesConfigForm" fxLayout="column">\n  <mat-form-field fxFlex class="mat-block">\n    <mat-label translate>attribute.attributes-scope</mat-label>\n    <mat-select formControlName="scope" required>\n      <mat-option *ngFor="let scope of attributeScopes" [value]="scope">\n        {{ telemetryTypeTranslationsMap.get(scope) | translate }}\n      </mat-option>\n    </mat-select>\n  </mat-form-field>\n  <div class="tb-form-panel no-padding no-border">\n    <div tb-hint-tooltip-icon="{{ (attributesConfigForm.get(\'updateAttributesOnlyOnValueChange\').value\n                                     ? \'tb.rulenode.update-attributes-only-on-value-change-hint-enabled\'\n                                     : \'tb.rulenode.update-attributes-only-on-value-change-hint\') | translate }}"\n         class="tb-form-row same-padding">\n      <mat-slide-toggle class="mat-slide margin" formControlName="updateAttributesOnlyOnValueChange">\n        {{ \'tb.rulenode.update-attributes-only-on-value-change\' | translate }}\n      </mat-slide-toggle>\n    </div>\n    <div tb-hint-tooltip-icon="{{ \'tb.rulenode.send-attributes-updated-notification-hint\' | translate }}"\n         *ngIf="attributesConfigForm.get(\'scope\').value !== attributeScopeMap.CLIENT_SCOPE"\n         class="tb-form-row same-padding">\n      <mat-slide-toggle class="mat-slide margin" formControlName="sendAttributesUpdatedNotification">\n        {{ \'tb.rulenode.send-attributes-updated-notification\' | translate }}\n      </mat-slide-toggle>\n    </div>\n    <div tb-hint-tooltip-icon="{{ \'tb.rulenode.notify-device-on-update-hint\' | translate }}"\n         *ngIf="attributesConfigForm.get(\'scope\').value === attributeScopeMap.SHARED_SCOPE"\n         class="tb-form-row same-padding">\n      <mat-slide-toggle class="mat-slide margin" formControlName="notifyDevice">\n        {{ \'tb.rulenode.notify-device\' | translate }}\n      </mat-slide-toggle>\n    </div>\n  </div>\n</section>\n',dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"component",type:X.MatSelect,selector:"mat-select",inputs:["disabled","disableRipple","tabIndex","hideSingleSelectionIndicator"],exportAs:["matSelect"]},{kind:"component",type:ee.MatOption,selector:"mat-option",exportAs:["matOption"]},{kind:"component",type:te.MatSlideToggle,selector:"mat-slide-toggle",inputs:["disabled","disableRipple","color","tabIndex"],exportAs:["matSlideToggle"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:W.DefaultFlexDirective,selector:"  [fxFlex], [fxFlex.xs], [fxFlex.sm], [fxFlex.md],  [fxFlex.lg], [fxFlex.xl], [fxFlex.lt-sm], [fxFlex.lt-md],  [fxFlex.lt-lg], [fxFlex.lt-xl], [fxFlex.gt-xs], [fxFlex.gt-sm],  [fxFlex.gt-md], [fxFlex.gt-lg]",inputs:["fxFlex","fxFlex.xs","fxFlex.sm","fxFlex.md","fxFlex.lg","fxFlex.xl","fxFlex.lt-sm","fxFlex.lt-md","fxFlex.lt-lg","fxFlex.lt-xl","fxFlex.gt-xs","fxFlex.gt-sm","fxFlex.gt-md","fxFlex.gt-lg"]},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"component",type:ne.HintTooltipIconComponent,selector:"[tb-hint-tooltip-icon]",inputs:["tb-hint-tooltip-icon","tooltipPosition","hintIcon"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:ct,decorators:[{type:n,args:[{selector:"tb-action-node-attributes-config",template:'<section [formGroup]="attributesConfigForm" fxLayout="column">\n  <mat-form-field fxFlex class="mat-block">\n    <mat-label translate>attribute.attributes-scope</mat-label>\n    <mat-select formControlName="scope" required>\n      <mat-option *ngFor="let scope of attributeScopes" [value]="scope">\n        {{ telemetryTypeTranslationsMap.get(scope) | translate }}\n      </mat-option>\n    </mat-select>\n  </mat-form-field>\n  <div class="tb-form-panel no-padding no-border">\n    <div tb-hint-tooltip-icon="{{ (attributesConfigForm.get(\'updateAttributesOnlyOnValueChange\').value\n                                     ? \'tb.rulenode.update-attributes-only-on-value-change-hint-enabled\'\n                                     : \'tb.rulenode.update-attributes-only-on-value-change-hint\') | translate }}"\n         class="tb-form-row same-padding">\n      <mat-slide-toggle class="mat-slide margin" formControlName="updateAttributesOnlyOnValueChange">\n        {{ \'tb.rulenode.update-attributes-only-on-value-change\' | translate }}\n      </mat-slide-toggle>\n    </div>\n    <div tb-hint-tooltip-icon="{{ \'tb.rulenode.send-attributes-updated-notification-hint\' | translate }}"\n         *ngIf="attributesConfigForm.get(\'scope\').value !== attributeScopeMap.CLIENT_SCOPE"\n         class="tb-form-row same-padding">\n      <mat-slide-toggle class="mat-slide margin" formControlName="sendAttributesUpdatedNotification">\n        {{ \'tb.rulenode.send-attributes-updated-notification\' | translate }}\n      </mat-slide-toggle>\n    </div>\n    <div tb-hint-tooltip-icon="{{ \'tb.rulenode.notify-device-on-update-hint\' | translate }}"\n         *ngIf="attributesConfigForm.get(\'scope\').value === attributeScopeMap.SHARED_SCOPE"\n         class="tb-form-row same-padding">\n      <mat-slide-toggle class="mat-slide margin" formControlName="notifyDevice">\n        {{ \'tb.rulenode.notify-device\' | translate }}\n      </mat-slide-toggle>\n    </div>\n  </div>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder}]}});class ft extends f{constructor(e,t,n,o){super(e),this.store=e,this.fb=t,this.nodeScriptTestService=n,this.translate=o,this.tbelEnabled=re(this.store).tbelEnabled,this.scriptLanguage=x,this.changeScript=new r,this.hasScript=!0,this.testScriptLabel="tb.rulenode.test-details-function"}configForm(){return this.clearAlarmConfigForm}onConfigurationSet(e){this.clearAlarmConfigForm=this.fb.group({scriptLang:[e?e.scriptLang:x.JS,[O.required]],alarmDetailsBuildJs:[e?e.alarmDetailsBuildJs:null,[]],alarmDetailsBuildTbel:[e?e.alarmDetailsBuildTbel:null,[]],alarmType:[e?e.alarmType:null,[O.required]]})}validatorTriggers(){return["scriptLang"]}updateValidators(e){let t=this.clearAlarmConfigForm.get("scriptLang").value;t!==x.TBEL||this.tbelEnabled||(t=x.JS,this.clearAlarmConfigForm.get("scriptLang").patchValue(t,{emitEvent:!1}),setTimeout((()=>{this.clearAlarmConfigForm.updateValueAndValidity({emitEvent:!0})}))),this.clearAlarmConfigForm.get("alarmDetailsBuildJs").setValidators(t===x.JS?[O.required]:[]),this.clearAlarmConfigForm.get("alarmDetailsBuildJs").updateValueAndValidity({emitEvent:e}),this.clearAlarmConfigForm.get("alarmDetailsBuildTbel").setValidators(t===x.TBEL?[O.required]:[]),this.clearAlarmConfigForm.get("alarmDetailsBuildTbel").updateValueAndValidity({emitEvent:e})}prepareInputConfig(e){return e&&(e.scriptLang||(e.scriptLang=x.JS)),e}testScript(e){const t=this.clearAlarmConfigForm.get("scriptLang").value,n=t===x.JS?"alarmDetailsBuildJs":"alarmDetailsBuildTbel",r=t===x.JS?"rulenode/clear_alarm_node_script_fn":"rulenode/tbel/clear_alarm_node_script_fn",o=this.clearAlarmConfigForm.get(n).value;this.nodeScriptTestService.testNodeScript(o,"json",this.translate.instant("tb.rulenode.details"),"Details",["msg","metadata","msgType"],this.ruleNodeId,r,t,e).subscribe((e=>{e&&(this.clearAlarmConfigForm.get(n).setValue(e),this.changeScript.emit())}))}onValidate(){this.clearAlarmConfigForm.get("scriptLang").value===x.JS&&this.jsFuncComponent.validateOnSubmit()}}e("ClearAlarmConfigComponent",ft),ft.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:ft,deps:[{token:P.Store},{token:R.UntypedFormBuilder},{token:oe.NodeScriptTestService},{token:Z.TranslateService}],target:t.ɵɵFactoryTarget.Component}),ft.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:ft,selector:"tb-action-node-clear-alarm-config",viewQueries:[{propertyName:"jsFuncComponent",first:!0,predicate:["jsFuncComponent"],descendants:!0},{propertyName:"tbelFuncComponent",first:!0,predicate:["tbelFuncComponent"],descendants:!0}],usesInheritance:!0,ngImport:t,template:'<section [formGroup]="clearAlarmConfigForm" fxLayout="column">\n  <tb-script-lang formControlName="scriptLang" *ngIf="tbelEnabled"></tb-script-lang>\n  <tb-js-func *ngIf="clearAlarmConfigForm.get(\'scriptLang\').value === scriptLanguage.JS"\n              #jsFuncComponent\n              formControlName="alarmDetailsBuildJs"\n              functionName="Details"\n              [functionArgs]="[\'msg\', \'metadata\', \'msgType\']"\n              helpId="rulenode/clear_alarm_node_script_fn"\n              noValidate="true">\n    <button toolbarSuffixButton\n            mat-icon-button\n            matTooltip="{{ testScriptLabel | translate }}"\n            matTooltipPosition="above"\n            class="tb-mat-32"\n            (click)="testScript()">\n      <mat-icon class="material-icons" color="primary">bug_report</mat-icon>\n    </button>\n  </tb-js-func>\n  <tb-js-func *ngIf="clearAlarmConfigForm.get(\'scriptLang\').value === scriptLanguage.TBEL"\n              #tbelFuncComponent\n              formControlName="alarmDetailsBuildTbel"\n              functionName="Details"\n              [functionArgs]="[\'msg\', \'metadata\', \'msgType\']"\n              [disableUndefinedCheck]="true"\n              [scriptLanguage]="scriptLanguage.TBEL"\n              helpId="rulenode/tbel/clear_alarm_node_script_fn"\n              noValidate="true">\n    <button toolbarSuffixButton\n            mat-icon-button\n            matTooltip="{{ testScriptLabel | translate }}"\n            matTooltipPosition="above"\n            class="tb-mat-32"\n            (click)="testScript()">\n      <mat-icon class="material-icons" color="primary">bug_report</mat-icon>\n    </button>\n  </tb-js-func>\n  <div fxLayout="row" style="padding-bottom: 16px;">\n    <button mat-button mat-raised-button color="primary" (click)="testScript()">\n      {{ testScriptLabel | translate }}\n    </button>\n  </div>\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.alarm-type</mat-label>\n    <input required matInput formControlName="alarmType">\n    <mat-error *ngIf="clearAlarmConfigForm.get(\'alarmType\').hasError(\'required\')">\n      {{ \'tb.rulenode.alarm-type-required\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n  </mat-form-field>\n</section>\n',dependencies:[{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:pe.JsFuncComponent,selector:"tb-js-func",inputs:["functionTitle","functionName","functionArgs","validationArgs","resultType","disabled","fillHeight","minHeight","editorCompleter","globalVariables","disableUndefinedCheck","helpId","scriptLanguage","hideBrackets","noValidate","required"]},{kind:"component",type:de.MatButton,selector:"    button[mat-button], button[mat-raised-button], button[mat-flat-button],    button[mat-stroked-button]  ",inputs:["disabled","disableRipple","color"],exportAs:["matButton"]},{kind:"component",type:de.MatIconButton,selector:"button[mat-icon-button]",inputs:["disabled","disableRipple","color"],exportAs:["matButton"]},{kind:"component",type:ue.MatIcon,selector:"mat-icon",inputs:["color","inline","svgIcon","fontSet","fontIcon"],exportAs:["matIcon"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatHint,selector:"mat-hint",inputs:["align","id"]},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"directive",type:ce.MatTooltip,selector:"[matTooltip]",exportAs:["matTooltip"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"component",type:fe.TbScriptLangComponent,selector:"tb-script-lang",inputs:["disabled"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:ft,decorators:[{type:n,args:[{selector:"tb-action-node-clear-alarm-config",template:'<section [formGroup]="clearAlarmConfigForm" fxLayout="column">\n  <tb-script-lang formControlName="scriptLang" *ngIf="tbelEnabled"></tb-script-lang>\n  <tb-js-func *ngIf="clearAlarmConfigForm.get(\'scriptLang\').value === scriptLanguage.JS"\n              #jsFuncComponent\n              formControlName="alarmDetailsBuildJs"\n              functionName="Details"\n              [functionArgs]="[\'msg\', \'metadata\', \'msgType\']"\n              helpId="rulenode/clear_alarm_node_script_fn"\n              noValidate="true">\n    <button toolbarSuffixButton\n            mat-icon-button\n            matTooltip="{{ testScriptLabel | translate }}"\n            matTooltipPosition="above"\n            class="tb-mat-32"\n            (click)="testScript()">\n      <mat-icon class="material-icons" color="primary">bug_report</mat-icon>\n    </button>\n  </tb-js-func>\n  <tb-js-func *ngIf="clearAlarmConfigForm.get(\'scriptLang\').value === scriptLanguage.TBEL"\n              #tbelFuncComponent\n              formControlName="alarmDetailsBuildTbel"\n              functionName="Details"\n              [functionArgs]="[\'msg\', \'metadata\', \'msgType\']"\n              [disableUndefinedCheck]="true"\n              [scriptLanguage]="scriptLanguage.TBEL"\n              helpId="rulenode/tbel/clear_alarm_node_script_fn"\n              noValidate="true">\n    <button toolbarSuffixButton\n            mat-icon-button\n            matTooltip="{{ testScriptLabel | translate }}"\n            matTooltipPosition="above"\n            class="tb-mat-32"\n            (click)="testScript()">\n      <mat-icon class="material-icons" color="primary">bug_report</mat-icon>\n    </button>\n  </tb-js-func>\n  <div fxLayout="row" style="padding-bottom: 16px;">\n    <button mat-button mat-raised-button color="primary" (click)="testScript()">\n      {{ testScriptLabel | translate }}\n    </button>\n  </div>\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.alarm-type</mat-label>\n    <input required matInput formControlName="alarmType">\n    <mat-error *ngIf="clearAlarmConfigForm.get(\'alarmType\').hasError(\'required\')">\n      {{ \'tb.rulenode.alarm-type-required\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n  </mat-form-field>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder},{type:oe.NodeScriptTestService},{type:Z.TranslateService}]},propDecorators:{jsFuncComponent:[{type:o,args:["jsFuncComponent",{static:!1}]}],tbelFuncComponent:[{type:o,args:["tbelFuncComponent",{static:!1}]}]}});class gt extends f{constructor(e,t,n,o){super(e),this.store=e,this.fb=t,this.nodeScriptTestService=n,this.translate=o,this.alarmSeverities=Object.keys(b),this.alarmSeverityTranslationMap=h,this.separatorKeysCodes=[ge,ye,xe],this.tbelEnabled=re(this.store).tbelEnabled,this.scriptLanguage=x,this.changeScript=new r,this.hasScript=!0,this.testScriptLabel="tb.rulenode.test-details-function"}configForm(){return this.createAlarmConfigForm}onConfigurationSet(e){this.createAlarmConfigForm=this.fb.group({scriptLang:[e?e.scriptLang:x.JS,[O.required]],alarmDetailsBuildJs:[e?e.alarmDetailsBuildJs:null,[]],alarmDetailsBuildTbel:[e?e.alarmDetailsBuildTbel:null,[]],useMessageAlarmData:[!!e&&e.useMessageAlarmData,[]],overwriteAlarmDetails:[!!e&&e.overwriteAlarmDetails,[]],alarmType:[e?e.alarmType:null,[]],severity:[e?e.severity:null,[]],propagate:[!!e&&e.propagate,[]],relationTypes:[e?e.relationTypes:null,[]],propagateToOwner:[!!e&&e.propagateToOwner,[]],propagateToTenant:[!!e&&e.propagateToTenant,[]],dynamicSeverity:!1}),this.createAlarmConfigForm.get("dynamicSeverity").valueChanges.subscribe((e=>{e?this.createAlarmConfigForm.get("severity").patchValue("",{emitEvent:!1}):this.createAlarmConfigForm.get("severity").patchValue(this.alarmSeverities[0],{emitEvent:!1})}))}validatorTriggers(){return["useMessageAlarmData","overwriteAlarmDetails","scriptLang"]}updateValidators(e){const t=this.createAlarmConfigForm.get("useMessageAlarmData").value,n=this.createAlarmConfigForm.get("overwriteAlarmDetails").value;t?(this.createAlarmConfigForm.get("alarmType").setValidators([]),this.createAlarmConfigForm.get("severity").setValidators([])):(this.createAlarmConfigForm.get("alarmType").setValidators([O.required]),this.createAlarmConfigForm.get("severity").setValidators([O.required])),this.createAlarmConfigForm.get("alarmType").updateValueAndValidity({emitEvent:e}),this.createAlarmConfigForm.get("severity").updateValueAndValidity({emitEvent:e});let r=this.createAlarmConfigForm.get("scriptLang").value;r!==x.TBEL||this.tbelEnabled||(r=x.JS,this.createAlarmConfigForm.get("scriptLang").patchValue(r,{emitEvent:!1}),setTimeout((()=>{this.createAlarmConfigForm.updateValueAndValidity({emitEvent:!0})})));const o=!1===t||!0===n;this.createAlarmConfigForm.get("alarmDetailsBuildJs").setValidators(o&&r===x.JS?[O.required]:[]),this.createAlarmConfigForm.get("alarmDetailsBuildTbel").setValidators(o&&r===x.TBEL?[O.required]:[]),this.createAlarmConfigForm.get("alarmDetailsBuildJs").updateValueAndValidity({emitEvent:e}),this.createAlarmConfigForm.get("alarmDetailsBuildTbel").updateValueAndValidity({emitEvent:e})}prepareInputConfig(e){return e&&(e.scriptLang||(e.scriptLang=x.JS)),e}testScript(e){const t=this.createAlarmConfigForm.get("scriptLang").value,n=t===x.JS?"alarmDetailsBuildJs":"alarmDetailsBuildTbel",r=t===x.JS?"rulenode/create_alarm_node_script_fn":"rulenode/tbel/create_alarm_node_script_fn",o=this.createAlarmConfigForm.get(n).value;this.nodeScriptTestService.testNodeScript(o,"json",this.translate.instant("tb.rulenode.details"),"Details",["msg","metadata","msgType"],this.ruleNodeId,r,t,e).subscribe((e=>{e&&(this.createAlarmConfigForm.get(n).setValue(e),this.changeScript.emit())}))}removeKey(e,t){const n=this.createAlarmConfigForm.get(t).value,r=n.indexOf(e);r>=0&&(n.splice(r,1),this.createAlarmConfigForm.get(t).setValue(n,{emitEvent:!0}))}addKey(e,t){const n=e.input;let r=e.value;if((r||"").trim()){r=r.trim();let e=this.createAlarmConfigForm.get(t).value;e&&-1!==e.indexOf(r)||(e||(e=[]),e.push(r),this.createAlarmConfigForm.get(t).setValue(e,{emitEvent:!0}))}n&&(n.value="")}onValidate(){const e=this.createAlarmConfigForm.get("useMessageAlarmData").value,t=this.createAlarmConfigForm.get("overwriteAlarmDetails").value;if(!e||t){this.createAlarmConfigForm.get("scriptLang").value===x.JS&&this.jsFuncComponent.validateOnSubmit()}}}e("CreateAlarmConfigComponent",gt),gt.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:gt,deps:[{token:P.Store},{token:R.UntypedFormBuilder},{token:oe.NodeScriptTestService},{token:Z.TranslateService}],target:t.ɵɵFactoryTarget.Component}),gt.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:gt,selector:"tb-action-node-create-alarm-config",viewQueries:[{propertyName:"jsFuncComponent",first:!0,predicate:["jsFuncComponent"],descendants:!0},{propertyName:"tbelFuncComponent",first:!0,predicate:["tbelFuncComponent"],descendants:!0}],usesInheritance:!0,ngImport:t,template:'<section [formGroup]="createAlarmConfigForm" fxLayout="column">\n  <mat-checkbox formControlName="useMessageAlarmData">\n    {{ \'tb.rulenode.use-message-alarm-data\' | translate }}\n  </mat-checkbox>\n  <mat-checkbox formControlName="overwriteAlarmDetails" *ngIf="createAlarmConfigForm.get(\'useMessageAlarmData\').value === true">\n    {{ \'tb.rulenode.overwrite-alarm-details\' | translate }}\n  </mat-checkbox>\n  <section fxLayout="column" *ngIf="createAlarmConfigForm.get(\'useMessageAlarmData\').value === false ||\n                                    createAlarmConfigForm.get(\'overwriteAlarmDetails\').value === true">\n    <tb-script-lang formControlName="scriptLang" *ngIf="tbelEnabled"></tb-script-lang>\n    <tb-js-func *ngIf="createAlarmConfigForm.get(\'scriptLang\').value === scriptLanguage.JS"\n                #jsFuncComponent\n                formControlName="alarmDetailsBuildJs"\n                functionName="Details"\n                [functionArgs]="[\'msg\', \'metadata\', \'msgType\']"\n                helpId="rulenode/create_alarm_node_script_fn"\n                noValidate="true">\n      <button toolbarSuffixButton\n              mat-icon-button\n              matTooltip="{{ testScriptLabel | translate }}"\n              matTooltipPosition="above"\n              class="tb-mat-32"\n              (click)="testScript()">\n        <mat-icon class="material-icons" color="primary">bug_report</mat-icon>\n      </button>\n    </tb-js-func>\n    <tb-js-func *ngIf="createAlarmConfigForm.get(\'scriptLang\').value === scriptLanguage.TBEL"\n                #tbelFuncComponent\n                formControlName="alarmDetailsBuildTbel"\n                functionName="Details"\n                [functionArgs]="[\'msg\', \'metadata\', \'msgType\']"\n                [disableUndefinedCheck]="true"\n                [scriptLanguage]="scriptLanguage.TBEL"\n                helpId="rulenode/tbel/create_alarm_node_script_fn"\n                noValidate="true">\n      <button toolbarSuffixButton\n              mat-icon-button\n              matTooltip="{{ testScriptLabel | translate }}"\n              matTooltipPosition="above"\n              class="tb-mat-32"\n              (click)="testScript()">\n        <mat-icon class="material-icons" color="primary">bug_report</mat-icon>\n      </button>\n    </tb-js-func>\n    <div fxLayout="row" style="padding-bottom: 16px;">\n      <button mat-button mat-raised-button color="primary" (click)="testScript()">\n        {{ testScriptLabel | translate }}\n      </button>\n    </div>\n  </section>\n  <section fxLayout="column" *ngIf="createAlarmConfigForm.get(\'useMessageAlarmData\').value === false">\n    <mat-form-field fxFlex subscriptSizing="dynamic">\n      <mat-label translate>tb.rulenode.alarm-type</mat-label>\n      <input required matInput formControlName="alarmType">\n      <mat-error *ngIf="createAlarmConfigForm.get(\'alarmType\').hasError(\'required\')">\n        {{ \'tb.rulenode.alarm-type-required\' | translate }}\n      </mat-error>\n      <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n    </mat-form-field>\n    <mat-checkbox formControlName="dynamicSeverity">\n      {{ \'tb.rulenode.use-alarm-severity-pattern\' | translate }}\n    </mat-checkbox>\n    <mat-form-field fxFlex *ngIf="!createAlarmConfigForm.get(\'dynamicSeverity\').value">\n      <mat-label translate>tb.rulenode.alarm-severity</mat-label>\n      <mat-select formControlName="severity" required>\n        <mat-option *ngFor="let severity of alarmSeverities" [value]="severity">\n          {{ alarmSeverityTranslationMap.get(severity) | translate }}\n        </mat-option>\n      </mat-select>\n      <mat-error *ngIf="createAlarmConfigForm.get(\'severity\').hasError(\'required\')">\n        {{ \'tb.rulenode.alarm-severity-required\' | translate }}\n      </mat-error>\n    </mat-form-field>\n    <mat-form-field fxFlex *ngIf="createAlarmConfigForm.get(\'dynamicSeverity\').value" subscriptSizing="dynamic">\n      <mat-label translate>tb.rulenode.alarm-severity-pattern</mat-label>\n      <input matInput formControlName="severity" required>\n      <mat-error *ngIf="createAlarmConfigForm.get(\'severity\').hasError(\'required\')">\n        {{ \'tb.rulenode.alarm-severity-required\' | translate }}\n      </mat-error>\n      <mat-hint [innerHTML]="\'tb.rulenode.alarm-severity-pattern-hint\' | translate | safe: \'html\'"></mat-hint>\n    </mat-form-field>\n    <mat-checkbox formControlName="propagate">\n      {{ \'tb.rulenode.propagate\' | translate }}\n    </mat-checkbox>\n    <section *ngIf="createAlarmConfigForm.get(\'propagate\').value === true">\n      <mat-form-field floatLabel="always" class="mat-block" subscriptSizing="dynamic">\n        <mat-label translate>tb.rulenode.relation-types-list</mat-label>\n        <mat-chip-grid #relationTypesChipList>\n          <mat-chip-row\n            *ngFor="let key of createAlarmConfigForm.get(\'relationTypes\').value;"\n            (removed)="removeKey(key, \'relationTypes\')">\n            {{key}}\n            <mat-icon matChipRemove>close</mat-icon>\n          </mat-chip-row>\n          <input matInput type="text" placeholder="{{\'tb.rulenode.relation-types-list\' | translate}}"\n                 [matChipInputFor]="relationTypesChipList"\n                 [matChipInputSeparatorKeyCodes]="separatorKeysCodes"\n                 (matChipInputTokenEnd)="addKey($event, \'relationTypes\')"\n                 [matChipInputAddOnBlur]="true">\n        </mat-chip-grid>\n        <mat-hint translate>tb.rulenode.relation-types-list-hint</mat-hint>\n      </mat-form-field>\n    </section>\n    <mat-checkbox formControlName="propagateToOwner">\n      {{ \'tb.rulenode.propagate-to-owner\' | translate }}\n    </mat-checkbox>\n    <mat-checkbox formControlName="propagateToTenant">\n      {{ \'tb.rulenode.propagate-to-tenant\' | translate }}\n    </mat-checkbox>\n  </section>\n</section>\n',dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:pe.JsFuncComponent,selector:"tb-js-func",inputs:["functionTitle","functionName","functionArgs","validationArgs","resultType","disabled","fillHeight","minHeight","editorCompleter","globalVariables","disableUndefinedCheck","helpId","scriptLanguage","hideBrackets","noValidate","required"]},{kind:"component",type:de.MatButton,selector:"    button[mat-button], button[mat-raised-button], button[mat-flat-button],    button[mat-stroked-button]  ",inputs:["disabled","disableRipple","color"],exportAs:["matButton"]},{kind:"component",type:de.MatIconButton,selector:"button[mat-icon-button]",inputs:["disabled","disableRipple","color"],exportAs:["matButton"]},{kind:"component",type:Q.MatCheckbox,selector:"mat-checkbox",inputs:["disableRipple","color","tabIndex"],exportAs:["matCheckbox"]},{kind:"component",type:ue.MatIcon,selector:"mat-icon",inputs:["color","inline","svgIcon","fontSet","fontIcon"],exportAs:["matIcon"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatHint,selector:"mat-hint",inputs:["align","id"]},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"component",type:X.MatSelect,selector:"mat-select",inputs:["disabled","disableRipple","tabIndex","hideSingleSelectionIndicator"],exportAs:["matSelect"]},{kind:"component",type:ee.MatOption,selector:"mat-option",exportAs:["matOption"]},{kind:"directive",type:ce.MatTooltip,selector:"[matTooltip]",exportAs:["matTooltip"]},{kind:"component",type:be.MatChipGrid,selector:"mat-chip-grid",inputs:["tabIndex","disabled","placeholder","required","value","errorStateMatcher"],outputs:["change","valueChange"]},{kind:"directive",type:be.MatChipInput,selector:"input[matChipInputFor]",inputs:["matChipInputFor","matChipInputAddOnBlur","matChipInputSeparatorKeyCodes","placeholder","id","disabled"],outputs:["matChipInputTokenEnd"],exportAs:["matChipInput","matChipInputFor"]},{kind:"directive",type:be.MatChipRemove,selector:"[matChipRemove]"},{kind:"component",type:be.MatChipRow,selector:"mat-chip-row, [mat-chip-row], mat-basic-chip-row, [mat-basic-chip-row]",inputs:["color","disabled","disableRipple","tabIndex","editable"],outputs:["edited"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:W.DefaultFlexDirective,selector:"  [fxFlex], [fxFlex.xs], [fxFlex.sm], [fxFlex.md],  [fxFlex.lg], [fxFlex.xl], [fxFlex.lt-sm], [fxFlex.lt-md],  [fxFlex.lt-lg], [fxFlex.lt-xl], [fxFlex.gt-xs], [fxFlex.gt-sm],  [fxFlex.gt-md], [fxFlex.gt-lg]",inputs:["fxFlex","fxFlex.xs","fxFlex.sm","fxFlex.md","fxFlex.lg","fxFlex.xl","fxFlex.lt-sm","fxFlex.lt-md","fxFlex.lt-lg","fxFlex.lt-xl","fxFlex.gt-xs","fxFlex.gt-sm","fxFlex.gt-md","fxFlex.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"component",type:fe.TbScriptLangComponent,selector:"tb-script-lang",inputs:["disabled"]},{kind:"pipe",type:he.SafePipe,name:"safe"},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:gt,decorators:[{type:n,args:[{selector:"tb-action-node-create-alarm-config",template:'<section [formGroup]="createAlarmConfigForm" fxLayout="column">\n  <mat-checkbox formControlName="useMessageAlarmData">\n    {{ \'tb.rulenode.use-message-alarm-data\' | translate }}\n  </mat-checkbox>\n  <mat-checkbox formControlName="overwriteAlarmDetails" *ngIf="createAlarmConfigForm.get(\'useMessageAlarmData\').value === true">\n    {{ \'tb.rulenode.overwrite-alarm-details\' | translate }}\n  </mat-checkbox>\n  <section fxLayout="column" *ngIf="createAlarmConfigForm.get(\'useMessageAlarmData\').value === false ||\n                                    createAlarmConfigForm.get(\'overwriteAlarmDetails\').value === true">\n    <tb-script-lang formControlName="scriptLang" *ngIf="tbelEnabled"></tb-script-lang>\n    <tb-js-func *ngIf="createAlarmConfigForm.get(\'scriptLang\').value === scriptLanguage.JS"\n                #jsFuncComponent\n                formControlName="alarmDetailsBuildJs"\n                functionName="Details"\n                [functionArgs]="[\'msg\', \'metadata\', \'msgType\']"\n                helpId="rulenode/create_alarm_node_script_fn"\n                noValidate="true">\n      <button toolbarSuffixButton\n              mat-icon-button\n              matTooltip="{{ testScriptLabel | translate }}"\n              matTooltipPosition="above"\n              class="tb-mat-32"\n              (click)="testScript()">\n        <mat-icon class="material-icons" color="primary">bug_report</mat-icon>\n      </button>\n    </tb-js-func>\n    <tb-js-func *ngIf="createAlarmConfigForm.get(\'scriptLang\').value === scriptLanguage.TBEL"\n                #tbelFuncComponent\n                formControlName="alarmDetailsBuildTbel"\n                functionName="Details"\n                [functionArgs]="[\'msg\', \'metadata\', \'msgType\']"\n                [disableUndefinedCheck]="true"\n                [scriptLanguage]="scriptLanguage.TBEL"\n                helpId="rulenode/tbel/create_alarm_node_script_fn"\n                noValidate="true">\n      <button toolbarSuffixButton\n              mat-icon-button\n              matTooltip="{{ testScriptLabel | translate }}"\n              matTooltipPosition="above"\n              class="tb-mat-32"\n              (click)="testScript()">\n        <mat-icon class="material-icons" color="primary">bug_report</mat-icon>\n      </button>\n    </tb-js-func>\n    <div fxLayout="row" style="padding-bottom: 16px;">\n      <button mat-button mat-raised-button color="primary" (click)="testScript()">\n        {{ testScriptLabel | translate }}\n      </button>\n    </div>\n  </section>\n  <section fxLayout="column" *ngIf="createAlarmConfigForm.get(\'useMessageAlarmData\').value === false">\n    <mat-form-field fxFlex subscriptSizing="dynamic">\n      <mat-label translate>tb.rulenode.alarm-type</mat-label>\n      <input required matInput formControlName="alarmType">\n      <mat-error *ngIf="createAlarmConfigForm.get(\'alarmType\').hasError(\'required\')">\n        {{ \'tb.rulenode.alarm-type-required\' | translate }}\n      </mat-error>\n      <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n    </mat-form-field>\n    <mat-checkbox formControlName="dynamicSeverity">\n      {{ \'tb.rulenode.use-alarm-severity-pattern\' | translate }}\n    </mat-checkbox>\n    <mat-form-field fxFlex *ngIf="!createAlarmConfigForm.get(\'dynamicSeverity\').value">\n      <mat-label translate>tb.rulenode.alarm-severity</mat-label>\n      <mat-select formControlName="severity" required>\n        <mat-option *ngFor="let severity of alarmSeverities" [value]="severity">\n          {{ alarmSeverityTranslationMap.get(severity) | translate }}\n        </mat-option>\n      </mat-select>\n      <mat-error *ngIf="createAlarmConfigForm.get(\'severity\').hasError(\'required\')">\n        {{ \'tb.rulenode.alarm-severity-required\' | translate }}\n      </mat-error>\n    </mat-form-field>\n    <mat-form-field fxFlex *ngIf="createAlarmConfigForm.get(\'dynamicSeverity\').value" subscriptSizing="dynamic">\n      <mat-label translate>tb.rulenode.alarm-severity-pattern</mat-label>\n      <input matInput formControlName="severity" required>\n      <mat-error *ngIf="createAlarmConfigForm.get(\'severity\').hasError(\'required\')">\n        {{ \'tb.rulenode.alarm-severity-required\' | translate }}\n      </mat-error>\n      <mat-hint [innerHTML]="\'tb.rulenode.alarm-severity-pattern-hint\' | translate | safe: \'html\'"></mat-hint>\n    </mat-form-field>\n    <mat-checkbox formControlName="propagate">\n      {{ \'tb.rulenode.propagate\' | translate }}\n    </mat-checkbox>\n    <section *ngIf="createAlarmConfigForm.get(\'propagate\').value === true">\n      <mat-form-field floatLabel="always" class="mat-block" subscriptSizing="dynamic">\n        <mat-label translate>tb.rulenode.relation-types-list</mat-label>\n        <mat-chip-grid #relationTypesChipList>\n          <mat-chip-row\n            *ngFor="let key of createAlarmConfigForm.get(\'relationTypes\').value;"\n            (removed)="removeKey(key, \'relationTypes\')">\n            {{key}}\n            <mat-icon matChipRemove>close</mat-icon>\n          </mat-chip-row>\n          <input matInput type="text" placeholder="{{\'tb.rulenode.relation-types-list\' | translate}}"\n                 [matChipInputFor]="relationTypesChipList"\n                 [matChipInputSeparatorKeyCodes]="separatorKeysCodes"\n                 (matChipInputTokenEnd)="addKey($event, \'relationTypes\')"\n                 [matChipInputAddOnBlur]="true">\n        </mat-chip-grid>\n        <mat-hint translate>tb.rulenode.relation-types-list-hint</mat-hint>\n      </mat-form-field>\n    </section>\n    <mat-checkbox formControlName="propagateToOwner">\n      {{ \'tb.rulenode.propagate-to-owner\' | translate }}\n    </mat-checkbox>\n    <mat-checkbox formControlName="propagateToTenant">\n      {{ \'tb.rulenode.propagate-to-tenant\' | translate }}\n    </mat-checkbox>\n  </section>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder},{type:oe.NodeScriptTestService},{type:Z.TranslateService}]},propDecorators:{jsFuncComponent:[{type:o,args:["jsFuncComponent",{static:!1}]}],tbelFuncComponent:[{type:o,args:["tbelFuncComponent",{static:!1}]}]}});class yt extends f{constructor(e,t){super(e),this.store=e,this.fb=t,this.directionTypes=Object.keys(v),this.directionTypeTranslations=C,this.entityType=F}configForm(){return this.createRelationConfigForm}onConfigurationSet(e){this.createRelationConfigForm=this.fb.group({direction:[e?e.direction:null,[O.required]],entityType:[e?e.entityType:null,[O.required]],entityNamePattern:[e?e.entityNamePattern:null,[]],entityTypePattern:[e?e.entityTypePattern:null,[]],relationType:[e?e.relationType:null,[O.required]],createEntityIfNotExists:[!!e&&e.createEntityIfNotExists,[]],removeCurrentRelations:[!!e&&e.removeCurrentRelations,[]],changeOriginatorToRelatedEntity:[!!e&&e.changeOriginatorToRelatedEntity,[]],entityCacheExpiration:[e?e.entityCacheExpiration:null,[O.required,O.min(0)]]})}validatorTriggers(){return["entityType"]}updateValidators(e){const t=this.createRelationConfigForm.get("entityType").value;t?this.createRelationConfigForm.get("entityNamePattern").setValidators([O.required,O.pattern(/.*\S.*/)]):this.createRelationConfigForm.get("entityNamePattern").setValidators([]),!t||t!==F.DEVICE&&t!==F.ASSET?this.createRelationConfigForm.get("entityTypePattern").setValidators([]):this.createRelationConfigForm.get("entityTypePattern").setValidators([O.required,O.pattern(/.*\S.*/)]),this.createRelationConfigForm.get("entityNamePattern").updateValueAndValidity({emitEvent:e}),this.createRelationConfigForm.get("entityTypePattern").updateValueAndValidity({emitEvent:e})}prepareOutputConfig(e){return e.entityNamePattern=e.entityNamePattern?e.entityNamePattern.trim():null,e.entityTypePattern=e.entityTypePattern?e.entityTypePattern.trim():null,e}}e("CreateRelationConfigComponent",yt),yt.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:yt,deps:[{token:P.Store},{token:R.UntypedFormBuilder}],target:t.ɵɵFactoryTarget.Component}),yt.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:yt,selector:"tb-action-node-create-relation-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="createRelationConfigForm" fxLayout="column">\n  <mat-form-field class="mat-block" style="min-width: 100px;">\n    <mat-label translate>relation.direction</mat-label>\n    <mat-select required matInput formControlName="direction">\n      <mat-option *ngFor="let type of directionTypes" [value]="type">\n        {{ directionTypeTranslations.get(type) | translate }}\n      </mat-option>\n    </mat-select>\n  </mat-form-field>\n  <div fxLayout="row" fxLayoutGap="8px">\n    <tb-entity-type-select\n      showLabel\n      style="min-width: 100px;"\n      required\n      formControlName="entityType">\n    </tb-entity-type-select>\n    <mat-form-field *ngIf="createRelationConfigForm.get(\'entityType\').value" fxFlex class="mat-block" subscriptSizing="dynamic">\n      <mat-label translate>tb.rulenode.entity-name-pattern</mat-label>\n      <input required matInput formControlName="entityNamePattern">\n      <mat-error *ngIf="createRelationConfigForm.get(\'entityNamePattern\').hasError(\'required\') ||\n                        createRelationConfigForm.get(\'entityNamePattern\').hasError(\'pattern\')">\n        {{ \'tb.rulenode.entity-name-pattern-required\' | translate }}\n      </mat-error>\n      <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n    </mat-form-field>\n    <mat-form-field *ngIf="createRelationConfigForm.get(\'entityType\').value === entityType.DEVICE ||\n                           createRelationConfigForm.get(\'entityType\').value === entityType.ASSET"\n                    fxFlex class="mat-block" subscriptSizing="dynamic">\n      <mat-label translate>tb.rulenode.entity-type-pattern</mat-label>\n      <input required matInput formControlName="entityTypePattern">\n      <mat-error *ngIf="createRelationConfigForm.get(\'entityTypePattern\').hasError(\'required\') ||\n                        createRelationConfigForm.get(\'entityTypePattern\').hasError(\'pattern\')">\n        {{ \'tb.rulenode.entity-type-pattern-required\' | translate }}\n      </mat-error>\n      <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n    </mat-form-field>\n  </div>\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.relation-type-pattern</mat-label>\n    <input required matInput formControlName="relationType">\n    <mat-error *ngIf="createRelationConfigForm.get(\'relationType\').hasError(\'required\')">\n      {{ \'tb.rulenode.relation-type-pattern-required\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n  </mat-form-field>\n  <section *ngIf="createRelationConfigForm.get(\'entityType\').value === entityType.CUSTOMER ||\n                  createRelationConfigForm.get(\'entityType\').value === entityType.DEVICE ||\n                  createRelationConfigForm.get(\'entityType\').value === entityType.ASSET">\n    <mat-checkbox formControlName="createEntityIfNotExists">\n      {{ \'tb.rulenode.create-entity-if-not-exists\' | translate }}\n    </mat-checkbox>\n    <div class="tb-hint" translate>tb.rulenode.create-entity-if-not-exists-hint</div>\n  </section>\n  <mat-checkbox formControlName="removeCurrentRelations">\n    {{ \'tb.rulenode.remove-current-relations\' | translate }}\n  </mat-checkbox>\n  <div class="tb-hint" translate>tb.rulenode.remove-current-relations-hint</div>\n  <mat-checkbox formControlName="changeOriginatorToRelatedEntity">\n    {{ \'tb.rulenode.change-originator-to-related-entity\' | translate }}\n  </mat-checkbox>\n  <div class="tb-hint" translate>tb.rulenode.change-originator-to-related-entity-hint</div>\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.entity-cache-expiration</mat-label>\n    <input required type="number" min="0" step="1" matInput formControlName="entityCacheExpiration">\n    <mat-error *ngIf="createRelationConfigForm.get(\'entityCacheExpiration\').hasError(\'required\')">\n      {{ \'tb.rulenode.entity-cache-expiration-required\' | translate }}\n    </mat-error>\n    <mat-error *ngIf="createRelationConfigForm.get(\'entityCacheExpiration\').hasError(\'min\')">\n      {{ \'tb.rulenode.entity-cache-expiration-range\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.entity-cache-expiration-hint</mat-hint>\n  </mat-form-field>\n</section>\n',dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:ve.EntityTypeSelectComponent,selector:"tb-entity-type-select",inputs:["allowedEntityTypes","useAliasEntityTypes","filterAllowedEntityTypes","showLabel","required","disabled"]},{kind:"component",type:Q.MatCheckbox,selector:"mat-checkbox",inputs:["disableRipple","color","tabIndex"],exportAs:["matCheckbox"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatHint,selector:"mat-hint",inputs:["align","id"]},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"component",type:X.MatSelect,selector:"mat-select",inputs:["disabled","disableRipple","tabIndex","hideSingleSelectionIndicator"],exportAs:["matSelect"]},{kind:"component",type:ee.MatOption,selector:"mat-option",exportAs:["matOption"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:W.DefaultLayoutGapDirective,selector:"  [fxLayoutGap], [fxLayoutGap.xs], [fxLayoutGap.sm], [fxLayoutGap.md],  [fxLayoutGap.lg], [fxLayoutGap.xl], [fxLayoutGap.lt-sm], [fxLayoutGap.lt-md],  [fxLayoutGap.lt-lg], [fxLayoutGap.lt-xl], [fxLayoutGap.gt-xs], [fxLayoutGap.gt-sm],  [fxLayoutGap.gt-md], [fxLayoutGap.gt-lg]",inputs:["fxLayoutGap","fxLayoutGap.xs","fxLayoutGap.sm","fxLayoutGap.md","fxLayoutGap.lg","fxLayoutGap.xl","fxLayoutGap.lt-sm","fxLayoutGap.lt-md","fxLayoutGap.lt-lg","fxLayoutGap.lt-xl","fxLayoutGap.gt-xs","fxLayoutGap.gt-sm","fxLayoutGap.gt-md","fxLayoutGap.gt-lg"]},{kind:"directive",type:W.DefaultFlexDirective,selector:"  [fxFlex], [fxFlex.xs], [fxFlex.sm], [fxFlex.md],  [fxFlex.lg], [fxFlex.xl], [fxFlex.lt-sm], [fxFlex.lt-md],  [fxFlex.lt-lg], [fxFlex.lt-xl], [fxFlex.gt-xs], [fxFlex.gt-sm],  [fxFlex.gt-md], [fxFlex.gt-lg]",inputs:["fxFlex","fxFlex.xs","fxFlex.sm","fxFlex.md","fxFlex.lg","fxFlex.xl","fxFlex.lt-sm","fxFlex.lt-md","fxFlex.lt-lg","fxFlex.lt-xl","fxFlex.gt-xs","fxFlex.gt-sm","fxFlex.gt-md","fxFlex.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NumberValueAccessor,selector:"input[type=number][formControlName],input[type=number][formControl],input[type=number][ngModel]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.MinValidator,selector:"input[type=number][min][formControlName],input[type=number][min][formControl],input[type=number][min][ngModel]",inputs:["min"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:yt,decorators:[{type:n,args:[{selector:"tb-action-node-create-relation-config",template:'<section [formGroup]="createRelationConfigForm" fxLayout="column">\n  <mat-form-field class="mat-block" style="min-width: 100px;">\n    <mat-label translate>relation.direction</mat-label>\n    <mat-select required matInput formControlName="direction">\n      <mat-option *ngFor="let type of directionTypes" [value]="type">\n        {{ directionTypeTranslations.get(type) | translate }}\n      </mat-option>\n    </mat-select>\n  </mat-form-field>\n  <div fxLayout="row" fxLayoutGap="8px">\n    <tb-entity-type-select\n      showLabel\n      style="min-width: 100px;"\n      required\n      formControlName="entityType">\n    </tb-entity-type-select>\n    <mat-form-field *ngIf="createRelationConfigForm.get(\'entityType\').value" fxFlex class="mat-block" subscriptSizing="dynamic">\n      <mat-label translate>tb.rulenode.entity-name-pattern</mat-label>\n      <input required matInput formControlName="entityNamePattern">\n      <mat-error *ngIf="createRelationConfigForm.get(\'entityNamePattern\').hasError(\'required\') ||\n                        createRelationConfigForm.get(\'entityNamePattern\').hasError(\'pattern\')">\n        {{ \'tb.rulenode.entity-name-pattern-required\' | translate }}\n      </mat-error>\n      <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n    </mat-form-field>\n    <mat-form-field *ngIf="createRelationConfigForm.get(\'entityType\').value === entityType.DEVICE ||\n                           createRelationConfigForm.get(\'entityType\').value === entityType.ASSET"\n                    fxFlex class="mat-block" subscriptSizing="dynamic">\n      <mat-label translate>tb.rulenode.entity-type-pattern</mat-label>\n      <input required matInput formControlName="entityTypePattern">\n      <mat-error *ngIf="createRelationConfigForm.get(\'entityTypePattern\').hasError(\'required\') ||\n                        createRelationConfigForm.get(\'entityTypePattern\').hasError(\'pattern\')">\n        {{ \'tb.rulenode.entity-type-pattern-required\' | translate }}\n      </mat-error>\n      <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n    </mat-form-field>\n  </div>\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.relation-type-pattern</mat-label>\n    <input required matInput formControlName="relationType">\n    <mat-error *ngIf="createRelationConfigForm.get(\'relationType\').hasError(\'required\')">\n      {{ \'tb.rulenode.relation-type-pattern-required\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n  </mat-form-field>\n  <section *ngIf="createRelationConfigForm.get(\'entityType\').value === entityType.CUSTOMER ||\n                  createRelationConfigForm.get(\'entityType\').value === entityType.DEVICE ||\n                  createRelationConfigForm.get(\'entityType\').value === entityType.ASSET">\n    <mat-checkbox formControlName="createEntityIfNotExists">\n      {{ \'tb.rulenode.create-entity-if-not-exists\' | translate }}\n    </mat-checkbox>\n    <div class="tb-hint" translate>tb.rulenode.create-entity-if-not-exists-hint</div>\n  </section>\n  <mat-checkbox formControlName="removeCurrentRelations">\n    {{ \'tb.rulenode.remove-current-relations\' | translate }}\n  </mat-checkbox>\n  <div class="tb-hint" translate>tb.rulenode.remove-current-relations-hint</div>\n  <mat-checkbox formControlName="changeOriginatorToRelatedEntity">\n    {{ \'tb.rulenode.change-originator-to-related-entity\' | translate }}\n  </mat-checkbox>\n  <div class="tb-hint" translate>tb.rulenode.change-originator-to-related-entity-hint</div>\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.entity-cache-expiration</mat-label>\n    <input required type="number" min="0" step="1" matInput formControlName="entityCacheExpiration">\n    <mat-error *ngIf="createRelationConfigForm.get(\'entityCacheExpiration\').hasError(\'required\')">\n      {{ \'tb.rulenode.entity-cache-expiration-required\' | translate }}\n    </mat-error>\n    <mat-error *ngIf="createRelationConfigForm.get(\'entityCacheExpiration\').hasError(\'min\')">\n      {{ \'tb.rulenode.entity-cache-expiration-range\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.entity-cache-expiration-hint</mat-hint>\n  </mat-form-field>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder}]}});class xt extends f{constructor(e,t){super(e),this.store=e,this.fb=t,this.directionTypes=Object.keys(v),this.directionTypeTranslations=C,this.entityType=F}configForm(){return this.deleteRelationConfigForm}onConfigurationSet(e){this.deleteRelationConfigForm=this.fb.group({deleteForSingleEntity:[!!e&&e.deleteForSingleEntity,[]],direction:[e?e.direction:null,[O.required]],entityType:[e?e.entityType:null,[]],entityNamePattern:[e?e.entityNamePattern:null,[]],relationType:[e?e.relationType:null,[O.required]],entityCacheExpiration:[e?e.entityCacheExpiration:null,[O.required,O.min(0)]]})}validatorTriggers(){return["deleteForSingleEntity","entityType"]}updateValidators(e){const t=this.deleteRelationConfigForm.get("deleteForSingleEntity").value,n=this.deleteRelationConfigForm.get("entityType").value;t?this.deleteRelationConfigForm.get("entityType").setValidators([O.required]):this.deleteRelationConfigForm.get("entityType").setValidators([]),t&&n?this.deleteRelationConfigForm.get("entityNamePattern").setValidators([O.required,O.pattern(/.*\S.*/)]):this.deleteRelationConfigForm.get("entityNamePattern").setValidators([]),this.deleteRelationConfigForm.get("entityType").updateValueAndValidity({emitEvent:!1}),this.deleteRelationConfigForm.get("entityNamePattern").updateValueAndValidity({emitEvent:e})}prepareOutputConfig(e){return e.entityNamePattern=e.entityNamePattern?e.entityNamePattern.trim():null,e}}e("DeleteRelationConfigComponent",xt),xt.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:xt,deps:[{token:P.Store},{token:R.UntypedFormBuilder}],target:t.ɵɵFactoryTarget.Component}),xt.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:xt,selector:"tb-action-node-delete-relation-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="deleteRelationConfigForm" fxLayout="column">\n  <mat-checkbox formControlName="deleteForSingleEntity">\n    {{ \'tb.rulenode.delete-relation-to-specific-entity\' | translate }}\n  </mat-checkbox>\n  <div class="tb-hint" style="padding-bottom: 16px;" translate>tb.rulenode.delete-relation-hint</div>\n  <mat-form-field class="mat-block" style="min-width: 100px;">\n    <mat-label translate>relation.direction</mat-label>\n    <mat-select required matInput formControlName="direction">\n      <mat-option *ngFor="let type of directionTypes" [value]="type">\n        {{ directionTypeTranslations.get(type) | translate }}\n      </mat-option>\n    </mat-select>\n  </mat-form-field>\n  <div *ngIf="deleteRelationConfigForm.get(\'deleteForSingleEntity\').value" fxLayout="row" fxLayoutGap="8px">\n    <tb-entity-type-select\n      showLabel\n      style="min-width: 100px;"\n      required\n      formControlName="entityType">\n    </tb-entity-type-select>\n    <mat-form-field *ngIf="deleteRelationConfigForm.get(\'entityType\').value" fxFlex class="mat-block" subscriptSizing="dynamic">\n      <mat-label translate>tb.rulenode.entity-name-pattern</mat-label>\n      <input required matInput formControlName="entityNamePattern">\n      <mat-error *ngIf="deleteRelationConfigForm.get(\'entityNamePattern\').hasError(\'required\') ||\n                        deleteRelationConfigForm.get(\'entityNamePattern\').hasError(\'pattern\')">\n        {{ \'tb.rulenode.entity-name-pattern-required\' | translate }}\n      </mat-error>\n      <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n    </mat-form-field>\n  </div>\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.relation-type-pattern</mat-label>\n    <input required matInput formControlName="relationType">\n    <mat-error *ngIf="deleteRelationConfigForm.get(\'relationType\').hasError(\'required\')">\n      {{ \'tb.rulenode.relation-type-pattern-required\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n  </mat-form-field>\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.entity-cache-expiration</mat-label>\n    <input required type="number" min="0" step="1" matInput formControlName="entityCacheExpiration">\n    <mat-error *ngIf="deleteRelationConfigForm.get(\'entityCacheExpiration\').hasError(\'required\')">\n      {{ \'tb.rulenode.entity-cache-expiration-required\' | translate }}\n    </mat-error>\n    <mat-error *ngIf="deleteRelationConfigForm.get(\'entityCacheExpiration\').hasError(\'min\')">\n      {{ \'tb.rulenode.entity-cache-expiration-range\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.entity-cache-expiration-hint</mat-hint>\n  </mat-form-field>\n</section>\n',dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:ve.EntityTypeSelectComponent,selector:"tb-entity-type-select",inputs:["allowedEntityTypes","useAliasEntityTypes","filterAllowedEntityTypes","showLabel","required","disabled"]},{kind:"component",type:Q.MatCheckbox,selector:"mat-checkbox",inputs:["disableRipple","color","tabIndex"],exportAs:["matCheckbox"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatHint,selector:"mat-hint",inputs:["align","id"]},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"component",type:X.MatSelect,selector:"mat-select",inputs:["disabled","disableRipple","tabIndex","hideSingleSelectionIndicator"],exportAs:["matSelect"]},{kind:"component",type:ee.MatOption,selector:"mat-option",exportAs:["matOption"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:W.DefaultLayoutGapDirective,selector:"  [fxLayoutGap], [fxLayoutGap.xs], [fxLayoutGap.sm], [fxLayoutGap.md],  [fxLayoutGap.lg], [fxLayoutGap.xl], [fxLayoutGap.lt-sm], [fxLayoutGap.lt-md],  [fxLayoutGap.lt-lg], [fxLayoutGap.lt-xl], [fxLayoutGap.gt-xs], [fxLayoutGap.gt-sm],  [fxLayoutGap.gt-md], [fxLayoutGap.gt-lg]",inputs:["fxLayoutGap","fxLayoutGap.xs","fxLayoutGap.sm","fxLayoutGap.md","fxLayoutGap.lg","fxLayoutGap.xl","fxLayoutGap.lt-sm","fxLayoutGap.lt-md","fxLayoutGap.lt-lg","fxLayoutGap.lt-xl","fxLayoutGap.gt-xs","fxLayoutGap.gt-sm","fxLayoutGap.gt-md","fxLayoutGap.gt-lg"]},{kind:"directive",type:W.DefaultFlexDirective,selector:"  [fxFlex], [fxFlex.xs], [fxFlex.sm], [fxFlex.md],  [fxFlex.lg], [fxFlex.xl], [fxFlex.lt-sm], [fxFlex.lt-md],  [fxFlex.lt-lg], [fxFlex.lt-xl], [fxFlex.gt-xs], [fxFlex.gt-sm],  [fxFlex.gt-md], [fxFlex.gt-lg]",inputs:["fxFlex","fxFlex.xs","fxFlex.sm","fxFlex.md","fxFlex.lg","fxFlex.xl","fxFlex.lt-sm","fxFlex.lt-md","fxFlex.lt-lg","fxFlex.lt-xl","fxFlex.gt-xs","fxFlex.gt-sm","fxFlex.gt-md","fxFlex.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NumberValueAccessor,selector:"input[type=number][formControlName],input[type=number][formControl],input[type=number][ngModel]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.MinValidator,selector:"input[type=number][min][formControlName],input[type=number][min][formControl],input[type=number][min][ngModel]",inputs:["min"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:xt,decorators:[{type:n,args:[{selector:"tb-action-node-delete-relation-config",template:'<section [formGroup]="deleteRelationConfigForm" fxLayout="column">\n  <mat-checkbox formControlName="deleteForSingleEntity">\n    {{ \'tb.rulenode.delete-relation-to-specific-entity\' | translate }}\n  </mat-checkbox>\n  <div class="tb-hint" style="padding-bottom: 16px;" translate>tb.rulenode.delete-relation-hint</div>\n  <mat-form-field class="mat-block" style="min-width: 100px;">\n    <mat-label translate>relation.direction</mat-label>\n    <mat-select required matInput formControlName="direction">\n      <mat-option *ngFor="let type of directionTypes" [value]="type">\n        {{ directionTypeTranslations.get(type) | translate }}\n      </mat-option>\n    </mat-select>\n  </mat-form-field>\n  <div *ngIf="deleteRelationConfigForm.get(\'deleteForSingleEntity\').value" fxLayout="row" fxLayoutGap="8px">\n    <tb-entity-type-select\n      showLabel\n      style="min-width: 100px;"\n      required\n      formControlName="entityType">\n    </tb-entity-type-select>\n    <mat-form-field *ngIf="deleteRelationConfigForm.get(\'entityType\').value" fxFlex class="mat-block" subscriptSizing="dynamic">\n      <mat-label translate>tb.rulenode.entity-name-pattern</mat-label>\n      <input required matInput formControlName="entityNamePattern">\n      <mat-error *ngIf="deleteRelationConfigForm.get(\'entityNamePattern\').hasError(\'required\') ||\n                        deleteRelationConfigForm.get(\'entityNamePattern\').hasError(\'pattern\')">\n        {{ \'tb.rulenode.entity-name-pattern-required\' | translate }}\n      </mat-error>\n      <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n    </mat-form-field>\n  </div>\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.relation-type-pattern</mat-label>\n    <input required matInput formControlName="relationType">\n    <mat-error *ngIf="deleteRelationConfigForm.get(\'relationType\').hasError(\'required\')">\n      {{ \'tb.rulenode.relation-type-pattern-required\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n  </mat-form-field>\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.entity-cache-expiration</mat-label>\n    <input required type="number" min="0" step="1" matInput formControlName="entityCacheExpiration">\n    <mat-error *ngIf="deleteRelationConfigForm.get(\'entityCacheExpiration\').hasError(\'required\')">\n      {{ \'tb.rulenode.entity-cache-expiration-required\' | translate }}\n    </mat-error>\n    <mat-error *ngIf="deleteRelationConfigForm.get(\'entityCacheExpiration\').hasError(\'min\')">\n      {{ \'tb.rulenode.entity-cache-expiration-range\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.entity-cache-expiration-hint</mat-hint>\n  </mat-form-field>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder}]}});class bt extends f{constructor(e,t){super(e),this.store=e,this.fb=t}configForm(){return this.deviceProfile}onConfigurationSet(e){this.deviceProfile=this.fb.group({persistAlarmRulesState:[!!e&&e.persistAlarmRulesState,O.required],fetchAlarmRulesStateOnStart:[!!e&&e.fetchAlarmRulesStateOnStart,O.required]})}}e("DeviceProfileConfigComponent",bt),bt.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:bt,deps:[{token:P.Store},{token:R.UntypedFormBuilder}],target:t.ɵɵFactoryTarget.Component}),bt.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:bt,selector:"tb-device-profile-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="deviceProfile" fxLayout="column">\n  <mat-checkbox fxFlex formControlName="persistAlarmRulesState">\n    {{ \'tb.rulenode.persist-alarm-rules\' | translate }}\n  </mat-checkbox>\n  <mat-checkbox fxFlex formControlName="fetchAlarmRulesStateOnStart">\n    {{ \'tb.rulenode.fetch-alarm-rules\' | translate }}\n  </mat-checkbox>\n</section>\n',dependencies:[{kind:"component",type:Q.MatCheckbox,selector:"mat-checkbox",inputs:["disableRipple","color","tabIndex"],exportAs:["matCheckbox"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:W.DefaultFlexDirective,selector:"  [fxFlex], [fxFlex.xs], [fxFlex.sm], [fxFlex.md],  [fxFlex.lg], [fxFlex.xl], [fxFlex.lt-sm], [fxFlex.lt-md],  [fxFlex.lt-lg], [fxFlex.lt-xl], [fxFlex.gt-xs], [fxFlex.gt-sm],  [fxFlex.gt-md], [fxFlex.gt-lg]",inputs:["fxFlex","fxFlex.xs","fxFlex.sm","fxFlex.md","fxFlex.lg","fxFlex.xl","fxFlex.lt-sm","fxFlex.lt-md","fxFlex.lt-lg","fxFlex.lt-xl","fxFlex.gt-xs","fxFlex.gt-sm","fxFlex.gt-md","fxFlex.gt-lg"]},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:bt,decorators:[{type:n,args:[{selector:"tb-device-profile-config",template:'<section [formGroup]="deviceProfile" fxLayout="column">\n  <mat-checkbox fxFlex formControlName="persistAlarmRulesState">\n    {{ \'tb.rulenode.persist-alarm-rules\' | translate }}\n  </mat-checkbox>\n  <mat-checkbox fxFlex formControlName="fetchAlarmRulesStateOnStart">\n    {{ \'tb.rulenode.fetch-alarm-rules\' | translate }}\n  </mat-checkbox>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder}]}});class ht extends f{constructor(e,t,n,o){super(e),this.store=e,this.fb=t,this.nodeScriptTestService=n,this.translate=o,this.tbelEnabled=re(this.store).tbelEnabled,this.scriptLanguage=x,this.changeScript=new r,this.hasScript=!0,this.testScriptLabel="tb.rulenode.test-generator-function"}configForm(){return this.generatorConfigForm}onConfigurationSet(e){this.generatorConfigForm=this.fb.group({msgCount:[e?e.msgCount:null,[O.required,O.min(0)]],periodInSeconds:[e?e.periodInSeconds:null,[O.required,O.min(1)]],originator:[e?e.originator:null,[]],scriptLang:[e?e.scriptLang:x.JS,[O.required]],jsScript:[e?e.jsScript:null,[]],tbelScript:[e?e.tbelScript:null,[]]})}validatorTriggers(){return["scriptLang"]}updateValidators(e){let t=this.generatorConfigForm.get("scriptLang").value;t!==x.TBEL||this.tbelEnabled||(t=x.JS,this.generatorConfigForm.get("scriptLang").patchValue(t,{emitEvent:!1}),setTimeout((()=>{this.generatorConfigForm.updateValueAndValidity({emitEvent:!0})}))),this.generatorConfigForm.get("jsScript").setValidators(t===x.JS?[O.required]:[]),this.generatorConfigForm.get("jsScript").updateValueAndValidity({emitEvent:e}),this.generatorConfigForm.get("tbelScript").setValidators(t===x.TBEL?[O.required]:[]),this.generatorConfigForm.get("tbelScript").updateValueAndValidity({emitEvent:e})}prepareInputConfig(e){return e&&(e.scriptLang||(e.scriptLang=x.JS),e.originatorId&&e.originatorType?e.originator={id:e.originatorId,entityType:e.originatorType}:e.originator=null,delete e.originatorId,delete e.originatorType),e}prepareOutputConfig(e){return e.originator?(e.originatorId=e.originator.id,e.originatorType=e.originator.entityType):(e.originatorId=null,e.originatorType=null),delete e.originator,e}testScript(e){const t=this.generatorConfigForm.get("scriptLang").value,n=t===x.JS?"jsScript":"tbelScript",r=t===x.JS?"rulenode/generator_node_script_fn":"rulenode/tbel/generator_node_script_fn",o=this.generatorConfigForm.get(n).value;this.nodeScriptTestService.testNodeScript(o,"generate",this.translate.instant("tb.rulenode.generator"),"Generate",["prevMsg","prevMetadata","prevMsgType"],this.ruleNodeId,r,t,e).subscribe((e=>{e&&(this.generatorConfigForm.get(n).setValue(e),this.changeScript.emit())}))}onValidate(){this.generatorConfigForm.get("scriptLang").value===x.JS&&this.jsFuncComponent.validateOnSubmit()}}var vt;e("GeneratorConfigComponent",ht),ht.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:ht,deps:[{token:P.Store},{token:R.UntypedFormBuilder},{token:oe.NodeScriptTestService},{token:Z.TranslateService}],target:t.ɵɵFactoryTarget.Component}),ht.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:ht,selector:"tb-action-node-generator-config",viewQueries:[{propertyName:"jsFuncComponent",first:!0,predicate:["jsFuncComponent"],descendants:!0},{propertyName:"tbelFuncComponent",first:!0,predicate:["tbelFuncComponent"],descendants:!0}],usesInheritance:!0,ngImport:t,template:'<section [formGroup]="generatorConfigForm" fxLayout="column">\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.message-count</mat-label>\n    <input required type="number" min="0" step="1" matInput formControlName="msgCount">\n    <mat-error *ngIf="generatorConfigForm.get(\'msgCount\').hasError(\'required\')">\n      {{ \'tb.rulenode.message-count-required\' | translate }}\n    </mat-error>\n    <mat-error *ngIf="generatorConfigForm.get(\'msgCount\').hasError(\'min\')">\n      {{ \'tb.rulenode.min-message-count-message\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.period-seconds</mat-label>\n    <input required type="number" min="1" step="1" matInput formControlName="periodInSeconds">\n    <mat-error *ngIf="generatorConfigForm.get(\'periodInSeconds\').hasError(\'required\')">\n      {{ \'tb.rulenode.period-seconds-required\' | translate }}\n    </mat-error>\n    <mat-error *ngIf="generatorConfigForm.get(\'periodInSeconds\').hasError(\'min\')">\n      {{ \'tb.rulenode.min-period-seconds-message\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <div fxLayout="column">\n    <label class="tb-small">{{ \'tb.rulenode.originator\' | translate }}</label>\n    <tb-entity-select\n      required="false"\n      formControlName="originator">\n    </tb-entity-select>\n  </div>\n\n  <tb-script-lang formControlName="scriptLang" *ngIf="tbelEnabled"></tb-script-lang>\n  <tb-js-func *ngIf="generatorConfigForm.get(\'scriptLang\').value === scriptLanguage.JS"\n              #jsFuncComponent\n              formControlName="jsScript"\n              functionName="Generate"\n              [functionArgs]="[\'prevMsg\', \'prevMetadata\', \'prevMsgType\']"\n              helpId="rulenode/generator_node_script_fn"\n              noValidate="true">\n    <button toolbarSuffixButton\n            mat-icon-button\n            matTooltip="{{ testScriptLabel | translate }}"\n            matTooltipPosition="above"\n            class="tb-mat-32"\n            (click)="testScript()">\n      <mat-icon class="material-icons" color="primary">bug_report</mat-icon>\n    </button>\n  </tb-js-func>\n  <tb-js-func *ngIf="generatorConfigForm.get(\'scriptLang\').value === scriptLanguage.TBEL"\n              #tbelFuncComponent\n              formControlName="tbelScript"\n              functionName="Generate"\n              [functionArgs]="[\'prevMsg\', \'prevMetadata\', \'prevMsgType\']"\n              [disableUndefinedCheck]="true"\n              [scriptLanguage]="scriptLanguage.TBEL"\n              helpId="rulenode/tbel/generator_node_script_fn"\n              noValidate="true">\n    <button toolbarSuffixButton\n            mat-icon-button\n            matTooltip="{{ testScriptLabel | translate }}"\n            matTooltipPosition="above"\n            class="tb-mat-32"\n            (click)="testScript()">\n      <mat-icon class="material-icons" color="primary">bug_report</mat-icon>\n    </button>\n  </tb-js-func>\n  <div fxLayout="row" style="padding-bottom: 16px;">\n    <button mat-button mat-raised-button color="primary" (click)="testScript()">\n      {{ testScriptLabel | translate }}\n    </button>\n  </div>\n</section>\n',dependencies:[{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:Ce.EntitySelectComponent,selector:"tb-entity-select",inputs:["allowedEntityTypes","useAliasEntityTypes","required","disabled"]},{kind:"component",type:pe.JsFuncComponent,selector:"tb-js-func",inputs:["functionTitle","functionName","functionArgs","validationArgs","resultType","disabled","fillHeight","minHeight","editorCompleter","globalVariables","disableUndefinedCheck","helpId","scriptLanguage","hideBrackets","noValidate","required"]},{kind:"component",type:de.MatButton,selector:"    button[mat-button], button[mat-raised-button], button[mat-flat-button],    button[mat-stroked-button]  ",inputs:["disabled","disableRipple","color"],exportAs:["matButton"]},{kind:"component",type:de.MatIconButton,selector:"button[mat-icon-button]",inputs:["disabled","disableRipple","color"],exportAs:["matButton"]},{kind:"component",type:ue.MatIcon,selector:"mat-icon",inputs:["color","inline","svgIcon","fontSet","fontIcon"],exportAs:["matIcon"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"directive",type:ce.MatTooltip,selector:"[matTooltip]",exportAs:["matTooltip"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NumberValueAccessor,selector:"input[type=number][formControlName],input[type=number][formControl],input[type=number][ngModel]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.MinValidator,selector:"input[type=number][min][formControlName],input[type=number][min][formControl],input[type=number][min][ngModel]",inputs:["min"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"component",type:fe.TbScriptLangComponent,selector:"tb-script-lang",inputs:["disabled"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:ht,decorators:[{type:n,args:[{selector:"tb-action-node-generator-config",template:'<section [formGroup]="generatorConfigForm" fxLayout="column">\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.message-count</mat-label>\n    <input required type="number" min="0" step="1" matInput formControlName="msgCount">\n    <mat-error *ngIf="generatorConfigForm.get(\'msgCount\').hasError(\'required\')">\n      {{ \'tb.rulenode.message-count-required\' | translate }}\n    </mat-error>\n    <mat-error *ngIf="generatorConfigForm.get(\'msgCount\').hasError(\'min\')">\n      {{ \'tb.rulenode.min-message-count-message\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.period-seconds</mat-label>\n    <input required type="number" min="1" step="1" matInput formControlName="periodInSeconds">\n    <mat-error *ngIf="generatorConfigForm.get(\'periodInSeconds\').hasError(\'required\')">\n      {{ \'tb.rulenode.period-seconds-required\' | translate }}\n    </mat-error>\n    <mat-error *ngIf="generatorConfigForm.get(\'periodInSeconds\').hasError(\'min\')">\n      {{ \'tb.rulenode.min-period-seconds-message\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <div fxLayout="column">\n    <label class="tb-small">{{ \'tb.rulenode.originator\' | translate }}</label>\n    <tb-entity-select\n      required="false"\n      formControlName="originator">\n    </tb-entity-select>\n  </div>\n\n  <tb-script-lang formControlName="scriptLang" *ngIf="tbelEnabled"></tb-script-lang>\n  <tb-js-func *ngIf="generatorConfigForm.get(\'scriptLang\').value === scriptLanguage.JS"\n              #jsFuncComponent\n              formControlName="jsScript"\n              functionName="Generate"\n              [functionArgs]="[\'prevMsg\', \'prevMetadata\', \'prevMsgType\']"\n              helpId="rulenode/generator_node_script_fn"\n              noValidate="true">\n    <button toolbarSuffixButton\n            mat-icon-button\n            matTooltip="{{ testScriptLabel | translate }}"\n            matTooltipPosition="above"\n            class="tb-mat-32"\n            (click)="testScript()">\n      <mat-icon class="material-icons" color="primary">bug_report</mat-icon>\n    </button>\n  </tb-js-func>\n  <tb-js-func *ngIf="generatorConfigForm.get(\'scriptLang\').value === scriptLanguage.TBEL"\n              #tbelFuncComponent\n              formControlName="tbelScript"\n              functionName="Generate"\n              [functionArgs]="[\'prevMsg\', \'prevMetadata\', \'prevMsgType\']"\n              [disableUndefinedCheck]="true"\n              [scriptLanguage]="scriptLanguage.TBEL"\n              helpId="rulenode/tbel/generator_node_script_fn"\n              noValidate="true">\n    <button toolbarSuffixButton\n            mat-icon-button\n            matTooltip="{{ testScriptLabel | translate }}"\n            matTooltipPosition="above"\n            class="tb-mat-32"\n            (click)="testScript()">\n      <mat-icon class="material-icons" color="primary">bug_report</mat-icon>\n    </button>\n  </tb-js-func>\n  <div fxLayout="row" style="padding-bottom: 16px;">\n    <button mat-button mat-raised-button color="primary" (click)="testScript()">\n      {{ testScriptLabel | translate }}\n    </button>\n  </div>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder},{type:oe.NodeScriptTestService},{type:Z.TranslateService}]},propDecorators:{jsFuncComponent:[{type:o,args:["jsFuncComponent",{static:!1}]}],tbelFuncComponent:[{type:o,args:["tbelFuncComponent",{static:!1}]}]}}),function(e){e.CUSTOMER="CUSTOMER",e.TENANT="TENANT",e.RELATED="RELATED",e.ALARM_ORIGINATOR="ALARM_ORIGINATOR",e.ENTITY="ENTITY"}(vt||(vt={}));const Ct=new Map([[vt.CUSTOMER,"tb.rulenode.originator-customer"],[vt.TENANT,"tb.rulenode.originator-tenant"],[vt.RELATED,"tb.rulenode.originator-related"],[vt.ALARM_ORIGINATOR,"tb.rulenode.originator-alarm-originator"],[vt.ENTITY,"tb.rulenode.originator-entity"]]),Ft=new Map([[vt.CUSTOMER,"tb.rulenode.originator-customer-desc"],[vt.TENANT,"tb.rulenode.originator-tenant-desc"],[vt.RELATED,"tb.rulenode.originator-related-entity-desc"],[vt.ALARM_ORIGINATOR,"tb.rulenode.originator-alarm-originator-desc"],[vt.ENTITY,"tb.rulenode.originator-entity-by-name-pattern-desc"]]),kt=[k.createdTime,k.name,{value:"type",name:"tb.rulenode.profile-name",keyName:"originatorProfileName"},k.firstName,k.lastName,k.email,k.title,k.country,k.state,k.city,k.address,k.address2,k.zip,k.phone,k.label,{value:"id",name:"tb.rulenode.id",keyName:"id"},{value:"additionalInfo",name:"tb.rulenode.additional-info",keyName:"additionalInfo"}],Lt=new Map([["type","profileName"],["createdTime","createdTime"],["name","name"],["firstName","firstName"],["lastName","lastName"],["email","email"],["title","title"],["country","country"],["state","state"],["city","city"],["address","address"],["address2","address2"],["zip","zip"],["phone","phone"],["label","label"],["id","id"],["additionalInfo","additionalInfo"]]);var Tt;!function(e){e.CIRCLE="CIRCLE",e.POLYGON="POLYGON"}(Tt||(Tt={}));const It=new Map([[Tt.CIRCLE,"tb.rulenode.perimeter-circle"],[Tt.POLYGON,"tb.rulenode.perimeter-polygon"]]);var Nt;!function(e){e.MILLISECONDS="MILLISECONDS",e.SECONDS="SECONDS",e.MINUTES="MINUTES",e.HOURS="HOURS",e.DAYS="DAYS"}(Nt||(Nt={}));const St=new Map([[Nt.MILLISECONDS,"tb.rulenode.time-unit-milliseconds"],[Nt.SECONDS,"tb.rulenode.time-unit-seconds"],[Nt.MINUTES,"tb.rulenode.time-unit-minutes"],[Nt.HOURS,"tb.rulenode.time-unit-hours"],[Nt.DAYS,"tb.rulenode.time-unit-days"]]);var qt;!function(e){e.METER="METER",e.KILOMETER="KILOMETER",e.FOOT="FOOT",e.MILE="MILE",e.NAUTICAL_MILE="NAUTICAL_MILE"}(qt||(qt={}));const At=new Map([[qt.METER,"tb.rulenode.range-unit-meter"],[qt.KILOMETER,"tb.rulenode.range-unit-kilometer"],[qt.FOOT,"tb.rulenode.range-unit-foot"],[qt.MILE,"tb.rulenode.range-unit-mile"],[qt.NAUTICAL_MILE,"tb.rulenode.range-unit-nautical-mile"]]);var Mt;!function(e){e.ID="ID",e.TITLE="TITLE",e.COUNTRY="COUNTRY",e.STATE="STATE",e.CITY="CITY",e.ZIP="ZIP",e.ADDRESS="ADDRESS",e.ADDRESS2="ADDRESS2",e.PHONE="PHONE",e.EMAIL="EMAIL",e.ADDITIONAL_INFO="ADDITIONAL_INFO"}(Mt||(Mt={}));const Et=new Map([[Mt.ID,"tb.rulenode.entity-details-id"],[Mt.TITLE,"tb.rulenode.entity-details-title"],[Mt.COUNTRY,"tb.rulenode.entity-details-country"],[Mt.STATE,"tb.rulenode.entity-details-state"],[Mt.CITY,"tb.rulenode.entity-details-city"],[Mt.ZIP,"tb.rulenode.entity-details-zip"],[Mt.ADDRESS,"tb.rulenode.entity-details-address"],[Mt.ADDRESS2,"tb.rulenode.entity-details-address2"],[Mt.PHONE,"tb.rulenode.entity-details-phone"],[Mt.EMAIL,"tb.rulenode.entity-details-email"],[Mt.ADDITIONAL_INFO,"tb.rulenode.entity-details-additional_info"]]);var Gt;!function(e){e.FIRST="FIRST",e.LAST="LAST",e.ALL="ALL"}(Gt||(Gt={}));const Dt=new Map([[Gt.FIRST,"tb.rulenode.first"],[Gt.LAST,"tb.rulenode.last"],[Gt.ALL,"tb.rulenode.all"]]),wt=new Map([[Gt.FIRST,"tb.rulenode.first-mode-hint"],[Gt.LAST,"tb.rulenode.last-mode-hint"],[Gt.ALL,"tb.rulenode.all-mode-hint"]]);var Vt,Pt;!function(e){e.ASC="ASC",e.DESC="DESC"}(Vt||(Vt={})),function(e){e.ATTRIBUTES="ATTRIBUTES",e.LATEST_TELEMETRY="LATEST_TELEMETRY",e.FIELDS="FIELDS"}(Pt||(Pt={}));const Rt=new Map([[Pt.ATTRIBUTES,"tb.rulenode.attributes"],[Pt.LATEST_TELEMETRY,"tb.rulenode.latest-telemetry"],[Pt.FIELDS,"tb.rulenode.fields"]]),Ot=new Map([[Pt.ATTRIBUTES,"tb.rulenode.add-mapped-attribute-to"],[Pt.LATEST_TELEMETRY,"tb.rulenode.add-mapped-latest-telemetry-to"],[Pt.FIELDS,"tb.rulenode.add-mapped-fields-to"]]),_t=new Map([[Vt.ASC,"tb.rulenode.ascending"],[Vt.DESC,"tb.rulenode.descending"]]);var Bt;!function(e){e.STANDARD="STANDARD",e.FIFO="FIFO"}(Bt||(Bt={}));const Kt=new Map([[Bt.STANDARD,"tb.rulenode.sqs-queue-standard"],[Bt.FIFO,"tb.rulenode.sqs-queue-fifo"]]),zt=["anonymous","basic","cert.PEM"],Ut=new Map([["anonymous","tb.rulenode.credentials-anonymous"],["basic","tb.rulenode.credentials-basic"],["cert.PEM","tb.rulenode.credentials-pem"]]),Ht=["sas","cert.PEM"],jt=new Map([["sas","tb.rulenode.credentials-sas"],["cert.PEM","tb.rulenode.credentials-pem"]]);var $t;!function(e){e.GET="GET",e.POST="POST",e.PUT="PUT",e.DELETE="DELETE"}($t||($t={}));const Qt=["US-ASCII","ISO-8859-1","UTF-8","UTF-16BE","UTF-16LE","UTF-16"],Jt=new Map([["US-ASCII","tb.rulenode.charset-us-ascii"],["ISO-8859-1","tb.rulenode.charset-iso-8859-1"],["UTF-8","tb.rulenode.charset-utf-8"],["UTF-16BE","tb.rulenode.charset-utf-16be"],["UTF-16LE","tb.rulenode.charset-utf-16le"],["UTF-16","tb.rulenode.charset-utf-16"]]);var Yt;!function(e){e.CUSTOM="CUSTOM",e.ADD="ADD",e.SUB="SUB",e.MULT="MULT",e.DIV="DIV",e.SIN="SIN",e.SINH="SINH",e.COS="COS",e.COSH="COSH",e.TAN="TAN",e.TANH="TANH",e.ACOS="ACOS",e.ASIN="ASIN",e.ATAN="ATAN",e.ATAN2="ATAN2",e.EXP="EXP",e.EXPM1="EXPM1",e.SQRT="SQRT",e.CBRT="CBRT",e.GET_EXP="GET_EXP",e.HYPOT="HYPOT",e.LOG="LOG",e.LOG10="LOG10",e.LOG1P="LOG1P",e.CEIL="CEIL",e.FLOOR="FLOOR",e.FLOOR_DIV="FLOOR_DIV",e.FLOOR_MOD="FLOOR_MOD",e.ABS="ABS",e.MIN="MIN",e.MAX="MAX",e.POW="POW",e.SIGNUM="SIGNUM",e.RAD="RAD",e.DEG="DEG"}(Yt||(Yt={}));const Wt=new Map([[Yt.CUSTOM,{value:Yt.CUSTOM,name:"Custom Function",description:"Use this function to specify complex mathematical expression.",minArgs:1,maxArgs:16}],[Yt.ADD,{value:Yt.ADD,name:"Addition",description:"x + y",minArgs:2,maxArgs:2}],[Yt.SUB,{value:Yt.SUB,name:"Subtraction",description:"x - y",minArgs:2,maxArgs:2}],[Yt.MULT,{value:Yt.MULT,name:"Multiplication",description:"x * y",minArgs:2,maxArgs:2}],[Yt.DIV,{value:Yt.DIV,name:"Division",description:"x / y",minArgs:2,maxArgs:2}],[Yt.SIN,{value:Yt.SIN,name:"Sine",description:"Returns the trigonometric sine of an angle in radians.",minArgs:1,maxArgs:1}],[Yt.SINH,{value:Yt.SINH,name:"Hyperbolic sine",description:"Returns the hyperbolic sine of an argument.",minArgs:1,maxArgs:1}],[Yt.COS,{value:Yt.COS,name:"Cosine",description:"Returns the trigonometric cosine of an angle in radians.",minArgs:1,maxArgs:1}],[Yt.COSH,{value:Yt.COSH,name:"Hyperbolic cosine",description:"Returns the hyperbolic cosine of an argument.",minArgs:1,maxArgs:1}],[Yt.TAN,{value:Yt.TAN,name:"Tangent",description:"Returns the trigonometric tangent of an angle in radians",minArgs:1,maxArgs:1}],[Yt.TANH,{value:Yt.TANH,name:"Hyperbolic tangent",description:"Returns the hyperbolic tangent of an argument",minArgs:1,maxArgs:1}],[Yt.ACOS,{value:Yt.ACOS,name:"Arc cosine",description:"Returns the arc cosine of an argument",minArgs:1,maxArgs:1}],[Yt.ASIN,{value:Yt.ASIN,name:"Arc sine",description:"Returns the arc sine of an argument",minArgs:1,maxArgs:1}],[Yt.ATAN,{value:Yt.ATAN,name:"Arc tangent",description:"Returns the arc tangent of an argument",minArgs:1,maxArgs:1}],[Yt.ATAN2,{value:Yt.ATAN2,name:"2-argument arc tangent",description:"Returns the angle theta from the conversion of rectangular coordinates (x, y) to polar coordinates (r, theta)",minArgs:2,maxArgs:2}],[Yt.EXP,{value:Yt.EXP,name:"Exponential",description:"Returns Euler's number e raised to the power of an argument",minArgs:1,maxArgs:1}],[Yt.EXPM1,{value:Yt.EXPM1,name:"Exponential minus one",description:"Returns Euler's number e raised to the power of an argument minus one",minArgs:1,maxArgs:1}],[Yt.SQRT,{value:Yt.SQRT,name:"Square",description:"Returns the correctly rounded positive square root of an argument",minArgs:1,maxArgs:1}],[Yt.CBRT,{value:Yt.CBRT,name:"Cube root",description:"Returns the cube root of an argument",minArgs:1,maxArgs:1}],[Yt.GET_EXP,{value:Yt.GET_EXP,name:"Get exponent",description:"Returns the unbiased exponent used in the representation of an argument",minArgs:1,maxArgs:1}],[Yt.HYPOT,{value:Yt.HYPOT,name:"Square root",description:"Returns the square root of the squares of the arguments",minArgs:2,maxArgs:2}],[Yt.LOG,{value:Yt.LOG,name:"Logarithm",description:"Returns the natural logarithm of an argument",minArgs:1,maxArgs:1}],[Yt.LOG10,{value:Yt.LOG10,name:"Base 10 logarithm",description:"Returns the base 10 logarithm of an argument",minArgs:1,maxArgs:1}],[Yt.LOG1P,{value:Yt.LOG1P,name:"Logarithm of the sum",description:"Returns the natural logarithm of the sum of an argument",minArgs:1,maxArgs:1}],[Yt.CEIL,{value:Yt.CEIL,name:"Ceiling",description:"Returns the smallest (closest to negative infinity) of an argument",minArgs:1,maxArgs:1}],[Yt.FLOOR,{value:Yt.FLOOR,name:"Floor",description:"Returns the largest (closest to positive infinity) of an argument",minArgs:1,maxArgs:1}],[Yt.FLOOR_DIV,{value:Yt.FLOOR_DIV,name:"Floor division",description:"Returns the largest (closest to positive infinity) of the arguments",minArgs:2,maxArgs:2}],[Yt.FLOOR_MOD,{value:Yt.FLOOR_MOD,name:"Floor modulus",description:"Returns the floor modulus of the arguments",minArgs:2,maxArgs:2}],[Yt.ABS,{value:Yt.ABS,name:"Absolute",description:"Returns the absolute value of an argument",minArgs:1,maxArgs:1}],[Yt.MIN,{value:Yt.MIN,name:"Min",description:"Returns the smaller of the arguments",minArgs:2,maxArgs:2}],[Yt.MAX,{value:Yt.MAX,name:"Max",description:"Returns the greater of the arguments",minArgs:2,maxArgs:2}],[Yt.POW,{value:Yt.POW,name:"Raise to a power",description:"Returns the value of the first argument raised to the power of the second argument",minArgs:2,maxArgs:2}],[Yt.SIGNUM,{value:Yt.SIGNUM,name:"Sign of a real number",description:"Returns the signum function of the argument",minArgs:1,maxArgs:1}],[Yt.RAD,{value:Yt.RAD,name:"Radian",description:"Converts an angle measured in degrees to an approximately equivalent angle measured in radians",minArgs:1,maxArgs:1}],[Yt.DEG,{value:Yt.DEG,name:"Degrees",description:"Converts an angle measured in radians to an approximately equivalent angle measured in degrees.",minArgs:1,maxArgs:1}]]);var Zt,Xt,en;!function(e){e.MESSAGE_BODY="MESSAGE_BODY",e.MESSAGE_METADATA="MESSAGE_METADATA",e.ATTRIBUTE="ATTRIBUTE",e.TIME_SERIES="TIME_SERIES",e.CONSTANT="CONSTANT"}(Zt||(Zt={})),function(e){e.MESSAGE_BODY="MESSAGE_BODY",e.MESSAGE_METADATA="MESSAGE_METADATA",e.ATTRIBUTE="ATTRIBUTE",e.TIME_SERIES="TIME_SERIES"}(Xt||(Xt={})),function(e){e.DATA="DATA",e.METADATA="METADATA"}(en||(en={}));const tn=new Map([[en.DATA,"tb.rulenode.message-to-metadata"],[en.METADATA,"tb.rulenode.metadata-to-message"]]),nn=(new Map([[en.DATA,"tb.rulenode.from-message"],[en.METADATA,"tb.rulenode.from-metadata"]]),new Map([[en.DATA,"tb.rulenode.message"],[en.METADATA,"tb.rulenode.metadata"]])),rn=new Map([[en.DATA,"tb.rulenode.message"],[en.METADATA,"tb.rulenode.message-metadata"]]),on=new Map([[Zt.MESSAGE_BODY,{name:"tb.rulenode.message-body-type",description:"Fetch argument value from incoming message"}],[Zt.MESSAGE_METADATA,{name:"tb.rulenode.message-metadata-type",description:"Fetch argument value from incoming message metadata"}],[Zt.ATTRIBUTE,{name:"tb.rulenode.attribute-type",description:"Fetch attribute value from database"}],[Zt.TIME_SERIES,{name:"tb.rulenode.time-series-type",description:"Fetch latest time-series value from database"}],[Zt.CONSTANT,{name:"tb.rulenode.constant-type",description:"Define constant value"}]]),an=new Map([[Xt.MESSAGE_BODY,{name:"tb.rulenode.message-body-type",description:"Add result to the outgoing message"}],[Xt.MESSAGE_METADATA,{name:"tb.rulenode.message-metadata-type",description:"Add result to the outgoing message metadata"}],[Xt.ATTRIBUTE,{name:"tb.rulenode.attribute-type",description:"Store result as an entity attribute in the database"}],[Xt.TIME_SERIES,{name:"tb.rulenode.time-series-type",description:"Store result as an entity time-series in the database"}]]),ln=["x","y","z","a","b","c","d","k","l","m","n","o","p","r","s","t"];var sn,mn;!function(e){e.SHARED_SCOPE="SHARED_SCOPE",e.SERVER_SCOPE="SERVER_SCOPE",e.CLIENT_SCOPE="CLIENT_SCOPE"}(sn||(sn={})),function(e){e.SHARED_SCOPE="SHARED_SCOPE",e.SERVER_SCOPE="SERVER_SCOPE"}(mn||(mn={}));const pn=new Map([[sn.SHARED_SCOPE,"tb.rulenode.shared-scope"],[sn.SERVER_SCOPE,"tb.rulenode.server-scope"],[sn.CLIENT_SCOPE,"tb.rulenode.client-scope"]]);var dn;!function(e){e.ON_FIRST_MESSAGE="ON_FIRST_MESSAGE",e.ON_EACH_MESSAGE="ON_EACH_MESSAGE"}(dn||(dn={}));const un=new Map([[dn.ON_EACH_MESSAGE,{value:!0,name:"tb.rulenode.presence-monitoring-strategy-on-each-message"}],[dn.ON_FIRST_MESSAGE,{value:!1,name:"tb.rulenode.presence-monitoring-strategy-on-first-message"}]]);class cn extends f{constructor(e,t){super(e),this.store=e,this.fb=t,this.perimeterType=Tt,this.perimeterTypes=Object.keys(Tt),this.perimeterTypeTranslationMap=It,this.rangeUnits=Object.keys(qt),this.rangeUnitTranslationMap=At,this.presenceMonitoringStrategies=un,this.presenceMonitoringStrategyKeys=Array.from(this.presenceMonitoringStrategies.keys()),this.timeUnits=Object.keys(Nt),this.timeUnitsTranslationMap=St,this.defaultPaddingEnable=!0}configForm(){return this.geoActionConfigForm}onConfigurationSet(e){this.geoActionConfigForm=this.fb.group({reportPresenceStatusOnEachMessage:[!e||e.reportPresenceStatusOnEachMessage,[O.required]],latitudeKeyName:[e?e.latitudeKeyName:null,[O.required]],longitudeKeyName:[e?e.longitudeKeyName:null,[O.required]],perimeterType:[e?e.perimeterType:null,[O.required]],fetchPerimeterInfoFromMessageMetadata:[!!e&&e.fetchPerimeterInfoFromMessageMetadata,[]],perimeterKeyName:[e?e.perimeterKeyName:null,[]],centerLatitude:[e?e.centerLatitude:null,[]],centerLongitude:[e?e.centerLatitude:null,[]],range:[e?e.range:null,[]],rangeUnit:[e?e.rangeUnit:null,[]],polygonsDefinition:[e?e.polygonsDefinition:null,[]],minInsideDuration:[e?e.minInsideDuration:null,[O.required,O.min(1),O.max(2147483647)]],minInsideDurationTimeUnit:[e?e.minInsideDurationTimeUnit:null,[O.required]],minOutsideDuration:[e?e.minOutsideDuration:null,[O.required,O.min(1),O.max(2147483647)]],minOutsideDurationTimeUnit:[e?e.minOutsideDurationTimeUnit:null,[O.required]]})}validatorTriggers(){return["fetchPerimeterInfoFromMessageMetadata","perimeterType"]}updateValidators(e){const t=this.geoActionConfigForm.get("fetchPerimeterInfoFromMessageMetadata").value,n=this.geoActionConfigForm.get("perimeterType").value;t?this.geoActionConfigForm.get("perimeterKeyName").setValidators([O.required]):this.geoActionConfigForm.get("perimeterKeyName").setValidators([]),t||n!==Tt.CIRCLE?(this.geoActionConfigForm.get("centerLatitude").setValidators([]),this.geoActionConfigForm.get("centerLongitude").setValidators([]),this.geoActionConfigForm.get("range").setValidators([]),this.geoActionConfigForm.get("rangeUnit").setValidators([]),this.defaultPaddingEnable=!0):(this.geoActionConfigForm.get("centerLatitude").setValidators([O.required,O.min(-90),O.max(90)]),this.geoActionConfigForm.get("centerLongitude").setValidators([O.required,O.min(-180),O.max(180)]),this.geoActionConfigForm.get("range").setValidators([O.required,O.min(0)]),this.geoActionConfigForm.get("rangeUnit").setValidators([O.required]),this.defaultPaddingEnable=!1),t||n!==Tt.POLYGON?this.geoActionConfigForm.get("polygonsDefinition").setValidators([]):this.geoActionConfigForm.get("polygonsDefinition").setValidators([O.required]),this.geoActionConfigForm.get("perimeterKeyName").updateValueAndValidity({emitEvent:e}),this.geoActionConfigForm.get("centerLatitude").updateValueAndValidity({emitEvent:e}),this.geoActionConfigForm.get("centerLongitude").updateValueAndValidity({emitEvent:e}),this.geoActionConfigForm.get("range").updateValueAndValidity({emitEvent:e}),this.geoActionConfigForm.get("rangeUnit").updateValueAndValidity({emitEvent:e}),this.geoActionConfigForm.get("polygonsDefinition").updateValueAndValidity({emitEvent:e})}}e("GpsGeoActionConfigComponent",cn),cn.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:cn,deps:[{token:P.Store},{token:R.UntypedFormBuilder}],target:t.ɵɵFactoryTarget.Component}),cn.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:cn,selector:"tb-action-node-gps-geofencing-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="geoActionConfigForm" class="tb-form-panel no-border no-padding">\n  <section class="tb-form-panel stroked">\n    <div class="tb-form-panel-title" translate>tb.rulenode.coordinate-field-names</div>\n    <section>\n      <div fxLayout="row" fxLayoutGap="16px">\n        <mat-form-field fxFlex="50" class="mat-block">\n          <mat-label>{{ \'tb.rulenode.latitude-field-name\' | translate }}</mat-label>\n          <input matInput formControlName="latitudeKeyName" required>\n          <mat-error *ngIf="geoActionConfigForm.get(\'latitudeKeyName\').hasError(\'required\')">\n            {{ \'tb.rulenode.latitude-field-name-required\' | translate }}\n          </mat-error>\n        </mat-form-field>\n        <mat-form-field fxFlex="50" class="mat-block">\n          <mat-label>{{ \'tb.rulenode.longitude-field-name\' | translate }}</mat-label>\n          <input matInput formControlName="longitudeKeyName" required>\n          <mat-error *ngIf="geoActionConfigForm.get(\'longitudeKeyName\').hasError(\'required\')">\n            {{ \'tb.rulenode.longitude-field-name-required\' | translate }}\n          </mat-error>\n        </mat-form-field>\n      </div>\n      <div class="tb-form-hint tb-primary-fill" translate>tb.rulenode.coordinate-field-hint</div>\n    </section>\n  </section>\n  <section class="tb-form-panel stroked" [class.no-padding-bottom]="!defaultPaddingEnable">\n    <div class="tb-form-panel-title" translate>tb.rulenode.geofence-configuration</div>\n    <section fxLayout="column">\n      <mat-form-field fxFlex class="mat-block" hideRequiredMarker>\n        <mat-label>{{ \'tb.rulenode.perimeter-type\' | translate }}</mat-label>\n        <mat-select formControlName="perimeterType">\n          <mat-option *ngFor="let type of perimeterTypes" [value]="type">\n            {{ perimeterTypeTranslationMap.get(type) | translate }}\n          </mat-option>\n        </mat-select>\n      </mat-form-field>\n      <div tb-hint-tooltip-icon="{{ geoActionConfigForm.get(\'perimeterType\').value === perimeterType.CIRCLE\n        ? (\'tb.rulenode.fetch-circle-parameter-info-from-metadata-hint\'\n            | translate : { perimeterKeyName: geoActionConfigForm.get(\'perimeterKeyName\').valid\n                              ? geoActionConfigForm.get(\'perimeterKeyName\').value\n                              : \'ss_perimeter\'})\n        : (\'tb.rulenode.fetch-poligon-parameter-info-from-metadata-hint\'\n            | translate : { perimeterKeyName: geoActionConfigForm.get(\'perimeterKeyName\').valid\n                              ? geoActionConfigForm.get(\'perimeterKeyName\').value\n                              : \'ss_perimeter\'}) }}"\n           class="tb-form-row no-border no-padding slide-toggle">\n        <mat-slide-toggle class="mat-slide" formControlName="fetchPerimeterInfoFromMessageMetadata">\n          {{ \'tb.rulenode.fetch-perimeter-info-from-metadata\' | translate }}\n        </mat-slide-toggle>\n      </div>\n      <mat-form-field *ngIf="geoActionConfigForm.get(\'fetchPerimeterInfoFromMessageMetadata\').value" class="mat-block">\n        <mat-label>{{ \'tb.rulenode.perimeter-key-name\' | translate }}</mat-label>\n        <input matInput formControlName="perimeterKeyName" required>\n        <mat-error *ngIf="geoActionConfigForm.get(\'perimeterKeyName\').hasError(\'required\')">\n          {{ \'tb.rulenode.perimeter-key-name-required\' | translate }}\n        </mat-error>\n        <mat-hint>{{ \'tb.rulenode.perimeter-key-name-hint\' | translate }}</mat-hint>\n      </mat-form-field>\n      <div fxLayout="column"\n           *ngIf="geoActionConfigForm.get(\'perimeterType\').value === perimeterType.CIRCLE &&\n              !geoActionConfigForm.get(\'fetchPerimeterInfoFromMessageMetadata\').value">\n        <div fxLayout="row" fxLayoutGap="16px">\n          <mat-form-field fxFlex>\n            <mat-label>{{ \'tb.rulenode.circle-center-latitude\' | translate }}</mat-label>\n            <input type="number" min="-90" max="90" step="0.1" matInput formControlName="centerLatitude" required>\n            <mat-error *ngIf="geoActionConfigForm.get(\'centerLatitude\').hasError(\'required\')">\n              {{ \'tb.rulenode.circle-center-latitude-required\' | translate }}\n            </mat-error>\n          </mat-form-field>\n          <mat-form-field fxFlex>\n            <mat-label>{{ \'tb.rulenode.circle-center-longitude\' | translate }}</mat-label>\n            <input type="number" min="-180" max="180" step="0.1" matInput formControlName="centerLongitude" required>\n            <mat-error *ngIf="geoActionConfigForm.get(\'centerLongitude\').hasError(\'required\')">\n              {{ \'tb.rulenode.circle-center-longitude-required\' | translate }}\n            </mat-error>\n          </mat-form-field>\n        </div>\n        <div fxLayout="row" fxLayoutGap="16px">\n          <mat-form-field fxFlex>\n            <mat-label>{{ \'tb.rulenode.range\' | translate }}</mat-label>\n            <input type="number" min="0" step="0.1" matInput formControlName="range" required>\n            <mat-error *ngIf="geoActionConfigForm.get(\'range\').hasError(\'required\')">\n              {{ \'tb.rulenode.range-required\' | translate }}\n            </mat-error>\n          </mat-form-field>\n          <mat-form-field fxFlex>\n            <mat-label>{{ \'tb.rulenode.range-units\' | translate }}</mat-label>\n            <mat-select formControlName="rangeUnit" required>\n              <mat-option *ngFor="let type of rangeUnits" [value]="type">\n                {{ rangeUnitTranslationMap.get(type) | translate }}\n              </mat-option>\n            </mat-select>\n            <mat-error *ngIf="geoActionConfigForm.get(\'rangeUnit\').hasError(\'required\')">\n              {{ \'tb.rulenode.range-units-required\' | translate }}\n            </mat-error>\n          </mat-form-field>\n        </div>\n      </div>\n      <div fxLayout="column" *ngIf="geoActionConfigForm.get(\'perimeterType\').value === perimeterType.POLYGON &&\n                                 !geoActionConfigForm.get(\'fetchPerimeterInfoFromMessageMetadata\').value">\n        <mat-form-field class="mat-block" subscriptSizing="dynamic">\n          <mat-label translate>tb.rulenode.polygon-definition</mat-label>\n          <input matInput formControlName="polygonsDefinition" required>\n          <mat-icon matSuffix class="margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon"\n                    color="primary"\n                    matTooltip="{{ \'tb.rulenode.polygon-definition-hint\' | translate }}">\n            help\n          </mat-icon>\n          <mat-error *ngIf="geoActionConfigForm.get(\'polygonsDefinition\').hasError(\'required\')">\n            {{ \'tb.rulenode.polygon-definition-required\' | translate }}\n          </mat-error>\n        </mat-form-field>\n      </div>\n    </section>\n  </section>\n  <section class="tb-form-panel stroked no-padding-bottom">\n    <div fxLayout="column" fxLayout.gt-sm="row"  fxLayoutGap.lt-md="16px" fxLayoutAlign="space-between">\n      <div class="tb-form-panel-title">{{ \'tb.rulenode.presence-monitoring-strategy\' | translate }}</div>\n      <tb-toggle-select class="fetch-to-data-toggle" formControlName="reportPresenceStatusOnEachMessage" appearance="fill" >\n        <tb-toggle-option *ngFor="let strategy of presenceMonitoringStrategyKeys" [value]="presenceMonitoringStrategies.get(strategy).value">\n          {{ presenceMonitoringStrategies.get(strategy).name | translate }}\n        </tb-toggle-option>\n      </tb-toggle-select>\n    </div>\n    <div class="tb-form-hint tb-primary-fill"> {{ geoActionConfigForm.get(\'reportPresenceStatusOnEachMessage\').value === false ?\n        (\'tb.rulenode.presence-monitoring-strategy-on-first-message-hint\' | translate) :\n        (\'tb.rulenode.presence-monitoring-strategy-on-each-message-hint\' | translate) }}\n    </div>\n    <section fxLayout="column">\n      <div *ngIf="geoActionConfigForm.get(\'reportPresenceStatusOnEachMessage\').value === false">\n        <div fxLayout="column" fxLayout.gt-sm="row" fxLayoutGap.gt-sm="8px">\n          <mat-form-field fxFlex class="mat-block">\n            <mat-label translate>tb.rulenode.min-inside-duration</mat-label>\n            <input type="number" step="1" min="1" max="2147483647" matInput formControlName="minInsideDuration" required>\n            <mat-error *ngIf="geoActionConfigForm.get(\'minInsideDuration\').hasError(\'required\')">\n              {{ \'tb.rulenode.min-inside-duration-value-required\' | translate }}\n            </mat-error>\n            <mat-error *ngIf="geoActionConfigForm.get(\'minInsideDuration\').hasError(\'min\')">\n              {{ \'tb.rulenode.time-value-range\' | translate }}\n            </mat-error>\n            <mat-error *ngIf="geoActionConfigForm.get(\'minInsideDuration\').hasError(\'max\')">\n              {{ \'tb.rulenode.time-value-range\' | translate }}\n            </mat-error>\n          </mat-form-field>\n          <mat-form-field fxFlex class="mat-block">\n            <mat-label translate>tb.rulenode.min-inside-duration-time-unit</mat-label>\n            <mat-select formControlName="minInsideDurationTimeUnit" required>\n              <mat-option *ngFor="let timeUnit of timeUnits" [value]="timeUnit">\n                {{ timeUnitsTranslationMap.get(timeUnit) | translate }}\n              </mat-option>\n            </mat-select>\n          </mat-form-field>\n        </div>\n        <div fxLayout="column" fxLayout.gt-sm="row" fxLayoutGap.gt-sm="8px">\n          <mat-form-field fxFlex class="mat-block">\n            <mat-label translate>tb.rulenode.min-outside-duration</mat-label>\n            <input type="number" step="1" min="1" max="2147483647" matInput formControlName="minOutsideDuration" required>\n            <mat-error *ngIf="geoActionConfigForm.get(\'minOutsideDuration\').hasError(\'required\')">\n              {{ \'tb.rulenode.min-outside-duration-value-required\' | translate }}\n            </mat-error>\n            <mat-error *ngIf="geoActionConfigForm.get(\'minOutsideDuration\').hasError(\'min\')">\n              {{ \'tb.rulenode.time-value-range\' | translate }}\n            </mat-error>\n            <mat-error *ngIf="geoActionConfigForm.get(\'minOutsideDuration\').hasError(\'max\')">\n              {{ \'tb.rulenode.time-value-range\' | translate }}\n            </mat-error>\n          </mat-form-field>\n          <mat-form-field fxFlex class="mat-block">\n            <mat-label translate>tb.rulenode.min-outside-duration-time-unit</mat-label>\n            <mat-select formControlName="minOutsideDurationTimeUnit" required>\n              <mat-option *ngFor="let timeUnit of timeUnits" [value]="timeUnit">\n                {{ timeUnitsTranslationMap.get(timeUnit) | translate }}\n              </mat-option>\n            </mat-select>\n          </mat-form-field>\n        </div>\n      </div>\n    </section>\n  </section>\n</section>\n',styles:[":host .slide-toggle{margin-bottom:18px}\n",':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n'],dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:ue.MatIcon,selector:"mat-icon",inputs:["color","inline","svgIcon","fontSet","fontIcon"],exportAs:["matIcon"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatHint,selector:"mat-hint",inputs:["align","id"]},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"directive",type:Y.MatSuffix,selector:"[matSuffix], [matIconSuffix], [matTextSuffix]",inputs:["matTextSuffix"]},{kind:"component",type:X.MatSelect,selector:"mat-select",inputs:["disabled","disableRipple","tabIndex","hideSingleSelectionIndicator"],exportAs:["matSelect"]},{kind:"component",type:ee.MatOption,selector:"mat-option",exportAs:["matOption"]},{kind:"directive",type:ce.MatTooltip,selector:"[matTooltip]",exportAs:["matTooltip"]},{kind:"component",type:te.MatSlideToggle,selector:"mat-slide-toggle",inputs:["disabled","disableRipple","color","tabIndex"],exportAs:["matSlideToggle"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:W.DefaultLayoutGapDirective,selector:"  [fxLayoutGap], [fxLayoutGap.xs], [fxLayoutGap.sm], [fxLayoutGap.md],  [fxLayoutGap.lg], [fxLayoutGap.xl], [fxLayoutGap.lt-sm], [fxLayoutGap.lt-md],  [fxLayoutGap.lt-lg], [fxLayoutGap.lt-xl], [fxLayoutGap.gt-xs], [fxLayoutGap.gt-sm],  [fxLayoutGap.gt-md], [fxLayoutGap.gt-lg]",inputs:["fxLayoutGap","fxLayoutGap.xs","fxLayoutGap.sm","fxLayoutGap.md","fxLayoutGap.lg","fxLayoutGap.xl","fxLayoutGap.lt-sm","fxLayoutGap.lt-md","fxLayoutGap.lt-lg","fxLayoutGap.lt-xl","fxLayoutGap.gt-xs","fxLayoutGap.gt-sm","fxLayoutGap.gt-md","fxLayoutGap.gt-lg"]},{kind:"directive",type:W.DefaultLayoutAlignDirective,selector:"  [fxLayoutAlign], [fxLayoutAlign.xs], [fxLayoutAlign.sm], [fxLayoutAlign.md],  [fxLayoutAlign.lg], [fxLayoutAlign.xl], [fxLayoutAlign.lt-sm], [fxLayoutAlign.lt-md],  [fxLayoutAlign.lt-lg], [fxLayoutAlign.lt-xl], [fxLayoutAlign.gt-xs], [fxLayoutAlign.gt-sm],  [fxLayoutAlign.gt-md], [fxLayoutAlign.gt-lg]",inputs:["fxLayoutAlign","fxLayoutAlign.xs","fxLayoutAlign.sm","fxLayoutAlign.md","fxLayoutAlign.lg","fxLayoutAlign.xl","fxLayoutAlign.lt-sm","fxLayoutAlign.lt-md","fxLayoutAlign.lt-lg","fxLayoutAlign.lt-xl","fxLayoutAlign.gt-xs","fxLayoutAlign.gt-sm","fxLayoutAlign.gt-md","fxLayoutAlign.gt-lg"]},{kind:"directive",type:W.DefaultFlexDirective,selector:"  [fxFlex], [fxFlex.xs], [fxFlex.sm], [fxFlex.md],  [fxFlex.lg], [fxFlex.xl], [fxFlex.lt-sm], [fxFlex.lt-md],  [fxFlex.lt-lg], [fxFlex.lt-xl], [fxFlex.gt-xs], [fxFlex.gt-sm],  [fxFlex.gt-md], [fxFlex.gt-lg]",inputs:["fxFlex","fxFlex.xs","fxFlex.sm","fxFlex.md","fxFlex.lg","fxFlex.xl","fxFlex.lt-sm","fxFlex.lt-md","fxFlex.lt-lg","fxFlex.lt-xl","fxFlex.gt-xs","fxFlex.gt-sm","fxFlex.gt-md","fxFlex.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NumberValueAccessor,selector:"input[type=number][formControlName],input[type=number][formControl],input[type=number][ngModel]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.MinValidator,selector:"input[type=number][min][formControlName],input[type=number][min][formControl],input[type=number][min][ngModel]",inputs:["min"]},{kind:"directive",type:R.MaxValidator,selector:"input[type=number][max][formControlName],input[type=number][max][formControl],input[type=number][max][ngModel]",inputs:["max"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"directive",type:Fe.ToggleOption,selector:"tb-toggle-option",inputs:["value"]},{kind:"component",type:ke.ToggleSelectComponent,selector:"tb-toggle-select",inputs:["disabled","selectMediaBreakpoint","appearance","disablePagination"]},{kind:"component",type:ne.HintTooltipIconComponent,selector:"[tb-hint-tooltip-icon]",inputs:["tb-hint-tooltip-icon","tooltipPosition","hintIcon"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:cn,decorators:[{type:n,args:[{selector:"tb-action-node-gps-geofencing-config",template:'<section [formGroup]="geoActionConfigForm" class="tb-form-panel no-border no-padding">\n  <section class="tb-form-panel stroked">\n    <div class="tb-form-panel-title" translate>tb.rulenode.coordinate-field-names</div>\n    <section>\n      <div fxLayout="row" fxLayoutGap="16px">\n        <mat-form-field fxFlex="50" class="mat-block">\n          <mat-label>{{ \'tb.rulenode.latitude-field-name\' | translate }}</mat-label>\n          <input matInput formControlName="latitudeKeyName" required>\n          <mat-error *ngIf="geoActionConfigForm.get(\'latitudeKeyName\').hasError(\'required\')">\n            {{ \'tb.rulenode.latitude-field-name-required\' | translate }}\n          </mat-error>\n        </mat-form-field>\n        <mat-form-field fxFlex="50" class="mat-block">\n          <mat-label>{{ \'tb.rulenode.longitude-field-name\' | translate }}</mat-label>\n          <input matInput formControlName="longitudeKeyName" required>\n          <mat-error *ngIf="geoActionConfigForm.get(\'longitudeKeyName\').hasError(\'required\')">\n            {{ \'tb.rulenode.longitude-field-name-required\' | translate }}\n          </mat-error>\n        </mat-form-field>\n      </div>\n      <div class="tb-form-hint tb-primary-fill" translate>tb.rulenode.coordinate-field-hint</div>\n    </section>\n  </section>\n  <section class="tb-form-panel stroked" [class.no-padding-bottom]="!defaultPaddingEnable">\n    <div class="tb-form-panel-title" translate>tb.rulenode.geofence-configuration</div>\n    <section fxLayout="column">\n      <mat-form-field fxFlex class="mat-block" hideRequiredMarker>\n        <mat-label>{{ \'tb.rulenode.perimeter-type\' | translate }}</mat-label>\n        <mat-select formControlName="perimeterType">\n          <mat-option *ngFor="let type of perimeterTypes" [value]="type">\n            {{ perimeterTypeTranslationMap.get(type) | translate }}\n          </mat-option>\n        </mat-select>\n      </mat-form-field>\n      <div tb-hint-tooltip-icon="{{ geoActionConfigForm.get(\'perimeterType\').value === perimeterType.CIRCLE\n        ? (\'tb.rulenode.fetch-circle-parameter-info-from-metadata-hint\'\n            | translate : { perimeterKeyName: geoActionConfigForm.get(\'perimeterKeyName\').valid\n                              ? geoActionConfigForm.get(\'perimeterKeyName\').value\n                              : \'ss_perimeter\'})\n        : (\'tb.rulenode.fetch-poligon-parameter-info-from-metadata-hint\'\n            | translate : { perimeterKeyName: geoActionConfigForm.get(\'perimeterKeyName\').valid\n                              ? geoActionConfigForm.get(\'perimeterKeyName\').value\n                              : \'ss_perimeter\'}) }}"\n           class="tb-form-row no-border no-padding slide-toggle">\n        <mat-slide-toggle class="mat-slide" formControlName="fetchPerimeterInfoFromMessageMetadata">\n          {{ \'tb.rulenode.fetch-perimeter-info-from-metadata\' | translate }}\n        </mat-slide-toggle>\n      </div>\n      <mat-form-field *ngIf="geoActionConfigForm.get(\'fetchPerimeterInfoFromMessageMetadata\').value" class="mat-block">\n        <mat-label>{{ \'tb.rulenode.perimeter-key-name\' | translate }}</mat-label>\n        <input matInput formControlName="perimeterKeyName" required>\n        <mat-error *ngIf="geoActionConfigForm.get(\'perimeterKeyName\').hasError(\'required\')">\n          {{ \'tb.rulenode.perimeter-key-name-required\' | translate }}\n        </mat-error>\n        <mat-hint>{{ \'tb.rulenode.perimeter-key-name-hint\' | translate }}</mat-hint>\n      </mat-form-field>\n      <div fxLayout="column"\n           *ngIf="geoActionConfigForm.get(\'perimeterType\').value === perimeterType.CIRCLE &&\n              !geoActionConfigForm.get(\'fetchPerimeterInfoFromMessageMetadata\').value">\n        <div fxLayout="row" fxLayoutGap="16px">\n          <mat-form-field fxFlex>\n            <mat-label>{{ \'tb.rulenode.circle-center-latitude\' | translate }}</mat-label>\n            <input type="number" min="-90" max="90" step="0.1" matInput formControlName="centerLatitude" required>\n            <mat-error *ngIf="geoActionConfigForm.get(\'centerLatitude\').hasError(\'required\')">\n              {{ \'tb.rulenode.circle-center-latitude-required\' | translate }}\n            </mat-error>\n          </mat-form-field>\n          <mat-form-field fxFlex>\n            <mat-label>{{ \'tb.rulenode.circle-center-longitude\' | translate }}</mat-label>\n            <input type="number" min="-180" max="180" step="0.1" matInput formControlName="centerLongitude" required>\n            <mat-error *ngIf="geoActionConfigForm.get(\'centerLongitude\').hasError(\'required\')">\n              {{ \'tb.rulenode.circle-center-longitude-required\' | translate }}\n            </mat-error>\n          </mat-form-field>\n        </div>\n        <div fxLayout="row" fxLayoutGap="16px">\n          <mat-form-field fxFlex>\n            <mat-label>{{ \'tb.rulenode.range\' | translate }}</mat-label>\n            <input type="number" min="0" step="0.1" matInput formControlName="range" required>\n            <mat-error *ngIf="geoActionConfigForm.get(\'range\').hasError(\'required\')">\n              {{ \'tb.rulenode.range-required\' | translate }}\n            </mat-error>\n          </mat-form-field>\n          <mat-form-field fxFlex>\n            <mat-label>{{ \'tb.rulenode.range-units\' | translate }}</mat-label>\n            <mat-select formControlName="rangeUnit" required>\n              <mat-option *ngFor="let type of rangeUnits" [value]="type">\n                {{ rangeUnitTranslationMap.get(type) | translate }}\n              </mat-option>\n            </mat-select>\n            <mat-error *ngIf="geoActionConfigForm.get(\'rangeUnit\').hasError(\'required\')">\n              {{ \'tb.rulenode.range-units-required\' | translate }}\n            </mat-error>\n          </mat-form-field>\n        </div>\n      </div>\n      <div fxLayout="column" *ngIf="geoActionConfigForm.get(\'perimeterType\').value === perimeterType.POLYGON &&\n                                 !geoActionConfigForm.get(\'fetchPerimeterInfoFromMessageMetadata\').value">\n        <mat-form-field class="mat-block" subscriptSizing="dynamic">\n          <mat-label translate>tb.rulenode.polygon-definition</mat-label>\n          <input matInput formControlName="polygonsDefinition" required>\n          <mat-icon matSuffix class="margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon"\n                    color="primary"\n                    matTooltip="{{ \'tb.rulenode.polygon-definition-hint\' | translate }}">\n            help\n          </mat-icon>\n          <mat-error *ngIf="geoActionConfigForm.get(\'polygonsDefinition\').hasError(\'required\')">\n            {{ \'tb.rulenode.polygon-definition-required\' | translate }}\n          </mat-error>\n        </mat-form-field>\n      </div>\n    </section>\n  </section>\n  <section class="tb-form-panel stroked no-padding-bottom">\n    <div fxLayout="column" fxLayout.gt-sm="row"  fxLayoutGap.lt-md="16px" fxLayoutAlign="space-between">\n      <div class="tb-form-panel-title">{{ \'tb.rulenode.presence-monitoring-strategy\' | translate }}</div>\n      <tb-toggle-select class="fetch-to-data-toggle" formControlName="reportPresenceStatusOnEachMessage" appearance="fill" >\n        <tb-toggle-option *ngFor="let strategy of presenceMonitoringStrategyKeys" [value]="presenceMonitoringStrategies.get(strategy).value">\n          {{ presenceMonitoringStrategies.get(strategy).name | translate }}\n        </tb-toggle-option>\n      </tb-toggle-select>\n    </div>\n    <div class="tb-form-hint tb-primary-fill"> {{ geoActionConfigForm.get(\'reportPresenceStatusOnEachMessage\').value === false ?\n        (\'tb.rulenode.presence-monitoring-strategy-on-first-message-hint\' | translate) :\n        (\'tb.rulenode.presence-monitoring-strategy-on-each-message-hint\' | translate) }}\n    </div>\n    <section fxLayout="column">\n      <div *ngIf="geoActionConfigForm.get(\'reportPresenceStatusOnEachMessage\').value === false">\n        <div fxLayout="column" fxLayout.gt-sm="row" fxLayoutGap.gt-sm="8px">\n          <mat-form-field fxFlex class="mat-block">\n            <mat-label translate>tb.rulenode.min-inside-duration</mat-label>\n            <input type="number" step="1" min="1" max="2147483647" matInput formControlName="minInsideDuration" required>\n            <mat-error *ngIf="geoActionConfigForm.get(\'minInsideDuration\').hasError(\'required\')">\n              {{ \'tb.rulenode.min-inside-duration-value-required\' | translate }}\n            </mat-error>\n            <mat-error *ngIf="geoActionConfigForm.get(\'minInsideDuration\').hasError(\'min\')">\n              {{ \'tb.rulenode.time-value-range\' | translate }}\n            </mat-error>\n            <mat-error *ngIf="geoActionConfigForm.get(\'minInsideDuration\').hasError(\'max\')">\n              {{ \'tb.rulenode.time-value-range\' | translate }}\n            </mat-error>\n          </mat-form-field>\n          <mat-form-field fxFlex class="mat-block">\n            <mat-label translate>tb.rulenode.min-inside-duration-time-unit</mat-label>\n            <mat-select formControlName="minInsideDurationTimeUnit" required>\n              <mat-option *ngFor="let timeUnit of timeUnits" [value]="timeUnit">\n                {{ timeUnitsTranslationMap.get(timeUnit) | translate }}\n              </mat-option>\n            </mat-select>\n          </mat-form-field>\n        </div>\n        <div fxLayout="column" fxLayout.gt-sm="row" fxLayoutGap.gt-sm="8px">\n          <mat-form-field fxFlex class="mat-block">\n            <mat-label translate>tb.rulenode.min-outside-duration</mat-label>\n            <input type="number" step="1" min="1" max="2147483647" matInput formControlName="minOutsideDuration" required>\n            <mat-error *ngIf="geoActionConfigForm.get(\'minOutsideDuration\').hasError(\'required\')">\n              {{ \'tb.rulenode.min-outside-duration-value-required\' | translate }}\n            </mat-error>\n            <mat-error *ngIf="geoActionConfigForm.get(\'minOutsideDuration\').hasError(\'min\')">\n              {{ \'tb.rulenode.time-value-range\' | translate }}\n            </mat-error>\n            <mat-error *ngIf="geoActionConfigForm.get(\'minOutsideDuration\').hasError(\'max\')">\n              {{ \'tb.rulenode.time-value-range\' | translate }}\n            </mat-error>\n          </mat-form-field>\n          <mat-form-field fxFlex class="mat-block">\n            <mat-label translate>tb.rulenode.min-outside-duration-time-unit</mat-label>\n            <mat-select formControlName="minOutsideDurationTimeUnit" required>\n              <mat-option *ngFor="let timeUnit of timeUnits" [value]="timeUnit">\n                {{ timeUnitsTranslationMap.get(timeUnit) | translate }}\n              </mat-option>\n            </mat-select>\n          </mat-form-field>\n        </div>\n      </div>\n    </section>\n  </section>\n</section>\n',styles:[":host .slide-toggle{margin-bottom:18px}\n",':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n']}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder}]}});class fn extends f{constructor(e,t,n,o){super(e),this.store=e,this.fb=t,this.nodeScriptTestService=n,this.translate=o,this.tbelEnabled=re(this.store).tbelEnabled,this.scriptLanguage=x,this.changeScript=new r,this.hasScript=!0,this.testScriptLabel="tb.rulenode.test-to-string-function"}configForm(){return this.logConfigForm}onConfigurationSet(e){this.logConfigForm=this.fb.group({scriptLang:[e?e.scriptLang:x.JS,[O.required]],jsScript:[e?e.jsScript:null,[]],tbelScript:[e?e.tbelScript:null,[]]})}validatorTriggers(){return["scriptLang"]}updateValidators(e){let t=this.logConfigForm.get("scriptLang").value;t!==x.TBEL||this.tbelEnabled||(t=x.JS,this.logConfigForm.get("scriptLang").patchValue(t,{emitEvent:!1}),setTimeout((()=>{this.logConfigForm.updateValueAndValidity({emitEvent:!0})}))),this.logConfigForm.get("jsScript").setValidators(t===x.JS?[O.required]:[]),this.logConfigForm.get("jsScript").updateValueAndValidity({emitEvent:e}),this.logConfigForm.get("tbelScript").setValidators(t===x.TBEL?[O.required]:[]),this.logConfigForm.get("tbelScript").updateValueAndValidity({emitEvent:e})}prepareInputConfig(e){return e&&(e.scriptLang||(e.scriptLang=x.JS)),e}testScript(e){const t=this.logConfigForm.get("scriptLang").value,n=t===x.JS?"jsScript":"tbelScript",r=t===x.JS?"rulenode/log_node_script_fn":"rulenode/tbel/log_node_script_fn",o=this.logConfigForm.get(n).value;this.nodeScriptTestService.testNodeScript(o,"string",this.translate.instant("tb.rulenode.to-string"),"ToString",["msg","metadata","msgType"],this.ruleNodeId,r,t,e).subscribe((e=>{e&&(this.logConfigForm.get(n).setValue(e),this.changeScript.emit())}))}onValidate(){this.logConfigForm.get("scriptLang").value===x.JS&&this.jsFuncComponent.validateOnSubmit()}}e("LogConfigComponent",fn),fn.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:fn,deps:[{token:P.Store},{token:R.UntypedFormBuilder},{token:oe.NodeScriptTestService},{token:Z.TranslateService}],target:t.ɵɵFactoryTarget.Component}),fn.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:fn,selector:"tb-action-node-log-config",viewQueries:[{propertyName:"jsFuncComponent",first:!0,predicate:["jsFuncComponent"],descendants:!0},{propertyName:"tbelFuncComponent",first:!0,predicate:["tbelFuncComponent"],descendants:!0}],usesInheritance:!0,ngImport:t,template:'<section [formGroup]="logConfigForm" fxLayout="column">\n  <tb-script-lang formControlName="scriptLang" *ngIf="tbelEnabled"></tb-script-lang>\n  <tb-js-func *ngIf="logConfigForm.get(\'scriptLang\').value === scriptLanguage.JS"\n              #jsFuncComponent\n              formControlName="jsScript"\n              functionName="ToString"\n              [functionArgs]="[\'msg\', \'metadata\', \'msgType\']"\n              helpId="rulenode/log_node_script_fn"\n              noValidate="true">\n    <button toolbarSuffixButton\n            mat-icon-button\n            matTooltip="{{ testScriptLabel | translate }}"\n            matTooltipPosition="above"\n            class="tb-mat-32"\n            (click)="testScript()">\n      <mat-icon class="material-icons" color="primary">bug_report</mat-icon>\n    </button>\n  </tb-js-func>\n  <tb-js-func *ngIf="logConfigForm.get(\'scriptLang\').value === scriptLanguage.TBEL"\n              #tbelFuncComponent\n              formControlName="tbelScript"\n              functionName="ToString"\n              [functionArgs]="[\'msg\', \'metadata\', \'msgType\']"\n              [disableUndefinedCheck]="true"\n              [scriptLanguage]="scriptLanguage.TBEL"\n              helpId="rulenode/tbel/log_node_script_fn"\n              noValidate="true">\n    <button toolbarSuffixButton\n            mat-icon-button\n            matTooltip="{{ testScriptLabel | translate }}"\n            matTooltipPosition="above"\n            class="tb-mat-32"\n            (click)="testScript()">\n      <mat-icon class="material-icons" color="primary">bug_report</mat-icon>\n    </button>\n  </tb-js-func>\n  <div fxLayout="row">\n    <button mat-button mat-raised-button color="primary" (click)="testScript()">\n      {{ testScriptLabel | translate }}\n    </button>\n  </div>\n</section>\n',dependencies:[{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:pe.JsFuncComponent,selector:"tb-js-func",inputs:["functionTitle","functionName","functionArgs","validationArgs","resultType","disabled","fillHeight","minHeight","editorCompleter","globalVariables","disableUndefinedCheck","helpId","scriptLanguage","hideBrackets","noValidate","required"]},{kind:"component",type:de.MatButton,selector:"    button[mat-button], button[mat-raised-button], button[mat-flat-button],    button[mat-stroked-button]  ",inputs:["disabled","disableRipple","color"],exportAs:["matButton"]},{kind:"component",type:de.MatIconButton,selector:"button[mat-icon-button]",inputs:["disabled","disableRipple","color"],exportAs:["matButton"]},{kind:"component",type:ue.MatIcon,selector:"mat-icon",inputs:["color","inline","svgIcon","fontSet","fontIcon"],exportAs:["matIcon"]},{kind:"directive",type:ce.MatTooltip,selector:"[matTooltip]",exportAs:["matTooltip"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"component",type:fe.TbScriptLangComponent,selector:"tb-script-lang",inputs:["disabled"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:fn,decorators:[{type:n,args:[{selector:"tb-action-node-log-config",template:'<section [formGroup]="logConfigForm" fxLayout="column">\n  <tb-script-lang formControlName="scriptLang" *ngIf="tbelEnabled"></tb-script-lang>\n  <tb-js-func *ngIf="logConfigForm.get(\'scriptLang\').value === scriptLanguage.JS"\n              #jsFuncComponent\n              formControlName="jsScript"\n              functionName="ToString"\n              [functionArgs]="[\'msg\', \'metadata\', \'msgType\']"\n              helpId="rulenode/log_node_script_fn"\n              noValidate="true">\n    <button toolbarSuffixButton\n            mat-icon-button\n            matTooltip="{{ testScriptLabel | translate }}"\n            matTooltipPosition="above"\n            class="tb-mat-32"\n            (click)="testScript()">\n      <mat-icon class="material-icons" color="primary">bug_report</mat-icon>\n    </button>\n  </tb-js-func>\n  <tb-js-func *ngIf="logConfigForm.get(\'scriptLang\').value === scriptLanguage.TBEL"\n              #tbelFuncComponent\n              formControlName="tbelScript"\n              functionName="ToString"\n              [functionArgs]="[\'msg\', \'metadata\', \'msgType\']"\n              [disableUndefinedCheck]="true"\n              [scriptLanguage]="scriptLanguage.TBEL"\n              helpId="rulenode/tbel/log_node_script_fn"\n              noValidate="true">\n    <button toolbarSuffixButton\n            mat-icon-button\n            matTooltip="{{ testScriptLabel | translate }}"\n            matTooltipPosition="above"\n            class="tb-mat-32"\n            (click)="testScript()">\n      <mat-icon class="material-icons" color="primary">bug_report</mat-icon>\n    </button>\n  </tb-js-func>\n  <div fxLayout="row">\n    <button mat-button mat-raised-button color="primary" (click)="testScript()">\n      {{ testScriptLabel | translate }}\n    </button>\n  </div>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder},{type:oe.NodeScriptTestService},{type:Z.TranslateService}]},propDecorators:{jsFuncComponent:[{type:o,args:["jsFuncComponent",{static:!1}]}],tbelFuncComponent:[{type:o,args:["tbelFuncComponent",{static:!1}]}]}});class gn extends f{constructor(e,t){super(e),this.store=e,this.fb=t}configForm(){return this.msgCountConfigForm}onConfigurationSet(e){this.msgCountConfigForm=this.fb.group({interval:[e?e.interval:null,[O.required,O.min(1)]],telemetryPrefix:[e?e.telemetryPrefix:null,[O.required]]})}}e("MsgCountConfigComponent",gn),gn.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:gn,deps:[{token:P.Store},{token:R.UntypedFormBuilder}],target:t.ɵɵFactoryTarget.Component}),gn.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:gn,selector:"tb-action-node-msg-count-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="msgCountConfigForm" fxLayout="column">\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.interval-seconds</mat-label>\n    <input required type="number" min="1" step="1" matInput formControlName="interval">\n    <mat-error *ngIf="msgCountConfigForm.get(\'interval\').hasError(\'required\')">\n      {{ \'tb.rulenode.interval-seconds-required\' | translate }}\n    </mat-error>\n    <mat-error *ngIf="msgCountConfigForm.get(\'interval\').hasError(\'min\')">\n      {{ \'tb.rulenode.min-interval-seconds-message\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.output-timeseries-key-prefix</mat-label>\n    <input required matInput formControlName="telemetryPrefix">\n    <mat-error *ngIf="msgCountConfigForm.get(\'telemetryPrefix\').hasError(\'required\')">\n      {{ \'tb.rulenode.output-timeseries-key-prefix-required\' | translate }}\n    </mat-error>\n  </mat-form-field>\n</section>\n',dependencies:[{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NumberValueAccessor,selector:"input[type=number][formControlName],input[type=number][formControl],input[type=number][ngModel]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.MinValidator,selector:"input[type=number][min][formControlName],input[type=number][min][formControl],input[type=number][min][ngModel]",inputs:["min"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:gn,decorators:[{type:n,args:[{selector:"tb-action-node-msg-count-config",template:'<section [formGroup]="msgCountConfigForm" fxLayout="column">\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.interval-seconds</mat-label>\n    <input required type="number" min="1" step="1" matInput formControlName="interval">\n    <mat-error *ngIf="msgCountConfigForm.get(\'interval\').hasError(\'required\')">\n      {{ \'tb.rulenode.interval-seconds-required\' | translate }}\n    </mat-error>\n    <mat-error *ngIf="msgCountConfigForm.get(\'interval\').hasError(\'min\')">\n      {{ \'tb.rulenode.min-interval-seconds-message\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.output-timeseries-key-prefix</mat-label>\n    <input required matInput formControlName="telemetryPrefix">\n    <mat-error *ngIf="msgCountConfigForm.get(\'telemetryPrefix\').hasError(\'required\')">\n      {{ \'tb.rulenode.output-timeseries-key-prefix-required\' | translate }}\n    </mat-error>\n  </mat-form-field>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder}]}});class yn extends f{constructor(e,t){super(e),this.store=e,this.fb=t}configForm(){return this.msgDelayConfigForm}onConfigurationSet(e){this.msgDelayConfigForm=this.fb.group({useMetadataPeriodInSecondsPatterns:[!!e&&e.useMetadataPeriodInSecondsPatterns,[]],periodInSeconds:[e?e.periodInSeconds:null,[]],periodInSecondsPattern:[e?e.periodInSecondsPattern:null,[]],maxPendingMsgs:[e?e.maxPendingMsgs:null,[O.required,O.min(1),O.max(1e5)]]})}validatorTriggers(){return["useMetadataPeriodInSecondsPatterns"]}updateValidators(e){this.msgDelayConfigForm.get("useMetadataPeriodInSecondsPatterns").value?(this.msgDelayConfigForm.get("periodInSecondsPattern").setValidators([O.required]),this.msgDelayConfigForm.get("periodInSeconds").setValidators([])):(this.msgDelayConfigForm.get("periodInSecondsPattern").setValidators([]),this.msgDelayConfigForm.get("periodInSeconds").setValidators([O.required,O.min(0)])),this.msgDelayConfigForm.get("periodInSecondsPattern").updateValueAndValidity({emitEvent:e}),this.msgDelayConfigForm.get("periodInSeconds").updateValueAndValidity({emitEvent:e})}}e("MsgDelayConfigComponent",yn),yn.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:yn,deps:[{token:P.Store},{token:R.UntypedFormBuilder}],target:t.ɵɵFactoryTarget.Component}),yn.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:yn,selector:"tb-action-node-msg-delay-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="msgDelayConfigForm" fxLayout="column">\n  <mat-checkbox formControlName="useMetadataPeriodInSecondsPatterns">\n    {{ \'tb.rulenode.use-metadata-period-in-seconds-patterns\' | translate }}\n  </mat-checkbox>\n  <div class="tb-hint" translate>tb.rulenode.use-metadata-period-in-seconds-patterns-hint</div>\n  <mat-form-field *ngIf="msgDelayConfigForm.get(\'useMetadataPeriodInSecondsPatterns\').value !== true; else periodInSecondsPattern"\n                  class="mat-block">\n    <mat-label translate>tb.rulenode.period-seconds</mat-label>\n    <input required type="number" min="0" step="1" matInput formControlName="periodInSeconds">\n    <mat-error *ngIf="msgDelayConfigForm.get(\'periodInSeconds\').hasError(\'required\')">\n      {{ \'tb.rulenode.period-seconds-required\' | translate }}\n    </mat-error>\n    <mat-error *ngIf="msgDelayConfigForm.get(\'periodInSeconds\').hasError(\'min\')">\n      {{ \'tb.rulenode.min-period-0-seconds-message\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <ng-template #periodInSecondsPattern>\n    <mat-form-field class="mat-block" subscriptSizing="dynamic">\n      <mat-label translate>tb.rulenode.period-in-seconds-pattern</mat-label>\n      <input required matInput formControlName="periodInSecondsPattern">\n      <mat-error *ngIf="msgDelayConfigForm.get(\'periodInSecondsPattern\').hasError(\'required\')">\n        {{ \'tb.rulenode.period-in-seconds-pattern-required\' | translate }}\n      </mat-error>\n      <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n    </mat-form-field>\n  </ng-template>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.max-pending-messages</mat-label>\n    <input required type="number" min="1" max="100000" step="1" matInput formControlName="maxPendingMsgs">\n    <mat-error *ngIf="msgDelayConfigForm.get(\'maxPendingMsgs\').hasError(\'required\')">\n      {{ \'tb.rulenode.max-pending-messages-required\' | translate }}\n    </mat-error>\n    <mat-error *ngIf="msgDelayConfigForm.get(\'maxPendingMsgs\').hasError(\'min\')">\n      {{ \'tb.rulenode.max-pending-messages-range\' | translate }}\n    </mat-error>\n    <mat-error *ngIf="msgDelayConfigForm.get(\'maxPendingMsgs\').hasError(\'max\')">\n      {{ \'tb.rulenode.max-pending-messages-range\' | translate }}\n    </mat-error>\n  </mat-form-field>\n</section>\n',dependencies:[{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:Q.MatCheckbox,selector:"mat-checkbox",inputs:["disableRipple","color","tabIndex"],exportAs:["matCheckbox"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatHint,selector:"mat-hint",inputs:["align","id"]},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NumberValueAccessor,selector:"input[type=number][formControlName],input[type=number][formControl],input[type=number][ngModel]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.MinValidator,selector:"input[type=number][min][formControlName],input[type=number][min][formControl],input[type=number][min][ngModel]",inputs:["min"]},{kind:"directive",type:R.MaxValidator,selector:"input[type=number][max][formControlName],input[type=number][max][formControl],input[type=number][max][ngModel]",inputs:["max"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:yn,decorators:[{type:n,args:[{selector:"tb-action-node-msg-delay-config",template:'<section [formGroup]="msgDelayConfigForm" fxLayout="column">\n  <mat-checkbox formControlName="useMetadataPeriodInSecondsPatterns">\n    {{ \'tb.rulenode.use-metadata-period-in-seconds-patterns\' | translate }}\n  </mat-checkbox>\n  <div class="tb-hint" translate>tb.rulenode.use-metadata-period-in-seconds-patterns-hint</div>\n  <mat-form-field *ngIf="msgDelayConfigForm.get(\'useMetadataPeriodInSecondsPatterns\').value !== true; else periodInSecondsPattern"\n                  class="mat-block">\n    <mat-label translate>tb.rulenode.period-seconds</mat-label>\n    <input required type="number" min="0" step="1" matInput formControlName="periodInSeconds">\n    <mat-error *ngIf="msgDelayConfigForm.get(\'periodInSeconds\').hasError(\'required\')">\n      {{ \'tb.rulenode.period-seconds-required\' | translate }}\n    </mat-error>\n    <mat-error *ngIf="msgDelayConfigForm.get(\'periodInSeconds\').hasError(\'min\')">\n      {{ \'tb.rulenode.min-period-0-seconds-message\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <ng-template #periodInSecondsPattern>\n    <mat-form-field class="mat-block" subscriptSizing="dynamic">\n      <mat-label translate>tb.rulenode.period-in-seconds-pattern</mat-label>\n      <input required matInput formControlName="periodInSecondsPattern">\n      <mat-error *ngIf="msgDelayConfigForm.get(\'periodInSecondsPattern\').hasError(\'required\')">\n        {{ \'tb.rulenode.period-in-seconds-pattern-required\' | translate }}\n      </mat-error>\n      <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n    </mat-form-field>\n  </ng-template>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.max-pending-messages</mat-label>\n    <input required type="number" min="1" max="100000" step="1" matInput formControlName="maxPendingMsgs">\n    <mat-error *ngIf="msgDelayConfigForm.get(\'maxPendingMsgs\').hasError(\'required\')">\n      {{ \'tb.rulenode.max-pending-messages-required\' | translate }}\n    </mat-error>\n    <mat-error *ngIf="msgDelayConfigForm.get(\'maxPendingMsgs\').hasError(\'min\')">\n      {{ \'tb.rulenode.max-pending-messages-range\' | translate }}\n    </mat-error>\n    <mat-error *ngIf="msgDelayConfigForm.get(\'maxPendingMsgs\').hasError(\'max\')">\n      {{ \'tb.rulenode.max-pending-messages-range\' | translate }}\n    </mat-error>\n  </mat-form-field>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder}]}});class xn extends f{constructor(e,t){super(e),this.store=e,this.fb=t,this.attributeScopes=Object.keys(g),this.telemetryTypeTranslationsMap=y}configForm(){return this.pushToCloudConfigForm}onConfigurationSet(e){this.pushToCloudConfigForm=this.fb.group({scope:[e?e.scope:null,[O.required]]})}}e("PushToCloudConfigComponent",xn),xn.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:xn,deps:[{token:P.Store},{token:R.UntypedFormBuilder}],target:t.ɵɵFactoryTarget.Component}),xn.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:xn,selector:"tb-action-node-push-to-cloud-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="pushToCloudConfigForm" fxLayout="column">\n  <mat-form-field fxFlex class="mat-block">\n    <mat-label translate>attribute.attributes-scope</mat-label>\n    <mat-select formControlName="scope" required>\n      <mat-option *ngFor="let scope of attributeScopes" [value]="scope">\n        {{ telemetryTypeTranslationsMap.get(scope) | translate }}\n      </mat-option>\n    </mat-select>\n  </mat-form-field>\n</section>\n',dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"component",type:X.MatSelect,selector:"mat-select",inputs:["disabled","disableRipple","tabIndex","hideSingleSelectionIndicator"],exportAs:["matSelect"]},{kind:"component",type:ee.MatOption,selector:"mat-option",exportAs:["matOption"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:W.DefaultFlexDirective,selector:"  [fxFlex], [fxFlex.xs], [fxFlex.sm], [fxFlex.md],  [fxFlex.lg], [fxFlex.xl], [fxFlex.lt-sm], [fxFlex.lt-md],  [fxFlex.lt-lg], [fxFlex.lt-xl], [fxFlex.gt-xs], [fxFlex.gt-sm],  [fxFlex.gt-md], [fxFlex.gt-lg]",inputs:["fxFlex","fxFlex.xs","fxFlex.sm","fxFlex.md","fxFlex.lg","fxFlex.xl","fxFlex.lt-sm","fxFlex.lt-md","fxFlex.lt-lg","fxFlex.lt-xl","fxFlex.gt-xs","fxFlex.gt-sm","fxFlex.gt-md","fxFlex.gt-lg"]},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:xn,decorators:[{type:n,args:[{selector:"tb-action-node-push-to-cloud-config",template:'<section [formGroup]="pushToCloudConfigForm" fxLayout="column">\n  <mat-form-field fxFlex class="mat-block">\n    <mat-label translate>attribute.attributes-scope</mat-label>\n    <mat-select formControlName="scope" required>\n      <mat-option *ngFor="let scope of attributeScopes" [value]="scope">\n        {{ telemetryTypeTranslationsMap.get(scope) | translate }}\n      </mat-option>\n    </mat-select>\n  </mat-form-field>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder}]}});class bn extends f{constructor(e,t){super(e),this.store=e,this.fb=t,this.attributeScopes=Object.keys(g),this.telemetryTypeTranslationsMap=y}configForm(){return this.pushToEdgeConfigForm}onConfigurationSet(e){this.pushToEdgeConfigForm=this.fb.group({scope:[e?e.scope:null,[O.required]]})}}e("PushToEdgeConfigComponent",bn),bn.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:bn,deps:[{token:P.Store},{token:R.UntypedFormBuilder}],target:t.ɵɵFactoryTarget.Component}),bn.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:bn,selector:"tb-action-node-push-to-edge-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="pushToEdgeConfigForm" fxLayout="column">\n  <mat-form-field fxFlex class="mat-block">\n    <mat-label translate>attribute.attributes-scope</mat-label>\n    <mat-select formControlName="scope" required>\n      <mat-option *ngFor="let scope of attributeScopes" [value]="scope">\n        {{ telemetryTypeTranslationsMap.get(scope) | translate }}\n      </mat-option>\n    </mat-select>\n  </mat-form-field>\n</section>\n',dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"component",type:X.MatSelect,selector:"mat-select",inputs:["disabled","disableRipple","tabIndex","hideSingleSelectionIndicator"],exportAs:["matSelect"]},{kind:"component",type:ee.MatOption,selector:"mat-option",exportAs:["matOption"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:W.DefaultFlexDirective,selector:"  [fxFlex], [fxFlex.xs], [fxFlex.sm], [fxFlex.md],  [fxFlex.lg], [fxFlex.xl], [fxFlex.lt-sm], [fxFlex.lt-md],  [fxFlex.lt-lg], [fxFlex.lt-xl], [fxFlex.gt-xs], [fxFlex.gt-sm],  [fxFlex.gt-md], [fxFlex.gt-lg]",inputs:["fxFlex","fxFlex.xs","fxFlex.sm","fxFlex.md","fxFlex.lg","fxFlex.xl","fxFlex.lt-sm","fxFlex.lt-md","fxFlex.lt-lg","fxFlex.lt-xl","fxFlex.gt-xs","fxFlex.gt-sm","fxFlex.gt-md","fxFlex.gt-lg"]},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:bn,decorators:[{type:n,args:[{selector:"tb-action-node-push-to-edge-config",template:'<section [formGroup]="pushToEdgeConfigForm" fxLayout="column">\n  <mat-form-field fxFlex class="mat-block">\n    <mat-label translate>attribute.attributes-scope</mat-label>\n    <mat-select formControlName="scope" required>\n      <mat-option *ngFor="let scope of attributeScopes" [value]="scope">\n        {{ telemetryTypeTranslationsMap.get(scope) | translate }}\n      </mat-option>\n    </mat-select>\n  </mat-form-field>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder}]}});class hn extends f{constructor(e,t){super(e),this.store=e,this.fb=t}configForm(){return this.rpcReplyConfigForm}onConfigurationSet(e){this.rpcReplyConfigForm=this.fb.group({requestIdMetaDataAttribute:[e?e.requestIdMetaDataAttribute:null,[]]})}}e("RpcReplyConfigComponent",hn),hn.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:hn,deps:[{token:P.Store},{token:R.UntypedFormBuilder}],target:t.ɵɵFactoryTarget.Component}),hn.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:hn,selector:"tb-action-node-rpc-reply-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="rpcReplyConfigForm" fxLayout="column">\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.request-id-metadata-attribute</mat-label>\n    <input matInput formControlName="requestIdMetaDataAttribute">\n  </mat-form-field>\n</section>\n',dependencies:[{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:hn,decorators:[{type:n,args:[{selector:"tb-action-node-rpc-reply-config",template:'<section [formGroup]="rpcReplyConfigForm" fxLayout="column">\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.request-id-metadata-attribute</mat-label>\n    <input matInput formControlName="requestIdMetaDataAttribute">\n  </mat-form-field>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder}]}});class vn extends f{constructor(e,t){super(e),this.store=e,this.fb=t}configForm(){return this.rpcRequestConfigForm}onConfigurationSet(e){this.rpcRequestConfigForm=this.fb.group({timeoutInSeconds:[e?e.timeoutInSeconds:null,[O.required,O.min(0)]]})}}e("RpcRequestConfigComponent",vn),vn.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:vn,deps:[{token:P.Store},{token:R.UntypedFormBuilder}],target:t.ɵɵFactoryTarget.Component}),vn.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:vn,selector:"tb-action-node-rpc-request-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="rpcRequestConfigForm" fxLayout="column">\n  <mat-form-field fxFlex class="mat-block">\n    <mat-label translate>tb.rulenode.timeout-sec</mat-label>\n    <input type="number" min="0" step="1" matInput formControlName="timeoutInSeconds" required>\n    <mat-error *ngIf="rpcRequestConfigForm.get(\'timeoutInSeconds\').hasError(\'required\')">\n      {{ \'tb.rulenode.timeout-required\' | translate }}\n    </mat-error>\n    <mat-error *ngIf="rpcRequestConfigForm.get(\'timeoutInSeconds\').hasError(\'min\')">\n      {{ \'tb.rulenode.min-timeout-message\' | translate }}\n    </mat-error>\n  </mat-form-field>\n</section>\n',dependencies:[{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:W.DefaultFlexDirective,selector:"  [fxFlex], [fxFlex.xs], [fxFlex.sm], [fxFlex.md],  [fxFlex.lg], [fxFlex.xl], [fxFlex.lt-sm], [fxFlex.lt-md],  [fxFlex.lt-lg], [fxFlex.lt-xl], [fxFlex.gt-xs], [fxFlex.gt-sm],  [fxFlex.gt-md], [fxFlex.gt-lg]",inputs:["fxFlex","fxFlex.xs","fxFlex.sm","fxFlex.md","fxFlex.lg","fxFlex.xl","fxFlex.lt-sm","fxFlex.lt-md","fxFlex.lt-lg","fxFlex.lt-xl","fxFlex.gt-xs","fxFlex.gt-sm","fxFlex.gt-md","fxFlex.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NumberValueAccessor,selector:"input[type=number][formControlName],input[type=number][formControl],input[type=number][ngModel]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.MinValidator,selector:"input[type=number][min][formControlName],input[type=number][min][formControl],input[type=number][min][ngModel]",inputs:["min"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:vn,decorators:[{type:n,args:[{selector:"tb-action-node-rpc-request-config",template:'<section [formGroup]="rpcRequestConfigForm" fxLayout="column">\n  <mat-form-field fxFlex class="mat-block">\n    <mat-label translate>tb.rulenode.timeout-sec</mat-label>\n    <input type="number" min="0" step="1" matInput formControlName="timeoutInSeconds" required>\n    <mat-error *ngIf="rpcRequestConfigForm.get(\'timeoutInSeconds\').hasError(\'required\')">\n      {{ \'tb.rulenode.timeout-required\' | translate }}\n    </mat-error>\n    <mat-error *ngIf="rpcRequestConfigForm.get(\'timeoutInSeconds\').hasError(\'min\')">\n      {{ \'tb.rulenode.min-timeout-message\' | translate }}\n    </mat-error>\n  </mat-form-field>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder}]}});class Cn extends L{get required(){return this.requiredValue}set required(e){this.requiredValue=Le(e)}constructor(e,t,n,r){super(e),this.store=e,this.translate=t,this.injector=n,this.fb=r,this.propagateChange=null,this.valueChangeSubscription=null}ngOnInit(){this.ngControl=this.injector.get(_),null!=this.ngControl&&(this.ngControl.valueAccessor=this),this.kvListFormGroup=this.fb.group({}),this.kvListFormGroup.addControl("keyVals",this.fb.array([]))}keyValsFormArray(){return this.kvListFormGroup.get("keyVals")}registerOnChange(e){this.propagateChange=e}registerOnTouched(e){}setDisabledState(e){this.disabled=e,this.disabled?this.kvListFormGroup.disable({emitEvent:!1}):this.kvListFormGroup.enable({emitEvent:!1})}writeValue(e){this.valueChangeSubscription&&this.valueChangeSubscription.unsubscribe();const t=[];if(e)for(const n of Object.keys(e))Object.prototype.hasOwnProperty.call(e,n)&&t.push(this.fb.group({key:[n,[O.required]],value:[e[n],[O.required]]}));this.kvListFormGroup.setControl("keyVals",this.fb.array(t)),this.valueChangeSubscription=this.kvListFormGroup.valueChanges.subscribe((()=>{this.updateModel()}))}removeKeyVal(e){this.kvListFormGroup.get("keyVals").removeAt(e)}addKeyVal(){this.kvListFormGroup.get("keyVals").push(this.fb.group({key:["",[O.required]],value:["",[O.required]]}))}validate(e){const t=this.kvListFormGroup.get("keyVals").value;if(!t.length&&this.required)return{kvMapRequired:!0};if(!this.kvListFormGroup.valid)return{kvFieldsRequired:!0};if(this.uniqueKeyValuePairValidator)for(const e of t)if(e.key===e.value)return{uniqueKeyValuePair:!0};return null}updateModel(){const e=this.kvListFormGroup.get("keyVals").value;if(this.required&&!e.length||!this.kvListFormGroup.valid)this.propagateChange(null);else{const t={};e.forEach((e=>{t[e.key]=e.value})),this.propagateChange(t)}}}e("KvMapConfigOldComponent",Cn),Cn.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Cn,deps:[{token:P.Store},{token:Z.TranslateService},{token:t.Injector},{token:R.FormBuilder}],target:t.ɵɵFactoryTarget.Component}),Cn.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:Cn,selector:"tb-kv-map-config-old",inputs:{disabled:"disabled",uniqueKeyValuePairValidator:"uniqueKeyValuePairValidator",requiredText:"requiredText",keyText:"keyText",keyRequiredText:"keyRequiredText",valText:"valText",valRequiredText:"valRequiredText",hintText:"hintText",required:"required"},providers:[{provide:B,useExisting:a((()=>Cn)),multi:!0},{provide:K,useExisting:a((()=>Cn)),multi:!0}],usesInheritance:!0,ngImport:t,template:'<section fxLayout="column" class="tb-kv-map-config" [formGroup]="kvListFormGroup">\n  <div class="header" fxFlex fxLayout="row" fxLayoutGap="8px">\n    <span class="cell tb-required" fxFlex>{{ keyText | translate }}</span>\n    <span class="cell tb-required" fxFlex>{{ valText | translate }}</span>\n    <span [fxShow]="!disabled" style="width: 52px;" innerHTML="&nbsp"></span>\n  </div>\n  <div class="body">\n    <div class="row" fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px"\n         formArrayName="keyVals"\n         *ngFor="let keyValControl of keyValsFormArray().controls; let $index = index">\n      <mat-form-field fxFlex class="cell mat-block">\n        <input [formControl]="keyValControl.get(\'key\')" matInput required\n               placeholder="{{ keyText | translate }}"/>\n        <mat-error *ngIf="keyValControl.get(\'key\').hasError(\'required\')">\n          {{ keyRequiredText | translate }}\n        </mat-error>\n      </mat-form-field>\n      <mat-form-field fxFlex class="cell mat-block">\n        <input [formControl]="keyValControl.get(\'value\')" matInput required\n               placeholder="{{ valText | translate }}"/>\n        <mat-error *ngIf="keyValControl.get(\'value\').hasError(\'required\')">\n          {{ valRequiredText | translate }}\n        </mat-error>\n      </mat-form-field>\n      <button mat-icon-button color="primary"\n              [fxShow]="!disabled"\n              type="button"\n              (click)="removeKeyVal($index)"\n              [disabled]="isLoading$ | async"\n              matTooltip="{{ \'tb.key-val.remove-entry\' | translate }}"\n              matTooltipPosition="above">\n        <mat-icon>close</mat-icon>\n      </button>\n    </div>\n    <div *ngIf="hintText" class="tb-hint" [innerHTML]="hintText | translate | safe: \'html\'"></div>\n  </div>\n  <tb-error [error]="ngControl.hasError(\'kvMapRequired\') || ngControl.hasError(\'uniqueKeyValuePair\') ?\n                     (ngControl.hasError(\'kvMapRequired\') ? translate.instant(requiredText) :\n                     translate.instant(\'tb.key-val.unique-key-value-pair-error\', {keyText: translate.instant(keyText),\n                     valText: translate.instant(valText)})) : \'\'"></tb-error>\n  <div style="margin-top: 16px;">\n    <button mat-button mat-raised-button color="primary"\n            [fxShow]="!disabled"\n            [disabled]="isLoading$ | async"\n            (click)="addKeyVal()"\n            type="button"\n            matTooltip="{{ \'tb.key-val.add-entry\' | translate }}"\n            matTooltipPosition="above">\n      <mat-icon>add</mat-icon>\n      {{ \'action.add\' | translate }}\n    </button>\n  </div>\n</section>\n',styles:[":host .tb-kv-map-config{margin-bottom:16px}:host .tb-kv-map-config .header{padding-left:5px;padding-right:5px;padding-bottom:5px}:host .tb-kv-map-config .header .cell{padding-left:5px;padding-right:5px;color:#757575;font-size:12px;font-weight:700;white-space:nowrap}:host .tb-kv-map-config .header .tb-required:after{color:#757575;font-size:12px;font-weight:700}:host .tb-kv-map-config .body{padding-left:5px;padding-right:5px;padding-bottom:0;max-height:300px;overflow:auto}:host .tb-kv-map-config .body .cell{padding-left:5px;padding-right:5px}:host .tb-kv-map-config tb-error{display:block;margin-top:-12px}\n",':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n'],dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:Ne.TbErrorComponent,selector:"tb-error",inputs:["noMargin","error"]},{kind:"component",type:de.MatButton,selector:"    button[mat-button], button[mat-raised-button], button[mat-flat-button],    button[mat-stroked-button]  ",inputs:["disabled","disableRipple","color"],exportAs:["matButton"]},{kind:"component",type:de.MatIconButton,selector:"button[mat-icon-button]",inputs:["disabled","disableRipple","color"],exportAs:["matButton"]},{kind:"component",type:ue.MatIcon,selector:"mat-icon",inputs:["color","inline","svgIcon","fontSet","fontIcon"],exportAs:["matIcon"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"directive",type:ce.MatTooltip,selector:"[matTooltip]",exportAs:["matTooltip"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:W.DefaultLayoutGapDirective,selector:"  [fxLayoutGap], [fxLayoutGap.xs], [fxLayoutGap.sm], [fxLayoutGap.md],  [fxLayoutGap.lg], [fxLayoutGap.xl], [fxLayoutGap.lt-sm], [fxLayoutGap.lt-md],  [fxLayoutGap.lt-lg], [fxLayoutGap.lt-xl], [fxLayoutGap.gt-xs], [fxLayoutGap.gt-sm],  [fxLayoutGap.gt-md], [fxLayoutGap.gt-lg]",inputs:["fxLayoutGap","fxLayoutGap.xs","fxLayoutGap.sm","fxLayoutGap.md","fxLayoutGap.lg","fxLayoutGap.xl","fxLayoutGap.lt-sm","fxLayoutGap.lt-md","fxLayoutGap.lt-lg","fxLayoutGap.lt-xl","fxLayoutGap.gt-xs","fxLayoutGap.gt-sm","fxLayoutGap.gt-md","fxLayoutGap.gt-lg"]},{kind:"directive",type:W.DefaultLayoutAlignDirective,selector:"  [fxLayoutAlign], [fxLayoutAlign.xs], [fxLayoutAlign.sm], [fxLayoutAlign.md],  [fxLayoutAlign.lg], [fxLayoutAlign.xl], [fxLayoutAlign.lt-sm], [fxLayoutAlign.lt-md],  [fxLayoutAlign.lt-lg], [fxLayoutAlign.lt-xl], [fxLayoutAlign.gt-xs], [fxLayoutAlign.gt-sm],  [fxLayoutAlign.gt-md], [fxLayoutAlign.gt-lg]",inputs:["fxLayoutAlign","fxLayoutAlign.xs","fxLayoutAlign.sm","fxLayoutAlign.md","fxLayoutAlign.lg","fxLayoutAlign.xl","fxLayoutAlign.lt-sm","fxLayoutAlign.lt-md","fxLayoutAlign.lt-lg","fxLayoutAlign.lt-xl","fxLayoutAlign.gt-xs","fxLayoutAlign.gt-sm","fxLayoutAlign.gt-md","fxLayoutAlign.gt-lg"]},{kind:"directive",type:W.DefaultFlexDirective,selector:"  [fxFlex], [fxFlex.xs], [fxFlex.sm], [fxFlex.md],  [fxFlex.lg], [fxFlex.xl], [fxFlex.lt-sm], [fxFlex.lt-md],  [fxFlex.lt-lg], [fxFlex.lt-xl], [fxFlex.gt-xs], [fxFlex.gt-sm],  [fxFlex.gt-md], [fxFlex.gt-lg]",inputs:["fxFlex","fxFlex.xs","fxFlex.sm","fxFlex.md","fxFlex.lg","fxFlex.xl","fxFlex.lt-sm","fxFlex.lt-md","fxFlex.lt-lg","fxFlex.lt-xl","fxFlex.gt-xs","fxFlex.gt-sm","fxFlex.gt-md","fxFlex.gt-lg"]},{kind:"directive",type:Se.DefaultShowHideDirective,selector:"  [fxShow], [fxShow.print],  [fxShow.xs], [fxShow.sm], [fxShow.md], [fxShow.lg], [fxShow.xl],  [fxShow.lt-sm], [fxShow.lt-md], [fxShow.lt-lg], [fxShow.lt-xl],  [fxShow.gt-xs], [fxShow.gt-sm], [fxShow.gt-md], [fxShow.gt-lg],  [fxHide], [fxHide.print],  [fxHide.xs], [fxHide.sm], [fxHide.md], [fxHide.lg], [fxHide.xl],  [fxHide.lt-sm], [fxHide.lt-md], [fxHide.lt-lg], [fxHide.lt-xl],  [fxHide.gt-xs], [fxHide.gt-sm], [fxHide.gt-md], [fxHide.gt-lg]",inputs:["fxShow","fxShow.print","fxShow.xs","fxShow.sm","fxShow.md","fxShow.lg","fxShow.xl","fxShow.lt-sm","fxShow.lt-md","fxShow.lt-lg","fxShow.lt-xl","fxShow.gt-xs","fxShow.gt-sm","fxShow.gt-md","fxShow.gt-lg","fxHide","fxHide.print","fxHide.xs","fxHide.sm","fxHide.md","fxHide.lg","fxHide.xl","fxHide.lt-sm","fxHide.lt-md","fxHide.lt-lg","fxHide.lt-xl","fxHide.gt-xs","fxHide.gt-sm","fxHide.gt-md","fxHide.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.FormControlDirective,selector:"[formControl]",inputs:["formControl","disabled","ngModel"],outputs:["ngModelChange"],exportAs:["ngForm"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormArrayName,selector:"[formArrayName]",inputs:["formArrayName"]},{kind:"pipe",type:H.AsyncPipe,name:"async"},{kind:"pipe",type:he.SafePipe,name:"safe"},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Cn,decorators:[{type:n,args:[{selector:"tb-kv-map-config-old",providers:[{provide:B,useExisting:a((()=>Cn)),multi:!0},{provide:K,useExisting:a((()=>Cn)),multi:!0}],template:'<section fxLayout="column" class="tb-kv-map-config" [formGroup]="kvListFormGroup">\n  <div class="header" fxFlex fxLayout="row" fxLayoutGap="8px">\n    <span class="cell tb-required" fxFlex>{{ keyText | translate }}</span>\n    <span class="cell tb-required" fxFlex>{{ valText | translate }}</span>\n    <span [fxShow]="!disabled" style="width: 52px;" innerHTML="&nbsp"></span>\n  </div>\n  <div class="body">\n    <div class="row" fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px"\n         formArrayName="keyVals"\n         *ngFor="let keyValControl of keyValsFormArray().controls; let $index = index">\n      <mat-form-field fxFlex class="cell mat-block">\n        <input [formControl]="keyValControl.get(\'key\')" matInput required\n               placeholder="{{ keyText | translate }}"/>\n        <mat-error *ngIf="keyValControl.get(\'key\').hasError(\'required\')">\n          {{ keyRequiredText | translate }}\n        </mat-error>\n      </mat-form-field>\n      <mat-form-field fxFlex class="cell mat-block">\n        <input [formControl]="keyValControl.get(\'value\')" matInput required\n               placeholder="{{ valText | translate }}"/>\n        <mat-error *ngIf="keyValControl.get(\'value\').hasError(\'required\')">\n          {{ valRequiredText | translate }}\n        </mat-error>\n      </mat-form-field>\n      <button mat-icon-button color="primary"\n              [fxShow]="!disabled"\n              type="button"\n              (click)="removeKeyVal($index)"\n              [disabled]="isLoading$ | async"\n              matTooltip="{{ \'tb.key-val.remove-entry\' | translate }}"\n              matTooltipPosition="above">\n        <mat-icon>close</mat-icon>\n      </button>\n    </div>\n    <div *ngIf="hintText" class="tb-hint" [innerHTML]="hintText | translate | safe: \'html\'"></div>\n  </div>\n  <tb-error [error]="ngControl.hasError(\'kvMapRequired\') || ngControl.hasError(\'uniqueKeyValuePair\') ?\n                     (ngControl.hasError(\'kvMapRequired\') ? translate.instant(requiredText) :\n                     translate.instant(\'tb.key-val.unique-key-value-pair-error\', {keyText: translate.instant(keyText),\n                     valText: translate.instant(valText)})) : \'\'"></tb-error>\n  <div style="margin-top: 16px;">\n    <button mat-button mat-raised-button color="primary"\n            [fxShow]="!disabled"\n            [disabled]="isLoading$ | async"\n            (click)="addKeyVal()"\n            type="button"\n            matTooltip="{{ \'tb.key-val.add-entry\' | translate }}"\n            matTooltipPosition="above">\n      <mat-icon>add</mat-icon>\n      {{ \'action.add\' | translate }}\n    </button>\n  </div>\n</section>\n',styles:[":host .tb-kv-map-config{margin-bottom:16px}:host .tb-kv-map-config .header{padding-left:5px;padding-right:5px;padding-bottom:5px}:host .tb-kv-map-config .header .cell{padding-left:5px;padding-right:5px;color:#757575;font-size:12px;font-weight:700;white-space:nowrap}:host .tb-kv-map-config .header .tb-required:after{color:#757575;font-size:12px;font-weight:700}:host .tb-kv-map-config .body{padding-left:5px;padding-right:5px;padding-bottom:0;max-height:300px;overflow:auto}:host .tb-kv-map-config .body .cell{padding-left:5px;padding-right:5px}:host .tb-kv-map-config tb-error{display:block;margin-top:-12px}\n",':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n']}]}],ctorParameters:function(){return[{type:P.Store},{type:Z.TranslateService},{type:t.Injector},{type:R.FormBuilder}]},propDecorators:{disabled:[{type:i}],uniqueKeyValuePairValidator:[{type:i}],requiredText:[{type:i}],keyText:[{type:i}],keyRequiredText:[{type:i}],valText:[{type:i}],valRequiredText:[{type:i}],hintText:[{type:i}],required:[{type:i}]}});class Fn extends f{constructor(e,t){super(e),this.store=e,this.fb=t}configForm(){return this.saveToCustomTableConfigForm}onConfigurationSet(e){this.saveToCustomTableConfigForm=this.fb.group({tableName:[e?e.tableName:null,[O.required,O.pattern(/.*\S.*/)]],fieldsMapping:[e?e.fieldsMapping:null,[O.required]]})}prepareOutputConfig(e){return e.tableName=e.tableName.trim(),e}}e("SaveToCustomTableConfigComponent",Fn),Fn.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Fn,deps:[{token:P.Store},{token:R.UntypedFormBuilder}],target:t.ɵɵFactoryTarget.Component}),Fn.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:Fn,selector:"tb-action-node-custom-table-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="saveToCustomTableConfigForm" fxLayout="column">\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.custom-table-name</mat-label>\n    <input required matInput formControlName="tableName">\n    <mat-error *ngIf="saveToCustomTableConfigForm.get(\'tableName\').hasError(\'required\') ||\n                      saveToCustomTableConfigForm.get(\'tableName\').hasError(\'pattern\')">\n      {{ \'tb.rulenode.custom-table-name-required\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.custom-table-hint</mat-hint>\n  </mat-form-field>\n  <label translate class="tb-title tb-required">tb.rulenode.fields-mapping</label>\n  <tb-kv-map-config-old\n    required\n    formControlName="fieldsMapping"\n    requiredText="tb.rulenode.fields-mapping-required"\n    keyText="tb.rulenode.message-field"\n    keyRequiredText="tb.rulenode.message-field-required"\n    valText="tb.rulenode.table-col"\n    valRequiredText="tb.rulenode.table-col-required">\n  </tb-kv-map-config-old>\n</section>\n',dependencies:[{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatHint,selector:"mat-hint",inputs:["align","id"]},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"component",type:Cn,selector:"tb-kv-map-config-old",inputs:["disabled","uniqueKeyValuePairValidator","requiredText","keyText","keyRequiredText","valText","valRequiredText","hintText","required"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Fn,decorators:[{type:n,args:[{selector:"tb-action-node-custom-table-config",template:'<section [formGroup]="saveToCustomTableConfigForm" fxLayout="column">\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.custom-table-name</mat-label>\n    <input required matInput formControlName="tableName">\n    <mat-error *ngIf="saveToCustomTableConfigForm.get(\'tableName\').hasError(\'required\') ||\n                      saveToCustomTableConfigForm.get(\'tableName\').hasError(\'pattern\')">\n      {{ \'tb.rulenode.custom-table-name-required\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.custom-table-hint</mat-hint>\n  </mat-form-field>\n  <label translate class="tb-title tb-required">tb.rulenode.fields-mapping</label>\n  <tb-kv-map-config-old\n    required\n    formControlName="fieldsMapping"\n    requiredText="tb.rulenode.fields-mapping-required"\n    keyText="tb.rulenode.message-field"\n    keyRequiredText="tb.rulenode.message-field-required"\n    valText="tb.rulenode.table-col"\n    valRequiredText="tb.rulenode.table-col-required">\n  </tb-kv-map-config-old>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder}]}});class kn extends f{constructor(e,t){super(e),this.store=e,this.fb=t}configForm(){return this.timeseriesConfigForm}onConfigurationSet(e){this.timeseriesConfigForm=this.fb.group({defaultTTL:[e?e.defaultTTL:null,[O.required,O.min(0)]],skipLatestPersistence:[!!e&&e.skipLatestPersistence,[]],useServerTs:[!!e&&e.useServerTs,[]]})}}e("TimeseriesConfigComponent",kn),kn.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:kn,deps:[{token:P.Store},{token:R.UntypedFormBuilder}],target:t.ɵɵFactoryTarget.Component}),kn.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:kn,selector:"tb-action-node-timeseries-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="timeseriesConfigForm" fxLayout="column">\n  <mat-form-field fxFlex class="mat-block">\n    <mat-label translate>tb.rulenode.default-ttl</mat-label>\n    <input type="number" min="0" step="1" matInput formControlName="defaultTTL" required>\n    <mat-error *ngIf="timeseriesConfigForm.get(\'defaultTTL\').hasError(\'required\')">\n      {{ \'tb.rulenode.default-ttl-required\' | translate }}\n    </mat-error>\n    <mat-error *ngIf="timeseriesConfigForm.get(\'defaultTTL\').hasError(\'min\')">\n      {{ \'tb.rulenode.min-default-ttl-message\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <mat-checkbox fxFlex formControlName="skipLatestPersistence">\n    {{ \'tb.rulenode.skip-latest-persistence\' | translate }}\n  </mat-checkbox>\n  <mat-checkbox fxFlex formControlName="useServerTs">\n    {{ \'tb.rulenode.use-server-ts\' | translate }}\n  </mat-checkbox>\n  <div class="tb-hint" translate>tb.rulenode.use-server-ts-hint</div>\n</section>\n',dependencies:[{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:Q.MatCheckbox,selector:"mat-checkbox",inputs:["disableRipple","color","tabIndex"],exportAs:["matCheckbox"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:W.DefaultFlexDirective,selector:"  [fxFlex], [fxFlex.xs], [fxFlex.sm], [fxFlex.md],  [fxFlex.lg], [fxFlex.xl], [fxFlex.lt-sm], [fxFlex.lt-md],  [fxFlex.lt-lg], [fxFlex.lt-xl], [fxFlex.gt-xs], [fxFlex.gt-sm],  [fxFlex.gt-md], [fxFlex.gt-lg]",inputs:["fxFlex","fxFlex.xs","fxFlex.sm","fxFlex.md","fxFlex.lg","fxFlex.xl","fxFlex.lt-sm","fxFlex.lt-md","fxFlex.lt-lg","fxFlex.lt-xl","fxFlex.gt-xs","fxFlex.gt-sm","fxFlex.gt-md","fxFlex.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NumberValueAccessor,selector:"input[type=number][formControlName],input[type=number][formControl],input[type=number][ngModel]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.MinValidator,selector:"input[type=number][min][formControlName],input[type=number][min][formControl],input[type=number][min][ngModel]",inputs:["min"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:kn,decorators:[{type:n,args:[{selector:"tb-action-node-timeseries-config",template:'<section [formGroup]="timeseriesConfigForm" fxLayout="column">\n  <mat-form-field fxFlex class="mat-block">\n    <mat-label translate>tb.rulenode.default-ttl</mat-label>\n    <input type="number" min="0" step="1" matInput formControlName="defaultTTL" required>\n    <mat-error *ngIf="timeseriesConfigForm.get(\'defaultTTL\').hasError(\'required\')">\n      {{ \'tb.rulenode.default-ttl-required\' | translate }}\n    </mat-error>\n    <mat-error *ngIf="timeseriesConfigForm.get(\'defaultTTL\').hasError(\'min\')">\n      {{ \'tb.rulenode.min-default-ttl-message\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <mat-checkbox fxFlex formControlName="skipLatestPersistence">\n    {{ \'tb.rulenode.skip-latest-persistence\' | translate }}\n  </mat-checkbox>\n  <mat-checkbox fxFlex formControlName="useServerTs">\n    {{ \'tb.rulenode.use-server-ts\' | translate }}\n  </mat-checkbox>\n  <div class="tb-hint" translate>tb.rulenode.use-server-ts-hint</div>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder}]}});class Ln extends f{constructor(e,t){super(e),this.store=e,this.fb=t}configForm(){return this.unassignCustomerConfigForm}onConfigurationSet(e){this.unassignCustomerConfigForm=this.fb.group({customerNamePattern:[e?e.customerNamePattern:null,[O.required,O.pattern(/.*\S.*/)]],customerCacheExpiration:[e?e.customerCacheExpiration:null,[O.required,O.min(0)]]})}prepareOutputConfig(e){return e.customerNamePattern=e.customerNamePattern.trim(),e}}e("UnassignCustomerConfigComponent",Ln),Ln.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Ln,deps:[{token:P.Store},{token:R.UntypedFormBuilder}],target:t.ɵɵFactoryTarget.Component}),Ln.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:Ln,selector:"tb-action-node-un-assign-to-customer-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="unassignCustomerConfigForm" fxLayout="column">\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.customer-name-pattern</mat-label>\n    <input required matInput formControlName="customerNamePattern">\n    <mat-error *ngIf="unassignCustomerConfigForm.get(\'customerNamePattern\').hasError(\'required\') ||\n                      unassignCustomerConfigForm.get(\'customerNamePattern\').hasError(\'pattern\')">\n      {{ \'tb.rulenode.customer-name-pattern-required\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n  </mat-form-field>\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.customer-cache-expiration</mat-label>\n    <input required type="number" min="0" step="1" matInput formControlName="customerCacheExpiration">\n    <mat-error *ngIf="unassignCustomerConfigForm.get(\'customerCacheExpiration\').hasError(\'required\')">\n      {{ \'tb.rulenode.customer-cache-expiration-required\' | translate }}\n    </mat-error>\n    <mat-error *ngIf="unassignCustomerConfigForm.get(\'customerCacheExpiration\').hasError(\'min\')">\n      {{ \'tb.rulenode.customer-cache-expiration-range\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.customer-cache-expiration-hint</mat-hint>\n  </mat-form-field>\n</section>\n',dependencies:[{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatHint,selector:"mat-hint",inputs:["align","id"]},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NumberValueAccessor,selector:"input[type=number][formControlName],input[type=number][formControl],input[type=number][ngModel]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.MinValidator,selector:"input[type=number][min][formControlName],input[type=number][min][formControl],input[type=number][min][ngModel]",inputs:["min"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Ln,decorators:[{type:n,args:[{selector:"tb-action-node-un-assign-to-customer-config",template:'<section [formGroup]="unassignCustomerConfigForm" fxLayout="column">\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.customer-name-pattern</mat-label>\n    <input required matInput formControlName="customerNamePattern">\n    <mat-error *ngIf="unassignCustomerConfigForm.get(\'customerNamePattern\').hasError(\'required\') ||\n                      unassignCustomerConfigForm.get(\'customerNamePattern\').hasError(\'pattern\')">\n      {{ \'tb.rulenode.customer-name-pattern-required\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n  </mat-form-field>\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.customer-cache-expiration</mat-label>\n    <input required type="number" min="0" step="1" matInput formControlName="customerCacheExpiration">\n    <mat-error *ngIf="unassignCustomerConfigForm.get(\'customerCacheExpiration\').hasError(\'required\')">\n      {{ \'tb.rulenode.customer-cache-expiration-required\' | translate }}\n    </mat-error>\n    <mat-error *ngIf="unassignCustomerConfigForm.get(\'customerCacheExpiration\').hasError(\'min\')">\n      {{ \'tb.rulenode.customer-cache-expiration-range\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.customer-cache-expiration-hint</mat-hint>\n  </mat-form-field>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder}]}});class Tn extends f{constructor(e,t){super(e),this.store=e,this.fb=t,this.attributeScopeMap=g,this.attributeScopes=Object.keys(g),this.telemetryTypeTranslationsMap=y,this.separatorKeysCodes=[ge,ye,xe]}configForm(){return this.deleteAttributesConfigForm}onConfigurationSet(e){this.deleteAttributesConfigForm=this.fb.group({scope:[e?e.scope:null,[O.required]],keys:[e?e.keys:null,[O.required]],sendAttributesDeletedNotification:[!!e&&e.sendAttributesDeletedNotification,[]],notifyDevice:[!!e&&e.notifyDevice,[]]}),this.deleteAttributesConfigForm.get("scope").valueChanges.subscribe((e=>{e!==g.SHARED_SCOPE&&this.deleteAttributesConfigForm.get("notifyDevice").patchValue(!1,{emitEvent:!1})}))}removeKey(e){const t=this.deleteAttributesConfigForm.get("keys").value,n=t.indexOf(e);n>=0&&(t.splice(n,1),this.deleteAttributesConfigForm.get("keys").patchValue(t,{emitEvent:!0}))}addKey(e){const t=e.input;let n=e.value;if((n||"").trim()){n=n.trim();let e=this.deleteAttributesConfigForm.get("keys").value;e&&-1!==e.indexOf(n)||(e||(e=[]),e.push(n),this.deleteAttributesConfigForm.get("keys").patchValue(e,{emitEvent:!0}))}t&&(t.value="")}}e("DeleteAttributesConfigComponent",Tn),Tn.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Tn,deps:[{token:P.Store},{token:R.UntypedFormBuilder}],target:t.ɵɵFactoryTarget.Component}),Tn.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:Tn,selector:"tb-action-node-delete-attributes-config",viewQueries:[{propertyName:"attributeChipList",first:!0,predicate:["attributeChipList"],descendants:!0}],usesInheritance:!0,ngImport:t,template:'<section [formGroup]="deleteAttributesConfigForm" fxLayout="column">\n  <mat-form-field>\n    <mat-label>{{ \'attribute.attributes-scope\' | translate }}</mat-label>\n    <mat-select required\n                class="tb-entity-type-select" matInput formControlName="scope">\n      <mat-option *ngFor="let scope of attributeScopes" [value]="scope">\n        {{ telemetryTypeTranslationsMap.get(scope) | translate }}\n      </mat-option>\n    </mat-select>\n  </mat-form-field>\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label>{{ \'tb.rulenode.attributes-keys\' | translate }}</mat-label>\n    <mat-chip-grid formControlName="keys" #attributeChipList>\n      <mat-chip-row\n        *ngFor="let key of deleteAttributesConfigForm.get(\'keys\').value;"\n        (removed)="removeKey(key)">\n        {{key}}\n        <mat-icon matChipRemove>close</mat-icon>\n      </mat-chip-row>\n      <input matInput type="text"\n             [matChipInputFor]="attributeChipList"\n             [matChipInputSeparatorKeyCodes]="separatorKeysCodes"\n             (matChipInputTokenEnd)="addKey($event)"\n             [matChipInputAddOnBlur]="true">\n    </mat-chip-grid>\n    <mat-error *ngIf="deleteAttributesConfigForm.get(\'keys\').hasError(\'required\')">{{ \'tb.rulenode.attributes-keys-required\' | translate }}</mat-error>\n    <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n  </mat-form-field>\n  <mat-checkbox formControlName="sendAttributesDeletedNotification">\n    {{ \'tb.rulenode.send-attributes-deleted-notification\' | translate }}\n  </mat-checkbox>\n  <div class="tb-hint" translate>tb.rulenode.send-attributes-deleted-notification-hint</div>\n  <div *ngIf="deleteAttributesConfigForm.get(\'scope\').value === attributeScopeMap.SHARED_SCOPE">\n    <mat-checkbox formControlName="notifyDevice">\n      {{ \'tb.rulenode.notify-device\' | translate }}\n    </mat-checkbox>\n    <div class="tb-hint" translate>tb.rulenode.notify-device-on-delete-hint</div>\n  </div>\n</section>\n',styles:[':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n'],dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:Q.MatCheckbox,selector:"mat-checkbox",inputs:["disableRipple","color","tabIndex"],exportAs:["matCheckbox"]},{kind:"component",type:ue.MatIcon,selector:"mat-icon",inputs:["color","inline","svgIcon","fontSet","fontIcon"],exportAs:["matIcon"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatHint,selector:"mat-hint",inputs:["align","id"]},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"component",type:X.MatSelect,selector:"mat-select",inputs:["disabled","disableRipple","tabIndex","hideSingleSelectionIndicator"],exportAs:["matSelect"]},{kind:"component",type:ee.MatOption,selector:"mat-option",exportAs:["matOption"]},{kind:"component",type:be.MatChipGrid,selector:"mat-chip-grid",inputs:["tabIndex","disabled","placeholder","required","value","errorStateMatcher"],outputs:["change","valueChange"]},{kind:"directive",type:be.MatChipInput,selector:"input[matChipInputFor]",inputs:["matChipInputFor","matChipInputAddOnBlur","matChipInputSeparatorKeyCodes","placeholder","id","disabled"],outputs:["matChipInputTokenEnd"],exportAs:["matChipInput","matChipInputFor"]},{kind:"directive",type:be.MatChipRemove,selector:"[matChipRemove]"},{kind:"component",type:be.MatChipRow,selector:"mat-chip-row, [mat-chip-row], mat-basic-chip-row, [mat-basic-chip-row]",inputs:["color","disabled","disableRipple","tabIndex","editable"],outputs:["edited"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Tn,decorators:[{type:n,args:[{selector:"tb-action-node-delete-attributes-config",template:'<section [formGroup]="deleteAttributesConfigForm" fxLayout="column">\n  <mat-form-field>\n    <mat-label>{{ \'attribute.attributes-scope\' | translate }}</mat-label>\n    <mat-select required\n                class="tb-entity-type-select" matInput formControlName="scope">\n      <mat-option *ngFor="let scope of attributeScopes" [value]="scope">\n        {{ telemetryTypeTranslationsMap.get(scope) | translate }}\n      </mat-option>\n    </mat-select>\n  </mat-form-field>\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label>{{ \'tb.rulenode.attributes-keys\' | translate }}</mat-label>\n    <mat-chip-grid formControlName="keys" #attributeChipList>\n      <mat-chip-row\n        *ngFor="let key of deleteAttributesConfigForm.get(\'keys\').value;"\n        (removed)="removeKey(key)">\n        {{key}}\n        <mat-icon matChipRemove>close</mat-icon>\n      </mat-chip-row>\n      <input matInput type="text"\n             [matChipInputFor]="attributeChipList"\n             [matChipInputSeparatorKeyCodes]="separatorKeysCodes"\n             (matChipInputTokenEnd)="addKey($event)"\n             [matChipInputAddOnBlur]="true">\n    </mat-chip-grid>\n    <mat-error *ngIf="deleteAttributesConfigForm.get(\'keys\').hasError(\'required\')">{{ \'tb.rulenode.attributes-keys-required\' | translate }}</mat-error>\n    <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n  </mat-form-field>\n  <mat-checkbox formControlName="sendAttributesDeletedNotification">\n    {{ \'tb.rulenode.send-attributes-deleted-notification\' | translate }}\n  </mat-checkbox>\n  <div class="tb-hint" translate>tb.rulenode.send-attributes-deleted-notification-hint</div>\n  <div *ngIf="deleteAttributesConfigForm.get(\'scope\').value === attributeScopeMap.SHARED_SCOPE">\n    <mat-checkbox formControlName="notifyDevice">\n      {{ \'tb.rulenode.notify-device\' | translate }}\n    </mat-checkbox>\n    <div class="tb-hint" translate>tb.rulenode.notify-device-on-delete-hint</div>\n  </div>\n</section>\n',styles:[':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n']}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder}]},propDecorators:{attributeChipList:[{type:o,args:["attributeChipList"]}]}});class In extends L{get function(){return this.functionValue}set function(e){e&&this.functionValue!==e&&(this.functionValue=e,this.setupArgumentsFormGroup(!0))}constructor(e,t){super(e),this.store=e,this.fb=t,this.maxArgs=16,this.minArgs=1,this.displayArgumentName=!1,this.mathFunctionMap=Wt,this.ArgumentType=Zt,this.attributeScopeMap=pn,this.argumentTypeMap=on,this.arguments=Object.values(Zt),this.attributeScope=Object.values(sn),this.propagateChange=null,this.valueChangeSubscription=[]}ngOnInit(){this.argumentsFormGroup=this.fb.group({arguments:this.fb.array([])}),this.valueChangeSubscription.push(this.argumentsFormGroup.valueChanges.subscribe((()=>{this.updateModel()}))),this.setupArgumentsFormGroup()}onDrop(e){const t=this.argumentsFormArray,n=t.at(e.previousIndex);t.removeAt(e.previousIndex),t.insert(e.currentIndex,n),this.updateArgumentNames()}get argumentsFormArray(){return this.argumentsFormGroup.get("arguments")}registerOnChange(e){this.propagateChange=e}registerOnTouched(e){}setDisabledState(e){this.disabled=e,this.disabled?this.argumentsFormGroup.disable({emitEvent:!1}):(this.argumentsFormGroup.enable({emitEvent:!1}),this.argumentsFormArray.controls.forEach((e=>this.updateArgumentControlValidators(e))))}ngOnDestroy(){this.valueChangeSubscription.length&&this.valueChangeSubscription.forEach((e=>e.unsubscribe()))}writeValue(e){const t=[];e&&e.forEach(((e,n)=>{t.push(this.createArgumentControl(e,n))})),this.argumentsFormGroup.setControl("arguments",this.fb.array(t),{emitEvent:!1}),this.setupArgumentsFormGroup()}removeArgument(e){this.argumentsFormArray.removeAt(e),this.updateArgumentNames()}addArgument(e=!0){const t=this.argumentsFormArray,n=this.createArgumentControl(null,t.length);t.push(n,{emitEvent:e})}validate(e){return this.argumentsFormGroup.valid?null:{argumentsRequired:!0}}setupArgumentsFormGroup(e=!1){if(this.function&&(this.maxArgs=this.mathFunctionMap.get(this.function).maxArgs,this.minArgs=this.mathFunctionMap.get(this.function).minArgs,this.displayArgumentName=this.function===Yt.CUSTOM),this.argumentsFormGroup){for(this.argumentsFormGroup.get("arguments").setValidators([O.minLength(this.minArgs),O.maxLength(this.maxArgs)]);this.argumentsFormArray.length>this.maxArgs;)this.removeArgument(this.maxArgs-1);for(;this.argumentsFormArray.length<this.minArgs;)this.addArgument(e);this.argumentsFormGroup.get("arguments").updateValueAndValidity({emitEvent:!1})}}createArgumentControl(e,t){const n=this.fb.group({type:[e?.type,[O.required]],key:[e?.key,[O.required]],name:[ln[t],[O.required]],attributeScope:[e?.attributeScope??sn.SERVER_SCOPE,[O.required]],defaultValue:[e?.defaultValue?e?.defaultValue:null]});return this.updateArgumentControlValidators(n),this.valueChangeSubscription.push(n.get("type").valueChanges.subscribe((()=>{this.updateArgumentControlValidators(n),n.get("attributeScope").updateValueAndValidity({emitEvent:!1}),n.get("defaultValue").updateValueAndValidity({emitEvent:!1})}))),n}updateArgumentControlValidators(e){const t=e.get("type").value;t===Zt.ATTRIBUTE?e.get("attributeScope").enable({emitEvent:!1}):e.get("attributeScope").disable({emitEvent:!1}),t&&t!==Zt.CONSTANT?e.get("defaultValue").enable({emitEvent:!1}):e.get("defaultValue").disable({emitEvent:!1})}updateArgumentNames(){this.argumentsFormArray.controls.forEach(((e,t)=>{e.get("name").setValue(ln[t])}))}updateModel(){const e=this.argumentsFormArray.value;e.length&&this.argumentsFormGroup.valid?this.propagateChange(e):this.propagateChange(null)}}e("ArgumentsMapConfigComponent",In),In.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:In,deps:[{token:P.Store},{token:R.FormBuilder}],target:t.ɵɵFactoryTarget.Component}),In.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:In,selector:"tb-arguments-map-config",inputs:{disabled:"disabled",function:"function"},providers:[{provide:B,useExisting:a((()=>In)),multi:!0},{provide:K,useExisting:a((()=>In)),multi:!0}],usesInheritance:!0,ngImport:t,template:'<section fxLayout="column">\n\n  <div [ngClass]="{\'tb-readonly\': disabled}"\n       style="max-height: 500px; overflow: auto;">\n    <mat-list class="tb-drop-list arguments-list" cdkDropList cdkDropListOrientation="vertical"\n              [formGroup]="argumentsFormGroup"\n              (cdkDropListDropped)="onDrop($event)"\n              [cdkDropListDisabled]="disabled">\n      <mat-list-item *ngFor="let argumentControl of argumentsFormArray.controls; let $index = index"\n                     formArrayName="arguments"\n                     cdkDrag class="tb-argument tb-draggable"\n                     [cdkDragDisabled]="disabled"\n                     style="height: 100%">\n        <div fxFlex fxLayout="row" fxLayoutAlign="start center">\n          <button *ngIf="!disabled" mat-icon-button color="primary"\n                  cdkDragHandle\n                  class="tb-drag-handle handle"\n                  style="min-width: 40px; margin: 0"\n                  matTooltip="{{ \'action.drag\' | translate }}"\n                  matTooltipPosition="above">\n            <mat-icon>drag_handle</mat-icon>\n          </button>\n          <div fxFlex fxLAyout="row" fxLayoutAlign="start center" fxLayoutGap="16px">\n            <span *ngIf="displayArgumentName"\n                  style="padding: 0 10px; min-width: 20px;">{{argumentControl.get(\'name\').value}}.</span>\n            <div fxFlex fxLayout="column">\n              <mat-form-field class="mat-block">\n                <mat-label translate>tb.rulenode.argument-source-field-input</mat-label>\n                <mat-select [formControl]="argumentControl.get(\'type\')" required>\n                  <mat-select-trigger>\n                    {{ argumentTypeMap.get(argumentControl.get(\'type\').value)?.name | translate }}\n                  </mat-select-trigger>\n                  <mat-option *ngFor="let argument of arguments" [value]="argument"\n                              style="border-bottom: 1px solid #eee;">\n                    {{ argumentTypeMap.get(argument).name | translate }}\n                    <small style="display: block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">\n                      {{ argumentTypeMap.get(argument).description }}\n                    </small>\n                  </mat-option>\n                </mat-select>\n                <mat-error *ngIf="argumentControl.get(\'type\').hasError(\'required\')" translate>\n                  tb.rulenode.argument-source-field-input-required\n                </mat-error>\n              </mat-form-field>\n              <div fxFlex fxLayout="row" fxLayout.xs="column" fxLayoutGap.gt-xs="16px">\n                <mat-form-field fxFlex="50" floatLabel="always" class="mat-block"\n                                *ngIf="argumentControl.get(\'type\').value && argumentControl.get(\'type\').value !== ArgumentType.CONSTANT">\n                  <mat-label translate>tb.rulenode.argument-key-field-input</mat-label>\n                  <input [formControl]="argumentControl.get(\'key\')" matInput required/>\n                  <mat-icon class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon" matSuffix\n                            color="primary"\n                            matTooltip="{{ \'tb.rulenode.math-templatization-tooltip\' | translate }}">\n                    help\n                  </mat-icon>\n                  <mat-error *ngIf="argumentControl.get(\'key\').hasError(\'required\')" translate>\n                    tb.rulenode.argument-key-field-input-required\n                  </mat-error>\n                </mat-form-field>\n                <mat-form-field fxFlex floatLabel="always" class="mat-block"\n                                *ngIf="argumentControl.get(\'type\').value === ArgumentType.CONSTANT">\n                  <mat-label translate>tb.rulenode.constant-value-field-input</mat-label>\n                  <input [formControl]="argumentControl.get(\'key\')"\n                         matInput\n                         required\n                         step="1" min="0"\n                         type="number"/>\n                  <mat-error *ngIf="argumentControl.get(\'key\').hasError(\'required\')" translate>\n                    tb.rulenode.constant-value-field-input-required\n                  </mat-error>\n                </mat-form-field>\n                <mat-form-field *ngIf="argumentControl.get(\'type\').value && argumentControl.get(\'type\').value !== ArgumentType.CONSTANT"\n                                fxFlex="50" floatLabel="always" class="mat-block">\n                  <mat-label translate>tb.rulenode.default-value-field-input</mat-label>\n                  <input [formControl]="argumentControl.get(\'defaultValue\')" matInput step="1" type="number"/>\n                </mat-form-field>\n              </div>\n              <mat-form-field *ngIf="argumentControl.get(\'type\').value === ArgumentType.ATTRIBUTE" class="mat-block">\n                <mat-label translate>tb.rulenode.attribute-scope-field-input</mat-label>\n                <mat-select required [formControl]="argumentControl.get(\'attributeScope\')">\n                  <mat-option *ngFor="let scope of attributeScope" [value]="scope">\n                    {{ attributeScopeMap.get(scope) | translate }}\n                  </mat-option>\n                </mat-select>\n                <mat-error *ngIf="argumentControl.get(\'attributeScope\').hasError(\'required\')" translate>\n                  tb.rulenode.attribute-scope-field-input-required\n                </mat-error>\n              </mat-form-field>\n            </div>\n            <button *ngIf="!disabled" mat-icon-button color="primary" style="min-width: 40px;"\n                    (click)="removeArgument($index)"\n                    matTooltip="{{ \'action.remove\' | translate }}"\n                    matTooltipPosition="above">\n              <mat-icon>close</mat-icon>\n            </button>\n          </div>\n        </div>\n      </mat-list-item>\n    </mat-list>\n  </div>\n  <div *ngIf="!argumentsFormArray.length">\n      <span translate fxLayoutAlign="center center"\n            class="tb-prompt">tb.rulenode.no-arguments-prompt</span>\n  </div>\n  <button mat-button mat-raised-button color="primary"\n          [disabled]="argumentsFormArray.length >= maxArgs"\n          (click)="addArgument()"\n          type="button"\n          matTooltipPosition="above">\n    <mat-icon>add</mat-icon>\n    {{ \'action.add\' | translate }}\n  </button>\n</section>\n',styles:[":host .mat-mdc-list-item.tb-argument{border:solid rgba(0,0,0,.25) 1px;border-radius:4px;padding:10px 0;margin-bottom:16px}:host .arguments-list{padding:0}\n"],dependencies:[{kind:"directive",type:H.NgClass,selector:"[ngClass]",inputs:["class","ngClass"]},{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:de.MatButton,selector:"    button[mat-button], button[mat-raised-button], button[mat-flat-button],    button[mat-stroked-button]  ",inputs:["disabled","disableRipple","color"],exportAs:["matButton"]},{kind:"component",type:de.MatIconButton,selector:"button[mat-icon-button]",inputs:["disabled","disableRipple","color"],exportAs:["matButton"]},{kind:"component",type:ue.MatIcon,selector:"mat-icon",inputs:["color","inline","svgIcon","fontSet","fontIcon"],exportAs:["matIcon"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"directive",type:Y.MatSuffix,selector:"[matSuffix], [matIconSuffix], [matTextSuffix]",inputs:["matTextSuffix"]},{kind:"component",type:X.MatSelect,selector:"mat-select",inputs:["disabled","disableRipple","tabIndex","hideSingleSelectionIndicator"],exportAs:["matSelect"]},{kind:"directive",type:X.MatSelectTrigger,selector:"mat-select-trigger"},{kind:"component",type:ee.MatOption,selector:"mat-option",exportAs:["matOption"]},{kind:"directive",type:ce.MatTooltip,selector:"[matTooltip]",exportAs:["matTooltip"]},{kind:"component",type:qe.MatList,selector:"mat-list",exportAs:["matList"]},{kind:"component",type:qe.MatListItem,selector:"mat-list-item, a[mat-list-item], button[mat-list-item]",inputs:["activated"],exportAs:["matListItem"]},{kind:"directive",type:Ae.CdkDropList,selector:"[cdkDropList], cdk-drop-list",inputs:["cdkDropListConnectedTo","cdkDropListData","cdkDropListOrientation","id","cdkDropListLockAxis","cdkDropListDisabled","cdkDropListSortingDisabled","cdkDropListEnterPredicate","cdkDropListSortPredicate","cdkDropListAutoScrollDisabled","cdkDropListAutoScrollStep"],outputs:["cdkDropListDropped","cdkDropListEntered","cdkDropListExited","cdkDropListSorted"],exportAs:["cdkDropList"]},{kind:"directive",type:Ae.CdkDrag,selector:"[cdkDrag]",inputs:["cdkDragData","cdkDragLockAxis","cdkDragRootElement","cdkDragBoundary","cdkDragStartDelay","cdkDragFreeDragPosition","cdkDragDisabled","cdkDragConstrainPosition","cdkDragPreviewClass","cdkDragPreviewContainer"],outputs:["cdkDragStarted","cdkDragReleased","cdkDragEnded","cdkDragEntered","cdkDragExited","cdkDragDropped","cdkDragMoved"],exportAs:["cdkDrag"]},{kind:"directive",type:Ae.CdkDragHandle,selector:"[cdkDragHandle]",inputs:["cdkDragHandleDisabled"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:W.DefaultLayoutGapDirective,selector:"  [fxLayoutGap], [fxLayoutGap.xs], [fxLayoutGap.sm], [fxLayoutGap.md],  [fxLayoutGap.lg], [fxLayoutGap.xl], [fxLayoutGap.lt-sm], [fxLayoutGap.lt-md],  [fxLayoutGap.lt-lg], [fxLayoutGap.lt-xl], [fxLayoutGap.gt-xs], [fxLayoutGap.gt-sm],  [fxLayoutGap.gt-md], [fxLayoutGap.gt-lg]",inputs:["fxLayoutGap","fxLayoutGap.xs","fxLayoutGap.sm","fxLayoutGap.md","fxLayoutGap.lg","fxLayoutGap.xl","fxLayoutGap.lt-sm","fxLayoutGap.lt-md","fxLayoutGap.lt-lg","fxLayoutGap.lt-xl","fxLayoutGap.gt-xs","fxLayoutGap.gt-sm","fxLayoutGap.gt-md","fxLayoutGap.gt-lg"]},{kind:"directive",type:W.DefaultLayoutAlignDirective,selector:"  [fxLayoutAlign], [fxLayoutAlign.xs], [fxLayoutAlign.sm], [fxLayoutAlign.md],  [fxLayoutAlign.lg], [fxLayoutAlign.xl], [fxLayoutAlign.lt-sm], [fxLayoutAlign.lt-md],  [fxLayoutAlign.lt-lg], [fxLayoutAlign.lt-xl], [fxLayoutAlign.gt-xs], [fxLayoutAlign.gt-sm],  [fxLayoutAlign.gt-md], [fxLayoutAlign.gt-lg]",inputs:["fxLayoutAlign","fxLayoutAlign.xs","fxLayoutAlign.sm","fxLayoutAlign.md","fxLayoutAlign.lg","fxLayoutAlign.xl","fxLayoutAlign.lt-sm","fxLayoutAlign.lt-md","fxLayoutAlign.lt-lg","fxLayoutAlign.lt-xl","fxLayoutAlign.gt-xs","fxLayoutAlign.gt-sm","fxLayoutAlign.gt-md","fxLayoutAlign.gt-lg"]},{kind:"directive",type:W.DefaultFlexDirective,selector:"  [fxFlex], [fxFlex.xs], [fxFlex.sm], [fxFlex.md],  [fxFlex.lg], [fxFlex.xl], [fxFlex.lt-sm], [fxFlex.lt-md],  [fxFlex.lt-lg], [fxFlex.lt-xl], [fxFlex.gt-xs], [fxFlex.gt-sm],  [fxFlex.gt-md], [fxFlex.gt-lg]",inputs:["fxFlex","fxFlex.xs","fxFlex.sm","fxFlex.md","fxFlex.lg","fxFlex.xl","fxFlex.lt-sm","fxFlex.lt-md","fxFlex.lt-lg","fxFlex.lt-xl","fxFlex.gt-xs","fxFlex.gt-sm","fxFlex.gt-md","fxFlex.gt-lg"]},{kind:"directive",type:Se.DefaultClassDirective,selector:"  [ngClass], [ngClass.xs], [ngClass.sm], [ngClass.md], [ngClass.lg], [ngClass.xl],  [ngClass.lt-sm], [ngClass.lt-md], [ngClass.lt-lg], [ngClass.lt-xl],  [ngClass.gt-xs], [ngClass.gt-sm], [ngClass.gt-md], [ngClass.gt-lg]",inputs:["ngClass","ngClass.xs","ngClass.sm","ngClass.md","ngClass.lg","ngClass.xl","ngClass.lt-sm","ngClass.lt-md","ngClass.lt-lg","ngClass.lt-xl","ngClass.gt-xs","ngClass.gt-sm","ngClass.gt-md","ngClass.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NumberValueAccessor,selector:"input[type=number][formControlName],input[type=number][formControl],input[type=number][ngModel]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.MinValidator,selector:"input[type=number][min][formControlName],input[type=number][min][formControl],input[type=number][min][ngModel]",inputs:["min"]},{kind:"directive",type:R.FormControlDirective,selector:"[formControl]",inputs:["formControl","disabled","ngModel"],outputs:["ngModelChange"],exportAs:["ngForm"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormArrayName,selector:"[formArrayName]",inputs:["formArrayName"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:In,decorators:[{type:n,args:[{selector:"tb-arguments-map-config",providers:[{provide:B,useExisting:a((()=>In)),multi:!0},{provide:K,useExisting:a((()=>In)),multi:!0}],template:'<section fxLayout="column">\n\n  <div [ngClass]="{\'tb-readonly\': disabled}"\n       style="max-height: 500px; overflow: auto;">\n    <mat-list class="tb-drop-list arguments-list" cdkDropList cdkDropListOrientation="vertical"\n              [formGroup]="argumentsFormGroup"\n              (cdkDropListDropped)="onDrop($event)"\n              [cdkDropListDisabled]="disabled">\n      <mat-list-item *ngFor="let argumentControl of argumentsFormArray.controls; let $index = index"\n                     formArrayName="arguments"\n                     cdkDrag class="tb-argument tb-draggable"\n                     [cdkDragDisabled]="disabled"\n                     style="height: 100%">\n        <div fxFlex fxLayout="row" fxLayoutAlign="start center">\n          <button *ngIf="!disabled" mat-icon-button color="primary"\n                  cdkDragHandle\n                  class="tb-drag-handle handle"\n                  style="min-width: 40px; margin: 0"\n                  matTooltip="{{ \'action.drag\' | translate }}"\n                  matTooltipPosition="above">\n            <mat-icon>drag_handle</mat-icon>\n          </button>\n          <div fxFlex fxLAyout="row" fxLayoutAlign="start center" fxLayoutGap="16px">\n            <span *ngIf="displayArgumentName"\n                  style="padding: 0 10px; min-width: 20px;">{{argumentControl.get(\'name\').value}}.</span>\n            <div fxFlex fxLayout="column">\n              <mat-form-field class="mat-block">\n                <mat-label translate>tb.rulenode.argument-source-field-input</mat-label>\n                <mat-select [formControl]="argumentControl.get(\'type\')" required>\n                  <mat-select-trigger>\n                    {{ argumentTypeMap.get(argumentControl.get(\'type\').value)?.name | translate }}\n                  </mat-select-trigger>\n                  <mat-option *ngFor="let argument of arguments" [value]="argument"\n                              style="border-bottom: 1px solid #eee;">\n                    {{ argumentTypeMap.get(argument).name | translate }}\n                    <small style="display: block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">\n                      {{ argumentTypeMap.get(argument).description }}\n                    </small>\n                  </mat-option>\n                </mat-select>\n                <mat-error *ngIf="argumentControl.get(\'type\').hasError(\'required\')" translate>\n                  tb.rulenode.argument-source-field-input-required\n                </mat-error>\n              </mat-form-field>\n              <div fxFlex fxLayout="row" fxLayout.xs="column" fxLayoutGap.gt-xs="16px">\n                <mat-form-field fxFlex="50" floatLabel="always" class="mat-block"\n                                *ngIf="argumentControl.get(\'type\').value && argumentControl.get(\'type\').value !== ArgumentType.CONSTANT">\n                  <mat-label translate>tb.rulenode.argument-key-field-input</mat-label>\n                  <input [formControl]="argumentControl.get(\'key\')" matInput required/>\n                  <mat-icon class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon" matSuffix\n                            color="primary"\n                            matTooltip="{{ \'tb.rulenode.math-templatization-tooltip\' | translate }}">\n                    help\n                  </mat-icon>\n                  <mat-error *ngIf="argumentControl.get(\'key\').hasError(\'required\')" translate>\n                    tb.rulenode.argument-key-field-input-required\n                  </mat-error>\n                </mat-form-field>\n                <mat-form-field fxFlex floatLabel="always" class="mat-block"\n                                *ngIf="argumentControl.get(\'type\').value === ArgumentType.CONSTANT">\n                  <mat-label translate>tb.rulenode.constant-value-field-input</mat-label>\n                  <input [formControl]="argumentControl.get(\'key\')"\n                         matInput\n                         required\n                         step="1" min="0"\n                         type="number"/>\n                  <mat-error *ngIf="argumentControl.get(\'key\').hasError(\'required\')" translate>\n                    tb.rulenode.constant-value-field-input-required\n                  </mat-error>\n                </mat-form-field>\n                <mat-form-field *ngIf="argumentControl.get(\'type\').value && argumentControl.get(\'type\').value !== ArgumentType.CONSTANT"\n                                fxFlex="50" floatLabel="always" class="mat-block">\n                  <mat-label translate>tb.rulenode.default-value-field-input</mat-label>\n                  <input [formControl]="argumentControl.get(\'defaultValue\')" matInput step="1" type="number"/>\n                </mat-form-field>\n              </div>\n              <mat-form-field *ngIf="argumentControl.get(\'type\').value === ArgumentType.ATTRIBUTE" class="mat-block">\n                <mat-label translate>tb.rulenode.attribute-scope-field-input</mat-label>\n                <mat-select required [formControl]="argumentControl.get(\'attributeScope\')">\n                  <mat-option *ngFor="let scope of attributeScope" [value]="scope">\n                    {{ attributeScopeMap.get(scope) | translate }}\n                  </mat-option>\n                </mat-select>\n                <mat-error *ngIf="argumentControl.get(\'attributeScope\').hasError(\'required\')" translate>\n                  tb.rulenode.attribute-scope-field-input-required\n                </mat-error>\n              </mat-form-field>\n            </div>\n            <button *ngIf="!disabled" mat-icon-button color="primary" style="min-width: 40px;"\n                    (click)="removeArgument($index)"\n                    matTooltip="{{ \'action.remove\' | translate }}"\n                    matTooltipPosition="above">\n              <mat-icon>close</mat-icon>\n            </button>\n          </div>\n        </div>\n      </mat-list-item>\n    </mat-list>\n  </div>\n  <div *ngIf="!argumentsFormArray.length">\n      <span translate fxLayoutAlign="center center"\n            class="tb-prompt">tb.rulenode.no-arguments-prompt</span>\n  </div>\n  <button mat-button mat-raised-button color="primary"\n          [disabled]="argumentsFormArray.length >= maxArgs"\n          (click)="addArgument()"\n          type="button"\n          matTooltipPosition="above">\n    <mat-icon>add</mat-icon>\n    {{ \'action.add\' | translate }}\n  </button>\n</section>\n',styles:[":host .mat-mdc-list-item.tb-argument{border:solid rgba(0,0,0,.25) 1px;border-radius:4px;padding:10px 0;margin-bottom:16px}:host .arguments-list{padding:0}\n"]}]}],ctorParameters:function(){return[{type:P.Store},{type:R.FormBuilder}]},propDecorators:{disabled:[{type:i}],function:[{type:i}]}});class Nn extends L{get required(){return this.requiredValue}set required(e){this.requiredValue=Le(e)}constructor(e,t,n,r){super(e),this.store=e,this.translate=t,this.injector=n,this.fb=r,this.searchText="",this.dirty=!1,this.mathOperation=[...Wt.values()],this.propagateChange=null}ngOnInit(){this.mathFunctionForm=this.fb.group({operation:[""]}),this.filteredOptions=this.mathFunctionForm.get("operation").valueChanges.pipe(Me((e=>{let t;t="string"==typeof e&&Yt[e]?Yt[e]:null,this.updateView(t)})),Ee((e=>(this.searchText=e||"",e?this._filter(e):this.mathOperation.slice()))))}_filter(e){const t=e.toLowerCase();return this.mathOperation.filter((e=>e.name.toLowerCase().includes(t)||e.value.toLowerCase().includes(t)))}registerOnChange(e){this.propagateChange=e}registerOnTouched(e){}setDisabledState(e){this.disabled=e,this.disabled?this.mathFunctionForm.disable({emitEvent:!1}):this.mathFunctionForm.enable({emitEvent:!1})}mathFunctionDisplayFn(e){if(e){const t=Wt.get(e);return t.value+" | "+t.name}return""}writeValue(e){this.modelValue=e,this.mathFunctionForm.get("operation").setValue(e,{emitEvent:!1}),this.dirty=!0}updateView(e){this.modelValue!==e&&(this.modelValue=e,this.propagateChange(this.modelValue))}onFocus(){this.dirty&&(this.mathFunctionForm.get("operation").updateValueAndValidity({onlySelf:!0}),this.dirty=!1)}clear(){this.mathFunctionForm.get("operation").patchValue(""),setTimeout((()=>{this.operationInput.nativeElement.blur(),this.operationInput.nativeElement.focus()}),0)}}e("MathFunctionAutocompleteComponent",Nn),Nn.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Nn,deps:[{token:P.Store},{token:Z.TranslateService},{token:t.Injector},{token:R.UntypedFormBuilder}],target:t.ɵɵFactoryTarget.Component}),Nn.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:Nn,selector:"tb-math-function-autocomplete",inputs:{required:"required",disabled:"disabled"},providers:[{provide:B,useExisting:a((()=>Nn)),multi:!0}],viewQueries:[{propertyName:"operationInput",first:!0,predicate:["operationInput"],descendants:!0,static:!0}],usesInheritance:!0,ngImport:t,template:'<mat-form-field [formGroup]="mathFunctionForm" class="mat-block">\n  <mat-label translate>tb.rulenode.functions-field-input</mat-label>\n  <input [required]="required"\n         (focusin)="onFocus()"\n         type="text"\n         #operationInput matInput\n         formControlName="operation"\n         [matAutocomplete]="auto">\n  <button *ngIf="mathFunctionForm.get(\'operation\').value"\n          type="button"\n          matSuffix mat-icon-button aria-label="Clear"\n          (click)="clear()">\n    <mat-icon class="material-icons">close</mat-icon>\n  </button>\n  <mat-autocomplete #auto="matAutocomplete" class="tb-autocomplete" [displayWith]="mathFunctionDisplayFn">\n    <mat-option *ngFor="let option of filteredOptions | async" [value]="option.value">\n      <span [innerHTML]="option.value + \' | \' + option.name | highlight:searchText"></span>\n      <small style="display: block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">\n        {{ option.description }}\n      </small>\n    </mat-option>\n    <mat-option *ngIf="!(filteredOptions | async)?.length" [value]="null">\n      <span translate>tb.rulenode.no-option-found</span>\n    </mat-option>\n  </mat-autocomplete>\n</mat-form-field>\n',dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:de.MatIconButton,selector:"button[mat-icon-button]",inputs:["disabled","disableRipple","color"],exportAs:["matButton"]},{kind:"component",type:ue.MatIcon,selector:"mat-icon",inputs:["color","inline","svgIcon","fontSet","fontIcon"],exportAs:["matIcon"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatSuffix,selector:"[matSuffix], [matIconSuffix], [matTextSuffix]",inputs:["matTextSuffix"]},{kind:"component",type:ee.MatOption,selector:"mat-option",exportAs:["matOption"]},{kind:"component",type:Re.MatAutocomplete,selector:"mat-autocomplete",inputs:["disableRipple","hideSingleSelectionIndicator"],exportAs:["matAutocomplete"]},{kind:"directive",type:Re.MatAutocompleteTrigger,selector:"input[matAutocomplete], textarea[matAutocomplete]",exportAs:["matAutocompleteTrigger"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"pipe",type:H.AsyncPipe,name:"async"},{kind:"pipe",type:Oe.HighlightPipe,name:"highlight"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Nn,decorators:[{type:n,args:[{selector:"tb-math-function-autocomplete",providers:[{provide:B,useExisting:a((()=>Nn)),multi:!0}],template:'<mat-form-field [formGroup]="mathFunctionForm" class="mat-block">\n  <mat-label translate>tb.rulenode.functions-field-input</mat-label>\n  <input [required]="required"\n         (focusin)="onFocus()"\n         type="text"\n         #operationInput matInput\n         formControlName="operation"\n         [matAutocomplete]="auto">\n  <button *ngIf="mathFunctionForm.get(\'operation\').value"\n          type="button"\n          matSuffix mat-icon-button aria-label="Clear"\n          (click)="clear()">\n    <mat-icon class="material-icons">close</mat-icon>\n  </button>\n  <mat-autocomplete #auto="matAutocomplete" class="tb-autocomplete" [displayWith]="mathFunctionDisplayFn">\n    <mat-option *ngFor="let option of filteredOptions | async" [value]="option.value">\n      <span [innerHTML]="option.value + \' | \' + option.name | highlight:searchText"></span>\n      <small style="display: block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">\n        {{ option.description }}\n      </small>\n    </mat-option>\n    <mat-option *ngIf="!(filteredOptions | async)?.length" [value]="null">\n      <span translate>tb.rulenode.no-option-found</span>\n    </mat-option>\n  </mat-autocomplete>\n</mat-form-field>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:Z.TranslateService},{type:t.Injector},{type:R.UntypedFormBuilder}]},propDecorators:{required:[{type:i}],disabled:[{type:i}],operationInput:[{type:o,args:["operationInput",{static:!0}]}]}});class Sn extends f{constructor(e,t){super(e),this.store=e,this.fb=t,this.MathFunction=Yt,this.ArgumentTypeResult=Xt,this.argumentTypeResultMap=an,this.attributeScopeMap=pn,this.argumentsResult=Object.values(Xt),this.attributeScopeResult=Object.values(mn)}configForm(){return this.mathFunctionConfigForm}onConfigurationSet(e){this.mathFunctionConfigForm=this.fb.group({operation:[e?e.operation:null,[O.required]],arguments:[e?e.arguments:null,[O.required]],customFunction:[e?e.customFunction:"",[O.required]],result:this.fb.group({type:[e?e.result.type:null,[O.required]],attributeScope:[e?e.result.attributeScope:null,[O.required]],key:[e?e.result.key:"",[O.required]],resultValuePrecision:[e?e.result.resultValuePrecision:0],addToBody:[!!e&&e.result.addToBody],addToMetadata:[!!e&&e.result.addToMetadata]})})}updateValidators(e){const t=this.mathFunctionConfigForm.get("operation").value,n=this.mathFunctionConfigForm.get("result.type").value;t===Yt.CUSTOM?(this.mathFunctionConfigForm.get("customFunction").enable({emitEvent:!1}),null===this.mathFunctionConfigForm.get("customFunction").value&&this.mathFunctionConfigForm.get("customFunction").patchValue("(x - 32) / 1.8",{emitEvent:!1})):this.mathFunctionConfigForm.get("customFunction").disable({emitEvent:!1}),n===Xt.ATTRIBUTE?this.mathFunctionConfigForm.get("result.attributeScope").enable({emitEvent:!1}):this.mathFunctionConfigForm.get("result.attributeScope").disable({emitEvent:!1}),this.mathFunctionConfigForm.get("customFunction").updateValueAndValidity({emitEvent:e}),this.mathFunctionConfigForm.get("result.attributeScope").updateValueAndValidity({emitEvent:e})}validatorTriggers(){return["operation","result.type"]}}e("MathFunctionConfigComponent",Sn),Sn.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Sn,deps:[{token:P.Store},{token:R.UntypedFormBuilder}],target:t.ɵɵFactoryTarget.Component}),Sn.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:Sn,selector:"tb-action-node-math-function-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="mathFunctionConfigForm" fxLayout="column">\n  <tb-math-function-autocomplete\n    fxFlex="30" fxFlex.md fxFlex.xs\n    required\n    formControlName="operation">\n  </tb-math-function-autocomplete>\n  <fieldset class="fields-group" fxLayout="column" fxLayoutGap="8px">\n    <legend class="group-title" translate>tb.rulenode.argument-tile</legend>\n    <tb-arguments-map-config formControlName="arguments"\n                             [function]="mathFunctionConfigForm.get(\'operation\').value">\n    </tb-arguments-map-config>\n  </fieldset>\n  <fieldset *ngIf="mathFunctionConfigForm.get(\'operation\').value === MathFunction.CUSTOM"\n            class="fields-group" fxLayout="column" fxLayoutGap="8px">\n    <legend class="group-title">{{\'tb.rulenode.custom-expression-field-input\' | translate }} *</legend>\n    <mat-form-field fxFlex class="mat-block no-margin-top" subscriptSizing="dynamic">\n      <input matInput formControlName="customFunction" required/>\n      <mat-error *ngIf="mathFunctionConfigForm.get(\'customFunction\').hasError(\'required\')" translate>\n        tb.rulenode.custom-expression-field-input-required\n      </mat-error>\n      <mat-hint translate>tb.rulenode.custom-expression-field-input-hint</mat-hint>\n    </mat-form-field>\n  </fieldset>\n  <fieldset class="fields-group" fxLayout="column" fxLayoutGap="8px">\n    <legend class="group-title" translate>tb.rulenode.result-title</legend>\n    <div formGroupName="result">\n      <mat-form-field fxFlex class="mat-block">\n        <mat-label translate>tb.rulenode.type-field-input</mat-label>\n        <mat-select formControlName="type" required>\n          <mat-select-trigger>\n            {{ argumentTypeResultMap.get(mathFunctionConfigForm.get(\'result.type\').value)?.name | translate }}\n          </mat-select-trigger>\n          <mat-option *ngFor="let argument of argumentsResult" [value]="argument"\n                      style="border-bottom: 1px solid #eee;">\n            {{ argumentTypeResultMap.get(argument).name | translate }}\n            <small style="display: block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">\n              {{ argumentTypeResultMap.get(argument).description }}\n            </small>\n          </mat-option>\n        </mat-select>\n        <mat-error *ngIf="mathFunctionConfigForm.get(\'result.type\').hasError(\'required\')" translate>\n          tb.rulenode.type-field-input-required\n        </mat-error>\n      </mat-form-field>\n      <div fxFlex fxLayout="row" fxLayout.xs="column" fxLayoutGap.gt-xs="16px">\n        <mat-form-field fxFlex class="mat-block" *ngIf="mathFunctionConfigForm.get(\'result\').get(\'type\').value === ArgumentTypeResult.ATTRIBUTE">\n          <mat-label translate>tb.rulenode.attribute-scope-field-input</mat-label>\n          <mat-select required formControlName="attributeScope">\n            <mat-option *ngFor="let scope of attributeScopeResult" [value]="scope">\n              {{ attributeScopeMap.get(scope) | translate }}\n            </mat-option>\n          </mat-select>\n        </mat-form-field>\n        <mat-form-field fxFlex floatLabel="always" class="mat-block">\n          <mat-label translate>tb.rulenode.key-field-input</mat-label>\n          <input matInput formControlName="key" required/>\n          <mat-icon class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon" matSuffix\n                    color="primary"\n                    matTooltip="{{ \'tb.rulenode.math-templatization-tooltip\' | translate }}">help</mat-icon>\n          <mat-error *ngIf="mathFunctionConfigForm.get(\'result.key\').hasError(\'required\')" translate>\n            tb.rulenode.key-field-input-required\n          </mat-error>\n        </mat-form-field>\n      </div>\n      <div fxFlex fxLayout="row" fxLayout.xs="column" fxLayoutGap.gt-xs="16px">\n        <mat-form-field fxFlex floatLabel="always" class="mat-block" subscriptSizing="dynamic">\n          <mat-label translate>tb.rulenode.number-floating-point-field-input</mat-label>\n          <input formControlName="resultValuePrecision"\n                 matInput\n                 step="1" min="0"\n                 type="number"/>\n          <mat-hint [innerHTML]="\'tb.rulenode.number-floating-point-field-input-hint\' | translate | safe: \'html\'"></mat-hint>\n        </mat-form-field>\n      </div>\n      <div *ngIf="[ArgumentTypeResult.ATTRIBUTE, ArgumentTypeResult.TIME_SERIES].includes(mathFunctionConfigForm.get(\'result\').get(\'type\').value)"\n           fxFlex fxLayout="row" fxLayout.xs="column" fxLayoutAlign="start" fxLayoutGap.gt-xs="16px" style="padding-top: 16px;">\n        <mat-checkbox formControlName="addToBody">\n          {{\'tb.rulenode.add-to-message-field-input\' | translate }}\n        </mat-checkbox>\n        <mat-checkbox formControlName="addToMetadata">\n          {{\'tb.rulenode.add-to-metadata-field-input\' | translate}}\n        </mat-checkbox>\n      </div>\n    </div>\n  </fieldset>\n</section>\n',styles:[":host ::ng-deep .fields-group{padding:0 16px 8px;margin:10px 0;border:1px groove rgba(0,0,0,.25);border-radius:4px}:host ::ng-deep .fields-group .mat-mdc-form-field .mat-mdc-form-field-infix{width:100%}:host ::ng-deep .fields-group legend{color:#000000b3;width:-moz-fit-content;width:fit-content}:host ::ng-deep .fields-group legend+*{display:block}:host ::ng-deep .fields-group legend+*.no-margin-top{margin-top:0}\n"],dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:Q.MatCheckbox,selector:"mat-checkbox",inputs:["disableRipple","color","tabIndex"],exportAs:["matCheckbox"]},{kind:"component",type:ue.MatIcon,selector:"mat-icon",inputs:["color","inline","svgIcon","fontSet","fontIcon"],exportAs:["matIcon"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatHint,selector:"mat-hint",inputs:["align","id"]},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"directive",type:Y.MatSuffix,selector:"[matSuffix], [matIconSuffix], [matTextSuffix]",inputs:["matTextSuffix"]},{kind:"component",type:X.MatSelect,selector:"mat-select",inputs:["disabled","disableRipple","tabIndex","hideSingleSelectionIndicator"],exportAs:["matSelect"]},{kind:"directive",type:X.MatSelectTrigger,selector:"mat-select-trigger"},{kind:"component",type:ee.MatOption,selector:"mat-option",exportAs:["matOption"]},{kind:"directive",type:ce.MatTooltip,selector:"[matTooltip]",exportAs:["matTooltip"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:W.DefaultLayoutGapDirective,selector:"  [fxLayoutGap], [fxLayoutGap.xs], [fxLayoutGap.sm], [fxLayoutGap.md],  [fxLayoutGap.lg], [fxLayoutGap.xl], [fxLayoutGap.lt-sm], [fxLayoutGap.lt-md],  [fxLayoutGap.lt-lg], [fxLayoutGap.lt-xl], [fxLayoutGap.gt-xs], [fxLayoutGap.gt-sm],  [fxLayoutGap.gt-md], [fxLayoutGap.gt-lg]",inputs:["fxLayoutGap","fxLayoutGap.xs","fxLayoutGap.sm","fxLayoutGap.md","fxLayoutGap.lg","fxLayoutGap.xl","fxLayoutGap.lt-sm","fxLayoutGap.lt-md","fxLayoutGap.lt-lg","fxLayoutGap.lt-xl","fxLayoutGap.gt-xs","fxLayoutGap.gt-sm","fxLayoutGap.gt-md","fxLayoutGap.gt-lg"]},{kind:"directive",type:W.DefaultLayoutAlignDirective,selector:"  [fxLayoutAlign], [fxLayoutAlign.xs], [fxLayoutAlign.sm], [fxLayoutAlign.md],  [fxLayoutAlign.lg], [fxLayoutAlign.xl], [fxLayoutAlign.lt-sm], [fxLayoutAlign.lt-md],  [fxLayoutAlign.lt-lg], [fxLayoutAlign.lt-xl], [fxLayoutAlign.gt-xs], [fxLayoutAlign.gt-sm],  [fxLayoutAlign.gt-md], [fxLayoutAlign.gt-lg]",inputs:["fxLayoutAlign","fxLayoutAlign.xs","fxLayoutAlign.sm","fxLayoutAlign.md","fxLayoutAlign.lg","fxLayoutAlign.xl","fxLayoutAlign.lt-sm","fxLayoutAlign.lt-md","fxLayoutAlign.lt-lg","fxLayoutAlign.lt-xl","fxLayoutAlign.gt-xs","fxLayoutAlign.gt-sm","fxLayoutAlign.gt-md","fxLayoutAlign.gt-lg"]},{kind:"directive",type:W.DefaultFlexDirective,selector:"  [fxFlex], [fxFlex.xs], [fxFlex.sm], [fxFlex.md],  [fxFlex.lg], [fxFlex.xl], [fxFlex.lt-sm], [fxFlex.lt-md],  [fxFlex.lt-lg], [fxFlex.lt-xl], [fxFlex.gt-xs], [fxFlex.gt-sm],  [fxFlex.gt-md], [fxFlex.gt-lg]",inputs:["fxFlex","fxFlex.xs","fxFlex.sm","fxFlex.md","fxFlex.lg","fxFlex.xl","fxFlex.lt-sm","fxFlex.lt-md","fxFlex.lt-lg","fxFlex.lt-xl","fxFlex.gt-xs","fxFlex.gt-sm","fxFlex.gt-md","fxFlex.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NumberValueAccessor,selector:"input[type=number][formControlName],input[type=number][formControl],input[type=number][ngModel]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.MinValidator,selector:"input[type=number][min][formControlName],input[type=number][min][formControl],input[type=number][min][ngModel]",inputs:["min"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:R.FormGroupName,selector:"[formGroupName]",inputs:["formGroupName"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"component",type:In,selector:"tb-arguments-map-config",inputs:["disabled","function"]},{kind:"component",type:Nn,selector:"tb-math-function-autocomplete",inputs:["required","disabled"]},{kind:"pipe",type:he.SafePipe,name:"safe"},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Sn,decorators:[{type:n,args:[{selector:"tb-action-node-math-function-config",template:'<section [formGroup]="mathFunctionConfigForm" fxLayout="column">\n  <tb-math-function-autocomplete\n    fxFlex="30" fxFlex.md fxFlex.xs\n    required\n    formControlName="operation">\n  </tb-math-function-autocomplete>\n  <fieldset class="fields-group" fxLayout="column" fxLayoutGap="8px">\n    <legend class="group-title" translate>tb.rulenode.argument-tile</legend>\n    <tb-arguments-map-config formControlName="arguments"\n                             [function]="mathFunctionConfigForm.get(\'operation\').value">\n    </tb-arguments-map-config>\n  </fieldset>\n  <fieldset *ngIf="mathFunctionConfigForm.get(\'operation\').value === MathFunction.CUSTOM"\n            class="fields-group" fxLayout="column" fxLayoutGap="8px">\n    <legend class="group-title">{{\'tb.rulenode.custom-expression-field-input\' | translate }} *</legend>\n    <mat-form-field fxFlex class="mat-block no-margin-top" subscriptSizing="dynamic">\n      <input matInput formControlName="customFunction" required/>\n      <mat-error *ngIf="mathFunctionConfigForm.get(\'customFunction\').hasError(\'required\')" translate>\n        tb.rulenode.custom-expression-field-input-required\n      </mat-error>\n      <mat-hint translate>tb.rulenode.custom-expression-field-input-hint</mat-hint>\n    </mat-form-field>\n  </fieldset>\n  <fieldset class="fields-group" fxLayout="column" fxLayoutGap="8px">\n    <legend class="group-title" translate>tb.rulenode.result-title</legend>\n    <div formGroupName="result">\n      <mat-form-field fxFlex class="mat-block">\n        <mat-label translate>tb.rulenode.type-field-input</mat-label>\n        <mat-select formControlName="type" required>\n          <mat-select-trigger>\n            {{ argumentTypeResultMap.get(mathFunctionConfigForm.get(\'result.type\').value)?.name | translate }}\n          </mat-select-trigger>\n          <mat-option *ngFor="let argument of argumentsResult" [value]="argument"\n                      style="border-bottom: 1px solid #eee;">\n            {{ argumentTypeResultMap.get(argument).name | translate }}\n            <small style="display: block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">\n              {{ argumentTypeResultMap.get(argument).description }}\n            </small>\n          </mat-option>\n        </mat-select>\n        <mat-error *ngIf="mathFunctionConfigForm.get(\'result.type\').hasError(\'required\')" translate>\n          tb.rulenode.type-field-input-required\n        </mat-error>\n      </mat-form-field>\n      <div fxFlex fxLayout="row" fxLayout.xs="column" fxLayoutGap.gt-xs="16px">\n        <mat-form-field fxFlex class="mat-block" *ngIf="mathFunctionConfigForm.get(\'result\').get(\'type\').value === ArgumentTypeResult.ATTRIBUTE">\n          <mat-label translate>tb.rulenode.attribute-scope-field-input</mat-label>\n          <mat-select required formControlName="attributeScope">\n            <mat-option *ngFor="let scope of attributeScopeResult" [value]="scope">\n              {{ attributeScopeMap.get(scope) | translate }}\n            </mat-option>\n          </mat-select>\n        </mat-form-field>\n        <mat-form-field fxFlex floatLabel="always" class="mat-block">\n          <mat-label translate>tb.rulenode.key-field-input</mat-label>\n          <input matInput formControlName="key" required/>\n          <mat-icon class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon" matSuffix\n                    color="primary"\n                    matTooltip="{{ \'tb.rulenode.math-templatization-tooltip\' | translate }}">help</mat-icon>\n          <mat-error *ngIf="mathFunctionConfigForm.get(\'result.key\').hasError(\'required\')" translate>\n            tb.rulenode.key-field-input-required\n          </mat-error>\n        </mat-form-field>\n      </div>\n      <div fxFlex fxLayout="row" fxLayout.xs="column" fxLayoutGap.gt-xs="16px">\n        <mat-form-field fxFlex floatLabel="always" class="mat-block" subscriptSizing="dynamic">\n          <mat-label translate>tb.rulenode.number-floating-point-field-input</mat-label>\n          <input formControlName="resultValuePrecision"\n                 matInput\n                 step="1" min="0"\n                 type="number"/>\n          <mat-hint [innerHTML]="\'tb.rulenode.number-floating-point-field-input-hint\' | translate | safe: \'html\'"></mat-hint>\n        </mat-form-field>\n      </div>\n      <div *ngIf="[ArgumentTypeResult.ATTRIBUTE, ArgumentTypeResult.TIME_SERIES].includes(mathFunctionConfigForm.get(\'result\').get(\'type\').value)"\n           fxFlex fxLayout="row" fxLayout.xs="column" fxLayoutAlign="start" fxLayoutGap.gt-xs="16px" style="padding-top: 16px;">\n        <mat-checkbox formControlName="addToBody">\n          {{\'tb.rulenode.add-to-message-field-input\' | translate }}\n        </mat-checkbox>\n        <mat-checkbox formControlName="addToMetadata">\n          {{\'tb.rulenode.add-to-metadata-field-input\' | translate}}\n        </mat-checkbox>\n      </div>\n    </div>\n  </fieldset>\n</section>\n',styles:[":host ::ng-deep .fields-group{padding:0 16px 8px;margin:10px 0;border:1px groove rgba(0,0,0,.25);border-radius:4px}:host ::ng-deep .fields-group .mat-mdc-form-field .mat-mdc-form-field-infix{width:100%}:host ::ng-deep .fields-group legend{color:#000000b3;width:-moz-fit-content;width:fit-content}:host ::ng-deep .fields-group legend+*{display:block}:host ::ng-deep .fields-group legend+*.no-margin-top{margin-top:0}\n"]}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder}]}});class qn extends f{constructor(e,t){super(e),this.store=e,this.fb=t,this.messageTypeNames=T,this.eventOptions=[I.CONNECT_EVENT,I.ACTIVITY_EVENT,I.DISCONNECT_EVENT,I.INACTIVITY_EVENT]}configForm(){return this.deviceState}prepareInputConfig(e){return{event:ae(e?.event)?e.event:I.ACTIVITY_EVENT}}onConfigurationSet(e){this.deviceState=this.fb.group({event:[e.event,[O.required]]})}}e("DeviceStateConfigComponent",qn),qn.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:qn,deps:[{token:P.Store},{token:R.FormBuilder}],target:t.ɵɵFactoryTarget.Component}),qn.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:qn,selector:"tb-action-node-device-state-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="deviceState">\n    <mat-form-field class="mat-block" subscriptSizing="dynamic">\n        <mat-label>{{ \'tb.rulenode.select-device-connectivity-event\' | translate }}</mat-label>\n        <mat-select formControlName="event">\n            <mat-option *ngFor="let eventOption of eventOptions" [value]="eventOption">\n                {{ messageTypeNames.get(eventOption) }}\n            </mat-option>\n        </mat-select>\n    </mat-form-field>\n</section>\n',dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"component",type:X.MatSelect,selector:"mat-select",inputs:["disabled","disableRipple","tabIndex","hideSingleSelectionIndicator"],exportAs:["matSelect"]},{kind:"component",type:ee.MatOption,selector:"mat-option",exportAs:["matOption"]},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:qn,decorators:[{type:n,args:[{selector:"tb-action-node-device-state-config",template:'<section [formGroup]="deviceState">\n    <mat-form-field class="mat-block" subscriptSizing="dynamic">\n        <mat-label>{{ \'tb.rulenode.select-device-connectivity-event\' | translate }}</mat-label>\n        <mat-select formControlName="event">\n            <mat-option *ngFor="let eventOption of eventOptions" [value]="eventOption">\n                {{ messageTypeNames.get(eventOption) }}\n            </mat-option>\n        </mat-select>\n    </mat-form-field>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.FormBuilder}]}});class An{constructor(){this.textAlign="left"}}e("ExampleHintComponent",An),An.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:An,deps:[],target:t.ɵɵFactoryTarget.Component}),An.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:An,selector:"tb-example-hint",inputs:{hintText:"hintText",popupHelpLink:"popupHelpLink",textAlign:"textAlign"},ngImport:t,template:'<div [hidden]="!hintText" class="tb-form-hint tb-primary-fill space-between">\n  <div [innerHTML]=" hintText | translate | safe: \'html\'"\n       [style.text-align]="textAlign"\n       class="hint-text"></div>\n  <div *ngIf="popupHelpLink" class="see-example" tb-help-popup="{{ popupHelpLink }}"\n       hintMode\n       tb-help-popup-placement="right"\n       trigger-style="letter-spacing:0.25px; font-size:12px"\n       [tb-help-popup-style]="{maxWidth: \'820px\'}"\n       trigger-text="{{ \'tb.key-val.see-examples\' | translate }}">\n  </div>\n</div>\n',styles:[":host .space-between{display:flex;justify-content:space-between;gap:20px}:host .space-between .see-example{display:flex;flex-shrink:0}:host .hint-text{width:100%}\n"],dependencies:[{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:$e.HelpPopupComponent,selector:"[tb-help-popup], [tb-help-popup-content]",inputs:["tb-help-popup","tb-help-popup-content","trigger-text","trigger-style","tb-help-popup-placement","tb-help-popup-style","hintMode"]},{kind:"pipe",type:he.SafePipe,name:"safe"},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:An,decorators:[{type:n,args:[{selector:"tb-example-hint",template:'<div [hidden]="!hintText" class="tb-form-hint tb-primary-fill space-between">\n  <div [innerHTML]=" hintText | translate | safe: \'html\'"\n       [style.text-align]="textAlign"\n       class="hint-text"></div>\n  <div *ngIf="popupHelpLink" class="see-example" tb-help-popup="{{ popupHelpLink }}"\n       hintMode\n       tb-help-popup-placement="right"\n       trigger-style="letter-spacing:0.25px; font-size:12px"\n       [tb-help-popup-style]="{maxWidth: \'820px\'}"\n       trigger-text="{{ \'tb.key-val.see-examples\' | translate }}">\n  </div>\n</div>\n',styles:[":host .space-between{display:flex;justify-content:space-between;gap:20px}:host .space-between .see-example{display:flex;flex-shrink:0}:host .hint-text{width:100%}\n"]}]}],propDecorators:{hintText:[{type:i}],popupHelpLink:[{type:i}],textAlign:[{type:i}]}});class Mn{constructor(e,t){this.injector=e,this.fb=t,this.propagateChange=()=>{},this.destroy$=new Ke,this.disabled=!1,this.uniqueKeyValuePairValidator=!1,this.required=!1,this.duplicateValuesValidator=e=>e.controls.key.value===e.controls.value.value&&e.controls.key.value&&e.controls.value.value?{uniqueKeyValuePair:!0}:null,this.oneMapRequiredValidator=e=>e.get("keyVals").value.length,this.propagateNestedErrors=e=>{if(this.kvListFormGroup&&this.kvListFormGroup.get("keyVals")&&"VALID"===this.kvListFormGroup.get("keyVals")?.status)return null;const t={};if(this.kvListFormGroup&&this.kvListFormGroup.setErrors(null),e instanceof z||e instanceof U){if(e.errors)for(const n of Object.keys(e.errors))t[n]=!0;for(const n of Object.keys(e.controls)){const r=this.propagateNestedErrors(e.controls[n]);if(r&&Object.keys(r).length)for(const e of Object.keys(r))t[e]=!0}return t}if(e.errors)for(const n of Object.keys(e.errors))t[n]=!0;return ie(t,{})?null:t}}ngOnInit(){this.ngControl=this.injector.get(_),null!=this.ngControl&&(this.ngControl.valueAccessor=this),this.kvListFormGroup=this.fb.group({keyVals:this.fb.array([])},{validators:[this.propagateNestedErrors,this.oneMapRequiredValidator]}),this.kvListFormGroup.valueChanges.pipe(ze(this.destroy$)).subscribe((()=>{this.updateModel()}))}ngOnDestroy(){this.destroy$.next(),this.destroy$.complete()}keyValsFormArray(){return this.kvListFormGroup.get("keyVals")}registerOnChange(e){this.propagateChange=e}registerOnTouched(e){}setDisabledState(e){this.disabled=e,this.disabled?this.kvListFormGroup.disable({emitEvent:!1}):this.kvListFormGroup.enable({emitEvent:!1})}writeValue(e){const t=Object.keys(e).map((t=>({key:t,value:e[t]})));if(this.keyValsFormArray().length===t.length)this.keyValsFormArray().patchValue(t,{emitEvent:!1});else{const e=[];t.forEach((t=>{e.push(this.fb.group({key:[t.key,[O.required,O.pattern(/(?:.|\s)*\S(&:.|\s)*/)]],value:[t.value,[O.required,O.pattern(/(?:.|\s)*\S(&:.|\s)*/)]]},{validators:this.uniqueKeyValuePairValidator?[this.duplicateValuesValidator]:[]}))})),this.kvListFormGroup.setControl("keyVals",this.fb.array(e,this.propagateNestedErrors),{emitEvent:!1})}}removeKeyVal(e){this.keyValsFormArray().removeAt(e)}addKeyVal(){this.keyValsFormArray().push(this.fb.group({key:["",[O.required,O.pattern(/(?:.|\s)*\S(&:.|\s)*/)]],value:["",[O.required,O.pattern(/(?:.|\s)*\S(&:.|\s)*/)]]},{validators:this.uniqueKeyValuePairValidator?[this.duplicateValuesValidator]:[]}))}validate(){const e=this.kvListFormGroup.get("keyVals").value;if(!e.length&&this.required)return{kvMapRequired:!0};if(!this.kvListFormGroup.valid)return{kvFieldsRequired:!0};if(this.uniqueKeyValuePairValidator)for(const t of e)if(t.key===t.value)return{uniqueKeyValuePair:!0};return null}updateModel(){const e=this.kvListFormGroup.get("keyVals").value;if(this.required&&!e.length||!this.kvListFormGroup.valid)this.propagateChange(null);else{const t={};e.forEach((e=>{t[e.key]=e.value})),this.propagateChange(t)}}}e("KvMapConfigComponent",Mn),Mn.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Mn,deps:[{token:t.Injector},{token:R.FormBuilder}],target:t.ɵɵFactoryTarget.Component}),Mn.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:Mn,selector:"tb-kv-map-config",inputs:{disabled:"disabled",uniqueKeyValuePairValidator:"uniqueKeyValuePairValidator",labelText:"labelText",requiredText:"requiredText",keyText:"keyText",keyRequiredText:"keyRequiredText",valText:"valText",valRequiredText:"valRequiredText",hintText:"hintText",popupHelpLink:"popupHelpLink",required:"required"},providers:[{provide:B,useExisting:a((()=>Mn)),multi:!0},{provide:K,useExisting:a((()=>Mn)),multi:!0}],ngImport:t,template:'<section [formGroup]="kvListFormGroup" class="tb-form-panel stroked">\n  <div class="tb-form-row no-padding no-border space-between">\n    <div class="tb-form-panel-title">{{ labelText }}</div>\n    <div class="tb-form-panel-hint tb-error" translate *ngIf="kvListFormGroup.hasError(\'kvMapRequired\')">\n      {{ requiredText }}\n    </div>\n    <div class="tb-form-panel-hint tb-error" translate *ngIf="kvListFormGroup.hasError(\'required\')">\n      tb.rulenode.map-fields-required\n    </div>\n    <div class="tb-form-panel-hint tb-error" translate *ngIf="kvListFormGroup.hasError(\'uniqueKeyValuePair\')">\n      {{ \'tb.key-val.unique-key-value-pair-error\' | translate:\n            {\n              valText: valText,\n              keyText: keyText\n            } }}\n    </div>\n  </div>\n  <div class="tb-form-panel no-border no-padding">\n    <div class="tb-form-table">\n      <div class="tb-form-table-header">\n        <div class="tb-form-table-header-cell field-space">{{ keyText }}</div>\n        <div class="tb-form-table-header-cell field-space">{{ valText }}</div>\n        <div class="tb-form-table-header-cell actions-header"></div>\n      </div>\n      <div class="tb-form-table-body">\n        <div class="tb-form-table-row"\n             *ngFor="let keyValControl of keyValsFormArray().controls; let $index = index;">\n          <mat-form-field class="tb-inline-field field-space" appearance="outline" subscriptSizing="dynamic">\n            <input [placeholder]="keyText+\'*\'" [formControl]="keyValControl.get(\'key\')" matInput/>\n          </mat-form-field>\n          <mat-form-field class="tb-inline-field field-space" appearance="outline" subscriptSizing="dynamic">\n            <input [placeholder]="valText+\'*\'" [formControl]="keyValControl.get(\'value\')" matInput/>\n          </mat-form-field>\n          <div class="tb-form-table-row-cell-buttons">\n            <button [class.tb-hidden]="keyValsFormArray().controls.length === 1"\n                    type="button"\n                    mat-icon-button\n                    (click)="removeKeyVal($index)"\n                    [disabled]="disabled"\n                    matTooltip="{{ \'tb.key-val.remove-mapping-entry\' | translate }}"\n                    matTooltipPosition="above">\n              <mat-icon>delete</mat-icon>\n            </button>\n          </div>\n        </div>\n      </div>\n    </div>\n  </div>\n  <div>\n    <button type="button" mat-stroked-button color="primary" (click)="addKeyVal()">\n      {{ \'tb.key-val.add-mapping-entry\' | translate }}\n    </button>\n  </div>\n  <tb-example-hint [hintText]="hintText" [popupHelpLink]="popupHelpLink" *ngIf="popupHelpLink || hintText"></tb-example-hint>\n</section>\n',styles:[":host .field-space{flex:1 1 50%}:host .actions-header{width:40px}\n",':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n'],dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:de.MatButton,selector:"    button[mat-button], button[mat-raised-button], button[mat-flat-button],    button[mat-stroked-button]  ",inputs:["disabled","disableRipple","color"],exportAs:["matButton"]},{kind:"component",type:de.MatIconButton,selector:"button[mat-icon-button]",inputs:["disabled","disableRipple","color"],exportAs:["matButton"]},{kind:"component",type:ue.MatIcon,selector:"mat-icon",inputs:["color","inline","svgIcon","fontSet","fontIcon"],exportAs:["matIcon"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:ce.MatTooltip,selector:"[matTooltip]",exportAs:["matTooltip"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.FormControlDirective,selector:"[formControl]",inputs:["formControl","disabled","ngModel"],outputs:["ngModelChange"],exportAs:["ngForm"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"component",type:An,selector:"tb-example-hint",inputs:["hintText","popupHelpLink","textAlign"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),Be([N()],Mn.prototype,"disabled",void 0),Be([N()],Mn.prototype,"uniqueKeyValuePairValidator",void 0),Be([N()],Mn.prototype,"required",void 0),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Mn,decorators:[{type:n,args:[{selector:"tb-kv-map-config",providers:[{provide:B,useExisting:a((()=>Mn)),multi:!0},{provide:K,useExisting:a((()=>Mn)),multi:!0}],template:'<section [formGroup]="kvListFormGroup" class="tb-form-panel stroked">\n  <div class="tb-form-row no-padding no-border space-between">\n    <div class="tb-form-panel-title">{{ labelText }}</div>\n    <div class="tb-form-panel-hint tb-error" translate *ngIf="kvListFormGroup.hasError(\'kvMapRequired\')">\n      {{ requiredText }}\n    </div>\n    <div class="tb-form-panel-hint tb-error" translate *ngIf="kvListFormGroup.hasError(\'required\')">\n      tb.rulenode.map-fields-required\n    </div>\n    <div class="tb-form-panel-hint tb-error" translate *ngIf="kvListFormGroup.hasError(\'uniqueKeyValuePair\')">\n      {{ \'tb.key-val.unique-key-value-pair-error\' | translate:\n            {\n              valText: valText,\n              keyText: keyText\n            } }}\n    </div>\n  </div>\n  <div class="tb-form-panel no-border no-padding">\n    <div class="tb-form-table">\n      <div class="tb-form-table-header">\n        <div class="tb-form-table-header-cell field-space">{{ keyText }}</div>\n        <div class="tb-form-table-header-cell field-space">{{ valText }}</div>\n        <div class="tb-form-table-header-cell actions-header"></div>\n      </div>\n      <div class="tb-form-table-body">\n        <div class="tb-form-table-row"\n             *ngFor="let keyValControl of keyValsFormArray().controls; let $index = index;">\n          <mat-form-field class="tb-inline-field field-space" appearance="outline" subscriptSizing="dynamic">\n            <input [placeholder]="keyText+\'*\'" [formControl]="keyValControl.get(\'key\')" matInput/>\n          </mat-form-field>\n          <mat-form-field class="tb-inline-field field-space" appearance="outline" subscriptSizing="dynamic">\n            <input [placeholder]="valText+\'*\'" [formControl]="keyValControl.get(\'value\')" matInput/>\n          </mat-form-field>\n          <div class="tb-form-table-row-cell-buttons">\n            <button [class.tb-hidden]="keyValsFormArray().controls.length === 1"\n                    type="button"\n                    mat-icon-button\n                    (click)="removeKeyVal($index)"\n                    [disabled]="disabled"\n                    matTooltip="{{ \'tb.key-val.remove-mapping-entry\' | translate }}"\n                    matTooltipPosition="above">\n              <mat-icon>delete</mat-icon>\n            </button>\n          </div>\n        </div>\n      </div>\n    </div>\n  </div>\n  <div>\n    <button type="button" mat-stroked-button color="primary" (click)="addKeyVal()">\n      {{ \'tb.key-val.add-mapping-entry\' | translate }}\n    </button>\n  </div>\n  <tb-example-hint [hintText]="hintText" [popupHelpLink]="popupHelpLink" *ngIf="popupHelpLink || hintText"></tb-example-hint>\n</section>\n',styles:[":host .field-space{flex:1 1 50%}:host .actions-header{width:40px}\n",':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n']}]}],ctorParameters:function(){return[{type:t.Injector},{type:R.FormBuilder}]},propDecorators:{disabled:[{type:i}],uniqueKeyValuePairValidator:[{type:i}],labelText:[{type:i}],requiredText:[{type:i}],keyText:[{type:i}],keyRequiredText:[{type:i}],valText:[{type:i}],valRequiredText:[{type:i}],hintText:[{type:i}],popupHelpLink:[{type:i}],required:[{type:i}]}});class En extends L{get required(){return this.requiredValue}set required(e){this.requiredValue=Le(e)}constructor(e,t){super(e),this.store=e,this.fb=t,this.directionTypes=Object.values(v),this.directionTypeTranslations=C,this.entityType=F,this.propagateChange=null}ngOnInit(){this.deviceRelationsQueryFormGroup=this.fb.group({fetchLastLevelOnly:[!1,[]],direction:[null,[O.required]],maxLevel:[null,[O.min(1)]],relationType:[null],deviceTypes:[null,[O.required]]}),this.deviceRelationsQueryFormGroup.valueChanges.subscribe((e=>{this.deviceRelationsQueryFormGroup.valid?this.propagateChange(e):this.propagateChange(null)}))}registerOnChange(e){this.propagateChange=e}registerOnTouched(e){}setDisabledState(e){this.disabled=e,this.disabled?this.deviceRelationsQueryFormGroup.disable({emitEvent:!1}):this.deviceRelationsQueryFormGroup.enable({emitEvent:!1})}writeValue(e){this.deviceRelationsQueryFormGroup.reset(e,{emitEvent:!1})}}e("DeviceRelationsQueryConfigComponent",En),En.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:En,deps:[{token:P.Store},{token:R.FormBuilder}],target:t.ɵɵFactoryTarget.Component}),En.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:En,selector:"tb-device-relations-query-config",inputs:{disabled:"disabled",required:"required"},providers:[{provide:B,useExisting:a((()=>En)),multi:!0}],usesInheritance:!0,ngImport:t,template:'<section fxLayout="column" [formGroup]="deviceRelationsQueryFormGroup">\n  <div fxLayoutGap="22px" fxLayout="row">\n    <mat-form-field class="mat-block" subscriptSizing="dynamic" fxFlex="50" style="min-width: 100px;" hideRequiredMarker>\n      <mat-label translate>relation.direction</mat-label>\n      <mat-select required formControlName="direction">\n        <mat-option *ngFor="let type of directionTypes" [value]="type">\n          {{ directionTypeTranslations.get(type) | translate }} <span translate>tb.rulenode.relations-query-config-direction-suffix</span>\n        </mat-option>\n      </mat-select>\n    </mat-form-field>\n    <mat-form-field fxFlex="50" floatLabel="always" class="mat-block">\n      <mat-label translate>tb.rulenode.max-relation-level</mat-label>\n      <input matInput\n             type="number"\n             min="1"\n             step="1"\n             placeholder="{{ \'tb.rulenode.unlimited-level\' | translate }}"\n             formControlName="maxLevel">\n      <mat-error *ngIf="deviceRelationsQueryFormGroup.get(\'maxLevel\').hasError(\'min\')">\n        {{ \'tb.rulenode.max-relation-level-error\' | translate }}\n      </mat-error>\n    </mat-form-field>\n  </div>\n  <div tb-hint-tooltip-icon="{{ \'tb.rulenode.last-level-device-relation-tooltip\' | translate }}"\n       *ngIf="deviceRelationsQueryFormGroup.get(\'maxLevel\').value > 1"\n       class="tb-form-row no-border no-padding last-level-slide-toggle">\n    <mat-slide-toggle class="mat-slide" formControlName="fetchLastLevelOnly">\n      {{ \'alias.last-level-relation\' | translate }}\n    </mat-slide-toggle>\n  </div>\n  <tb-relation-type-autocomplete\n    fxFlex\n    formControlName="relationType">\n  </tb-relation-type-autocomplete>\n  <tb-entity-subtype-list\n    required\n    [label]="\'tb.rulenode.device-profiles\' | translate"\n    [entityType]="entityType.DEVICE"\n    [emptyInputPlaceholder]="\'tb.rulenode.add-device-profile\' | translate"\n    [filledInputPlaceholder]="\'tb.rulenode.add-device-profile\' | translate"\n    formControlName="deviceTypes">\n    <mat-icon matSuffix class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon" color="primary"\n              matTooltip="{{ \'tb.rulenode.chip-help\' | translate: { inputName: \'tb.rulenode.device-profile\' | translate } }}">help</mat-icon>\n  </tb-entity-subtype-list>\n</section>\n',styles:[":host .last-level-slide-toggle{margin:8px 0 24px}\n",':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n'],dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:Qe.EntitySubTypeListComponent,selector:"tb-entity-subtype-list",inputs:["required","floatLabel","label","disabled","entityType","emptyInputPlaceholder","filledInputPlaceholder","appearance","subscriptSizing","additionalClasses"]},{kind:"component",type:Je.RelationTypeAutocompleteComponent,selector:"tb-relation-type-autocomplete",inputs:["showLabel","additionalClasses","appearance","required","disabled","subscriptSizing"]},{kind:"component",type:ue.MatIcon,selector:"mat-icon",inputs:["color","inline","svgIcon","fontSet","fontIcon"],exportAs:["matIcon"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"directive",type:Y.MatSuffix,selector:"[matSuffix], [matIconSuffix], [matTextSuffix]",inputs:["matTextSuffix"]},{kind:"component",type:X.MatSelect,selector:"mat-select",inputs:["disabled","disableRipple","tabIndex","hideSingleSelectionIndicator"],exportAs:["matSelect"]},{kind:"component",type:ee.MatOption,selector:"mat-option",exportAs:["matOption"]},{kind:"directive",type:ce.MatTooltip,selector:"[matTooltip]",exportAs:["matTooltip"]},{kind:"component",type:te.MatSlideToggle,selector:"mat-slide-toggle",inputs:["disabled","disableRipple","color","tabIndex"],exportAs:["matSlideToggle"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:W.DefaultLayoutGapDirective,selector:"  [fxLayoutGap], [fxLayoutGap.xs], [fxLayoutGap.sm], [fxLayoutGap.md],  [fxLayoutGap.lg], [fxLayoutGap.xl], [fxLayoutGap.lt-sm], [fxLayoutGap.lt-md],  [fxLayoutGap.lt-lg], [fxLayoutGap.lt-xl], [fxLayoutGap.gt-xs], [fxLayoutGap.gt-sm],  [fxLayoutGap.gt-md], [fxLayoutGap.gt-lg]",inputs:["fxLayoutGap","fxLayoutGap.xs","fxLayoutGap.sm","fxLayoutGap.md","fxLayoutGap.lg","fxLayoutGap.xl","fxLayoutGap.lt-sm","fxLayoutGap.lt-md","fxLayoutGap.lt-lg","fxLayoutGap.lt-xl","fxLayoutGap.gt-xs","fxLayoutGap.gt-sm","fxLayoutGap.gt-md","fxLayoutGap.gt-lg"]},{kind:"directive",type:W.DefaultFlexDirective,selector:"  [fxFlex], [fxFlex.xs], [fxFlex.sm], [fxFlex.md],  [fxFlex.lg], [fxFlex.xl], [fxFlex.lt-sm], [fxFlex.lt-md],  [fxFlex.lt-lg], [fxFlex.lt-xl], [fxFlex.gt-xs], [fxFlex.gt-sm],  [fxFlex.gt-md], [fxFlex.gt-lg]",inputs:["fxFlex","fxFlex.xs","fxFlex.sm","fxFlex.md","fxFlex.lg","fxFlex.xl","fxFlex.lt-sm","fxFlex.lt-md","fxFlex.lt-lg","fxFlex.lt-xl","fxFlex.gt-xs","fxFlex.gt-sm","fxFlex.gt-md","fxFlex.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NumberValueAccessor,selector:"input[type=number][formControlName],input[type=number][formControl],input[type=number][ngModel]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.MinValidator,selector:"input[type=number][min][formControlName],input[type=number][min][formControl],input[type=number][min][ngModel]",inputs:["min"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"component",type:ne.HintTooltipIconComponent,selector:"[tb-hint-tooltip-icon]",inputs:["tb-hint-tooltip-icon","tooltipPosition","hintIcon"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:En,decorators:[{type:n,args:[{selector:"tb-device-relations-query-config",providers:[{provide:B,useExisting:a((()=>En)),multi:!0}],template:'<section fxLayout="column" [formGroup]="deviceRelationsQueryFormGroup">\n  <div fxLayoutGap="22px" fxLayout="row">\n    <mat-form-field class="mat-block" subscriptSizing="dynamic" fxFlex="50" style="min-width: 100px;" hideRequiredMarker>\n      <mat-label translate>relation.direction</mat-label>\n      <mat-select required formControlName="direction">\n        <mat-option *ngFor="let type of directionTypes" [value]="type">\n          {{ directionTypeTranslations.get(type) | translate }} <span translate>tb.rulenode.relations-query-config-direction-suffix</span>\n        </mat-option>\n      </mat-select>\n    </mat-form-field>\n    <mat-form-field fxFlex="50" floatLabel="always" class="mat-block">\n      <mat-label translate>tb.rulenode.max-relation-level</mat-label>\n      <input matInput\n             type="number"\n             min="1"\n             step="1"\n             placeholder="{{ \'tb.rulenode.unlimited-level\' | translate }}"\n             formControlName="maxLevel">\n      <mat-error *ngIf="deviceRelationsQueryFormGroup.get(\'maxLevel\').hasError(\'min\')">\n        {{ \'tb.rulenode.max-relation-level-error\' | translate }}\n      </mat-error>\n    </mat-form-field>\n  </div>\n  <div tb-hint-tooltip-icon="{{ \'tb.rulenode.last-level-device-relation-tooltip\' | translate }}"\n       *ngIf="deviceRelationsQueryFormGroup.get(\'maxLevel\').value > 1"\n       class="tb-form-row no-border no-padding last-level-slide-toggle">\n    <mat-slide-toggle class="mat-slide" formControlName="fetchLastLevelOnly">\n      {{ \'alias.last-level-relation\' | translate }}\n    </mat-slide-toggle>\n  </div>\n  <tb-relation-type-autocomplete\n    fxFlex\n    formControlName="relationType">\n  </tb-relation-type-autocomplete>\n  <tb-entity-subtype-list\n    required\n    [label]="\'tb.rulenode.device-profiles\' | translate"\n    [entityType]="entityType.DEVICE"\n    [emptyInputPlaceholder]="\'tb.rulenode.add-device-profile\' | translate"\n    [filledInputPlaceholder]="\'tb.rulenode.add-device-profile\' | translate"\n    formControlName="deviceTypes">\n    <mat-icon matSuffix class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon" color="primary"\n              matTooltip="{{ \'tb.rulenode.chip-help\' | translate: { inputName: \'tb.rulenode.device-profile\' | translate } }}">help</mat-icon>\n  </tb-entity-subtype-list>\n</section>\n',styles:[":host .last-level-slide-toggle{margin:8px 0 24px}\n",':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n']}]}],ctorParameters:function(){return[{type:P.Store},{type:R.FormBuilder}]},propDecorators:{disabled:[{type:i}],required:[{type:i}]}});class Gn extends L{get required(){return this.requiredValue}set required(e){this.requiredValue=Le(e)}constructor(e,t){super(e),this.store=e,this.fb=t,this.directionTypes=Object.values(v),this.directionTypeTranslations=C,this.propagateChange=null}ngOnInit(){this.relationsQueryFormGroup=this.fb.group({fetchLastLevelOnly:[!1,[]],direction:[null,[O.required]],maxLevel:[null,[O.min(1)]],filters:[null]}),this.relationsQueryFormGroup.valueChanges.subscribe((e=>{this.relationsQueryFormGroup.valid?this.propagateChange(e):this.propagateChange(null)}))}registerOnChange(e){this.propagateChange=e}registerOnTouched(e){}setDisabledState(e){this.disabled=e,this.disabled?this.relationsQueryFormGroup.disable({emitEvent:!1}):this.relationsQueryFormGroup.enable({emitEvent:!1})}writeValue(e){this.relationsQueryFormGroup.reset(e||{},{emitEvent:!1})}}e("RelationsQueryConfigComponent",Gn),Gn.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Gn,deps:[{token:P.Store},{token:R.FormBuilder}],target:t.ɵɵFactoryTarget.Component}),Gn.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:Gn,selector:"tb-relations-query-config",inputs:{disabled:"disabled",required:"required"},providers:[{provide:B,useExisting:a((()=>Gn)),multi:!0}],usesInheritance:!0,ngImport:t,template:'<section [formGroup]="relationsQueryFormGroup" class="tb-form-panel stroked">\n  <div class="tb-form-panel-title tb-required" translate>tb.rulenode.relations-query</div>\n  <section>\n    <div fxLayoutGap="16px" fxLayout="row">\n      <mat-form-field fxFlex="50" class="mat-block" style="min-width: 100px;" hideRequiredMarker>\n        <mat-label translate>relation.direction</mat-label>\n        <mat-select required formControlName="direction">\n          <mat-option *ngFor="let type of directionTypes" [value]="type">\n            {{ directionTypeTranslations.get(type) | translate }} <span translate>tb.rulenode.relations-query-config-direction-suffix</span>\n          </mat-option>\n        </mat-select>\n      </mat-form-field>\n      <mat-form-field fxFlex="50" floatLabel="always" class="mat-block">\n        <mat-label translate>tb.rulenode.max-relation-level</mat-label>\n        <input matInput\n               type="number"\n               min="1"\n               step="1"\n               placeholder="{{ \'tb.rulenode.unlimited-level\' | translate }}"\n               formControlName="maxLevel">\n        <mat-error *ngIf="relationsQueryFormGroup.get(\'maxLevel\').hasError(\'min\')">\n          {{ \'tb.rulenode.max-relation-level-error\' | translate }}\n        </mat-error>\n      </mat-form-field>\n    </div>\n    <div tb-hint-tooltip-icon="{{ \'tb.rulenode.last-level-relation-tooltip\' | translate }}"\n         *ngIf="relationsQueryFormGroup.get(\'maxLevel\').value > 1"\n         class="tb-form-row no-border no-padding last-level-slide-toggle">\n      <mat-slide-toggle class="mat-slide" formControlName="fetchLastLevelOnly">\n        {{ \'alias.last-level-relation\' | translate }}\n      </mat-slide-toggle>\n    </div>\n  </section>\n  <section [formGroup]="relationsQueryFormGroup" class="tb-form-panel stroked">\n    <div class="tb-form-panel-title" translate>relation.relation-filters</div>\n    <tb-relation-filters\n      formControlName="filters">\n    </tb-relation-filters>\n  </section>\n</section>\n',dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"component",type:X.MatSelect,selector:"mat-select",inputs:["disabled","disableRipple","tabIndex","hideSingleSelectionIndicator"],exportAs:["matSelect"]},{kind:"component",type:ee.MatOption,selector:"mat-option",exportAs:["matOption"]},{kind:"component",type:te.MatSlideToggle,selector:"mat-slide-toggle",inputs:["disabled","disableRipple","color","tabIndex"],exportAs:["matSlideToggle"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:W.DefaultLayoutGapDirective,selector:"  [fxLayoutGap], [fxLayoutGap.xs], [fxLayoutGap.sm], [fxLayoutGap.md],  [fxLayoutGap.lg], [fxLayoutGap.xl], [fxLayoutGap.lt-sm], [fxLayoutGap.lt-md],  [fxLayoutGap.lt-lg], [fxLayoutGap.lt-xl], [fxLayoutGap.gt-xs], [fxLayoutGap.gt-sm],  [fxLayoutGap.gt-md], [fxLayoutGap.gt-lg]",inputs:["fxLayoutGap","fxLayoutGap.xs","fxLayoutGap.sm","fxLayoutGap.md","fxLayoutGap.lg","fxLayoutGap.xl","fxLayoutGap.lt-sm","fxLayoutGap.lt-md","fxLayoutGap.lt-lg","fxLayoutGap.lt-xl","fxLayoutGap.gt-xs","fxLayoutGap.gt-sm","fxLayoutGap.gt-md","fxLayoutGap.gt-lg"]},{kind:"directive",type:W.DefaultFlexDirective,selector:"  [fxFlex], [fxFlex.xs], [fxFlex.sm], [fxFlex.md],  [fxFlex.lg], [fxFlex.xl], [fxFlex.lt-sm], [fxFlex.lt-md],  [fxFlex.lt-lg], [fxFlex.lt-xl], [fxFlex.gt-xs], [fxFlex.gt-sm],  [fxFlex.gt-md], [fxFlex.gt-lg]",inputs:["fxFlex","fxFlex.xs","fxFlex.sm","fxFlex.md","fxFlex.lg","fxFlex.xl","fxFlex.lt-sm","fxFlex.lt-md","fxFlex.lt-lg","fxFlex.lt-xl","fxFlex.gt-xs","fxFlex.gt-sm","fxFlex.gt-md","fxFlex.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NumberValueAccessor,selector:"input[type=number][formControlName],input[type=number][formControl],input[type=number][ngModel]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.MinValidator,selector:"input[type=number][min][formControlName],input[type=number][min][formControl],input[type=number][min][ngModel]",inputs:["min"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"component",type:ne.HintTooltipIconComponent,selector:"[tb-hint-tooltip-icon]",inputs:["tb-hint-tooltip-icon","tooltipPosition","hintIcon"]},{kind:"component",type:Ye.RelationFiltersComponent,selector:"tb-relation-filters",inputs:["disabled","allowedEntityTypes"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Gn,decorators:[{type:n,args:[{selector:"tb-relations-query-config",providers:[{provide:B,useExisting:a((()=>Gn)),multi:!0}],template:'<section [formGroup]="relationsQueryFormGroup" class="tb-form-panel stroked">\n  <div class="tb-form-panel-title tb-required" translate>tb.rulenode.relations-query</div>\n  <section>\n    <div fxLayoutGap="16px" fxLayout="row">\n      <mat-form-field fxFlex="50" class="mat-block" style="min-width: 100px;" hideRequiredMarker>\n        <mat-label translate>relation.direction</mat-label>\n        <mat-select required formControlName="direction">\n          <mat-option *ngFor="let type of directionTypes" [value]="type">\n            {{ directionTypeTranslations.get(type) | translate }} <span translate>tb.rulenode.relations-query-config-direction-suffix</span>\n          </mat-option>\n        </mat-select>\n      </mat-form-field>\n      <mat-form-field fxFlex="50" floatLabel="always" class="mat-block">\n        <mat-label translate>tb.rulenode.max-relation-level</mat-label>\n        <input matInput\n               type="number"\n               min="1"\n               step="1"\n               placeholder="{{ \'tb.rulenode.unlimited-level\' | translate }}"\n               formControlName="maxLevel">\n        <mat-error *ngIf="relationsQueryFormGroup.get(\'maxLevel\').hasError(\'min\')">\n          {{ \'tb.rulenode.max-relation-level-error\' | translate }}\n        </mat-error>\n      </mat-form-field>\n    </div>\n    <div tb-hint-tooltip-icon="{{ \'tb.rulenode.last-level-relation-tooltip\' | translate }}"\n         *ngIf="relationsQueryFormGroup.get(\'maxLevel\').value > 1"\n         class="tb-form-row no-border no-padding last-level-slide-toggle">\n      <mat-slide-toggle class="mat-slide" formControlName="fetchLastLevelOnly">\n        {{ \'alias.last-level-relation\' | translate }}\n      </mat-slide-toggle>\n    </div>\n  </section>\n  <section [formGroup]="relationsQueryFormGroup" class="tb-form-panel stroked">\n    <div class="tb-form-panel-title" translate>relation.relation-filters</div>\n    <tb-relation-filters\n      formControlName="filters">\n    </tb-relation-filters>\n  </section>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.FormBuilder}]},propDecorators:{disabled:[{type:i}],required:[{type:i}]}});class Dn extends L{get required(){return this.requiredValue}set required(e){this.requiredValue=Le(e)}constructor(e,t,n,r){super(e),this.store=e,this.translate=t,this.truncate=n,this.fb=r,this.placeholder="tb.rulenode.add-message-type",this.separatorKeysCodes=[ge,ye,xe],this.messageTypes=[],this.messageTypesList=[],this.searchText="",this.propagateChange=e=>{},this.messageTypeConfigForm=this.fb.group({messageType:[null]});for(const e of Object.keys(I))this.messageTypesList.push({name:T.get(I[e]),value:e})}registerOnChange(e){this.propagateChange=e}registerOnTouched(e){}ngOnInit(){this.filteredMessageTypes=this.messageTypeConfigForm.get("messageType").valueChanges.pipe(Ge(""),Ee((e=>e||"")),De((e=>this.fetchMessageTypes(e))),we())}setDisabledState(e){this.disabled=e,this.disabled?this.messageTypeConfigForm.disable({emitEvent:!1}):this.messageTypeConfigForm.enable({emitEvent:!1})}writeValue(e){this.searchText="",this.messageTypes.length=0,e&&e.forEach((e=>{const t=this.messageTypesList.find((t=>t.value===e));t?this.messageTypes.push({name:t.name,value:t.value}):this.messageTypes.push({name:e,value:e})}))}displayMessageTypeFn(e){return e?e.name:void 0}textIsNotEmpty(e){return e&&e.length>0}createMessageType(e,t){e.preventDefault(),this.transformMessageType(t)}add(e){this.transformMessageType(e.value)}fetchMessageTypes(e){if(this.searchText=e,this.searchText&&this.searchText.length){const e=this.searchText.toUpperCase();return Ue(this.messageTypesList.filter((t=>t.name.toUpperCase().includes(e))))}return Ue(this.messageTypesList)}transformMessageType(e){if((e||"").trim()){let t;const n=e.trim(),r=this.messageTypesList.find((e=>e.name===n));t=r?{name:r.name,value:r.value}:{name:n,value:n},t&&this.addMessageType(t)}this.clear("")}remove(e){const t=this.messageTypes.indexOf(e);t>=0&&(this.messageTypes.splice(t,1),this.updateModel())}selected(e){this.addMessageType(e.option.value),this.clear("")}addMessageType(e){-1===this.messageTypes.findIndex((t=>t.value===e.value))&&(this.messageTypes.push(e),this.updateModel())}onFocus(){this.messageTypeConfigForm.get("messageType").updateValueAndValidity({onlySelf:!0,emitEvent:!0})}clear(e=""){this.messageTypeInput.nativeElement.value=e,this.messageTypeConfigForm.get("messageType").patchValue(null,{emitEvent:!0}),setTimeout((()=>{this.messageTypeInput.nativeElement.blur(),this.messageTypeInput.nativeElement.focus()}),0)}updateModel(){const e=this.messageTypes.map((e=>e.value));this.required?(this.chipList.errorState=!e.length,this.propagateChange(e.length>0?e:null)):(this.chipList.errorState=!1,this.propagateChange(e))}}e("MessageTypesConfigComponent",Dn),Dn.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Dn,deps:[{token:P.Store},{token:Z.TranslateService},{token:S.TruncatePipe},{token:R.FormBuilder}],target:t.ɵɵFactoryTarget.Component}),Dn.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:Dn,selector:"tb-message-types-config",inputs:{required:"required",label:"label",placeholder:"placeholder",disabled:"disabled"},providers:[{provide:B,useExisting:a((()=>Dn)),multi:!0}],viewQueries:[{propertyName:"chipList",first:!0,predicate:["chipList"],descendants:!0},{propertyName:"matAutocomplete",first:!0,predicate:["messageTypeAutocomplete"],descendants:!0},{propertyName:"messageTypeInput",first:!0,predicate:["messageTypeInput"],descendants:!0}],usesInheritance:!0,ngImport:t,template:'<mat-form-field [formGroup]="messageTypeConfigForm" style="width: 100%;">\n  <mat-label *ngIf="label">{{ label }}</mat-label>\n  <mat-chip-grid #chipList [required]="required">\n    <mat-chip-row\n      *ngFor="let messageType of messageTypes"\n      [removable]="true"\n      (removed)="remove(messageType)">\n      {{messageType.name}}\n      <mat-icon matChipRemove>close</mat-icon>\n    </mat-chip-row>\n    <input matInput type="text" placeholder="{{ placeholder | translate }}"\n           #messageTypeInput\n           (focusin)="onFocus()"\n           formControlName="messageType"\n           matAutocompleteOrigin\n           #origin="matAutocompleteOrigin"\n           [matAutocompleteConnectedTo]="origin"\n           [matAutocomplete]="messageTypeAutocomplete"\n           [matChipInputFor]="chipList"\n           [matChipInputSeparatorKeyCodes]="separatorKeysCodes"\n           (matChipInputTokenEnd)="add($event)">\n  </mat-chip-grid>\n  <mat-autocomplete #messageTypeAutocomplete="matAutocomplete"\n                    class="tb-autocomplete"\n                    (optionSelected)="selected($event)"\n                    [displayWith]="displayMessageTypeFn">\n    <mat-option *ngFor="let messageType of filteredMessageTypes | async" [value]="messageType">\n      <span [innerHTML]="messageType.name | highlight:searchText"></span>\n    </mat-option>\n    <mat-option *ngIf="(filteredMessageTypes | async)?.length === 0" [value]="null" class="tb-not-found">\n      <div class="tb-not-found-content" (click)="$event.stopPropagation()">\n        <div *ngIf="!textIsNotEmpty(searchText); else searchNotEmpty">\n          <span translate>tb.rulenode.no-message-types-found</span>\n        </div>\n        <ng-template #searchNotEmpty>\n                <span>\n                  {{ \'tb.rulenode.no-message-type-matching\' | translate :\n                  {messageType: truncate.transform(searchText, true, 6, &apos;...&apos;)}\n                  }}\n                </span>\n        </ng-template>\n        <span>\n          <a translate (click)="createMessageType($event, searchText)">tb.rulenode.create-new-message-type</a>\n        </span>\n      </div>\n    </mat-option>\n  </mat-autocomplete>\n  <mat-icon class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon" matSuffix\n            color="primary"\n            matTooltip="{{ \'tb.rulenode.chip-help\' | translate: { inputName: \'tb.rulenode.message-type\' | translate } }}">help</mat-icon>\n  <mat-error *ngIf="chipList.errorState">\n    {{ \'tb.rulenode.select-message-types-required\' | translate }}\n  </mat-error>\n</mat-form-field>\n',styles:[':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n'],dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:ue.MatIcon,selector:"mat-icon",inputs:["color","inline","svgIcon","fontSet","fontIcon"],exportAs:["matIcon"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"directive",type:Y.MatSuffix,selector:"[matSuffix], [matIconSuffix], [matTextSuffix]",inputs:["matTextSuffix"]},{kind:"component",type:ee.MatOption,selector:"mat-option",exportAs:["matOption"]},{kind:"directive",type:ce.MatTooltip,selector:"[matTooltip]",exportAs:["matTooltip"]},{kind:"component",type:Re.MatAutocomplete,selector:"mat-autocomplete",inputs:["disableRipple","hideSingleSelectionIndicator"],exportAs:["matAutocomplete"]},{kind:"directive",type:Re.MatAutocompleteTrigger,selector:"input[matAutocomplete], textarea[matAutocomplete]",exportAs:["matAutocompleteTrigger"]},{kind:"directive",type:Re.MatAutocompleteOrigin,selector:"[matAutocompleteOrigin]",exportAs:["matAutocompleteOrigin"]},{kind:"component",type:be.MatChipGrid,selector:"mat-chip-grid",inputs:["tabIndex","disabled","placeholder","required","value","errorStateMatcher"],outputs:["change","valueChange"]},{kind:"directive",type:be.MatChipInput,selector:"input[matChipInputFor]",inputs:["matChipInputFor","matChipInputAddOnBlur","matChipInputSeparatorKeyCodes","placeholder","id","disabled"],outputs:["matChipInputTokenEnd"],exportAs:["matChipInput","matChipInputFor"]},{kind:"directive",type:be.MatChipRemove,selector:"[matChipRemove]"},{kind:"component",type:be.MatChipRow,selector:"mat-chip-row, [mat-chip-row], mat-basic-chip-row, [mat-basic-chip-row]",inputs:["color","disabled","disableRipple","tabIndex","editable"],outputs:["edited"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"pipe",type:H.AsyncPipe,name:"async"},{kind:"pipe",type:Oe.HighlightPipe,name:"highlight"},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Dn,decorators:[{type:n,args:[{selector:"tb-message-types-config",providers:[{provide:B,useExisting:a((()=>Dn)),multi:!0}],template:'<mat-form-field [formGroup]="messageTypeConfigForm" style="width: 100%;">\n  <mat-label *ngIf="label">{{ label }}</mat-label>\n  <mat-chip-grid #chipList [required]="required">\n    <mat-chip-row\n      *ngFor="let messageType of messageTypes"\n      [removable]="true"\n      (removed)="remove(messageType)">\n      {{messageType.name}}\n      <mat-icon matChipRemove>close</mat-icon>\n    </mat-chip-row>\n    <input matInput type="text" placeholder="{{ placeholder | translate }}"\n           #messageTypeInput\n           (focusin)="onFocus()"\n           formControlName="messageType"\n           matAutocompleteOrigin\n           #origin="matAutocompleteOrigin"\n           [matAutocompleteConnectedTo]="origin"\n           [matAutocomplete]="messageTypeAutocomplete"\n           [matChipInputFor]="chipList"\n           [matChipInputSeparatorKeyCodes]="separatorKeysCodes"\n           (matChipInputTokenEnd)="add($event)">\n  </mat-chip-grid>\n  <mat-autocomplete #messageTypeAutocomplete="matAutocomplete"\n                    class="tb-autocomplete"\n                    (optionSelected)="selected($event)"\n                    [displayWith]="displayMessageTypeFn">\n    <mat-option *ngFor="let messageType of filteredMessageTypes | async" [value]="messageType">\n      <span [innerHTML]="messageType.name | highlight:searchText"></span>\n    </mat-option>\n    <mat-option *ngIf="(filteredMessageTypes | async)?.length === 0" [value]="null" class="tb-not-found">\n      <div class="tb-not-found-content" (click)="$event.stopPropagation()">\n        <div *ngIf="!textIsNotEmpty(searchText); else searchNotEmpty">\n          <span translate>tb.rulenode.no-message-types-found</span>\n        </div>\n        <ng-template #searchNotEmpty>\n                <span>\n                  {{ \'tb.rulenode.no-message-type-matching\' | translate :\n                  {messageType: truncate.transform(searchText, true, 6, &apos;...&apos;)}\n                  }}\n                </span>\n        </ng-template>\n        <span>\n          <a translate (click)="createMessageType($event, searchText)">tb.rulenode.create-new-message-type</a>\n        </span>\n      </div>\n    </mat-option>\n  </mat-autocomplete>\n  <mat-icon class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon" matSuffix\n            color="primary"\n            matTooltip="{{ \'tb.rulenode.chip-help\' | translate: { inputName: \'tb.rulenode.message-type\' | translate } }}">help</mat-icon>\n  <mat-error *ngIf="chipList.errorState">\n    {{ \'tb.rulenode.select-message-types-required\' | translate }}\n  </mat-error>\n</mat-form-field>\n',styles:[':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n']}]}],ctorParameters:function(){return[{type:P.Store},{type:Z.TranslateService},{type:S.TruncatePipe},{type:R.FormBuilder}]},propDecorators:{required:[{type:i}],label:[{type:i}],placeholder:[{type:i}],disabled:[{type:i}],chipList:[{type:o,args:["chipList",{static:!1}]}],matAutocomplete:[{type:o,args:["messageTypeAutocomplete",{static:!1}]}],messageTypeInput:[{type:o,args:["messageTypeInput",{static:!1}]}]}});class wn extends L{get required(){return this.requiredValue}set required(e){this.requiredValue=Le(e)}constructor(e,t){super(e),this.store=e,this.fb=t,this.subscriptions=[],this.disableCertPemCredentials=!1,this.passwordFieldRequired=!0,this.allCredentialsTypes=zt,this.credentialsTypeTranslationsMap=Ut,this.propagateChange=e=>{}}ngOnInit(){this.credentialsConfigFormGroup=this.fb.group({type:[null,[O.required]],username:[null,[]],password:[null,[]],caCert:[null,[]],caCertFileName:[null,[]],privateKey:[null,[]],privateKeyFileName:[null,[]],cert:[null,[]],certFileName:[null,[]]}),this.subscriptions.push(this.credentialsConfigFormGroup.valueChanges.subscribe((()=>{this.updateView()}))),this.subscriptions.push(this.credentialsConfigFormGroup.get("type").valueChanges.subscribe((()=>{this.credentialsTypeChanged()})))}ngOnChanges(e){for(const t of Object.keys(e)){const n=e[t];if(!n.firstChange&&n.currentValue!==n.previousValue&&n.currentValue&&"disableCertPemCredentials"===t){"cert.PEM"===this.credentialsConfigFormGroup.get("type").value&&setTimeout((()=>{this.credentialsConfigFormGroup.get("type").patchValue("anonymous",{emitEvent:!0})}))}}}ngOnDestroy(){this.subscriptions.forEach((e=>e.unsubscribe()))}writeValue(e){ae(e)&&(this.credentialsConfigFormGroup.reset(e,{emitEvent:!1}),this.updateValidators())}setDisabledState(e){e?this.credentialsConfigFormGroup.disable({emitEvent:!1}):(this.credentialsConfigFormGroup.enable({emitEvent:!1}),this.updateValidators())}updateView(){let e=this.credentialsConfigFormGroup.value;const t=e.type;switch(t){case"anonymous":e={type:t};break;case"basic":e={type:t,username:e.username,password:e.password};break;case"cert.PEM":delete e.username}this.propagateChange(e)}registerOnChange(e){this.propagateChange=e}registerOnTouched(e){}validate(e){return this.credentialsConfigFormGroup.valid?null:{credentialsConfig:{valid:!1}}}credentialsTypeChanged(){this.credentialsConfigFormGroup.patchValue({username:null,password:null,caCert:null,caCertFileName:null,privateKey:null,privateKeyFileName:null,cert:null,certFileName:null}),this.updateValidators()}updateValidators(e=!1){const t=this.credentialsConfigFormGroup.get("type").value;switch(e&&this.credentialsConfigFormGroup.reset({type:t},{emitEvent:!1}),this.credentialsConfigFormGroup.setValidators([]),this.credentialsConfigFormGroup.get("username").setValidators([]),this.credentialsConfigFormGroup.get("password").setValidators([]),t){case"anonymous":break;case"basic":this.credentialsConfigFormGroup.get("username").setValidators([O.required]),this.credentialsConfigFormGroup.get("password").setValidators(this.passwordFieldRequired?[O.required]:[]);break;case"cert.PEM":this.credentialsConfigFormGroup.setValidators([this.requiredFilesSelected(O.required,[["caCert","caCertFileName"],["privateKey","privateKeyFileName","cert","certFileName"]])])}this.credentialsConfigFormGroup.get("username").updateValueAndValidity({emitEvent:e}),this.credentialsConfigFormGroup.get("password").updateValueAndValidity({emitEvent:e}),this.credentialsConfigFormGroup.updateValueAndValidity({emitEvent:e})}requiredFilesSelected(e,t=null){return n=>{t||(t=[Object.keys(n.controls)]);return n?.controls&&t.some((t=>t.every((t=>!e(n.controls[t])))))?null:{notAllRequiredFilesSelected:!0}}}}e("CredentialsConfigComponent",wn),wn.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:wn,deps:[{token:P.Store},{token:R.FormBuilder}],target:t.ɵɵFactoryTarget.Component}),wn.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:wn,selector:"tb-credentials-config",inputs:{required:"required",disableCertPemCredentials:"disableCertPemCredentials",passwordFieldRequired:"passwordFieldRequired"},providers:[{provide:B,useExisting:a((()=>wn)),multi:!0},{provide:K,useExisting:a((()=>wn)),multi:!0}],usesInheritance:!0,usesOnChanges:!0,ngImport:t,template:'<section [formGroup]="credentialsConfigFormGroup" fxLayout="column">\n  <mat-expansion-panel class="tb-credentials-config-panel-group">\n    <mat-expansion-panel-header>\n      <mat-panel-title translate>tb.rulenode.credentials</mat-panel-title>\n      <mat-panel-description>\n        {{ credentialsTypeTranslationsMap.get(credentialsConfigFormGroup.get(\'type\').value) | translate }}\n      </mat-panel-description>\n    </mat-expansion-panel-header>\n    <ng-template matExpansionPanelContent>\n      <mat-form-field class="mat-block">\n        <mat-label translate>tb.rulenode.credentials-type</mat-label>\n        <mat-select formControlName="type" required>\n          <mat-option *ngFor="let credentialsType of allCredentialsTypes" [value]="credentialsType"\n                      [disabled]="credentialsType === \'cert.PEM\' && disableCertPemCredentials">\n            {{ credentialsTypeTranslationsMap.get(credentialsType) | translate }}\n          </mat-option>\n        </mat-select>\n        <mat-error *ngIf="credentialsConfigFormGroup.get(\'type\').hasError(\'required\')">\n          {{ \'tb.rulenode.credentials-type-required\' | translate }}\n        </mat-error>\n      </mat-form-field>\n      <section fxLayout="column" [ngSwitch]="credentialsConfigFormGroup.get(\'type\').value">\n        <ng-template ngSwitchCase="anonymous">\n        </ng-template>\n        <ng-template ngSwitchCase="basic">\n          <mat-form-field class="mat-block">\n            <mat-label translate>tb.rulenode.username</mat-label>\n            <input required matInput formControlName="username">\n            <mat-error *ngIf="credentialsConfigFormGroup.get(\'username\').hasError(\'required\')">\n              {{ \'tb.rulenode.username-required\' | translate }}\n            </mat-error>\n          </mat-form-field>\n          <mat-form-field class="mat-block">\n            <mat-label translate>tb.rulenode.password</mat-label>\n            <input type="password" [required]="passwordFieldRequired" matInput formControlName="password">\n            <tb-toggle-password matSuffix></tb-toggle-password>\n            <mat-error *ngIf="credentialsConfigFormGroup.get(\'password\').hasError(\'required\')">\n              {{ \'tb.rulenode.password-required\' | translate }}\n            </mat-error>\n          </mat-form-field>\n        </ng-template>\n        <ng-template ngSwitchCase="cert.PEM">\n          <div class="tb-hint">{{ \'tb.rulenode.credentials-pem-hint\' | translate }}</div>\n          <tb-file-input formControlName="caCert"\n                         inputId="caCertSelect"\n                         [existingFileName]="credentialsConfigFormGroup.get(\'caCertFileName\').value"\n                         (fileNameChanged)="credentialsConfigFormGroup.get(\'caCertFileName\').setValue($event)"\n                         label="{{\'tb.rulenode.ca-cert\' | translate}}"\n                         noFileText="tb.rulenode.no-file"\n                         dropLabel="{{\'tb.rulenode.drop-file\' | translate}}">\n          </tb-file-input>\n          <tb-file-input formControlName="cert"\n                         inputId="CertSelect"\n                         [existingFileName]="credentialsConfigFormGroup.get(\'certFileName\').value"\n                         (fileNameChanged)="credentialsConfigFormGroup.get(\'certFileName\').setValue($event)"\n                         label="{{\'tb.rulenode.cert\' | translate}}"\n                         noFileText="tb.rulenode.no-file"\n                         dropLabel="{{\'tb.rulenode.drop-file\' | translate}}">\n          </tb-file-input>\n          <tb-file-input style="padding-bottom: 8px;"\n                         formControlName="privateKey"\n                         inputId="privateKeySelect"\n                         [existingFileName]="credentialsConfigFormGroup.get(\'privateKeyFileName\').value"\n                         (fileNameChanged)="credentialsConfigFormGroup.get(\'privateKeyFileName\').setValue($event)"\n                         label="{{\'tb.rulenode.private-key\' | translate}}"\n                         noFileText="tb.rulenode.no-file"\n                         dropLabel="{{\'tb.rulenode.drop-file\' | translate}}">\n          </tb-file-input>\n          <mat-form-field class="mat-block">\n            <mat-label translate>tb.rulenode.private-key-password</mat-label>\n            <input type="password" matInput formControlName="password">\n            <tb-toggle-password matSuffix></tb-toggle-password>\n          </mat-form-field>\n        </ng-template>\n      </section>\n    </ng-template>\n  </mat-expansion-panel>\n</section>\n',dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"directive",type:H.NgSwitch,selector:"[ngSwitch]",inputs:["ngSwitch"]},{kind:"directive",type:H.NgSwitchCase,selector:"[ngSwitchCase]",inputs:["ngSwitchCase"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"directive",type:Y.MatSuffix,selector:"[matSuffix], [matIconSuffix], [matTextSuffix]",inputs:["matTextSuffix"]},{kind:"component",type:X.MatSelect,selector:"mat-select",inputs:["disabled","disableRipple","tabIndex","hideSingleSelectionIndicator"],exportAs:["matSelect"]},{kind:"component",type:ee.MatOption,selector:"mat-option",exportAs:["matOption"]},{kind:"component",type:We.MatExpansionPanel,selector:"mat-expansion-panel",inputs:["disabled","expanded","hideToggle","togglePosition"],outputs:["opened","closed","expandedChange","afterExpand","afterCollapse"],exportAs:["matExpansionPanel"]},{kind:"component",type:We.MatExpansionPanelHeader,selector:"mat-expansion-panel-header",inputs:["tabIndex","expandedHeight","collapsedHeight"]},{kind:"directive",type:We.MatExpansionPanelTitle,selector:"mat-panel-title"},{kind:"directive",type:We.MatExpansionPanelDescription,selector:"mat-panel-description"},{kind:"directive",type:We.MatExpansionPanelContent,selector:"ng-template[matExpansionPanelContent]"},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"component",type:Ze.FileInputComponent,selector:"tb-file-input",inputs:["label","hint","accept","noFileText","inputId","allowedExtensions","dropLabel","maxSizeByte","contentConvertFunction","required","requiredAsError","disabled","existingFileName","readAsBinary","workFromFileObj","multipleFile"],outputs:["fileNameChanged"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"component",type:Xe.TogglePasswordComponent,selector:"tb-toggle-password"},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:wn,decorators:[{type:n,args:[{selector:"tb-credentials-config",providers:[{provide:B,useExisting:a((()=>wn)),multi:!0},{provide:K,useExisting:a((()=>wn)),multi:!0}],template:'<section [formGroup]="credentialsConfigFormGroup" fxLayout="column">\n  <mat-expansion-panel class="tb-credentials-config-panel-group">\n    <mat-expansion-panel-header>\n      <mat-panel-title translate>tb.rulenode.credentials</mat-panel-title>\n      <mat-panel-description>\n        {{ credentialsTypeTranslationsMap.get(credentialsConfigFormGroup.get(\'type\').value) | translate }}\n      </mat-panel-description>\n    </mat-expansion-panel-header>\n    <ng-template matExpansionPanelContent>\n      <mat-form-field class="mat-block">\n        <mat-label translate>tb.rulenode.credentials-type</mat-label>\n        <mat-select formControlName="type" required>\n          <mat-option *ngFor="let credentialsType of allCredentialsTypes" [value]="credentialsType"\n                      [disabled]="credentialsType === \'cert.PEM\' && disableCertPemCredentials">\n            {{ credentialsTypeTranslationsMap.get(credentialsType) | translate }}\n          </mat-option>\n        </mat-select>\n        <mat-error *ngIf="credentialsConfigFormGroup.get(\'type\').hasError(\'required\')">\n          {{ \'tb.rulenode.credentials-type-required\' | translate }}\n        </mat-error>\n      </mat-form-field>\n      <section fxLayout="column" [ngSwitch]="credentialsConfigFormGroup.get(\'type\').value">\n        <ng-template ngSwitchCase="anonymous">\n        </ng-template>\n        <ng-template ngSwitchCase="basic">\n          <mat-form-field class="mat-block">\n            <mat-label translate>tb.rulenode.username</mat-label>\n            <input required matInput formControlName="username">\n            <mat-error *ngIf="credentialsConfigFormGroup.get(\'username\').hasError(\'required\')">\n              {{ \'tb.rulenode.username-required\' | translate }}\n            </mat-error>\n          </mat-form-field>\n          <mat-form-field class="mat-block">\n            <mat-label translate>tb.rulenode.password</mat-label>\n            <input type="password" [required]="passwordFieldRequired" matInput formControlName="password">\n            <tb-toggle-password matSuffix></tb-toggle-password>\n            <mat-error *ngIf="credentialsConfigFormGroup.get(\'password\').hasError(\'required\')">\n              {{ \'tb.rulenode.password-required\' | translate }}\n            </mat-error>\n          </mat-form-field>\n        </ng-template>\n        <ng-template ngSwitchCase="cert.PEM">\n          <div class="tb-hint">{{ \'tb.rulenode.credentials-pem-hint\' | translate }}</div>\n          <tb-file-input formControlName="caCert"\n                         inputId="caCertSelect"\n                         [existingFileName]="credentialsConfigFormGroup.get(\'caCertFileName\').value"\n                         (fileNameChanged)="credentialsConfigFormGroup.get(\'caCertFileName\').setValue($event)"\n                         label="{{\'tb.rulenode.ca-cert\' | translate}}"\n                         noFileText="tb.rulenode.no-file"\n                         dropLabel="{{\'tb.rulenode.drop-file\' | translate}}">\n          </tb-file-input>\n          <tb-file-input formControlName="cert"\n                         inputId="CertSelect"\n                         [existingFileName]="credentialsConfigFormGroup.get(\'certFileName\').value"\n                         (fileNameChanged)="credentialsConfigFormGroup.get(\'certFileName\').setValue($event)"\n                         label="{{\'tb.rulenode.cert\' | translate}}"\n                         noFileText="tb.rulenode.no-file"\n                         dropLabel="{{\'tb.rulenode.drop-file\' | translate}}">\n          </tb-file-input>\n          <tb-file-input style="padding-bottom: 8px;"\n                         formControlName="privateKey"\n                         inputId="privateKeySelect"\n                         [existingFileName]="credentialsConfigFormGroup.get(\'privateKeyFileName\').value"\n                         (fileNameChanged)="credentialsConfigFormGroup.get(\'privateKeyFileName\').setValue($event)"\n                         label="{{\'tb.rulenode.private-key\' | translate}}"\n                         noFileText="tb.rulenode.no-file"\n                         dropLabel="{{\'tb.rulenode.drop-file\' | translate}}">\n          </tb-file-input>\n          <mat-form-field class="mat-block">\n            <mat-label translate>tb.rulenode.private-key-password</mat-label>\n            <input type="password" matInput formControlName="password">\n            <tb-toggle-password matSuffix></tb-toggle-password>\n          </mat-form-field>\n        </ng-template>\n      </section>\n    </ng-template>\n  </mat-expansion-panel>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.FormBuilder}]},propDecorators:{required:[{type:i}],disableCertPemCredentials:[{type:i}],passwordFieldRequired:[{type:i}]}});const Vn=new l("WindowToken","undefined"!=typeof window&&window.document?{providedIn:"root",factory:()=>window}:{providedIn:"root",factory:()=>{}});class Pn{constructor(e,t,n){this.ngZone=e,this.document=t,this.window=n,this.copySubject=new Ke,this.copyResponse$=this.copySubject.asObservable(),this.config={}}configure(e){this.config=e}copy(e){if(!this.isSupported||!e)return this.pushCopyResponse({isSuccess:!1,content:e});const t=this.copyFromContent(e);return t?this.pushCopyResponse({content:e,isSuccess:t}):this.pushCopyResponse({isSuccess:!1,content:e})}get isSupported(){return!!this.document.queryCommandSupported&&!!this.document.queryCommandSupported("copy")&&!!this.window}isTargetValid(e){if(e instanceof HTMLInputElement||e instanceof HTMLTextAreaElement){if(e.hasAttribute("disabled"))throw new Error('Invalid "target" attribute. Please use "readonly" instead of "disabled" attribute');return!0}throw new Error("Target should be input or textarea")}copyFromInputElement(e,t=!0){try{this.selectTarget(e);const n=this.copyText();return this.clearSelection(t?e:void 0,this.window),n&&this.isCopySuccessInIE11()}catch(e){return!1}}isCopySuccessInIE11(){const e=this.window.clipboardData;return!(e&&e.getData&&!e.getData("Text"))}copyFromContent(e,t=this.document.body){if(this.tempTextArea&&!t.contains(this.tempTextArea)&&this.destroy(this.tempTextArea.parentElement||void 0),!this.tempTextArea){this.tempTextArea=this.createTempTextArea(this.document,this.window);try{t.appendChild(this.tempTextArea)}catch(e){throw new Error("Container should be a Dom element")}}this.tempTextArea.value=e;const n=this.copyFromInputElement(this.tempTextArea,!1);return this.config.cleanUpAfterCopy&&this.destroy(this.tempTextArea.parentElement||void 0),n}destroy(e=this.document.body){this.tempTextArea&&(e.removeChild(this.tempTextArea),this.tempTextArea=void 0)}selectTarget(e){return e.select(),e.setSelectionRange(0,e.value.length),e.value.length}copyText(){return this.document.execCommand("copy")}clearSelection(e,t){e&&e.focus(),t.getSelection()?.removeAllRanges()}createTempTextArea(e,t){const n="rtl"===e.documentElement.getAttribute("dir");let r;r=e.createElement("textarea"),r.style.fontSize="12pt",r.style.border="0",r.style.padding="0",r.style.margin="0",r.style.position="absolute",r.style[n?"right":"left"]="-9999px";const o=t.pageYOffset||e.documentElement.scrollTop;return r.style.top=o+"px",r.setAttribute("readonly",""),r}pushCopyResponse(e){this.copySubject.observers.length>0&&this.ngZone.run((()=>{this.copySubject.next(e)}))}pushCopyReponse(e){this.pushCopyResponse(e)}}Pn.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"13.0.1",ngImport:t,type:Pn,deps:[{token:t.NgZone},{token:j},{token:Vn,optional:!0}],target:t.ɵɵFactoryTarget.Injectable}),Pn.ɵprov=t.ɵɵngDeclareInjectable({minVersion:"12.0.0",version:"13.0.1",ngImport:t,type:Pn,providedIn:"root"}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"13.0.1",ngImport:t,type:Pn,decorators:[{type:s,args:[{providedIn:"root"}]}],ctorParameters:function(){return[{type:t.NgZone},{type:void 0,decorators:[{type:m,args:[j]}]},{type:void 0,decorators:[{type:p},{type:m,args:[Vn]}]}]}});class Rn{constructor(e,t,n,o){this.ngZone=e,this.host=t,this.renderer=n,this.clipboardSrv=o,this.cbOnSuccess=new r,this.cbOnError=new r,this.onClick=e=>{this.clipboardSrv.isSupported?this.targetElm&&this.clipboardSrv.isTargetValid(this.targetElm)?this.handleResult(this.clipboardSrv.copyFromInputElement(this.targetElm),this.targetElm.value,e):this.cbContent&&this.handleResult(this.clipboardSrv.copyFromContent(this.cbContent,this.container),this.cbContent,e):this.handleResult(!1,void 0,e)}}ngOnInit(){this.ngZone.runOutsideAngular((()=>{this.clickListener=this.renderer.listen(this.host.nativeElement,"click",this.onClick)}))}ngOnDestroy(){this.clickListener&&this.clickListener(),this.clipboardSrv.destroy(this.container)}handleResult(e,t,n){let r={isSuccess:e,content:t,successMessage:this.cbSuccessMsg,event:n};e?this.cbOnSuccess.observed&&this.ngZone.run((()=>{this.cbOnSuccess.emit(r)})):this.cbOnError.observed&&this.ngZone.run((()=>{this.cbOnError.emit(r)})),this.clipboardSrv.pushCopyResponse(r)}}Rn.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"13.0.1",ngImport:t,type:Rn,deps:[{token:t.NgZone},{token:t.ElementRef},{token:t.Renderer2},{token:Pn}],target:t.ɵɵFactoryTarget.Directive}),Rn.ɵdir=t.ɵɵngDeclareDirective({minVersion:"12.0.0",version:"13.0.1",type:Rn,selector:"[ngxClipboard]",inputs:{targetElm:["ngxClipboard","targetElm"],container:"container",cbContent:"cbContent",cbSuccessMsg:"cbSuccessMsg"},outputs:{cbOnSuccess:"cbOnSuccess",cbOnError:"cbOnError"},ngImport:t}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"13.0.1",ngImport:t,type:Rn,decorators:[{type:d,args:[{selector:"[ngxClipboard]"}]}],ctorParameters:function(){return[{type:t.NgZone},{type:t.ElementRef},{type:t.Renderer2},{type:Pn}]},propDecorators:{targetElm:[{type:i,args:["ngxClipboard"]}],container:[{type:i}],cbContent:[{type:i}],cbSuccessMsg:[{type:i}],cbOnSuccess:[{type:u}],cbOnError:[{type:u}]}});class On{constructor(e,t,n){this._clipboardService=e,this._viewContainerRef=t,this._templateRef=n}ngOnInit(){this._clipboardService.isSupported&&this._viewContainerRef.createEmbeddedView(this._templateRef)}}On.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"13.0.1",ngImport:t,type:On,deps:[{token:Pn},{token:t.ViewContainerRef},{token:t.TemplateRef}],target:t.ɵɵFactoryTarget.Directive}),On.ɵdir=t.ɵɵngDeclareDirective({minVersion:"12.0.0",version:"13.0.1",type:On,selector:"[ngxClipboardIfSupported]",ngImport:t}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"13.0.1",ngImport:t,type:On,decorators:[{type:d,args:[{selector:"[ngxClipboardIfSupported]"}]}],ctorParameters:function(){return[{type:Pn},{type:t.ViewContainerRef},{type:t.TemplateRef}]}});class _n{}_n.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"13.0.1",ngImport:t,type:_n,deps:[],target:t.ɵɵFactoryTarget.NgModule}),_n.ɵmod=t.ɵɵngDeclareNgModule({minVersion:"12.0.0",version:"13.0.1",ngImport:t,type:_n,declarations:[Rn,On],imports:[$],exports:[Rn,On]}),_n.ɵinj=t.ɵɵngDeclareInjector({minVersion:"12.0.0",version:"13.0.1",ngImport:t,type:_n,imports:[[$]]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"13.0.1",ngImport:t,type:_n,decorators:[{type:c,args:[{imports:[$],declarations:[Rn,On],exports:[Rn,On]}]}]});class Bn{set required(e){this.requiredValue!==e&&(this.requiredValue=e,this.updateValidators())}get required(){return this.requiredValue}constructor(e){this.fb=e,this.subscriptSizing="fixed",this.messageTypes=[{name:"Post attributes",value:"POST_ATTRIBUTES_REQUEST"},{name:"Post telemetry",value:"POST_TELEMETRY_REQUEST"},{name:"Custom",value:""}],this.propagateChange=()=>{},this.destroy$=new Ke,this.messageTypeFormGroup=this.fb.group({messageTypeAlias:[null,[O.required]],messageType:[{value:null,disabled:!0},[O.maxLength(255)]]}),this.messageTypeFormGroup.get("messageTypeAlias").valueChanges.pipe(ze(this.destroy$)).subscribe((e=>this.updateMessageTypeValue(e))),this.messageTypeFormGroup.valueChanges.pipe(ze(this.destroy$)).subscribe((()=>this.updateView()))}ngOnDestroy(){this.destroy$.next(),this.destroy$.complete()}registerOnTouched(e){}registerOnChange(e){this.propagateChange=e}writeValue(e){this.modelValue=e;let t=this.messageTypes.find((t=>t.value===e));t||(t=this.messageTypes.find((e=>""===e.value))),this.messageTypeFormGroup.get("messageTypeAlias").patchValue(t,{emitEvent:!1}),this.messageTypeFormGroup.get("messageType").patchValue(e,{emitEvent:!1})}validate(){return this.messageTypeFormGroup.valid?null:{messageTypeInvalid:!0}}setDisabledState(e){this.disabled=e,e?this.messageTypeFormGroup.disable({emitEvent:!1}):(this.messageTypeFormGroup.enable({emitEvent:!1}),"Custom"!==this.messageTypeFormGroup.get("messageTypeAlias").value?.name&&this.messageTypeFormGroup.get("messageType").disable({emitEvent:!1}))}updateView(){const e=this.messageTypeFormGroup.getRawValue().messageType;this.modelValue!==e&&(this.modelValue=e,this.propagateChange(this.modelValue))}updateValidators(){this.messageTypeFormGroup.get("messageType").setValidators(this.required?[O.required,O.maxLength(255)]:[O.maxLength(255)]),this.messageTypeFormGroup.get("messageType").updateValueAndValidity({emitEvent:!1})}updateMessageTypeValue(e){"Custom"!==e?.name?this.messageTypeFormGroup.get("messageType").disable({emitEvent:!1}):this.messageTypeFormGroup.get("messageType").enable({emitEvent:!1}),this.messageTypeFormGroup.get("messageType").patchValue(e.value??null)}}e("OutputMessageTypeAutocompleteComponent",Bn),Bn.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Bn,deps:[{token:R.FormBuilder}],target:t.ɵɵFactoryTarget.Component}),Bn.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:Bn,selector:"tb-output-message-type-autocomplete",inputs:{subscriptSizing:"subscriptSizing",disabled:"disabled",required:"required"},providers:[{provide:B,useExisting:a((()=>Bn)),multi:!0},{provide:K,useExisting:a((()=>Bn)),multi:!0}],ngImport:t,template:'<section class="tb-form-row no-border no-padding tb-standard-fields column-xs" [formGroup]="messageTypeFormGroup">\n  <mat-form-field class="flex" subscriptSizing="{{ subscriptSizing }}" hideRequiredMarker>\n    <mat-label>{{\'tb.rulenode.output-message-type\' | translate}}</mat-label>\n    <mat-select formControlName="messageTypeAlias">\n      <mat-option *ngFor="let msgType of messageTypes" [value]="msgType">\n        {{msgType.name}}\n      </mat-option>\n    </mat-select>\n  </mat-form-field>\n  <mat-form-field class="flex" subscriptSizing="{{ subscriptSizing }}" [hideRequiredMarker]="messageTypeFormGroup.get(\'messageType\').disabled">\n    <mat-label>{{\'tb.rulenode.message-type-value\' | translate}}</mat-label>\n    <input matInput type="text" formControlName="messageType">\n    <button type="button"\n            matSuffix\n            mat-icon-button\n            aria-label="Copy"\n            *ngIf="messageTypeFormGroup.get(\'messageType\').value"\n            ngxClipboard\n            [cbContent]="messageTypeFormGroup.get(\'messageType\').value"\n            matTooltip="{{ \'tb.rulenode.copy-message-type\' | translate }}">\n      <mat-icon aria-hidden="false"\n                aria-label="help-icon">content_copy\n      </mat-icon>\n    </button>\n    <mat-error *ngIf="messageTypeFormGroup.get(\'messageType\').hasError(\'required\')">\n      {{ \'tb.rulenode.message-type-value-required\' | translate }}\n    </mat-error>\n    <mat-error *ngIf="messageTypeFormGroup.get(\'messageType\').hasError(\'maxlength\')">\n      {{ \'tb.rulenode.message-type-value-max-length\' | translate }}\n    </mat-error>\n  </mat-form-field>\n</section>\n\n',dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:de.MatIconButton,selector:"button[mat-icon-button]",inputs:["disabled","disableRipple","color"],exportAs:["matButton"]},{kind:"component",type:ue.MatIcon,selector:"mat-icon",inputs:["color","inline","svgIcon","fontSet","fontIcon"],exportAs:["matIcon"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"directive",type:Y.MatSuffix,selector:"[matSuffix], [matIconSuffix], [matTextSuffix]",inputs:["matTextSuffix"]},{kind:"component",type:X.MatSelect,selector:"mat-select",inputs:["disabled","disableRipple","tabIndex","hideSingleSelectionIndicator"],exportAs:["matSelect"]},{kind:"component",type:ee.MatOption,selector:"mat-option",exportAs:["matOption"]},{kind:"directive",type:ce.MatTooltip,selector:"[matTooltip]",exportAs:["matTooltip"]},{kind:"directive",type:Rn,selector:"[ngxClipboard]",inputs:["ngxClipboard","container","cbContent","cbSuccessMsg"],outputs:["cbOnSuccess","cbOnError"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),Be([N()],Bn.prototype,"disabled",void 0),Be([N()],Bn.prototype,"required",null),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Bn,decorators:[{type:n,args:[{selector:"tb-output-message-type-autocomplete",providers:[{provide:B,useExisting:a((()=>Bn)),multi:!0},{provide:K,useExisting:a((()=>Bn)),multi:!0}],template:'<section class="tb-form-row no-border no-padding tb-standard-fields column-xs" [formGroup]="messageTypeFormGroup">\n  <mat-form-field class="flex" subscriptSizing="{{ subscriptSizing }}" hideRequiredMarker>\n    <mat-label>{{\'tb.rulenode.output-message-type\' | translate}}</mat-label>\n    <mat-select formControlName="messageTypeAlias">\n      <mat-option *ngFor="let msgType of messageTypes" [value]="msgType">\n        {{msgType.name}}\n      </mat-option>\n    </mat-select>\n  </mat-form-field>\n  <mat-form-field class="flex" subscriptSizing="{{ subscriptSizing }}" [hideRequiredMarker]="messageTypeFormGroup.get(\'messageType\').disabled">\n    <mat-label>{{\'tb.rulenode.message-type-value\' | translate}}</mat-label>\n    <input matInput type="text" formControlName="messageType">\n    <button type="button"\n            matSuffix\n            mat-icon-button\n            aria-label="Copy"\n            *ngIf="messageTypeFormGroup.get(\'messageType\').value"\n            ngxClipboard\n            [cbContent]="messageTypeFormGroup.get(\'messageType\').value"\n            matTooltip="{{ \'tb.rulenode.copy-message-type\' | translate }}">\n      <mat-icon aria-hidden="false"\n                aria-label="help-icon">content_copy\n      </mat-icon>\n    </button>\n    <mat-error *ngIf="messageTypeFormGroup.get(\'messageType\').hasError(\'required\')">\n      {{ \'tb.rulenode.message-type-value-required\' | translate }}\n    </mat-error>\n    <mat-error *ngIf="messageTypeFormGroup.get(\'messageType\').hasError(\'maxlength\')">\n      {{ \'tb.rulenode.message-type-value-max-length\' | translate }}\n    </mat-error>\n  </mat-form-field>\n</section>\n\n'}]}],ctorParameters:function(){return[{type:R.FormBuilder}]},propDecorators:{subscriptSizing:[{type:i}],disabled:[{type:i}],required:[{type:i}]}});class Kn{constructor(e,t){this.fb=e,this.translate=t,this.translation=nn,this.propagateChange=()=>{},this.destroy$=new Ke,this.selectOptions=[]}ngOnInit(){this.initOptions(),this.chipControlGroup=this.fb.group({chipControl:[null,[]]}),this.chipControlGroup.get("chipControl").valueChanges.pipe(Ve(this.destroy$)).subscribe((e=>{e&&this.propagateChange(e)}))}ngOnDestroy(){this.destroy$.next(),this.destroy$.complete()}initOptions(){for(const e of this.translation.keys())this.selectOptions.push({value:e,name:this.translate.instant(this.translation.get(e))})}writeValue(e){this.chipControlGroup.get("chipControl").patchValue(e,{emitEvent:!1})}registerOnChange(e){this.propagateChange=e}registerOnTouched(e){}setDisabledState(e){e?this.chipControlGroup.disable({emitEvent:!1}):this.chipControlGroup.enable({emitEvent:!1})}}e("MsgMetadataChipComponent",Kn),Kn.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Kn,deps:[{token:R.FormBuilder},{token:Z.TranslateService}],target:t.ɵɵFactoryTarget.Component}),Kn.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:Kn,selector:"tb-msg-metadata-chip",inputs:{labelText:"labelText",translation:"translation"},providers:[{provide:B,useExisting:a((()=>Kn)),multi:!0}],ngImport:t,template:'<div [formGroup]="chipControlGroup" class="tb-form-row space-between">\n  <div class="fixed-title-width">{{ labelText }}</div>\n  <mat-chip-listbox formControlName="chipControl">\n    <mat-chip-option *ngFor="let option of selectOptions"\n                     selectable="{{ chipControlGroup.get(\'chipControl\').value !== option.value }}"\n                     color="primary"\n                     [value]="option.value">{{ option.name }}</mat-chip-option>\n  </mat-chip-listbox>\n</div>\n',dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"component",type:be.MatChipListbox,selector:"mat-chip-listbox",inputs:["tabIndex","multiple","aria-orientation","selectable","compareWith","required","hideSingleSelectionIndicator","value"],outputs:["change"]},{kind:"component",type:be.MatChipOption,selector:"mat-basic-chip-option, [mat-basic-chip-option], mat-chip-option, [mat-chip-option]",inputs:["color","disabled","disableRipple","tabIndex","selectable","selected"],outputs:["selectionChange"]},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Kn,decorators:[{type:n,args:[{selector:"tb-msg-metadata-chip",providers:[{provide:B,useExisting:a((()=>Kn)),multi:!0}],template:'<div [formGroup]="chipControlGroup" class="tb-form-row space-between">\n  <div class="fixed-title-width">{{ labelText }}</div>\n  <mat-chip-listbox formControlName="chipControl">\n    <mat-chip-option *ngFor="let option of selectOptions"\n                     selectable="{{ chipControlGroup.get(\'chipControl\').value !== option.value }}"\n                     color="primary"\n                     [value]="option.value">{{ option.name }}</mat-chip-option>\n  </mat-chip-listbox>\n</div>\n'}]}],ctorParameters:function(){return[{type:R.FormBuilder},{type:Z.TranslateService}]},propDecorators:{labelText:[{type:i}],translation:[{type:i}]}});class zn extends L{constructor(e,t,n,r){super(e),this.store=e,this.translate=t,this.injector=n,this.fb=r,this.destroy$=new Ke,this.sourceFieldSubcritption=[],this.propagateChange=null,this.disabled=!1,this.required=!1,this.oneMapRequiredValidator=e=>e.get("keyVals").value.length,this.propagateNestedErrors=e=>{if(this.svListFormGroup&&this.svListFormGroup.get("keyVals")&&"VALID"===this.svListFormGroup.get("keyVals")?.status)return null;const t={};if(this.svListFormGroup&&this.svListFormGroup.setErrors(null),e instanceof z||e instanceof U){if(e.errors)for(const n of Object.keys(e.errors))t[n]=!0;for(const n of Object.keys(e.controls)){const r=this.propagateNestedErrors(e.controls[n]);if(r&&Object.keys(r).length)for(const e of Object.keys(r))t[e]=!0}return t}if(e.errors)for(const n of Object.keys(e.errors))t[n]=!0;return ie(t,{})?null:t}}ngOnInit(){this.ngControl=this.injector.get(_),null!=this.ngControl&&(this.ngControl.valueAccessor=this),this.svListFormGroup=this.fb.group({keyVals:this.fb.array([])},{validators:[this.propagateNestedErrors,this.oneMapRequiredValidator]}),this.svListFormGroup.valueChanges.pipe(Ve(this.destroy$)).subscribe((()=>{this.updateModel()}))}ngOnDestroy(){this.destroy$.next(),this.destroy$.complete()}keyValsFormArray(){return this.svListFormGroup.get("keyVals")}registerOnChange(e){this.propagateChange=e}registerOnTouched(e){}setDisabledState(e){this.disabled=e,this.disabled?this.svListFormGroup.disable({emitEvent:!1}):this.svListFormGroup.enable({emitEvent:!1})}writeValue(e){const t=Object.keys(e).map((t=>({key:t,value:e[t]})));if(this.keyValsFormArray().length===t.length)this.keyValsFormArray().patchValue(t,{emitEvent:!1});else{const e=[];t.forEach((t=>{e.push(this.fb.group({key:[t.key,[O.required]],value:[t.value,[O.required,O.pattern(/(?:.|\s)*\S(&:.|\s)*/)]]}))})),this.svListFormGroup.setControl("keyVals",this.fb.array(e,this.propagateNestedErrors),{emitEvent:!1});for(const e of this.keyValsFormArray().controls)this.keyChangeSubscribe(e)}}filterSelectOptions(e){const t=[];for(const e of this.svListFormGroup.get("keyVals").value){const n=this.selectOptions.find((t=>t.value===e.key));n&&t.push(n)}const n=[];for(const r of this.selectOptions)ae(t.find((e=>e.value===r.value)))&&r.value!==e?.get("key").value||n.push(r);return n}removeKeyVal(e){this.keyValsFormArray().removeAt(e),this.sourceFieldSubcritption[e].unsubscribe(),this.sourceFieldSubcritption.splice(e,1)}addKeyVal(){this.keyValsFormArray().push(this.fb.group({key:["",[O.required]],value:["",[O.required,O.pattern(/(?:.|\s)*\S(&:.|\s)*/)]]})),this.keyChangeSubscribe(this.keyValsFormArray().at(this.keyValsFormArray().length-1))}keyChangeSubscribe(e){this.sourceFieldSubcritption.push(e.get("key").valueChanges.pipe(Ve(this.destroy$)).subscribe((t=>{const n=Lt.get(t);e.get("value").patchValue(this.targetKeyPrefix+n[0].toUpperCase()+n.slice(1))})))}validate(e){return!this.svListFormGroup.get("keyVals").value.length&&this.required?{svMapRequired:!0}:this.svListFormGroup.valid?null:{svFieldsRequired:!0}}updateModel(){const e=this.svListFormGroup.get("keyVals").value;if(this.required&&!e.length||!this.svListFormGroup.valid)this.propagateChange(null);else{const t={};e.forEach((e=>{t[e.key]=e.value})),this.propagateChange(t)}}}e("SvMapConfigComponent",zn),zn.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:zn,deps:[{token:P.Store},{token:Z.TranslateService},{token:t.Injector},{token:R.FormBuilder}],target:t.ɵɵFactoryTarget.Component}),zn.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:zn,selector:"tb-sv-map-config",inputs:{selectOptions:"selectOptions",disabled:"disabled",labelText:"labelText",requiredText:"requiredText",targetKeyPrefix:"targetKeyPrefix",selectText:"selectText",selectRequiredText:"selectRequiredText",valText:"valText",valRequiredText:"valRequiredText",hintText:"hintText",popupHelpLink:"popupHelpLink",required:"required"},providers:[{provide:B,useExisting:a((()=>zn)),multi:!0},{provide:K,useExisting:a((()=>zn)),multi:!0}],usesInheritance:!0,ngImport:t,template:'<section [formGroup]="svListFormGroup" class="tb-form-panel stroked">\n  <div class="tb-form-row no-padding no-border space-between">\n    <div class="tb-form-panel-title">{{ labelText }}</div>\n    <div class="tb-form-panel-hint tb-error" translate *ngIf="svListFormGroup.hasError(\'required\')">\n      tb.rulenode.map-fields-required\n    </div>\n    <div class="tb-form-panel-hint tb-error" translate *ngIf="svListFormGroup.hasError(\'svMapRequired\')">\n      {{ requiredText }}\n    </div>\n  </div>\n  <div class="tb-form-panel no-border no-padding">\n    <div class="tb-form-table">\n      <div class="tb-form-table-header">\n        <div class="tb-form-table-header-cell field-space">{{ selectText }}</div>\n        <div class="tb-form-table-header-cell field-space">{{ valText }}</div>\n        <div class="tb-form-table-header-cell actions-header"></div>\n      </div>\n      <div class="tb-form-table-body">\n        <div class="tb-form-table-row"\n             *ngFor="let keyValControl of keyValsFormArray().controls; let $index = index;">\n          <mat-form-field class="tb-inline-field field-space" appearance="outline" subscriptSizing="dynamic">\n            <mat-select [placeholder]="selectText" [formControl]="keyValControl.get(\'key\')" required>\n              <mat-option *ngFor="let option of filterSelectOptions(keyValControl)" [value]="option.value">\n                {{option.name}}\n              </mat-option>\n            </mat-select>\n          </mat-form-field>\n          <mat-form-field class="tb-inline-field field-space" appearance="outline" subscriptSizing="dynamic">\n            <input [placeholder]="valText" [formControl]="keyValControl.get(\'value\')" matInput/>\n          </mat-form-field>\n          <div class="tb-form-table-row-cell-buttons">\n            <button [ngClass]="{\'tb-hidden\': keyValsFormArray().controls.length === 1}"\n                    type="button"\n                    mat-icon-button\n                    (click)="removeKeyVal($index)"\n                    [disabled]="isLoading$ | async"\n                    matTooltip="{{ \'tb.key-val.remove-mapping-entry\' | translate }}"\n                    matTooltipPosition="above">\n              <mat-icon>delete</mat-icon>\n            </button>\n          </div>\n        </div>\n      </div>\n    </div>\n  </div>\n  <div>\n    <button [disabled]="(isLoading$ | async) || keyValsFormArray().length >= selectOptions.length"\n            type="button" mat-stroked-button color="primary" (click)="addKeyVal()">\n      {{ \'tb.key-val.add-mapping-entry\' | translate }}\n    </button>\n  </div>\n  <tb-example-hint [hintText]="hintText" [popupHelpLink]="popupHelpLink"></tb-example-hint>\n</section>\n',styles:[":host .field-space{flex:1 1 50%}:host .actions-header{width:40px}\n",':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n'],dependencies:[{kind:"directive",type:H.NgClass,selector:"[ngClass]",inputs:["class","ngClass"]},{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:de.MatButton,selector:"    button[mat-button], button[mat-raised-button], button[mat-flat-button],    button[mat-stroked-button]  ",inputs:["disabled","disableRipple","color"],exportAs:["matButton"]},{kind:"component",type:de.MatIconButton,selector:"button[mat-icon-button]",inputs:["disabled","disableRipple","color"],exportAs:["matButton"]},{kind:"component",type:ue.MatIcon,selector:"mat-icon",inputs:["color","inline","svgIcon","fontSet","fontIcon"],exportAs:["matIcon"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"component",type:X.MatSelect,selector:"mat-select",inputs:["disabled","disableRipple","tabIndex","hideSingleSelectionIndicator"],exportAs:["matSelect"]},{kind:"component",type:ee.MatOption,selector:"mat-option",exportAs:["matOption"]},{kind:"directive",type:ce.MatTooltip,selector:"[matTooltip]",exportAs:["matTooltip"]},{kind:"directive",type:Se.DefaultClassDirective,selector:"  [ngClass], [ngClass.xs], [ngClass.sm], [ngClass.md], [ngClass.lg], [ngClass.xl],  [ngClass.lt-sm], [ngClass.lt-md], [ngClass.lt-lg], [ngClass.lt-xl],  [ngClass.gt-xs], [ngClass.gt-sm], [ngClass.gt-md], [ngClass.gt-lg]",inputs:["ngClass","ngClass.xs","ngClass.sm","ngClass.md","ngClass.lg","ngClass.xl","ngClass.lt-sm","ngClass.lt-md","ngClass.lt-lg","ngClass.lt-xl","ngClass.gt-xs","ngClass.gt-sm","ngClass.gt-md","ngClass.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.FormControlDirective,selector:"[formControl]",inputs:["formControl","disabled","ngModel"],outputs:["ngModelChange"],exportAs:["ngForm"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"component",type:An,selector:"tb-example-hint",inputs:["hintText","popupHelpLink","textAlign"]},{kind:"pipe",type:H.AsyncPipe,name:"async"},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),Be([N()],zn.prototype,"disabled",void 0),Be([N()],zn.prototype,"required",void 0),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:zn,decorators:[{type:n,args:[{selector:"tb-sv-map-config",providers:[{provide:B,useExisting:a((()=>zn)),multi:!0},{provide:K,useExisting:a((()=>zn)),multi:!0}],template:'<section [formGroup]="svListFormGroup" class="tb-form-panel stroked">\n  <div class="tb-form-row no-padding no-border space-between">\n    <div class="tb-form-panel-title">{{ labelText }}</div>\n    <div class="tb-form-panel-hint tb-error" translate *ngIf="svListFormGroup.hasError(\'required\')">\n      tb.rulenode.map-fields-required\n    </div>\n    <div class="tb-form-panel-hint tb-error" translate *ngIf="svListFormGroup.hasError(\'svMapRequired\')">\n      {{ requiredText }}\n    </div>\n  </div>\n  <div class="tb-form-panel no-border no-padding">\n    <div class="tb-form-table">\n      <div class="tb-form-table-header">\n        <div class="tb-form-table-header-cell field-space">{{ selectText }}</div>\n        <div class="tb-form-table-header-cell field-space">{{ valText }}</div>\n        <div class="tb-form-table-header-cell actions-header"></div>\n      </div>\n      <div class="tb-form-table-body">\n        <div class="tb-form-table-row"\n             *ngFor="let keyValControl of keyValsFormArray().controls; let $index = index;">\n          <mat-form-field class="tb-inline-field field-space" appearance="outline" subscriptSizing="dynamic">\n            <mat-select [placeholder]="selectText" [formControl]="keyValControl.get(\'key\')" required>\n              <mat-option *ngFor="let option of filterSelectOptions(keyValControl)" [value]="option.value">\n                {{option.name}}\n              </mat-option>\n            </mat-select>\n          </mat-form-field>\n          <mat-form-field class="tb-inline-field field-space" appearance="outline" subscriptSizing="dynamic">\n            <input [placeholder]="valText" [formControl]="keyValControl.get(\'value\')" matInput/>\n          </mat-form-field>\n          <div class="tb-form-table-row-cell-buttons">\n            <button [ngClass]="{\'tb-hidden\': keyValsFormArray().controls.length === 1}"\n                    type="button"\n                    mat-icon-button\n                    (click)="removeKeyVal($index)"\n                    [disabled]="isLoading$ | async"\n                    matTooltip="{{ \'tb.key-val.remove-mapping-entry\' | translate }}"\n                    matTooltipPosition="above">\n              <mat-icon>delete</mat-icon>\n            </button>\n          </div>\n        </div>\n      </div>\n    </div>\n  </div>\n  <div>\n    <button [disabled]="(isLoading$ | async) || keyValsFormArray().length >= selectOptions.length"\n            type="button" mat-stroked-button color="primary" (click)="addKeyVal()">\n      {{ \'tb.key-val.add-mapping-entry\' | translate }}\n    </button>\n  </div>\n  <tb-example-hint [hintText]="hintText" [popupHelpLink]="popupHelpLink"></tb-example-hint>\n</section>\n',styles:[":host .field-space{flex:1 1 50%}:host .actions-header{width:40px}\n",':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n']}]}],ctorParameters:function(){return[{type:P.Store},{type:Z.TranslateService},{type:t.Injector},{type:R.FormBuilder}]},propDecorators:{selectOptions:[{type:i}],disabled:[{type:i}],labelText:[{type:i}],requiredText:[{type:i}],targetKeyPrefix:[{type:i}],selectText:[{type:i}],selectRequiredText:[{type:i}],valText:[{type:i}],valRequiredText:[{type:i}],hintText:[{type:i}],popupHelpLink:[{type:i}],required:[{type:i}]}});class Un extends L{get required(){return this.requiredValue}set required(e){this.requiredValue=Le(e)}constructor(e,t){super(e),this.store=e,this.fb=t,this.directionTypes=Object.keys(v),this.directionTypeTranslations=C,this.propagateChange=null}ngOnInit(){this.relationsQueryFormGroup=this.fb.group({fetchLastLevelOnly:[!1,[]],direction:[null,[O.required]],maxLevel:[null,[]],filters:[null]}),this.relationsQueryFormGroup.valueChanges.subscribe((e=>{this.relationsQueryFormGroup.valid?this.propagateChange(e):this.propagateChange(null)}))}registerOnChange(e){this.propagateChange=e}registerOnTouched(e){}setDisabledState(e){this.disabled=e,this.disabled?this.relationsQueryFormGroup.disable({emitEvent:!1}):this.relationsQueryFormGroup.enable({emitEvent:!1})}writeValue(e){this.relationsQueryFormGroup.reset(e||{},{emitEvent:!1})}}e("RelationsQueryConfigOldComponent",Un),Un.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Un,deps:[{token:P.Store},{token:R.FormBuilder}],target:t.ɵɵFactoryTarget.Component}),Un.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:Un,selector:"tb-relations-query-config-old",inputs:{disabled:"disabled",required:"required"},providers:[{provide:B,useExisting:a((()=>Un)),multi:!0}],usesInheritance:!0,ngImport:t,template:'<section fxLayout="column" [formGroup]="relationsQueryFormGroup">\n  <mat-checkbox formControlName="fetchLastLevelOnly">\n    {{ \'alias.last-level-relation\' | translate }}\n  </mat-checkbox>\n  <div fxLayoutGap="8px" fxLayout="row">\n    <mat-form-field class="mat-block" style="min-width: 100px;">\n      <mat-label translate>relation.direction</mat-label>\n      <mat-select required matInput formControlName="direction">\n        <mat-option *ngFor="let type of directionTypes" [value]="type">\n          {{ directionTypeTranslations.get(type) | translate }}\n        </mat-option>\n      </mat-select>\n    </mat-form-field>\n    <mat-form-field fxFlex floatLabel="always" class="mat-block">\n      <mat-label translate>tb.rulenode.max-relation-level</mat-label>\n      <input matInput\n             type="number"\n             min="1"\n             step="1"\n             placeholder="{{ \'tb.rulenode.unlimited-level\' | translate }}"\n             formControlName="maxLevel">\n    </mat-form-field>\n  </div>\n  <div class="mat-caption" style="color: #6e6e6e;" translate>relation.relation-filters</div>\n  <tb-relation-filters\n    formControlName="filters"\n  ></tb-relation-filters>\n</section>\n',dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"component",type:Q.MatCheckbox,selector:"mat-checkbox",inputs:["disableRipple","color","tabIndex"],exportAs:["matCheckbox"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"component",type:X.MatSelect,selector:"mat-select",inputs:["disabled","disableRipple","tabIndex","hideSingleSelectionIndicator"],exportAs:["matSelect"]},{kind:"component",type:ee.MatOption,selector:"mat-option",exportAs:["matOption"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:W.DefaultLayoutGapDirective,selector:"  [fxLayoutGap], [fxLayoutGap.xs], [fxLayoutGap.sm], [fxLayoutGap.md],  [fxLayoutGap.lg], [fxLayoutGap.xl], [fxLayoutGap.lt-sm], [fxLayoutGap.lt-md],  [fxLayoutGap.lt-lg], [fxLayoutGap.lt-xl], [fxLayoutGap.gt-xs], [fxLayoutGap.gt-sm],  [fxLayoutGap.gt-md], [fxLayoutGap.gt-lg]",inputs:["fxLayoutGap","fxLayoutGap.xs","fxLayoutGap.sm","fxLayoutGap.md","fxLayoutGap.lg","fxLayoutGap.xl","fxLayoutGap.lt-sm","fxLayoutGap.lt-md","fxLayoutGap.lt-lg","fxLayoutGap.lt-xl","fxLayoutGap.gt-xs","fxLayoutGap.gt-sm","fxLayoutGap.gt-md","fxLayoutGap.gt-lg"]},{kind:"directive",type:W.DefaultFlexDirective,selector:"  [fxFlex], [fxFlex.xs], [fxFlex.sm], [fxFlex.md],  [fxFlex.lg], [fxFlex.xl], [fxFlex.lt-sm], [fxFlex.lt-md],  [fxFlex.lt-lg], [fxFlex.lt-xl], [fxFlex.gt-xs], [fxFlex.gt-sm],  [fxFlex.gt-md], [fxFlex.gt-lg]",inputs:["fxFlex","fxFlex.xs","fxFlex.sm","fxFlex.md","fxFlex.lg","fxFlex.xl","fxFlex.lt-sm","fxFlex.lt-md","fxFlex.lt-lg","fxFlex.lt-xl","fxFlex.gt-xs","fxFlex.gt-sm","fxFlex.gt-md","fxFlex.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NumberValueAccessor,selector:"input[type=number][formControlName],input[type=number][formControl],input[type=number][ngModel]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.MinValidator,selector:"input[type=number][min][formControlName],input[type=number][min][formControl],input[type=number][min][ngModel]",inputs:["min"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"component",type:Ye.RelationFiltersComponent,selector:"tb-relation-filters",inputs:["disabled","allowedEntityTypes"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Un,decorators:[{type:n,args:[{selector:"tb-relations-query-config-old",providers:[{provide:B,useExisting:a((()=>Un)),multi:!0}],template:'<section fxLayout="column" [formGroup]="relationsQueryFormGroup">\n  <mat-checkbox formControlName="fetchLastLevelOnly">\n    {{ \'alias.last-level-relation\' | translate }}\n  </mat-checkbox>\n  <div fxLayoutGap="8px" fxLayout="row">\n    <mat-form-field class="mat-block" style="min-width: 100px;">\n      <mat-label translate>relation.direction</mat-label>\n      <mat-select required matInput formControlName="direction">\n        <mat-option *ngFor="let type of directionTypes" [value]="type">\n          {{ directionTypeTranslations.get(type) | translate }}\n        </mat-option>\n      </mat-select>\n    </mat-form-field>\n    <mat-form-field fxFlex floatLabel="always" class="mat-block">\n      <mat-label translate>tb.rulenode.max-relation-level</mat-label>\n      <input matInput\n             type="number"\n             min="1"\n             step="1"\n             placeholder="{{ \'tb.rulenode.unlimited-level\' | translate }}"\n             formControlName="maxLevel">\n    </mat-form-field>\n  </div>\n  <div class="mat-caption" style="color: #6e6e6e;" translate>relation.relation-filters</div>\n  <tb-relation-filters\n    formControlName="filters"\n  ></tb-relation-filters>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.FormBuilder}]},propDecorators:{disabled:[{type:i}],required:[{type:i}]}});class Hn{constructor(e,t){this.translate=e,this.fb=t,this.propagateChange=e=>{},this.destroy$=new Ke,this.separatorKeysCodes=[ge,ye,xe],this.onTouched=()=>{}}ngOnInit(){this.attributeControlGroup=this.fb.group({clientAttributeNames:[[],[]],sharedAttributeNames:[[],[]],serverAttributeNames:[[],[]],latestTsKeyNames:[[],[]],getLatestValueWithTs:[!1,[]]},{validators:this.atLeastOne(O.required,["clientAttributeNames","sharedAttributeNames","serverAttributeNames","latestTsKeyNames"])}),this.attributeControlGroup.valueChanges.pipe(Ve(this.destroy$)).subscribe((e=>{this.propagateChange(this.preparePropagateValue(e))}))}preparePropagateValue(e){const t={};for(const n in e)t[n]="getLatestValueWithTs"===n||ae(e[n])?e[n]:[];return t}validate(){return this.attributeControlGroup.valid?null:{atLeastOneRequired:!0}}atLeastOne(e,t=null){return n=>{t||(t=Object.keys(n.controls));return n?.controls&&t.some((t=>!e(n.controls[t])))?null:{atLeastOne:!0}}}writeValue(e){this.attributeControlGroup.setValue(e,{emitEvent:!1})}registerOnChange(e){this.propagateChange=e}registerOnTouched(e){this.onTouched=e}setDisabledState(e){e?this.attributeControlGroup.disable({emitEvent:!1}):this.attributeControlGroup.enable({emitEvent:!1})}ngOnDestroy(){this.destroy$.next(null),this.destroy$.complete()}}e("SelectAttributesComponent",Hn),Hn.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Hn,deps:[{token:Z.TranslateService},{token:R.FormBuilder}],target:t.ɵɵFactoryTarget.Component}),Hn.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:Hn,selector:"tb-select-attributes",inputs:{popupHelpLink:"popupHelpLink"},providers:[{provide:B,useExisting:a((()=>Hn)),multi:!0},{provide:K,useExisting:Hn,multi:!0}],ngImport:t,template:'<div class="tb-form-panel no-padding no-border" [formGroup]="attributeControlGroup">\n  <tb-example-hint [hintText]="\'tb.rulenode.kv-map-pattern-hint\' | translate"\n                   [popupHelpLink]="popupHelpLink"></tb-example-hint>\n  <tb-string-items-list subscriptSizing="dynamic" class="mat-block" editable\n                        (focusout)="onTouched()"\n                        [placeholder]="\'tb.rulenode.add-attribute-key\' | translate"\n                        [label]="\'tb.rulenode.client-attributes\' | translate" formControlName="clientAttributeNames">\n    <ng-container matSuffix *ngTemplateOutlet="helpIcon"></ng-container>\n  </tb-string-items-list>\n  <tb-string-items-list subscriptSizing="dynamic" class="mat-block" editable\n                        (focusout)="onTouched()"\n                        [placeholder]="\'tb.rulenode.add-attribute-key\' | translate"\n                        [label]="\'tb.rulenode.shared-attributes\' | translate" formControlName="sharedAttributeNames">\n    <ng-container matSuffix *ngTemplateOutlet="helpIcon"></ng-container>\n  </tb-string-items-list>\n  <tb-string-items-list subscriptSizing="dynamic" class="mat-block" editable\n                        (focusout)="onTouched()"\n                        [placeholder]="\'tb.rulenode.add-attribute-key\' | translate"\n                        [label]="\'tb.rulenode.server-attributes\' | translate" formControlName="serverAttributeNames">\n    <ng-container matSuffix *ngTemplateOutlet="helpIcon"></ng-container>\n  </tb-string-items-list>\n  <tb-string-items-list subscriptSizing="dynamic" editable class="mat-block"\n                        (focusout)="onTouched()"\n                        [placeholder]="\'tb.rulenode.add-telemetry-key\' | translate"\n                        [label]="\'tb.rulenode.latest-telemetry\' | translate" formControlName="latestTsKeyNames">\n    <ng-container matSuffix *ngTemplateOutlet="helpIcon"></ng-container>\n  </tb-string-items-list>\n  <div tb-hint-tooltip-icon="{{ \'tb.rulenode.fetch-latest-telemetry-with-timestamp-tooltip\' | translate:\n                         { latestTsKeyName:  attributeControlGroup.get(\'latestTsKeyNames\').value[0]} }}"\n       *ngIf="attributeControlGroup.get(\'latestTsKeyNames\').value?.length > 0"\n       class="tb-form-row no-border no-padding">\n    <mat-slide-toggle class="mat-slide" formControlName="getLatestValueWithTs">\n      {{ \'tb.rulenode.fetch-latest-telemetry-with-timestamp\' | translate }}\n    </mat-slide-toggle>\n  </div>\n</div>\n\n<ng-template #helpIcon>\n  <mat-icon class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon"\n            color="primary"\n            matTooltip="{{ \'tb.rulenode.chip-help\' | translate: { inputName: \'tb.rulenode.field-name\' | translate } }}">help</mat-icon>\n</ng-template>\n',styles:[':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n'],dependencies:[{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"directive",type:H.NgTemplateOutlet,selector:"[ngTemplateOutlet]",inputs:["ngTemplateOutletContext","ngTemplateOutlet","ngTemplateOutletInjector"]},{kind:"component",type:et.StringItemsListComponent,selector:"tb-string-items-list",inputs:["required","disabled","label","placeholder","hint","requiredText","floatLabel","appearance","editable","subscriptSizing","predefinedValues"]},{kind:"component",type:ue.MatIcon,selector:"mat-icon",inputs:["color","inline","svgIcon","fontSet","fontIcon"],exportAs:["matIcon"]},{kind:"directive",type:Y.MatSuffix,selector:"[matSuffix], [matIconSuffix], [matTextSuffix]",inputs:["matTextSuffix"]},{kind:"directive",type:ce.MatTooltip,selector:"[matTooltip]",exportAs:["matTooltip"]},{kind:"component",type:te.MatSlideToggle,selector:"mat-slide-toggle",inputs:["disabled","disableRipple","color","tabIndex"],exportAs:["matSlideToggle"]},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"component",type:ne.HintTooltipIconComponent,selector:"[tb-hint-tooltip-icon]",inputs:["tb-hint-tooltip-icon","tooltipPosition","hintIcon"]},{kind:"component",type:An,selector:"tb-example-hint",inputs:["hintText","popupHelpLink","textAlign"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Hn,decorators:[{type:n,args:[{selector:"tb-select-attributes",providers:[{provide:B,useExisting:a((()=>Hn)),multi:!0},{provide:K,useExisting:Hn,multi:!0}],template:'<div class="tb-form-panel no-padding no-border" [formGroup]="attributeControlGroup">\n  <tb-example-hint [hintText]="\'tb.rulenode.kv-map-pattern-hint\' | translate"\n                   [popupHelpLink]="popupHelpLink"></tb-example-hint>\n  <tb-string-items-list subscriptSizing="dynamic" class="mat-block" editable\n                        (focusout)="onTouched()"\n                        [placeholder]="\'tb.rulenode.add-attribute-key\' | translate"\n                        [label]="\'tb.rulenode.client-attributes\' | translate" formControlName="clientAttributeNames">\n    <ng-container matSuffix *ngTemplateOutlet="helpIcon"></ng-container>\n  </tb-string-items-list>\n  <tb-string-items-list subscriptSizing="dynamic" class="mat-block" editable\n                        (focusout)="onTouched()"\n                        [placeholder]="\'tb.rulenode.add-attribute-key\' | translate"\n                        [label]="\'tb.rulenode.shared-attributes\' | translate" formControlName="sharedAttributeNames">\n    <ng-container matSuffix *ngTemplateOutlet="helpIcon"></ng-container>\n  </tb-string-items-list>\n  <tb-string-items-list subscriptSizing="dynamic" class="mat-block" editable\n                        (focusout)="onTouched()"\n                        [placeholder]="\'tb.rulenode.add-attribute-key\' | translate"\n                        [label]="\'tb.rulenode.server-attributes\' | translate" formControlName="serverAttributeNames">\n    <ng-container matSuffix *ngTemplateOutlet="helpIcon"></ng-container>\n  </tb-string-items-list>\n  <tb-string-items-list subscriptSizing="dynamic" editable class="mat-block"\n                        (focusout)="onTouched()"\n                        [placeholder]="\'tb.rulenode.add-telemetry-key\' | translate"\n                        [label]="\'tb.rulenode.latest-telemetry\' | translate" formControlName="latestTsKeyNames">\n    <ng-container matSuffix *ngTemplateOutlet="helpIcon"></ng-container>\n  </tb-string-items-list>\n  <div tb-hint-tooltip-icon="{{ \'tb.rulenode.fetch-latest-telemetry-with-timestamp-tooltip\' | translate:\n                         { latestTsKeyName:  attributeControlGroup.get(\'latestTsKeyNames\').value[0]} }}"\n       *ngIf="attributeControlGroup.get(\'latestTsKeyNames\').value?.length > 0"\n       class="tb-form-row no-border no-padding">\n    <mat-slide-toggle class="mat-slide" formControlName="getLatestValueWithTs">\n      {{ \'tb.rulenode.fetch-latest-telemetry-with-timestamp\' | translate }}\n    </mat-slide-toggle>\n  </div>\n</div>\n\n<ng-template #helpIcon>\n  <mat-icon class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon"\n            color="primary"\n            matTooltip="{{ \'tb.rulenode.chip-help\' | translate: { inputName: \'tb.rulenode.field-name\' | translate } }}">help</mat-icon>\n</ng-template>\n',styles:[':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n']}]}],ctorParameters:function(){return[{type:Z.TranslateService},{type:R.FormBuilder}]},propDecorators:{popupHelpLink:[{type:i}]}});class jn extends L{constructor(e,t){super(e),this.store=e,this.fb=t,this.propagateChange=null,this.destroy$=new Ke,this.alarmStatus=q,this.alarmStatusTranslations=A}ngOnInit(){this.alarmStatusGroup=this.fb.group({alarmStatus:[null,[]]}),this.alarmStatusGroup.get("alarmStatus").valueChanges.pipe(Ve(this.destroy$)).subscribe((e=>{this.propagateChange(e)}))}setDisabledState(e){e?this.alarmStatusGroup.disable({emitEvent:!1}):this.alarmStatusGroup.enable({emitEvent:!1})}registerOnChange(e){this.propagateChange=e}registerOnTouched(e){}ngOnDestroy(){this.destroy$.next(),this.destroy$.complete()}writeValue(e){this.alarmStatusGroup.get("alarmStatus").patchValue(e,{emitEvent:!1})}}e("AlarmStatusSelectComponent",jn),jn.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:jn,deps:[{token:P.Store},{token:R.FormBuilder}],target:t.ɵɵFactoryTarget.Component}),jn.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:jn,selector:"tb-alarm-status-select",providers:[{provide:B,useExisting:a((()=>jn)),multi:!0}],usesInheritance:!0,ngImport:t,template:'<section [formGroup]="alarmStatusGroup" fxLayout="column" fxLayoutAlign="center center">\n  <mat-chip-listbox multiple formControlName="alarmStatus" class="chip-listbox" fxLayout="column">\n    <div class="toggle-column">\n      <mat-chip-option fxFlex class="option" [value]="alarmStatus.ACTIVE_UNACK">\n        {{ alarmStatusTranslations.get(alarmStatus.ACTIVE_UNACK) | translate }}\n      </mat-chip-option>\n      <mat-chip-option fxFlex class="option" [value]="alarmStatus.ACTIVE_ACK">\n        {{ alarmStatusTranslations.get(alarmStatus.ACTIVE_ACK) | translate }}\n      </mat-chip-option>\n    </div>\n    <div class="toggle-column">\n      <mat-chip-option fxFlex class="option" [value]="alarmStatus.CLEARED_UNACK">\n        {{ alarmStatusTranslations.get(alarmStatus.CLEARED_UNACK) | translate }}\n      </mat-chip-option>\n      <mat-chip-option fxFlex class="option" [value]="alarmStatus.CLEARED_ACK">\n        {{ alarmStatusTranslations.get(alarmStatus.CLEARED_ACK) | translate }}\n      </mat-chip-option>\n    </div>\n  </mat-chip-listbox>\n</section>\n',styles:[":host .chip-listbox{max-width:460px;width:100%}:host .chip-listbox .toggle-column{display:flex;flex:1 1 100%;gap:8px}:host .chip-listbox .option{margin:0}@media screen and (max-width: 959px){:host .chip-listbox{max-width:360px}:host .chip-listbox .toggle-column{flex-direction:column}}:host ::ng-deep .chip-listbox .mdc-evolution-chip-set__chips{gap:8px}:host ::ng-deep .chip-listbox .option button{flex-basis:100%;justify-content:start}:host ::ng-deep .chip-listbox .option .mdc-evolution-chip__graphic{flex-grow:0}\n"],dependencies:[{kind:"component",type:be.MatChipListbox,selector:"mat-chip-listbox",inputs:["tabIndex","multiple","aria-orientation","selectable","compareWith","required","hideSingleSelectionIndicator","value"],outputs:["change"]},{kind:"component",type:be.MatChipOption,selector:"mat-basic-chip-option, [mat-basic-chip-option], mat-chip-option, [mat-chip-option]",inputs:["color","disabled","disableRipple","tabIndex","selectable","selected"],outputs:["selectionChange"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:W.DefaultLayoutAlignDirective,selector:"  [fxLayoutAlign], [fxLayoutAlign.xs], [fxLayoutAlign.sm], [fxLayoutAlign.md],  [fxLayoutAlign.lg], [fxLayoutAlign.xl], [fxLayoutAlign.lt-sm], [fxLayoutAlign.lt-md],  [fxLayoutAlign.lt-lg], [fxLayoutAlign.lt-xl], [fxLayoutAlign.gt-xs], [fxLayoutAlign.gt-sm],  [fxLayoutAlign.gt-md], [fxLayoutAlign.gt-lg]",inputs:["fxLayoutAlign","fxLayoutAlign.xs","fxLayoutAlign.sm","fxLayoutAlign.md","fxLayoutAlign.lg","fxLayoutAlign.xl","fxLayoutAlign.lt-sm","fxLayoutAlign.lt-md","fxLayoutAlign.lt-lg","fxLayoutAlign.lt-xl","fxLayoutAlign.gt-xs","fxLayoutAlign.gt-sm","fxLayoutAlign.gt-md","fxLayoutAlign.gt-lg"]},{kind:"directive",type:W.DefaultFlexDirective,selector:"  [fxFlex], [fxFlex.xs], [fxFlex.sm], [fxFlex.md],  [fxFlex.lg], [fxFlex.xl], [fxFlex.lt-sm], [fxFlex.lt-md],  [fxFlex.lt-lg], [fxFlex.lt-xl], [fxFlex.gt-xs], [fxFlex.gt-sm],  [fxFlex.gt-md], [fxFlex.gt-lg]",inputs:["fxFlex","fxFlex.xs","fxFlex.sm","fxFlex.md","fxFlex.lg","fxFlex.xl","fxFlex.lt-sm","fxFlex.lt-md","fxFlex.lt-lg","fxFlex.lt-xl","fxFlex.gt-xs","fxFlex.gt-sm","fxFlex.gt-md","fxFlex.gt-lg"]},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:jn,decorators:[{type:n,args:[{selector:"tb-alarm-status-select",providers:[{provide:B,useExisting:a((()=>jn)),multi:!0}],template:'<section [formGroup]="alarmStatusGroup" fxLayout="column" fxLayoutAlign="center center">\n  <mat-chip-listbox multiple formControlName="alarmStatus" class="chip-listbox" fxLayout="column">\n    <div class="toggle-column">\n      <mat-chip-option fxFlex class="option" [value]="alarmStatus.ACTIVE_UNACK">\n        {{ alarmStatusTranslations.get(alarmStatus.ACTIVE_UNACK) | translate }}\n      </mat-chip-option>\n      <mat-chip-option fxFlex class="option" [value]="alarmStatus.ACTIVE_ACK">\n        {{ alarmStatusTranslations.get(alarmStatus.ACTIVE_ACK) | translate }}\n      </mat-chip-option>\n    </div>\n    <div class="toggle-column">\n      <mat-chip-option fxFlex class="option" [value]="alarmStatus.CLEARED_UNACK">\n        {{ alarmStatusTranslations.get(alarmStatus.CLEARED_UNACK) | translate }}\n      </mat-chip-option>\n      <mat-chip-option fxFlex class="option" [value]="alarmStatus.CLEARED_ACK">\n        {{ alarmStatusTranslations.get(alarmStatus.CLEARED_ACK) | translate }}\n      </mat-chip-option>\n    </div>\n  </mat-chip-listbox>\n</section>\n',styles:[":host .chip-listbox{max-width:460px;width:100%}:host .chip-listbox .toggle-column{display:flex;flex:1 1 100%;gap:8px}:host .chip-listbox .option{margin:0}@media screen and (max-width: 959px){:host .chip-listbox{max-width:360px}:host .chip-listbox .toggle-column{flex-direction:column}}:host ::ng-deep .chip-listbox .mdc-evolution-chip-set__chips{gap:8px}:host ::ng-deep .chip-listbox .option button{flex-basis:100%;justify-content:start}:host ::ng-deep .chip-listbox .option .mdc-evolution-chip__graphic{flex-grow:0}\n"]}]}],ctorParameters:function(){return[{type:P.Store},{type:R.FormBuilder}]}});class $n{}e("RulenodeCoreConfigCommonModule",$n),$n.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:$n,deps:[],target:t.ɵɵFactoryTarget.NgModule}),$n.ɵmod=t.ɵɵngDeclareNgModule({minVersion:"14.0.0",version:"15.2.10",ngImport:t,type:$n,declarations:[Mn,En,Gn,Dn,wn,In,Nn,Bn,Cn,Kn,zn,Un,Hn,jn,An],imports:[$,M,_e],exports:[Mn,En,Gn,Dn,wn,In,Nn,Bn,Cn,Kn,zn,Un,Hn,jn,An]}),$n.ɵinj=t.ɵɵngDeclareInjector({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:$n,imports:[$,M,_e]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:$n,decorators:[{type:c,args:[{declarations:[Mn,En,Gn,Dn,wn,In,Nn,Bn,Cn,Kn,zn,Un,Hn,jn,An],imports:[$,M,_e],exports:[Mn,En,Gn,Dn,wn,In,Nn,Bn,Cn,Kn,zn,Un,Hn,jn,An]}]}]});class Qn{}e("RuleNodeCoreConfigActionModule",Qn),Qn.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Qn,deps:[],target:t.ɵɵFactoryTarget.NgModule}),Qn.ɵmod=t.ɵɵngDeclareNgModule({minVersion:"14.0.0",version:"15.2.10",ngImport:t,type:Qn,declarations:[Tn,ct,kn,vn,fn,ut,ft,gt,yt,yn,xt,ht,cn,gn,hn,Fn,Ln,bt,bn,xn,Sn,qn],imports:[$,M,_e,$n],exports:[Tn,ct,kn,vn,fn,ut,ft,gt,yt,yn,xt,ht,cn,gn,hn,Fn,Ln,bt,bn,xn,Sn,qn]}),Qn.ɵinj=t.ɵɵngDeclareInjector({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Qn,imports:[$,M,_e,$n]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Qn,decorators:[{type:c,args:[{declarations:[Tn,ct,kn,vn,fn,ut,ft,gt,yt,yn,xt,ht,cn,gn,hn,Fn,Ln,bt,bn,xn,Sn,qn],imports:[$,M,_e,$n],exports:[Tn,ct,kn,vn,fn,ut,ft,gt,yt,yn,xt,ht,cn,gn,hn,Fn,Ln,bt,bn,xn,Sn,qn]}]}]});class Jn extends f{constructor(e,t,n){super(e),this.store=e,this.translate=t,this.fb=n,this.separatorKeysCodes=[ge,ye,xe]}configForm(){return this.calculateDeltaConfigForm}onConfigurationSet(e){this.calculateDeltaConfigForm=this.fb.group({inputValueKey:[e.inputValueKey,[O.required,O.pattern(/(?:.|\s)*\S(&:.|\s)*/)]],outputValueKey:[e.outputValueKey,[O.required,O.pattern(/(?:.|\s)*\S(&:.|\s)*/)]],useCache:[e.useCache,[]],addPeriodBetweenMsgs:[e.addPeriodBetweenMsgs,[]],periodValueKey:[e.periodValueKey,[]],round:[e.round,[O.min(0),O.max(15)]],tellFailureIfDeltaIsNegative:[e.tellFailureIfDeltaIsNegative,[]]})}prepareInputConfig(e){return{inputValueKey:ae(e?.inputValueKey)?e.inputValueKey:null,outputValueKey:ae(e?.outputValueKey)?e.outputValueKey:null,useCache:!ae(e?.useCache)||e.useCache,addPeriodBetweenMsgs:!!ae(e?.addPeriodBetweenMsgs)&&e.addPeriodBetweenMsgs,periodValueKey:ae(e?.periodValueKey)?e.periodValueKey:null,round:ae(e?.round)?e.round:null,tellFailureIfDeltaIsNegative:!ae(e?.tellFailureIfDeltaIsNegative)||e.tellFailureIfDeltaIsNegative}}prepareOutputConfig(e){return le(e)}updateValidators(e){this.calculateDeltaConfigForm.get("addPeriodBetweenMsgs").value?this.calculateDeltaConfigForm.get("periodValueKey").setValidators([O.required]):this.calculateDeltaConfigForm.get("periodValueKey").setValidators([]),this.calculateDeltaConfigForm.get("periodValueKey").updateValueAndValidity({emitEvent:e})}validatorTriggers(){return["addPeriodBetweenMsgs"]}}e("CalculateDeltaConfigComponent",Jn),Jn.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Jn,deps:[{token:P.Store},{token:Z.TranslateService},{token:R.FormBuilder}],target:t.ɵɵFactoryTarget.Component}),Jn.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:Jn,selector:"tb-enrichment-node-calculate-delta-config",usesInheritance:!0,ngImport:t,template:"<section [formGroup]=\"calculateDeltaConfigForm\">\n  <div fxLayout.gt-sm=\"row\" fxLayoutGap.gt-sm=\"22px\">\n    <mat-form-field class=\"mat-block\" fxFlex>\n      <mat-label>{{ 'tb.rulenode.input-value-key' | translate }}</mat-label>\n      <input matInput formControlName=\"inputValueKey\">\n      <mat-error *ngIf=\"calculateDeltaConfigForm.get('inputValueKey').hasError('required') ||\n      calculateDeltaConfigForm.get('inputValueKey').hasError('pattern')\">\n        {{ 'tb.rulenode.input-value-key-required' | translate }}\n      </mat-error>\n    </mat-form-field>\n    <mat-form-field class=\"mat-block\" fxFlex>\n      <mat-label>{{ 'tb.rulenode.output-value-key' | translate }}</mat-label>\n      <input matInput formControlName=\"outputValueKey\">\n      <mat-error *ngIf=\"calculateDeltaConfigForm.get('outputValueKey').hasError('required') ||\n      calculateDeltaConfigForm.get('inputValueKey').hasError('pattern')\">\n        {{ 'tb.rulenode.output-value-key-required' | translate }}\n      </mat-error>\n    </mat-form-field>\n  </div>\n  <mat-form-field class=\"mat-block\" fxFlex>\n    <mat-label>{{ 'tb.rulenode.number-of-digits-after-floating-point' | translate }}</mat-label>\n    <input type=\"number\" min=\"0\" max=\"15\" step=\"1\" matInput formControlName=\"round\">\n    <mat-error *ngIf=\"calculateDeltaConfigForm.get('round').hasError('min')\">\n      {{ 'tb.rulenode.number-of-digits-after-floating-point-range' | translate }}\n    </mat-error>\n    <mat-error *ngIf=\"calculateDeltaConfigForm.get('round').hasError('max')\">\n      {{ 'tb.rulenode.number-of-digits-after-floating-point-range' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <div class=\"tb-form-panel no-padding no-border\">\n    <div tb-hint-tooltip-icon=\"{{ 'tb.rulenode.failure-if-delta-negative-tooltip' | translate }}\"\n         class=\"tb-form-row same-padding\">\n      <mat-slide-toggle class=\"mat-slide margin\" formControlName=\"tellFailureIfDeltaIsNegative\">\n        {{ 'tb.rulenode.failure-if-delta-negative' | translate }}\n      </mat-slide-toggle>\n    </div>\n    <div tb-hint-tooltip-icon=\"{{ 'tb.rulenode.use-caching-tooltip' | translate :\n                       { inputValueKey: calculateDeltaConfigForm.get('inputValueKey').valid ?\n                                calculateDeltaConfigForm.get('inputValueKey').value : 'tb.rulenode.input-value-key' | translate } }}\"\n         class=\"tb-form-row same-padding\">\n      <mat-slide-toggle class=\"mat-slide margin\" formControlName=\"useCache\">\n        {{ 'tb.rulenode.use-caching' | translate }}\n      </mat-slide-toggle>\n    </div>\n    <div class=\"tb-form-panel stroked\" [class.no-padding-bottom]=\"calculateDeltaConfigForm.get('addPeriodBetweenMsgs').value\">\n      <div tb-hint-tooltip-icon=\"{{ 'tb.rulenode.add-time-difference-between-readings-tooltip' | translate:\n                           { periodValueKey: (calculateDeltaConfigForm.get('periodValueKey').valid &&\n                           calculateDeltaConfigForm.get('addPeriodBetweenMsgs').value) ? calculateDeltaConfigForm.get('periodValueKey').value :\n                           'periodInMs' } }}\"\n           class=\"tb-form-row no-border no-padding\">\n        <mat-slide-toggle class=\"mat-slide\" formControlName=\"addPeriodBetweenMsgs\">\n          {{ 'tb.rulenode.add-time-difference-between-readings' | translate:\n          { inputValueKey: calculateDeltaConfigForm.get('inputValueKey').valid ?\n                     calculateDeltaConfigForm.get('inputValueKey').value : 'tb.rulenode.input-value-key' | translate } }}\n        </mat-slide-toggle>\n      </div>\n      <mat-form-field class=\"mat-block\" *ngIf=\"calculateDeltaConfigForm.get('addPeriodBetweenMsgs').value\">\n        <mat-label>{{ 'tb.rulenode.period-value-key' | translate }}</mat-label>\n        <input required matInput formControlName=\"periodValueKey\">\n        <mat-error *ngIf=\"calculateDeltaConfigForm.get('periodValueKey').hasError('required')\">\n          {{ 'tb.rulenode.period-value-key-required' | translate }}\n        </mat-error>\n      </mat-form-field>\n    </div>\n  </div>\n</section>\n",dependencies:[{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"component",type:te.MatSlideToggle,selector:"mat-slide-toggle",inputs:["disabled","disableRipple","color","tabIndex"],exportAs:["matSlideToggle"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:W.DefaultLayoutGapDirective,selector:"  [fxLayoutGap], [fxLayoutGap.xs], [fxLayoutGap.sm], [fxLayoutGap.md],  [fxLayoutGap.lg], [fxLayoutGap.xl], [fxLayoutGap.lt-sm], [fxLayoutGap.lt-md],  [fxLayoutGap.lt-lg], [fxLayoutGap.lt-xl], [fxLayoutGap.gt-xs], [fxLayoutGap.gt-sm],  [fxLayoutGap.gt-md], [fxLayoutGap.gt-lg]",inputs:["fxLayoutGap","fxLayoutGap.xs","fxLayoutGap.sm","fxLayoutGap.md","fxLayoutGap.lg","fxLayoutGap.xl","fxLayoutGap.lt-sm","fxLayoutGap.lt-md","fxLayoutGap.lt-lg","fxLayoutGap.lt-xl","fxLayoutGap.gt-xs","fxLayoutGap.gt-sm","fxLayoutGap.gt-md","fxLayoutGap.gt-lg"]},{kind:"directive",type:W.DefaultFlexDirective,selector:"  [fxFlex], [fxFlex.xs], [fxFlex.sm], [fxFlex.md],  [fxFlex.lg], [fxFlex.xl], [fxFlex.lt-sm], [fxFlex.lt-md],  [fxFlex.lt-lg], [fxFlex.lt-xl], [fxFlex.gt-xs], [fxFlex.gt-sm],  [fxFlex.gt-md], [fxFlex.gt-lg]",inputs:["fxFlex","fxFlex.xs","fxFlex.sm","fxFlex.md","fxFlex.lg","fxFlex.xl","fxFlex.lt-sm","fxFlex.lt-md","fxFlex.lt-lg","fxFlex.lt-xl","fxFlex.gt-xs","fxFlex.gt-sm","fxFlex.gt-md","fxFlex.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NumberValueAccessor,selector:"input[type=number][formControlName],input[type=number][formControl],input[type=number][ngModel]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.MinValidator,selector:"input[type=number][min][formControlName],input[type=number][min][formControl],input[type=number][min][ngModel]",inputs:["min"]},{kind:"directive",type:R.MaxValidator,selector:"input[type=number][max][formControlName],input[type=number][max][formControl],input[type=number][max][ngModel]",inputs:["max"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"component",type:ne.HintTooltipIconComponent,selector:"[tb-hint-tooltip-icon]",inputs:["tb-hint-tooltip-icon","tooltipPosition","hintIcon"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Jn,decorators:[{type:n,args:[{selector:"tb-enrichment-node-calculate-delta-config",template:"<section [formGroup]=\"calculateDeltaConfigForm\">\n  <div fxLayout.gt-sm=\"row\" fxLayoutGap.gt-sm=\"22px\">\n    <mat-form-field class=\"mat-block\" fxFlex>\n      <mat-label>{{ 'tb.rulenode.input-value-key' | translate }}</mat-label>\n      <input matInput formControlName=\"inputValueKey\">\n      <mat-error *ngIf=\"calculateDeltaConfigForm.get('inputValueKey').hasError('required') ||\n      calculateDeltaConfigForm.get('inputValueKey').hasError('pattern')\">\n        {{ 'tb.rulenode.input-value-key-required' | translate }}\n      </mat-error>\n    </mat-form-field>\n    <mat-form-field class=\"mat-block\" fxFlex>\n      <mat-label>{{ 'tb.rulenode.output-value-key' | translate }}</mat-label>\n      <input matInput formControlName=\"outputValueKey\">\n      <mat-error *ngIf=\"calculateDeltaConfigForm.get('outputValueKey').hasError('required') ||\n      calculateDeltaConfigForm.get('inputValueKey').hasError('pattern')\">\n        {{ 'tb.rulenode.output-value-key-required' | translate }}\n      </mat-error>\n    </mat-form-field>\n  </div>\n  <mat-form-field class=\"mat-block\" fxFlex>\n    <mat-label>{{ 'tb.rulenode.number-of-digits-after-floating-point' | translate }}</mat-label>\n    <input type=\"number\" min=\"0\" max=\"15\" step=\"1\" matInput formControlName=\"round\">\n    <mat-error *ngIf=\"calculateDeltaConfigForm.get('round').hasError('min')\">\n      {{ 'tb.rulenode.number-of-digits-after-floating-point-range' | translate }}\n    </mat-error>\n    <mat-error *ngIf=\"calculateDeltaConfigForm.get('round').hasError('max')\">\n      {{ 'tb.rulenode.number-of-digits-after-floating-point-range' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <div class=\"tb-form-panel no-padding no-border\">\n    <div tb-hint-tooltip-icon=\"{{ 'tb.rulenode.failure-if-delta-negative-tooltip' | translate }}\"\n         class=\"tb-form-row same-padding\">\n      <mat-slide-toggle class=\"mat-slide margin\" formControlName=\"tellFailureIfDeltaIsNegative\">\n        {{ 'tb.rulenode.failure-if-delta-negative' | translate }}\n      </mat-slide-toggle>\n    </div>\n    <div tb-hint-tooltip-icon=\"{{ 'tb.rulenode.use-caching-tooltip' | translate :\n                       { inputValueKey: calculateDeltaConfigForm.get('inputValueKey').valid ?\n                                calculateDeltaConfigForm.get('inputValueKey').value : 'tb.rulenode.input-value-key' | translate } }}\"\n         class=\"tb-form-row same-padding\">\n      <mat-slide-toggle class=\"mat-slide margin\" formControlName=\"useCache\">\n        {{ 'tb.rulenode.use-caching' | translate }}\n      </mat-slide-toggle>\n    </div>\n    <div class=\"tb-form-panel stroked\" [class.no-padding-bottom]=\"calculateDeltaConfigForm.get('addPeriodBetweenMsgs').value\">\n      <div tb-hint-tooltip-icon=\"{{ 'tb.rulenode.add-time-difference-between-readings-tooltip' | translate:\n                           { periodValueKey: (calculateDeltaConfigForm.get('periodValueKey').valid &&\n                           calculateDeltaConfigForm.get('addPeriodBetweenMsgs').value) ? calculateDeltaConfigForm.get('periodValueKey').value :\n                           'periodInMs' } }}\"\n           class=\"tb-form-row no-border no-padding\">\n        <mat-slide-toggle class=\"mat-slide\" formControlName=\"addPeriodBetweenMsgs\">\n          {{ 'tb.rulenode.add-time-difference-between-readings' | translate:\n          { inputValueKey: calculateDeltaConfigForm.get('inputValueKey').valid ?\n                     calculateDeltaConfigForm.get('inputValueKey').value : 'tb.rulenode.input-value-key' | translate } }}\n        </mat-slide-toggle>\n      </div>\n      <mat-form-field class=\"mat-block\" *ngIf=\"calculateDeltaConfigForm.get('addPeriodBetweenMsgs').value\">\n        <mat-label>{{ 'tb.rulenode.period-value-key' | translate }}</mat-label>\n        <input required matInput formControlName=\"periodValueKey\">\n        <mat-error *ngIf=\"calculateDeltaConfigForm.get('periodValueKey').hasError('required')\">\n          {{ 'tb.rulenode.period-value-key-required' | translate }}\n        </mat-error>\n      </mat-form-field>\n    </div>\n  </div>\n</section>\n"}]}],ctorParameters:function(){return[{type:P.Store},{type:Z.TranslateService},{type:R.FormBuilder}]}});class Yn extends f{constructor(e,t,n){super(e),this.store=e,this.fb=t,this.translate=n,this.fetchToData=[],this.DataToFetch=Pt;for(const e of Rt.keys())e!==Pt.FIELDS&&this.fetchToData.push({value:e,name:this.translate.instant(Rt.get(e))})}configForm(){return this.customerAttributesConfigForm}prepareOutputConfig(e){const t={};for(const n of Object.keys(e.dataMapping))t[n.trim()]=e.dataMapping[n];return e.dataMapping=t,le(e)}prepareInputConfig(e){let t,n;return t=ae(e?.telemetry)?e.telemetry?Pt.LATEST_TELEMETRY:Pt.ATTRIBUTES:ae(e?.dataToFetch)?e.dataToFetch:Pt.ATTRIBUTES,n=ae(e?.attrMapping)?e.attrMapping:ae(e?.dataMapping)?e.dataMapping:null,{dataToFetch:t,dataMapping:n,fetchTo:ae(e?.fetchTo)?e.fetchTo:en.METADATA}}selectTranslation(e,t){return this.customerAttributesConfigForm.get("dataToFetch").value===Pt.LATEST_TELEMETRY?e:t}onConfigurationSet(e){this.customerAttributesConfigForm=this.fb.group({dataToFetch:[e.dataToFetch,[]],dataMapping:[e.dataMapping,[O.required]],fetchTo:[e.fetchTo]})}}e("CustomerAttributesConfigComponent",Yn),Yn.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Yn,deps:[{token:P.Store},{token:R.FormBuilder},{token:Z.TranslateService}],target:t.ɵɵFactoryTarget.Component}),Yn.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:Yn,selector:"tb-enrichment-node-customer-attributes-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="customerAttributesConfigForm" class="tb-form-panel stroked">\n  <div class="tb-form-panel-title" translate>tb.rulenode.mapping-of-customers</div>\n  <div fxFlex fxLayoutAlign="center center">\n    <div class="fetch-to-data-toggle">\n      <tb-toggle-select class="fetch-to-data-toggle" formControlName="dataToFetch" appearance="fill">\n        <tb-toggle-option *ngFor="let data of fetchToData" [value]="data.value">\n          {{ data.name }}\n        </tb-toggle-option>\n      </tb-toggle-select>\n    </div>\n  </div>\n  <tb-kv-map-config\n    required\n    formControlName="dataMapping"\n    [requiredText]="\'tb.rulenode.attr-mapping-required\' | translate"\n    [labelText]="selectTranslation(\'tb.rulenode.latest-telemetry-mapping\',\'tb.rulenode.attributes-mapping\') | translate"\n    [keyText]="selectTranslation(\'tb.rulenode.source-telemetry\',\'tb.rulenode.source-attribute\') | translate"\n    [keyRequiredText]="selectTranslation(\'tb.rulenode.source-telemetry-required\',\'tb.rulenode.source-attribute-required\') | translate"\n    [valText]="\'tb.rulenode.target-key\' | translate"\n    [valRequiredText]="\'tb.rulenode.target-key-required\' | translate"\n    [hintText]="\'tb.rulenode.kv-map-pattern-hint\' | translate"\n    popupHelpLink="rulenode/customer_attributes_node_fields_templatization">\n  </tb-kv-map-config>\n  <tb-msg-metadata-chip\n    [labelText]="customerAttributesConfigForm.get(\'dataToFetch\').value === DataToFetch.LATEST_TELEMETRY ?\n    (\'tb.rulenode.add-mapped-latest-telemetry-to\' | translate) : (\'tb.rulenode.add-mapped-attribute-to\' | translate)"\n    formControlName="fetchTo">\n  </tb-msg-metadata-chip>\n</section>\n',styles:[":host .fetch-to-data-toggle{max-width:420px;width:100%}\n"],dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"directive",type:W.DefaultLayoutAlignDirective,selector:"  [fxLayoutAlign], [fxLayoutAlign.xs], [fxLayoutAlign.sm], [fxLayoutAlign.md],  [fxLayoutAlign.lg], [fxLayoutAlign.xl], [fxLayoutAlign.lt-sm], [fxLayoutAlign.lt-md],  [fxLayoutAlign.lt-lg], [fxLayoutAlign.lt-xl], [fxLayoutAlign.gt-xs], [fxLayoutAlign.gt-sm],  [fxLayoutAlign.gt-md], [fxLayoutAlign.gt-lg]",inputs:["fxLayoutAlign","fxLayoutAlign.xs","fxLayoutAlign.sm","fxLayoutAlign.md","fxLayoutAlign.lg","fxLayoutAlign.xl","fxLayoutAlign.lt-sm","fxLayoutAlign.lt-md","fxLayoutAlign.lt-lg","fxLayoutAlign.lt-xl","fxLayoutAlign.gt-xs","fxLayoutAlign.gt-sm","fxLayoutAlign.gt-md","fxLayoutAlign.gt-lg"]},{kind:"directive",type:W.DefaultFlexDirective,selector:"  [fxFlex], [fxFlex.xs], [fxFlex.sm], [fxFlex.md],  [fxFlex.lg], [fxFlex.xl], [fxFlex.lt-sm], [fxFlex.lt-md],  [fxFlex.lt-lg], [fxFlex.lt-xl], [fxFlex.gt-xs], [fxFlex.gt-sm],  [fxFlex.gt-md], [fxFlex.gt-lg]",inputs:["fxFlex","fxFlex.xs","fxFlex.sm","fxFlex.md","fxFlex.lg","fxFlex.xl","fxFlex.lt-sm","fxFlex.lt-md","fxFlex.lt-lg","fxFlex.lt-xl","fxFlex.gt-xs","fxFlex.gt-sm","fxFlex.gt-md","fxFlex.gt-lg"]},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"directive",type:Fe.ToggleOption,selector:"tb-toggle-option",inputs:["value"]},{kind:"component",type:ke.ToggleSelectComponent,selector:"tb-toggle-select",inputs:["disabled","selectMediaBreakpoint","appearance","disablePagination"]},{kind:"component",type:Mn,selector:"tb-kv-map-config",inputs:["disabled","uniqueKeyValuePairValidator","labelText","requiredText","keyText","keyRequiredText","valText","valRequiredText","hintText","popupHelpLink","required"]},{kind:"component",type:Kn,selector:"tb-msg-metadata-chip",inputs:["labelText","translation"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Yn,decorators:[{type:n,args:[{selector:"tb-enrichment-node-customer-attributes-config",template:'<section [formGroup]="customerAttributesConfigForm" class="tb-form-panel stroked">\n  <div class="tb-form-panel-title" translate>tb.rulenode.mapping-of-customers</div>\n  <div fxFlex fxLayoutAlign="center center">\n    <div class="fetch-to-data-toggle">\n      <tb-toggle-select class="fetch-to-data-toggle" formControlName="dataToFetch" appearance="fill">\n        <tb-toggle-option *ngFor="let data of fetchToData" [value]="data.value">\n          {{ data.name }}\n        </tb-toggle-option>\n      </tb-toggle-select>\n    </div>\n  </div>\n  <tb-kv-map-config\n    required\n    formControlName="dataMapping"\n    [requiredText]="\'tb.rulenode.attr-mapping-required\' | translate"\n    [labelText]="selectTranslation(\'tb.rulenode.latest-telemetry-mapping\',\'tb.rulenode.attributes-mapping\') | translate"\n    [keyText]="selectTranslation(\'tb.rulenode.source-telemetry\',\'tb.rulenode.source-attribute\') | translate"\n    [keyRequiredText]="selectTranslation(\'tb.rulenode.source-telemetry-required\',\'tb.rulenode.source-attribute-required\') | translate"\n    [valText]="\'tb.rulenode.target-key\' | translate"\n    [valRequiredText]="\'tb.rulenode.target-key-required\' | translate"\n    [hintText]="\'tb.rulenode.kv-map-pattern-hint\' | translate"\n    popupHelpLink="rulenode/customer_attributes_node_fields_templatization">\n  </tb-kv-map-config>\n  <tb-msg-metadata-chip\n    [labelText]="customerAttributesConfigForm.get(\'dataToFetch\').value === DataToFetch.LATEST_TELEMETRY ?\n    (\'tb.rulenode.add-mapped-latest-telemetry-to\' | translate) : (\'tb.rulenode.add-mapped-attribute-to\' | translate)"\n    formControlName="fetchTo">\n  </tb-msg-metadata-chip>\n</section>\n',styles:[":host .fetch-to-data-toggle{max-width:420px;width:100%}\n"]}]}],ctorParameters:function(){return[{type:P.Store},{type:R.FormBuilder},{type:Z.TranslateService}]}});class Wn extends f{constructor(e,t,n){super(e),this.store=e,this.translate=t,this.fb=n}configForm(){return this.deviceAttributesConfigForm}onConfigurationSet(e){this.deviceAttributesConfigForm=this.fb.group({deviceRelationsQuery:[e.deviceRelationsQuery,[O.required]],tellFailureIfAbsent:[e.tellFailureIfAbsent,[]],fetchTo:[e.fetchTo,[]],attributesControl:[e.attributesControl,[]]})}prepareInputConfig(e){return se(e)&&(e.attributesControl={clientAttributeNames:ae(e?.clientAttributeNames)?e.clientAttributeNames:[],latestTsKeyNames:ae(e?.latestTsKeyNames)?e.latestTsKeyNames:[],serverAttributeNames:ae(e?.serverAttributeNames)?e.serverAttributeNames:[],sharedAttributeNames:ae(e?.sharedAttributeNames)?e.sharedAttributeNames:[],getLatestValueWithTs:!!ae(e?.getLatestValueWithTs)&&e.getLatestValueWithTs}),{deviceRelationsQuery:ae(e?.deviceRelationsQuery)?e.deviceRelationsQuery:null,tellFailureIfAbsent:!ae(e?.tellFailureIfAbsent)||e.tellFailureIfAbsent,fetchTo:ae(e?.fetchTo)?e.fetchTo:en.METADATA,attributesControl:e?e.attributesControl:null}}prepareOutputConfig(e){for(const t of Object.keys(e.attributesControl))e[t]=e.attributesControl[t];return delete e.attributesControl,e}}e("DeviceAttributesConfigComponent",Wn),Wn.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Wn,deps:[{token:P.Store},{token:Z.TranslateService},{token:R.FormBuilder}],target:t.ɵɵFactoryTarget.Component}),Wn.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:Wn,selector:"tb-enrichment-node-device-attributes-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="deviceAttributesConfigForm" class="tb-form-panel no-padding no-border">\n  <div class="tb-form-panel stroked no-padding-bottom">\n    <div class="tb-form-panel-title" translate>tb.rulenode.device-relations-query</div>\n    <tb-device-relations-query-config\n      required\n      formControlName="deviceRelationsQuery">\n    </tb-device-relations-query-config>\n  </div>\n  <div class="tb-form-panel stroked">\n    <div class="tb-form-row no-padding no-border space-between">\n      <div class="tb-form-panel-title tb-required" translate>tb.rulenode.related-device-attributes</div>\n      <div class="tb-form-panel-hint tb-error" translate\n           [hidden]="!(deviceAttributesConfigForm.get(\'attributesControl\').touched &&\n                        deviceAttributesConfigForm.get(\'attributesControl\').hasError(\'atLeastOneRequired\'))">\n        tb.rulenode.at-least-one-field-required\n      </div>\n    </div>\n    <tb-select-attributes formControlName="attributesControl"\n                          popupHelpLink="rulenode/related_device_attributes_node_fields_templatization"></tb-select-attributes>\n    <tb-msg-metadata-chip formControlName="fetchTo"\n                          [labelText]="\'tb.rulenode.add-selected-attributes-to\' | translate"></tb-msg-metadata-chip>\n  </div>\n  <div tb-hint-tooltip-icon="{{ \'tb.rulenode.tell-failure-tooltip\' | translate }}"\n       class="tb-form-row same-padding">\n    <mat-slide-toggle class="mat-slide margin" formControlName="tellFailureIfAbsent">\n      {{ \'tb.rulenode.tell-failure\' | translate }}\n    </mat-slide-toggle>\n  </div>\n</section>\n',styles:[':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n'],dependencies:[{kind:"component",type:te.MatSlideToggle,selector:"mat-slide-toggle",inputs:["disabled","disableRipple","color","tabIndex"],exportAs:["matSlideToggle"]},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"component",type:ne.HintTooltipIconComponent,selector:"[tb-hint-tooltip-icon]",inputs:["tb-hint-tooltip-icon","tooltipPosition","hintIcon"]},{kind:"component",type:En,selector:"tb-device-relations-query-config",inputs:["disabled","required"]},{kind:"component",type:Kn,selector:"tb-msg-metadata-chip",inputs:["labelText","translation"]},{kind:"component",type:Hn,selector:"tb-select-attributes",inputs:["popupHelpLink"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Wn,decorators:[{type:n,args:[{selector:"tb-enrichment-node-device-attributes-config",template:'<section [formGroup]="deviceAttributesConfigForm" class="tb-form-panel no-padding no-border">\n  <div class="tb-form-panel stroked no-padding-bottom">\n    <div class="tb-form-panel-title" translate>tb.rulenode.device-relations-query</div>\n    <tb-device-relations-query-config\n      required\n      formControlName="deviceRelationsQuery">\n    </tb-device-relations-query-config>\n  </div>\n  <div class="tb-form-panel stroked">\n    <div class="tb-form-row no-padding no-border space-between">\n      <div class="tb-form-panel-title tb-required" translate>tb.rulenode.related-device-attributes</div>\n      <div class="tb-form-panel-hint tb-error" translate\n           [hidden]="!(deviceAttributesConfigForm.get(\'attributesControl\').touched &&\n                        deviceAttributesConfigForm.get(\'attributesControl\').hasError(\'atLeastOneRequired\'))">\n        tb.rulenode.at-least-one-field-required\n      </div>\n    </div>\n    <tb-select-attributes formControlName="attributesControl"\n                          popupHelpLink="rulenode/related_device_attributes_node_fields_templatization"></tb-select-attributes>\n    <tb-msg-metadata-chip formControlName="fetchTo"\n                          [labelText]="\'tb.rulenode.add-selected-attributes-to\' | translate"></tb-msg-metadata-chip>\n  </div>\n  <div tb-hint-tooltip-icon="{{ \'tb.rulenode.tell-failure-tooltip\' | translate }}"\n       class="tb-form-row same-padding">\n    <mat-slide-toggle class="mat-slide margin" formControlName="tellFailureIfAbsent">\n      {{ \'tb.rulenode.tell-failure\' | translate }}\n    </mat-slide-toggle>\n  </div>\n</section>\n',styles:[':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n']}]}],ctorParameters:function(){return[{type:P.Store},{type:Z.TranslateService},{type:R.FormBuilder}]}});class Zn extends f{constructor(e,t,n){super(e),this.store=e,this.translate=t,this.fb=n,this.predefinedValues=[];for(const e of Object.keys(Mt))this.predefinedValues.push({value:Mt[e],name:this.translate.instant(Et.get(Mt[e]))})}ngOnInit(){super.ngOnInit()}configForm(){return this.entityDetailsConfigForm}prepareInputConfig(e){let t;return t=ae(e?.addToMetadata)?e.addToMetadata?en.METADATA:en.DATA:e?.fetchTo?e.fetchTo:en.DATA,{detailsList:ae(e?.detailsList)?e.detailsList:null,fetchTo:t}}onConfigurationSet(e){this.entityDetailsConfigForm=this.fb.group({detailsList:[e.detailsList,[O.required]],fetchTo:[e.fetchTo,[]]})}}e("EntityDetailsConfigComponent",Zn),Zn.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Zn,deps:[{token:P.Store},{token:Z.TranslateService},{token:R.FormBuilder}],target:t.ɵɵFactoryTarget.Component}),Zn.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:Zn,selector:"tb-enrichment-node-entity-details-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="entityDetailsConfigForm">\n  <tb-string-items-list [predefinedValues]="predefinedValues"\n                        class="mat-block" required\n                        [label]="\'tb.rulenode.select-details\' | translate"\n                        [placeholder]="\'tb.rulenode.add-detail\' | translate"\n                        [requiredText]="\'tb.rulenode.entity-details-list-empty\' | translate"\n                        formControlName="detailsList">\n    <mat-icon matSuffix class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon"\n              color="primary"\n              matTooltip="{{ \'tb.rulenode.chip-help\' | translate: { inputName: \'tb.rulenode.detail\' | translate } }}">\n      help\n    </mat-icon>\n  </tb-string-items-list>\n  <tb-msg-metadata-chip\n    [labelText]="\'tb.rulenode.add-selected-details-to\' | translate"\n    formControlName="fetchTo">\n  </tb-msg-metadata-chip>\n</section>\n',styles:[':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n'],dependencies:[{kind:"component",type:et.StringItemsListComponent,selector:"tb-string-items-list",inputs:["required","disabled","label","placeholder","hint","requiredText","floatLabel","appearance","editable","subscriptSizing","predefinedValues"]},{kind:"component",type:ue.MatIcon,selector:"mat-icon",inputs:["color","inline","svgIcon","fontSet","fontIcon"],exportAs:["matIcon"]},{kind:"directive",type:Y.MatSuffix,selector:"[matSuffix], [matIconSuffix], [matTextSuffix]",inputs:["matTextSuffix"]},{kind:"directive",type:ce.MatTooltip,selector:"[matTooltip]",exportAs:["matTooltip"]},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"component",type:Kn,selector:"tb-msg-metadata-chip",inputs:["labelText","translation"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Zn,decorators:[{type:n,args:[{selector:"tb-enrichment-node-entity-details-config",template:'<section [formGroup]="entityDetailsConfigForm">\n  <tb-string-items-list [predefinedValues]="predefinedValues"\n                        class="mat-block" required\n                        [label]="\'tb.rulenode.select-details\' | translate"\n                        [placeholder]="\'tb.rulenode.add-detail\' | translate"\n                        [requiredText]="\'tb.rulenode.entity-details-list-empty\' | translate"\n                        formControlName="detailsList">\n    <mat-icon matSuffix class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon"\n              color="primary"\n              matTooltip="{{ \'tb.rulenode.chip-help\' | translate: { inputName: \'tb.rulenode.detail\' | translate } }}">\n      help\n    </mat-icon>\n  </tb-string-items-list>\n  <tb-msg-metadata-chip\n    [labelText]="\'tb.rulenode.add-selected-details-to\' | translate"\n    formControlName="fetchTo">\n  </tb-msg-metadata-chip>\n</section>\n',styles:[':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n']}]}],ctorParameters:function(){return[{type:P.Store},{type:Z.TranslateService},{type:R.FormBuilder}]}});class Xn extends f{constructor(e,t,n){super(e),this.store=e,this.translate=t,this.fb=n,this.separatorKeysCodes=[ge,ye,xe],this.aggregationTypes=E,this.aggregations=Object.values(E),this.aggregationTypesTranslations=G,this.fetchMode=Gt,this.samplingOrders=Object.values(Vt),this.samplingOrdersTranslate=_t,this.timeUnits=Object.values(Nt),this.timeUnitsTranslationMap=St,this.deduplicationStrategiesHintTranslations=wt,this.headerOptions=[],this.timeUnitMap={[Nt.MILLISECONDS]:1,[Nt.SECONDS]:1e3,[Nt.MINUTES]:6e4,[Nt.HOURS]:36e5,[Nt.DAYS]:864e5},this.intervalValidator=()=>e=>e.get("startInterval").value*this.timeUnitMap[e.get("startIntervalTimeUnit").value]<=e.get("endInterval").value*this.timeUnitMap[e.get("endIntervalTimeUnit").value]?{intervalError:!0}:null;for(const e of Dt.keys())this.headerOptions.push({value:e,name:this.translate.instant(Dt.get(e))})}configForm(){return this.getTelemetryFromDatabaseConfigForm}onConfigurationSet(e){this.getTelemetryFromDatabaseConfigForm=this.fb.group({latestTsKeyNames:[e.latestTsKeyNames,[O.required]],aggregation:[e.aggregation,[O.required]],fetchMode:[e.fetchMode,[O.required]],orderBy:[e.orderBy,[]],limit:[e.limit,[]],useMetadataIntervalPatterns:[e.useMetadataIntervalPatterns,[]],interval:this.fb.group({startInterval:[e.interval.startInterval,[]],startIntervalTimeUnit:[e.interval.startIntervalTimeUnit,[]],endInterval:[e.interval.endInterval,[]],endIntervalTimeUnit:[e.interval.endIntervalTimeUnit,[]]}),startIntervalPattern:[e.startIntervalPattern,[]],endIntervalPattern:[e.endIntervalPattern,[]]})}validatorTriggers(){return["fetchMode","useMetadataIntervalPatterns"]}toggleChange(e){this.getTelemetryFromDatabaseConfigForm.get("fetchMode").patchValue(e,{emitEvent:!0})}prepareOutputConfig(e){return e.startInterval=e.interval.startInterval,e.startIntervalTimeUnit=e.interval.startIntervalTimeUnit,e.endInterval=e.interval.endInterval,e.endIntervalTimeUnit=e.interval.endIntervalTimeUnit,delete e.interval,le(e)}prepareInputConfig(e){return se(e)&&(e.interval={startInterval:e.startInterval,startIntervalTimeUnit:e.startIntervalTimeUnit,endInterval:e.endInterval,endIntervalTimeUnit:e.endIntervalTimeUnit}),{latestTsKeyNames:ae(e?.latestTsKeyNames)?e.latestTsKeyNames:null,aggregation:ae(e?.aggregation)?e.aggregation:E.NONE,fetchMode:ae(e?.fetchMode)?e.fetchMode:Gt.FIRST,orderBy:ae(e?.orderBy)?e.orderBy:Vt.ASC,limit:ae(e?.limit)?e.limit:1e3,useMetadataIntervalPatterns:!!ae(e?.useMetadataIntervalPatterns)&&e.useMetadataIntervalPatterns,interval:{startInterval:ae(e?.interval?.startInterval)?e.interval.startInterval:2,startIntervalTimeUnit:ae(e?.interval?.startIntervalTimeUnit)?e.interval.startIntervalTimeUnit:Nt.MINUTES,endInterval:ae(e?.interval?.endInterval)?e.interval.endInterval:1,endIntervalTimeUnit:ae(e?.interval?.endIntervalTimeUnit)?e.interval.endIntervalTimeUnit:Nt.MINUTES},startIntervalPattern:ae(e?.startIntervalPattern)?e.startIntervalPattern:null,endIntervalPattern:ae(e?.endIntervalPattern)?e.endIntervalPattern:null}}updateValidators(e){const t=this.getTelemetryFromDatabaseConfigForm.get("fetchMode").value,n=this.getTelemetryFromDatabaseConfigForm.get("useMetadataIntervalPatterns").value;t&&t===Gt.ALL?(this.getTelemetryFromDatabaseConfigForm.get("aggregation").setValidators([O.required]),this.getTelemetryFromDatabaseConfigForm.get("orderBy").setValidators([O.required]),this.getTelemetryFromDatabaseConfigForm.get("limit").setValidators([O.required,O.min(2),O.max(1e3)])):(this.getTelemetryFromDatabaseConfigForm.get("aggregation").setValidators([]),this.getTelemetryFromDatabaseConfigForm.get("orderBy").setValidators([]),this.getTelemetryFromDatabaseConfigForm.get("limit").setValidators([])),n?(this.getTelemetryFromDatabaseConfigForm.get("interval.startInterval").setValidators([]),this.getTelemetryFromDatabaseConfigForm.get("interval.startIntervalTimeUnit").setValidators([]),this.getTelemetryFromDatabaseConfigForm.get("interval.endInterval").setValidators([]),this.getTelemetryFromDatabaseConfigForm.get("interval.endIntervalTimeUnit").setValidators([]),this.getTelemetryFromDatabaseConfigForm.get("interval").setValidators([]),this.getTelemetryFromDatabaseConfigForm.get("startIntervalPattern").setValidators([O.required,O.pattern(/(?:.|\s)*\S(&:.|\s)*/)]),this.getTelemetryFromDatabaseConfigForm.get("endIntervalPattern").setValidators([O.required,O.pattern(/(?:.|\s)*\S(&:.|\s)*/)])):(this.getTelemetryFromDatabaseConfigForm.get("interval.startInterval").setValidators([O.required,O.min(1),O.max(2147483647)]),this.getTelemetryFromDatabaseConfigForm.get("interval.startIntervalTimeUnit").setValidators([O.required]),this.getTelemetryFromDatabaseConfigForm.get("interval.endInterval").setValidators([O.required,O.min(1),O.max(2147483647)]),this.getTelemetryFromDatabaseConfigForm.get("interval.endIntervalTimeUnit").setValidators([O.required]),this.getTelemetryFromDatabaseConfigForm.get("interval").setValidators([this.intervalValidator()]),this.getTelemetryFromDatabaseConfigForm.get("startIntervalPattern").setValidators([]),this.getTelemetryFromDatabaseConfigForm.get("endIntervalPattern").setValidators([])),this.getTelemetryFromDatabaseConfigForm.get("aggregation").updateValueAndValidity({emitEvent:e}),this.getTelemetryFromDatabaseConfigForm.get("orderBy").updateValueAndValidity({emitEvent:e}),this.getTelemetryFromDatabaseConfigForm.get("limit").updateValueAndValidity({emitEvent:e}),this.getTelemetryFromDatabaseConfigForm.get("interval.startInterval").updateValueAndValidity({emitEvent:e}),this.getTelemetryFromDatabaseConfigForm.get("interval.startIntervalTimeUnit").updateValueAndValidity({emitEvent:e}),this.getTelemetryFromDatabaseConfigForm.get("interval.endInterval").updateValueAndValidity({emitEvent:e}),this.getTelemetryFromDatabaseConfigForm.get("interval.endIntervalTimeUnit").updateValueAndValidity({emitEvent:e}),this.getTelemetryFromDatabaseConfigForm.get("interval").updateValueAndValidity({emitEvent:e}),this.getTelemetryFromDatabaseConfigForm.get("startIntervalPattern").updateValueAndValidity({emitEvent:e}),this.getTelemetryFromDatabaseConfigForm.get("endIntervalPattern").updateValueAndValidity({emitEvent:e})}removeKey(e,t){const n=this.getTelemetryFromDatabaseConfigForm.get(t).value,r=n.indexOf(e);r>=0&&(n.splice(r,1),this.getTelemetryFromDatabaseConfigForm.get(t).setValue(n,{emitEvent:!0}))}clearChipGrid(){this.getTelemetryFromDatabaseConfigForm.get("latestTsKeyNames").patchValue([],{emitEvent:!0})}addKey(e,t){const n=e.input;let r=e.value;if((r||"").trim()){r=r.trim();let e=this.getTelemetryFromDatabaseConfigForm.get(t).value;e&&-1!==e.indexOf(r)||(e||(e=[]),e.push(r),this.getTelemetryFromDatabaseConfigForm.get(t).setValue(e,{emitEvent:!0}))}n&&(n.value="")}defaultPaddingEnable(){return this.getTelemetryFromDatabaseConfigForm.get("fetchMode").value===Gt.ALL&&this.getTelemetryFromDatabaseConfigForm.get("aggregation").value===E.NONE}}e("GetTelemetryFromDatabaseConfigComponent",Xn),Xn.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Xn,deps:[{token:P.Store},{token:Z.TranslateService},{token:R.FormBuilder}],target:t.ɵɵFactoryTarget.Component}),Xn.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:Xn,selector:"tb-enrichment-node-get-telemetry-from-database",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="getTelemetryFromDatabaseConfigForm" class="tb-form-panel no-padding no-border">\n  <tb-string-items-list class="mat-block" editable [placeholder]="\'tb.rulenode.add-timeseries-key\' | translate"\n                        subscriptSizing="dynamic" required\n                        [requiredText]="\'tb.rulenode.timeseries-keys-required\' | translate"\n                        [label]="\'tb.rulenode.timeseries-keys\' | translate" formControlName="latestTsKeyNames"\n                        [hint]="\'tb.rulenode.general-pattern-hint\' | translate">\n    <div matHintEnd class="see-example" tb-help-popup="{{\'rulenode/originator_telemetry_node_fields_templatization\'}}"\n         hintMode\n         tb-help-popup-placement="right"\n         trigger-style="letter-spacing:0.25px; font-size:12px"\n         [tb-help-popup-style]="{maxWidth: \'820px\'}"\n         trigger-text="{{ \'tb.key-val.see-examples\' | translate }}"></div>\n    <mat-icon matSuffix class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon" color="primary"\n              matTooltip="{{ \'tb.rulenode.chip-help\' | translate: { inputName: \'tb.rulenode.timeseries-key\' | translate } }}">help\n    </mat-icon>\n  </tb-string-items-list>\n  <div class="tb-form-panel stroked">\n    <div class="tb-form-panel-title" translate>tb.rulenode.fetch-interval</div>\n    <div tb-hint-tooltip-icon="{{ \'tb.rulenode.use-metadata-dynamic-interval-tooltip\' | translate }}"\n         class="tb-form-row no-border no-padding">\n      <mat-slide-toggle class="mat-slide" formControlName="useMetadataIntervalPatterns">\n        {{ \'tb.rulenode.use-metadata-dynamic-interval\' | translate }}\n      </mat-slide-toggle>\n    </div>\n    <div formGroupName="interval" fxLayout="column"\n         *ngIf="getTelemetryFromDatabaseConfigForm.get(\'useMetadataIntervalPatterns\').value === false; else intervalPattern">\n      <div fxLayout="column" fxLayout.gt-sm="row" fxLayoutGap="0" fxLayoutGap.gt-sm="16px">\n        <mat-form-field fxFlex="50" class="mat-block">\n          <mat-label>{{ \'tb.rulenode.interval-start\' | translate }}</mat-label>\n          <input type="number" step="1" min="1" max="2147483647" matInput formControlName="startInterval" required>\n          <mat-error *ngIf="getTelemetryFromDatabaseConfigForm.get(\'interval.startInterval\').hasError(\'required\')">\n            {{ \'tb.rulenode.start-interval-value-required\' | translate }}\n          </mat-error>\n          <mat-error *ngIf="getTelemetryFromDatabaseConfigForm.get(\'interval.startInterval\').hasError(\'min\')">\n            {{ \'tb.rulenode.time-value-range\' | translate }}\n          </mat-error>\n          <mat-error *ngIf="getTelemetryFromDatabaseConfigForm.get(\'interval.startInterval\').hasError(\'max\')">\n            {{ \'tb.rulenode.time-value-range\' | translate }}\n          </mat-error>\n        </mat-form-field>\n        <mat-form-field fxFlex="50" class="mat-block" hideRequiredMarker>\n          <mat-label>{{ \'tb.rulenode.time-unit\' | translate }}</mat-label>\n          <mat-select formControlName="startIntervalTimeUnit" required>\n            <mat-option *ngFor="let timeUnit of timeUnits" [value]="timeUnit">\n              {{ timeUnitsTranslationMap.get(timeUnit) | translate }}\n            </mat-option>\n          </mat-select>\n        </mat-form-field>\n      </div>\n      <div fxLayout="column" fxLayout.gt-sm="row" fxLayoutGap="0" fxLayoutGap.gt-sm="16px">\n        <mat-form-field fxFlex="50" class="mat-block">\n          <mat-label>{{ \'tb.rulenode.interval-end\' | translate }}</mat-label>\n          <input type="number" step="1" min="1" max="2147483647" matInput formControlName="endInterval" required>\n          <mat-error *ngIf="getTelemetryFromDatabaseConfigForm.get(\'interval.endInterval\').hasError(\'required\')">\n            {{ \'tb.rulenode.end-interval-value-required\' | translate }}\n          </mat-error>\n          <mat-error *ngIf="getTelemetryFromDatabaseConfigForm.get(\'interval.endInterval\').hasError(\'min\')">\n            {{ \'tb.rulenode.time-value-range\' | translate }}\n          </mat-error>\n          <mat-error *ngIf="getTelemetryFromDatabaseConfigForm.get(\'interval.endInterval\').hasError(\'max\')">\n            {{ \'tb.rulenode.time-value-range\' | translate }}\n          </mat-error>\n        </mat-form-field>\n        <mat-form-field fxFlex="50" class="mat-block" hideRequiredMarker>\n          <mat-label>{{ \'tb.rulenode.time-unit\' | translate }}</mat-label>\n          <mat-select formControlName="endIntervalTimeUnit" required>\n            <mat-option *ngFor="let timeUnit of timeUnits" [value]="timeUnit">\n              {{ timeUnitsTranslationMap.get(timeUnit) | translate }}\n            </mat-option>\n          </mat-select>\n        </mat-form-field>\n      </div>\n      <div class="description-block tb-primary-fill" [class.error]="getTelemetryFromDatabaseConfigForm.get(\'interval\').invalid">\n        <mat-icon class="description-icon">error_outline</mat-icon>\n        <div class="description-text">\n          <ng-container *ngIf="getTelemetryFromDatabaseConfigForm.get(\'interval\').valid; else invalidText">\n            {{ \'tb.rulenode.fetch-timeseries-from-to\' | translate:\n            {\n              startInterval: getTelemetryFromDatabaseConfigForm.get(\'interval.startInterval\').value,\n              endInterval: getTelemetryFromDatabaseConfigForm.get(\'interval.endInterval\').value,\n              startIntervalTimeUnit: getTelemetryFromDatabaseConfigForm.get(\'interval.startIntervalTimeUnit\').value.toLowerCase(),\n              endIntervalTimeUnit: getTelemetryFromDatabaseConfigForm.get(\'interval.endIntervalTimeUnit\').value.toLowerCase()\n            } }}\n          </ng-container>\n          <ng-template #invalidText>\n            {{ "tb.rulenode.fetch-timeseries-from-to-invalid" | translate }}\n          </ng-template>\n        </div>\n      </div>\n    </div>\n    <ng-template #intervalPattern>\n      <div fxLayout="column" class="input-block">\n        <mat-form-field fxFlex class="mat-block">\n          <mat-label>{{ \'tb.rulenode.start-interval\' | translate }}</mat-label>\n          <input matInput formControlName="startIntervalPattern" required>\n          <mat-error *ngIf="getTelemetryFromDatabaseConfigForm.get(\'startIntervalPattern\').hasError(\'required\') ||\n            getTelemetryFromDatabaseConfigForm.get(\'startIntervalPattern\').hasError(\'pattern\')">\n            {{ \'tb.rulenode.start-interval-required\' | translate }}\n          </mat-error>\n        </mat-form-field>\n        <mat-form-field fxFlex class="mat-block">\n          <mat-label>{{ \'tb.rulenode.end-interval\' | translate }}</mat-label>\n          <input matInput formControlName="endIntervalPattern" required>\n          <mat-error *ngIf="getTelemetryFromDatabaseConfigForm.get(\'endIntervalPattern\').hasError(\'required\') ||\n          getTelemetryFromDatabaseConfigForm.get(\'endIntervalPattern\').hasError(\'pattern\')">\n            {{ \'tb.rulenode.end-interval-required\' | translate }}\n          </mat-error>\n        </mat-form-field>\n        <tb-example-hint [hintText]="\'tb.rulenode.metadata-dynamic-interval-hint\' | translate"\n                         popupHelpLink="rulenode/originator_telemetry_node_fields_templatization">\n        </tb-example-hint>\n      </div>\n    </ng-template>\n  </div>\n  <div class="tb-form-panel stroked">\n    <div class="tb-form-panel-title" translate>tb.rulenode.fetch-strategy</div>\n    <div class="tb-form-panel no-border no-padding item-center">\n      <div class="fetch-mod-toggle">\n        <tb-toggle-select formControlName="fetchMode" appearance="fill">\n          <tb-toggle-option *ngFor="let data of headerOptions" [value]="data.value">\n            {{ data.name }}\n          </tb-toggle-option>\n        </tb-toggle-select>\n      </div>\n      <div class="tb-form-hint tb-primary-fill hint-container">\n        {{ deduplicationStrategiesHintTranslations.get(getTelemetryFromDatabaseConfigForm.get(\'fetchMode\').value) | translate }}\n      </div>\n    </div>\n    <div *ngIf="getTelemetryFromDatabaseConfigForm.get(\'fetchMode\').value === fetchMode.ALL">\n      <mat-form-field class="mat-block" hideRequiredMarker\n                      [subscriptSizing]="defaultPaddingEnable() ? \'fixed\' : \'dynamic\'">\n        <mat-label>{{ \'aggregation.function\' | translate }}</mat-label>\n        <mat-select formControlName="aggregation" required>\n          <mat-option *ngFor="let aggregation of aggregations" [value]="aggregation">\n            {{ aggregationTypesTranslations.get(aggregationTypes[aggregation]) | translate }}\n          </mat-option>\n        </mat-select>\n      </mat-form-field>\n      <div *ngIf="getTelemetryFromDatabaseConfigForm.get(\'aggregation\').value === aggregationTypes.NONE">\n        <mat-form-field class="mat-block" hideRequiredMarker>\n          <mat-label> {{ "tb.rulenode.order-by-timestamp" | translate }} </mat-label>\n          <mat-select formControlName="orderBy" required>\n            <mat-option *ngFor="let order of samplingOrders" [value]="order">\n              {{ samplingOrdersTranslate.get(order) | translate }}\n            </mat-option>\n          </mat-select>\n        </mat-form-field>\n        <mat-form-field class="mat-block">\n          <mat-label>{{ "tb.rulenode.limit" | translate }}</mat-label>\n          <input type="number" min="2" max="1000" step="1" matInput formControlName="limit" required>\n          <mat-hint>{{ "tb.rulenode.limit-hint" | translate }}</mat-hint>\n          <mat-error *ngIf="getTelemetryFromDatabaseConfigForm.get(\'limit\').hasError(\'required\')">\n            {{ \'tb.rulenode.limit-required\' | translate }}\n          </mat-error>\n          <mat-error *ngIf="getTelemetryFromDatabaseConfigForm.get(\'limit\').hasError(\'min\')">\n            {{ \'tb.rulenode.limit-range\' | translate }}\n          </mat-error>\n          <mat-error *ngIf="getTelemetryFromDatabaseConfigForm.get(\'limit\').hasError(\'max\')">\n            {{ \'tb.rulenode.limit-range\' | translate }}\n          </mat-error>\n        </mat-form-field>\n      </div>\n    </div>\n  </div>\n</section>\n',styles:[":host .see-example{display:inline-block}:host .description-block{display:flex;align-items:center;border-radius:6px;border:1px solid #EAEAEA}:host .description-block .description-icon{font-size:24px;height:24px;min-height:24px;width:24px;min-width:24px;line-height:24px;color:#d9d9d9;margin:4px}:host .description-block .description-text{font-size:12px;line-height:16px;letter-spacing:.25px;margin:6px}:host .description-block.error{color:var(--mdc-theme-error, #f44336)}:host .description-block.error .description-icon{color:var(--mdc-theme-error, #f44336)}:host .item-center{align-items:center}:host .item-center .fetch-mod-toggle{width:100%}:host .hint-container{width:100%}\n",':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n'],dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:$e.HelpPopupComponent,selector:"[tb-help-popup], [tb-help-popup-content]",inputs:["tb-help-popup","tb-help-popup-content","trigger-text","trigger-style","tb-help-popup-placement","tb-help-popup-style","hintMode"]},{kind:"component",type:et.StringItemsListComponent,selector:"tb-string-items-list",inputs:["required","disabled","label","placeholder","hint","requiredText","floatLabel","appearance","editable","subscriptSizing","predefinedValues"]},{kind:"component",type:ue.MatIcon,selector:"mat-icon",inputs:["color","inline","svgIcon","fontSet","fontIcon"],exportAs:["matIcon"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatHint,selector:"mat-hint",inputs:["align","id"]},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"directive",type:Y.MatSuffix,selector:"[matSuffix], [matIconSuffix], [matTextSuffix]",inputs:["matTextSuffix"]},{kind:"component",type:X.MatSelect,selector:"mat-select",inputs:["disabled","disableRipple","tabIndex","hideSingleSelectionIndicator"],exportAs:["matSelect"]},{kind:"component",type:ee.MatOption,selector:"mat-option",exportAs:["matOption"]},{kind:"directive",type:ce.MatTooltip,selector:"[matTooltip]",exportAs:["matTooltip"]},{kind:"component",type:te.MatSlideToggle,selector:"mat-slide-toggle",inputs:["disabled","disableRipple","color","tabIndex"],exportAs:["matSlideToggle"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:W.DefaultLayoutGapDirective,selector:"  [fxLayoutGap], [fxLayoutGap.xs], [fxLayoutGap.sm], [fxLayoutGap.md],  [fxLayoutGap.lg], [fxLayoutGap.xl], [fxLayoutGap.lt-sm], [fxLayoutGap.lt-md],  [fxLayoutGap.lt-lg], [fxLayoutGap.lt-xl], [fxLayoutGap.gt-xs], [fxLayoutGap.gt-sm],  [fxLayoutGap.gt-md], [fxLayoutGap.gt-lg]",inputs:["fxLayoutGap","fxLayoutGap.xs","fxLayoutGap.sm","fxLayoutGap.md","fxLayoutGap.lg","fxLayoutGap.xl","fxLayoutGap.lt-sm","fxLayoutGap.lt-md","fxLayoutGap.lt-lg","fxLayoutGap.lt-xl","fxLayoutGap.gt-xs","fxLayoutGap.gt-sm","fxLayoutGap.gt-md","fxLayoutGap.gt-lg"]},{kind:"directive",type:W.DefaultFlexDirective,selector:"  [fxFlex], [fxFlex.xs], [fxFlex.sm], [fxFlex.md],  [fxFlex.lg], [fxFlex.xl], [fxFlex.lt-sm], [fxFlex.lt-md],  [fxFlex.lt-lg], [fxFlex.lt-xl], [fxFlex.gt-xs], [fxFlex.gt-sm],  [fxFlex.gt-md], [fxFlex.gt-lg]",inputs:["fxFlex","fxFlex.xs","fxFlex.sm","fxFlex.md","fxFlex.lg","fxFlex.xl","fxFlex.lt-sm","fxFlex.lt-md","fxFlex.lt-lg","fxFlex.lt-xl","fxFlex.gt-xs","fxFlex.gt-sm","fxFlex.gt-md","fxFlex.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NumberValueAccessor,selector:"input[type=number][formControlName],input[type=number][formControl],input[type=number][ngModel]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.MinValidator,selector:"input[type=number][min][formControlName],input[type=number][min][formControl],input[type=number][min][ngModel]",inputs:["min"]},{kind:"directive",type:R.MaxValidator,selector:"input[type=number][max][formControlName],input[type=number][max][formControl],input[type=number][max][ngModel]",inputs:["max"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:R.FormGroupName,selector:"[formGroupName]",inputs:["formGroupName"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"directive",type:Fe.ToggleOption,selector:"tb-toggle-option",inputs:["value"]},{kind:"component",type:ke.ToggleSelectComponent,selector:"tb-toggle-select",inputs:["disabled","selectMediaBreakpoint","appearance","disablePagination"]},{kind:"component",type:ne.HintTooltipIconComponent,selector:"[tb-hint-tooltip-icon]",inputs:["tb-hint-tooltip-icon","tooltipPosition","hintIcon"]},{kind:"component",type:An,selector:"tb-example-hint",inputs:["hintText","popupHelpLink","textAlign"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Xn,decorators:[{type:n,args:[{selector:"tb-enrichment-node-get-telemetry-from-database",template:'<section [formGroup]="getTelemetryFromDatabaseConfigForm" class="tb-form-panel no-padding no-border">\n  <tb-string-items-list class="mat-block" editable [placeholder]="\'tb.rulenode.add-timeseries-key\' | translate"\n                        subscriptSizing="dynamic" required\n                        [requiredText]="\'tb.rulenode.timeseries-keys-required\' | translate"\n                        [label]="\'tb.rulenode.timeseries-keys\' | translate" formControlName="latestTsKeyNames"\n                        [hint]="\'tb.rulenode.general-pattern-hint\' | translate">\n    <div matHintEnd class="see-example" tb-help-popup="{{\'rulenode/originator_telemetry_node_fields_templatization\'}}"\n         hintMode\n         tb-help-popup-placement="right"\n         trigger-style="letter-spacing:0.25px; font-size:12px"\n         [tb-help-popup-style]="{maxWidth: \'820px\'}"\n         trigger-text="{{ \'tb.key-val.see-examples\' | translate }}"></div>\n    <mat-icon matSuffix class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon" color="primary"\n              matTooltip="{{ \'tb.rulenode.chip-help\' | translate: { inputName: \'tb.rulenode.timeseries-key\' | translate } }}">help\n    </mat-icon>\n  </tb-string-items-list>\n  <div class="tb-form-panel stroked">\n    <div class="tb-form-panel-title" translate>tb.rulenode.fetch-interval</div>\n    <div tb-hint-tooltip-icon="{{ \'tb.rulenode.use-metadata-dynamic-interval-tooltip\' | translate }}"\n         class="tb-form-row no-border no-padding">\n      <mat-slide-toggle class="mat-slide" formControlName="useMetadataIntervalPatterns">\n        {{ \'tb.rulenode.use-metadata-dynamic-interval\' | translate }}\n      </mat-slide-toggle>\n    </div>\n    <div formGroupName="interval" fxLayout="column"\n         *ngIf="getTelemetryFromDatabaseConfigForm.get(\'useMetadataIntervalPatterns\').value === false; else intervalPattern">\n      <div fxLayout="column" fxLayout.gt-sm="row" fxLayoutGap="0" fxLayoutGap.gt-sm="16px">\n        <mat-form-field fxFlex="50" class="mat-block">\n          <mat-label>{{ \'tb.rulenode.interval-start\' | translate }}</mat-label>\n          <input type="number" step="1" min="1" max="2147483647" matInput formControlName="startInterval" required>\n          <mat-error *ngIf="getTelemetryFromDatabaseConfigForm.get(\'interval.startInterval\').hasError(\'required\')">\n            {{ \'tb.rulenode.start-interval-value-required\' | translate }}\n          </mat-error>\n          <mat-error *ngIf="getTelemetryFromDatabaseConfigForm.get(\'interval.startInterval\').hasError(\'min\')">\n            {{ \'tb.rulenode.time-value-range\' | translate }}\n          </mat-error>\n          <mat-error *ngIf="getTelemetryFromDatabaseConfigForm.get(\'interval.startInterval\').hasError(\'max\')">\n            {{ \'tb.rulenode.time-value-range\' | translate }}\n          </mat-error>\n        </mat-form-field>\n        <mat-form-field fxFlex="50" class="mat-block" hideRequiredMarker>\n          <mat-label>{{ \'tb.rulenode.time-unit\' | translate }}</mat-label>\n          <mat-select formControlName="startIntervalTimeUnit" required>\n            <mat-option *ngFor="let timeUnit of timeUnits" [value]="timeUnit">\n              {{ timeUnitsTranslationMap.get(timeUnit) | translate }}\n            </mat-option>\n          </mat-select>\n        </mat-form-field>\n      </div>\n      <div fxLayout="column" fxLayout.gt-sm="row" fxLayoutGap="0" fxLayoutGap.gt-sm="16px">\n        <mat-form-field fxFlex="50" class="mat-block">\n          <mat-label>{{ \'tb.rulenode.interval-end\' | translate }}</mat-label>\n          <input type="number" step="1" min="1" max="2147483647" matInput formControlName="endInterval" required>\n          <mat-error *ngIf="getTelemetryFromDatabaseConfigForm.get(\'interval.endInterval\').hasError(\'required\')">\n            {{ \'tb.rulenode.end-interval-value-required\' | translate }}\n          </mat-error>\n          <mat-error *ngIf="getTelemetryFromDatabaseConfigForm.get(\'interval.endInterval\').hasError(\'min\')">\n            {{ \'tb.rulenode.time-value-range\' | translate }}\n          </mat-error>\n          <mat-error *ngIf="getTelemetryFromDatabaseConfigForm.get(\'interval.endInterval\').hasError(\'max\')">\n            {{ \'tb.rulenode.time-value-range\' | translate }}\n          </mat-error>\n        </mat-form-field>\n        <mat-form-field fxFlex="50" class="mat-block" hideRequiredMarker>\n          <mat-label>{{ \'tb.rulenode.time-unit\' | translate }}</mat-label>\n          <mat-select formControlName="endIntervalTimeUnit" required>\n            <mat-option *ngFor="let timeUnit of timeUnits" [value]="timeUnit">\n              {{ timeUnitsTranslationMap.get(timeUnit) | translate }}\n            </mat-option>\n          </mat-select>\n        </mat-form-field>\n      </div>\n      <div class="description-block tb-primary-fill" [class.error]="getTelemetryFromDatabaseConfigForm.get(\'interval\').invalid">\n        <mat-icon class="description-icon">error_outline</mat-icon>\n        <div class="description-text">\n          <ng-container *ngIf="getTelemetryFromDatabaseConfigForm.get(\'interval\').valid; else invalidText">\n            {{ \'tb.rulenode.fetch-timeseries-from-to\' | translate:\n            {\n              startInterval: getTelemetryFromDatabaseConfigForm.get(\'interval.startInterval\').value,\n              endInterval: getTelemetryFromDatabaseConfigForm.get(\'interval.endInterval\').value,\n              startIntervalTimeUnit: getTelemetryFromDatabaseConfigForm.get(\'interval.startIntervalTimeUnit\').value.toLowerCase(),\n              endIntervalTimeUnit: getTelemetryFromDatabaseConfigForm.get(\'interval.endIntervalTimeUnit\').value.toLowerCase()\n            } }}\n          </ng-container>\n          <ng-template #invalidText>\n            {{ "tb.rulenode.fetch-timeseries-from-to-invalid" | translate }}\n          </ng-template>\n        </div>\n      </div>\n    </div>\n    <ng-template #intervalPattern>\n      <div fxLayout="column" class="input-block">\n        <mat-form-field fxFlex class="mat-block">\n          <mat-label>{{ \'tb.rulenode.start-interval\' | translate }}</mat-label>\n          <input matInput formControlName="startIntervalPattern" required>\n          <mat-error *ngIf="getTelemetryFromDatabaseConfigForm.get(\'startIntervalPattern\').hasError(\'required\') ||\n            getTelemetryFromDatabaseConfigForm.get(\'startIntervalPattern\').hasError(\'pattern\')">\n            {{ \'tb.rulenode.start-interval-required\' | translate }}\n          </mat-error>\n        </mat-form-field>\n        <mat-form-field fxFlex class="mat-block">\n          <mat-label>{{ \'tb.rulenode.end-interval\' | translate }}</mat-label>\n          <input matInput formControlName="endIntervalPattern" required>\n          <mat-error *ngIf="getTelemetryFromDatabaseConfigForm.get(\'endIntervalPattern\').hasError(\'required\') ||\n          getTelemetryFromDatabaseConfigForm.get(\'endIntervalPattern\').hasError(\'pattern\')">\n            {{ \'tb.rulenode.end-interval-required\' | translate }}\n          </mat-error>\n        </mat-form-field>\n        <tb-example-hint [hintText]="\'tb.rulenode.metadata-dynamic-interval-hint\' | translate"\n                         popupHelpLink="rulenode/originator_telemetry_node_fields_templatization">\n        </tb-example-hint>\n      </div>\n    </ng-template>\n  </div>\n  <div class="tb-form-panel stroked">\n    <div class="tb-form-panel-title" translate>tb.rulenode.fetch-strategy</div>\n    <div class="tb-form-panel no-border no-padding item-center">\n      <div class="fetch-mod-toggle">\n        <tb-toggle-select formControlName="fetchMode" appearance="fill">\n          <tb-toggle-option *ngFor="let data of headerOptions" [value]="data.value">\n            {{ data.name }}\n          </tb-toggle-option>\n        </tb-toggle-select>\n      </div>\n      <div class="tb-form-hint tb-primary-fill hint-container">\n        {{ deduplicationStrategiesHintTranslations.get(getTelemetryFromDatabaseConfigForm.get(\'fetchMode\').value) | translate }}\n      </div>\n    </div>\n    <div *ngIf="getTelemetryFromDatabaseConfigForm.get(\'fetchMode\').value === fetchMode.ALL">\n      <mat-form-field class="mat-block" hideRequiredMarker\n                      [subscriptSizing]="defaultPaddingEnable() ? \'fixed\' : \'dynamic\'">\n        <mat-label>{{ \'aggregation.function\' | translate }}</mat-label>\n        <mat-select formControlName="aggregation" required>\n          <mat-option *ngFor="let aggregation of aggregations" [value]="aggregation">\n            {{ aggregationTypesTranslations.get(aggregationTypes[aggregation]) | translate }}\n          </mat-option>\n        </mat-select>\n      </mat-form-field>\n      <div *ngIf="getTelemetryFromDatabaseConfigForm.get(\'aggregation\').value === aggregationTypes.NONE">\n        <mat-form-field class="mat-block" hideRequiredMarker>\n          <mat-label> {{ "tb.rulenode.order-by-timestamp" | translate }} </mat-label>\n          <mat-select formControlName="orderBy" required>\n            <mat-option *ngFor="let order of samplingOrders" [value]="order">\n              {{ samplingOrdersTranslate.get(order) | translate }}\n            </mat-option>\n          </mat-select>\n        </mat-form-field>\n        <mat-form-field class="mat-block">\n          <mat-label>{{ "tb.rulenode.limit" | translate }}</mat-label>\n          <input type="number" min="2" max="1000" step="1" matInput formControlName="limit" required>\n          <mat-hint>{{ "tb.rulenode.limit-hint" | translate }}</mat-hint>\n          <mat-error *ngIf="getTelemetryFromDatabaseConfigForm.get(\'limit\').hasError(\'required\')">\n            {{ \'tb.rulenode.limit-required\' | translate }}\n          </mat-error>\n          <mat-error *ngIf="getTelemetryFromDatabaseConfigForm.get(\'limit\').hasError(\'min\')">\n            {{ \'tb.rulenode.limit-range\' | translate }}\n          </mat-error>\n          <mat-error *ngIf="getTelemetryFromDatabaseConfigForm.get(\'limit\').hasError(\'max\')">\n            {{ \'tb.rulenode.limit-range\' | translate }}\n          </mat-error>\n        </mat-form-field>\n      </div>\n    </div>\n  </div>\n</section>\n',styles:[":host .see-example{display:inline-block}:host .description-block{display:flex;align-items:center;border-radius:6px;border:1px solid #EAEAEA}:host .description-block .description-icon{font-size:24px;height:24px;min-height:24px;width:24px;min-width:24px;line-height:24px;color:#d9d9d9;margin:4px}:host .description-block .description-text{font-size:12px;line-height:16px;letter-spacing:.25px;margin:6px}:host .description-block.error{color:var(--mdc-theme-error, #f44336)}:host .description-block.error .description-icon{color:var(--mdc-theme-error, #f44336)}:host .item-center{align-items:center}:host .item-center .fetch-mod-toggle{width:100%}:host .hint-container{width:100%}\n",':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n']}]}],ctorParameters:function(){return[{type:P.Store},{type:Z.TranslateService},{type:R.FormBuilder}]}});class er extends f{constructor(e,t,n){super(e),this.store=e,this.translate=t,this.fb=n}configForm(){return this.originatorAttributesConfigForm}onConfigurationSet(e){this.originatorAttributesConfigForm=this.fb.group({tellFailureIfAbsent:[e.tellFailureIfAbsent,[]],fetchTo:[e.fetchTo,[]],attributesControl:[e.attributesControl,[]]})}prepareInputConfig(e){return se(e)&&(e.attributesControl={clientAttributeNames:ae(e?.clientAttributeNames)?e.clientAttributeNames:[],latestTsKeyNames:ae(e?.latestTsKeyNames)?e.latestTsKeyNames:[],serverAttributeNames:ae(e?.serverAttributeNames)?e.serverAttributeNames:[],sharedAttributeNames:ae(e?.sharedAttributeNames)?e.sharedAttributeNames:[],getLatestValueWithTs:!!ae(e?.getLatestValueWithTs)&&e.getLatestValueWithTs}),{fetchTo:ae(e?.fetchTo)?e.fetchTo:en.METADATA,tellFailureIfAbsent:!!ae(e?.tellFailureIfAbsent)&&e.tellFailureIfAbsent,attributesControl:ae(e?.attributesControl)?e.attributesControl:null}}prepareOutputConfig(e){for(const t of Object.keys(e.attributesControl))e[t]=e.attributesControl[t];return delete e.attributesControl,e}}e("OriginatorAttributesConfigComponent",er),er.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:er,deps:[{token:P.Store},{token:Z.TranslateService},{token:R.FormBuilder}],target:t.ɵɵFactoryTarget.Component}),er.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:er,selector:"tb-enrichment-node-originator-attributes-config",usesInheritance:!0,ngImport:t,template:'<section class="tb-form-panel no-padding no-border" [formGroup]="originatorAttributesConfigForm">\n  <div class="tb-form-panel stroked">\n    <div class="tb-form-row no-padding no-border space-between">\n      <div class="tb-form-panel-title tb-required" translate>tb.rulenode.originator-attributes</div>\n      <div class="tb-form-panel-hint tb-error" translate\n           [hidden]="!(originatorAttributesConfigForm.get(\'attributesControl\').touched &&\n                        originatorAttributesConfigForm.get(\'attributesControl\').hasError(\'atLeastOneRequired\'))">\n        tb.rulenode.at-least-one-field-required\n      </div>\n    </div>\n    <tb-select-attributes formControlName="attributesControl"\n                          popupHelpLink="rulenode/originator_attributes_node_fields_templatization">\n    </tb-select-attributes>\n    <tb-msg-metadata-chip [labelText]="\'tb.rulenode.add-originator-attributes-to\' | translate"\n                          formControlName="fetchTo">\n    </tb-msg-metadata-chip>\n  </div>\n  <div tb-hint-tooltip-icon="{{ \'tb.rulenode.tell-failure-tooltip\' | translate }}" class="tb-form-row same-padding">\n    <mat-slide-toggle class="mat-slide margin" formControlName="tellFailureIfAbsent">\n      {{ \'tb.rulenode.tell-failure\' | translate }}\n    </mat-slide-toggle>\n  </div>\n</section>\n',styles:[':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n'],dependencies:[{kind:"component",type:te.MatSlideToggle,selector:"mat-slide-toggle",inputs:["disabled","disableRipple","color","tabIndex"],exportAs:["matSlideToggle"]},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"component",type:ne.HintTooltipIconComponent,selector:"[tb-hint-tooltip-icon]",inputs:["tb-hint-tooltip-icon","tooltipPosition","hintIcon"]},{kind:"component",type:Kn,selector:"tb-msg-metadata-chip",inputs:["labelText","translation"]},{kind:"component",type:Hn,selector:"tb-select-attributes",inputs:["popupHelpLink"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:er,decorators:[{type:n,args:[{selector:"tb-enrichment-node-originator-attributes-config",template:'<section class="tb-form-panel no-padding no-border" [formGroup]="originatorAttributesConfigForm">\n  <div class="tb-form-panel stroked">\n    <div class="tb-form-row no-padding no-border space-between">\n      <div class="tb-form-panel-title tb-required" translate>tb.rulenode.originator-attributes</div>\n      <div class="tb-form-panel-hint tb-error" translate\n           [hidden]="!(originatorAttributesConfigForm.get(\'attributesControl\').touched &&\n                        originatorAttributesConfigForm.get(\'attributesControl\').hasError(\'atLeastOneRequired\'))">\n        tb.rulenode.at-least-one-field-required\n      </div>\n    </div>\n    <tb-select-attributes formControlName="attributesControl"\n                          popupHelpLink="rulenode/originator_attributes_node_fields_templatization">\n    </tb-select-attributes>\n    <tb-msg-metadata-chip [labelText]="\'tb.rulenode.add-originator-attributes-to\' | translate"\n                          formControlName="fetchTo">\n    </tb-msg-metadata-chip>\n  </div>\n  <div tb-hint-tooltip-icon="{{ \'tb.rulenode.tell-failure-tooltip\' | translate }}" class="tb-form-row same-padding">\n    <mat-slide-toggle class="mat-slide margin" formControlName="tellFailureIfAbsent">\n      {{ \'tb.rulenode.tell-failure\' | translate }}\n    </mat-slide-toggle>\n  </div>\n</section>\n',styles:[':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n']}]}],ctorParameters:function(){return[{type:P.Store},{type:Z.TranslateService},{type:R.FormBuilder}]}});class tr extends f{constructor(e,t,n){super(e),this.store=e,this.fb=t,this.translate=n,this.originatorFields=[];for(const e of kt)this.originatorFields.push({value:e.value,name:this.translate.instant(e.name)})}configForm(){return this.originatorFieldsConfigForm}prepareOutputConfig(e){return le(e)}prepareInputConfig(e){return{dataMapping:ae(e?.dataMapping)?e.dataMapping:null,ignoreNullStrings:ae(e?.ignoreNullStrings)?e.ignoreNullStrings:null,fetchTo:ae(e?.fetchTo)?e.fetchTo:en.METADATA}}onConfigurationSet(e){this.originatorFieldsConfigForm=this.fb.group({dataMapping:[e.dataMapping,[O.required]],ignoreNullStrings:[e.ignoreNullStrings,[]],fetchTo:[e.fetchTo,[]]})}}e("OriginatorFieldsConfigComponent",tr),tr.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:tr,deps:[{token:P.Store},{token:R.FormBuilder},{token:Z.TranslateService}],target:t.ɵɵFactoryTarget.Component}),tr.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:tr,selector:"tb-enrichment-node-originator-fields-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="originatorFieldsConfigForm" class="tb-form-panel no-padding no-border">\n  <tb-sv-map-config\n    required\n    [selectOptions]="originatorFields"\n    targetKeyPrefix="originator"\n    formControlName="dataMapping"\n    [requiredText]="\'tb.rulenode.attr-mapping-required\' | translate"\n    [labelText]="\'tb.rulenode.originator-fields-mapping\' | translate"\n    [selectText]="\'tb.rulenode.source-field\' | translate"\n    [selectRequiredText]="\'tb.rulenode.source-field-required\' | translate"\n    [valText]="\'tb.rulenode.target-key\' | translate"\n    [valRequiredText]="\'tb.rulenode.target-key-required\' | translate"\n    [hintText]="\'tb.rulenode.originator-fields-sv-map-hint\' | translate"\n    popupHelpLink="rulenode/originator_fields_node_fields_templatization">\n  </tb-sv-map-config>\n  <tb-msg-metadata-chip [labelText]="\'tb.rulenode.add-mapped-originator-fields-to\' | translate"\n                        formControlName="fetchTo">\n  </tb-msg-metadata-chip>\n  <div tb-hint-tooltip-icon="{{ \'tb.rulenode.skip-empty-fields-tooltip\' | translate }}" class="tb-form-row same-padding">\n    <mat-slide-toggle class="mat-slide margin" formControlName="ignoreNullStrings">\n      {{ \'tb.rulenode.skip-empty-fields\' | translate }}\n    </mat-slide-toggle>\n  </div>\n</section>\n',dependencies:[{kind:"component",type:te.MatSlideToggle,selector:"mat-slide-toggle",inputs:["disabled","disableRipple","color","tabIndex"],exportAs:["matSlideToggle"]},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"component",type:ne.HintTooltipIconComponent,selector:"[tb-hint-tooltip-icon]",inputs:["tb-hint-tooltip-icon","tooltipPosition","hintIcon"]},{kind:"component",type:Kn,selector:"tb-msg-metadata-chip",inputs:["labelText","translation"]},{kind:"component",type:zn,selector:"tb-sv-map-config",inputs:["selectOptions","disabled","labelText","requiredText","targetKeyPrefix","selectText","selectRequiredText","valText","valRequiredText","hintText","popupHelpLink","required"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:tr,decorators:[{type:n,args:[{selector:"tb-enrichment-node-originator-fields-config",template:'<section [formGroup]="originatorFieldsConfigForm" class="tb-form-panel no-padding no-border">\n  <tb-sv-map-config\n    required\n    [selectOptions]="originatorFields"\n    targetKeyPrefix="originator"\n    formControlName="dataMapping"\n    [requiredText]="\'tb.rulenode.attr-mapping-required\' | translate"\n    [labelText]="\'tb.rulenode.originator-fields-mapping\' | translate"\n    [selectText]="\'tb.rulenode.source-field\' | translate"\n    [selectRequiredText]="\'tb.rulenode.source-field-required\' | translate"\n    [valText]="\'tb.rulenode.target-key\' | translate"\n    [valRequiredText]="\'tb.rulenode.target-key-required\' | translate"\n    [hintText]="\'tb.rulenode.originator-fields-sv-map-hint\' | translate"\n    popupHelpLink="rulenode/originator_fields_node_fields_templatization">\n  </tb-sv-map-config>\n  <tb-msg-metadata-chip [labelText]="\'tb.rulenode.add-mapped-originator-fields-to\' | translate"\n                        formControlName="fetchTo">\n  </tb-msg-metadata-chip>\n  <div tb-hint-tooltip-icon="{{ \'tb.rulenode.skip-empty-fields-tooltip\' | translate }}" class="tb-form-row same-padding">\n    <mat-slide-toggle class="mat-slide margin" formControlName="ignoreNullStrings">\n      {{ \'tb.rulenode.skip-empty-fields\' | translate }}\n    </mat-slide-toggle>\n  </div>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.FormBuilder},{type:Z.TranslateService}]}});class nr extends f{constructor(e,t,n){super(e),this.store=e,this.fb=t,this.translate=n,this.DataToFetch=Pt,this.msgMetadataLabelTranslations=Ot,this.originatorFields=[],this.fetchToData=[];for(const e of Object.keys(kt))this.originatorFields.push({value:kt[e].value,name:this.translate.instant(kt[e].name)});for(const e of Rt.keys())this.fetchToData.push({value:e,name:this.translate.instant(Rt.get(e))})}configForm(){return this.relatedAttributesConfigForm}prepareOutputConfig(e){e.dataToFetch===Pt.FIELDS?(e.dataMapping=e.svMap,delete e.svMap):(e.dataMapping=e.kvMap,delete e.kvMap);const t={};if(e&&e.dataMapping)for(const n of Object.keys(e.dataMapping))t[n.trim()]=e.dataMapping[n];return e.dataMapping=t,delete e.svMap,delete e.kvMap,le(e)}prepareInputConfig(e){let t,n,r={[k.name.value]:`relatedEntity${this.translate.instant(k.name.name)}`},o={serialNumber:"sn"};return t=ae(e?.telemetry)?e.telemetry?Pt.LATEST_TELEMETRY:Pt.ATTRIBUTES:ae(e?.dataToFetch)?e.dataToFetch:Pt.ATTRIBUTES,n=ae(e?.attrMapping)?e.attrMapping:ae(e?.dataMapping)?e.dataMapping:null,t===Pt.FIELDS?r=n:o=n,{relationsQuery:ae(e?.relationsQuery)?e.relationsQuery:null,dataToFetch:t,svMap:r,kvMap:o,fetchTo:ae(e?.fetchTo)?e.fetchTo:en.METADATA}}selectTranslation(e,t){return this.relatedAttributesConfigForm.get("dataToFetch").value===Pt.LATEST_TELEMETRY?e:t}onConfigurationSet(e){this.relatedAttributesConfigForm=this.fb.group({relationsQuery:[e.relationsQuery,[O.required]],dataToFetch:[e.dataToFetch,[]],kvMap:[e.kvMap,[O.required]],svMap:[e.svMap,[O.required]],fetchTo:[e.fetchTo,[]]})}validatorTriggers(){return["dataToFetch"]}updateValidators(e){this.relatedAttributesConfigForm.get("dataToFetch").value===Pt.FIELDS?(this.relatedAttributesConfigForm.get("svMap").enable({emitEvent:!1}),this.relatedAttributesConfigForm.get("kvMap").disable({emitEvent:!1}),this.relatedAttributesConfigForm.get("svMap").updateValueAndValidity()):(this.relatedAttributesConfigForm.get("svMap").disable({emitEvent:!1}),this.relatedAttributesConfigForm.get("kvMap").enable({emitEvent:!1}),this.relatedAttributesConfigForm.get("kvMap").updateValueAndValidity())}}e("RelatedAttributesConfigComponent",nr),nr.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:nr,deps:[{token:P.Store},{token:R.FormBuilder},{token:Z.TranslateService}],target:t.ɵɵFactoryTarget.Component}),nr.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:nr,selector:"tb-enrichment-node-related-attributes-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="relatedAttributesConfigForm" class="tb-form-panel no-padding no-border">\n  <tb-relations-query-config\n    required\n    formControlName="relationsQuery">\n  </tb-relations-query-config>\n  <div class="tb-form-panel stroked">\n    <div class="tb-form-panel-title" translate>tb.rulenode.data-to-fetch</div>\n    <tb-toggle-select formControlName="dataToFetch" appearance="fill">\n      <tb-toggle-option *ngFor="let data of fetchToData" [value]="data.value">\n        {{ data.name }}\n      </tb-toggle-option>\n    </tb-toggle-select>\n    <tb-kv-map-config\n      [hidden]="relatedAttributesConfigForm.get(\'dataToFetch\').value === DataToFetch.FIELDS"\n      required\n      formControlName="kvMap"\n      [requiredText]="\'tb.rulenode.attr-mapping-required\' | translate"\n      [labelText]="selectTranslation(\'tb.rulenode.latest-telemetry-mapping\',\'tb.rulenode.attributes-mapping\') | translate"\n      [keyText]="selectTranslation(\'tb.rulenode.source-telemetry\',\'tb.rulenode.source-attribute\') | translate"\n      [keyRequiredText]="selectTranslation(\'tb.rulenode.source-telemetry-required\',\'tb.rulenode.source-attribute-required\') | translate"\n      [valText]="\'tb.rulenode.target-key\' | translate"\n      [valRequiredText]="\'tb.rulenode.target-key-required\' | translate"\n      [hintText]="\'tb.rulenode.kv-map-pattern-hint\' | translate"\n      popupHelpLink="rulenode/related_entity_data_node_fields_templatization">\n    </tb-kv-map-config>\n    <tb-sv-map-config\n      [hidden]="relatedAttributesConfigForm.get(\'dataToFetch\').value !== DataToFetch.FIELDS"\n      required\n      [labelText]="\'tb.rulenode.fields-mapping\' | translate"\n      targetKeyPrefix="relatedEntity"\n      [selectOptions]="originatorFields"\n      formControlName="svMap"\n      [requiredText]="\'tb.rulenode.attr-mapping-required\' | translate"\n      [selectText]="\'tb.rulenode.source-field\' | translate"\n      [selectRequiredText]="\'tb.rulenode.source-field-required\' | translate"\n      [valText]="\'tb.rulenode.target-key\' | translate"\n      [valRequiredText]="\'tb.rulenode.target-key-required\' | translate"\n      [hintText]="\'tb.rulenode.sv-map-hint\' | translate"\n      popupHelpLink="rulenode/related_entity_data_node_fields_templatization">\n    </tb-sv-map-config>\n    <tb-msg-metadata-chip formControlName="fetchTo"\n                          [labelText]="msgMetadataLabelTranslations.get(relatedAttributesConfigForm.get(\'dataToFetch\').value) | translate">\n    </tb-msg-metadata-chip>\n  </div>\n</section>\n',styles:[':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n'],dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"directive",type:Fe.ToggleOption,selector:"tb-toggle-option",inputs:["value"]},{kind:"component",type:ke.ToggleSelectComponent,selector:"tb-toggle-select",inputs:["disabled","selectMediaBreakpoint","appearance","disablePagination"]},{kind:"component",type:Mn,selector:"tb-kv-map-config",inputs:["disabled","uniqueKeyValuePairValidator","labelText","requiredText","keyText","keyRequiredText","valText","valRequiredText","hintText","popupHelpLink","required"]},{kind:"component",type:Gn,selector:"tb-relations-query-config",inputs:["disabled","required"]},{kind:"component",type:Kn,selector:"tb-msg-metadata-chip",inputs:["labelText","translation"]},{kind:"component",type:zn,selector:"tb-sv-map-config",inputs:["selectOptions","disabled","labelText","requiredText","targetKeyPrefix","selectText","selectRequiredText","valText","valRequiredText","hintText","popupHelpLink","required"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:nr,decorators:[{type:n,args:[{selector:"tb-enrichment-node-related-attributes-config",template:'<section [formGroup]="relatedAttributesConfigForm" class="tb-form-panel no-padding no-border">\n  <tb-relations-query-config\n    required\n    formControlName="relationsQuery">\n  </tb-relations-query-config>\n  <div class="tb-form-panel stroked">\n    <div class="tb-form-panel-title" translate>tb.rulenode.data-to-fetch</div>\n    <tb-toggle-select formControlName="dataToFetch" appearance="fill">\n      <tb-toggle-option *ngFor="let data of fetchToData" [value]="data.value">\n        {{ data.name }}\n      </tb-toggle-option>\n    </tb-toggle-select>\n    <tb-kv-map-config\n      [hidden]="relatedAttributesConfigForm.get(\'dataToFetch\').value === DataToFetch.FIELDS"\n      required\n      formControlName="kvMap"\n      [requiredText]="\'tb.rulenode.attr-mapping-required\' | translate"\n      [labelText]="selectTranslation(\'tb.rulenode.latest-telemetry-mapping\',\'tb.rulenode.attributes-mapping\') | translate"\n      [keyText]="selectTranslation(\'tb.rulenode.source-telemetry\',\'tb.rulenode.source-attribute\') | translate"\n      [keyRequiredText]="selectTranslation(\'tb.rulenode.source-telemetry-required\',\'tb.rulenode.source-attribute-required\') | translate"\n      [valText]="\'tb.rulenode.target-key\' | translate"\n      [valRequiredText]="\'tb.rulenode.target-key-required\' | translate"\n      [hintText]="\'tb.rulenode.kv-map-pattern-hint\' | translate"\n      popupHelpLink="rulenode/related_entity_data_node_fields_templatization">\n    </tb-kv-map-config>\n    <tb-sv-map-config\n      [hidden]="relatedAttributesConfigForm.get(\'dataToFetch\').value !== DataToFetch.FIELDS"\n      required\n      [labelText]="\'tb.rulenode.fields-mapping\' | translate"\n      targetKeyPrefix="relatedEntity"\n      [selectOptions]="originatorFields"\n      formControlName="svMap"\n      [requiredText]="\'tb.rulenode.attr-mapping-required\' | translate"\n      [selectText]="\'tb.rulenode.source-field\' | translate"\n      [selectRequiredText]="\'tb.rulenode.source-field-required\' | translate"\n      [valText]="\'tb.rulenode.target-key\' | translate"\n      [valRequiredText]="\'tb.rulenode.target-key-required\' | translate"\n      [hintText]="\'tb.rulenode.sv-map-hint\' | translate"\n      popupHelpLink="rulenode/related_entity_data_node_fields_templatization">\n    </tb-sv-map-config>\n    <tb-msg-metadata-chip formControlName="fetchTo"\n                          [labelText]="msgMetadataLabelTranslations.get(relatedAttributesConfigForm.get(\'dataToFetch\').value) | translate">\n    </tb-msg-metadata-chip>\n  </div>\n</section>\n',styles:[':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n']}]}],ctorParameters:function(){return[{type:P.Store},{type:R.FormBuilder},{type:Z.TranslateService}]}});class rr extends f{constructor(e,t,n){super(e),this.store=e,this.fb=t,this.translate=n,this.fetchToData=[],this.DataToFetch=Pt;for(const e of Rt.keys())e!==Pt.FIELDS&&this.fetchToData.push({value:e,name:this.translate.instant(Rt.get(e))})}configForm(){return this.tenantAttributesConfigForm}prepareInputConfig(e){let t,n;return t=ae(e?.telemetry)?e.telemetry?Pt.LATEST_TELEMETRY:Pt.ATTRIBUTES:ae(e?.dataToFetch)?e.dataToFetch:Pt.ATTRIBUTES,n=ae(e?.attrMapping)?e.attrMapping:ae(e?.dataMapping)?e.dataMapping:null,{dataToFetch:t,dataMapping:n,fetchTo:ae(e?.fetchTo)?e.fetchTo:en.METADATA}}selectTranslation(e,t){return this.tenantAttributesConfigForm.get("dataToFetch").value===Pt.LATEST_TELEMETRY?e:t}onConfigurationSet(e){this.tenantAttributesConfigForm=this.fb.group({dataToFetch:[e.dataToFetch,[]],dataMapping:[e.dataMapping,[O.required]],fetchTo:[e.fetchTo,[]]})}}e("TenantAttributesConfigComponent",rr),rr.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:rr,deps:[{token:P.Store},{token:R.FormBuilder},{token:Z.TranslateService}],target:t.ɵɵFactoryTarget.Component}),rr.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:rr,selector:"tb-enrichment-node-tenant-attributes-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="tenantAttributesConfigForm" class="tb-form-panel stroked">\n  <div class="tb-form-panel-title" translate>tb.rulenode.mapping-of-tenant</div>\n  <div fxFlex fxLayoutAlign="center center">\n    <div class="fetch-to-data-toggle">\n      <tb-toggle-select class="fetch-to-data-toggle" formControlName="dataToFetch" appearance="fill">\n        <tb-toggle-option *ngFor="let data of fetchToData" [value]="data.value">\n          {{ data.name }}\n        </tb-toggle-option>\n      </tb-toggle-select>\n    </div>\n  </div>\n  <tb-kv-map-config\n    required\n    formControlName="dataMapping"\n    [requiredText]="\'tb.rulenode.attr-mapping-required\' | translate"\n    [labelText]="selectTranslation(\'tb.rulenode.latest-telemetry-mapping\', \'tb.rulenode.attributes-mapping\') | translate"\n    [keyText]="selectTranslation(\'tb.rulenode.source-telemetry\', \'tb.rulenode.source-attribute\') | translate"\n    [keyRequiredText]="selectTranslation(\'tb.rulenode.source-telemetry-required\', \'tb.rulenode.source-attribute-required\') | translate"\n    [valText]="\'tb.rulenode.target-key\' | translate"\n    [valRequiredText]="\'tb.rulenode.target-key-required\' | translate"\n    [hintText]="\'tb.rulenode.kv-map-pattern-hint\' | translate"\n    popupHelpLink="rulenode/tenant_attributes_node_fields_templatization">\n  </tb-kv-map-config>\n  <tb-msg-metadata-chip formControlName="fetchTo"\n                        [labelText]="tenantAttributesConfigForm.get(\'dataToFetch\').value === DataToFetch.LATEST_TELEMETRY ?\n                        (\'tb.rulenode.add-mapped-latest-telemetry-to\' | translate) : (\'tb.rulenode.add-mapped-attribute-to\' | translate)">\n  </tb-msg-metadata-chip>\n</section>\n',styles:[":host .fetch-to-data-toggle{max-width:420px;width:100%}\n"],dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"directive",type:W.DefaultLayoutAlignDirective,selector:"  [fxLayoutAlign], [fxLayoutAlign.xs], [fxLayoutAlign.sm], [fxLayoutAlign.md],  [fxLayoutAlign.lg], [fxLayoutAlign.xl], [fxLayoutAlign.lt-sm], [fxLayoutAlign.lt-md],  [fxLayoutAlign.lt-lg], [fxLayoutAlign.lt-xl], [fxLayoutAlign.gt-xs], [fxLayoutAlign.gt-sm],  [fxLayoutAlign.gt-md], [fxLayoutAlign.gt-lg]",inputs:["fxLayoutAlign","fxLayoutAlign.xs","fxLayoutAlign.sm","fxLayoutAlign.md","fxLayoutAlign.lg","fxLayoutAlign.xl","fxLayoutAlign.lt-sm","fxLayoutAlign.lt-md","fxLayoutAlign.lt-lg","fxLayoutAlign.lt-xl","fxLayoutAlign.gt-xs","fxLayoutAlign.gt-sm","fxLayoutAlign.gt-md","fxLayoutAlign.gt-lg"]},{kind:"directive",type:W.DefaultFlexDirective,selector:"  [fxFlex], [fxFlex.xs], [fxFlex.sm], [fxFlex.md],  [fxFlex.lg], [fxFlex.xl], [fxFlex.lt-sm], [fxFlex.lt-md],  [fxFlex.lt-lg], [fxFlex.lt-xl], [fxFlex.gt-xs], [fxFlex.gt-sm],  [fxFlex.gt-md], [fxFlex.gt-lg]",inputs:["fxFlex","fxFlex.xs","fxFlex.sm","fxFlex.md","fxFlex.lg","fxFlex.xl","fxFlex.lt-sm","fxFlex.lt-md","fxFlex.lt-lg","fxFlex.lt-xl","fxFlex.gt-xs","fxFlex.gt-sm","fxFlex.gt-md","fxFlex.gt-lg"]},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"directive",type:Fe.ToggleOption,selector:"tb-toggle-option",inputs:["value"]},{kind:"component",type:ke.ToggleSelectComponent,selector:"tb-toggle-select",inputs:["disabled","selectMediaBreakpoint","appearance","disablePagination"]},{kind:"component",type:Mn,selector:"tb-kv-map-config",inputs:["disabled","uniqueKeyValuePairValidator","labelText","requiredText","keyText","keyRequiredText","valText","valRequiredText","hintText","popupHelpLink","required"]},{kind:"component",type:Kn,selector:"tb-msg-metadata-chip",inputs:["labelText","translation"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:rr,decorators:[{type:n,args:[{selector:"tb-enrichment-node-tenant-attributes-config",template:'<section [formGroup]="tenantAttributesConfigForm" class="tb-form-panel stroked">\n  <div class="tb-form-panel-title" translate>tb.rulenode.mapping-of-tenant</div>\n  <div fxFlex fxLayoutAlign="center center">\n    <div class="fetch-to-data-toggle">\n      <tb-toggle-select class="fetch-to-data-toggle" formControlName="dataToFetch" appearance="fill">\n        <tb-toggle-option *ngFor="let data of fetchToData" [value]="data.value">\n          {{ data.name }}\n        </tb-toggle-option>\n      </tb-toggle-select>\n    </div>\n  </div>\n  <tb-kv-map-config\n    required\n    formControlName="dataMapping"\n    [requiredText]="\'tb.rulenode.attr-mapping-required\' | translate"\n    [labelText]="selectTranslation(\'tb.rulenode.latest-telemetry-mapping\', \'tb.rulenode.attributes-mapping\') | translate"\n    [keyText]="selectTranslation(\'tb.rulenode.source-telemetry\', \'tb.rulenode.source-attribute\') | translate"\n    [keyRequiredText]="selectTranslation(\'tb.rulenode.source-telemetry-required\', \'tb.rulenode.source-attribute-required\') | translate"\n    [valText]="\'tb.rulenode.target-key\' | translate"\n    [valRequiredText]="\'tb.rulenode.target-key-required\' | translate"\n    [hintText]="\'tb.rulenode.kv-map-pattern-hint\' | translate"\n    popupHelpLink="rulenode/tenant_attributes_node_fields_templatization">\n  </tb-kv-map-config>\n  <tb-msg-metadata-chip formControlName="fetchTo"\n                        [labelText]="tenantAttributesConfigForm.get(\'dataToFetch\').value === DataToFetch.LATEST_TELEMETRY ?\n                        (\'tb.rulenode.add-mapped-latest-telemetry-to\' | translate) : (\'tb.rulenode.add-mapped-attribute-to\' | translate)">\n  </tb-msg-metadata-chip>\n</section>\n',styles:[":host .fetch-to-data-toggle{max-width:420px;width:100%}\n"]}]}],ctorParameters:function(){return[{type:P.Store},{type:R.FormBuilder},{type:Z.TranslateService}]}});class or extends f{constructor(e,t){super(e),this.store=e,this.fb=t}configForm(){return this.fetchDeviceCredentialsConfigForm}prepareInputConfig(e){return{fetchTo:ae(e?.fetchTo)?e.fetchTo:en.METADATA}}onConfigurationSet(e){this.fetchDeviceCredentialsConfigForm=this.fb.group({fetchTo:[e.fetchTo,[]]})}}e("FetchDeviceCredentialsConfigComponent",or),or.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:or,deps:[{token:P.Store},{token:R.FormBuilder}],target:t.ɵɵFactoryTarget.Component}),or.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:or,selector:"./tb-enrichment-node-fetch-device-credentials-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="fetchDeviceCredentialsConfigForm">\n  <tb-msg-metadata-chip\n    [labelText]="\'tb.rulenode.fetch-credentials-to\' | translate"\n    formControlName="fetchTo">\n  </tb-msg-metadata-chip>\n</section>\n',dependencies:[{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"component",type:Kn,selector:"tb-msg-metadata-chip",inputs:["labelText","translation"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:or,decorators:[{type:n,args:[{selector:"./tb-enrichment-node-fetch-device-credentials-config",template:'<section [formGroup]="fetchDeviceCredentialsConfigForm">\n  <tb-msg-metadata-chip\n    [labelText]="\'tb.rulenode.fetch-credentials-to\' | translate"\n    formControlName="fetchTo">\n  </tb-msg-metadata-chip>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.FormBuilder}]}});class ar{}e("RulenodeCoreConfigEnrichmentModule",ar),ar.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:ar,deps:[],target:t.ɵɵFactoryTarget.NgModule}),ar.ɵmod=t.ɵɵngDeclareNgModule({minVersion:"14.0.0",version:"15.2.10",ngImport:t,type:ar,declarations:[Yn,Zn,Wn,er,tr,Xn,nr,rr,Jn,or],imports:[$,M,$n],exports:[Yn,Zn,Wn,er,tr,Xn,nr,rr,Jn,or]}),ar.ɵinj=t.ɵɵngDeclareInjector({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:ar,imports:[$,M,$n]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:ar,decorators:[{type:c,args:[{declarations:[Yn,Zn,Wn,er,tr,Xn,nr,rr,Jn,or],imports:[$,M,$n],exports:[Yn,Zn,Wn,er,tr,Xn,nr,rr,Jn,or]}]}]});class ir extends f{constructor(e,t){super(e),this.store=e,this.fb=t,this.allAzureIotHubCredentialsTypes=Ht,this.azureIotHubCredentialsTypeTranslationsMap=jt}configForm(){return this.azureIotHubConfigForm}onConfigurationSet(e){this.azureIotHubConfigForm=this.fb.group({topicPattern:[e?e.topicPattern:null,[O.required]],host:[e?e.host:null,[O.required]],port:[e?e.port:null,[O.required,O.min(1),O.max(65535)]],connectTimeoutSec:[e?e.connectTimeoutSec:null,[O.required,O.min(1),O.max(200)]],clientId:[e?e.clientId:null,[O.required]],cleanSession:[!!e&&e.cleanSession,[]],ssl:[!!e&&e.ssl,[]],credentials:this.fb.group({type:[e&&e.credentials?e.credentials.type:null,[O.required]],sasKey:[e&&e.credentials?e.credentials.sasKey:null,[]],caCert:[e&&e.credentials?e.credentials.caCert:null,[]],caCertFileName:[e&&e.credentials?e.credentials.caCertFileName:null,[]],privateKey:[e&&e.credentials?e.credentials.privateKey:null,[]],privateKeyFileName:[e&&e.credentials?e.credentials.privateKeyFileName:null,[]],cert:[e&&e.credentials?e.credentials.cert:null,[]],certFileName:[e&&e.credentials?e.credentials.certFileName:null,[]],password:[e&&e.credentials?e.credentials.password:null,[]]})})}prepareOutputConfig(e){const t=e.credentials.type;return"sas"===t&&(e.credentials={type:t,sasKey:e.credentials.sasKey,caCert:e.credentials.caCert,caCertFileName:e.credentials.caCertFileName}),e}validatorTriggers(){return["credentials.type"]}updateValidators(e){const t=this.azureIotHubConfigForm.get("credentials"),n=t.get("type").value;switch(e&&t.reset({type:n},{emitEvent:!1}),t.get("sasKey").setValidators([]),t.get("privateKey").setValidators([]),t.get("privateKeyFileName").setValidators([]),t.get("cert").setValidators([]),t.get("certFileName").setValidators([]),n){case"sas":t.get("sasKey").setValidators([O.required]);break;case"cert.PEM":t.get("privateKey").setValidators([O.required]),t.get("privateKeyFileName").setValidators([O.required]),t.get("cert").setValidators([O.required]),t.get("certFileName").setValidators([O.required])}t.get("sasKey").updateValueAndValidity({emitEvent:e}),t.get("privateKey").updateValueAndValidity({emitEvent:e}),t.get("privateKeyFileName").updateValueAndValidity({emitEvent:e}),t.get("cert").updateValueAndValidity({emitEvent:e}),t.get("certFileName").updateValueAndValidity({emitEvent:e})}}e("AzureIotHubConfigComponent",ir),ir.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:ir,deps:[{token:P.Store},{token:R.UntypedFormBuilder}],target:t.ɵɵFactoryTarget.Component}),ir.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:ir,selector:"tb-external-node-azure-iot-hub-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="azureIotHubConfigForm" fxLayout="column">\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.topic</mat-label>\n    <input required matInput formControlName="topicPattern">\n    <mat-error *ngIf="azureIotHubConfigForm.get(\'topicPattern\').hasError(\'required\')">\n      {{ \'tb.rulenode.topic-required\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.hostname</mat-label>\n    <input required matInput formControlName="host">\n    <mat-error *ngIf="azureIotHubConfigForm.get(\'host\').hasError(\'required\')">\n      {{ \'tb.rulenode.hostname-required\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.device-id</mat-label>\n    <input required matInput formControlName="clientId" autocomplete="new-clientId">\n    <mat-error *ngIf="azureIotHubConfigForm.get(\'clientId\').hasError(\'required\')">\n      {{ \'tb.rulenode.device-id-required\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <mat-accordion>\n    <mat-expansion-panel class="tb-mqtt-credentials-panel-group">\n      <mat-expansion-panel-header>\n        <mat-panel-title class="tb-required" translate>tb.rulenode.credentials</mat-panel-title>\n        <mat-panel-description>\n          {{ azureIotHubCredentialsTypeTranslationsMap.get(azureIotHubConfigForm.get(\'credentials.type\').value) | translate }}\n        </mat-panel-description>\n      </mat-expansion-panel-header>\n      <section formGroupName="credentials" fxLayout="column">\n        <mat-form-field class="mat-block">\n          <mat-label translate>tb.rulenode.credentials-type</mat-label>\n          <mat-select formControlName="type" required>\n            <mat-option *ngFor="let credentialsType of allAzureIotHubCredentialsTypes" [value]="credentialsType">\n              {{ azureIotHubCredentialsTypeTranslationsMap.get(credentialsType) | translate }}\n            </mat-option>\n          </mat-select>\n          <mat-error *ngIf="azureIotHubConfigForm.get(\'credentials.type\').hasError(\'required\')">\n            {{ \'tb.rulenode.credentials-type-required\' | translate }}\n          </mat-error>\n        </mat-form-field>\n        <section fxLayout="column" [ngSwitch]="azureIotHubConfigForm.get(\'credentials.type\').value">\n          <ng-template ngSwitchCase="anonymous">\n          </ng-template>\n          <ng-template ngSwitchCase="sas">\n            <mat-form-field class="mat-block">\n              <mat-label translate>tb.rulenode.sas-key</mat-label>\n              <input type="password" required matInput formControlName="sasKey" autocomplete="new-password">\n              <tb-toggle-password matSuffix></tb-toggle-password>\n              <mat-error *ngIf="azureIotHubConfigForm.get(\'credentials.sasKey\').hasError(\'required\')">\n                {{ \'tb.rulenode.sas-key-required\' | translate }}\n              </mat-error>\n            </mat-form-field>\n            <tb-file-input formControlName="caCert"\n                           inputId="caCertSelect"\n                           [existingFileName]="azureIotHubConfigForm.get(\'credentials.caCertFileName\').value"\n                           (fileNameChanged)="azureIotHubConfigForm.get(\'credentials.caCertFileName\').setValue($event)"\n                           label="{{\'tb.rulenode.azure-ca-cert\' | translate}}"\n                           noFileText="tb.rulenode.no-file"\n                           dropLabel="{{\'tb.rulenode.drop-file\' | translate}}">\n            </tb-file-input>\n          </ng-template>\n          <ng-template ngSwitchCase="cert.PEM">\n            <tb-file-input formControlName="caCert"\n                           inputId="caCertSelect"\n                           [existingFileName]="azureIotHubConfigForm.get(\'credentials.caCertFileName\').value"\n                           (fileNameChanged)="azureIotHubConfigForm.get(\'credentials.caCertFileName\').setValue($event)"\n                           label="{{\'tb.rulenode.azure-ca-cert\' | translate}}"\n                           noFileText="tb.rulenode.no-file"\n                           dropLabel="{{\'tb.rulenode.drop-file\' | translate}}">\n            </tb-file-input>\n            <tb-file-input formControlName="cert"\n                           inputId="CertSelect"\n                           [existingFileName]="azureIotHubConfigForm.get(\'credentials.certFileName\').value"\n                           (fileNameChanged)="azureIotHubConfigForm.get(\'credentials.certFileName\').setValue($event)"\n                           required\n                           requiredAsError\n                           label="{{\'tb.rulenode.cert\' | translate}}"\n                           noFileText="tb.rulenode.no-file"\n                           dropLabel="{{\'tb.rulenode.drop-file\' | translate}}">\n            </tb-file-input>\n            <tb-file-input style="padding-bottom: 8px;"\n                           formControlName="privateKey"\n                           inputId="privateKeySelect"\n                           [existingFileName]="azureIotHubConfigForm.get(\'credentials.privateKeyFileName\').value"\n                           (fileNameChanged)="azureIotHubConfigForm.get(\'credentials.privateKeyFileName\').setValue($event)"\n                           required\n                           requiredAsError\n                           label="{{\'tb.rulenode.private-key\' | translate}}"\n                           noFileText="tb.rulenode.no-file"\n                           dropLabel="{{\'tb.rulenode.drop-file\' | translate}}">\n            </tb-file-input>\n            <mat-form-field class="mat-block">\n              <mat-label translate>tb.rulenode.private-key-password</mat-label>\n              <input type="password" matInput formControlName="password" autocomplete="new-password">\n              <tb-toggle-password matSuffix></tb-toggle-password>\n            </mat-form-field>\n          </ng-template>\n        </section>\n      </section>\n    </mat-expansion-panel>\n  </mat-accordion>\n</section>\n',styles:[":host .tb-mqtt-credentials-panel-group{margin:0 6px}\n",':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n'],dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"directive",type:H.NgSwitch,selector:"[ngSwitch]",inputs:["ngSwitch"]},{kind:"directive",type:H.NgSwitchCase,selector:"[ngSwitchCase]",inputs:["ngSwitchCase"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatHint,selector:"mat-hint",inputs:["align","id"]},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"directive",type:Y.MatSuffix,selector:"[matSuffix], [matIconSuffix], [matTextSuffix]",inputs:["matTextSuffix"]},{kind:"component",type:X.MatSelect,selector:"mat-select",inputs:["disabled","disableRipple","tabIndex","hideSingleSelectionIndicator"],exportAs:["matSelect"]},{kind:"component",type:ee.MatOption,selector:"mat-option",exportAs:["matOption"]},{kind:"directive",type:We.MatAccordion,selector:"mat-accordion",inputs:["multi","hideToggle","displayMode","togglePosition"],exportAs:["matAccordion"]},{kind:"component",type:We.MatExpansionPanel,selector:"mat-expansion-panel",inputs:["disabled","expanded","hideToggle","togglePosition"],outputs:["opened","closed","expandedChange","afterExpand","afterCollapse"],exportAs:["matExpansionPanel"]},{kind:"component",type:We.MatExpansionPanelHeader,selector:"mat-expansion-panel-header",inputs:["tabIndex","expandedHeight","collapsedHeight"]},{kind:"directive",type:We.MatExpansionPanelTitle,selector:"mat-panel-title"},{kind:"directive",type:We.MatExpansionPanelDescription,selector:"mat-panel-description"},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:R.FormGroupName,selector:"[formGroupName]",inputs:["formGroupName"]},{kind:"component",type:Ze.FileInputComponent,selector:"tb-file-input",inputs:["label","hint","accept","noFileText","inputId","allowedExtensions","dropLabel","maxSizeByte","contentConvertFunction","required","requiredAsError","disabled","existingFileName","readAsBinary","workFromFileObj","multipleFile"],outputs:["fileNameChanged"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"component",type:Xe.TogglePasswordComponent,selector:"tb-toggle-password"},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:ir,decorators:[{type:n,args:[{selector:"tb-external-node-azure-iot-hub-config",template:'<section [formGroup]="azureIotHubConfigForm" fxLayout="column">\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.topic</mat-label>\n    <input required matInput formControlName="topicPattern">\n    <mat-error *ngIf="azureIotHubConfigForm.get(\'topicPattern\').hasError(\'required\')">\n      {{ \'tb.rulenode.topic-required\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.hostname</mat-label>\n    <input required matInput formControlName="host">\n    <mat-error *ngIf="azureIotHubConfigForm.get(\'host\').hasError(\'required\')">\n      {{ \'tb.rulenode.hostname-required\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.device-id</mat-label>\n    <input required matInput formControlName="clientId" autocomplete="new-clientId">\n    <mat-error *ngIf="azureIotHubConfigForm.get(\'clientId\').hasError(\'required\')">\n      {{ \'tb.rulenode.device-id-required\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <mat-accordion>\n    <mat-expansion-panel class="tb-mqtt-credentials-panel-group">\n      <mat-expansion-panel-header>\n        <mat-panel-title class="tb-required" translate>tb.rulenode.credentials</mat-panel-title>\n        <mat-panel-description>\n          {{ azureIotHubCredentialsTypeTranslationsMap.get(azureIotHubConfigForm.get(\'credentials.type\').value) | translate }}\n        </mat-panel-description>\n      </mat-expansion-panel-header>\n      <section formGroupName="credentials" fxLayout="column">\n        <mat-form-field class="mat-block">\n          <mat-label translate>tb.rulenode.credentials-type</mat-label>\n          <mat-select formControlName="type" required>\n            <mat-option *ngFor="let credentialsType of allAzureIotHubCredentialsTypes" [value]="credentialsType">\n              {{ azureIotHubCredentialsTypeTranslationsMap.get(credentialsType) | translate }}\n            </mat-option>\n          </mat-select>\n          <mat-error *ngIf="azureIotHubConfigForm.get(\'credentials.type\').hasError(\'required\')">\n            {{ \'tb.rulenode.credentials-type-required\' | translate }}\n          </mat-error>\n        </mat-form-field>\n        <section fxLayout="column" [ngSwitch]="azureIotHubConfigForm.get(\'credentials.type\').value">\n          <ng-template ngSwitchCase="anonymous">\n          </ng-template>\n          <ng-template ngSwitchCase="sas">\n            <mat-form-field class="mat-block">\n              <mat-label translate>tb.rulenode.sas-key</mat-label>\n              <input type="password" required matInput formControlName="sasKey" autocomplete="new-password">\n              <tb-toggle-password matSuffix></tb-toggle-password>\n              <mat-error *ngIf="azureIotHubConfigForm.get(\'credentials.sasKey\').hasError(\'required\')">\n                {{ \'tb.rulenode.sas-key-required\' | translate }}\n              </mat-error>\n            </mat-form-field>\n            <tb-file-input formControlName="caCert"\n                           inputId="caCertSelect"\n                           [existingFileName]="azureIotHubConfigForm.get(\'credentials.caCertFileName\').value"\n                           (fileNameChanged)="azureIotHubConfigForm.get(\'credentials.caCertFileName\').setValue($event)"\n                           label="{{\'tb.rulenode.azure-ca-cert\' | translate}}"\n                           noFileText="tb.rulenode.no-file"\n                           dropLabel="{{\'tb.rulenode.drop-file\' | translate}}">\n            </tb-file-input>\n          </ng-template>\n          <ng-template ngSwitchCase="cert.PEM">\n            <tb-file-input formControlName="caCert"\n                           inputId="caCertSelect"\n                           [existingFileName]="azureIotHubConfigForm.get(\'credentials.caCertFileName\').value"\n                           (fileNameChanged)="azureIotHubConfigForm.get(\'credentials.caCertFileName\').setValue($event)"\n                           label="{{\'tb.rulenode.azure-ca-cert\' | translate}}"\n                           noFileText="tb.rulenode.no-file"\n                           dropLabel="{{\'tb.rulenode.drop-file\' | translate}}">\n            </tb-file-input>\n            <tb-file-input formControlName="cert"\n                           inputId="CertSelect"\n                           [existingFileName]="azureIotHubConfigForm.get(\'credentials.certFileName\').value"\n                           (fileNameChanged)="azureIotHubConfigForm.get(\'credentials.certFileName\').setValue($event)"\n                           required\n                           requiredAsError\n                           label="{{\'tb.rulenode.cert\' | translate}}"\n                           noFileText="tb.rulenode.no-file"\n                           dropLabel="{{\'tb.rulenode.drop-file\' | translate}}">\n            </tb-file-input>\n            <tb-file-input style="padding-bottom: 8px;"\n                           formControlName="privateKey"\n                           inputId="privateKeySelect"\n                           [existingFileName]="azureIotHubConfigForm.get(\'credentials.privateKeyFileName\').value"\n                           (fileNameChanged)="azureIotHubConfigForm.get(\'credentials.privateKeyFileName\').setValue($event)"\n                           required\n                           requiredAsError\n                           label="{{\'tb.rulenode.private-key\' | translate}}"\n                           noFileText="tb.rulenode.no-file"\n                           dropLabel="{{\'tb.rulenode.drop-file\' | translate}}">\n            </tb-file-input>\n            <mat-form-field class="mat-block">\n              <mat-label translate>tb.rulenode.private-key-password</mat-label>\n              <input type="password" matInput formControlName="password" autocomplete="new-password">\n              <tb-toggle-password matSuffix></tb-toggle-password>\n            </mat-form-field>\n          </ng-template>\n        </section>\n      </section>\n    </mat-expansion-panel>\n  </mat-accordion>\n</section>\n',styles:[":host .tb-mqtt-credentials-panel-group{margin:0 6px}\n",':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n']}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder}]}});class lr extends f{constructor(e,t){super(e),this.store=e,this.fb=t,this.ackValues=["all","-1","0","1"],this.ToByteStandartCharsetTypesValues=Qt,this.ToByteStandartCharsetTypeTranslationMap=Jt}configForm(){return this.kafkaConfigForm}onConfigurationSet(e){this.kafkaConfigForm=this.fb.group({topicPattern:[e?e.topicPattern:null,[O.required]],keyPattern:[e?e.keyPattern:null],bootstrapServers:[e?e.bootstrapServers:null,[O.required]],retries:[e?e.retries:null,[O.min(0)]],batchSize:[e?e.batchSize:null,[O.min(0)]],linger:[e?e.linger:null,[O.min(0)]],bufferMemory:[e?e.bufferMemory:null,[O.min(0)]],acks:[e?e.acks:null,[O.required]],keySerializer:[e?e.keySerializer:null,[O.required]],valueSerializer:[e?e.valueSerializer:null,[O.required]],otherProperties:[e?e.otherProperties:null,[]],addMetadataKeyValuesAsKafkaHeaders:[!!e&&e.addMetadataKeyValuesAsKafkaHeaders,[]],kafkaHeadersCharset:[e?e.kafkaHeadersCharset:null,[]]})}validatorTriggers(){return["addMetadataKeyValuesAsKafkaHeaders"]}updateValidators(e){this.kafkaConfigForm.get("addMetadataKeyValuesAsKafkaHeaders").value?this.kafkaConfigForm.get("kafkaHeadersCharset").setValidators([O.required]):this.kafkaConfigForm.get("kafkaHeadersCharset").setValidators([]),this.kafkaConfigForm.get("kafkaHeadersCharset").updateValueAndValidity({emitEvent:e})}}e("KafkaConfigComponent",lr),lr.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:lr,deps:[{token:P.Store},{token:R.UntypedFormBuilder}],target:t.ɵɵFactoryTarget.Component}),lr.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:lr,selector:"tb-external-node-kafka-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="kafkaConfigForm" fxLayout="column">\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.topic-pattern</mat-label>\n    <input required matInput formControlName="topicPattern">\n    <mat-error *ngIf="kafkaConfigForm.get(\'topicPattern\').hasError(\'required\')">\n      {{ \'tb.rulenode.topic-pattern-required\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n  </mat-form-field>\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.key-pattern</mat-label>\n    <input matInput formControlName="keyPattern">\n    <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n  </mat-form-field>\n  <div class="tb-hint" translate>tb.rulenode.key-pattern-hint</div>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.bootstrap-servers</mat-label>\n    <input required matInput formControlName="bootstrapServers">\n    <mat-error *ngIf="kafkaConfigForm.get(\'bootstrapServers\').hasError(\'required\')">\n      {{ \'tb.rulenode.bootstrap-servers-required\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.retries</mat-label>\n    <input type="number" step="1" min="0" matInput formControlName="retries">\n    <mat-error *ngIf="kafkaConfigForm.get(\'retries\').hasError(\'min\')">\n      {{ \'tb.rulenode.min-retries-message\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.batch-size-bytes</mat-label>\n    <input type="number" step="1" min="0" matInput formControlName="batchSize">\n    <mat-error *ngIf="kafkaConfigForm.get(\'batchSize\').hasError(\'min\')">\n      {{ \'tb.rulenode.min-batch-size-bytes-message\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.linger-ms</mat-label>\n    <input type="number" step="1" min="0" matInput formControlName="linger">\n    <mat-error *ngIf="kafkaConfigForm.get(\'linger\').hasError(\'min\')">\n      {{ \'tb.rulenode.min-linger-ms-message\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.buffer-memory-bytes</mat-label>\n    <input type="number" step="1" min="0" matInput formControlName="bufferMemory">\n    <mat-error *ngIf="kafkaConfigForm.get(\'bufferMemory\').hasError(\'min\')">\n      {{ \'tb.rulenode.min-buffer-memory-bytes-message\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.acks</mat-label>\n    <mat-select formControlName="acks" required>\n      <mat-option *ngFor="let ackValue of ackValues" [value]="ackValue">\n        {{ ackValue }}\n      </mat-option>\n    </mat-select>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.key-serializer</mat-label>\n    <input required matInput formControlName="keySerializer">\n    <mat-error *ngIf="kafkaConfigForm.get(\'keySerializer\').hasError(\'required\')">\n      {{ \'tb.rulenode.key-serializer-required\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.value-serializer</mat-label>\n    <input required matInput formControlName="valueSerializer">\n    <mat-error *ngIf="kafkaConfigForm.get(\'valueSerializer\').hasError(\'required\')">\n      {{ \'tb.rulenode.value-serializer-required\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <label translate class="tb-title">tb.rulenode.other-properties</label>\n  <tb-kv-map-config-old\n    required="false"\n    formControlName="otherProperties"\n    keyText="tb.rulenode.key"\n    keyRequiredText="tb.rulenode.key-required"\n    valText="tb.rulenode.value"\n    valRequiredText="tb.rulenode.value-required">\n  </tb-kv-map-config-old>\n  <mat-checkbox fxFlex formControlName="addMetadataKeyValuesAsKafkaHeaders">\n    {{ \'tb.rulenode.add-metadata-key-values-as-kafka-headers\' | translate }}\n  </mat-checkbox>\n  <div class="tb-hint" translate>tb.rulenode.add-metadata-key-values-as-kafka-headers-hint</div>\n  <mat-form-field fxFlex class="mat-block" *ngIf="kafkaConfigForm.get(\'addMetadataKeyValuesAsKafkaHeaders\').value">\n    <mat-label translate>tb.rulenode.charset-encoding</mat-label>\n    <mat-select formControlName="kafkaHeadersCharset" required>\n      <mat-option *ngFor="let charset of ToByteStandartCharsetTypesValues" [value]="charset">\n        {{ ToByteStandartCharsetTypeTranslationMap.get(charset) | translate }}\n      </mat-option>\n    </mat-select>\n  </mat-form-field>\n</section>\n',dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:Q.MatCheckbox,selector:"mat-checkbox",inputs:["disableRipple","color","tabIndex"],exportAs:["matCheckbox"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatHint,selector:"mat-hint",inputs:["align","id"]},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"component",type:X.MatSelect,selector:"mat-select",inputs:["disabled","disableRipple","tabIndex","hideSingleSelectionIndicator"],exportAs:["matSelect"]},{kind:"component",type:ee.MatOption,selector:"mat-option",exportAs:["matOption"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:W.DefaultFlexDirective,selector:"  [fxFlex], [fxFlex.xs], [fxFlex.sm], [fxFlex.md],  [fxFlex.lg], [fxFlex.xl], [fxFlex.lt-sm], [fxFlex.lt-md],  [fxFlex.lt-lg], [fxFlex.lt-xl], [fxFlex.gt-xs], [fxFlex.gt-sm],  [fxFlex.gt-md], [fxFlex.gt-lg]",inputs:["fxFlex","fxFlex.xs","fxFlex.sm","fxFlex.md","fxFlex.lg","fxFlex.xl","fxFlex.lt-sm","fxFlex.lt-md","fxFlex.lt-lg","fxFlex.lt-xl","fxFlex.gt-xs","fxFlex.gt-sm","fxFlex.gt-md","fxFlex.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NumberValueAccessor,selector:"input[type=number][formControlName],input[type=number][formControl],input[type=number][ngModel]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.MinValidator,selector:"input[type=number][min][formControlName],input[type=number][min][formControl],input[type=number][min][ngModel]",inputs:["min"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"component",type:Cn,selector:"tb-kv-map-config-old",inputs:["disabled","uniqueKeyValuePairValidator","requiredText","keyText","keyRequiredText","valText","valRequiredText","hintText","required"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:lr,decorators:[{type:n,args:[{selector:"tb-external-node-kafka-config",template:'<section [formGroup]="kafkaConfigForm" fxLayout="column">\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.topic-pattern</mat-label>\n    <input required matInput formControlName="topicPattern">\n    <mat-error *ngIf="kafkaConfigForm.get(\'topicPattern\').hasError(\'required\')">\n      {{ \'tb.rulenode.topic-pattern-required\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n  </mat-form-field>\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.key-pattern</mat-label>\n    <input matInput formControlName="keyPattern">\n    <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n  </mat-form-field>\n  <div class="tb-hint" translate>tb.rulenode.key-pattern-hint</div>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.bootstrap-servers</mat-label>\n    <input required matInput formControlName="bootstrapServers">\n    <mat-error *ngIf="kafkaConfigForm.get(\'bootstrapServers\').hasError(\'required\')">\n      {{ \'tb.rulenode.bootstrap-servers-required\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.retries</mat-label>\n    <input type="number" step="1" min="0" matInput formControlName="retries">\n    <mat-error *ngIf="kafkaConfigForm.get(\'retries\').hasError(\'min\')">\n      {{ \'tb.rulenode.min-retries-message\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.batch-size-bytes</mat-label>\n    <input type="number" step="1" min="0" matInput formControlName="batchSize">\n    <mat-error *ngIf="kafkaConfigForm.get(\'batchSize\').hasError(\'min\')">\n      {{ \'tb.rulenode.min-batch-size-bytes-message\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.linger-ms</mat-label>\n    <input type="number" step="1" min="0" matInput formControlName="linger">\n    <mat-error *ngIf="kafkaConfigForm.get(\'linger\').hasError(\'min\')">\n      {{ \'tb.rulenode.min-linger-ms-message\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.buffer-memory-bytes</mat-label>\n    <input type="number" step="1" min="0" matInput formControlName="bufferMemory">\n    <mat-error *ngIf="kafkaConfigForm.get(\'bufferMemory\').hasError(\'min\')">\n      {{ \'tb.rulenode.min-buffer-memory-bytes-message\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.acks</mat-label>\n    <mat-select formControlName="acks" required>\n      <mat-option *ngFor="let ackValue of ackValues" [value]="ackValue">\n        {{ ackValue }}\n      </mat-option>\n    </mat-select>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.key-serializer</mat-label>\n    <input required matInput formControlName="keySerializer">\n    <mat-error *ngIf="kafkaConfigForm.get(\'keySerializer\').hasError(\'required\')">\n      {{ \'tb.rulenode.key-serializer-required\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.value-serializer</mat-label>\n    <input required matInput formControlName="valueSerializer">\n    <mat-error *ngIf="kafkaConfigForm.get(\'valueSerializer\').hasError(\'required\')">\n      {{ \'tb.rulenode.value-serializer-required\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <label translate class="tb-title">tb.rulenode.other-properties</label>\n  <tb-kv-map-config-old\n    required="false"\n    formControlName="otherProperties"\n    keyText="tb.rulenode.key"\n    keyRequiredText="tb.rulenode.key-required"\n    valText="tb.rulenode.value"\n    valRequiredText="tb.rulenode.value-required">\n  </tb-kv-map-config-old>\n  <mat-checkbox fxFlex formControlName="addMetadataKeyValuesAsKafkaHeaders">\n    {{ \'tb.rulenode.add-metadata-key-values-as-kafka-headers\' | translate }}\n  </mat-checkbox>\n  <div class="tb-hint" translate>tb.rulenode.add-metadata-key-values-as-kafka-headers-hint</div>\n  <mat-form-field fxFlex class="mat-block" *ngIf="kafkaConfigForm.get(\'addMetadataKeyValuesAsKafkaHeaders\').value">\n    <mat-label translate>tb.rulenode.charset-encoding</mat-label>\n    <mat-select formControlName="kafkaHeadersCharset" required>\n      <mat-option *ngFor="let charset of ToByteStandartCharsetTypesValues" [value]="charset">\n        {{ ToByteStandartCharsetTypeTranslationMap.get(charset) | translate }}\n      </mat-option>\n    </mat-select>\n  </mat-form-field>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder}]}});class sr extends f{constructor(e,t){super(e),this.store=e,this.fb=t}configForm(){return this.mqttConfigForm}onConfigurationSet(e){this.mqttConfigForm=this.fb.group({topicPattern:[e?e.topicPattern:null,[O.required]],host:[e?e.host:null,[O.required]],port:[e?e.port:null,[O.required,O.min(1),O.max(65535)]],connectTimeoutSec:[e?e.connectTimeoutSec:null,[O.required,O.min(1),O.max(200)]],clientId:[e?e.clientId:null,[]],appendClientIdSuffix:[{value:!!e&&e.appendClientIdSuffix,disabled:!(e&&me(e.clientId))},[]],cleanSession:[!!e&&e.cleanSession,[]],retainedMessage:[!!e&&e.retainedMessage,[]],ssl:[!!e&&e.ssl,[]],credentials:[e?e.credentials:null,[]]})}updateValidators(e){me(this.mqttConfigForm.get("clientId").value)?this.mqttConfigForm.get("appendClientIdSuffix").enable({emitEvent:!1}):this.mqttConfigForm.get("appendClientIdSuffix").disable({emitEvent:!1}),this.mqttConfigForm.get("appendClientIdSuffix").updateValueAndValidity({emitEvent:e})}validatorTriggers(){return["clientId"]}}e("MqttConfigComponent",sr),sr.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:sr,deps:[{token:P.Store},{token:R.UntypedFormBuilder}],target:t.ɵɵFactoryTarget.Component}),sr.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:sr,selector:"tb-external-node-mqtt-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="mqttConfigForm" fxLayout="column">\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.topic-pattern</mat-label>\n    <input required matInput formControlName="topicPattern">\n    <mat-error *ngIf="mqttConfigForm.get(\'topicPattern\').hasError(\'required\')">\n      {{ \'tb.rulenode.topic-pattern-required\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n  </mat-form-field>\n  <div fxFlex fxLayout="column" fxLayout.gt-sm="row" fxLayoutGap.gt-sm="8px">\n    <mat-form-field fxFlex="60" class="mat-block">\n      <mat-label translate>tb.rulenode.host</mat-label>\n      <input required matInput formControlName="host">\n      <mat-error *ngIf="mqttConfigForm.get(\'host\').hasError(\'required\')">\n        {{ \'tb.rulenode.host-required\' | translate }}\n      </mat-error>\n    </mat-form-field>\n    <mat-form-field fxFlex="40" class="mat-block">\n      <mat-label translate>tb.rulenode.port</mat-label>\n      <input required type="number" step="1" min="1" max="65535" matInput formControlName="port">\n      <mat-error *ngIf="mqttConfigForm.get(\'port\').hasError(\'required\')">\n        {{ \'tb.rulenode.port-required\' | translate }}\n      </mat-error>\n      <mat-error *ngIf="mqttConfigForm.get(\'port\').hasError(\'min\')">\n        {{ \'tb.rulenode.port-range\' | translate }}\n      </mat-error>\n      <mat-error *ngIf="mqttConfigForm.get(\'port\').hasError(\'max\')">\n        {{ \'tb.rulenode.port-range\' | translate }}\n      </mat-error>\n    </mat-form-field>\n    <mat-form-field fxFlex="40" class="mat-block">\n      <mat-label translate>tb.rulenode.connect-timeout</mat-label>\n      <input required type="number" step="1" min="1" max="200" matInput formControlName="connectTimeoutSec">\n      <mat-error *ngIf="mqttConfigForm.get(\'connectTimeoutSec\').hasError(\'required\')">\n        {{ \'tb.rulenode.connect-timeout-required\' | translate }}\n      </mat-error>\n      <mat-error *ngIf="mqttConfigForm.get(\'connectTimeoutSec\').hasError(\'min\')">\n        {{ \'tb.rulenode.connect-timeout-range\' | translate }}\n      </mat-error>\n      <mat-error *ngIf="mqttConfigForm.get(\'connectTimeoutSec\').hasError(\'max\')">\n        {{ \'tb.rulenode.connect-timeout-range\' | translate }}\n      </mat-error>\n    </mat-form-field>\n  </div>\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.client-id</mat-label>\n    <input matInput formControlName="clientId">\n    <mat-hint>{{\'tb.rulenode.client-id-hint\' | translate}}</mat-hint>\n  </mat-form-field>\n  <mat-checkbox formControlName="appendClientIdSuffix">\n    {{ \'tb.rulenode.append-client-id-suffix\' | translate }}\n  </mat-checkbox>\n  <div class="tb-hint">{{ "tb.rulenode.client-id-suffix-hint" | translate }}</div>\n  <mat-checkbox formControlName="cleanSession">\n    {{ \'tb.rulenode.clean-session\' | translate }}\n  </mat-checkbox>\n  <mat-checkbox formControlName="retainedMessage">\n    {{ "tb.rulenode.retained-message" | translate }}\n  </mat-checkbox>\n  <mat-checkbox formControlName="ssl">\n    {{ \'tb.rulenode.enable-ssl\' | translate }}\n  </mat-checkbox>\n  <tb-credentials-config formControlName="credentials" [passwordFieldRequired]="false"></tb-credentials-config>\n</section>\n',styles:[":host .tb-mqtt-credentials-panel-group{margin:0 6px}\n"],dependencies:[{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:Q.MatCheckbox,selector:"mat-checkbox",inputs:["disableRipple","color","tabIndex"],exportAs:["matCheckbox"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatHint,selector:"mat-hint",inputs:["align","id"]},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:W.DefaultLayoutGapDirective,selector:"  [fxLayoutGap], [fxLayoutGap.xs], [fxLayoutGap.sm], [fxLayoutGap.md],  [fxLayoutGap.lg], [fxLayoutGap.xl], [fxLayoutGap.lt-sm], [fxLayoutGap.lt-md],  [fxLayoutGap.lt-lg], [fxLayoutGap.lt-xl], [fxLayoutGap.gt-xs], [fxLayoutGap.gt-sm],  [fxLayoutGap.gt-md], [fxLayoutGap.gt-lg]",inputs:["fxLayoutGap","fxLayoutGap.xs","fxLayoutGap.sm","fxLayoutGap.md","fxLayoutGap.lg","fxLayoutGap.xl","fxLayoutGap.lt-sm","fxLayoutGap.lt-md","fxLayoutGap.lt-lg","fxLayoutGap.lt-xl","fxLayoutGap.gt-xs","fxLayoutGap.gt-sm","fxLayoutGap.gt-md","fxLayoutGap.gt-lg"]},{kind:"directive",type:W.DefaultFlexDirective,selector:"  [fxFlex], [fxFlex.xs], [fxFlex.sm], [fxFlex.md],  [fxFlex.lg], [fxFlex.xl], [fxFlex.lt-sm], [fxFlex.lt-md],  [fxFlex.lt-lg], [fxFlex.lt-xl], [fxFlex.gt-xs], [fxFlex.gt-sm],  [fxFlex.gt-md], [fxFlex.gt-lg]",inputs:["fxFlex","fxFlex.xs","fxFlex.sm","fxFlex.md","fxFlex.lg","fxFlex.xl","fxFlex.lt-sm","fxFlex.lt-md","fxFlex.lt-lg","fxFlex.lt-xl","fxFlex.gt-xs","fxFlex.gt-sm","fxFlex.gt-md","fxFlex.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NumberValueAccessor,selector:"input[type=number][formControlName],input[type=number][formControl],input[type=number][ngModel]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.MinValidator,selector:"input[type=number][min][formControlName],input[type=number][min][formControl],input[type=number][min][ngModel]",inputs:["min"]},{kind:"directive",type:R.MaxValidator,selector:"input[type=number][max][formControlName],input[type=number][max][formControl],input[type=number][max][ngModel]",inputs:["max"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"component",type:wn,selector:"tb-credentials-config",inputs:["required","disableCertPemCredentials","passwordFieldRequired"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:sr,decorators:[{type:n,args:[{selector:"tb-external-node-mqtt-config",template:'<section [formGroup]="mqttConfigForm" fxLayout="column">\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.topic-pattern</mat-label>\n    <input required matInput formControlName="topicPattern">\n    <mat-error *ngIf="mqttConfigForm.get(\'topicPattern\').hasError(\'required\')">\n      {{ \'tb.rulenode.topic-pattern-required\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n  </mat-form-field>\n  <div fxFlex fxLayout="column" fxLayout.gt-sm="row" fxLayoutGap.gt-sm="8px">\n    <mat-form-field fxFlex="60" class="mat-block">\n      <mat-label translate>tb.rulenode.host</mat-label>\n      <input required matInput formControlName="host">\n      <mat-error *ngIf="mqttConfigForm.get(\'host\').hasError(\'required\')">\n        {{ \'tb.rulenode.host-required\' | translate }}\n      </mat-error>\n    </mat-form-field>\n    <mat-form-field fxFlex="40" class="mat-block">\n      <mat-label translate>tb.rulenode.port</mat-label>\n      <input required type="number" step="1" min="1" max="65535" matInput formControlName="port">\n      <mat-error *ngIf="mqttConfigForm.get(\'port\').hasError(\'required\')">\n        {{ \'tb.rulenode.port-required\' | translate }}\n      </mat-error>\n      <mat-error *ngIf="mqttConfigForm.get(\'port\').hasError(\'min\')">\n        {{ \'tb.rulenode.port-range\' | translate }}\n      </mat-error>\n      <mat-error *ngIf="mqttConfigForm.get(\'port\').hasError(\'max\')">\n        {{ \'tb.rulenode.port-range\' | translate }}\n      </mat-error>\n    </mat-form-field>\n    <mat-form-field fxFlex="40" class="mat-block">\n      <mat-label translate>tb.rulenode.connect-timeout</mat-label>\n      <input required type="number" step="1" min="1" max="200" matInput formControlName="connectTimeoutSec">\n      <mat-error *ngIf="mqttConfigForm.get(\'connectTimeoutSec\').hasError(\'required\')">\n        {{ \'tb.rulenode.connect-timeout-required\' | translate }}\n      </mat-error>\n      <mat-error *ngIf="mqttConfigForm.get(\'connectTimeoutSec\').hasError(\'min\')">\n        {{ \'tb.rulenode.connect-timeout-range\' | translate }}\n      </mat-error>\n      <mat-error *ngIf="mqttConfigForm.get(\'connectTimeoutSec\').hasError(\'max\')">\n        {{ \'tb.rulenode.connect-timeout-range\' | translate }}\n      </mat-error>\n    </mat-form-field>\n  </div>\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.client-id</mat-label>\n    <input matInput formControlName="clientId">\n    <mat-hint>{{\'tb.rulenode.client-id-hint\' | translate}}</mat-hint>\n  </mat-form-field>\n  <mat-checkbox formControlName="appendClientIdSuffix">\n    {{ \'tb.rulenode.append-client-id-suffix\' | translate }}\n  </mat-checkbox>\n  <div class="tb-hint">{{ "tb.rulenode.client-id-suffix-hint" | translate }}</div>\n  <mat-checkbox formControlName="cleanSession">\n    {{ \'tb.rulenode.clean-session\' | translate }}\n  </mat-checkbox>\n  <mat-checkbox formControlName="retainedMessage">\n    {{ "tb.rulenode.retained-message" | translate }}\n  </mat-checkbox>\n  <mat-checkbox formControlName="ssl">\n    {{ \'tb.rulenode.enable-ssl\' | translate }}\n  </mat-checkbox>\n  <tb-credentials-config formControlName="credentials" [passwordFieldRequired]="false"></tb-credentials-config>\n</section>\n',styles:[":host .tb-mqtt-credentials-panel-group{margin:0 6px}\n"]}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder}]}});class mr extends f{constructor(e,t){super(e),this.store=e,this.fb=t,this.notificationType=D,this.entityType=F}configForm(){return this.notificationConfigForm}onConfigurationSet(e){this.notificationConfigForm=this.fb.group({templateId:[e?e.templateId:null,[O.required]],targets:[e?e.targets:[],[O.required]]})}}e("NotificationConfigComponent",mr),mr.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:mr,deps:[{token:P.Store},{token:R.FormBuilder}],target:t.ɵɵFactoryTarget.Component}),mr.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:mr,selector:"tb-external-node-notification-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="notificationConfigForm" fxLayout="column">\n  <tb-template-autocomplete\n    required\n    allowCreate\n    formControlName="templateId"\n    [notificationTypes]="notificationType.RULE_NODE">\n  </tb-template-autocomplete>\n  <tb-entity-list\n    required\n    formControlName="targets"\n    labelText="{{ \'notification.recipients\' | translate }}"\n    placeholderText="{{ \'notification.recipient\' | translate }}"\n    requiredText="{{ \'notification.recipients-required\' | translate }}"\n    entityType="{{ entityType.NOTIFICATION_TARGET }}"\n    subType="{{ notificationType.RULE_NODE }}">\n  </tb-entity-list>\n</section>\n',dependencies:[{kind:"component",type:tt.EntityListComponent,selector:"tb-entity-list",inputs:["entityType","subType","labelText","placeholderText","requiredText","required","disabled","subscriptSizing","hint"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"component",type:nt.TemplateAutocompleteComponent,selector:"tb-template-autocomplete",inputs:["required","allowCreate","allowEdit","disabled","notificationTypes"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:mr,decorators:[{type:n,args:[{selector:"tb-external-node-notification-config",template:'<section [formGroup]="notificationConfigForm" fxLayout="column">\n  <tb-template-autocomplete\n    required\n    allowCreate\n    formControlName="templateId"\n    [notificationTypes]="notificationType.RULE_NODE">\n  </tb-template-autocomplete>\n  <tb-entity-list\n    required\n    formControlName="targets"\n    labelText="{{ \'notification.recipients\' | translate }}"\n    placeholderText="{{ \'notification.recipient\' | translate }}"\n    requiredText="{{ \'notification.recipients-required\' | translate }}"\n    entityType="{{ entityType.NOTIFICATION_TARGET }}"\n    subType="{{ notificationType.RULE_NODE }}">\n  </tb-entity-list>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.FormBuilder}]}});class pr extends f{constructor(e,t){super(e),this.store=e,this.fb=t}configForm(){return this.pubSubConfigForm}onConfigurationSet(e){this.pubSubConfigForm=this.fb.group({projectId:[e?e.projectId:null,[O.required]],topicName:[e?e.topicName:null,[O.required]],serviceAccountKey:[e?e.serviceAccountKey:null,[O.required]],serviceAccountKeyFileName:[e?e.serviceAccountKeyFileName:null,[O.required]],messageAttributes:[e?e.messageAttributes:null,[]]})}}e("PubSubConfigComponent",pr),pr.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:pr,deps:[{token:P.Store},{token:R.UntypedFormBuilder}],target:t.ɵɵFactoryTarget.Component}),pr.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:pr,selector:"tb-external-node-pub-sub-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="pubSubConfigForm" fxLayout="column">\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.gcp-project-id</mat-label>\n    <input required matInput formControlName="projectId">\n    <mat-error *ngIf="pubSubConfigForm.get(\'projectId\').hasError(\'required\')">\n      {{ \'tb.rulenode.gcp-project-id-required\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.pubsub-topic-name</mat-label>\n    <input required matInput formControlName="topicName">\n    <mat-error *ngIf="pubSubConfigForm.get(\'topicName\').hasError(\'required\')">\n      {{ \'tb.rulenode.pubsub-topic-name-required\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <tb-file-input style="padding-bottom: 24px;"\n                 formControlName="serviceAccountKey"\n                 [existingFileName]="pubSubConfigForm.get(\'serviceAccountKeyFileName\').value"\n                 (fileNameChanged)="pubSubConfigForm.get(\'serviceAccountKeyFileName\').setValue($event)"\n                 required\n                 requiredAsError\n                 label="{{\'tb.rulenode.gcp-service-account-key\' | translate}}"\n                 noFileText="tb.rulenode.no-file"\n                 dropLabel="{{\'tb.rulenode.drop-file\' | translate}}">\n  </tb-file-input>\n  <label translate class="tb-title">tb.rulenode.message-attributes</label>\n  <div class="tb-hint" [innerHTML]="\'tb.rulenode.message-attributes-hint\' | translate | safe: \'html\'"></div>\n  <tb-kv-map-config-old\n    required="false"\n    formControlName="messageAttributes"\n    keyText="tb.rulenode.name"\n    keyRequiredText="tb.rulenode.name-required"\n    valText="tb.rulenode.value"\n    valRequiredText="tb.rulenode.value-required">\n  </tb-kv-map-config-old>\n</section>\n',dependencies:[{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"component",type:Ze.FileInputComponent,selector:"tb-file-input",inputs:["label","hint","accept","noFileText","inputId","allowedExtensions","dropLabel","maxSizeByte","contentConvertFunction","required","requiredAsError","disabled","existingFileName","readAsBinary","workFromFileObj","multipleFile"],outputs:["fileNameChanged"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"component",type:Cn,selector:"tb-kv-map-config-old",inputs:["disabled","uniqueKeyValuePairValidator","requiredText","keyText","keyRequiredText","valText","valRequiredText","hintText","required"]},{kind:"pipe",type:he.SafePipe,name:"safe"},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:pr,decorators:[{type:n,args:[{selector:"tb-external-node-pub-sub-config",template:'<section [formGroup]="pubSubConfigForm" fxLayout="column">\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.gcp-project-id</mat-label>\n    <input required matInput formControlName="projectId">\n    <mat-error *ngIf="pubSubConfigForm.get(\'projectId\').hasError(\'required\')">\n      {{ \'tb.rulenode.gcp-project-id-required\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.pubsub-topic-name</mat-label>\n    <input required matInput formControlName="topicName">\n    <mat-error *ngIf="pubSubConfigForm.get(\'topicName\').hasError(\'required\')">\n      {{ \'tb.rulenode.pubsub-topic-name-required\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <tb-file-input style="padding-bottom: 24px;"\n                 formControlName="serviceAccountKey"\n                 [existingFileName]="pubSubConfigForm.get(\'serviceAccountKeyFileName\').value"\n                 (fileNameChanged)="pubSubConfigForm.get(\'serviceAccountKeyFileName\').setValue($event)"\n                 required\n                 requiredAsError\n                 label="{{\'tb.rulenode.gcp-service-account-key\' | translate}}"\n                 noFileText="tb.rulenode.no-file"\n                 dropLabel="{{\'tb.rulenode.drop-file\' | translate}}">\n  </tb-file-input>\n  <label translate class="tb-title">tb.rulenode.message-attributes</label>\n  <div class="tb-hint" [innerHTML]="\'tb.rulenode.message-attributes-hint\' | translate | safe: \'html\'"></div>\n  <tb-kv-map-config-old\n    required="false"\n    formControlName="messageAttributes"\n    keyText="tb.rulenode.name"\n    keyRequiredText="tb.rulenode.name-required"\n    valText="tb.rulenode.value"\n    valRequiredText="tb.rulenode.value-required">\n  </tb-kv-map-config-old>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder}]}});class dr extends f{constructor(e,t){super(e),this.store=e,this.fb=t,this.messageProperties=[null,"BASIC","TEXT_PLAIN","MINIMAL_BASIC","MINIMAL_PERSISTENT_BASIC","PERSISTENT_BASIC","PERSISTENT_TEXT_PLAIN"]}configForm(){return this.rabbitMqConfigForm}onConfigurationSet(e){this.rabbitMqConfigForm=this.fb.group({exchangeNamePattern:[e?e.exchangeNamePattern:null,[]],routingKeyPattern:[e?e.routingKeyPattern:null,[]],messageProperties:[e?e.messageProperties:null,[]],host:[e?e.host:null,[O.required]],port:[e?e.port:null,[O.required,O.min(1),O.max(65535)]],virtualHost:[e?e.virtualHost:null,[]],username:[e?e.username:null,[]],password:[e?e.password:null,[]],automaticRecoveryEnabled:[!!e&&e.automaticRecoveryEnabled,[]],connectionTimeout:[e?e.connectionTimeout:null,[O.min(0)]],handshakeTimeout:[e?e.handshakeTimeout:null,[O.min(0)]],clientProperties:[e?e.clientProperties:null,[]]})}}e("RabbitMqConfigComponent",dr),dr.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:dr,deps:[{token:P.Store},{token:R.UntypedFormBuilder}],target:t.ɵɵFactoryTarget.Component}),dr.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:dr,selector:"tb-external-node-rabbit-mq-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="rabbitMqConfigForm" fxLayout="column">\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.exchange-name-pattern</mat-label>\n    <input matInput formControlName="exchangeNamePattern">\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.routing-key-pattern</mat-label>\n    <input matInput formControlName="routingKeyPattern">\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.message-properties</mat-label>\n    <mat-select formControlName="messageProperties">\n      <mat-option *ngFor="let property of messageProperties" [value]="property">\n        {{ property }}\n      </mat-option>\n    </mat-select>\n  </mat-form-field>\n  <div fxLayout.gt-sm="row" fxLayoutGap.gt-sm="8px">\n    <mat-form-field fxFlex="100" fxFlex.gt-sm="60" class="mat-block">\n      <mat-label translate>tb.rulenode.host</mat-label>\n      <input required matInput formControlName="host">\n      <mat-error *ngIf="rabbitMqConfigForm.get(\'host\').hasError(\'required\')">\n        {{ \'tb.rulenode.host-required\' | translate }}\n      </mat-error>\n    </mat-form-field>\n    <mat-form-field fxFlex="100" fxFlex.gt-sm="40" class="mat-block">\n      <mat-label translate>tb.rulenode.port</mat-label>\n      <input required type="number" step="1" min="1" max="65535" matInput formControlName="port">\n      <mat-error *ngIf="rabbitMqConfigForm.get(\'port\').hasError(\'required\')">\n        {{ \'tb.rulenode.port-required\' | translate }}\n      </mat-error>\n      <mat-error *ngIf="rabbitMqConfigForm.get(\'port\').hasError(\'min\')">\n        {{ \'tb.rulenode.port-range\' | translate }}\n      </mat-error>\n      <mat-error *ngIf="rabbitMqConfigForm.get(\'port\').hasError(\'max\')">\n        {{ \'tb.rulenode.port-range\' | translate }}\n      </mat-error>\n    </mat-form-field>\n  </div>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.virtual-host</mat-label>\n    <input matInput formControlName="virtualHost">\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.username</mat-label>\n    <input matInput formControlName="username">\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.password</mat-label>\n    <input type="password" matInput formControlName="password">\n    <tb-toggle-password matSuffix></tb-toggle-password>\n  </mat-form-field>\n  <mat-checkbox formControlName="automaticRecoveryEnabled">\n    {{ \'tb.rulenode.automatic-recovery\' | translate }}\n  </mat-checkbox>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.connection-timeout-ms</mat-label>\n    <input type="number" step="1" min="0" matInput formControlName="connectionTimeout">\n    <mat-error *ngIf="rabbitMqConfigForm.get(\'connectionTimeout\').hasError(\'min\')">\n      {{ \'tb.rulenode.min-connection-timeout-ms-message\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.handshake-timeout-ms</mat-label>\n    <input type="number" step="1" min="0" matInput formControlName="handshakeTimeout">\n    <mat-error *ngIf="rabbitMqConfigForm.get(\'handshakeTimeout\').hasError(\'min\')">\n      {{ \'tb.rulenode.min-handshake-timeout-ms-message\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <label translate class="tb-title">tb.rulenode.client-properties</label>\n  <tb-kv-map-config-old\n    required="false"\n    formControlName="clientProperties"\n    keyText="tb.rulenode.key"\n    keyRequiredText="tb.rulenode.key-required"\n    valText="tb.rulenode.value"\n    valRequiredText="tb.rulenode.value-required">\n  </tb-kv-map-config-old>\n</section>\n',dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:Q.MatCheckbox,selector:"mat-checkbox",inputs:["disableRipple","color","tabIndex"],exportAs:["matCheckbox"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"directive",type:Y.MatSuffix,selector:"[matSuffix], [matIconSuffix], [matTextSuffix]",inputs:["matTextSuffix"]},{kind:"component",type:X.MatSelect,selector:"mat-select",inputs:["disabled","disableRipple","tabIndex","hideSingleSelectionIndicator"],exportAs:["matSelect"]},{kind:"component",type:ee.MatOption,selector:"mat-option",exportAs:["matOption"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:W.DefaultLayoutGapDirective,selector:"  [fxLayoutGap], [fxLayoutGap.xs], [fxLayoutGap.sm], [fxLayoutGap.md],  [fxLayoutGap.lg], [fxLayoutGap.xl], [fxLayoutGap.lt-sm], [fxLayoutGap.lt-md],  [fxLayoutGap.lt-lg], [fxLayoutGap.lt-xl], [fxLayoutGap.gt-xs], [fxLayoutGap.gt-sm],  [fxLayoutGap.gt-md], [fxLayoutGap.gt-lg]",inputs:["fxLayoutGap","fxLayoutGap.xs","fxLayoutGap.sm","fxLayoutGap.md","fxLayoutGap.lg","fxLayoutGap.xl","fxLayoutGap.lt-sm","fxLayoutGap.lt-md","fxLayoutGap.lt-lg","fxLayoutGap.lt-xl","fxLayoutGap.gt-xs","fxLayoutGap.gt-sm","fxLayoutGap.gt-md","fxLayoutGap.gt-lg"]},{kind:"directive",type:W.DefaultFlexDirective,selector:"  [fxFlex], [fxFlex.xs], [fxFlex.sm], [fxFlex.md],  [fxFlex.lg], [fxFlex.xl], [fxFlex.lt-sm], [fxFlex.lt-md],  [fxFlex.lt-lg], [fxFlex.lt-xl], [fxFlex.gt-xs], [fxFlex.gt-sm],  [fxFlex.gt-md], [fxFlex.gt-lg]",inputs:["fxFlex","fxFlex.xs","fxFlex.sm","fxFlex.md","fxFlex.lg","fxFlex.xl","fxFlex.lt-sm","fxFlex.lt-md","fxFlex.lt-lg","fxFlex.lt-xl","fxFlex.gt-xs","fxFlex.gt-sm","fxFlex.gt-md","fxFlex.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NumberValueAccessor,selector:"input[type=number][formControlName],input[type=number][formControl],input[type=number][ngModel]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.MinValidator,selector:"input[type=number][min][formControlName],input[type=number][min][formControl],input[type=number][min][ngModel]",inputs:["min"]},{kind:"directive",type:R.MaxValidator,selector:"input[type=number][max][formControlName],input[type=number][max][formControl],input[type=number][max][ngModel]",inputs:["max"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"component",type:Xe.TogglePasswordComponent,selector:"tb-toggle-password"},{kind:"component",type:Cn,selector:"tb-kv-map-config-old",inputs:["disabled","uniqueKeyValuePairValidator","requiredText","keyText","keyRequiredText","valText","valRequiredText","hintText","required"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:dr,decorators:[{type:n,args:[{selector:"tb-external-node-rabbit-mq-config",template:'<section [formGroup]="rabbitMqConfigForm" fxLayout="column">\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.exchange-name-pattern</mat-label>\n    <input matInput formControlName="exchangeNamePattern">\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.routing-key-pattern</mat-label>\n    <input matInput formControlName="routingKeyPattern">\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.message-properties</mat-label>\n    <mat-select formControlName="messageProperties">\n      <mat-option *ngFor="let property of messageProperties" [value]="property">\n        {{ property }}\n      </mat-option>\n    </mat-select>\n  </mat-form-field>\n  <div fxLayout.gt-sm="row" fxLayoutGap.gt-sm="8px">\n    <mat-form-field fxFlex="100" fxFlex.gt-sm="60" class="mat-block">\n      <mat-label translate>tb.rulenode.host</mat-label>\n      <input required matInput formControlName="host">\n      <mat-error *ngIf="rabbitMqConfigForm.get(\'host\').hasError(\'required\')">\n        {{ \'tb.rulenode.host-required\' | translate }}\n      </mat-error>\n    </mat-form-field>\n    <mat-form-field fxFlex="100" fxFlex.gt-sm="40" class="mat-block">\n      <mat-label translate>tb.rulenode.port</mat-label>\n      <input required type="number" step="1" min="1" max="65535" matInput formControlName="port">\n      <mat-error *ngIf="rabbitMqConfigForm.get(\'port\').hasError(\'required\')">\n        {{ \'tb.rulenode.port-required\' | translate }}\n      </mat-error>\n      <mat-error *ngIf="rabbitMqConfigForm.get(\'port\').hasError(\'min\')">\n        {{ \'tb.rulenode.port-range\' | translate }}\n      </mat-error>\n      <mat-error *ngIf="rabbitMqConfigForm.get(\'port\').hasError(\'max\')">\n        {{ \'tb.rulenode.port-range\' | translate }}\n      </mat-error>\n    </mat-form-field>\n  </div>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.virtual-host</mat-label>\n    <input matInput formControlName="virtualHost">\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.username</mat-label>\n    <input matInput formControlName="username">\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.password</mat-label>\n    <input type="password" matInput formControlName="password">\n    <tb-toggle-password matSuffix></tb-toggle-password>\n  </mat-form-field>\n  <mat-checkbox formControlName="automaticRecoveryEnabled">\n    {{ \'tb.rulenode.automatic-recovery\' | translate }}\n  </mat-checkbox>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.connection-timeout-ms</mat-label>\n    <input type="number" step="1" min="0" matInput formControlName="connectionTimeout">\n    <mat-error *ngIf="rabbitMqConfigForm.get(\'connectionTimeout\').hasError(\'min\')">\n      {{ \'tb.rulenode.min-connection-timeout-ms-message\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.handshake-timeout-ms</mat-label>\n    <input type="number" step="1" min="0" matInput formControlName="handshakeTimeout">\n    <mat-error *ngIf="rabbitMqConfigForm.get(\'handshakeTimeout\').hasError(\'min\')">\n      {{ \'tb.rulenode.min-handshake-timeout-ms-message\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <label translate class="tb-title">tb.rulenode.client-properties</label>\n  <tb-kv-map-config-old\n    required="false"\n    formControlName="clientProperties"\n    keyText="tb.rulenode.key"\n    keyRequiredText="tb.rulenode.key-required"\n    valText="tb.rulenode.value"\n    valRequiredText="tb.rulenode.value-required">\n  </tb-kv-map-config-old>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder}]}});class ur extends f{constructor(e,t){super(e),this.store=e,this.fb=t,this.proxySchemes=["http","https"],this.httpRequestTypes=Object.keys($t)}configForm(){return this.restApiCallConfigForm}onConfigurationSet(e){this.restApiCallConfigForm=this.fb.group({restEndpointUrlPattern:[e?e.restEndpointUrlPattern:null,[O.required]],requestMethod:[e?e.requestMethod:null,[O.required]],useSimpleClientHttpFactory:[!!e&&e.useSimpleClientHttpFactory,[]],parseToPlainText:[!!e&&e.parseToPlainText,[]],ignoreRequestBody:[!!e&&e.ignoreRequestBody,[]],enableProxy:[!!e&&e.enableProxy,[]],useSystemProxyProperties:[!!e&&e.enableProxy,[]],proxyScheme:[e?e.proxyHost:null,[]],proxyHost:[e?e.proxyHost:null,[]],proxyPort:[e?e.proxyPort:null,[]],proxyUser:[e?e.proxyUser:null,[]],proxyPassword:[e?e.proxyPassword:null,[]],readTimeoutMs:[e?e.readTimeoutMs:null,[]],maxParallelRequestsCount:[e?e.maxParallelRequestsCount:null,[O.min(0)]],headers:[e?e.headers:null,[]],useRedisQueueForMsgPersistence:[!!e&&e.useRedisQueueForMsgPersistence,[]],trimQueue:[!!e&&e.trimQueue,[]],maxQueueSize:[e?e.maxQueueSize:null,[]],credentials:[e?e.credentials:null,[]]})}validatorTriggers(){return["useSimpleClientHttpFactory","useRedisQueueForMsgPersistence","enableProxy","useSystemProxyProperties"]}updateValidators(e){const t=this.restApiCallConfigForm.get("useSimpleClientHttpFactory").value,n=this.restApiCallConfigForm.get("useRedisQueueForMsgPersistence").value,r=this.restApiCallConfigForm.get("enableProxy").value,o=this.restApiCallConfigForm.get("useSystemProxyProperties").value;r&&!o?(this.restApiCallConfigForm.get("proxyHost").setValidators(r?[O.required]:[]),this.restApiCallConfigForm.get("proxyPort").setValidators(r?[O.required,O.min(1),O.max(65535)]:[])):(this.restApiCallConfigForm.get("proxyHost").setValidators([]),this.restApiCallConfigForm.get("proxyPort").setValidators([]),t?this.restApiCallConfigForm.get("readTimeoutMs").setValidators([]):this.restApiCallConfigForm.get("readTimeoutMs").setValidators([O.min(0)])),n?this.restApiCallConfigForm.get("maxQueueSize").setValidators([O.min(0)]):this.restApiCallConfigForm.get("maxQueueSize").setValidators([]),this.restApiCallConfigForm.get("readTimeoutMs").updateValueAndValidity({emitEvent:e}),this.restApiCallConfigForm.get("maxQueueSize").updateValueAndValidity({emitEvent:e}),this.restApiCallConfigForm.get("proxyHost").updateValueAndValidity({emitEvent:e}),this.restApiCallConfigForm.get("proxyPort").updateValueAndValidity({emitEvent:e}),this.restApiCallConfigForm.get("credentials").updateValueAndValidity({emitEvent:e})}}e("RestApiCallConfigComponent",ur),ur.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:ur,deps:[{token:P.Store},{token:R.UntypedFormBuilder}],target:t.ɵɵFactoryTarget.Component}),ur.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:ur,selector:"tb-external-node-rest-api-call-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="restApiCallConfigForm" fxLayout="column">\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.endpoint-url-pattern</mat-label>\n    <input required matInput formControlName="restEndpointUrlPattern">\n    <mat-error *ngIf="restApiCallConfigForm.get(\'restEndpointUrlPattern\').hasError(\'required\')">\n      {{ \'tb.rulenode.endpoint-url-pattern-required\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.request-method</mat-label>\n    <mat-select formControlName="requestMethod">\n      <mat-option *ngFor="let requestType of httpRequestTypes" [value]="requestType">\n        {{ requestType }}\n      </mat-option>\n    </mat-select>\n  </mat-form-field>\n  <mat-checkbox formControlName="enableProxy">\n    {{ \'tb.rulenode.enable-proxy\' | translate }}\n  </mat-checkbox>\n  <mat-checkbox *ngIf="!restApiCallConfigForm.get(\'enableProxy\').value" formControlName="useSimpleClientHttpFactory">\n    {{ \'tb.rulenode.use-simple-client-http-factory\' | translate }}\n  </mat-checkbox>\n  <mat-checkbox formControlName="parseToPlainText">\n    {{ \'tb.rulenode.parse-to-plain-text\' | translate }}\n  </mat-checkbox>\n  <div class="tb-hint" style="padding-bottom: 5px;" translate>tb.rulenode.parse-to-plain-text-hint</div>\n  <mat-checkbox formControlName="ignoreRequestBody">\n    {{ \'tb.rulenode.ignore-request-body\' | translate }}\n  </mat-checkbox>\n  <div *ngIf="restApiCallConfigForm.get(\'enableProxy\').value">\n    <mat-checkbox formControlName="useSystemProxyProperties">\n      {{ \'tb.rulenode.use-system-proxy-properties\' | translate }}\n    </mat-checkbox>\n    <div *ngIf="!restApiCallConfigForm.get(\'useSystemProxyProperties\').value">\n      <div fxLayout.gt-sm="row" fxLayoutGap.gt-sm="8px">\n        <mat-form-field class="mat-block" fxFlex="100" fxFlex.gt-sm="10">\n          <mat-label translate>tb.rulenode.proxy-scheme</mat-label>\n          <mat-select formControlName="proxyScheme">\n            <mat-option *ngFor="let proxyScheme of proxySchemes" [value]="proxyScheme">\n              {{ proxyScheme }}\n            </mat-option>\n          </mat-select>\n        </mat-form-field>\n        <mat-form-field class="md-block" fxFlex="100" fxFlex.gt-sm="50">\n          <mat-label translate>tb.rulenode.proxy-host</mat-label>\n          <input matInput required formControlName="proxyHost">\n          <mat-error *ngIf="restApiCallConfigForm.get(\'proxyHost\').hasError(\'required\')">\n            {{ \'tb.rulenode.proxy-host-required\' | translate }}\n          </mat-error>\n        </mat-form-field>\n        <mat-form-field class="mat-block" fxFlex="100" fxFlex.gt-sm="40">\n          <mat-label translate>tb.rulenode.proxy-port</mat-label>\n          <input matInput required formControlName="proxyPort" type="number" step="1">\n          <mat-error *ngIf="restApiCallConfigForm.get(\'proxyPort\').hasError(\'required\')">\n            {{ \'tb.rulenode.proxy-port-required\' | translate }}\n          </mat-error>\n          <mat-error\n            *ngIf="restApiCallConfigForm.get(\'proxyPort\').hasError(\'min\') || restApiCallConfigForm.get(\'proxyPort\').hasError(\'max\')">\n            {{ \'tb.rulenode.proxy-port-range\' | translate }}\n          </mat-error>\n        </mat-form-field>\n      </div>\n      <mat-form-field class="mat-block">\n        <mat-label translate>tb.rulenode.proxy-user</mat-label>\n        <input matInput formControlName="proxyUser">\n      </mat-form-field>\n      <mat-form-field class="mat-block">\n        <mat-label translate>tb.rulenode.proxy-password</mat-label>\n        <input matInput formControlName="proxyPassword">\n      </mat-form-field>\n    </div>\n  </div>\n  <mat-form-field *ngIf="!restApiCallConfigForm.get(\'useSimpleClientHttpFactory\').value || restApiCallConfigForm.get(\'enableProxy\').value" class="mat-block"\n                  subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.read-timeout</mat-label>\n    <input type="number" step="1" min="0" matInput formControlName="readTimeoutMs">\n    <mat-hint translate>tb.rulenode.read-timeout-hint</mat-hint>\n  </mat-form-field>\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.max-parallel-requests-count</mat-label>\n    <input type="number" step="1" min="0" matInput formControlName="maxParallelRequestsCount">\n    <mat-hint translate>tb.rulenode.max-parallel-requests-count-hint</mat-hint>\n  </mat-form-field>\n  <label translate class="tb-title">tb.rulenode.headers</label>\n  <div class="tb-hint" [innerHTML]="\'tb.rulenode.headers-hint\' | translate | safe: \'html\'">  </div>\n  <tb-kv-map-config-old\n    required="false"\n    formControlName="headers"\n    keyText="tb.rulenode.header"\n    keyRequiredText="tb.rulenode.header-required"\n    valText="tb.rulenode.value"\n    valRequiredText="tb.rulenode.value-required">\n  </tb-kv-map-config-old>\n  <mat-checkbox formControlName="useRedisQueueForMsgPersistence">\n    {{ \'tb.rulenode.use-redis-queue\' | translate }}\n  </mat-checkbox>\n  <div fxLayout="column" *ngIf="restApiCallConfigForm.get(\'useRedisQueueForMsgPersistence\').value === true">\n    <mat-checkbox formControlName="trimQueue">\n      {{ \'tb.rulenode.trim-redis-queue\' | translate }}\n    </mat-checkbox>\n    <mat-form-field class="mat-block">\n      <mat-label translate>tb.rulenode.redis-queue-max-size</mat-label>\n      <input type="number" step="1" min="0" matInput formControlName="maxQueueSize">\n    </mat-form-field>\n  </div>\n  <tb-credentials-config formControlName="credentials" [disableCertPemCredentials]="restApiCallConfigForm.get(\'useSimpleClientHttpFactory\').value"></tb-credentials-config>\n</section>\n',dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:Q.MatCheckbox,selector:"mat-checkbox",inputs:["disableRipple","color","tabIndex"],exportAs:["matCheckbox"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatHint,selector:"mat-hint",inputs:["align","id"]},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"component",type:X.MatSelect,selector:"mat-select",inputs:["disabled","disableRipple","tabIndex","hideSingleSelectionIndicator"],exportAs:["matSelect"]},{kind:"component",type:ee.MatOption,selector:"mat-option",exportAs:["matOption"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:W.DefaultLayoutGapDirective,selector:"  [fxLayoutGap], [fxLayoutGap.xs], [fxLayoutGap.sm], [fxLayoutGap.md],  [fxLayoutGap.lg], [fxLayoutGap.xl], [fxLayoutGap.lt-sm], [fxLayoutGap.lt-md],  [fxLayoutGap.lt-lg], [fxLayoutGap.lt-xl], [fxLayoutGap.gt-xs], [fxLayoutGap.gt-sm],  [fxLayoutGap.gt-md], [fxLayoutGap.gt-lg]",inputs:["fxLayoutGap","fxLayoutGap.xs","fxLayoutGap.sm","fxLayoutGap.md","fxLayoutGap.lg","fxLayoutGap.xl","fxLayoutGap.lt-sm","fxLayoutGap.lt-md","fxLayoutGap.lt-lg","fxLayoutGap.lt-xl","fxLayoutGap.gt-xs","fxLayoutGap.gt-sm","fxLayoutGap.gt-md","fxLayoutGap.gt-lg"]},{kind:"directive",type:W.DefaultFlexDirective,selector:"  [fxFlex], [fxFlex.xs], [fxFlex.sm], [fxFlex.md],  [fxFlex.lg], [fxFlex.xl], [fxFlex.lt-sm], [fxFlex.lt-md],  [fxFlex.lt-lg], [fxFlex.lt-xl], [fxFlex.gt-xs], [fxFlex.gt-sm],  [fxFlex.gt-md], [fxFlex.gt-lg]",inputs:["fxFlex","fxFlex.xs","fxFlex.sm","fxFlex.md","fxFlex.lg","fxFlex.xl","fxFlex.lt-sm","fxFlex.lt-md","fxFlex.lt-lg","fxFlex.lt-xl","fxFlex.gt-xs","fxFlex.gt-sm","fxFlex.gt-md","fxFlex.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NumberValueAccessor,selector:"input[type=number][formControlName],input[type=number][formControl],input[type=number][ngModel]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.MinValidator,selector:"input[type=number][min][formControlName],input[type=number][min][formControl],input[type=number][min][ngModel]",inputs:["min"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"component",type:wn,selector:"tb-credentials-config",inputs:["required","disableCertPemCredentials","passwordFieldRequired"]},{kind:"component",type:Cn,selector:"tb-kv-map-config-old",inputs:["disabled","uniqueKeyValuePairValidator","requiredText","keyText","keyRequiredText","valText","valRequiredText","hintText","required"]},{kind:"pipe",type:he.SafePipe,name:"safe"},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:ur,decorators:[{type:n,args:[{selector:"tb-external-node-rest-api-call-config",template:'<section [formGroup]="restApiCallConfigForm" fxLayout="column">\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.endpoint-url-pattern</mat-label>\n    <input required matInput formControlName="restEndpointUrlPattern">\n    <mat-error *ngIf="restApiCallConfigForm.get(\'restEndpointUrlPattern\').hasError(\'required\')">\n      {{ \'tb.rulenode.endpoint-url-pattern-required\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.request-method</mat-label>\n    <mat-select formControlName="requestMethod">\n      <mat-option *ngFor="let requestType of httpRequestTypes" [value]="requestType">\n        {{ requestType }}\n      </mat-option>\n    </mat-select>\n  </mat-form-field>\n  <mat-checkbox formControlName="enableProxy">\n    {{ \'tb.rulenode.enable-proxy\' | translate }}\n  </mat-checkbox>\n  <mat-checkbox *ngIf="!restApiCallConfigForm.get(\'enableProxy\').value" formControlName="useSimpleClientHttpFactory">\n    {{ \'tb.rulenode.use-simple-client-http-factory\' | translate }}\n  </mat-checkbox>\n  <mat-checkbox formControlName="parseToPlainText">\n    {{ \'tb.rulenode.parse-to-plain-text\' | translate }}\n  </mat-checkbox>\n  <div class="tb-hint" style="padding-bottom: 5px;" translate>tb.rulenode.parse-to-plain-text-hint</div>\n  <mat-checkbox formControlName="ignoreRequestBody">\n    {{ \'tb.rulenode.ignore-request-body\' | translate }}\n  </mat-checkbox>\n  <div *ngIf="restApiCallConfigForm.get(\'enableProxy\').value">\n    <mat-checkbox formControlName="useSystemProxyProperties">\n      {{ \'tb.rulenode.use-system-proxy-properties\' | translate }}\n    </mat-checkbox>\n    <div *ngIf="!restApiCallConfigForm.get(\'useSystemProxyProperties\').value">\n      <div fxLayout.gt-sm="row" fxLayoutGap.gt-sm="8px">\n        <mat-form-field class="mat-block" fxFlex="100" fxFlex.gt-sm="10">\n          <mat-label translate>tb.rulenode.proxy-scheme</mat-label>\n          <mat-select formControlName="proxyScheme">\n            <mat-option *ngFor="let proxyScheme of proxySchemes" [value]="proxyScheme">\n              {{ proxyScheme }}\n            </mat-option>\n          </mat-select>\n        </mat-form-field>\n        <mat-form-field class="md-block" fxFlex="100" fxFlex.gt-sm="50">\n          <mat-label translate>tb.rulenode.proxy-host</mat-label>\n          <input matInput required formControlName="proxyHost">\n          <mat-error *ngIf="restApiCallConfigForm.get(\'proxyHost\').hasError(\'required\')">\n            {{ \'tb.rulenode.proxy-host-required\' | translate }}\n          </mat-error>\n        </mat-form-field>\n        <mat-form-field class="mat-block" fxFlex="100" fxFlex.gt-sm="40">\n          <mat-label translate>tb.rulenode.proxy-port</mat-label>\n          <input matInput required formControlName="proxyPort" type="number" step="1">\n          <mat-error *ngIf="restApiCallConfigForm.get(\'proxyPort\').hasError(\'required\')">\n            {{ \'tb.rulenode.proxy-port-required\' | translate }}\n          </mat-error>\n          <mat-error\n            *ngIf="restApiCallConfigForm.get(\'proxyPort\').hasError(\'min\') || restApiCallConfigForm.get(\'proxyPort\').hasError(\'max\')">\n            {{ \'tb.rulenode.proxy-port-range\' | translate }}\n          </mat-error>\n        </mat-form-field>\n      </div>\n      <mat-form-field class="mat-block">\n        <mat-label translate>tb.rulenode.proxy-user</mat-label>\n        <input matInput formControlName="proxyUser">\n      </mat-form-field>\n      <mat-form-field class="mat-block">\n        <mat-label translate>tb.rulenode.proxy-password</mat-label>\n        <input matInput formControlName="proxyPassword">\n      </mat-form-field>\n    </div>\n  </div>\n  <mat-form-field *ngIf="!restApiCallConfigForm.get(\'useSimpleClientHttpFactory\').value || restApiCallConfigForm.get(\'enableProxy\').value" class="mat-block"\n                  subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.read-timeout</mat-label>\n    <input type="number" step="1" min="0" matInput formControlName="readTimeoutMs">\n    <mat-hint translate>tb.rulenode.read-timeout-hint</mat-hint>\n  </mat-form-field>\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.max-parallel-requests-count</mat-label>\n    <input type="number" step="1" min="0" matInput formControlName="maxParallelRequestsCount">\n    <mat-hint translate>tb.rulenode.max-parallel-requests-count-hint</mat-hint>\n  </mat-form-field>\n  <label translate class="tb-title">tb.rulenode.headers</label>\n  <div class="tb-hint" [innerHTML]="\'tb.rulenode.headers-hint\' | translate | safe: \'html\'">  </div>\n  <tb-kv-map-config-old\n    required="false"\n    formControlName="headers"\n    keyText="tb.rulenode.header"\n    keyRequiredText="tb.rulenode.header-required"\n    valText="tb.rulenode.value"\n    valRequiredText="tb.rulenode.value-required">\n  </tb-kv-map-config-old>\n  <mat-checkbox formControlName="useRedisQueueForMsgPersistence">\n    {{ \'tb.rulenode.use-redis-queue\' | translate }}\n  </mat-checkbox>\n  <div fxLayout="column" *ngIf="restApiCallConfigForm.get(\'useRedisQueueForMsgPersistence\').value === true">\n    <mat-checkbox formControlName="trimQueue">\n      {{ \'tb.rulenode.trim-redis-queue\' | translate }}\n    </mat-checkbox>\n    <mat-form-field class="mat-block">\n      <mat-label translate>tb.rulenode.redis-queue-max-size</mat-label>\n      <input type="number" step="1" min="0" matInput formControlName="maxQueueSize">\n    </mat-form-field>\n  </div>\n  <tb-credentials-config formControlName="credentials" [disableCertPemCredentials]="restApiCallConfigForm.get(\'useSimpleClientHttpFactory\').value"></tb-credentials-config>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder}]}});class cr extends f{constructor(e,t){super(e),this.store=e,this.fb=t,this.smtpProtocols=["smtp","smtps"],this.tlsVersions=["TLSv1","TLSv1.1","TLSv1.2","TLSv1.3"]}configForm(){return this.sendEmailConfigForm}onConfigurationSet(e){this.sendEmailConfigForm=this.fb.group({useSystemSmtpSettings:[!!e&&e.useSystemSmtpSettings,[]],smtpProtocol:[e?e.smtpProtocol:null,[]],smtpHost:[e?e.smtpHost:null,[]],smtpPort:[e?e.smtpPort:null,[]],timeout:[e?e.timeout:null,[]],enableTls:[!!e&&e.enableTls,[]],tlsVersion:[e?e.tlsVersion:null,[]],enableProxy:[!!e&&e.enableProxy,[]],proxyHost:[e?e.proxyHost:null,[]],proxyPort:[e?e.proxyPort:null,[]],proxyUser:[e?e.proxyUser:null,[]],proxyPassword:[e?e.proxyPassword:null,[]],username:[e?e.username:null,[]],password:[e?e.password:null,[]]})}validatorTriggers(){return["useSystemSmtpSettings","enableProxy"]}updateValidators(e){const t=this.sendEmailConfigForm.get("useSystemSmtpSettings").value,n=this.sendEmailConfigForm.get("enableProxy").value;t?(this.sendEmailConfigForm.get("smtpProtocol").setValidators([]),this.sendEmailConfigForm.get("smtpHost").setValidators([]),this.sendEmailConfigForm.get("smtpPort").setValidators([]),this.sendEmailConfigForm.get("timeout").setValidators([]),this.sendEmailConfigForm.get("proxyHost").setValidators([]),this.sendEmailConfigForm.get("proxyPort").setValidators([])):(this.sendEmailConfigForm.get("smtpProtocol").setValidators([O.required]),this.sendEmailConfigForm.get("smtpHost").setValidators([O.required]),this.sendEmailConfigForm.get("smtpPort").setValidators([O.required,O.min(1),O.max(65535)]),this.sendEmailConfigForm.get("timeout").setValidators([O.required,O.min(0)]),this.sendEmailConfigForm.get("proxyHost").setValidators(n?[O.required]:[]),this.sendEmailConfigForm.get("proxyPort").setValidators(n?[O.required,O.min(1),O.max(65535)]:[])),this.sendEmailConfigForm.get("smtpProtocol").updateValueAndValidity({emitEvent:e}),this.sendEmailConfigForm.get("smtpHost").updateValueAndValidity({emitEvent:e}),this.sendEmailConfigForm.get("smtpPort").updateValueAndValidity({emitEvent:e}),this.sendEmailConfigForm.get("timeout").updateValueAndValidity({emitEvent:e}),this.sendEmailConfigForm.get("proxyHost").updateValueAndValidity({emitEvent:e}),this.sendEmailConfigForm.get("proxyPort").updateValueAndValidity({emitEvent:e})}}e("SendEmailConfigComponent",cr),cr.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:cr,deps:[{token:P.Store},{token:R.UntypedFormBuilder}],target:t.ɵɵFactoryTarget.Component}),cr.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:cr,selector:"tb-external-node-send-email-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="sendEmailConfigForm" fxLayout="column">\n  <mat-checkbox formControlName="useSystemSmtpSettings">\n    {{ \'tb.rulenode.use-system-smtp-settings\' | translate }}\n  </mat-checkbox>\n  <section fxLayout="column" *ngIf="sendEmailConfigForm.get(\'useSystemSmtpSettings\').value === false">\n    <mat-form-field class="mat-block">\n      <mat-label translate>tb.rulenode.smtp-protocol</mat-label>\n      <mat-select formControlName="smtpProtocol">\n        <mat-option *ngFor="let smtpProtocol of smtpProtocols" [value]="smtpProtocol">\n          {{ smtpProtocol.toUpperCase() }}\n        </mat-option>\n      </mat-select>\n    </mat-form-field>\n    <div fxLayout.gt-sm="row" fxLayoutGap.gt-sm="8px">\n      <mat-form-field fxFlex="100" fxFlex.gt-sm="60" class="mat-block">\n        <mat-label translate>tb.rulenode.smtp-host</mat-label>\n        <input required matInput formControlName="smtpHost">\n        <mat-error *ngIf="sendEmailConfigForm.get(\'smtpHost\').hasError(\'required\')">\n          {{ \'tb.rulenode.smtp-host-required\' | translate }}\n        </mat-error>\n      </mat-form-field>\n      <mat-form-field fxFlex="100" fxFlex.gt-sm="40" class="mat-block">\n        <mat-label translate>tb.rulenode.smtp-port</mat-label>\n        <input required type="number" step="1" min="1" max="65535" matInput formControlName="smtpPort">\n        <mat-error *ngIf="sendEmailConfigForm.get(\'smtpPort\').hasError(\'required\')">\n          {{ \'tb.rulenode.smtp-port-required\' | translate }}\n        </mat-error>\n        <mat-error *ngIf="sendEmailConfigForm.get(\'smtpPort\').hasError(\'min\')">\n          {{ \'tb.rulenode.smtp-port-range\' | translate }}\n        </mat-error>\n        <mat-error *ngIf="sendEmailConfigForm.get(\'smtpPort\').hasError(\'max\')">\n          {{ \'tb.rulenode.smtp-port-range\' | translate }}\n        </mat-error>\n      </mat-form-field>\n    </div>\n    <mat-form-field class="mat-block">\n      <mat-label translate>tb.rulenode.timeout-msec</mat-label>\n      <input required type="number" step="1" min="0" matInput formControlName="timeout">\n      <mat-error *ngIf="sendEmailConfigForm.get(\'timeout\').hasError(\'required\')">\n        {{ \'tb.rulenode.timeout-required\' | translate }}\n      </mat-error>\n      <mat-error *ngIf="sendEmailConfigForm.get(\'timeout\').hasError(\'min\')">\n        {{ \'tb.rulenode.min-timeout-msec-message\' | translate }}\n      </mat-error>\n    </mat-form-field>\n    <mat-checkbox formControlName="enableTls">\n      {{ \'tb.rulenode.enable-tls\' | translate }}\n    </mat-checkbox>\n    <mat-form-field class="mat-block" *ngIf="sendEmailConfigForm.get(\'enableTls\').value === true">\n      <mat-label translate>tb.rulenode.tls-version</mat-label>\n      <mat-select formControlName="tlsVersion">\n        <mat-option *ngFor="let tlsVersion of tlsVersions" [value]="tlsVersion">\n          {{ tlsVersion }}\n        </mat-option>\n      </mat-select>\n    </mat-form-field>\n    <tb-checkbox formControlName="enableProxy">\n      {{ \'tb.rulenode.enable-proxy\' | translate }}\n    </tb-checkbox>\n    <div *ngIf="sendEmailConfigForm.get(\'enableProxy\').value">\n      <div fxLayout.gt-sm="row" fxLayoutGap.gt-sm="8px">\n        <mat-form-field class="mat-block" fxFlex="100" fxFlex.gt-sm="60">\n          <mat-label translate>tb.rulenode.proxy-host</mat-label>\n          <input matInput required formControlName="proxyHost">\n          <mat-error *ngIf="sendEmailConfigForm.get(\'proxyHost\').hasError(\'required\')">\n            {{ \'tb.rulenode.proxy-host-required\' | translate }}\n          </mat-error>\n        </mat-form-field>\n        <mat-form-field class="mat-block" fxFlex="100" fxFlex.gt-sm="40">\n          <mat-label translate>tb.rulenode.proxy-port</mat-label>\n          <input matInput required formControlName="proxyPort" type="number" step="1" min="1" max="65535">\n          <mat-error *ngIf="sendEmailConfigForm.get(\'proxyPort\').hasError(\'required\')">\n            {{ \'tb.rulenode.proxy-port-required\' | translate }}\n          </mat-error>\n          <mat-error *ngIf="sendEmailConfigForm.get(\'proxyPort\').hasError(\'min\') || sendEmailConfigForm.get(\'proxyPort\').hasError(\'max\')">\n            {{ \'tb.rulenode.proxy-port-range\' | translate }}\n          </mat-error>\n        </mat-form-field>\n      </div>\n      <mat-form-field class="mat-block">\n        <mat-label translate>tb.rulenode.proxy-user</mat-label>\n        <input matInput formControlName="proxyUser">\n      </mat-form-field>\n      <mat-form-field class="mat-block">\n        <mat-label translate>tb.rulenode.proxy-password</mat-label>\n        <input matInput formControlName="proxyPassword">\n      </mat-form-field>\n    </div>\n    <mat-form-field class="mat-block" floatLabel="always">\n      <mat-label translate>tb.rulenode.username</mat-label>\n      <input matInput placeholder="{{ \'tb.rulenode.enter-username\' | translate }}" formControlName="username">\n    </mat-form-field>\n    <mat-form-field class="mat-block" floatLabel="always">\n      <mat-label translate>tb.rulenode.password</mat-label>\n      <input matInput type="password" placeholder="{{ \'tb.rulenode.enter-password\' | translate }}" formControlName="password">\n      <tb-toggle-password matSuffix></tb-toggle-password>\n    </mat-form-field>\n  </section>\n</section>\n',dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:rt.TbCheckboxComponent,selector:"tb-checkbox",inputs:["disabled","trueValue","falseValue"],outputs:["valueChange"]},{kind:"component",type:Q.MatCheckbox,selector:"mat-checkbox",inputs:["disableRipple","color","tabIndex"],exportAs:["matCheckbox"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"directive",type:Y.MatSuffix,selector:"[matSuffix], [matIconSuffix], [matTextSuffix]",inputs:["matTextSuffix"]},{kind:"component",type:X.MatSelect,selector:"mat-select",inputs:["disabled","disableRipple","tabIndex","hideSingleSelectionIndicator"],exportAs:["matSelect"]},{kind:"component",type:ee.MatOption,selector:"mat-option",exportAs:["matOption"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:W.DefaultLayoutGapDirective,selector:"  [fxLayoutGap], [fxLayoutGap.xs], [fxLayoutGap.sm], [fxLayoutGap.md],  [fxLayoutGap.lg], [fxLayoutGap.xl], [fxLayoutGap.lt-sm], [fxLayoutGap.lt-md],  [fxLayoutGap.lt-lg], [fxLayoutGap.lt-xl], [fxLayoutGap.gt-xs], [fxLayoutGap.gt-sm],  [fxLayoutGap.gt-md], [fxLayoutGap.gt-lg]",inputs:["fxLayoutGap","fxLayoutGap.xs","fxLayoutGap.sm","fxLayoutGap.md","fxLayoutGap.lg","fxLayoutGap.xl","fxLayoutGap.lt-sm","fxLayoutGap.lt-md","fxLayoutGap.lt-lg","fxLayoutGap.lt-xl","fxLayoutGap.gt-xs","fxLayoutGap.gt-sm","fxLayoutGap.gt-md","fxLayoutGap.gt-lg"]},{kind:"directive",type:W.DefaultFlexDirective,selector:"  [fxFlex], [fxFlex.xs], [fxFlex.sm], [fxFlex.md],  [fxFlex.lg], [fxFlex.xl], [fxFlex.lt-sm], [fxFlex.lt-md],  [fxFlex.lt-lg], [fxFlex.lt-xl], [fxFlex.gt-xs], [fxFlex.gt-sm],  [fxFlex.gt-md], [fxFlex.gt-lg]",inputs:["fxFlex","fxFlex.xs","fxFlex.sm","fxFlex.md","fxFlex.lg","fxFlex.xl","fxFlex.lt-sm","fxFlex.lt-md","fxFlex.lt-lg","fxFlex.lt-xl","fxFlex.gt-xs","fxFlex.gt-sm","fxFlex.gt-md","fxFlex.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NumberValueAccessor,selector:"input[type=number][formControlName],input[type=number][formControl],input[type=number][ngModel]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.MinValidator,selector:"input[type=number][min][formControlName],input[type=number][min][formControl],input[type=number][min][ngModel]",inputs:["min"]},{kind:"directive",type:R.MaxValidator,selector:"input[type=number][max][formControlName],input[type=number][max][formControl],input[type=number][max][ngModel]",inputs:["max"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"component",type:Xe.TogglePasswordComponent,selector:"tb-toggle-password"},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:cr,decorators:[{type:n,args:[{selector:"tb-external-node-send-email-config",template:'<section [formGroup]="sendEmailConfigForm" fxLayout="column">\n  <mat-checkbox formControlName="useSystemSmtpSettings">\n    {{ \'tb.rulenode.use-system-smtp-settings\' | translate }}\n  </mat-checkbox>\n  <section fxLayout="column" *ngIf="sendEmailConfigForm.get(\'useSystemSmtpSettings\').value === false">\n    <mat-form-field class="mat-block">\n      <mat-label translate>tb.rulenode.smtp-protocol</mat-label>\n      <mat-select formControlName="smtpProtocol">\n        <mat-option *ngFor="let smtpProtocol of smtpProtocols" [value]="smtpProtocol">\n          {{ smtpProtocol.toUpperCase() }}\n        </mat-option>\n      </mat-select>\n    </mat-form-field>\n    <div fxLayout.gt-sm="row" fxLayoutGap.gt-sm="8px">\n      <mat-form-field fxFlex="100" fxFlex.gt-sm="60" class="mat-block">\n        <mat-label translate>tb.rulenode.smtp-host</mat-label>\n        <input required matInput formControlName="smtpHost">\n        <mat-error *ngIf="sendEmailConfigForm.get(\'smtpHost\').hasError(\'required\')">\n          {{ \'tb.rulenode.smtp-host-required\' | translate }}\n        </mat-error>\n      </mat-form-field>\n      <mat-form-field fxFlex="100" fxFlex.gt-sm="40" class="mat-block">\n        <mat-label translate>tb.rulenode.smtp-port</mat-label>\n        <input required type="number" step="1" min="1" max="65535" matInput formControlName="smtpPort">\n        <mat-error *ngIf="sendEmailConfigForm.get(\'smtpPort\').hasError(\'required\')">\n          {{ \'tb.rulenode.smtp-port-required\' | translate }}\n        </mat-error>\n        <mat-error *ngIf="sendEmailConfigForm.get(\'smtpPort\').hasError(\'min\')">\n          {{ \'tb.rulenode.smtp-port-range\' | translate }}\n        </mat-error>\n        <mat-error *ngIf="sendEmailConfigForm.get(\'smtpPort\').hasError(\'max\')">\n          {{ \'tb.rulenode.smtp-port-range\' | translate }}\n        </mat-error>\n      </mat-form-field>\n    </div>\n    <mat-form-field class="mat-block">\n      <mat-label translate>tb.rulenode.timeout-msec</mat-label>\n      <input required type="number" step="1" min="0" matInput formControlName="timeout">\n      <mat-error *ngIf="sendEmailConfigForm.get(\'timeout\').hasError(\'required\')">\n        {{ \'tb.rulenode.timeout-required\' | translate }}\n      </mat-error>\n      <mat-error *ngIf="sendEmailConfigForm.get(\'timeout\').hasError(\'min\')">\n        {{ \'tb.rulenode.min-timeout-msec-message\' | translate }}\n      </mat-error>\n    </mat-form-field>\n    <mat-checkbox formControlName="enableTls">\n      {{ \'tb.rulenode.enable-tls\' | translate }}\n    </mat-checkbox>\n    <mat-form-field class="mat-block" *ngIf="sendEmailConfigForm.get(\'enableTls\').value === true">\n      <mat-label translate>tb.rulenode.tls-version</mat-label>\n      <mat-select formControlName="tlsVersion">\n        <mat-option *ngFor="let tlsVersion of tlsVersions" [value]="tlsVersion">\n          {{ tlsVersion }}\n        </mat-option>\n      </mat-select>\n    </mat-form-field>\n    <tb-checkbox formControlName="enableProxy">\n      {{ \'tb.rulenode.enable-proxy\' | translate }}\n    </tb-checkbox>\n    <div *ngIf="sendEmailConfigForm.get(\'enableProxy\').value">\n      <div fxLayout.gt-sm="row" fxLayoutGap.gt-sm="8px">\n        <mat-form-field class="mat-block" fxFlex="100" fxFlex.gt-sm="60">\n          <mat-label translate>tb.rulenode.proxy-host</mat-label>\n          <input matInput required formControlName="proxyHost">\n          <mat-error *ngIf="sendEmailConfigForm.get(\'proxyHost\').hasError(\'required\')">\n            {{ \'tb.rulenode.proxy-host-required\' | translate }}\n          </mat-error>\n        </mat-form-field>\n        <mat-form-field class="mat-block" fxFlex="100" fxFlex.gt-sm="40">\n          <mat-label translate>tb.rulenode.proxy-port</mat-label>\n          <input matInput required formControlName="proxyPort" type="number" step="1" min="1" max="65535">\n          <mat-error *ngIf="sendEmailConfigForm.get(\'proxyPort\').hasError(\'required\')">\n            {{ \'tb.rulenode.proxy-port-required\' | translate }}\n          </mat-error>\n          <mat-error *ngIf="sendEmailConfigForm.get(\'proxyPort\').hasError(\'min\') || sendEmailConfigForm.get(\'proxyPort\').hasError(\'max\')">\n            {{ \'tb.rulenode.proxy-port-range\' | translate }}\n          </mat-error>\n        </mat-form-field>\n      </div>\n      <mat-form-field class="mat-block">\n        <mat-label translate>tb.rulenode.proxy-user</mat-label>\n        <input matInput formControlName="proxyUser">\n      </mat-form-field>\n      <mat-form-field class="mat-block">\n        <mat-label translate>tb.rulenode.proxy-password</mat-label>\n        <input matInput formControlName="proxyPassword">\n      </mat-form-field>\n    </div>\n    <mat-form-field class="mat-block" floatLabel="always">\n      <mat-label translate>tb.rulenode.username</mat-label>\n      <input matInput placeholder="{{ \'tb.rulenode.enter-username\' | translate }}" formControlName="username">\n    </mat-form-field>\n    <mat-form-field class="mat-block" floatLabel="always">\n      <mat-label translate>tb.rulenode.password</mat-label>\n      <input matInput type="password" placeholder="{{ \'tb.rulenode.enter-password\' | translate }}" formControlName="password">\n      <tb-toggle-password matSuffix></tb-toggle-password>\n    </mat-form-field>\n  </section>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder}]}});class fr extends f{constructor(e,t){super(e),this.store=e,this.fb=t}configForm(){return this.sendSmsConfigForm}onConfigurationSet(e){this.sendSmsConfigForm=this.fb.group({numbersToTemplate:[e?e.numbersToTemplate:null,[O.required]],smsMessageTemplate:[e?e.smsMessageTemplate:null,[O.required]],useSystemSmsSettings:[!!e&&e.useSystemSmsSettings,[]],smsProviderConfiguration:[e?e.smsProviderConfiguration:null,[]]})}validatorTriggers(){return["useSystemSmsSettings"]}updateValidators(e){this.sendSmsConfigForm.get("useSystemSmsSettings").value?this.sendSmsConfigForm.get("smsProviderConfiguration").setValidators([]):this.sendSmsConfigForm.get("smsProviderConfiguration").setValidators([O.required]),this.sendSmsConfigForm.get("smsProviderConfiguration").updateValueAndValidity({emitEvent:e})}}e("SendSmsConfigComponent",fr),fr.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:fr,deps:[{token:P.Store},{token:R.UntypedFormBuilder}],target:t.ɵɵFactoryTarget.Component}),fr.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:fr,selector:"tb-external-node-send-sms-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="sendSmsConfigForm" fxLayout="column">\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.numbers-to-template</mat-label>\n    <input required matInput formControlName="numbersToTemplate">\n    <mat-error *ngIf="sendSmsConfigForm.get(\'numbersToTemplate\').hasError(\'required\')">\n      {{ \'tb.rulenode.numbers-to-template-required\' | translate }}\n    </mat-error>\n    <mat-hint [innerHTML]="\'tb.rulenode.numbers-to-template-hint\' | translate | safe: \'html\'"></mat-hint>\n  </mat-form-field>\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.sms-message-template</mat-label>\n    <textarea required matInput formControlName="smsMessageTemplate" rows="6"></textarea>\n    <mat-error *ngIf="sendSmsConfigForm.get(\'smsMessageTemplate\').hasError(\'required\')">\n      {{ \'tb.rulenode.sms-message-template-required\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n  </mat-form-field>\n  <mat-checkbox formControlName="useSystemSmsSettings">\n    {{ \'tb.rulenode.use-system-sms-settings\' | translate }}\n  </mat-checkbox>\n  <tb-sms-provider-configuration\n    *ngIf="sendSmsConfigForm.get(\'useSystemSmsSettings\').value === false"\n    formControlName="smsProviderConfiguration"\n    required>\n  </tb-sms-provider-configuration>\n</section>\n',dependencies:[{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:Q.MatCheckbox,selector:"mat-checkbox",inputs:["disableRipple","color","tabIndex"],exportAs:["matCheckbox"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatHint,selector:"mat-hint",inputs:["align","id"]},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"component",type:ot.SmsProviderConfigurationComponent,selector:"tb-sms-provider-configuration",inputs:["required","disabled"]},{kind:"pipe",type:he.SafePipe,name:"safe"},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:fr,decorators:[{type:n,args:[{selector:"tb-external-node-send-sms-config",template:'<section [formGroup]="sendSmsConfigForm" fxLayout="column">\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.numbers-to-template</mat-label>\n    <input required matInput formControlName="numbersToTemplate">\n    <mat-error *ngIf="sendSmsConfigForm.get(\'numbersToTemplate\').hasError(\'required\')">\n      {{ \'tb.rulenode.numbers-to-template-required\' | translate }}\n    </mat-error>\n    <mat-hint [innerHTML]="\'tb.rulenode.numbers-to-template-hint\' | translate | safe: \'html\'"></mat-hint>\n  </mat-form-field>\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.sms-message-template</mat-label>\n    <textarea required matInput formControlName="smsMessageTemplate" rows="6"></textarea>\n    <mat-error *ngIf="sendSmsConfigForm.get(\'smsMessageTemplate\').hasError(\'required\')">\n      {{ \'tb.rulenode.sms-message-template-required\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n  </mat-form-field>\n  <mat-checkbox formControlName="useSystemSmsSettings">\n    {{ \'tb.rulenode.use-system-sms-settings\' | translate }}\n  </mat-checkbox>\n  <tb-sms-provider-configuration\n    *ngIf="sendSmsConfigForm.get(\'useSystemSmsSettings\').value === false"\n    formControlName="smsProviderConfiguration"\n    required>\n  </tb-sms-provider-configuration>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder}]}});class gr extends f{constructor(e,t){super(e),this.store=e,this.fb=t,this.slackChanelTypes=Object.keys(w),this.slackChanelTypesTranslateMap=V}configForm(){return this.slackConfigForm}onConfigurationSet(e){this.slackConfigForm=this.fb.group({botToken:[e?e.botToken:null],useSystemSettings:[!!e&&e.useSystemSettings],messageTemplate:[e?e.messageTemplate:null,[O.required]],conversationType:[e?e.conversationType:null,[O.required]],conversation:[e?e.conversation:null,[O.required]]})}validatorTriggers(){return["useSystemSettings"]}updateValidators(e){this.slackConfigForm.get("useSystemSettings").value?this.slackConfigForm.get("botToken").clearValidators():this.slackConfigForm.get("botToken").setValidators([O.required]),this.slackConfigForm.get("botToken").updateValueAndValidity({emitEvent:e})}}e("SlackConfigComponent",gr),gr.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:gr,deps:[{token:P.Store},{token:R.FormBuilder}],target:t.ɵɵFactoryTarget.Component}),gr.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:gr,selector:"tb-external-node-slack-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="slackConfigForm" fxLayout="column">\n  <mat-form-field fxFlex class="mat-block">\n    <mat-label translate>tb.rulenode.message-template</mat-label>\n    <input required matInput formControlName="messageTemplate">\n    <mat-error *ngIf="slackConfigForm.get(\'messageTemplate\').hasError(\'required\')">\n      {{ \'tb.rulenode.message-template-required\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n  </mat-form-field>\n  <mat-checkbox formControlName="useSystemSettings">\n    {{ \'tb.rulenode.use-system-slack-settings\' | translate }}\n  </mat-checkbox>\n  <mat-form-field *ngIf="!slackConfigForm.get(\'useSystemSettings\').value" class="mat-block">\n    <mat-label translate>tb.rulenode.slack-api-token</mat-label>\n    <input required matInput formControlName="botToken">\n    <mat-error *ngIf="slackConfigForm.get(\'botToken\').hasError(\'required\')">\n      {{ \'tb.rulenode.slack-api-token-required\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <label class="tb-title">{{ \'notification.slack-chanel-type\' | translate }}</label>\n  <mat-radio-group formControlName="conversationType">\n    <mat-radio-button *ngFor="let slackChanelType of slackChanelTypes" [value]="slackChanelType">\n      {{ slackChanelTypesTranslateMap.get(slackChanelType) | translate }}\n    </mat-radio-button>\n  </mat-radio-group>\n  <tb-slack-conversation-autocomplete\n    formControlName="conversation"\n    required\n    [token]="slackConfigForm.get(\'useSystemSettings\').value ? \'\' : slackConfigForm.get(\'botToken\').value"\n    [slackChanelType]="slackConfigForm.get(\'conversationType\').value">\n  </tb-slack-conversation-autocomplete>\n</section>\n',styles:[":host .tb-title{display:block;padding-bottom:6px}:host ::ng-deep .mat-mdc-radio-group{display:flex;flex-direction:row;margin-bottom:22px;gap:12px}:host ::ng-deep .mat-mdc-radio-group .mat-mdc-radio-button{flex:1 1 100%;padding:4px;border:1px solid rgba(0,0,0,.12);border-radius:6px}@media screen and (max-width: 599px){:host ::ng-deep .mat-mdc-radio-group{flex-direction:column}}\n"],dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:Q.MatCheckbox,selector:"mat-checkbox",inputs:["disableRipple","color","tabIndex"],exportAs:["matCheckbox"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatHint,selector:"mat-hint",inputs:["align","id"]},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"directive",type:at.MatRadioGroup,selector:"mat-radio-group",exportAs:["matRadioGroup"]},{kind:"component",type:at.MatRadioButton,selector:"mat-radio-button",inputs:["disableRipple","tabIndex"],exportAs:["matRadioButton"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:W.DefaultFlexDirective,selector:"  [fxFlex], [fxFlex.xs], [fxFlex.sm], [fxFlex.md],  [fxFlex.lg], [fxFlex.xl], [fxFlex.lt-sm], [fxFlex.lt-md],  [fxFlex.lt-lg], [fxFlex.lt-xl], [fxFlex.gt-xs], [fxFlex.gt-sm],  [fxFlex.gt-md], [fxFlex.gt-lg]",inputs:["fxFlex","fxFlex.xs","fxFlex.sm","fxFlex.md","fxFlex.lg","fxFlex.xl","fxFlex.lt-sm","fxFlex.lt-md","fxFlex.lt-lg","fxFlex.lt-xl","fxFlex.gt-xs","fxFlex.gt-sm","fxFlex.gt-md","fxFlex.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"component",type:it.SlackConversationAutocompleteComponent,selector:"tb-slack-conversation-autocomplete",inputs:["labelText","requiredText","required","disabled","slackChanelType","token"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:gr,decorators:[{type:n,args:[{selector:"tb-external-node-slack-config",template:'<section [formGroup]="slackConfigForm" fxLayout="column">\n  <mat-form-field fxFlex class="mat-block">\n    <mat-label translate>tb.rulenode.message-template</mat-label>\n    <input required matInput formControlName="messageTemplate">\n    <mat-error *ngIf="slackConfigForm.get(\'messageTemplate\').hasError(\'required\')">\n      {{ \'tb.rulenode.message-template-required\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n  </mat-form-field>\n  <mat-checkbox formControlName="useSystemSettings">\n    {{ \'tb.rulenode.use-system-slack-settings\' | translate }}\n  </mat-checkbox>\n  <mat-form-field *ngIf="!slackConfigForm.get(\'useSystemSettings\').value" class="mat-block">\n    <mat-label translate>tb.rulenode.slack-api-token</mat-label>\n    <input required matInput formControlName="botToken">\n    <mat-error *ngIf="slackConfigForm.get(\'botToken\').hasError(\'required\')">\n      {{ \'tb.rulenode.slack-api-token-required\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <label class="tb-title">{{ \'notification.slack-chanel-type\' | translate }}</label>\n  <mat-radio-group formControlName="conversationType">\n    <mat-radio-button *ngFor="let slackChanelType of slackChanelTypes" [value]="slackChanelType">\n      {{ slackChanelTypesTranslateMap.get(slackChanelType) | translate }}\n    </mat-radio-button>\n  </mat-radio-group>\n  <tb-slack-conversation-autocomplete\n    formControlName="conversation"\n    required\n    [token]="slackConfigForm.get(\'useSystemSettings\').value ? \'\' : slackConfigForm.get(\'botToken\').value"\n    [slackChanelType]="slackConfigForm.get(\'conversationType\').value">\n  </tb-slack-conversation-autocomplete>\n</section>\n',styles:[":host .tb-title{display:block;padding-bottom:6px}:host ::ng-deep .mat-mdc-radio-group{display:flex;flex-direction:row;margin-bottom:22px;gap:12px}:host ::ng-deep .mat-mdc-radio-group .mat-mdc-radio-button{flex:1 1 100%;padding:4px;border:1px solid rgba(0,0,0,.12);border-radius:6px}@media screen and (max-width: 599px){:host ::ng-deep .mat-mdc-radio-group{flex-direction:column}}\n"]}]}],ctorParameters:function(){return[{type:P.Store},{type:R.FormBuilder}]}});class yr extends f{constructor(e,t){super(e),this.store=e,this.fb=t}configForm(){return this.snsConfigForm}onConfigurationSet(e){this.snsConfigForm=this.fb.group({topicArnPattern:[e?e.topicArnPattern:null,[O.required]],accessKeyId:[e?e.accessKeyId:null,[O.required]],secretAccessKey:[e?e.secretAccessKey:null,[O.required]],region:[e?e.region:null,[O.required]]})}}e("SnsConfigComponent",yr),yr.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:yr,deps:[{token:P.Store},{token:R.UntypedFormBuilder}],target:t.ɵɵFactoryTarget.Component}),yr.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:yr,selector:"tb-external-node-sns-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="snsConfigForm" fxLayout="column">\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.topic-arn-pattern</mat-label>\n    <input required matInput formControlName="topicArnPattern">\n    <mat-error *ngIf="snsConfigForm.get(\'topicArnPattern\').hasError(\'required\')">\n      {{ \'tb.rulenode.topic-arn-pattern-required\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.aws-access-key-id</mat-label>\n    <input required matInput formControlName="accessKeyId">\n    <mat-error *ngIf="snsConfigForm.get(\'accessKeyId\').hasError(\'required\')">\n      {{ \'tb.rulenode.aws-access-key-id-required\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.aws-secret-access-key</mat-label>\n    <input required matInput formControlName="secretAccessKey">\n    <mat-error *ngIf="snsConfigForm.get(\'secretAccessKey\').hasError(\'required\')">\n      {{ \'tb.rulenode.aws-secret-access-key-required\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.aws-region</mat-label>\n    <input required matInput formControlName="region">\n    <mat-error *ngIf="snsConfigForm.get(\'region\').hasError(\'required\')">\n      {{ \'tb.rulenode.aws-region-required\' | translate }}\n    </mat-error>\n  </mat-form-field>\n</section>\n',dependencies:[{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatHint,selector:"mat-hint",inputs:["align","id"]},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:yr,decorators:[{type:n,args:[{selector:"tb-external-node-sns-config",template:'<section [formGroup]="snsConfigForm" fxLayout="column">\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.topic-arn-pattern</mat-label>\n    <input required matInput formControlName="topicArnPattern">\n    <mat-error *ngIf="snsConfigForm.get(\'topicArnPattern\').hasError(\'required\')">\n      {{ \'tb.rulenode.topic-arn-pattern-required\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.aws-access-key-id</mat-label>\n    <input required matInput formControlName="accessKeyId">\n    <mat-error *ngIf="snsConfigForm.get(\'accessKeyId\').hasError(\'required\')">\n      {{ \'tb.rulenode.aws-access-key-id-required\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.aws-secret-access-key</mat-label>\n    <input required matInput formControlName="secretAccessKey">\n    <mat-error *ngIf="snsConfigForm.get(\'secretAccessKey\').hasError(\'required\')">\n      {{ \'tb.rulenode.aws-secret-access-key-required\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.aws-region</mat-label>\n    <input required matInput formControlName="region">\n    <mat-error *ngIf="snsConfigForm.get(\'region\').hasError(\'required\')">\n      {{ \'tb.rulenode.aws-region-required\' | translate }}\n    </mat-error>\n  </mat-form-field>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder}]}});class xr extends f{constructor(e,t){super(e),this.store=e,this.fb=t,this.sqsQueueType=Bt,this.sqsQueueTypes=Object.keys(Bt),this.sqsQueueTypeTranslationsMap=Kt}configForm(){return this.sqsConfigForm}onConfigurationSet(e){this.sqsConfigForm=this.fb.group({queueType:[e?e.queueType:null,[O.required]],queueUrlPattern:[e?e.queueUrlPattern:null,[O.required]],delaySeconds:[e?e.delaySeconds:null,[O.min(0),O.max(900)]],messageAttributes:[e?e.messageAttributes:null,[]],accessKeyId:[e?e.accessKeyId:null,[O.required]],secretAccessKey:[e?e.secretAccessKey:null,[O.required]],region:[e?e.region:null,[O.required]]})}}e("SqsConfigComponent",xr),xr.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:xr,deps:[{token:P.Store},{token:R.UntypedFormBuilder}],target:t.ɵɵFactoryTarget.Component}),xr.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:xr,selector:"tb-external-node-sqs-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="sqsConfigForm" fxLayout="column">\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.queue-type</mat-label>\n    <mat-select formControlName="queueType" required>\n      <mat-option *ngFor="let type of sqsQueueTypes" [value]="type">\n        {{ sqsQueueTypeTranslationsMap.get(type) | translate }}\n      </mat-option>\n    </mat-select>\n  </mat-form-field>\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.queue-url-pattern</mat-label>\n    <input required matInput formControlName="queueUrlPattern">\n    <mat-error *ngIf="sqsConfigForm.get(\'queueUrlPattern\').hasError(\'required\')">\n      {{ \'tb.rulenode.queue-url-pattern-required\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n  </mat-form-field>\n  <mat-form-field *ngIf="sqsConfigForm.get(\'queueType\').value === sqsQueueType.STANDARD" class="mat-block">\n    <mat-label translate>tb.rulenode.delay-seconds</mat-label>\n    <input required type="number" min="0" max="900" step="1" matInput formControlName="delaySeconds">\n    <mat-error *ngIf="sqsConfigForm.get(\'delaySeconds\').hasError(\'min\')">\n      {{ \'tb.rulenode.min-delay-seconds-message\' | translate }}\n    </mat-error>\n    <mat-error *ngIf="sqsConfigForm.get(\'delaySeconds\').hasError(\'max\')">\n      {{ \'tb.rulenode.max-delay-seconds-message\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <label translate class="tb-title">tb.rulenode.message-attributes</label>\n  <div class="tb-hint" [innerHTML]="\'tb.rulenode.message-attributes-hint\' | translate | safe: \'html\'"></div>\n  <tb-kv-map-config-old\n    required="false"\n    formControlName="messageAttributes"\n    keyText="tb.rulenode.name"\n    keyRequiredText="tb.rulenode.name-required"\n    valText="tb.rulenode.value"\n    valRequiredText="tb.rulenode.value-required">\n  </tb-kv-map-config-old>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.aws-access-key-id</mat-label>\n    <input required matInput formControlName="accessKeyId">\n    <mat-error *ngIf="sqsConfigForm.get(\'accessKeyId\').hasError(\'required\')">\n      {{ \'tb.rulenode.aws-access-key-id-required\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.aws-secret-access-key</mat-label>\n    <input required matInput formControlName="secretAccessKey">\n    <mat-error *ngIf="sqsConfigForm.get(\'secretAccessKey\').hasError(\'required\')">\n      {{ \'tb.rulenode.aws-secret-access-key-required\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.aws-region</mat-label>\n    <input required matInput formControlName="region">\n    <mat-error *ngIf="sqsConfigForm.get(\'region\').hasError(\'required\')">\n      {{ \'tb.rulenode.aws-region-required\' | translate }}\n    </mat-error>\n  </mat-form-field>\n</section>\n',dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatHint,selector:"mat-hint",inputs:["align","id"]},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"component",type:X.MatSelect,selector:"mat-select",inputs:["disabled","disableRipple","tabIndex","hideSingleSelectionIndicator"],exportAs:["matSelect"]},{kind:"component",type:ee.MatOption,selector:"mat-option",exportAs:["matOption"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NumberValueAccessor,selector:"input[type=number][formControlName],input[type=number][formControl],input[type=number][ngModel]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.MinValidator,selector:"input[type=number][min][formControlName],input[type=number][min][formControl],input[type=number][min][ngModel]",inputs:["min"]},{kind:"directive",type:R.MaxValidator,selector:"input[type=number][max][formControlName],input[type=number][max][formControl],input[type=number][max][ngModel]",inputs:["max"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"component",type:Cn,selector:"tb-kv-map-config-old",inputs:["disabled","uniqueKeyValuePairValidator","requiredText","keyText","keyRequiredText","valText","valRequiredText","hintText","required"]},{kind:"pipe",type:he.SafePipe,name:"safe"},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:xr,decorators:[{type:n,args:[{selector:"tb-external-node-sqs-config",template:'<section [formGroup]="sqsConfigForm" fxLayout="column">\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.queue-type</mat-label>\n    <mat-select formControlName="queueType" required>\n      <mat-option *ngFor="let type of sqsQueueTypes" [value]="type">\n        {{ sqsQueueTypeTranslationsMap.get(type) | translate }}\n      </mat-option>\n    </mat-select>\n  </mat-form-field>\n  <mat-form-field class="mat-block" subscriptSizing="dynamic">\n    <mat-label translate>tb.rulenode.queue-url-pattern</mat-label>\n    <input required matInput formControlName="queueUrlPattern">\n    <mat-error *ngIf="sqsConfigForm.get(\'queueUrlPattern\').hasError(\'required\')">\n      {{ \'tb.rulenode.queue-url-pattern-required\' | translate }}\n    </mat-error>\n    <mat-hint translate>tb.rulenode.general-pattern-hint</mat-hint>\n  </mat-form-field>\n  <mat-form-field *ngIf="sqsConfigForm.get(\'queueType\').value === sqsQueueType.STANDARD" class="mat-block">\n    <mat-label translate>tb.rulenode.delay-seconds</mat-label>\n    <input required type="number" min="0" max="900" step="1" matInput formControlName="delaySeconds">\n    <mat-error *ngIf="sqsConfigForm.get(\'delaySeconds\').hasError(\'min\')">\n      {{ \'tb.rulenode.min-delay-seconds-message\' | translate }}\n    </mat-error>\n    <mat-error *ngIf="sqsConfigForm.get(\'delaySeconds\').hasError(\'max\')">\n      {{ \'tb.rulenode.max-delay-seconds-message\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <label translate class="tb-title">tb.rulenode.message-attributes</label>\n  <div class="tb-hint" [innerHTML]="\'tb.rulenode.message-attributes-hint\' | translate | safe: \'html\'"></div>\n  <tb-kv-map-config-old\n    required="false"\n    formControlName="messageAttributes"\n    keyText="tb.rulenode.name"\n    keyRequiredText="tb.rulenode.name-required"\n    valText="tb.rulenode.value"\n    valRequiredText="tb.rulenode.value-required">\n  </tb-kv-map-config-old>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.aws-access-key-id</mat-label>\n    <input required matInput formControlName="accessKeyId">\n    <mat-error *ngIf="sqsConfigForm.get(\'accessKeyId\').hasError(\'required\')">\n      {{ \'tb.rulenode.aws-access-key-id-required\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.aws-secret-access-key</mat-label>\n    <input required matInput formControlName="secretAccessKey">\n    <mat-error *ngIf="sqsConfigForm.get(\'secretAccessKey\').hasError(\'required\')">\n      {{ \'tb.rulenode.aws-secret-access-key-required\' | translate }}\n    </mat-error>\n  </mat-form-field>\n  <mat-form-field class="mat-block">\n    <mat-label translate>tb.rulenode.aws-region</mat-label>\n    <input required matInput formControlName="region">\n    <mat-error *ngIf="sqsConfigForm.get(\'region\').hasError(\'required\')">\n      {{ \'tb.rulenode.aws-region-required\' | translate }}\n    </mat-error>\n  </mat-form-field>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder}]}});class br{}e("RulenodeCoreConfigExternalModule",br),br.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:br,deps:[],target:t.ɵɵFactoryTarget.NgModule}),br.ɵmod=t.ɵɵngDeclareNgModule({minVersion:"14.0.0",version:"15.2.10",ngImport:t,type:br,declarations:[yr,xr,pr,lr,sr,mr,dr,ur,cr,ir,fr,gr],imports:[$,M,_e,$n],exports:[yr,xr,pr,lr,sr,mr,dr,ur,cr,ir,fr,gr]}),br.ɵinj=t.ɵɵngDeclareInjector({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:br,imports:[$,M,_e,$n]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:br,decorators:[{type:c,args:[{declarations:[yr,xr,pr,lr,sr,mr,dr,ur,cr,ir,fr,gr],imports:[$,M,_e,$n],exports:[yr,xr,pr,lr,sr,mr,dr,ur,cr,ir,fr,gr]}]}]});class hr extends f{constructor(e,t){super(e),this.store=e,this.fb=t,this.searchText=""}configForm(){return this.alarmStatusConfigForm}prepareInputConfig(e){return{alarmStatusList:ae(e?.alarmStatusList)?e.alarmStatusList:null}}onConfigurationSet(e){this.alarmStatusConfigForm=this.fb.group({alarmStatusList:[e.alarmStatusList,[O.required]]})}}e("CheckAlarmStatusComponent",hr),hr.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:hr,deps:[{token:P.Store},{token:R.FormBuilder}],target:t.ɵɵFactoryTarget.Component}),hr.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:hr,selector:"tb-filter-node-check-alarm-status-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="alarmStatusConfigForm" class="tb-form-panel stroked">\n  <div class="tb-form-row no-padding no-border space-between">\n    <div class="tb-form-panel-title tb-required" translate>tb.rulenode.alarm-status</div>\n    <div class="tb-form-panel-hint tb-error" translate [hidden]="alarmStatusConfigForm.get(\'alarmStatusList\').valid">\n      tb.rulenode.alarm-required\n    </div>\n  </div>\n  <tb-alarm-status-select formControlName="alarmStatusList"></tb-alarm-status-select>\n</section>\n\n\n\n',styles:[':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n'],dependencies:[{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"component",type:jn,selector:"tb-alarm-status-select"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:hr,decorators:[{type:n,args:[{selector:"tb-filter-node-check-alarm-status-config",template:'<section [formGroup]="alarmStatusConfigForm" class="tb-form-panel stroked">\n  <div class="tb-form-row no-padding no-border space-between">\n    <div class="tb-form-panel-title tb-required" translate>tb.rulenode.alarm-status</div>\n    <div class="tb-form-panel-hint tb-error" translate [hidden]="alarmStatusConfigForm.get(\'alarmStatusList\').valid">\n      tb.rulenode.alarm-required\n    </div>\n  </div>\n  <tb-alarm-status-select formControlName="alarmStatusList"></tb-alarm-status-select>\n</section>\n\n\n\n',styles:[':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n']}]}],ctorParameters:function(){return[{type:P.Store},{type:R.FormBuilder}]}});class vr extends f{constructor(e,t){super(e),this.store=e,this.fb=t}configForm(){return this.checkMessageConfigForm}prepareInputConfig(e){return{messageNames:ae(e?.messageNames)?e.messageNames:[],metadataNames:ae(e?.metadataNames)?e.metadataNames:[],checkAllKeys:!!ae(e?.checkAllKeys)&&e.checkAllKeys}}prepareOutputConfig(e){return{messageNames:ae(e?.messageNames)?e.messageNames:[],metadataNames:ae(e?.metadataNames)?e.metadataNames:[],checkAllKeys:e.checkAllKeys}}atLeastOne(e,t=null){return n=>{t||(t=Object.keys(n.controls));return n?.controls&&t.some((t=>!e(n.controls[t])))?null:{atLeastOne:!0}}}onConfigurationSet(e){this.checkMessageConfigForm=this.fb.group({messageNames:[e.messageNames,[]],metadataNames:[e.metadataNames,[]],checkAllKeys:[e.checkAllKeys,[]]},{validators:this.atLeastOne(O.required,["messageNames","metadataNames"])})}get touchedValidationControl(){return["messageNames","metadataNames"].some((e=>this.checkMessageConfigForm.get(e).touched))}}e("CheckMessageConfigComponent",vr),vr.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:vr,deps:[{token:P.Store},{token:R.FormBuilder}],target:t.ɵɵFactoryTarget.Component}),vr.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:vr,selector:"tb-filter-node-check-message-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="checkMessageConfigForm" class="tb-form-panel stroked">\n  <div class="tb-form-row no-padding no-border space-between">\n    <div class="tb-form-panel-title tb-required" translate>tb.rulenode.fields-to-check</div>\n    <div class="tb-form-panel-hint tb-error" translate [hidden]="!(touchedValidationControl && checkMessageConfigForm.hasError(\'atLeastOne\'))">\n      tb.rulenode.at-least-one-field-required\n    </div>\n  </div>\n  <tb-string-items-list editable subscriptSizing="dynamic"\n                        [label]="\'tb.rulenode.data-keys\' | translate"\n                        [placeholder]="\'tb.rulenode.add-message-field\' | translate"\n                        formControlName="messageNames">\n    <mat-icon matSuffix color="primary" class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon"\n              matTooltip="{{ \'tb.rulenode.chip-help\' | translate: { inputName: \'tb.rulenode.field-name\' | translate } }}">help</mat-icon>\n  </tb-string-items-list>\n  <tb-string-items-list editable subscriptSizing="dynamic"\n                        [label]="\'tb.rulenode.metadata-keys\' | translate"\n                        [placeholder]="\'tb.rulenode.add-metadata-field\' | translate"\n                        formControlName="metadataNames">\n    <mat-icon matSuffix color="primary" class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon"\n              matTooltip="{{ \'tb.rulenode.chip-help\' | translate: { inputName: \'tb.rulenode.field-name\' | translate } }}">help</mat-icon>\n  </tb-string-items-list>\n  <div tb-hint-tooltip-icon="{{ \'tb.rulenode.check-all-keys-tooltip\' | translate }}"\n       class="tb-form-row no-border no-padding">\n    <mat-slide-toggle class="mat-slide" formControlName="checkAllKeys">\n      {{ \'tb.rulenode.check-all-keys\' | translate }}\n    </mat-slide-toggle>\n  </div>\n</section>\n',styles:[':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n'],dependencies:[{kind:"component",type:et.StringItemsListComponent,selector:"tb-string-items-list",inputs:["required","disabled","label","placeholder","hint","requiredText","floatLabel","appearance","editable","subscriptSizing","predefinedValues"]},{kind:"component",type:ue.MatIcon,selector:"mat-icon",inputs:["color","inline","svgIcon","fontSet","fontIcon"],exportAs:["matIcon"]},{kind:"directive",type:Y.MatSuffix,selector:"[matSuffix], [matIconSuffix], [matTextSuffix]",inputs:["matTextSuffix"]},{kind:"directive",type:ce.MatTooltip,selector:"[matTooltip]",exportAs:["matTooltip"]},{kind:"component",type:te.MatSlideToggle,selector:"mat-slide-toggle",inputs:["disabled","disableRipple","color","tabIndex"],exportAs:["matSlideToggle"]},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"component",type:ne.HintTooltipIconComponent,selector:"[tb-hint-tooltip-icon]",inputs:["tb-hint-tooltip-icon","tooltipPosition","hintIcon"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:vr,decorators:[{type:n,args:[{selector:"tb-filter-node-check-message-config",template:'<section [formGroup]="checkMessageConfigForm" class="tb-form-panel stroked">\n  <div class="tb-form-row no-padding no-border space-between">\n    <div class="tb-form-panel-title tb-required" translate>tb.rulenode.fields-to-check</div>\n    <div class="tb-form-panel-hint tb-error" translate [hidden]="!(touchedValidationControl && checkMessageConfigForm.hasError(\'atLeastOne\'))">\n      tb.rulenode.at-least-one-field-required\n    </div>\n  </div>\n  <tb-string-items-list editable subscriptSizing="dynamic"\n                        [label]="\'tb.rulenode.data-keys\' | translate"\n                        [placeholder]="\'tb.rulenode.add-message-field\' | translate"\n                        formControlName="messageNames">\n    <mat-icon matSuffix color="primary" class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon"\n              matTooltip="{{ \'tb.rulenode.chip-help\' | translate: { inputName: \'tb.rulenode.field-name\' | translate } }}">help</mat-icon>\n  </tb-string-items-list>\n  <tb-string-items-list editable subscriptSizing="dynamic"\n                        [label]="\'tb.rulenode.metadata-keys\' | translate"\n                        [placeholder]="\'tb.rulenode.add-metadata-field\' | translate"\n                        formControlName="metadataNames">\n    <mat-icon matSuffix color="primary" class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon"\n              matTooltip="{{ \'tb.rulenode.chip-help\' | translate: { inputName: \'tb.rulenode.field-name\' | translate } }}">help</mat-icon>\n  </tb-string-items-list>\n  <div tb-hint-tooltip-icon="{{ \'tb.rulenode.check-all-keys-tooltip\' | translate }}"\n       class="tb-form-row no-border no-padding">\n    <mat-slide-toggle class="mat-slide" formControlName="checkAllKeys">\n      {{ \'tb.rulenode.check-all-keys\' | translate }}\n    </mat-slide-toggle>\n  </div>\n</section>\n',styles:[':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n']}]}],ctorParameters:function(){return[{type:P.Store},{type:R.FormBuilder}]}});class Cr extends f{constructor(e,t){super(e),this.store=e,this.fb=t,this.entitySearchDirection=Object.values(v),this.entitySearchDirectionTranslationsMap=C}configForm(){return this.checkRelationConfigForm}prepareInputConfig(e){return{checkForSingleEntity:!!ae(e?.checkForSingleEntity)&&e.checkForSingleEntity,direction:ae(e?.direction)?e.direction:null,entityType:ae(e?.entityType)?e.entityType:null,entityId:ae(e?.entityId)?e.entityId:null,relationType:ae(e?.relationType)?e.relationType:null}}onConfigurationSet(e){this.checkRelationConfigForm=this.fb.group({checkForSingleEntity:[e.checkForSingleEntity,[]],direction:[e.direction,[]],entityType:[e.entityType,e&&e.checkForSingleEntity?[O.required]:[]],entityId:[e.entityId,e&&e.checkForSingleEntity?[O.required]:[]],relationType:[e.relationType,[O.required]]})}validatorTriggers(){return["checkForSingleEntity"]}updateValidators(e){const t=this.checkRelationConfigForm.get("checkForSingleEntity").value;this.checkRelationConfigForm.get("entityType").setValidators(t?[O.required]:[]),this.checkRelationConfigForm.get("entityType").updateValueAndValidity({emitEvent:e}),this.checkRelationConfigForm.get("entityId").setValidators(t?[O.required]:[]),this.checkRelationConfigForm.get("entityId").updateValueAndValidity({emitEvent:e})}}e("CheckRelationConfigComponent",Cr),Cr.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Cr,deps:[{token:P.Store},{token:R.UntypedFormBuilder}],target:t.ɵɵFactoryTarget.Component}),Cr.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:Cr,selector:"tb-filter-node-check-relation-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="checkRelationConfigForm" class="tb-form-panel stroked no-padding-bottom">\n  <div class="tb-form-panel-title" translate>tb.rulenode.relation-search-parameters</div>\n  <div fxLayout="column">\n    <mat-form-field class="mat-block" hideRequiredMarker>\n      <mat-label>{{ \'relation.direction\' | translate }}</mat-label>\n      <mat-select formControlName="direction" required>\n        <mat-option *ngFor="let direction of entitySearchDirection" [value]="direction">\n          {{ entitySearchDirectionTranslationsMap.get(direction) | translate }} <span translate>tb.rulenode.relations-query-config-direction-suffix</span>\n        </mat-option>\n      </mat-select>\n    </mat-form-field>\n    <tb-relation-type-autocomplete\n      required\n      formControlName="relationType">\n    </tb-relation-type-autocomplete>\n    <div tb-hint-tooltip-icon="{{ \'tb.rulenode.check-relation-to-specific-entity-tooltip\' | translate }}"\n         class="tb-form-row no-border no-padding slide-toggle">\n      <mat-slide-toggle class="mat-slide" formControlName="checkForSingleEntity">\n        {{ \'tb.rulenode.check-relation-to-specific-entity\' | translate }}\n      </mat-slide-toggle>\n    </div>\n    <div *ngIf="checkRelationConfigForm.get(\'checkForSingleEntity\').value" class="same-width-component-row">\n      <tb-entity-type-select\n        style="min-width: 100px; flex: 1;"\n        showLabel\n        required\n        formControlName="entityType">\n      </tb-entity-type-select>\n      <tb-entity-autocomplete\n        fxFlex\n        required\n        *ngIf="checkRelationConfigForm.get(\'entityType\').value"\n        [entityType]="checkRelationConfigForm.get(\'entityType\').value"\n        formControlName="entityId">\n      </tb-entity-autocomplete>\n    </div>\n  </div>\n</section>\n',styles:[":host .slide-toggle{margin-bottom:18px}\n",':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n'],dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:lt.EntityAutocompleteComponent,selector:"tb-entity-autocomplete",inputs:["entityType","entitySubtype","excludeEntityIds","labelText","requiredText","useFullEntityId","appearance","required","disabled"],outputs:["entityChanged"]},{kind:"component",type:ve.EntityTypeSelectComponent,selector:"tb-entity-type-select",inputs:["allowedEntityTypes","useAliasEntityTypes","filterAllowedEntityTypes","showLabel","required","disabled"]},{kind:"component",type:Je.RelationTypeAutocompleteComponent,selector:"tb-relation-type-autocomplete",inputs:["showLabel","additionalClasses","appearance","required","disabled","subscriptSizing"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"component",type:X.MatSelect,selector:"mat-select",inputs:["disabled","disableRipple","tabIndex","hideSingleSelectionIndicator"],exportAs:["matSelect"]},{kind:"component",type:ee.MatOption,selector:"mat-option",exportAs:["matOption"]},{kind:"component",type:te.MatSlideToggle,selector:"mat-slide-toggle",inputs:["disabled","disableRipple","color","tabIndex"],exportAs:["matSlideToggle"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:W.DefaultFlexDirective,selector:"  [fxFlex], [fxFlex.xs], [fxFlex.sm], [fxFlex.md],  [fxFlex.lg], [fxFlex.xl], [fxFlex.lt-sm], [fxFlex.lt-md],  [fxFlex.lt-lg], [fxFlex.lt-xl], [fxFlex.gt-xs], [fxFlex.gt-sm],  [fxFlex.gt-md], [fxFlex.gt-lg]",inputs:["fxFlex","fxFlex.xs","fxFlex.sm","fxFlex.md","fxFlex.lg","fxFlex.xl","fxFlex.lt-sm","fxFlex.lt-md","fxFlex.lt-lg","fxFlex.lt-xl","fxFlex.gt-xs","fxFlex.gt-sm","fxFlex.gt-md","fxFlex.gt-lg"]},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"component",type:ne.HintTooltipIconComponent,selector:"[tb-hint-tooltip-icon]",inputs:["tb-hint-tooltip-icon","tooltipPosition","hintIcon"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Cr,decorators:[{type:n,args:[{selector:"tb-filter-node-check-relation-config",template:'<section [formGroup]="checkRelationConfigForm" class="tb-form-panel stroked no-padding-bottom">\n  <div class="tb-form-panel-title" translate>tb.rulenode.relation-search-parameters</div>\n  <div fxLayout="column">\n    <mat-form-field class="mat-block" hideRequiredMarker>\n      <mat-label>{{ \'relation.direction\' | translate }}</mat-label>\n      <mat-select formControlName="direction" required>\n        <mat-option *ngFor="let direction of entitySearchDirection" [value]="direction">\n          {{ entitySearchDirectionTranslationsMap.get(direction) | translate }} <span translate>tb.rulenode.relations-query-config-direction-suffix</span>\n        </mat-option>\n      </mat-select>\n    </mat-form-field>\n    <tb-relation-type-autocomplete\n      required\n      formControlName="relationType">\n    </tb-relation-type-autocomplete>\n    <div tb-hint-tooltip-icon="{{ \'tb.rulenode.check-relation-to-specific-entity-tooltip\' | translate }}"\n         class="tb-form-row no-border no-padding slide-toggle">\n      <mat-slide-toggle class="mat-slide" formControlName="checkForSingleEntity">\n        {{ \'tb.rulenode.check-relation-to-specific-entity\' | translate }}\n      </mat-slide-toggle>\n    </div>\n    <div *ngIf="checkRelationConfigForm.get(\'checkForSingleEntity\').value" class="same-width-component-row">\n      <tb-entity-type-select\n        style="min-width: 100px; flex: 1;"\n        showLabel\n        required\n        formControlName="entityType">\n      </tb-entity-type-select>\n      <tb-entity-autocomplete\n        fxFlex\n        required\n        *ngIf="checkRelationConfigForm.get(\'entityType\').value"\n        [entityType]="checkRelationConfigForm.get(\'entityType\').value"\n        formControlName="entityId">\n      </tb-entity-autocomplete>\n    </div>\n  </div>\n</section>\n',styles:[":host .slide-toggle{margin-bottom:18px}\n",':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n']}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder}]}});class Fr extends f{constructor(e,t){super(e),this.store=e,this.fb=t,this.perimeterType=Tt,this.perimeterTypes=Object.values(Tt),this.perimeterTypeTranslationMap=It,this.rangeUnits=Object.values(qt),this.rangeUnitTranslationMap=At,this.defaultPaddingEnable=!0}configForm(){return this.geoFilterConfigForm}prepareInputConfig(e){return{latitudeKeyName:ae(e?.latitudeKeyName)?e.latitudeKeyName:null,longitudeKeyName:ae(e?.longitudeKeyName)?e.longitudeKeyName:null,perimeterType:ae(e?.perimeterType)?e.perimeterType:null,fetchPerimeterInfoFromMessageMetadata:!!ae(e?.fetchPerimeterInfoFromMessageMetadata)&&e.fetchPerimeterInfoFromMessageMetadata,perimeterKeyName:ae(e?.perimeterKeyName)?e.perimeterKeyName:null,centerLatitude:ae(e?.centerLatitude)?e.centerLatitude:null,centerLongitude:ae(e?.centerLongitude)?e.centerLongitude:null,range:ae(e?.range)?e.range:null,rangeUnit:ae(e?.rangeUnit)?e.rangeUnit:null,polygonsDefinition:ae(e?.polygonsDefinition)?e.polygonsDefinition:null}}onConfigurationSet(e){this.geoFilterConfigForm=this.fb.group({latitudeKeyName:[e.latitudeKeyName,[O.required]],longitudeKeyName:[e.longitudeKeyName,[O.required]],perimeterType:[e.perimeterType,[O.required]],fetchPerimeterInfoFromMessageMetadata:[e.fetchPerimeterInfoFromMessageMetadata,[]],perimeterKeyName:[e.perimeterKeyName,[]],centerLatitude:[e.centerLatitude,[]],centerLongitude:[e.centerLongitude,[]],range:[e.range,[]],rangeUnit:[e.rangeUnit,[]],polygonsDefinition:[e.polygonsDefinition,[]]})}validatorTriggers(){return["fetchPerimeterInfoFromMessageMetadata","perimeterType"]}updateValidators(e){const t=this.geoFilterConfigForm.get("fetchPerimeterInfoFromMessageMetadata").value,n=this.geoFilterConfigForm.get("perimeterType").value;t?this.geoFilterConfigForm.get("perimeterKeyName").setValidators([O.required]):this.geoFilterConfigForm.get("perimeterKeyName").setValidators([]),t||n!==Tt.CIRCLE?(this.geoFilterConfigForm.get("centerLatitude").setValidators([]),this.geoFilterConfigForm.get("centerLongitude").setValidators([]),this.geoFilterConfigForm.get("range").setValidators([]),this.geoFilterConfigForm.get("rangeUnit").setValidators([]),this.defaultPaddingEnable=!0):(this.geoFilterConfigForm.get("centerLatitude").setValidators([O.required,O.min(-90),O.max(90)]),this.geoFilterConfigForm.get("centerLongitude").setValidators([O.required,O.min(-180),O.max(180)]),this.geoFilterConfigForm.get("range").setValidators([O.required,O.min(0)]),this.geoFilterConfigForm.get("rangeUnit").setValidators([O.required]),this.defaultPaddingEnable=!1),t||n!==Tt.POLYGON?this.geoFilterConfigForm.get("polygonsDefinition").setValidators([]):this.geoFilterConfigForm.get("polygonsDefinition").setValidators([O.required]),this.geoFilterConfigForm.get("perimeterKeyName").updateValueAndValidity({emitEvent:e}),this.geoFilterConfigForm.get("centerLatitude").updateValueAndValidity({emitEvent:e}),this.geoFilterConfigForm.get("centerLongitude").updateValueAndValidity({emitEvent:e}),this.geoFilterConfigForm.get("range").updateValueAndValidity({emitEvent:e}),this.geoFilterConfigForm.get("rangeUnit").updateValueAndValidity({emitEvent:e}),this.geoFilterConfigForm.get("polygonsDefinition").updateValueAndValidity({emitEvent:e})}}e("GpsGeoFilterConfigComponent",Fr),Fr.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Fr,deps:[{token:P.Store},{token:R.FormBuilder}],target:t.ɵɵFactoryTarget.Component}),Fr.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:Fr,selector:"tb-filter-node-gps-geofencing-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="geoFilterConfigForm" class="tb-form-panel no-border no-padding">\n  <section class="tb-form-panel stroked">\n    <div class="tb-form-panel-title" translate>tb.rulenode.coordinate-field-names</div>\n    <section>\n      <div fxLayout="row" fxLayoutGap="16px">\n        <mat-form-field fxFlex="50" class="mat-block">\n          <mat-label>{{ \'tb.rulenode.latitude-field-name\' | translate }}</mat-label>\n          <input matInput formControlName="latitudeKeyName" required>\n          <mat-error *ngIf="geoFilterConfigForm.get(\'latitudeKeyName\').hasError(\'required\')">\n            {{ \'tb.rulenode.latitude-field-name-required\' | translate }}\n          </mat-error>\n        </mat-form-field>\n        <mat-form-field fxFlex="50" class="mat-block">\n          <mat-label>{{ \'tb.rulenode.longitude-field-name\' | translate }}</mat-label>\n          <input matInput formControlName="longitudeKeyName" required>\n          <mat-error *ngIf="geoFilterConfigForm.get(\'longitudeKeyName\').hasError(\'required\')">\n            {{ \'tb.rulenode.longitude-field-name-required\' | translate }}\n          </mat-error>\n        </mat-form-field>\n      </div>\n    <div class="tb-form-hint tb-primary-fill" translate>tb.rulenode.coordinate-field-hint</div>\n    </section>\n  </section>\n  <section class="tb-form-panel stroked" [class.no-padding-bottom]="!defaultPaddingEnable">\n    <div class="tb-form-panel-title" translate>tb.rulenode.geofence-configuration</div>\n    <section fxLayout="column">\n      <mat-form-field fxFlex class="mat-block" hideRequiredMarker>\n        <mat-label>{{ \'tb.rulenode.perimeter-type\' | translate }}</mat-label>\n        <mat-select formControlName="perimeterType">\n          <mat-option *ngFor="let type of perimeterTypes" [value]="type">\n            {{ perimeterTypeTranslationMap.get(type) | translate }}\n          </mat-option>\n        </mat-select>\n      </mat-form-field>\n      <div tb-hint-tooltip-icon="{{ geoFilterConfigForm.get(\'perimeterType\').value === perimeterType.CIRCLE\n        ? (\'tb.rulenode.fetch-circle-parameter-info-from-metadata-hint\'\n            | translate : { perimeterKeyName: geoFilterConfigForm.get(\'perimeterKeyName\').valid\n                              ? geoFilterConfigForm.get(\'perimeterKeyName\').value\n                              : \'ss_perimeter\'})\n        : (\'tb.rulenode.fetch-poligon-parameter-info-from-metadata-hint\'\n            | translate : { perimeterKeyName: geoFilterConfigForm.get(\'perimeterKeyName\').valid\n                              ? geoFilterConfigForm.get(\'perimeterKeyName\').value\n                              : \'ss_perimeter\'}) }}"\n           class="tb-form-row no-border no-padding slide-toggle">\n        <mat-slide-toggle class="mat-slide" formControlName="fetchPerimeterInfoFromMessageMetadata">\n          {{ \'tb.rulenode.fetch-perimeter-info-from-metadata\' | translate }}\n        </mat-slide-toggle>\n      </div>\n      <mat-form-field *ngIf="geoFilterConfigForm.get(\'fetchPerimeterInfoFromMessageMetadata\').value" class="mat-block">\n        <mat-label>{{ \'tb.rulenode.perimeter-key-name\' | translate }}</mat-label>\n        <input matInput formControlName="perimeterKeyName" required>\n        <mat-error *ngIf="geoFilterConfigForm.get(\'perimeterKeyName\').hasError(\'required\')">\n          {{ \'tb.rulenode.perimeter-key-name-required\' | translate }}\n        </mat-error>\n        <mat-hint>{{ \'tb.rulenode.perimeter-key-name-hint\' | translate }}</mat-hint>\n      </mat-form-field>\n      <div fxLayout="column"\n           *ngIf="geoFilterConfigForm.get(\'perimeterType\').value === perimeterType.CIRCLE &&\n                    !geoFilterConfigForm.get(\'fetchPerimeterInfoFromMessageMetadata\').value">\n        <div fxLayout="row" fxLayoutGap="16px">\n          <mat-form-field fxFlex>\n            <mat-label>{{ \'tb.rulenode.circle-center-latitude\' | translate }}</mat-label>\n            <input type="number" min="-90" max="90" step="0.1" matInput formControlName="centerLatitude" required>\n            <mat-error *ngIf="geoFilterConfigForm.get(\'centerLatitude\').hasError(\'required\')">\n              {{ \'tb.rulenode.circle-center-latitude-required\' | translate }}\n            </mat-error>\n          </mat-form-field>\n          <mat-form-field fxFlex>\n            <mat-label>{{ \'tb.rulenode.circle-center-longitude\' | translate }}</mat-label>\n            <input type="number" min="-180" max="180" step="0.1" matInput formControlName="centerLongitude" required>\n            <mat-error *ngIf="geoFilterConfigForm.get(\'centerLongitude\').hasError(\'required\')">\n              {{ \'tb.rulenode.circle-center-longitude-required\' | translate }}\n            </mat-error>\n          </mat-form-field>\n        </div>\n        <div fxLayout="row" fxLayoutGap="16px">\n          <mat-form-field fxFlex>\n            <mat-label>{{ \'tb.rulenode.range\' | translate }}</mat-label>\n            <input type="number" min="0" step="0.1" matInput formControlName="range" required>\n            <mat-error *ngIf="geoFilterConfigForm.get(\'range\').hasError(\'required\')">\n              {{ \'tb.rulenode.range-required\' | translate }}\n            </mat-error>\n          </mat-form-field>\n          <mat-form-field fxFlex>\n            <mat-label>{{ \'tb.rulenode.range-units\' | translate }}</mat-label>\n            <mat-select formControlName="rangeUnit" required>\n              <mat-option *ngFor="let type of rangeUnits" [value]="type">\n                {{ rangeUnitTranslationMap.get(type) | translate }}\n              </mat-option>\n            </mat-select>\n            <mat-error *ngIf="geoFilterConfigForm.get(\'rangeUnit\').hasError(\'required\')">\n              {{ \'tb.rulenode.range-units-required\' | translate }}\n            </mat-error>\n          </mat-form-field>\n        </div>\n      </div>\n      <mat-form-field class="mat-block" subscriptSizing="dynamic"\n                      *ngIf="geoFilterConfigForm.get(\'perimeterType\').value === perimeterType.POLYGON &&\n                         !geoFilterConfigForm.get(\'fetchPerimeterInfoFromMessageMetadata\').value">\n        <mat-label>{{ \'tb.rulenode.polygon-definition\' | translate }}</mat-label>\n        <input matInput formControlName="polygonsDefinition" required>\n        <mat-hint>{{ \'tb.rulenode.polygon-definition-hint\' | translate }}</mat-hint>\n        <mat-error *ngIf="geoFilterConfigForm.get(\'polygonsDefinition\').hasError(\'required\')">\n          {{ \'tb.rulenode.polygon-definition-required\' | translate }}\n        </mat-error>\n      </mat-form-field>\n    </section>\n  </section>\n</section>\n',styles:[":host .slide-toggle{margin-bottom:18px}\n",':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n'],dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatHint,selector:"mat-hint",inputs:["align","id"]},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"component",type:X.MatSelect,selector:"mat-select",inputs:["disabled","disableRipple","tabIndex","hideSingleSelectionIndicator"],exportAs:["matSelect"]},{kind:"component",type:ee.MatOption,selector:"mat-option",exportAs:["matOption"]},{kind:"component",type:te.MatSlideToggle,selector:"mat-slide-toggle",inputs:["disabled","disableRipple","color","tabIndex"],exportAs:["matSlideToggle"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:W.DefaultLayoutGapDirective,selector:"  [fxLayoutGap], [fxLayoutGap.xs], [fxLayoutGap.sm], [fxLayoutGap.md],  [fxLayoutGap.lg], [fxLayoutGap.xl], [fxLayoutGap.lt-sm], [fxLayoutGap.lt-md],  [fxLayoutGap.lt-lg], [fxLayoutGap.lt-xl], [fxLayoutGap.gt-xs], [fxLayoutGap.gt-sm],  [fxLayoutGap.gt-md], [fxLayoutGap.gt-lg]",inputs:["fxLayoutGap","fxLayoutGap.xs","fxLayoutGap.sm","fxLayoutGap.md","fxLayoutGap.lg","fxLayoutGap.xl","fxLayoutGap.lt-sm","fxLayoutGap.lt-md","fxLayoutGap.lt-lg","fxLayoutGap.lt-xl","fxLayoutGap.gt-xs","fxLayoutGap.gt-sm","fxLayoutGap.gt-md","fxLayoutGap.gt-lg"]},{kind:"directive",type:W.DefaultFlexDirective,selector:"  [fxFlex], [fxFlex.xs], [fxFlex.sm], [fxFlex.md],  [fxFlex.lg], [fxFlex.xl], [fxFlex.lt-sm], [fxFlex.lt-md],  [fxFlex.lt-lg], [fxFlex.lt-xl], [fxFlex.gt-xs], [fxFlex.gt-sm],  [fxFlex.gt-md], [fxFlex.gt-lg]",inputs:["fxFlex","fxFlex.xs","fxFlex.sm","fxFlex.md","fxFlex.lg","fxFlex.xl","fxFlex.lt-sm","fxFlex.lt-md","fxFlex.lt-lg","fxFlex.lt-xl","fxFlex.gt-xs","fxFlex.gt-sm","fxFlex.gt-md","fxFlex.gt-lg"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NumberValueAccessor,selector:"input[type=number][formControlName],input[type=number][formControl],input[type=number][ngModel]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.MinValidator,selector:"input[type=number][min][formControlName],input[type=number][min][formControl],input[type=number][min][ngModel]",inputs:["min"]},{kind:"directive",type:R.MaxValidator,selector:"input[type=number][max][formControlName],input[type=number][max][formControl],input[type=number][max][ngModel]",inputs:["max"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"component",type:ne.HintTooltipIconComponent,selector:"[tb-hint-tooltip-icon]",inputs:["tb-hint-tooltip-icon","tooltipPosition","hintIcon"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Fr,decorators:[{type:n,args:[{selector:"tb-filter-node-gps-geofencing-config",template:'<section [formGroup]="geoFilterConfigForm" class="tb-form-panel no-border no-padding">\n  <section class="tb-form-panel stroked">\n    <div class="tb-form-panel-title" translate>tb.rulenode.coordinate-field-names</div>\n    <section>\n      <div fxLayout="row" fxLayoutGap="16px">\n        <mat-form-field fxFlex="50" class="mat-block">\n          <mat-label>{{ \'tb.rulenode.latitude-field-name\' | translate }}</mat-label>\n          <input matInput formControlName="latitudeKeyName" required>\n          <mat-error *ngIf="geoFilterConfigForm.get(\'latitudeKeyName\').hasError(\'required\')">\n            {{ \'tb.rulenode.latitude-field-name-required\' | translate }}\n          </mat-error>\n        </mat-form-field>\n        <mat-form-field fxFlex="50" class="mat-block">\n          <mat-label>{{ \'tb.rulenode.longitude-field-name\' | translate }}</mat-label>\n          <input matInput formControlName="longitudeKeyName" required>\n          <mat-error *ngIf="geoFilterConfigForm.get(\'longitudeKeyName\').hasError(\'required\')">\n            {{ \'tb.rulenode.longitude-field-name-required\' | translate }}\n          </mat-error>\n        </mat-form-field>\n      </div>\n    <div class="tb-form-hint tb-primary-fill" translate>tb.rulenode.coordinate-field-hint</div>\n    </section>\n  </section>\n  <section class="tb-form-panel stroked" [class.no-padding-bottom]="!defaultPaddingEnable">\n    <div class="tb-form-panel-title" translate>tb.rulenode.geofence-configuration</div>\n    <section fxLayout="column">\n      <mat-form-field fxFlex class="mat-block" hideRequiredMarker>\n        <mat-label>{{ \'tb.rulenode.perimeter-type\' | translate }}</mat-label>\n        <mat-select formControlName="perimeterType">\n          <mat-option *ngFor="let type of perimeterTypes" [value]="type">\n            {{ perimeterTypeTranslationMap.get(type) | translate }}\n          </mat-option>\n        </mat-select>\n      </mat-form-field>\n      <div tb-hint-tooltip-icon="{{ geoFilterConfigForm.get(\'perimeterType\').value === perimeterType.CIRCLE\n        ? (\'tb.rulenode.fetch-circle-parameter-info-from-metadata-hint\'\n            | translate : { perimeterKeyName: geoFilterConfigForm.get(\'perimeterKeyName\').valid\n                              ? geoFilterConfigForm.get(\'perimeterKeyName\').value\n                              : \'ss_perimeter\'})\n        : (\'tb.rulenode.fetch-poligon-parameter-info-from-metadata-hint\'\n            | translate : { perimeterKeyName: geoFilterConfigForm.get(\'perimeterKeyName\').valid\n                              ? geoFilterConfigForm.get(\'perimeterKeyName\').value\n                              : \'ss_perimeter\'}) }}"\n           class="tb-form-row no-border no-padding slide-toggle">\n        <mat-slide-toggle class="mat-slide" formControlName="fetchPerimeterInfoFromMessageMetadata">\n          {{ \'tb.rulenode.fetch-perimeter-info-from-metadata\' | translate }}\n        </mat-slide-toggle>\n      </div>\n      <mat-form-field *ngIf="geoFilterConfigForm.get(\'fetchPerimeterInfoFromMessageMetadata\').value" class="mat-block">\n        <mat-label>{{ \'tb.rulenode.perimeter-key-name\' | translate }}</mat-label>\n        <input matInput formControlName="perimeterKeyName" required>\n        <mat-error *ngIf="geoFilterConfigForm.get(\'perimeterKeyName\').hasError(\'required\')">\n          {{ \'tb.rulenode.perimeter-key-name-required\' | translate }}\n        </mat-error>\n        <mat-hint>{{ \'tb.rulenode.perimeter-key-name-hint\' | translate }}</mat-hint>\n      </mat-form-field>\n      <div fxLayout="column"\n           *ngIf="geoFilterConfigForm.get(\'perimeterType\').value === perimeterType.CIRCLE &&\n                    !geoFilterConfigForm.get(\'fetchPerimeterInfoFromMessageMetadata\').value">\n        <div fxLayout="row" fxLayoutGap="16px">\n          <mat-form-field fxFlex>\n            <mat-label>{{ \'tb.rulenode.circle-center-latitude\' | translate }}</mat-label>\n            <input type="number" min="-90" max="90" step="0.1" matInput formControlName="centerLatitude" required>\n            <mat-error *ngIf="geoFilterConfigForm.get(\'centerLatitude\').hasError(\'required\')">\n              {{ \'tb.rulenode.circle-center-latitude-required\' | translate }}\n            </mat-error>\n          </mat-form-field>\n          <mat-form-field fxFlex>\n            <mat-label>{{ \'tb.rulenode.circle-center-longitude\' | translate }}</mat-label>\n            <input type="number" min="-180" max="180" step="0.1" matInput formControlName="centerLongitude" required>\n            <mat-error *ngIf="geoFilterConfigForm.get(\'centerLongitude\').hasError(\'required\')">\n              {{ \'tb.rulenode.circle-center-longitude-required\' | translate }}\n            </mat-error>\n          </mat-form-field>\n        </div>\n        <div fxLayout="row" fxLayoutGap="16px">\n          <mat-form-field fxFlex>\n            <mat-label>{{ \'tb.rulenode.range\' | translate }}</mat-label>\n            <input type="number" min="0" step="0.1" matInput formControlName="range" required>\n            <mat-error *ngIf="geoFilterConfigForm.get(\'range\').hasError(\'required\')">\n              {{ \'tb.rulenode.range-required\' | translate }}\n            </mat-error>\n          </mat-form-field>\n          <mat-form-field fxFlex>\n            <mat-label>{{ \'tb.rulenode.range-units\' | translate }}</mat-label>\n            <mat-select formControlName="rangeUnit" required>\n              <mat-option *ngFor="let type of rangeUnits" [value]="type">\n                {{ rangeUnitTranslationMap.get(type) | translate }}\n              </mat-option>\n            </mat-select>\n            <mat-error *ngIf="geoFilterConfigForm.get(\'rangeUnit\').hasError(\'required\')">\n              {{ \'tb.rulenode.range-units-required\' | translate }}\n            </mat-error>\n          </mat-form-field>\n        </div>\n      </div>\n      <mat-form-field class="mat-block" subscriptSizing="dynamic"\n                      *ngIf="geoFilterConfigForm.get(\'perimeterType\').value === perimeterType.POLYGON &&\n                         !geoFilterConfigForm.get(\'fetchPerimeterInfoFromMessageMetadata\').value">\n        <mat-label>{{ \'tb.rulenode.polygon-definition\' | translate }}</mat-label>\n        <input matInput formControlName="polygonsDefinition" required>\n        <mat-hint>{{ \'tb.rulenode.polygon-definition-hint\' | translate }}</mat-hint>\n        <mat-error *ngIf="geoFilterConfigForm.get(\'polygonsDefinition\').hasError(\'required\')">\n          {{ \'tb.rulenode.polygon-definition-required\' | translate }}\n        </mat-error>\n      </mat-form-field>\n    </section>\n  </section>\n</section>\n',styles:[":host .slide-toggle{margin-bottom:18px}\n",':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n']}]}],ctorParameters:function(){return[{type:P.Store},{type:R.FormBuilder}]}});class kr extends f{constructor(e,t){super(e),this.store=e,this.fb=t}configForm(){return this.messageTypeConfigForm}prepareInputConfig(e){return{messageTypes:ae(e?.messageTypes)?e.messageTypes:null}}onConfigurationSet(e){this.messageTypeConfigForm=this.fb.group({messageTypes:[e.messageTypes,[O.required]]})}}e("MessageTypeConfigComponent",kr),kr.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:kr,deps:[{token:P.Store},{token:R.UntypedFormBuilder}],target:t.ɵɵFactoryTarget.Component}),kr.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:kr,selector:"tb-filter-node-message-type-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="messageTypeConfigForm">\n  <tb-message-types-config\n    required\n    [label]="\'tb.rulenode.select-message-types\' | translate"\n    formControlName="messageTypes">\n  </tb-message-types-config>\n</section>\n',dependencies:[{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"component",type:Dn,selector:"tb-message-types-config",inputs:["required","label","placeholder","disabled"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:kr,decorators:[{type:n,args:[{selector:"tb-filter-node-message-type-config",template:'<section [formGroup]="messageTypeConfigForm">\n  <tb-message-types-config\n    required\n    [label]="\'tb.rulenode.select-message-types\' | translate"\n    formControlName="messageTypes">\n  </tb-message-types-config>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder}]}});class Lr extends f{constructor(e,t){super(e),this.store=e,this.fb=t,this.allowedEntityTypes=[F.DEVICE,F.ASSET,F.ENTITY_VIEW,F.TENANT,F.CUSTOMER,F.USER,F.DASHBOARD,F.RULE_CHAIN,F.RULE_NODE,F.EDGE]}configForm(){return this.originatorTypeConfigForm}prepareInputConfig(e){return{originatorTypes:ae(e?.originatorTypes)?e.originatorTypes:null}}onConfigurationSet(e){this.originatorTypeConfigForm=this.fb.group({originatorTypes:[e.originatorTypes,[O.required]]})}}e("OriginatorTypeConfigComponent",Lr),Lr.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Lr,deps:[{token:P.Store},{token:R.UntypedFormBuilder}],target:t.ɵɵFactoryTarget.Component}),Lr.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:Lr,selector:"tb-filter-node-originator-type-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="originatorTypeConfigForm">\n  <tb-entity-type-list fxFlex\n                       formControlName="originatorTypes"\n                       [allowedEntityTypes]="allowedEntityTypes"\n                       [ignoreAuthorityFilter]="true"\n                       [emptyInputPlaceholder]="\'tb.rulenode.add-entity-type\' | translate"\n                       [filledInputPlaceholder]="\'tb.rulenode.add-entity-type\' | translate"\n                       [label]="\'tb.rulenode.select-entity-types\' | translate"\n                       required>\n    <mat-icon matSuffix class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon"\n              color="primary"\n              matTooltip="{{ \'tb.rulenode.chip-help\' | translate: { inputName: \'tb.rulenode.entity-type\' | translate } }}">help</mat-icon>\n  </tb-entity-type-list>\n</section>\n',styles:[':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n'],dependencies:[{kind:"component",type:st.EntityTypeListComponent,selector:"tb-entity-type-list",inputs:["required","additionalClasses","appearance","label","floatLabel","disabled","subscriptSizing","allowedEntityTypes","emptyInputPlaceholder","filledInputPlaceholder","ignoreAuthorityFilter"]},{kind:"component",type:ue.MatIcon,selector:"mat-icon",inputs:["color","inline","svgIcon","fontSet","fontIcon"],exportAs:["matIcon"]},{kind:"directive",type:Y.MatSuffix,selector:"[matSuffix], [matIconSuffix], [matTextSuffix]",inputs:["matTextSuffix"]},{kind:"directive",type:ce.MatTooltip,selector:"[matTooltip]",exportAs:["matTooltip"]},{kind:"directive",type:W.DefaultFlexDirective,selector:"  [fxFlex], [fxFlex.xs], [fxFlex.sm], [fxFlex.md],  [fxFlex.lg], [fxFlex.xl], [fxFlex.lt-sm], [fxFlex.lt-md],  [fxFlex.lt-lg], [fxFlex.lt-xl], [fxFlex.gt-xs], [fxFlex.gt-sm],  [fxFlex.gt-md], [fxFlex.gt-lg]",inputs:["fxFlex","fxFlex.xs","fxFlex.sm","fxFlex.md","fxFlex.lg","fxFlex.xl","fxFlex.lt-sm","fxFlex.lt-md","fxFlex.lt-lg","fxFlex.lt-xl","fxFlex.gt-xs","fxFlex.gt-sm","fxFlex.gt-md","fxFlex.gt-lg"]},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Lr,decorators:[{type:n,args:[{selector:"tb-filter-node-originator-type-config",template:'<section [formGroup]="originatorTypeConfigForm">\n  <tb-entity-type-list fxFlex\n                       formControlName="originatorTypes"\n                       [allowedEntityTypes]="allowedEntityTypes"\n                       [ignoreAuthorityFilter]="true"\n                       [emptyInputPlaceholder]="\'tb.rulenode.add-entity-type\' | translate"\n                       [filledInputPlaceholder]="\'tb.rulenode.add-entity-type\' | translate"\n                       [label]="\'tb.rulenode.select-entity-types\' | translate"\n                       required>\n    <mat-icon matSuffix class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon"\n              color="primary"\n              matTooltip="{{ \'tb.rulenode.chip-help\' | translate: { inputName: \'tb.rulenode.entity-type\' | translate } }}">help</mat-icon>\n  </tb-entity-type-list>\n</section>\n',styles:[':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n']}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder}]}});class Tr extends f{constructor(e,t,n,o){super(e),this.store=e,this.fb=t,this.nodeScriptTestService=n,this.translate=o,this.tbelEnabled=re(this.store).tbelEnabled,this.scriptLanguage=x,this.changeScript=new r,this.hasScript=!0,this.testScriptLabel="tb.rulenode.test-filter-function"}configForm(){return this.scriptConfigForm}onConfigurationSet(e){this.scriptConfigForm=this.fb.group({scriptLang:[e.scriptLang,[O.required]],jsScript:[e.jsScript,[]],tbelScript:[e.tbelScript,[]]})}validatorTriggers(){return["scriptLang"]}updateValidators(e){let t=this.scriptConfigForm.get("scriptLang").value;t!==x.TBEL||this.tbelEnabled||(t=x.JS,this.scriptConfigForm.get("scriptLang").patchValue(t,{emitEvent:!1}),setTimeout((()=>{this.scriptConfigForm.updateValueAndValidity({emitEvent:!0})}))),this.scriptConfigForm.get("jsScript").setValidators(t===x.JS?[O.required]:[]),this.scriptConfigForm.get("jsScript").updateValueAndValidity({emitEvent:e}),this.scriptConfigForm.get("tbelScript").setValidators(t===x.TBEL?[O.required]:[]),this.scriptConfigForm.get("tbelScript").updateValueAndValidity({emitEvent:e})}prepareInputConfig(e){return e&&(e.scriptLang||(e.scriptLang=x.JS)),{scriptLang:ae(e?.scriptLang)?e.scriptLang:x.JS,jsScript:ae(e?.jsScript)?e.jsScript:null,tbelScript:ae(e?.tbelScript)?e.tbelScript:null}}testScript(e){const t=this.scriptConfigForm.get("scriptLang").value,n=t===x.JS?"jsScript":"tbelScript",r=t===x.JS?"rulenode/filter_node_script_fn":"rulenode/tbel/filter_node_script_fn",o=this.scriptConfigForm.get(n).value;this.nodeScriptTestService.testNodeScript(o,"filter",this.translate.instant("tb.rulenode.filter"),"Filter",["msg","metadata","msgType"],this.ruleNodeId,r,t,e).subscribe((e=>{e&&(this.scriptConfigForm.get(n).setValue(e),this.changeScript.emit())}))}onValidate(){this.scriptConfigForm.get("scriptLang").value===x.JS&&this.jsFuncComponent.validateOnSubmit()}}e("ScriptConfigComponent",Tr),Tr.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Tr,deps:[{token:P.Store},{token:R.UntypedFormBuilder},{token:oe.NodeScriptTestService},{token:Z.TranslateService}],target:t.ɵɵFactoryTarget.Component}),Tr.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:Tr,selector:"tb-filter-node-script-config",viewQueries:[{propertyName:"jsFuncComponent",first:!0,predicate:["jsFuncComponent"],descendants:!0},{propertyName:"tbelFuncComponent",first:!0,predicate:["tbelFuncComponent"],descendants:!0}],usesInheritance:!0,ngImport:t,template:'<section [formGroup]="scriptConfigForm">\n  <tb-script-lang formControlName="scriptLang" *ngIf="tbelEnabled"></tb-script-lang>\n  <tb-js-func *ngIf="scriptConfigForm.get(\'scriptLang\').value === scriptLanguage.JS"\n              #jsFuncComponent\n              formControlName="jsScript"\n              functionName="Filter"\n              [functionArgs]="[\'msg\', \'metadata\', \'msgType\']"\n              helpId="rulenode/filter_node_script_fn"\n              noValidate="true">\n    <button toolbarSuffixButton\n            mat-icon-button\n            matTooltip="{{ testScriptLabel | translate }}"\n            matTooltipPosition="above"\n            class="tb-mat-32"\n            (click)="testScript()">\n      <mat-icon class="material-icons" color="primary">bug_report</mat-icon>\n    </button>\n  </tb-js-func>\n  <tb-js-func *ngIf="scriptConfigForm.get(\'scriptLang\').value === scriptLanguage.TBEL"\n              #tbelFuncComponent\n              formControlName="tbelScript"\n              functionName="Filter"\n              [functionArgs]="[\'msg\', \'metadata\', \'msgType\']"\n              [disableUndefinedCheck]="true"\n              [scriptLanguage]="scriptLanguage.TBEL"\n              helpId="rulenode/tbel/filter_node_script_fn"\n              noValidate="true">\n    <button toolbarSuffixButton\n            mat-icon-button\n            matTooltip="{{ testScriptLabel | translate }}"\n            matTooltipPosition="above"\n            class="tb-mat-32"\n            (click)="testScript()">\n      <mat-icon class="material-icons" color="primary">bug_report</mat-icon>\n    </button>\n  </tb-js-func>\n  <button mat-button mat-raised-button color="primary" (click)="testScript()">\n    {{ testScriptLabel | translate }}\n  </button>\n</section>\n',dependencies:[{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:pe.JsFuncComponent,selector:"tb-js-func",inputs:["functionTitle","functionName","functionArgs","validationArgs","resultType","disabled","fillHeight","minHeight","editorCompleter","globalVariables","disableUndefinedCheck","helpId","scriptLanguage","hideBrackets","noValidate","required"]},{kind:"component",type:de.MatButton,selector:"    button[mat-button], button[mat-raised-button], button[mat-flat-button],    button[mat-stroked-button]  ",inputs:["disabled","disableRipple","color"],exportAs:["matButton"]},{kind:"component",type:de.MatIconButton,selector:"button[mat-icon-button]",inputs:["disabled","disableRipple","color"],exportAs:["matButton"]},{kind:"component",type:ue.MatIcon,selector:"mat-icon",inputs:["color","inline","svgIcon","fontSet","fontIcon"],exportAs:["matIcon"]},{kind:"directive",type:ce.MatTooltip,selector:"[matTooltip]",exportAs:["matTooltip"]},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"component",type:fe.TbScriptLangComponent,selector:"tb-script-lang",inputs:["disabled"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Tr,decorators:[{type:n,args:[{selector:"tb-filter-node-script-config",template:'<section [formGroup]="scriptConfigForm">\n  <tb-script-lang formControlName="scriptLang" *ngIf="tbelEnabled"></tb-script-lang>\n  <tb-js-func *ngIf="scriptConfigForm.get(\'scriptLang\').value === scriptLanguage.JS"\n              #jsFuncComponent\n              formControlName="jsScript"\n              functionName="Filter"\n              [functionArgs]="[\'msg\', \'metadata\', \'msgType\']"\n              helpId="rulenode/filter_node_script_fn"\n              noValidate="true">\n    <button toolbarSuffixButton\n            mat-icon-button\n            matTooltip="{{ testScriptLabel | translate }}"\n            matTooltipPosition="above"\n            class="tb-mat-32"\n            (click)="testScript()">\n      <mat-icon class="material-icons" color="primary">bug_report</mat-icon>\n    </button>\n  </tb-js-func>\n  <tb-js-func *ngIf="scriptConfigForm.get(\'scriptLang\').value === scriptLanguage.TBEL"\n              #tbelFuncComponent\n              formControlName="tbelScript"\n              functionName="Filter"\n              [functionArgs]="[\'msg\', \'metadata\', \'msgType\']"\n              [disableUndefinedCheck]="true"\n              [scriptLanguage]="scriptLanguage.TBEL"\n              helpId="rulenode/tbel/filter_node_script_fn"\n              noValidate="true">\n    <button toolbarSuffixButton\n            mat-icon-button\n            matTooltip="{{ testScriptLabel | translate }}"\n            matTooltipPosition="above"\n            class="tb-mat-32"\n            (click)="testScript()">\n      <mat-icon class="material-icons" color="primary">bug_report</mat-icon>\n    </button>\n  </tb-js-func>\n  <button mat-button mat-raised-button color="primary" (click)="testScript()">\n    {{ testScriptLabel | translate }}\n  </button>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder},{type:oe.NodeScriptTestService},{type:Z.TranslateService}]},propDecorators:{jsFuncComponent:[{type:o,args:["jsFuncComponent",{static:!1}]}],tbelFuncComponent:[{type:o,args:["tbelFuncComponent",{static:!1}]}]}});class Ir extends f{constructor(e,t,n,o){super(e),this.store=e,this.fb=t,this.nodeScriptTestService=n,this.translate=o,this.tbelEnabled=re(this.store).tbelEnabled,this.scriptLanguage=x,this.changeScript=new r,this.hasScript=!0,this.testScriptLabel="tb.rulenode.test-switch-function"}configForm(){return this.switchConfigForm}onConfigurationSet(e){this.switchConfigForm=this.fb.group({scriptLang:[e.scriptLang,[O.required]],jsScript:[e.jsScript,[]],tbelScript:[e.tbelScript,[]]})}validatorTriggers(){return["scriptLang"]}updateValidators(e){let t=this.switchConfigForm.get("scriptLang").value;t!==x.TBEL||this.tbelEnabled||(t=x.JS,this.switchConfigForm.get("scriptLang").patchValue(t,{emitEvent:!1}),setTimeout((()=>{this.switchConfigForm.updateValueAndValidity({emitEvent:!0})}))),this.switchConfigForm.get("jsScript").setValidators(t===x.JS?[O.required]:[]),this.switchConfigForm.get("jsScript").updateValueAndValidity({emitEvent:e}),this.switchConfigForm.get("tbelScript").setValidators(t===x.TBEL?[O.required]:[]),this.switchConfigForm.get("tbelScript").updateValueAndValidity({emitEvent:e})}prepareInputConfig(e){return e&&(e.scriptLang||(e.scriptLang=x.JS)),{scriptLang:ae(e?.scriptLang)?e.scriptLang:x.JS,jsScript:ae(e?.jsScript)?e.jsScript:null,tbelScript:ae(e?.tbelScript)?e.tbelScript:null}}testScript(e){const t=this.switchConfigForm.get("scriptLang").value,n=t===x.JS?"jsScript":"tbelScript",r=t===x.JS?"rulenode/switch_node_script_fn":"rulenode/tbel/switch_node_script_fn",o=this.switchConfigForm.get(n).value;this.nodeScriptTestService.testNodeScript(o,"switch",this.translate.instant("tb.rulenode.switch"),"Switch",["msg","metadata","msgType"],this.ruleNodeId,r,t,e).subscribe((e=>{e&&(this.switchConfigForm.get(n).setValue(e),this.changeScript.emit())}))}onValidate(){this.switchConfigForm.get("scriptLang").value===x.JS&&this.jsFuncComponent.validateOnSubmit()}}e("SwitchConfigComponent",Ir),Ir.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Ir,deps:[{token:P.Store},{token:R.UntypedFormBuilder},{token:oe.NodeScriptTestService},{token:Z.TranslateService}],target:t.ɵɵFactoryTarget.Component}),Ir.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:Ir,selector:"tb-filter-node-switch-config",viewQueries:[{propertyName:"jsFuncComponent",first:!0,predicate:["jsFuncComponent"],descendants:!0},{propertyName:"tbelFuncComponent",first:!0,predicate:["tbelFuncComponent"],descendants:!0}],usesInheritance:!0,ngImport:t,template:'<section [formGroup]="switchConfigForm">\n  <tb-script-lang formControlName="scriptLang" *ngIf="tbelEnabled"></tb-script-lang>\n  <tb-js-func *ngIf="switchConfigForm.get(\'scriptLang\').value === scriptLanguage.JS"\n              #jsFuncComponent\n              formControlName="jsScript"\n              functionName="Switch"\n              [functionArgs]="[\'msg\', \'metadata\', \'msgType\']"\n              helpId="rulenode/switch_node_script_fn"\n              noValidate="true">\n    <button toolbarSuffixButton\n            mat-icon-button\n            matTooltip="{{ testScriptLabel | translate }}"\n            matTooltipPosition="above"\n            class="tb-mat-32"\n            (click)="testScript()">\n      <mat-icon class="material-icons" color="primary">bug_report</mat-icon>\n    </button>\n  </tb-js-func>\n  <tb-js-func *ngIf="switchConfigForm.get(\'scriptLang\').value === scriptLanguage.TBEL"\n              #tbelFuncComponent\n              formControlName="tbelScript"\n              functionName="Switch"\n              [functionArgs]="[\'msg\', \'metadata\', \'msgType\']"\n              [disableUndefinedCheck]="true"\n              [scriptLanguage]="scriptLanguage.TBEL"\n              helpId="rulenode/tbel/switch_node_script_fn"\n              noValidate="true">\n    <button toolbarSuffixButton\n            mat-icon-button\n            matTooltip="{{ testScriptLabel | translate }}"\n            matTooltipPosition="above"\n            class="tb-mat-32"\n            (click)="testScript()">\n      <mat-icon class="material-icons" color="primary">bug_report</mat-icon>\n    </button>\n  </tb-js-func>\n  <button mat-button mat-raised-button color="primary" (click)="testScript()">\n    {{ testScriptLabel | translate }}\n  </button>\n</section>\n',dependencies:[{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:pe.JsFuncComponent,selector:"tb-js-func",inputs:["functionTitle","functionName","functionArgs","validationArgs","resultType","disabled","fillHeight","minHeight","editorCompleter","globalVariables","disableUndefinedCheck","helpId","scriptLanguage","hideBrackets","noValidate","required"]},{kind:"component",type:de.MatButton,selector:"    button[mat-button], button[mat-raised-button], button[mat-flat-button],    button[mat-stroked-button]  ",inputs:["disabled","disableRipple","color"],exportAs:["matButton"]},{kind:"component",type:de.MatIconButton,selector:"button[mat-icon-button]",inputs:["disabled","disableRipple","color"],exportAs:["matButton"]},{kind:"component",type:ue.MatIcon,selector:"mat-icon",inputs:["color","inline","svgIcon","fontSet","fontIcon"],exportAs:["matIcon"]},{kind:"directive",type:ce.MatTooltip,selector:"[matTooltip]",exportAs:["matTooltip"]},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"component",type:fe.TbScriptLangComponent,selector:"tb-script-lang",inputs:["disabled"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Ir,decorators:[{type:n,args:[{selector:"tb-filter-node-switch-config",template:'<section [formGroup]="switchConfigForm">\n  <tb-script-lang formControlName="scriptLang" *ngIf="tbelEnabled"></tb-script-lang>\n  <tb-js-func *ngIf="switchConfigForm.get(\'scriptLang\').value === scriptLanguage.JS"\n              #jsFuncComponent\n              formControlName="jsScript"\n              functionName="Switch"\n              [functionArgs]="[\'msg\', \'metadata\', \'msgType\']"\n              helpId="rulenode/switch_node_script_fn"\n              noValidate="true">\n    <button toolbarSuffixButton\n            mat-icon-button\n            matTooltip="{{ testScriptLabel | translate }}"\n            matTooltipPosition="above"\n            class="tb-mat-32"\n            (click)="testScript()">\n      <mat-icon class="material-icons" color="primary">bug_report</mat-icon>\n    </button>\n  </tb-js-func>\n  <tb-js-func *ngIf="switchConfigForm.get(\'scriptLang\').value === scriptLanguage.TBEL"\n              #tbelFuncComponent\n              formControlName="tbelScript"\n              functionName="Switch"\n              [functionArgs]="[\'msg\', \'metadata\', \'msgType\']"\n              [disableUndefinedCheck]="true"\n              [scriptLanguage]="scriptLanguage.TBEL"\n              helpId="rulenode/tbel/switch_node_script_fn"\n              noValidate="true">\n    <button toolbarSuffixButton\n            mat-icon-button\n            matTooltip="{{ testScriptLabel | translate }}"\n            matTooltipPosition="above"\n            class="tb-mat-32"\n            (click)="testScript()">\n      <mat-icon class="material-icons" color="primary">bug_report</mat-icon>\n    </button>\n  </tb-js-func>\n  <button mat-button mat-raised-button color="primary" (click)="testScript()">\n    {{ testScriptLabel | translate }}\n  </button>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder},{type:oe.NodeScriptTestService},{type:Z.TranslateService}]},propDecorators:{jsFuncComponent:[{type:o,args:["jsFuncComponent",{static:!1}]}],tbelFuncComponent:[{type:o,args:["tbelFuncComponent",{static:!1}]}]}});class Nr{}e("RuleNodeCoreConfigFilterModule",Nr),Nr.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Nr,deps:[],target:t.ɵɵFactoryTarget.NgModule}),Nr.ɵmod=t.ɵɵngDeclareNgModule({minVersion:"14.0.0",version:"15.2.10",ngImport:t,type:Nr,declarations:[vr,Cr,Fr,kr,Lr,Tr,Ir,hr],imports:[$,M,$n],exports:[vr,Cr,Fr,kr,Lr,Tr,Ir,hr]}),Nr.ɵinj=t.ɵɵngDeclareInjector({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Nr,imports:[$,M,$n]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Nr,decorators:[{type:c,args:[{declarations:[vr,Cr,Fr,kr,Lr,Tr,Ir,hr],imports:[$,M,$n],exports:[vr,Cr,Fr,kr,Lr,Tr,Ir,hr]}]}]});class Sr extends f{constructor(e,t){super(e),this.store=e,this.fb=t,this.originatorSource=vt,this.originatorSources=Object.keys(vt),this.originatorSourceTranslationMap=Ct,this.originatorSourceDescTranslationMap=Ft,this.allowedEntityTypes=[F.DEVICE,F.ASSET,F.ENTITY_VIEW,F.USER,F.EDGE]}configForm(){return this.changeOriginatorConfigForm}onConfigurationSet(e){this.changeOriginatorConfigForm=this.fb.group({originatorSource:[e?e.originatorSource:null,[O.required]],entityType:[e?e.entityType:null,[]],entityNamePattern:[e?e.entityNamePattern:null,[]],relationsQuery:[e?e.relationsQuery:null,[]]})}validatorTriggers(){return["originatorSource"]}updateValidators(e){const t=this.changeOriginatorConfigForm.get("originatorSource").value;t===vt.RELATED?this.changeOriginatorConfigForm.get("relationsQuery").setValidators([O.required]):this.changeOriginatorConfigForm.get("relationsQuery").setValidators([]),t===vt.ENTITY?(this.changeOriginatorConfigForm.get("entityType").setValidators([O.required]),this.changeOriginatorConfigForm.get("entityNamePattern").setValidators([O.required,O.pattern(/.*\S.*/)])):(this.changeOriginatorConfigForm.get("entityType").patchValue(null,{emitEvent:e}),this.changeOriginatorConfigForm.get("entityNamePattern").patchValue(null,{emitEvent:e}),this.changeOriginatorConfigForm.get("entityType").setValidators([]),this.changeOriginatorConfigForm.get("entityNamePattern").setValidators([])),this.changeOriginatorConfigForm.get("relationsQuery").updateValueAndValidity({emitEvent:e}),this.changeOriginatorConfigForm.get("entityType").updateValueAndValidity({emitEvent:e}),this.changeOriginatorConfigForm.get("entityNamePattern").updateValueAndValidity({emitEvent:e})}}e("ChangeOriginatorConfigComponent",Sr),Sr.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Sr,deps:[{token:P.Store},{token:R.FormBuilder}],target:t.ɵɵFactoryTarget.Component}),Sr.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:Sr,selector:"tb-transformation-node-change-originator-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="changeOriginatorConfigForm" class="tb-form-panel no-border no-padding">\n  <mat-form-field class="mat-block" subscriptSizing="dynamic" hideRequiredMarker>\n    <mat-label translate>tb.rulenode.new-originator</mat-label>\n    <mat-select formControlName="originatorSource" required>\n      <mat-select-trigger>\n        <span *ngIf="originatorSourceTranslationMap.get(changeOriginatorConfigForm.get(\'originatorSource\').value)">\n          {{ originatorSourceTranslationMap.get(changeOriginatorConfigForm.get(\'originatorSource\').value) | translate }}\n        </span>\n      </mat-select-trigger>\n      <mat-option *ngFor="let source of originatorSources" [value]="source">\n        <span matListItemTitle>\n          {{ originatorSourceTranslationMap.get(source) | translate }}\n        </span>\n        <br>\n        <small matListItemMeta style="color: inherit">\n          {{ originatorSourceDescTranslationMap.get(source) | translate }}\n        </small>\n      </mat-option>\n    </mat-select>\n  </mat-form-field>\n  <div class="tb-form-panel stroked no-padding-bottom"\n        *ngIf="changeOriginatorConfigForm.get(\'originatorSource\').value === \'ENTITY\'">\n    <tb-example-hint [hintText]="\'tb.rulenode.entity-name-pattern-hint\' | translate"\n                      popupHelpLink="rulenode/change_originator_node_fields_templatization">\n    </tb-example-hint>\n    <div class="tb-form-row no-border no-padding tb-standard-fields">\n      <tb-entity-type-select\n        showLabel\n        required\n        [allowedEntityTypes] = "allowedEntityTypes"\n        formControlName="entityType"\n        class="mat-mdc-form-field flex">\n      </tb-entity-type-select>\n      <mat-form-field class="flex">\n        <mat-label translate>tb.rulenode.entity-name-pattern</mat-label>\n        <input required matInput formControlName="entityNamePattern">\n        <mat-error *ngIf="changeOriginatorConfigForm.get(\'entityNamePattern\').hasError(\'required\') ||\n                          changeOriginatorConfigForm.get(\'entityNamePattern\').hasError(\'pattern\')">\n          {{ \'tb.rulenode.entity-name-pattern-required\' | translate }}\n        </mat-error>\n      </mat-form-field>\n    </div>\n  </div>\n  <tb-relations-query-config\n    required\n    *ngIf="changeOriginatorConfigForm.get(\'originatorSource\').value === originatorSource.RELATED"\n    formControlName="relationsQuery">\n  </tb-relations-query-config>\n</section>\n',dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:ve.EntityTypeSelectComponent,selector:"tb-entity-type-select",inputs:["allowedEntityTypes","useAliasEntityTypes","filterAllowedEntityTypes","showLabel","required","disabled"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"component",type:X.MatSelect,selector:"mat-select",inputs:["disabled","disableRipple","tabIndex","hideSingleSelectionIndicator"],exportAs:["matSelect"]},{kind:"directive",type:X.MatSelectTrigger,selector:"mat-select-trigger"},{kind:"component",type:ee.MatOption,selector:"mat-option",exportAs:["matOption"]},{kind:"directive",type:qe.MatListItemTitle,selector:"[matListItemTitle]"},{kind:"directive",type:qe.MatListItemMeta,selector:"[matListItemMeta]"},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"component",type:Gn,selector:"tb-relations-query-config",inputs:["disabled","required"]},{kind:"component",type:An,selector:"tb-example-hint",inputs:["hintText","popupHelpLink","textAlign"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Sr,decorators:[{type:n,args:[{selector:"tb-transformation-node-change-originator-config",template:'<section [formGroup]="changeOriginatorConfigForm" class="tb-form-panel no-border no-padding">\n  <mat-form-field class="mat-block" subscriptSizing="dynamic" hideRequiredMarker>\n    <mat-label translate>tb.rulenode.new-originator</mat-label>\n    <mat-select formControlName="originatorSource" required>\n      <mat-select-trigger>\n        <span *ngIf="originatorSourceTranslationMap.get(changeOriginatorConfigForm.get(\'originatorSource\').value)">\n          {{ originatorSourceTranslationMap.get(changeOriginatorConfigForm.get(\'originatorSource\').value) | translate }}\n        </span>\n      </mat-select-trigger>\n      <mat-option *ngFor="let source of originatorSources" [value]="source">\n        <span matListItemTitle>\n          {{ originatorSourceTranslationMap.get(source) | translate }}\n        </span>\n        <br>\n        <small matListItemMeta style="color: inherit">\n          {{ originatorSourceDescTranslationMap.get(source) | translate }}\n        </small>\n      </mat-option>\n    </mat-select>\n  </mat-form-field>\n  <div class="tb-form-panel stroked no-padding-bottom"\n        *ngIf="changeOriginatorConfigForm.get(\'originatorSource\').value === \'ENTITY\'">\n    <tb-example-hint [hintText]="\'tb.rulenode.entity-name-pattern-hint\' | translate"\n                      popupHelpLink="rulenode/change_originator_node_fields_templatization">\n    </tb-example-hint>\n    <div class="tb-form-row no-border no-padding tb-standard-fields">\n      <tb-entity-type-select\n        showLabel\n        required\n        [allowedEntityTypes] = "allowedEntityTypes"\n        formControlName="entityType"\n        class="mat-mdc-form-field flex">\n      </tb-entity-type-select>\n      <mat-form-field class="flex">\n        <mat-label translate>tb.rulenode.entity-name-pattern</mat-label>\n        <input required matInput formControlName="entityNamePattern">\n        <mat-error *ngIf="changeOriginatorConfigForm.get(\'entityNamePattern\').hasError(\'required\') ||\n                          changeOriginatorConfigForm.get(\'entityNamePattern\').hasError(\'pattern\')">\n          {{ \'tb.rulenode.entity-name-pattern-required\' | translate }}\n        </mat-error>\n      </mat-form-field>\n    </div>\n  </div>\n  <tb-relations-query-config\n    required\n    *ngIf="changeOriginatorConfigForm.get(\'originatorSource\').value === originatorSource.RELATED"\n    formControlName="relationsQuery">\n  </tb-relations-query-config>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.FormBuilder}]}});class qr extends f{constructor(e,t,n,o){super(e),this.store=e,this.fb=t,this.nodeScriptTestService=n,this.translate=o,this.tbelEnabled=re(this.store).tbelEnabled,this.scriptLanguage=x,this.changeScript=new r,this.hasScript=!0,this.testScriptLabel="tb.rulenode.test-transformer-function"}configForm(){return this.scriptConfigForm}onConfigurationSet(e){this.scriptConfigForm=this.fb.group({scriptLang:[e?e.scriptLang:x.JS,[O.required]],jsScript:[e?e.jsScript:null,[O.required]],tbelScript:[e?e.tbelScript:null,[]]})}validatorTriggers(){return["scriptLang"]}updateValidators(e){let t=this.scriptConfigForm.get("scriptLang").value;t!==x.TBEL||this.tbelEnabled||(t=x.JS,this.scriptConfigForm.get("scriptLang").patchValue(t,{emitEvent:!1}),setTimeout((()=>{this.scriptConfigForm.updateValueAndValidity({emitEvent:!0})}))),this.scriptConfigForm.get("jsScript").setValidators(t===x.JS?[O.required]:[]),this.scriptConfigForm.get("jsScript").updateValueAndValidity({emitEvent:e}),this.scriptConfigForm.get("tbelScript").setValidators(t===x.TBEL?[O.required]:[]),this.scriptConfigForm.get("tbelScript").updateValueAndValidity({emitEvent:e})}prepareInputConfig(e){return e&&(e.scriptLang||(e.scriptLang=x.JS)),e}testScript(e){const t=this.scriptConfigForm.get("scriptLang").value,n=t===x.JS?"jsScript":"tbelScript",r=t===x.JS?"rulenode/transformation_node_script_fn":"rulenode/tbel/transformation_node_script_fn",o=this.scriptConfigForm.get(n).value;this.nodeScriptTestService.testNodeScript(o,"update",this.translate.instant("tb.rulenode.transformer"),"Transform",["msg","metadata","msgType"],this.ruleNodeId,r,t,e).subscribe((e=>{e&&(this.scriptConfigForm.get(n).setValue(e),this.changeScript.emit())}))}onValidate(){this.scriptConfigForm.get("scriptLang").value===x.JS&&this.jsFuncComponent.validateOnSubmit()}}e("TransformScriptConfigComponent",qr),qr.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:qr,deps:[{token:P.Store},{token:R.FormBuilder},{token:oe.NodeScriptTestService},{token:Z.TranslateService}],target:t.ɵɵFactoryTarget.Component}),qr.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:qr,selector:"tb-transformation-node-script-config",viewQueries:[{propertyName:"jsFuncComponent",first:!0,predicate:["jsFuncComponent"],descendants:!0},{propertyName:"tbelFuncComponent",first:!0,predicate:["tbelFuncComponent"],descendants:!0}],usesInheritance:!0,ngImport:t,template:'<section [formGroup]="scriptConfigForm">\n  <tb-script-lang formControlName="scriptLang" *ngIf="tbelEnabled"></tb-script-lang>\n  <tb-js-func *ngIf="scriptConfigForm.get(\'scriptLang\').value === scriptLanguage.JS"\n              #jsFuncComponent\n              formControlName="jsScript"\n              functionName="Transform"\n              helpId="rulenode/transformation_node_script_fn"\n              [functionArgs]="[\'msg\', \'metadata\', \'msgType\']"\n              noValidate="true">\n    <button toolbarSuffixButton\n            mat-icon-button\n            matTooltip="{{ testScriptLabel | translate }}"\n            matTooltipPosition="above"\n            class="tb-mat-32"\n            (click)="testScript()">\n      <mat-icon class="material-icons" color="primary">bug_report</mat-icon>\n    </button>\n  </tb-js-func>\n  <tb-js-func *ngIf="scriptConfigForm.get(\'scriptLang\').value === scriptLanguage.TBEL"\n              #tbelFuncComponent\n              formControlName="tbelScript"\n              functionName="Transform"\n              helpId="rulenode/tbel/transformation_node_script_fn"\n              [functionArgs]="[\'msg\', \'metadata\', \'msgType\']"\n              [disableUndefinedCheck]="true"\n              [scriptLanguage]="scriptLanguage.TBEL"\n              noValidate="true">\n    <button toolbarSuffixButton\n            mat-icon-button\n            matTooltip="{{ testScriptLabel | translate }}"\n            matTooltipPosition="above"\n            class="tb-mat-32"\n            (click)="testScript()">\n      <mat-icon class="material-icons" color="primary">bug_report</mat-icon>\n    </button>\n  </tb-js-func>\n  <div>\n    <button mat-button mat-raised-button color="primary" (click)="testScript()">\n      {{ testScriptLabel | translate }}\n    </button>\n  </div>\n</section>\n',dependencies:[{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:pe.JsFuncComponent,selector:"tb-js-func",inputs:["functionTitle","functionName","functionArgs","validationArgs","resultType","disabled","fillHeight","minHeight","editorCompleter","globalVariables","disableUndefinedCheck","helpId","scriptLanguage","hideBrackets","noValidate","required"]},{kind:"component",type:de.MatButton,selector:"    button[mat-button], button[mat-raised-button], button[mat-flat-button],    button[mat-stroked-button]  ",inputs:["disabled","disableRipple","color"],exportAs:["matButton"]},{kind:"component",type:de.MatIconButton,selector:"button[mat-icon-button]",inputs:["disabled","disableRipple","color"],exportAs:["matButton"]},{kind:"component",type:ue.MatIcon,selector:"mat-icon",inputs:["color","inline","svgIcon","fontSet","fontIcon"],exportAs:["matIcon"]},{kind:"directive",type:ce.MatTooltip,selector:"[matTooltip]",exportAs:["matTooltip"]},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"component",type:fe.TbScriptLangComponent,selector:"tb-script-lang",inputs:["disabled"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:qr,decorators:[{type:n,args:[{selector:"tb-transformation-node-script-config",template:'<section [formGroup]="scriptConfigForm">\n  <tb-script-lang formControlName="scriptLang" *ngIf="tbelEnabled"></tb-script-lang>\n  <tb-js-func *ngIf="scriptConfigForm.get(\'scriptLang\').value === scriptLanguage.JS"\n              #jsFuncComponent\n              formControlName="jsScript"\n              functionName="Transform"\n              helpId="rulenode/transformation_node_script_fn"\n              [functionArgs]="[\'msg\', \'metadata\', \'msgType\']"\n              noValidate="true">\n    <button toolbarSuffixButton\n            mat-icon-button\n            matTooltip="{{ testScriptLabel | translate }}"\n            matTooltipPosition="above"\n            class="tb-mat-32"\n            (click)="testScript()">\n      <mat-icon class="material-icons" color="primary">bug_report</mat-icon>\n    </button>\n  </tb-js-func>\n  <tb-js-func *ngIf="scriptConfigForm.get(\'scriptLang\').value === scriptLanguage.TBEL"\n              #tbelFuncComponent\n              formControlName="tbelScript"\n              functionName="Transform"\n              helpId="rulenode/tbel/transformation_node_script_fn"\n              [functionArgs]="[\'msg\', \'metadata\', \'msgType\']"\n              [disableUndefinedCheck]="true"\n              [scriptLanguage]="scriptLanguage.TBEL"\n              noValidate="true">\n    <button toolbarSuffixButton\n            mat-icon-button\n            matTooltip="{{ testScriptLabel | translate }}"\n            matTooltipPosition="above"\n            class="tb-mat-32"\n            (click)="testScript()">\n      <mat-icon class="material-icons" color="primary">bug_report</mat-icon>\n    </button>\n  </tb-js-func>\n  <div>\n    <button mat-button mat-raised-button color="primary" (click)="testScript()">\n      {{ testScriptLabel | translate }}\n    </button>\n  </div>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.FormBuilder},{type:oe.NodeScriptTestService},{type:Z.TranslateService}]},propDecorators:{jsFuncComponent:[{type:o,args:["jsFuncComponent",{static:!1}]}],tbelFuncComponent:[{type:o,args:["tbelFuncComponent",{static:!1}]}]}});
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+const Ar=mt({passive:!0});class Mr{constructor(e,t){this._platform=e,this._ngZone=t,this._monitoredElements=new Map}monitor(e){if(!this._platform.isBrowser)return He;const t=Te(e),n=this._monitoredElements.get(t);if(n)return n.subject;const r=new Ke,o="cdk-text-field-autofilled",a=e=>{"cdk-text-field-autofill-start"!==e.animationName||t.classList.contains(o)?"cdk-text-field-autofill-end"===e.animationName&&t.classList.contains(o)&&(t.classList.remove(o),this._ngZone.run((()=>r.next({target:e.target,isAutofilled:!1})))):(t.classList.add(o),this._ngZone.run((()=>r.next({target:e.target,isAutofilled:!0}))))};return this._ngZone.runOutsideAngular((()=>{t.addEventListener("animationstart",a,Ar),t.classList.add("cdk-text-field-autofill-monitored")})),this._monitoredElements.set(t,{subject:r,unlisten:()=>{t.removeEventListener("animationstart",a,Ar)}}),r}stopMonitoring(e){const t=Te(e),n=this._monitoredElements.get(t);n&&(n.unlisten(),n.subject.complete(),t.classList.remove("cdk-text-field-autofill-monitored"),t.classList.remove("cdk-text-field-autofilled"),this._monitoredElements.delete(t))}ngOnDestroy(){this._monitoredElements.forEach(((e,t)=>this.stopMonitoring(t)))}}Mr.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.0-rc.0",ngImport:t,type:Mr,deps:[{token:pt.Platform},{token:t.NgZone}],target:t.ɵɵFactoryTarget.Injectable}),Mr.ɵprov=t.ɵɵngDeclareInjectable({minVersion:"12.0.0",version:"15.2.0-rc.0",ngImport:t,type:Mr,providedIn:"root"}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.0-rc.0",ngImport:t,type:Mr,decorators:[{type:s,args:[{providedIn:"root"}]}],ctorParameters:function(){return[{type:pt.Platform},{type:t.NgZone}]}});class Er{constructor(e,t){this._elementRef=e,this._autofillMonitor=t,this.cdkAutofill=new r}ngOnInit(){this._autofillMonitor.monitor(this._elementRef).subscribe((e=>this.cdkAutofill.emit(e)))}ngOnDestroy(){this._autofillMonitor.stopMonitoring(this._elementRef)}}Er.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.0-rc.0",ngImport:t,type:Er,deps:[{token:t.ElementRef},{token:Mr}],target:t.ɵɵFactoryTarget.Directive}),Er.ɵdir=t.ɵɵngDeclareDirective({minVersion:"14.0.0",version:"15.2.0-rc.0",type:Er,selector:"[cdkAutofill]",outputs:{cdkAutofill:"cdkAutofill"},ngImport:t}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.0-rc.0",ngImport:t,type:Er,decorators:[{type:d,args:[{selector:"[cdkAutofill]"}]}],ctorParameters:function(){return[{type:t.ElementRef},{type:Mr}]},propDecorators:{cdkAutofill:[{type:u}]}});
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+class Gr{get minRows(){return this._minRows}set minRows(e){this._minRows=Ie(e),this._setMinHeight()}get maxRows(){return this._maxRows}set maxRows(e){this._maxRows=Ie(e),this._setMaxHeight()}get enabled(){return this._enabled}set enabled(e){e=Le(e),this._enabled!==e&&((this._enabled=e)?this.resizeToFitContent(!0):this.reset())}get placeholder(){return this._textareaElement.placeholder}set placeholder(e){this._cachedPlaceholderHeight=void 0,e?this._textareaElement.setAttribute("placeholder",e):this._textareaElement.removeAttribute("placeholder"),this._cacheTextareaPlaceholderHeight()}constructor(e,t,n,r){this._elementRef=e,this._platform=t,this._ngZone=n,this._destroyed=new Ke,this._enabled=!0,this._previousMinRows=-1,this._isViewInited=!1,this._handleFocusEvent=e=>{this._hasFocus="focus"===e.type},this._document=r,this._textareaElement=this._elementRef.nativeElement}_setMinHeight(){const e=this.minRows&&this._cachedLineHeight?this.minRows*this._cachedLineHeight+"px":null;e&&(this._textareaElement.style.minHeight=e)}_setMaxHeight(){const e=this.maxRows&&this._cachedLineHeight?this.maxRows*this._cachedLineHeight+"px":null;e&&(this._textareaElement.style.maxHeight=e)}ngAfterViewInit(){this._platform.isBrowser&&(this._initialHeight=this._textareaElement.style.height,this.resizeToFitContent(),this._ngZone.runOutsideAngular((()=>{const e=this._getWindow();je(e,"resize").pipe(Pe(16),Ve(this._destroyed)).subscribe((()=>this.resizeToFitContent(!0))),this._textareaElement.addEventListener("focus",this._handleFocusEvent),this._textareaElement.addEventListener("blur",this._handleFocusEvent)})),this._isViewInited=!0,this.resizeToFitContent(!0))}ngOnDestroy(){this._textareaElement.removeEventListener("focus",this._handleFocusEvent),this._textareaElement.removeEventListener("blur",this._handleFocusEvent),this._destroyed.next(),this._destroyed.complete()}_cacheTextareaLineHeight(){if(this._cachedLineHeight)return;let e=this._textareaElement.cloneNode(!1);e.rows=1,e.style.position="absolute",e.style.visibility="hidden",e.style.border="none",e.style.padding="0",e.style.height="",e.style.minHeight="",e.style.maxHeight="",e.style.overflow="hidden",this._textareaElement.parentNode.appendChild(e),this._cachedLineHeight=e.clientHeight,e.remove(),this._setMinHeight(),this._setMaxHeight()}_measureScrollHeight(){const e=this._textareaElement,t=e.style.marginBottom||"",n=this._platform.FIREFOX,r=n&&this._hasFocus,o=n?"cdk-textarea-autosize-measuring-firefox":"cdk-textarea-autosize-measuring";r&&(e.style.marginBottom=`${e.clientHeight}px`),e.classList.add(o);const a=e.scrollHeight-4;return e.classList.remove(o),r&&(e.style.marginBottom=t),a}_cacheTextareaPlaceholderHeight(){if(!this._isViewInited||null!=this._cachedPlaceholderHeight)return;if(!this.placeholder)return void(this._cachedPlaceholderHeight=0);const e=this._textareaElement.value;this._textareaElement.value=this._textareaElement.placeholder,this._cachedPlaceholderHeight=this._measureScrollHeight(),this._textareaElement.value=e}ngDoCheck(){this._platform.isBrowser&&this.resizeToFitContent()}resizeToFitContent(e=!1){if(!this._enabled)return;if(this._cacheTextareaLineHeight(),this._cacheTextareaPlaceholderHeight(),!this._cachedLineHeight)return;const t=this._elementRef.nativeElement,n=t.value;if(!e&&this._minRows===this._previousMinRows&&n===this._previousValue)return;const r=this._measureScrollHeight(),o=Math.max(r,this._cachedPlaceholderHeight||0);t.style.height=`${o}px`,this._ngZone.runOutsideAngular((()=>{"undefined"!=typeof requestAnimationFrame?requestAnimationFrame((()=>this._scrollToCaretPosition(t))):setTimeout((()=>this._scrollToCaretPosition(t)))})),this._previousValue=n,this._previousMinRows=this._minRows}reset(){void 0!==this._initialHeight&&(this._textareaElement.style.height=this._initialHeight)}_noopInputHandler(){}_getDocument(){return this._document||document}_getWindow(){return this._getDocument().defaultView||window}_scrollToCaretPosition(e){const{selectionStart:t,selectionEnd:n}=e;!this._destroyed.isStopped&&this._hasFocus&&e.setSelectionRange(t,n)}}Gr.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.0-rc.0",ngImport:t,type:Gr,deps:[{token:t.ElementRef},{token:pt.Platform},{token:t.NgZone},{token:j,optional:!0}],target:t.ɵɵFactoryTarget.Directive}),Gr.ɵdir=t.ɵɵngDeclareDirective({minVersion:"14.0.0",version:"15.2.0-rc.0",type:Gr,selector:"textarea[cdkTextareaAutosize]",inputs:{minRows:["cdkAutosizeMinRows","minRows"],maxRows:["cdkAutosizeMaxRows","maxRows"],enabled:["cdkTextareaAutosize","enabled"],placeholder:"placeholder"},host:{attributes:{rows:"1"},listeners:{input:"_noopInputHandler()"},classAttribute:"cdk-textarea-autosize"},exportAs:["cdkTextareaAutosize"],ngImport:t}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.0-rc.0",ngImport:t,type:Gr,decorators:[{type:d,args:[{selector:"textarea[cdkTextareaAutosize]",exportAs:"cdkTextareaAutosize",host:{class:"cdk-textarea-autosize",rows:"1","(input)":"_noopInputHandler()"}}]}],ctorParameters:function(){return[{type:t.ElementRef},{type:pt.Platform},{type:t.NgZone},{type:void 0,decorators:[{type:p},{type:m,args:[j]}]}]},propDecorators:{minRows:[{type:i,args:["cdkAutosizeMinRows"]}],maxRows:[{type:i,args:["cdkAutosizeMaxRows"]}],enabled:[{type:i,args:["cdkTextareaAutosize"]}],placeholder:[{type:i}]}});
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+class Dr{}Dr.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.0-rc.0",ngImport:t,type:Dr,deps:[],target:t.ɵɵFactoryTarget.NgModule}),Dr.ɵmod=t.ɵɵngDeclareNgModule({minVersion:"14.0.0",version:"15.2.0-rc.0",ngImport:t,type:Dr,declarations:[Er,Gr],exports:[Er,Gr]}),Dr.ɵinj=t.ɵɵngDeclareInjector({minVersion:"12.0.0",version:"15.2.0-rc.0",ngImport:t,type:Dr}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.0-rc.0",ngImport:t,type:Dr,decorators:[{type:c,args:[{declarations:[Er,Gr],exports:[Er,Gr]}]}]});class wr extends f{constructor(e,t){super(e),this.store=e,this.fb=t,this.mailBodyTypes=[{name:"tb.mail-body-type.plain-text",description:"tb.mail-body-type.plain-text-description",value:"false"},{name:"tb.mail-body-type.html",description:"tb.mail-body-type.html-text-description",value:"true"},{name:"tb.mail-body-type.use-body-type-template",description:"tb.mail-body-type.dynamic-text-description",value:"dynamic"}]}configForm(){return this.toEmailConfigForm}onConfigurationSet(e){this.toEmailConfigForm=this.fb.group({fromTemplate:[e?e.fromTemplate:null,[O.required]],toTemplate:[e?e.toTemplate:null,[O.required]],ccTemplate:[e?e.ccTemplate:null,[]],bccTemplate:[e?e.bccTemplate:null,[]],subjectTemplate:[e?e.subjectTemplate:null,[O.required]],mailBodyType:[e?e.mailBodyType:null],isHtmlTemplate:[e?e.isHtmlTemplate:null,[O.required]],bodyTemplate:[e?e.bodyTemplate:null,[O.required]]})}prepareInputConfig(e){return{fromTemplate:ae(e?.fromTemplate)?e.fromTemplate:null,toTemplate:ae(e?.toTemplate)?e.toTemplate:null,ccTemplate:ae(e?.ccTemplate)?e.ccTemplate:null,bccTemplate:ae(e?.bccTemplate)?e.bccTemplate:null,subjectTemplate:ae(e?.subjectTemplate)?e.subjectTemplate:null,mailBodyType:ae(e?.mailBodyType)?e.mailBodyType:null,isHtmlTemplate:ae(e?.isHtmlTemplate)?e.isHtmlTemplate:null,bodyTemplate:ae(e?.bodyTemplate)?e.bodyTemplate:null}}updateValidators(e){"dynamic"===this.toEmailConfigForm.get("mailBodyType").value?this.toEmailConfigForm.get("isHtmlTemplate").enable({emitEvent:!1}):this.toEmailConfigForm.get("isHtmlTemplate").disable({emitEvent:!1}),this.toEmailConfigForm.get("isHtmlTemplate").updateValueAndValidity({emitEvent:e})}validatorTriggers(){return["mailBodyType"]}getBodyTypeName(){return this.mailBodyTypes.find((e=>e.value===this.toEmailConfigForm.get("mailBodyType").value)).name}}e("ToEmailConfigComponent",wr),wr.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:wr,deps:[{token:P.Store},{token:R.FormBuilder}],target:t.ɵɵFactoryTarget.Component}),wr.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:wr,selector:"tb-transformation-node-to-email-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="toEmailConfigForm" class="tb-form-panel no-border no-padding">\n  <div class="tb-form-panel stroked">\n    <div class="tb-form-panel-title" translate>tb.rulenode.email-sender</div>\n    <div class="tb-form-row no-border no-padding tb-standard-fields">\n      <mat-form-field class="flex" subscriptSizing="dynamic">\n        <mat-label translate>tb.rulenode.from-template</mat-label>\n        <input required matInput formControlName="fromTemplate">\n        <mat-hint align="start">\n          {{ \'tb.rulenode.email-from-template-hint\' | translate }}\n        </mat-hint>\n        <mat-hint align="end">\n          <div class="input-bottom-double-hint">\n            <div class="see-example"\n                hintMode\n                tb-help-popup="{{\'rulenode/to_email_node_fields_templatization\'}}"\n                tb-help-popup-placement="right"\n                trigger-style="letter-spacing:0.25px; font-size:12px;"\n                [tb-help-popup-style]="{maxWidth: \'820px\'}"\n                trigger-text="{{ \'tb.key-val.see-examples\' | translate }}"></div>\n          </div>\n        </mat-hint>\n        <mat-error *ngIf="toEmailConfigForm.get(\'fromTemplate\').hasError(\'required\')">\n          {{ \'tb.rulenode.from-template-required\' | translate }}\n        </mat-error>\n      </mat-form-field>\n    </div>\n  </div>\n  <div class="tb-form-panel stroked">\n    <div class="tb-form-panel no-padding no-border">\n      <div class="tb-form-panel-title" translate>tb.rulenode.recipients</div>\n      <tb-example-hint [hintText]="\'tb.rulenode.recipients-block-main-hint\' | translate"\n                        popupHelpLink="rulenode/to_email_node_fields_templatization">\n      </tb-example-hint>\n    </div>\n    <div class="tb-form-row no-border no-padding tb-standard-fields">\n      <mat-form-field class="flex">\n        <mat-label translate>tb.rulenode.to-template</mat-label>\n        <textarea required\n                  matInput\n                  class="tb-enable-vertical-resize"\n                  formControlName="toTemplate"\n                  cdkTextareaAutosize\n                  cdkAutosizeMinRows="1"></textarea>\n        <mat-error *ngIf="toEmailConfigForm.get(\'toTemplate\').hasError(\'required\')">\n          {{ \'tb.rulenode.to-template-required\' | translate }}\n        </mat-error>\n      </mat-form-field>\n      <mat-form-field class="flex">\n        <mat-label translate>tb.rulenode.cc-template</mat-label>\n        <textarea matInput\n                  formControlName="ccTemplate"\n                  class="tb-enable-vertical-resize"\n                  cdkTextareaAutosize\n                  cdkAutosizeMinRows="1"></textarea>\n      </mat-form-field>\n      <mat-form-field class="flex">\n        <mat-label translate>tb.rulenode.bcc-template</mat-label>\n        <textarea matInput\n                  formControlName="bccTemplate"\n                  class="tb-enable-vertical-resize"\n                  cdkTextareaAutosize\n                  cdkAutosizeMinRows="1"></textarea>\n      </mat-form-field>\n    </div>\n  </div>\n  <div class="tb-form-panel stroked">\n    <div class="tb-form-panel-title" translate>tb.rulenode.message-subject-and-content</div>\n    <tb-example-hint [hintText]="\'tb.rulenode.kv-map-pattern-hint\' | translate"\n                      popupHelpLink="rulenode/to_email_node_fields_templatization">\n    </tb-example-hint>\n    <section>\n      <mat-form-field class="mat-block">\n        <mat-label translate>tb.rulenode.subject-template</mat-label>\n        <textarea required\n                  matInput\n                  formControlName="subjectTemplate"\n                  class="tb-enable-vertical-resize"\n                  cdkTextareaAutosize\n                  cdkAutosizeMinRows="1"></textarea>\n        <mat-error *ngIf="toEmailConfigForm.get(\'subjectTemplate\').hasError(\'required\')">\n          {{ \'tb.rulenode.subject-template-required\' | translate }}\n        </mat-error>\n      </mat-form-field>\n      <mat-form-field class="mat-block">\n        <mat-label translate>tb.rulenode.mail-body-type</mat-label>\n        <mat-select formControlName="mailBodyType">\n          <mat-select-trigger>\n            <span *ngIf="toEmailConfigForm.get(\'mailBodyType\').value">\n              {{ getBodyTypeName() | translate }}\n            </span>\n          </mat-select-trigger>\n          <mat-option *ngFor="let type of mailBodyTypes" [value]="type.value">\n            <span matListItemTitle>\n              {{ type.name | translate }}\n            </span>\n            <br>\n            <small matListItemMeta style="color: inherit">\n              {{ type.description | translate }}\n            </small>\n          </mat-option>\n        </mat-select>\n      </mat-form-field>\n      <mat-form-field class="mat-block" *ngIf="toEmailConfigForm.get(\'mailBodyType\').value === \'dynamic\'">\n        <mat-label translate>tb.rulenode.body-type-template</mat-label>\n        <input required matInput formControlName="isHtmlTemplate">\n        <mat-hint translate>tb.mail-body-type.after-template-evaluation-hint</mat-hint>\n      </mat-form-field>\n      <mat-form-field class="mat-block">\n        <mat-label translate>tb.rulenode.body-template</mat-label>\n        <textarea required\n                  matInput\n                  formControlName="bodyTemplate"\n                  class="tb-enable-vertical-resize"\n                  cdkTextareaAutosize\n                  cdkAutosizeMinRows="2"></textarea>\n        <mat-error *ngIf="toEmailConfigForm.get(\'bodyTemplate\').hasError(\'required\')">\n          {{ \'tb.rulenode.body-template-required\' | translate }}\n        </mat-error>\n      </mat-form-field>\n    </section>\n  </div>\n</section>\n',styles:[":host .input-bottom-double-hint{display:inline-flex}:host .input-bottom-double-hint .see-example{flex-shrink:0;padding-right:16px}:host textarea.tb-enable-vertical-resize{resize:vertical}\n"],dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:$e.HelpPopupComponent,selector:"[tb-help-popup], [tb-help-popup-content]",inputs:["tb-help-popup","tb-help-popup-content","trigger-text","trigger-style","tb-help-popup-placement","tb-help-popup-style","hintMode"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatHint,selector:"mat-hint",inputs:["align","id"]},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"directive",type:Gr,selector:"textarea[cdkTextareaAutosize]",inputs:["cdkAutosizeMinRows","cdkAutosizeMaxRows","cdkTextareaAutosize","placeholder"],exportAs:["cdkTextareaAutosize"]},{kind:"component",type:X.MatSelect,selector:"mat-select",inputs:["disabled","disableRipple","tabIndex","hideSingleSelectionIndicator"],exportAs:["matSelect"]},{kind:"directive",type:X.MatSelectTrigger,selector:"mat-select-trigger"},{kind:"component",type:ee.MatOption,selector:"mat-option",exportAs:["matOption"]},{kind:"directive",type:qe.MatListItemTitle,selector:"[matListItemTitle]"},{kind:"directive",type:qe.MatListItemMeta,selector:"[matListItemMeta]"},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"component",type:An,selector:"tb-example-hint",inputs:["hintText","popupHelpLink","textAlign"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:wr,decorators:[{type:n,args:[{selector:"tb-transformation-node-to-email-config",template:'<section [formGroup]="toEmailConfigForm" class="tb-form-panel no-border no-padding">\n  <div class="tb-form-panel stroked">\n    <div class="tb-form-panel-title" translate>tb.rulenode.email-sender</div>\n    <div class="tb-form-row no-border no-padding tb-standard-fields">\n      <mat-form-field class="flex" subscriptSizing="dynamic">\n        <mat-label translate>tb.rulenode.from-template</mat-label>\n        <input required matInput formControlName="fromTemplate">\n        <mat-hint align="start">\n          {{ \'tb.rulenode.email-from-template-hint\' | translate }}\n        </mat-hint>\n        <mat-hint align="end">\n          <div class="input-bottom-double-hint">\n            <div class="see-example"\n                hintMode\n                tb-help-popup="{{\'rulenode/to_email_node_fields_templatization\'}}"\n                tb-help-popup-placement="right"\n                trigger-style="letter-spacing:0.25px; font-size:12px;"\n                [tb-help-popup-style]="{maxWidth: \'820px\'}"\n                trigger-text="{{ \'tb.key-val.see-examples\' | translate }}"></div>\n          </div>\n        </mat-hint>\n        <mat-error *ngIf="toEmailConfigForm.get(\'fromTemplate\').hasError(\'required\')">\n          {{ \'tb.rulenode.from-template-required\' | translate }}\n        </mat-error>\n      </mat-form-field>\n    </div>\n  </div>\n  <div class="tb-form-panel stroked">\n    <div class="tb-form-panel no-padding no-border">\n      <div class="tb-form-panel-title" translate>tb.rulenode.recipients</div>\n      <tb-example-hint [hintText]="\'tb.rulenode.recipients-block-main-hint\' | translate"\n                        popupHelpLink="rulenode/to_email_node_fields_templatization">\n      </tb-example-hint>\n    </div>\n    <div class="tb-form-row no-border no-padding tb-standard-fields">\n      <mat-form-field class="flex">\n        <mat-label translate>tb.rulenode.to-template</mat-label>\n        <textarea required\n                  matInput\n                  class="tb-enable-vertical-resize"\n                  formControlName="toTemplate"\n                  cdkTextareaAutosize\n                  cdkAutosizeMinRows="1"></textarea>\n        <mat-error *ngIf="toEmailConfigForm.get(\'toTemplate\').hasError(\'required\')">\n          {{ \'tb.rulenode.to-template-required\' | translate }}\n        </mat-error>\n      </mat-form-field>\n      <mat-form-field class="flex">\n        <mat-label translate>tb.rulenode.cc-template</mat-label>\n        <textarea matInput\n                  formControlName="ccTemplate"\n                  class="tb-enable-vertical-resize"\n                  cdkTextareaAutosize\n                  cdkAutosizeMinRows="1"></textarea>\n      </mat-form-field>\n      <mat-form-field class="flex">\n        <mat-label translate>tb.rulenode.bcc-template</mat-label>\n        <textarea matInput\n                  formControlName="bccTemplate"\n                  class="tb-enable-vertical-resize"\n                  cdkTextareaAutosize\n                  cdkAutosizeMinRows="1"></textarea>\n      </mat-form-field>\n    </div>\n  </div>\n  <div class="tb-form-panel stroked">\n    <div class="tb-form-panel-title" translate>tb.rulenode.message-subject-and-content</div>\n    <tb-example-hint [hintText]="\'tb.rulenode.kv-map-pattern-hint\' | translate"\n                      popupHelpLink="rulenode/to_email_node_fields_templatization">\n    </tb-example-hint>\n    <section>\n      <mat-form-field class="mat-block">\n        <mat-label translate>tb.rulenode.subject-template</mat-label>\n        <textarea required\n                  matInput\n                  formControlName="subjectTemplate"\n                  class="tb-enable-vertical-resize"\n                  cdkTextareaAutosize\n                  cdkAutosizeMinRows="1"></textarea>\n        <mat-error *ngIf="toEmailConfigForm.get(\'subjectTemplate\').hasError(\'required\')">\n          {{ \'tb.rulenode.subject-template-required\' | translate }}\n        </mat-error>\n      </mat-form-field>\n      <mat-form-field class="mat-block">\n        <mat-label translate>tb.rulenode.mail-body-type</mat-label>\n        <mat-select formControlName="mailBodyType">\n          <mat-select-trigger>\n            <span *ngIf="toEmailConfigForm.get(\'mailBodyType\').value">\n              {{ getBodyTypeName() | translate }}\n            </span>\n          </mat-select-trigger>\n          <mat-option *ngFor="let type of mailBodyTypes" [value]="type.value">\n            <span matListItemTitle>\n              {{ type.name | translate }}\n            </span>\n            <br>\n            <small matListItemMeta style="color: inherit">\n              {{ type.description | translate }}\n            </small>\n          </mat-option>\n        </mat-select>\n      </mat-form-field>\n      <mat-form-field class="mat-block" *ngIf="toEmailConfigForm.get(\'mailBodyType\').value === \'dynamic\'">\n        <mat-label translate>tb.rulenode.body-type-template</mat-label>\n        <input required matInput formControlName="isHtmlTemplate">\n        <mat-hint translate>tb.mail-body-type.after-template-evaluation-hint</mat-hint>\n      </mat-form-field>\n      <mat-form-field class="mat-block">\n        <mat-label translate>tb.rulenode.body-template</mat-label>\n        <textarea required\n                  matInput\n                  formControlName="bodyTemplate"\n                  class="tb-enable-vertical-resize"\n                  cdkTextareaAutosize\n                  cdkAutosizeMinRows="2"></textarea>\n        <mat-error *ngIf="toEmailConfigForm.get(\'bodyTemplate\').hasError(\'required\')">\n          {{ \'tb.rulenode.body-template-required\' | translate }}\n        </mat-error>\n      </mat-form-field>\n    </section>\n  </div>\n</section>\n',styles:[":host .input-bottom-double-hint{display:inline-flex}:host .input-bottom-double-hint .see-example{flex-shrink:0;padding-right:16px}:host textarea.tb-enable-vertical-resize{resize:vertical}\n"]}]}],ctorParameters:function(){return[{type:P.Store},{type:R.FormBuilder}]}});class Vr extends f{constructor(e,t,n){super(e),this.store=e,this.fb=t,this.translate=n,this.copyFrom=[],this.translation=tn;for(const e of this.translation.keys())this.copyFrom.push({value:e,name:this.translate.instant(this.translation.get(e))})}onConfigurationSet(e){this.copyKeysConfigForm=this.fb.group({copyFrom:[e.copyFrom,[O.required]],keys:[e?e.keys:null,[O.required]]})}configForm(){return this.copyKeysConfigForm}prepareInputConfig(e){let t;return t=ae(e?.fromMetadata)?e.copyFrom?en.METADATA:en.DATA:ae(e?.copyFrom)?e.copyFrom:en.DATA,{keys:ae(e?.keys)?e.keys:null,copyFrom:t}}}e("CopyKeysConfigComponent",Vr),Vr.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Vr,deps:[{token:P.Store},{token:R.FormBuilder},{token:Z.TranslateService}],target:t.ɵɵFactoryTarget.Component}),Vr.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:Vr,selector:"tb-transformation-node-copy-keys-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="copyKeysConfigForm" class="tb-form-panel no-padding no-border">\n  <tb-msg-metadata-chip\n    [labelText]="(\'tb.key-val.copy-key-values-from\' | translate)"\n    [translation]="translation"\n    formControlName="copyFrom">\n  </tb-msg-metadata-chip>\n  <tb-string-items-list class="mat-block"\n                        required\n                        [label]="\'tb.rulenode.keys\' | translate"\n                        [placeholder]="\'tb.rulenode.add-key\' | translate"\n                        [requiredText]="\'tb.key-val.at-least-one-key-error\' | translate"\n                        formControlName="keys">\n    <mat-icon matSuffix class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon"\n              color="primary"\n              matTooltip="{{ \'tb.rulenode.use-regular-expression-hint\' | translate }}">\n      help\n    </mat-icon>\n  </tb-string-items-list>\n</section>\n',styles:[':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n'],dependencies:[{kind:"component",type:et.StringItemsListComponent,selector:"tb-string-items-list",inputs:["required","disabled","label","placeholder","hint","requiredText","floatLabel","appearance","editable","subscriptSizing","predefinedValues"]},{kind:"component",type:ue.MatIcon,selector:"mat-icon",inputs:["color","inline","svgIcon","fontSet","fontIcon"],exportAs:["matIcon"]},{kind:"directive",type:Y.MatSuffix,selector:"[matSuffix], [matIconSuffix], [matTextSuffix]",inputs:["matTextSuffix"]},{kind:"directive",type:ce.MatTooltip,selector:"[matTooltip]",exportAs:["matTooltip"]},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"component",type:Kn,selector:"tb-msg-metadata-chip",inputs:["labelText","translation"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Vr,decorators:[{type:n,args:[{selector:"tb-transformation-node-copy-keys-config",template:'<section [formGroup]="copyKeysConfigForm" class="tb-form-panel no-padding no-border">\n  <tb-msg-metadata-chip\n    [labelText]="(\'tb.key-val.copy-key-values-from\' | translate)"\n    [translation]="translation"\n    formControlName="copyFrom">\n  </tb-msg-metadata-chip>\n  <tb-string-items-list class="mat-block"\n                        required\n                        [label]="\'tb.rulenode.keys\' | translate"\n                        [placeholder]="\'tb.rulenode.add-key\' | translate"\n                        [requiredText]="\'tb.key-val.at-least-one-key-error\' | translate"\n                        formControlName="keys">\n    <mat-icon matSuffix class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon"\n              color="primary"\n              matTooltip="{{ \'tb.rulenode.use-regular-expression-hint\' | translate }}">\n      help\n    </mat-icon>\n  </tb-string-items-list>\n</section>\n',styles:[':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n']}]}],ctorParameters:function(){return[{type:P.Store},{type:R.FormBuilder},{type:Z.TranslateService}]}});class Pr extends f{constructor(e,t,n){super(e),this.store=e,this.fb=t,this.translate=n,this.renameIn=[],this.translation=rn;for(const e of this.translation.keys())this.renameIn.push({value:e,name:this.translate.instant(this.translation.get(e))})}configForm(){return this.renameKeysConfigForm}onConfigurationSet(e){this.renameKeysConfigForm=this.fb.group({renameIn:[e?e.renameIn:null,[O.required]],renameKeysMapping:[e?e.renameKeysMapping:null,[O.required]]})}prepareInputConfig(e){let t;return t=ae(e?.fromMetadata)?e.fromMetadata?en.METADATA:en.DATA:ae(e?.renameIn)?e?.renameIn:en.DATA,{renameKeysMapping:ae(e?.renameKeysMapping)?e.renameKeysMapping:null,renameIn:t}}}e("RenameKeysConfigComponent",Pr),Pr.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Pr,deps:[{token:P.Store},{token:R.FormBuilder},{token:Z.TranslateService}],target:t.ɵɵFactoryTarget.Component}),Pr.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:Pr,selector:"tb-transformation-node-rename-keys-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="renameKeysConfigForm" class="tb-form-panel stroked">\n  <div class="tb-form-panel-title" translate>tb.rulenode.rename-keys-in</div>\n  <div class="fx-centered">\n    <div class="fetch-to-data-toggle">\n      <tb-toggle-select class="fetch-to-data-toggle" formControlName="renameIn" appearance="fill">\n        <tb-toggle-option *ngFor="let data of renameIn" [value]="data.value">\n          {{ data.name }}\n        </tb-toggle-option>\n      </tb-toggle-select>\n    </div>\n  </div>\n  <tb-kv-map-config\n    required\n    labelText="{{ translation.get(renameKeysConfigForm.get(\'renameIn\').value) | translate }} {{\'tb.rulenode.keys-mapping\' | translate}}"\n    formControlName="renameKeysMapping"\n    uniqueKeyValuePairValidator\n    requiredText="{{\'tb.rulenode.attr-mapping-required\' | translate}}"\n    keyText="{{\'tb.rulenode.current-key-name\' | translate}}"\n    keyRequiredText="{{\'tb.rulenode.key-name-required\' | translate}}"\n    valText="{{\'tb.rulenode.new-key-name\' | translate}}"\n    valRequiredText="{{\'tb.rulenode.new-key-name-required\' | translate}}">\n  </tb-kv-map-config>\n</section>\n',styles:[":host .fetch-to-data-toggle{max-width:420px;width:100%}:host .fx-centered{display:flex;width:100%;justify-content:space-around}\n"],dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"directive",type:Fe.ToggleOption,selector:"tb-toggle-option",inputs:["value"]},{kind:"component",type:ke.ToggleSelectComponent,selector:"tb-toggle-select",inputs:["disabled","selectMediaBreakpoint","appearance","disablePagination"]},{kind:"component",type:Mn,selector:"tb-kv-map-config",inputs:["disabled","uniqueKeyValuePairValidator","labelText","requiredText","keyText","keyRequiredText","valText","valRequiredText","hintText","popupHelpLink","required"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Pr,decorators:[{type:n,args:[{selector:"tb-transformation-node-rename-keys-config",template:'<section [formGroup]="renameKeysConfigForm" class="tb-form-panel stroked">\n  <div class="tb-form-panel-title" translate>tb.rulenode.rename-keys-in</div>\n  <div class="fx-centered">\n    <div class="fetch-to-data-toggle">\n      <tb-toggle-select class="fetch-to-data-toggle" formControlName="renameIn" appearance="fill">\n        <tb-toggle-option *ngFor="let data of renameIn" [value]="data.value">\n          {{ data.name }}\n        </tb-toggle-option>\n      </tb-toggle-select>\n    </div>\n  </div>\n  <tb-kv-map-config\n    required\n    labelText="{{ translation.get(renameKeysConfigForm.get(\'renameIn\').value) | translate }} {{\'tb.rulenode.keys-mapping\' | translate}}"\n    formControlName="renameKeysMapping"\n    uniqueKeyValuePairValidator\n    requiredText="{{\'tb.rulenode.attr-mapping-required\' | translate}}"\n    keyText="{{\'tb.rulenode.current-key-name\' | translate}}"\n    keyRequiredText="{{\'tb.rulenode.key-name-required\' | translate}}"\n    valText="{{\'tb.rulenode.new-key-name\' | translate}}"\n    valRequiredText="{{\'tb.rulenode.new-key-name-required\' | translate}}">\n  </tb-kv-map-config>\n</section>\n',styles:[":host .fetch-to-data-toggle{max-width:420px;width:100%}:host .fx-centered{display:flex;width:100%;justify-content:space-around}\n"]}]}],ctorParameters:function(){return[{type:P.Store},{type:R.FormBuilder},{type:Z.TranslateService}]}});class Rr extends f{constructor(e,t){super(e),this.store=e,this.fb=t}configForm(){return this.jsonPathConfigForm}onConfigurationSet(e){this.jsonPathConfigForm=this.fb.group({jsonPath:[e?e.jsonPath:null,[O.required]]})}}e("NodeJsonPathConfigComponent",Rr),Rr.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Rr,deps:[{token:P.Store},{token:R.FormBuilder}],target:t.ɵɵFactoryTarget.Component}),Rr.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:Rr,selector:"tb-transformation-node-json-path-config",usesInheritance:!0,ngImport:t,template:"<section [formGroup]=\"jsonPathConfigForm\">\n  <mat-form-field subscriptSizing=\"dynamic\" class=\"mat-block\">\n    <mat-label>{{ 'tb.rulenode.json-path-expression' | translate }}</mat-label>\n    <input matInput formControlName=\"jsonPath\" required/>\n    <mat-hint>{{ 'tb.rulenode.json-path-expression-hint' | translate }}</mat-hint>\n    <mat-error *ngIf=\"jsonPathConfigForm.get('jsonPath').hasError('required')\">{{ 'tb.rulenode.json-path-expression-required' | translate }}</mat-error>\n  </mat-form-field>\n</section>\n",dependencies:[{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatHint,selector:"mat-hint",inputs:["align","id"]},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Rr,decorators:[{type:n,args:[{selector:"tb-transformation-node-json-path-config",template:"<section [formGroup]=\"jsonPathConfigForm\">\n  <mat-form-field subscriptSizing=\"dynamic\" class=\"mat-block\">\n    <mat-label>{{ 'tb.rulenode.json-path-expression' | translate }}</mat-label>\n    <input matInput formControlName=\"jsonPath\" required/>\n    <mat-hint>{{ 'tb.rulenode.json-path-expression-hint' | translate }}</mat-hint>\n    <mat-error *ngIf=\"jsonPathConfigForm.get('jsonPath').hasError('required')\">{{ 'tb.rulenode.json-path-expression-required' | translate }}</mat-error>\n  </mat-form-field>\n</section>\n"}]}],ctorParameters:function(){return[{type:P.Store},{type:R.FormBuilder}]}});class Or extends f{constructor(e,t,n){super(e),this.store=e,this.fb=t,this.translate=n,this.deleteFrom=[],this.translation=nn;for(const e of this.translation.keys())this.deleteFrom.push({value:e,name:this.translate.instant(this.translation.get(e))})}onConfigurationSet(e){this.deleteKeysConfigForm=this.fb.group({deleteFrom:[e.deleteFrom,[O.required]],keys:[e?e.keys:null,[O.required]]})}prepareInputConfig(e){let t;return t=ae(e?.fromMetadata)?e.fromMetadata?en.METADATA:en.DATA:ae(e?.deleteFrom)?e?.deleteFrom:en.DATA,{keys:ae(e?.keys)?e.keys:null,deleteFrom:t}}configForm(){return this.deleteKeysConfigForm}}e("DeleteKeysConfigComponent",Or),Or.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Or,deps:[{token:P.Store},{token:R.FormBuilder},{token:Z.TranslateService}],target:t.ɵɵFactoryTarget.Component}),Or.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:Or,selector:"tb-transformation-node-delete-keys-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="deleteKeysConfigForm" class="tb-form-panel no-border no-padding">\n  <tb-msg-metadata-chip\n    [labelText]="(\'tb.key-val.delete-key-values-from\' | translate)"\n    formControlName="deleteFrom">\n  </tb-msg-metadata-chip>\n  <tb-string-items-list class="mat-block"\n                        required\n                        [label]="\'tb.rulenode.keys\' | translate"\n                        [placeholder]="\'tb.rulenode.add-key\' | translate"\n                        [requiredText]="\'tb.key-val.at-least-one-key-error\' | translate"\n                        formControlName="keys">\n    <mat-icon matSuffix class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon"\n              color="primary"\n              matTooltip="{{ \'tb.rulenode.use-regular-expression-delete-hint\' | translate }}">\n      help\n    </mat-icon>\n  </tb-string-items-list>\n</section>\n',styles:[':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n'],dependencies:[{kind:"component",type:et.StringItemsListComponent,selector:"tb-string-items-list",inputs:["required","disabled","label","placeholder","hint","requiredText","floatLabel","appearance","editable","subscriptSizing","predefinedValues"]},{kind:"component",type:ue.MatIcon,selector:"mat-icon",inputs:["color","inline","svgIcon","fontSet","fontIcon"],exportAs:["matIcon"]},{kind:"directive",type:Y.MatSuffix,selector:"[matSuffix], [matIconSuffix], [matTextSuffix]",inputs:["matTextSuffix"]},{kind:"directive",type:ce.MatTooltip,selector:"[matTooltip]",exportAs:["matTooltip"]},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"component",type:Kn,selector:"tb-msg-metadata-chip",inputs:["labelText","translation"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Or,decorators:[{type:n,args:[{selector:"tb-transformation-node-delete-keys-config",template:'<section [formGroup]="deleteKeysConfigForm" class="tb-form-panel no-border no-padding">\n  <tb-msg-metadata-chip\n    [labelText]="(\'tb.key-val.delete-key-values-from\' | translate)"\n    formControlName="deleteFrom">\n  </tb-msg-metadata-chip>\n  <tb-string-items-list class="mat-block"\n                        required\n                        [label]="\'tb.rulenode.keys\' | translate"\n                        [placeholder]="\'tb.rulenode.add-key\' | translate"\n                        [requiredText]="\'tb.key-val.at-least-one-key-error\' | translate"\n                        formControlName="keys">\n    <mat-icon matSuffix class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon"\n              color="primary"\n              matTooltip="{{ \'tb.rulenode.use-regular-expression-delete-hint\' | translate }}">\n      help\n    </mat-icon>\n  </tb-string-items-list>\n</section>\n',styles:[':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n']}]}],ctorParameters:function(){return[{type:P.Store},{type:R.FormBuilder},{type:Z.TranslateService}]}});class _r extends f{constructor(e,t){super(e),this.store=e,this.fb=t,this.deduplicationStrategie=Gt,this.deduplicationStrategies=Object.keys(this.deduplicationStrategie),this.deduplicationStrategiesTranslations=Dt}configForm(){return this.deduplicationConfigForm}onConfigurationSet(e){this.deduplicationConfigForm=this.fb.group({interval:[ae(e?.interval)?e.interval:null,[O.required,O.min(1)]],strategy:[ae(e?.strategy)?e.strategy:null,[O.required]],outMsgType:[ae(e?.outMsgType)?e.outMsgType:null,[O.required]],maxPendingMsgs:[ae(e?.maxPendingMsgs)?e.maxPendingMsgs:null,[O.required,O.min(1),O.max(1e3)]],maxRetries:[ae(e?.maxRetries)?e.maxRetries:null,[O.required,O.min(0),O.max(100)]]})}prepareInputConfig(e){return e||(e={}),e.outMsgType||(e.outMsgType="POST_TELEMETRY_REQUEST"),super.prepareInputConfig(e)}updateValidators(e){this.deduplicationConfigForm.get("strategy").value===this.deduplicationStrategie.ALL?this.deduplicationConfigForm.get("outMsgType").enable({emitEvent:!1}):this.deduplicationConfigForm.get("outMsgType").disable({emitEvent:!1}),this.deduplicationConfigForm.get("outMsgType").updateValueAndValidity({emitEvent:e})}validatorTriggers(){return["strategy"]}}e("DeduplicationConfigComponent",_r),_r.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:_r,deps:[{token:P.Store},{token:R.FormBuilder}],target:t.ɵɵFactoryTarget.Component}),_r.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:_r,selector:"tb-action-node-msg-deduplication-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="deduplicationConfigForm">\n  <mat-form-field class="mat-block">\n    <mat-label>{{\'tb.rulenode.interval\' | translate}}</mat-label>\n    <input type=\'number\' required matInput formControlName="interval">\n    <mat-error *ngIf="deduplicationConfigForm.get(\'interval\').hasError(\'required\')">\n      {{\'tb.rulenode.interval-required\' | translate}}\n    </mat-error>\n    <mat-error *ngIf="deduplicationConfigForm.get(\'interval\').hasError(\'min\')">\n      {{\'tb.rulenode.interval-min-error\' | translate}}\n    </mat-error>\n    <mat-icon matSuffix class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon"\n              color="primary"\n              matTooltip="{{ \'tb.rulenode.interval-hint\' | translate }}">help</mat-icon>\n  </mat-form-field>\n  <div class="tb-form-panel no-padding no-border">\n    <div class="tb-form-panel stroked">\n      <div class="tb-form-panel-title  tb-required" translate>tb.rulenode.strategy</div>\n      <tb-toggle-select class="fetch-to-data-toggle" formControlName="strategy" appearance="fill">\n        <tb-toggle-option *ngFor="let strategy of deduplicationStrategies" [value]="strategy">\n          {{ deduplicationStrategiesTranslations.get(strategy) | translate }}\n        </tb-toggle-option>\n      </tb-toggle-select>\n      <tb-example-hint [hintText]="\'tb.rulenode.strategy-all-hint\' | translate"\n                       *ngIf="deduplicationConfigForm.get(\'strategy\').value === \'ALL\'">\n      </tb-example-hint>\n      <tb-example-hint [hintText]="\'tb.rulenode.strategy-first-hint\' | translate"\n                        textAlign="\'center\'"\n                       *ngIf="deduplicationConfigForm.get(\'strategy\').value === \'FIRST\'">\n      </tb-example-hint>\n      <tb-example-hint [hintText]="\'tb.rulenode.strategy-last-hint\' | translate"\n                        textAlign="\'center\'"\n                       *ngIf="deduplicationConfigForm.get(\'strategy\').value === \'LAST\'">\n      </tb-example-hint>\n      <div *ngIf="deduplicationConfigForm.get(\'strategy\').value === deduplicationStrategie.ALL">\n        <tb-output-message-type-autocomplete\n          required\n          formControlName="outMsgType">\n        </tb-output-message-type-autocomplete>\n      </div>\n    </div>\n    <section class="tb-form-panel stroked">\n      <mat-expansion-panel class="tb-settings">\n        <mat-expansion-panel-header>\n          <mat-panel-title translate>tb.rulenode.advanced-settings</mat-panel-title>\n        </mat-expansion-panel-header>\n        <div class="tb-form-row no-border no-padding tb-standard-fields">\n          <mat-form-field class="flex">\n            <mat-label>{{\'tb.rulenode.max-pending-msgs\' | translate}}</mat-label>\n            <input type = \'number\' required matInput formControlName="maxPendingMsgs">\n            <mat-error *ngIf="deduplicationConfigForm.get(\'maxPendingMsgs\').hasError(\'required\')">\n              {{\'tb.rulenode.max-pending-msgs-required\' | translate}}\n            </mat-error>\n            <mat-error *ngIf="deduplicationConfigForm.get(\'maxPendingMsgs\').hasError(\'max\')">\n              {{\'tb.rulenode.max-pending-msgs-max-error\' | translate}}\n            </mat-error>\n            <mat-error *ngIf="deduplicationConfigForm.get(\'maxPendingMsgs\').hasError(\'min\')">\n              {{\'tb.rulenode.max-pending-msgs-min-error\' | translate}}\n            </mat-error>\n            <mat-icon matSuffix class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon"\n                      color="primary"\n                      matTooltip="{{ \'tb.rulenode.max-pending-msgs-hint\' | translate }}">help</mat-icon>\n          </mat-form-field>\n          <mat-form-field class="flex">\n            <mat-label>{{\'tb.rulenode.max-retries\' | translate}}</mat-label>\n            <input type = \'number\' required matInput formControlName="maxRetries">\n            <mat-error *ngIf="deduplicationConfigForm.get(\'maxRetries\').hasError(\'required\')">\n              {{\'tb.rulenode.max-retries-required\' | translate}}\n            </mat-error>\n            <mat-error *ngIf="deduplicationConfigForm.get(\'maxRetries\').hasError(\'max\')">\n              {{\'tb.rulenode.max-retries-max-error\' | translate}}\n            </mat-error>\n            <mat-error *ngIf="deduplicationConfigForm.get(\'maxRetries\').hasError(\'min\')">\n              {{\'tb.rulenode.max-retries-min-error\' | translate}}\n            </mat-error>\n            <mat-icon matSuffix class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon"\n                      color="primary"\n                      matTooltip="{{ \'tb.rulenode.max-retries-hint\' | translate }}">help</mat-icon>\n          </mat-form-field>\n        </div>\n      </mat-expansion-panel>\n    </section>\n  </div>\n</section>\n',styles:[':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n'],dependencies:[{kind:"directive",type:H.NgForOf,selector:"[ngFor][ngForOf]",inputs:["ngForOf","ngForTrackBy","ngForTemplate"]},{kind:"directive",type:H.NgIf,selector:"[ngIf]",inputs:["ngIf","ngIfThen","ngIfElse"]},{kind:"component",type:ue.MatIcon,selector:"mat-icon",inputs:["color","inline","svgIcon","fontSet","fontIcon"],exportAs:["matIcon"]},{kind:"directive",type:J.MatInput,selector:"input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]",inputs:["disabled","id","placeholder","name","required","type","errorStateMatcher","aria-describedby","value","readonly"],exportAs:["matInput"]},{kind:"component",type:Y.MatFormField,selector:"mat-form-field",inputs:["hideRequiredMarker","color","floatLabel","appearance","subscriptSizing","hintLabel"],exportAs:["matFormField"]},{kind:"directive",type:Y.MatLabel,selector:"mat-label"},{kind:"directive",type:Y.MatError,selector:"mat-error, [matError]",inputs:["id"]},{kind:"directive",type:Y.MatSuffix,selector:"[matSuffix], [matIconSuffix], [matTextSuffix]",inputs:["matTextSuffix"]},{kind:"directive",type:ce.MatTooltip,selector:"[matTooltip]",exportAs:["matTooltip"]},{kind:"component",type:We.MatExpansionPanel,selector:"mat-expansion-panel",inputs:["disabled","expanded","hideToggle","togglePosition"],outputs:["opened","closed","expandedChange","afterExpand","afterCollapse"],exportAs:["matExpansionPanel"]},{kind:"component",type:We.MatExpansionPanelHeader,selector:"mat-expansion-panel-header",inputs:["tabIndex","expandedHeight","collapsedHeight"]},{kind:"directive",type:We.MatExpansionPanelTitle,selector:"mat-panel-title"},{kind:"directive",type:R.DefaultValueAccessor,selector:"input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]"},{kind:"directive",type:R.NumberValueAccessor,selector:"input[type=number][formControlName],input[type=number][formControl],input[type=number][ngModel]"},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]},{kind:"directive",type:Z.TranslateDirective,selector:"[translate],[ngx-translate]",inputs:["translate","translateParams"]},{kind:"directive",type:Fe.ToggleOption,selector:"tb-toggle-option",inputs:["value"]},{kind:"component",type:ke.ToggleSelectComponent,selector:"tb-toggle-select",inputs:["disabled","selectMediaBreakpoint","appearance","disablePagination"]},{kind:"component",type:Bn,selector:"tb-output-message-type-autocomplete",inputs:["subscriptSizing","disabled","required"]},{kind:"component",type:An,selector:"tb-example-hint",inputs:["hintText","popupHelpLink","textAlign"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:_r,decorators:[{type:n,args:[{selector:"tb-action-node-msg-deduplication-config",template:'<section [formGroup]="deduplicationConfigForm">\n  <mat-form-field class="mat-block">\n    <mat-label>{{\'tb.rulenode.interval\' | translate}}</mat-label>\n    <input type=\'number\' required matInput formControlName="interval">\n    <mat-error *ngIf="deduplicationConfigForm.get(\'interval\').hasError(\'required\')">\n      {{\'tb.rulenode.interval-required\' | translate}}\n    </mat-error>\n    <mat-error *ngIf="deduplicationConfigForm.get(\'interval\').hasError(\'min\')">\n      {{\'tb.rulenode.interval-min-error\' | translate}}\n    </mat-error>\n    <mat-icon matSuffix class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon"\n              color="primary"\n              matTooltip="{{ \'tb.rulenode.interval-hint\' | translate }}">help</mat-icon>\n  </mat-form-field>\n  <div class="tb-form-panel no-padding no-border">\n    <div class="tb-form-panel stroked">\n      <div class="tb-form-panel-title  tb-required" translate>tb.rulenode.strategy</div>\n      <tb-toggle-select class="fetch-to-data-toggle" formControlName="strategy" appearance="fill">\n        <tb-toggle-option *ngFor="let strategy of deduplicationStrategies" [value]="strategy">\n          {{ deduplicationStrategiesTranslations.get(strategy) | translate }}\n        </tb-toggle-option>\n      </tb-toggle-select>\n      <tb-example-hint [hintText]="\'tb.rulenode.strategy-all-hint\' | translate"\n                       *ngIf="deduplicationConfigForm.get(\'strategy\').value === \'ALL\'">\n      </tb-example-hint>\n      <tb-example-hint [hintText]="\'tb.rulenode.strategy-first-hint\' | translate"\n                        textAlign="\'center\'"\n                       *ngIf="deduplicationConfigForm.get(\'strategy\').value === \'FIRST\'">\n      </tb-example-hint>\n      <tb-example-hint [hintText]="\'tb.rulenode.strategy-last-hint\' | translate"\n                        textAlign="\'center\'"\n                       *ngIf="deduplicationConfigForm.get(\'strategy\').value === \'LAST\'">\n      </tb-example-hint>\n      <div *ngIf="deduplicationConfigForm.get(\'strategy\').value === deduplicationStrategie.ALL">\n        <tb-output-message-type-autocomplete\n          required\n          formControlName="outMsgType">\n        </tb-output-message-type-autocomplete>\n      </div>\n    </div>\n    <section class="tb-form-panel stroked">\n      <mat-expansion-panel class="tb-settings">\n        <mat-expansion-panel-header>\n          <mat-panel-title translate>tb.rulenode.advanced-settings</mat-panel-title>\n        </mat-expansion-panel-header>\n        <div class="tb-form-row no-border no-padding tb-standard-fields">\n          <mat-form-field class="flex">\n            <mat-label>{{\'tb.rulenode.max-pending-msgs\' | translate}}</mat-label>\n            <input type = \'number\' required matInput formControlName="maxPendingMsgs">\n            <mat-error *ngIf="deduplicationConfigForm.get(\'maxPendingMsgs\').hasError(\'required\')">\n              {{\'tb.rulenode.max-pending-msgs-required\' | translate}}\n            </mat-error>\n            <mat-error *ngIf="deduplicationConfigForm.get(\'maxPendingMsgs\').hasError(\'max\')">\n              {{\'tb.rulenode.max-pending-msgs-max-error\' | translate}}\n            </mat-error>\n            <mat-error *ngIf="deduplicationConfigForm.get(\'maxPendingMsgs\').hasError(\'min\')">\n              {{\'tb.rulenode.max-pending-msgs-min-error\' | translate}}\n            </mat-error>\n            <mat-icon matSuffix class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon"\n                      color="primary"\n                      matTooltip="{{ \'tb.rulenode.max-pending-msgs-hint\' | translate }}">help</mat-icon>\n          </mat-form-field>\n          <mat-form-field class="flex">\n            <mat-label>{{\'tb.rulenode.max-retries\' | translate}}</mat-label>\n            <input type = \'number\' required matInput formControlName="maxRetries">\n            <mat-error *ngIf="deduplicationConfigForm.get(\'maxRetries\').hasError(\'required\')">\n              {{\'tb.rulenode.max-retries-required\' | translate}}\n            </mat-error>\n            <mat-error *ngIf="deduplicationConfigForm.get(\'maxRetries\').hasError(\'max\')">\n              {{\'tb.rulenode.max-retries-max-error\' | translate}}\n            </mat-error>\n            <mat-error *ngIf="deduplicationConfigForm.get(\'maxRetries\').hasError(\'min\')">\n              {{\'tb.rulenode.max-retries-min-error\' | translate}}\n            </mat-error>\n            <mat-icon matSuffix class="help-icon margin-8 cursor-pointer" aria-hidden="false" aria-label="help-icon"\n                      color="primary"\n                      matTooltip="{{ \'tb.rulenode.max-retries-hint\' | translate }}">help</mat-icon>\n          </mat-form-field>\n        </div>\n      </mat-expansion-panel>\n    </section>\n  </div>\n</section>\n',styles:[':host .margin-8{margin:8px}:host .tb-error{letter-spacing:.25px;color:var(--mdc-theme-error, #f44336)}:host .tb-required:after{content:"*";font-size:16px;color:#000000de}:host .help-icon{color:#000;opacity:.38;padding:unset}:host .help-icon:hover{color:#305680;opacity:unset}.same-width-component-row{display:flex;flex-wrap:nowrap;gap:16px}@media screen and (max-width: 599px){.same-width-component-row{gap:8px}}.same-width-component-row>*{flex:1}\n']}]}],ctorParameters:function(){return[{type:P.Store},{type:R.FormBuilder}]}});class Br{}e("RulenodeCoreConfigTransformModule",Br),Br.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Br,deps:[],target:t.ɵɵFactoryTarget.NgModule}),Br.ɵmod=t.ɵɵngDeclareNgModule({minVersion:"14.0.0",version:"15.2.10",ngImport:t,type:Br,declarations:[Sr,qr,wr,Vr,Pr,Rr,Or,_r],imports:[$,M,$n],exports:[Sr,qr,wr,Vr,Pr,Rr,Or,_r]}),Br.ɵinj=t.ɵɵngDeclareInjector({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Br,imports:[$,M,$n]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Br,decorators:[{type:c,args:[{declarations:[Sr,qr,wr,Vr,Pr,Rr,Or,_r],imports:[$,M,$n],exports:[Sr,qr,wr,Vr,Pr,Rr,Or,_r]}]}]});class Kr extends f{constructor(e,t){super(e),this.store=e,this.fb=t,this.entityType=F}configForm(){return this.ruleChainInputConfigForm}onConfigurationSet(e){this.ruleChainInputConfigForm=this.fb.group({ruleChainId:[e?e.ruleChainId:null,[O.required]]})}}e("RuleChainInputComponent",Kr),Kr.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Kr,deps:[{token:P.Store},{token:R.UntypedFormBuilder}],target:t.ɵɵFactoryTarget.Component}),Kr.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:Kr,selector:"tb-flow-node-rule-chain-input-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="ruleChainInputConfigForm" fxLayout="column">\n  <tb-entity-autocomplete required\n                          [excludeEntityIds]="[ruleChainId]"\n                          [entityType]="entityType.RULE_CHAIN"\n                          [entitySubtype]="ruleChainType"\n                          formControlName="ruleChainId">\n  </tb-entity-autocomplete>\n</section>\n',dependencies:[{kind:"component",type:lt.EntityAutocompleteComponent,selector:"tb-entity-autocomplete",inputs:["entityType","entitySubtype","excludeEntityIds","labelText","requiredText","useFullEntityId","appearance","required","disabled"],outputs:["entityChanged"]},{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:R.NgControlStatus,selector:"[formControlName],[ngModel],[formControl]"},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.RequiredValidator,selector:":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]",inputs:["required"]},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"directive",type:R.FormControlName,selector:"[formControlName]",inputs:["formControlName","disabled","ngModel"],outputs:["ngModelChange"]}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Kr,decorators:[{type:n,args:[{selector:"tb-flow-node-rule-chain-input-config",template:'<section [formGroup]="ruleChainInputConfigForm" fxLayout="column">\n  <tb-entity-autocomplete required\n                          [excludeEntityIds]="[ruleChainId]"\n                          [entityType]="entityType.RULE_CHAIN"\n                          [entitySubtype]="ruleChainType"\n                          formControlName="ruleChainId">\n  </tb-entity-autocomplete>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder}]}});class zr extends f{constructor(e,t){super(e),this.store=e,this.fb=t}configForm(){return this.ruleChainOutputConfigForm}onConfigurationSet(e){this.ruleChainOutputConfigForm=this.fb.group({})}}e("RuleChainOutputComponent",zr),zr.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:zr,deps:[{token:P.Store},{token:R.UntypedFormBuilder}],target:t.ɵɵFactoryTarget.Component}),zr.ɵcmp=t.ɵɵngDeclareComponent({minVersion:"14.0.0",version:"15.2.10",type:zr,selector:"tb-flow-node-rule-chain-output-config",usesInheritance:!0,ngImport:t,template:'<section [formGroup]="ruleChainOutputConfigForm" fxLayout="column">\n  <div innerHTML="{{ \'tb.rulenode.output-node-name-hint\' | translate }}"></div>\n</section>\n',dependencies:[{kind:"directive",type:W.DefaultLayoutDirective,selector:"  [fxLayout], [fxLayout.xs], [fxLayout.sm], [fxLayout.md],  [fxLayout.lg], [fxLayout.xl], [fxLayout.lt-sm], [fxLayout.lt-md],  [fxLayout.lt-lg], [fxLayout.lt-xl], [fxLayout.gt-xs], [fxLayout.gt-sm],  [fxLayout.gt-md], [fxLayout.gt-lg]",inputs:["fxLayout","fxLayout.xs","fxLayout.sm","fxLayout.md","fxLayout.lg","fxLayout.xl","fxLayout.lt-sm","fxLayout.lt-md","fxLayout.lt-lg","fxLayout.lt-xl","fxLayout.gt-xs","fxLayout.gt-sm","fxLayout.gt-md","fxLayout.gt-lg"]},{kind:"directive",type:R.NgControlStatusGroup,selector:"[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]"},{kind:"directive",type:R.FormGroupDirective,selector:"[formGroup]",inputs:["formGroup"],outputs:["ngSubmit"],exportAs:["ngForm"]},{kind:"pipe",type:Z.TranslatePipe,name:"translate"}]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:zr,decorators:[{type:n,args:[{selector:"tb-flow-node-rule-chain-output-config",template:'<section [formGroup]="ruleChainOutputConfigForm" fxLayout="column">\n  <div innerHTML="{{ \'tb.rulenode.output-node-name-hint\' | translate }}"></div>\n</section>\n'}]}],ctorParameters:function(){return[{type:P.Store},{type:R.UntypedFormBuilder}]}});class Ur{}e("RuleNodeCoreConfigFlowModule",Ur),Ur.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Ur,deps:[],target:t.ɵɵFactoryTarget.NgModule}),Ur.ɵmod=t.ɵɵngDeclareNgModule({minVersion:"14.0.0",version:"15.2.10",ngImport:t,type:Ur,declarations:[Kr,zr],imports:[$,M,$n],exports:[Kr,zr]}),Ur.ɵinj=t.ɵɵngDeclareInjector({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Ur,imports:[$,M,$n]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Ur,decorators:[{type:c,args:[{declarations:[Kr,zr],imports:[$,M,$n],exports:[Kr,zr]}]}]});class Hr{constructor(e){!function(e){e.setTranslation("en_US",{tb:{rulenode:{id:"Id","additional-info":"Additional Info","advanced-settings":"Advanced settings","create-entity-if-not-exists":"Create new entity if not exists","create-entity-if-not-exists-hint":"Create a new entity set above if it does not exist.","select-device-connectivity-event":"Select device connectivity event","entity-name-pattern":"Name pattern","entity-name-pattern-required":"Name pattern is required","entity-name-pattern-hint":"Name pattern field support templatization. Use $[messageKey] to extract value from the message and ${metadataKey} to extract value from the metadata.","copy-message-type":"Copy message type","entity-type-pattern":"Type pattern","entity-type-pattern-required":"Type pattern is required","message-type-value":"Message type value","message-type-value-required":"Message type value is required","message-type-value-max-length":"Message type value should be less than 256","output-message-type":"Output message type","entity-cache-expiration":"Entities cache expiration time (sec)","entity-cache-expiration-hint":"Specifies maximum time interval allowed to store found entity records. 0 value means that records will never expire.","entity-cache-expiration-required":"Entities cache expiration time is required.","entity-cache-expiration-range":"Entities cache expiration time should be greater than or equal to 0.","customer-name-pattern":"Customer name pattern","customer-name-pattern-required":"Customer name pattern is required","create-customer-if-not-exists":"Create new customer if not exists","customer-cache-expiration":"Customers cache expiration time (sec)","customer-cache-expiration-hint":"Specifies maximum time interval allowed to store found customer records. 0 value means that records will never expire.","customer-cache-expiration-required":"Customers cache expiration time is required.","customer-cache-expiration-range":"Customers cache expiration time should be greater than or equal to 0.","interval-start":"Interval start","interval-end":"Interval end","time-unit":"Time unit","fetch-mode":"Fetch mode","order-by-timestamp":"Order by timestamp",limit:"Limit","limit-hint":"Min limit value is 2, max - 1000. If you want to fetch a single entry, select fetch mode 'First' or 'Last'.","limit-required":"Limit is required.","limit-range":"Limit should be in a range from 2 to 1000.","time-unit-milliseconds":"Milliseconds","time-unit-seconds":"Seconds","time-unit-minutes":"Minutes","time-unit-hours":"Hours","time-unit-days":"Days","time-value-range":"Allowing range from 1 to 2147483647.","start-interval-value-required":"Interval start is required.","end-interval-value-required":"Interval end is required.",filter:"Filter",switch:"Switch","math-templatization-tooltip":"This field support templatization. Use $[messageKey] to extract value from the message and ${metadataKey} to extract value from the metadata.","add-message-type":"Add message type","select-message-types-required":"At least one message type should be selected.","select-message-types":"Select message types","no-message-types-found":"No message types found","no-message-type-matching":"'{{messageType}}' not found.","create-new-message-type":"Create a new one.","message-types-required":"Message types are required.","client-attributes":"Client attributes","shared-attributes":"Shared attributes","server-attributes":"Server attributes","attributes-keys":"Attributes keys","attributes-keys-required":"Attributes keys are required","notify-device":"Force notification to the device","send-attributes-updated-notification":"Send attributes updated notification","send-attributes-updated-notification-hint":"Send notification about updated attributes as a separate message to the rule engine queue.","send-attributes-deleted-notification":"Send attributes deleted notification","send-attributes-deleted-notification-hint":"Send notification about deleted attributes as a separate message to the rule engine queue.","update-attributes-only-on-value-change":"Save attributes only if the value changes","update-attributes-only-on-value-change-hint":"Updates the attributes on every incoming message disregarding if their value has changed. Increases API usage and reduces performance.","update-attributes-only-on-value-change-hint-enabled":"Updates the attributes only if their value has changed. If the value is not changed, no update to the attribute timestamp nor attribute change notification will be sent.","fetch-credentials-to-metadata":"Fetch credentials to metadata","notify-device-on-update-hint":"If enabled, force notification to the device about shared attributes update. If disabled, the notification behavior is controlled by the 'notifyDevice' parameter from the incoming message metadata. To turn off the notification, the message metadata must contain the 'notifyDevice' parameter set to 'false'. Any other case will trigger the notification to the device.","notify-device-on-delete-hint":"If enabled, force notification to the device about shared attributes removal. If disabled, the notification behavior is controlled by the 'notifyDevice' parameter from the incoming message metadata. To turn on the notification, the message metadata must contain the 'notifyDevice' parameter set to 'true'. In any other case, the notification will not be triggered to the device.","latest-timeseries":"Latest time-series data keys","timeseries-keys":"Timeseries keys","timeseries-keys-required":"At least one timeseries key should be selected.","add-timeseries-key":"Add timeseries key","add-message-field":"Add message field","relation-search-parameters":"Relation search parameters","add-metadata-field":"Add metadata field","data-keys":"Message field names","copy-from":"Copy from","data-to-metadata":"Data to metadata","metadata-to-data":"Metadata to data","use-regular-expression-hint":"Use regular expression to copy keys by pattern.\n\nTips & tricks:\nPress 'Enter' to complete field name input.\nPress 'Backspace' to delete field name. Multiple field names supported.",interval:"Interval","interval-required":"Interval is required","interval-hint":"Deduplication interval in seconds.","interval-min-error":"Min allowed value is 1","max-pending-msgs":"Max pending messages","max-pending-msgs-hint":"Maximum number of messages that are stored in memory for each unique deduplication id.","max-pending-msgs-required":"Max pending messages is required","max-pending-msgs-max-error":"Max allowed value is 1000","max-pending-msgs-min-error":"Min allowed value is 1","max-retries":"Max retries","max-retries-required":"Max retries is required","max-retries-hint":"Maximum number of retries to push the deduplicated messages into the queue. 10 seconds delay is used between retries","max-retries-max-error":"Max allowed value is 100","max-retries-min-error":"Min allowed value is 0",strategy:"Strategy","strategy-required":"Strategy is required","strategy-all-hint":"Return all messages that arrived during deduplication period as a single JSON array message. Where each element represents object with msg and metadata inner properties.","strategy-first-hint":"Return first message that arrived during deduplication period.","strategy-last-hint":"Return last message that arrived during deduplication period.",first:"First",last:"Last",all:"All","output-msg-type-hint":"The message type of the deduplication result.","queue-name-hint":"The queue name where the deduplication result will be published.",keys:"Keys","keys-required":"Keys are required","rename-keys-in":"Rename keys in",data:"Data",message:"Message",metadata:"Metadata","current-key-name":"Current key name","key-name-required":"Key name is required","new-key-name":"New key name","new-key-name-required":"New key name is required","metadata-keys":"Metadata field names","json-path-expression":"JSON path expression","json-path-expression-required":"JSON path expression is required","json-path-expression-hint":"JSONPath specifies a path to an element or a set of elements in a JSON structure. '$' represents the root object or array.","relations-query":"Relations query","device-relations-query":"Device relations query","max-relation-level":"Max relation level","max-relation-level-error":"Value should be greater than 0 or unspecified.","relation-type":"Relation type","relation-type-pattern":"Relation type pattern","relation-type-pattern-required":"Relation type pattern is required","relation-types-list":"Relation types to propagate","relation-types-list-hint":"If Propagate relation types are not selected, alarms will be propagated without filtering by relation type.","unlimited-level":"Unlimited level","latest-telemetry":"Latest telemetry","add-telemetry-key":"Add telemetry key","delete-from":"Delete from","use-regular-expression-delete-hint":"Use regular expression to delete keys by pattern.\n\nTips & tricks:\nPress 'Enter' to complete field name input.\nPress 'Backspace' to delete field name.\nMultiple field names supported.","fetch-into":"Fetch into","attr-mapping":"Attributes mapping:","source-attribute":"Source attribute key","source-attribute-required":"Source attribute key is required.","source-telemetry":"Source telemetry key","source-telemetry-required":"Source telemetry key is required.","target-key":"Target key","target-key-required":"Target key is required.","attr-mapping-required":"At least one mapping entry should be specified.","fields-mapping":"Fields mapping","relations-query-config-direction-suffix":"originator","profile-name":"Profile name","fetch-circle-parameter-info-from-metadata-hint":'Metadata field \'{{perimeterKeyName}}\' should be defined in next format: {"latitude":48.196, "longitude":24.6532, "radius":100.0, "radiusUnit":"METER"}',"fetch-poligon-parameter-info-from-metadata-hint":"Metadata field '{{perimeterKeyName}}' should be defined in next format: [[48.19736,24.65235],[48.19800,24.65060],...,[48.19849,24.65420]]","short-templatization-tooltip":"Use $[messageKey] to extract value from the message and ${metadataKey} to extract value from the metadata.","fields-mapping-required":"At least one field mapping should be specified.","at-least-one-field-required":"At least one input field must have a value(s) provided.","originator-fields-sv-map-hint":"Target key fields support templatization. Use $[messageKey] to extract value from the message and ${metadataKey} to extract value from the metadata.","sv-map-hint":"Only target key fields support templatization. Use $[messageKey] to extract value from the message and ${metadataKey} to extract value from the metadata.","source-field":"Source field","source-field-required":"Source field is required.","originator-source":"Originator source","new-originator":"New originator","originator-customer":"Customer","originator-tenant":"Tenant","originator-related":"Related entity","originator-alarm-originator":"Alarm Originator","originator-entity":"Entity by name pattern","clone-message":"Clone message",transform:"Transform","default-ttl":"Default TTL in seconds","default-ttl-required":"Default TTL is required.","min-default-ttl-message":"Only 0 minimum TTL is allowed.","message-count":"Message count (0 - unlimited)","message-count-required":"Message count is required.","min-message-count-message":"Only 0 minimum message count is allowed.","period-seconds":"Period in seconds","period-seconds-required":"Period is required.","use-metadata-period-in-seconds-patterns":"Use period in seconds pattern","use-metadata-period-in-seconds-patterns-hint":"If selected, rule node use period in seconds interval pattern from message metadata or data assuming that intervals are in the seconds.","period-in-seconds-pattern":"Period in seconds pattern","period-in-seconds-pattern-required":"Period in seconds pattern is required","min-period-seconds-message":"Only 1 second minimum period is allowed.",originator:"Originator","message-body":"Message body","message-metadata":"Message metadata",generate:"Generate","test-generator-function":"Test generator function",generator:"Generator","test-filter-function":"Test filter function","test-switch-function":"Test switch function","test-transformer-function":"Test transformer function",transformer:"Transformer","alarm-create-condition":"Alarm create condition","test-condition-function":"Test condition function","alarm-clear-condition":"Alarm clear condition","alarm-details-builder":"Alarm details builder","test-details-function":"Test details function","alarm-type":"Alarm type","select-entity-types":"Select entity types","alarm-type-required":"Alarm type is required.","alarm-severity":"Alarm severity","alarm-severity-required":"Alarm severity is required","alarm-severity-pattern":"Alarm severity pattern","alarm-status-filter":"Alarm status filter","alarm-status-list-empty":"Alarm status list is empty","no-alarm-status-matching":"No alarm status matching were found.",propagate:"Propagate alarm to related entities","propagate-to-owner":"Propagate alarm to entity owner (Customer or Tenant)","propagate-to-tenant":"Propagate alarm to Tenant",condition:"Condition",details:"Details","to-string":"To string","test-to-string-function":"Test to string function","from-template":"From","from-template-required":"From is required","message-to-metadata":"Message to metadata","metadata-to-message":"Metadata to message","from-message":"From message","from-metadata":"From metadata","to-template":"To","to-template-required":"To Template is required","mail-address-list-template-hint":'Comma separated address list, use <code><span style="color: #000;">$&#123;</span>metadataKey<span style="color: #000;">&#125;</span></code> for value from metadata, <code><span style="color: #000;">$[</span>messageKey<span style="color: #000;">]</span></code> for value from message body',"cc-template":"Cc","bcc-template":"Bcc","subject-template":"Subject","subject-template-required":"Subject Template is required","body-template":"Body","body-template-required":"Body Template is required","dynamic-mail-body-type":"Dynamic mail body type","mail-body-type":"Mail body type","body-type-template":"Body type template","request-id-metadata-attribute":"Request Id Metadata attribute name","timeout-sec":"Timeout in seconds","timeout-required":"Timeout is required","min-timeout-message":"Only 0 minimum timeout value is allowed.","endpoint-url-pattern":"Endpoint URL pattern","endpoint-url-pattern-required":"Endpoint URL pattern is required","request-method":"Request method","use-simple-client-http-factory":"Use simple client HTTP factory","ignore-request-body":"Without request body","parse-to-plain-text":"Parse to plain text","parse-to-plain-text-hint":'If selected, request body message payload will be transformed from JSON string to plain text, e.g. msg = "Hello,\\t\\"world\\"" will be parsed to Hello, "world"',"read-timeout":"Read timeout in millis","read-timeout-hint":"The value of 0 means an infinite timeout","max-parallel-requests-count":"Max number of parallel requests","max-parallel-requests-count-hint":"The value of 0 specifies no limit in parallel processing",headers:"Headers","headers-hint":'Use <code><span style="color: #000;">$&#123;</span>metadataKey<span style="color: #000;">&#125;</span></code> for value from metadata, <code><span style="color: #000;">$[</span>messageKey<span style="color: #000;">]</span></code> for value from message body in header/value fields',header:"Header","header-required":"Header is required",value:"Value","value-required":"Value is required","topic-pattern":"Topic pattern","key-pattern":"Key pattern","key-pattern-hint":"Optional. If a valid partition number is specified, it will be used when sending the record. If no partition is specified, the key will be used instead. If neither is specified, a partition will be assigned in a round-robin fashion.","topic-pattern-required":"Topic pattern is required",topic:"Topic","topic-required":"Topic is required","bootstrap-servers":"Bootstrap servers","bootstrap-servers-required":"Bootstrap servers value is required","other-properties":"Other properties",key:"Key","key-required":"Key is required",retries:"Automatically retry times if fails","min-retries-message":"Only 0 minimum retries is allowed.","batch-size-bytes":"Produces batch size in bytes","min-batch-size-bytes-message":"Only 0 minimum batch size is allowed.","linger-ms":"Time to buffer locally (ms)","min-linger-ms-message":"Only 0 ms minimum value is allowed.","buffer-memory-bytes":"Client buffer max size in bytes","min-buffer-memory-message":"Only 0 minimum buffer size is allowed.",acks:"Number of acknowledgments","key-serializer":"Key serializer","key-serializer-required":"Key serializer is required","value-serializer":"Value serializer","value-serializer-required":"Value serializer is required","topic-arn-pattern":"Topic ARN pattern","topic-arn-pattern-required":"Topic ARN pattern is required","aws-access-key-id":"AWS Access Key ID","aws-access-key-id-required":"AWS Access Key ID is required","aws-secret-access-key":"AWS Secret Access Key","aws-secret-access-key-required":"AWS Secret Access Key is required","aws-region":"AWS Region","aws-region-required":"AWS Region is required","exchange-name-pattern":"Exchange name pattern","routing-key-pattern":"Routing key pattern","message-properties":"Message properties",host:"Host","host-required":"Host is required",port:"Port","port-required":"Port is required","port-range":"Port should be in a range from 1 to 65535.","virtual-host":"Virtual host",username:"Username",password:"Password","automatic-recovery":"Automatic recovery","connection-timeout-ms":"Connection timeout (ms)","min-connection-timeout-ms-message":"Only 0 ms minimum value is allowed.","handshake-timeout-ms":"Handshake timeout (ms)","min-handshake-timeout-ms-message":"Only 0 ms minimum value is allowed.","client-properties":"Client properties","queue-url-pattern":"Queue URL pattern","queue-url-pattern-required":"Queue URL pattern is required","delay-seconds":"Delay (seconds)","min-delay-seconds-message":"Only 0 seconds minimum value is allowed.","max-delay-seconds-message":"Only 900 seconds maximum value is allowed.",name:"Name","name-required":"Name is required","queue-type":"Queue type","sqs-queue-standard":"Standard","sqs-queue-fifo":"FIFO","gcp-project-id":"GCP project ID","gcp-project-id-required":"GCP project ID is required","gcp-service-account-key":"GCP service account key file","gcp-service-account-key-required":"GCP service account key file is required","pubsub-topic-name":"Topic name","pubsub-topic-name-required":"Topic name is required","message-attributes":"Message attributes","message-attributes-hint":'Use <code><span style="color: #000;">$&#123;</span>metadataKey<span style="color: #000000;">&#125;</span></code> for value from metadata, <code><span style="color: #000;">$[</span>messageKey<span style="color: #000;">]</span></code> for value from message body in name/value fields',"connect-timeout":"Connection timeout (sec)","connect-timeout-required":"Connection timeout is required.","connect-timeout-range":"Connection timeout should be in a range from 1 to 200.","client-id":"Client ID","client-id-hint":'Optional. Leave empty for auto-generated Client ID. Be careful when specifying the Client ID. Majority of the MQTT brokers will not allow multiple connections with the same Client ID. To connect to such brokers, your mqtt Client ID must be unique. When platform is running in a micro-services mode, the copy of rule node is launched in each micro-service. This will automatically lead to multiple mqtt clients with the same ID and may cause failures of the rule node. To avoid such failures enable "Add Service ID as suffix to Client ID" option below.',"append-client-id-suffix":"Add Service ID as suffix to Client ID","client-id-suffix-hint":'Optional. Applied when "Client ID" specified explicitly. If selected then Service ID will be added to Client ID as a suffix. Helps to avoid failures when platform is running in a micro-services mode.',"device-id":"Device ID","device-id-required":"Device ID is required.","clean-session":"Clean session","enable-ssl":"Enable SSL",credentials:"Credentials","credentials-type":"Credentials type","credentials-type-required":"Credentials type is required.","credentials-anonymous":"Anonymous","credentials-basic":"Basic","credentials-pem":"PEM","credentials-pem-hint":"At least Server CA certificate file or a pair of Client certificate and Client private key files are required","credentials-sas":"Shared Access Signature","sas-key":"SAS Key","sas-key-required":"SAS Key is required.",hostname:"Hostname","hostname-required":"Hostname is required.","azure-ca-cert":"CA certificate file","username-required":"Username is required.","password-required":"Password is required.","ca-cert":"Server CA certificate file","private-key":"Client private key file",cert:"Client certificate file","no-file":"No file selected.","drop-file":"Drop a file or click to select a file to upload.","private-key-password":"Private key password","use-system-smtp-settings":"Use system SMTP settings","use-metadata-dynamic-interval":"Use dynamic interval","metadata-dynamic-interval-hint":"Interval start and end input fields support templatization. Note that the substituted template value should be set in milliseconds. Use $[messageKey] to extract value from the message and ${metadataKey} to extract value from the metadata.","use-metadata-interval-patterns-hint":"If selected, rule node use start and end interval patterns from message metadata or data assuming that intervals are in the milliseconds.","use-message-alarm-data":"Use message alarm data","overwrite-alarm-details":"Overwrite alarm details","use-alarm-severity-pattern":"Use alarm severity pattern","check-all-keys":"Check that all specified fields are present","check-all-keys-hint":"If selected, checks that all specified keys are present in the message data and metadata.","check-relation-to-specific-entity":"Check relation to specific entity","check-relation-to-specific-entity-tooltip":"If enabled, checks the presence of relation with a specific entity otherwise, checks the presence of relation with any entity. In both cases, relation lookup is based on configured direction and type.","check-relation-hint":"Checks existence of relation to specific entity or to any entity based on direction and relation type.","delete-relation-to-specific-entity":"Delete relation to specific entity","delete-relation-hint":"Deletes relation from the originator of the incoming message to the specified entity or list of entities based on direction and type.","remove-current-relations":"Remove current relations","remove-current-relations-hint":"Removes current relations from the originator of the incoming message based on direction and type.","change-originator-to-related-entity":"Change originator to related entity","change-originator-to-related-entity-hint":"Used to process submitted message as a message from another entity.","start-interval":"Interval start","end-interval":"Interval end","start-interval-required":"Interval start is required.","end-interval-required":"Interval end is required.","smtp-protocol":"Protocol","smtp-host":"SMTP host","smtp-host-required":"SMTP host is required.","smtp-port":"SMTP port","smtp-port-required":"You must supply a smtp port.","smtp-port-range":"SMTP port should be in a range from 1 to 65535.","timeout-msec":"Timeout ms","min-timeout-msec-message":"Only 0 ms minimum value is allowed.","enter-username":"Enter username","enter-password":"Enter password","enable-tls":"Enable TLS","tls-version":"TLS version","enable-proxy":"Enable proxy","use-system-proxy-properties":"Use system proxy properties","proxy-host":"Proxy host","proxy-host-required":"Proxy host is required.","proxy-port":"Proxy port","proxy-port-required":"Proxy port is required.","proxy-port-range":"Proxy port should be in a range from 1 to 65535.","proxy-user":"Proxy user","proxy-password":"Proxy password","proxy-scheme":"Proxy scheme","numbers-to-template":"Phone Numbers To Template","numbers-to-template-required":"Phone Numbers To Template is required","numbers-to-template-hint":'Comma separated Phone Numbers, use <code><span style="color: #000;">$&#123;</span>metadataKey<span style="color: #000;">&#125;</span></code> for value from metadata, <code><span style="color: #000;">$[</span>messageKey<span style="color: #000;">]</span></code> for value from message body',"sms-message-template":"SMS message Template","sms-message-template-required":"SMS message Template is required","use-system-sms-settings":"Use system SMS provider settings","min-period-0-seconds-message":"Only 0 second minimum period is allowed.","max-pending-messages":"Maximum pending messages","max-pending-messages-required":"Maximum pending messages is required.","max-pending-messages-range":"Maximum pending messages should be in a range from 1 to 100000.","originator-types-filter":"Originator types filter","interval-seconds":"Interval in seconds","interval-seconds-required":"Interval is required.","min-interval-seconds-message":"Only 1 second minimum interval is allowed.","output-timeseries-key-prefix":"Output timeseries key prefix","output-timeseries-key-prefix-required":"Output timeseries key prefix required.","separator-hint":'Press "Enter" to complete field input.',"select-details":"Select details","entity-details-id":"Id","entity-details-title":"Title","entity-details-country":"Country","entity-details-state":"State","entity-details-city":"City","entity-details-zip":"Zip","entity-details-address":"Address","entity-details-address2":"Address2","entity-details-additional_info":"Additional Info","entity-details-phone":"Phone","entity-details-email":"Email","email-sender":"Email sender","fields-to-check":"Fields to check","add-detail":"Add detail","check-all-keys-tooltip":"If enabled, checks the presence of all fields listed in the message and metadata field names within the incoming message and its metadata.","fields-to-check-hint":'Press "Enter" to complete field name input. Multiple field names supported.',"entity-details-list-empty":"At least one detail should be selected.","alarm-status":"Alarm status","alarm-required":"At least one alarm status should be selected.","no-entity-details-matching":"No entity details matching were found.","custom-table-name":"Custom table name","custom-table-name-required":"Table Name is required","custom-table-hint":"Enter the table name without prefix 'cs_tb_'.","message-field":"Message field","message-field-required":"Message field is required.","table-col":"Table column","table-col-required":"Table column is required.","latitude-field-name":"Latitude field name","longitude-field-name":"Longitude field name","latitude-field-name-required":"Latitude field name is required.","longitude-field-name-required":"Longitude field name is required.","fetch-perimeter-info-from-metadata":"Fetch perimeter information from metadata","fetch-perimeter-info-from-metadata-tooltip":"If perimeter type is set to 'Polygon' the value of metadata field '{{perimeterKeyName}}' will be set as perimeter definition without additional parsing of the value. Otherwise, if perimeter type is set to 'Circle' the value of '{{perimeterKeyName}}' metadata field will be parsed to extract 'latitude', 'longitude',  'radius', 'radiusUnit' fields that uses for circle perimeter definition.","perimeter-key-name":"Perimeter key name","perimeter-key-name-hint":"Metadata field name that includes perimeter information.","perimeter-key-name-required":"Perimeter key name is required.","perimeter-circle":"Circle","perimeter-polygon":"Polygon","perimeter-type":"Perimeter type","circle-center-latitude":"Center latitude","circle-center-latitude-required":"Center latitude is required.","circle-center-longitude":"Center longitude","circle-center-longitude-required":"Center longitude is required.","range-unit-meter":"Meter","range-unit-kilometer":"Kilometer","range-unit-foot":"Foot","range-unit-mile":"Mile","range-unit-nautical-mile":"Nautical mile","range-units":"Range units","range-units-required":"Range units is required.",range:"Range","range-required":"Range is required.","polygon-definition":"Polygon definition","polygon-definition-required":"Polygon definition is required.","polygon-definition-hint":"Use the following format for manual definition of polygon: [[lat1,lon1],[lat2,lon2], ... ,[latN,lonN]].","min-inside-duration":"Minimal inside duration","min-inside-duration-value-required":"Minimal inside duration is required","min-inside-duration-time-unit":"Minimal inside duration time unit","min-outside-duration":"Minimal outside duration","min-outside-duration-value-required":"Minimal outside duration is required","min-outside-duration-time-unit":"Minimal outside duration time unit","tell-failure-if-absent":"Tell Failure","tell-failure-if-absent-hint":'If at least one selected key doesn\'t exist the outbound message will report "Failure".',"get-latest-value-with-ts":"Fetch timestamp for the latest telemetry values","get-latest-value-with-ts-hint":'If selected, the latest telemetry values will also include timestamp, e.g: "temp": "&#123;"ts":1574329385897, "value":42&#125;"',"use-redis-queue":"Use redis queue for message persistence","ignore-null-strings":"Ignore null strings","ignore-null-strings-hint":"If selected rule node will ignore entity fields with empty value.","trim-redis-queue":"Trim redis queue","redis-queue-max-size":"Redis queue max size","add-metadata-key-values-as-kafka-headers":"Add Message metadata key-value pairs to Kafka record headers","add-metadata-key-values-as-kafka-headers-hint":"If selected, key-value pairs from message metadata will be added to the outgoing records headers as byte arrays with predefined charset encoding.","charset-encoding":"Charset encoding","charset-encoding-required":"Charset encoding is required.","charset-us-ascii":"US-ASCII","charset-iso-8859-1":"ISO-8859-1","charset-utf-8":"UTF-8","charset-utf-16be":"UTF-16BE","charset-utf-16le":"UTF-16LE","charset-utf-16":"UTF-16","select-queue-hint":"The queue name can be selected from a drop-down list or add a custom name.","persist-alarm-rules":"Persist state of alarm rules","fetch-alarm-rules":"Fetch state of alarm rules","input-value-key":"Input value key","input-value-key-required":"Input value key is required.","output-value-key":"Output value key","output-value-key-required":"Output value key is required.","number-of-digits-after-floating-point":"Number of digits after floating point","number-of-digits-after-floating-point-range":"Number of digits after floating point should be in a range from 0 to 15.","failure-if-delta-negative":"Tell Failure if delta is negative","failure-if-delta-negative-tooltip":"Rule node forces failure of message processing if delta value is negative.","use-caching":"Use caching","use-caching-tooltip":'Rule node will cache the value of "{{inputValueKey}}" that arrives from the incoming message to improve performance. Note that the cache will not be updated if you modify the "{{inputValueKey}}" value elsewhere.',"add-time-difference-between-readings":'Add the time difference between "{{inputValueKey}}" readings',"add-time-difference-between-readings-tooltip":'If enabled, the rule node will add the "{{periodValueKey}}" to the outbound message.',"period-value-key":"Period value key","period-value-key-required":"Period value key is required.","general-pattern-hint":"Use ${metadataKey} for value from metadata, $[messageKey] for value from message body.","alarm-severity-pattern-hint":'Use <code><span style="color: #000;">$&#123;</span>metadataKey<span style="color: #000;">&#125;</span></code> for value from metadata, <code><span style="color: #000;">$[</span>messageKey<span style="color: #000;">]</span></code> for value from message body. Alarm severity should be system (CRITICAL, MAJOR etc.)',"output-node-name-hint":"The <b>rule node name</b> corresponds to the <b>relation type</b> of the output message, and it is used to forward messages to other rule nodes in the caller rule chain.","skip-latest-persistence":"Skip latest persistence","use-server-ts":"Use server ts","use-server-ts-hint":"Enable this setting to use the timestamp of the message processing instead of the timestamp from the message. Useful for all sorts of sequential processing if you merge messages from multiple sources (devices, assets, etc).","kv-map-pattern-hint":"All input fields support templatization. Use $[messageKey] to extract value from the message and ${metadataKey} to extract value from the metadata.","shared-scope":"Shared scope","server-scope":"Server scope","client-scope":"Client scope","attribute-type":"Attribute","constant-type":"Constant","time-series-type":"Time-series","message-body-type":"Message","message-metadata-type":"Metadata","argument-tile":"Arguments","no-arguments-prompt":"No arguments configured","result-title":"Result","functions-field-input":"Functions","no-option-found":"No option found","argument-source-field-input":"Source","argument-source-field-input-required":"Argument source is required.","argument-key-field-input":"Key","argument-key-field-input-required":"Argument key is required.","constant-value-field-input":"Constant value","constant-value-field-input-required":"Constant value is required.","attribute-scope-field-input":"Attribute scope","attribute-scope-field-input-required":"Attribute scope os required.","default-value-field-input":"Default value","type-field-input":"Type","type-field-input-required":"Type is required.","key-field-input":"Key","add-entity-type":"Add entity type","add-device-profile":"Add device profile","key-field-input-required":"Key is required.","number-floating-point-field-input":"Number of digits after floating point","number-floating-point-field-input-hint":"Use <i>0</i> to convert result to integer","add-to-message-field-input":"Add to message","add-to-metadata-field-input":"Add to metadata","custom-expression-field-input":"Mathematical Expression","custom-expression-field-input-required":"Mathematical expression is required","custom-expression-field-input-hint":"Specify a mathematical expression to evaluate. Default expression demonstrates how to transform Fahrenheit to Celsius","retained-message":"Retained","attributes-mapping":"Attributes mapping","latest-telemetry-mapping":"Latest telemetry mapping","add-mapped-attribute-to":"Add mapped attributes to","add-mapped-latest-telemetry-to":"Add mapped latest telemetry to","add-mapped-fields-to":"Add mapped fields to","add-selected-details-to":"Add selected details to","clear-selected-types":"Clear selected types","clear-selected-details":"Clear selected details","clear-selected-fields":"Clear selected fields","clear-selected-keys":"Clear selected keys","geofence-configuration":"Geofence configuration","coordinate-field-names":"Coordinate field names","coordinate-field-hint":"Rule node tries to retrieve the specified fields from the message. If they are not present, it will look them up in the metadata.","presence-monitoring-strategy":"Presence monitoring strategy","presence-monitoring-strategy-on-first-message":"On first message","presence-monitoring-strategy-on-each-message":"On each message","presence-monitoring-strategy-on-first-message-hint":"Reports presence status 'Inside' or 'Outside' on the first message after the configured minimal duration has passed since previous presence status 'Entered' or 'Left' update.","presence-monitoring-strategy-on-each-message-hint":"Reports presence status 'Inside' or 'Outside' on each message after presence status 'Entered' or 'Left' update.","fetch-credentials-to":"Fetch credentials to","add-originator-attributes-to":"Add originator attributes to","originator-attributes":"Originator attributes","fetch-latest-telemetry-with-timestamp":"Fetch latest telemetry with timestamp","fetch-latest-telemetry-with-timestamp-tooltip":'If selected, latest telemetry values will be added to the outbound metadata with timestamp, e.g: "{{latestTsKeyName}}": "{"ts":1574329385897, "value":42}"',"tell-failure":"Tell failure if any of the attributes are missing","tell-failure-tooltip":'If at least one selected key doesn\'t exist the outbound message will report "Failure".',"created-time":"Created time","chip-help":"Press 'Enter' to complete {{inputName}} input. \nPress 'Backspace' to delete {{inputName}}. \nMultiple values supported.",detail:"detail","field-name":"field name","device-profile":"device profile","entity-type":"entity type","message-type":"message type","timeseries-key":"timeseries key",type:"Type","first-name":"First name","last-name":"Last name",label:"Label","originator-fields-mapping":"Originator fields mapping","add-mapped-originator-fields-to":"Add mapped originator fields to",fields:"Fields","skip-empty-fields":"Skip empty fields","skip-empty-fields-tooltip":"Fields with empty values will not be added to the output message/output metadata.","fetch-interval":"Fetch interval","fetch-strategy":"Fetch strategy","fetch-timeseries-from-to":"Fetch timeseries from {{startInterval}} {{startIntervalTimeUnit}} ago to {{endInterval}} {{endIntervalTimeUnit}} ago.","fetch-timeseries-from-to-invalid":'Fetch timeseries invalid ("Interval start" should be less than "Interval end").',"use-metadata-dynamic-interval-tooltip":"If selected, the rule node will use dynamic interval start and end based on the message and metadata patterns.","all-mode-hint":'If selected fetch mode "All" rule node will retrieve telemetry from the fetch interval with configurable query parameters.',"first-mode-hint":'If selected fetch mode "First" rule node will retrieve the closest telemetry to the fetch interval\'s start.',"last-mode-hint":'If selected fetch mode "Last" rule node will retrieve the closest telemetry to the fetch interval\'s end.',ascending:"Ascending",descending:"Descending",min:"Min",max:"Max",average:"Average",sum:"Sum",count:"Count",none:"None","last-level-relation-tooltip":"If selected, the rule node will search related entities only on the level set in the max relation level.","last-level-device-relation-tooltip":"If selected, the rule node will search related devices only on the level set in the max relation level.","data-to-fetch":"Data to fetch","mapping-of-customers":"Mapping of customer's","map-fields-required":"All mapping fields are required.",attributes:"Attributes","related-device-attributes":"Related device attributes","add-selected-attributes-to":"Add selected attributes to","device-profiles":"Device profiles","mapping-of-tenant":"Mapping of tenant's","add-attribute-key":"Add attribute key","message-template":"Message template","message-template-required":"Message template is required","use-system-slack-settings":"Use system slack settings","slack-api-token":"Slack API token","slack-api-token-required":"Slack API token is required","keys-mapping":"keys mapping","add-key":"Add key",recipients:"Recipients","message-subject-and-content":"Message subject and content","template-rules-hint":"Both input fields support templatization. Use $[messageKey] to extract value from the message and ${metadataKey} to extract value from the metadata.","originator-customer-desc":"Use customer of incoming message originator as new originator.","originator-tenant-desc":"Use current tenant as new originator.","originator-related-entity-desc":"Use related entity as new originator. Lookup based on configured relation type and direction.","originator-alarm-originator-desc":"Use alarm originator as new originator. Only if incoming message originator is alarm entity.","originator-entity-by-name-pattern-desc":"Use entity fetched from DB as new originator. Lookup based on entity type and specified name pattern.","email-from-template-hint":"Use $[messageKey] to extract value from the message and ${metadataKey} to extract value from the metadata.","recipients-block-main-hint":"Comma-separated address list. All input fields support templatization. Use $[messageKey] to extract value from the message and ${metadataKey} to extract value from the metadata."},"key-val":{key:"Key",value:"Value","see-examples":"See examples.","remove-entry":"Remove entry","remove-mapping-entry":"Remove mapping entry","add-mapping-entry":"Add mapping","add-entry":"Add entry","copy-key-values-from":"Copy key-values from","delete-key-values":"Delete key-values","delete-key-values-from":"Delete key-values from","at-least-one-key-error":"At least one key should be selected.","unique-key-value-pair-error":"'{{keyText}}' must be different from the '{{valText}}'!"},"mail-body-type":{"plain-text":"Plain text",html:"HTML",dynamic:"Dynamic","use-body-type-template":"Use body type template","plain-text-description":"Simple, unformatted text with no special styling or formating.","html-text-description":"Allows you to use HTML tags for formatting, links and images in your mai body.","dynamic-text-description":"Allows to use Plain Text or HTML body type dynamically based on templatization feature.","after-template-evaluation-hint":"After template evaluation value should be true for HTML, and false for Plain text."}}},!0)}(e)}}e("RuleNodeCoreConfigModule",Hr),Hr.ɵfac=t.ɵɵngDeclareFactory({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Hr,deps:[{token:Z.TranslateService}],target:t.ɵɵFactoryTarget.NgModule}),Hr.ɵmod=t.ɵɵngDeclareNgModule({minVersion:"14.0.0",version:"15.2.10",ngImport:t,type:Hr,declarations:[dt],imports:[$,M],exports:[Qn,Nr,ar,br,Br,Ur,dt]}),Hr.ɵinj=t.ɵɵngDeclareInjector({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Hr,imports:[$,M,Qn,Nr,ar,br,Br,Ur]}),t.ɵɵngDeclareClassMetadata({minVersion:"12.0.0",version:"15.2.10",ngImport:t,type:Hr,decorators:[{type:c,args:[{declarations:[dt],imports:[$,M],exports:[Qn,Nr,ar,br,Br,Ur,dt]}]}],ctorParameters:function(){return[{type:Z.TranslateService}]}})}}}));//# sourceMappingURL=rulenode-core-config.js.map
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/action/TbCreateRelationNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbCreateRelationNodeTest.java
index ec2b4a581f..5d7b92615d 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbCreateRelationNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbCreateRelationNodeTest.java
@@ -17,12 +17,12 @@ package org.thingsboard.rule.engine.action;
 
 import com.datastax.oss.driver.api.core.uuid.Uuids;
 import com.google.common.util.concurrent.Futures;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+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.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.common.util.ListeningExecutor;
 import org.thingsboard.rule.engine.TestDbCallbackExecutor;
@@ -49,13 +49,13 @@ import org.thingsboard.server.dao.relation.RelationService;
 
 import java.util.Collections;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class TbCreateRelationNodeTest {
 
     private TbCreateRelationNode node;
@@ -74,7 +74,7 @@ public class TbCreateRelationNodeTest {
 
     private ListeningExecutor dbExecutor;
 
-    @Before
+    @BeforeEach
     public void before() {
         dbExecutor = new TestDbCallbackExecutor();
     }
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbDeviceStateNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbDeviceStateNodeTest.java
index 9352d64809..9b3d2dc29b 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbDeviceStateNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbDeviceStateNodeTest.java
@@ -47,6 +47,7 @@ import org.thingsboard.server.common.msg.queue.TbCallback;
 import org.thingsboard.server.common.msg.tools.TbRateLimits;
 
 import java.util.UUID;
+import java.util.function.BiConsumer;
 import java.util.stream.Stream;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -65,9 +66,9 @@ public class TbDeviceStateNodeTest {
     @Mock
     private TbContext ctxMock;
     @Mock
-    private static RuleEngineDeviceStateManager deviceStateManagerMock;
+    private RuleEngineDeviceStateManager deviceStateManagerMock;
     @Captor
-    private static ArgumentCaptor<TbCallback> callbackCaptor;
+    private ArgumentCaptor<TbCallback> callbackCaptor;
     private TbDeviceStateNode node;
     private TbDeviceStateNodeConfiguration config;
 
@@ -246,7 +247,7 @@ public class TbDeviceStateNodeTest {
 
     @ParameterizedTest
     @MethodSource
-    public void givenSupportedEventAndDeviceOriginator_whenOnMsg_thenCorrectEventIsSentWithCorrectCallback(TbMsgType supportedEventType, Runnable actionVerification) {
+    public void givenSupportedEventAndDeviceOriginator_whenOnMsg_thenCorrectEventIsSentWithCorrectCallback(TbMsgType supportedEventType, BiConsumer<RuleEngineDeviceStateManager, ArgumentCaptor<TbCallback>> actionVerification) {
         // GIVEN
         given(ctxMock.getTenantId()).willReturn(TENANT_ID);
         given(ctxMock.getDeviceStateNodeRateLimitConfig()).willReturn("1:1");
@@ -262,7 +263,7 @@ public class TbDeviceStateNodeTest {
         node.onMsg(ctxMock, msg);
 
         // THEN
-        actionVerification.run();
+        actionVerification.accept(this.deviceStateManagerMock, this.callbackCaptor);
 
         TbCallback actualCallback = callbackCaptor.getValue();
 
@@ -280,10 +281,10 @@ public class TbDeviceStateNodeTest {
 
     private static Stream<Arguments> givenSupportedEventAndDeviceOriginator_whenOnMsg_thenCorrectEventIsSentWithCorrectCallback() {
         return Stream.of(
-                Arguments.of(TbMsgType.CONNECT_EVENT, (Runnable) () -> then(deviceStateManagerMock).should().onDeviceConnect(eq(TENANT_ID), eq(DEVICE_ID), eq(METADATA_TS), callbackCaptor.capture())),
-                Arguments.of(TbMsgType.ACTIVITY_EVENT, (Runnable) () -> then(deviceStateManagerMock).should().onDeviceActivity(eq(TENANT_ID), eq(DEVICE_ID), eq(METADATA_TS), callbackCaptor.capture())),
-                Arguments.of(TbMsgType.DISCONNECT_EVENT, (Runnable) () -> then(deviceStateManagerMock).should().onDeviceDisconnect(eq(TENANT_ID), eq(DEVICE_ID), eq(METADATA_TS), callbackCaptor.capture())),
-                Arguments.of(TbMsgType.INACTIVITY_EVENT, (Runnable) () -> then(deviceStateManagerMock).should().onDeviceInactivity(eq(TENANT_ID), eq(DEVICE_ID), eq(METADATA_TS), callbackCaptor.capture()))
+                Arguments.of(TbMsgType.CONNECT_EVENT, (BiConsumer<RuleEngineDeviceStateManager, ArgumentCaptor<TbCallback>>) (deviceStateManagerMock, callbackCaptor) -> then(deviceStateManagerMock).should().onDeviceConnect(eq(TENANT_ID), eq(DEVICE_ID), eq(METADATA_TS), callbackCaptor.capture())),
+                Arguments.of(TbMsgType.ACTIVITY_EVENT, (BiConsumer<RuleEngineDeviceStateManager, ArgumentCaptor<TbCallback>>) (deviceStateManagerMock, callbackCaptor) -> then(deviceStateManagerMock).should().onDeviceActivity(eq(TENANT_ID), eq(DEVICE_ID), eq(METADATA_TS), callbackCaptor.capture())),
+                Arguments.of(TbMsgType.DISCONNECT_EVENT, (BiConsumer<RuleEngineDeviceStateManager, ArgumentCaptor<TbCallback>>) (deviceStateManagerMock, callbackCaptor) -> then(deviceStateManagerMock).should().onDeviceDisconnect(eq(TENANT_ID), eq(DEVICE_ID), eq(METADATA_TS), callbackCaptor.capture())),
+                Arguments.of(TbMsgType.INACTIVITY_EVENT, (BiConsumer<RuleEngineDeviceStateManager, ArgumentCaptor<TbCallback>>) (deviceStateManagerMock, callbackCaptor) -> then(deviceStateManagerMock).should().onDeviceInactivity(eq(TENANT_ID), eq(DEVICE_ID), eq(METADATA_TS), callbackCaptor.capture()))
         );
     }
 
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/credentials/CertPemCredentialsTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/credentials/CertPemCredentialsTest.java
index 6aa1b02fa9..cd191c3707 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/credentials/CertPemCredentialsTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/credentials/CertPemCredentialsTest.java
@@ -16,8 +16,7 @@
 package org.thingsboard.rule.engine.credentials;
 
 import org.apache.commons.io.FileUtils;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
@@ -49,14 +48,14 @@ public class CertPemCredentialsTest {
 
         List<X509Certificate> x509Certificates = SslUtil.readCertFile(fileContent);
 
-        Assert.assertEquals(4, x509Certificates.size());
-        Assert.assertEquals("CN=*.thingsboard.cloud, O=\"ThingsBoard, Inc.\", ST=New York, C=US",
+        Assertions.assertEquals(4, x509Certificates.size());
+        Assertions.assertEquals("CN=*.thingsboard.cloud, O=\"ThingsBoard, Inc.\", ST=New York, C=US",
                 x509Certificates.get(0).getSubjectDN().getName());
-        Assert.assertEquals("CN=Sectigo ECC Organization Validation Secure Server CA, O=Sectigo Limited, L=Salford, ST=Greater Manchester, C=GB",
+        Assertions.assertEquals("CN=Sectigo ECC Organization Validation Secure Server CA, O=Sectigo Limited, L=Salford, ST=Greater Manchester, C=GB",
                 x509Certificates.get(1).getSubjectDN().getName());
-        Assert.assertEquals("CN=USERTrust ECC Certification Authority, O=The USERTRUST Network, L=Jersey City, ST=New Jersey, C=US",
+        Assertions.assertEquals("CN=USERTrust ECC Certification Authority, O=The USERTRUST Network, L=Jersey City, ST=New Jersey, C=US",
                 x509Certificates.get(2).getSubjectDN().getName());
-        Assert.assertEquals("CN=AAA Certificate Services, O=Comodo CA Limited, L=Salford, ST=Greater Manchester, C=GB",
+        Assertions.assertEquals("CN=AAA Certificate Services, O=Comodo CA Limited, L=Salford, ST=Greater Manchester, C=GB",
                 x509Certificates.get(3).getSubjectDN().getName());
     }
 
@@ -66,8 +65,8 @@ public class CertPemCredentialsTest {
 
         List<X509Certificate> x509Certificates = SslUtil.readCertFile(fileContent);
 
-        Assert.assertEquals(1, x509Certificates.size());
-        Assert.assertEquals("CN=*.thingsboard.cloud, O=\"ThingsBoard, Inc.\", ST=New York, C=US",
+        Assertions.assertEquals(1, x509Certificates.size());
+        Assertions.assertEquals("CN=*.thingsboard.cloud, O=\"ThingsBoard, Inc.\", ST=New York, C=US",
                 x509Certificates.get(0).getSubjectDN().getName());
     }
 
@@ -77,7 +76,7 @@ public class CertPemCredentialsTest {
 
         List<X509Certificate> x509Certificates = SslUtil.readCertFile(fileContent);
 
-        Assert.assertEquals(0, x509Certificates.size());
+        Assertions.assertEquals(0, x509Certificates.size());
     }
 
     private static Stream<Arguments> testLoadKeyStore() {
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/edge/TbMsgPushToEdgeNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/edge/TbMsgPushToEdgeNodeTest.java
index 5f57f7f5e3..b8a70991bc 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/edge/TbMsgPushToEdgeNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/edge/TbMsgPushToEdgeNodeTest.java
@@ -16,13 +16,13 @@
 package org.thingsboard.rule.engine.edge;
 
 import com.google.common.util.concurrent.SettableFuture;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentMatcher;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.common.util.ListeningExecutor;
 import org.thingsboard.rule.engine.api.TbContext;
@@ -50,7 +50,7 @@ import java.util.UUID;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.verify;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class TbMsgPushToEdgeNodeTest {
 
     private static final List<TbMsgType> MISC_EVENTS = List.of(TbMsgType.CONNECT_EVENT, TbMsgType.DISCONNECT_EVENT,
@@ -71,7 +71,7 @@ public class TbMsgPushToEdgeNodeTest {
     @Mock
     private ListeningExecutor dbCallbackExecutor;
 
-    @Before
+    @BeforeEach
     public void setUp() throws TbNodeException {
         node = new TbMsgPushToEdgeNode();
         TbMsgPushToEdgeNodeConfiguration config = new TbMsgPushToEdgeNodeConfiguration().defaultConfiguration();
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/filter/TbJsFilterNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsFilterNodeTest.java
index 903944025a..b991b7b220 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsFilterNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsFilterNodeTest.java
@@ -17,11 +17,11 @@ package org.thingsboard.rule.engine.filter;
 
 import com.datastax.oss.driver.api.core.uuid.Uuids;
 import com.google.common.util.concurrent.Futures;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.rule.engine.api.ScriptEngine;
 import org.thingsboard.rule.engine.api.TbContext;
@@ -38,12 +38,12 @@ import org.thingsboard.server.common.msg.TbMsgMetaData;
 
 import javax.script.ScriptException;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.same;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class TbJsFilterNodeTest {
 
     private TbJsFilterNode node;
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeTest.java
index d679e42ba0..ff7a40644b 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeTest.java
@@ -18,10 +18,10 @@ package org.thingsboard.rule.engine.filter;
 import com.datastax.oss.driver.api.core.uuid.Uuids;
 import com.google.common.collect.Sets;
 import com.google.common.util.concurrent.Futures;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.rule.engine.api.ScriptEngine;
 import org.thingsboard.rule.engine.api.TbContext;
@@ -38,7 +38,7 @@ import org.thingsboard.server.common.msg.TbMsgMetaData;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class TbJsSwitchNodeTest {
 
     private TbJsSwitchNode node;
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/geo/GeoUtilTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/geo/GeoUtilTest.java
index 2172288236..8d39105d30 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/geo/GeoUtilTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/geo/GeoUtilTest.java
@@ -15,12 +15,12 @@
  */
 package org.thingsboard.rule.engine.geo;
 
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class GeoUtilTest {
 
     public static final String SIMPLE_RECT = "[[51.903762928405555,23.642220786948297],[44.669801219635644,41.83345155830211]]";
@@ -47,117 +47,117 @@ public class GeoUtilTest {
 
     @Test
     public void testPointsInSimplePolygons() {
-        Assert.assertTrue("Polygon " + SIMPLE_RECT + " must contain the dot " + POINT_INSIDE_SIMPLE_RECT_CENTER,
-                GeoUtil.contains(SIMPLE_RECT, POINT_INSIDE_SIMPLE_RECT_CENTER)
-        );
-        Assert.assertTrue("Polygon " + SIMPLE_RECT + " must contain the dot " + POINT_INSIDE_SIMPLE_RECT_NEAR_BORDER,
-                GeoUtil.contains(SIMPLE_RECT, POINT_INSIDE_SIMPLE_RECT_NEAR_BORDER)
-        );
-        Assert.assertTrue("Polygon " + SIMPLE_RECT_WITH_HOLE_IN_CENTER + " must contain the dot "
-                        + POINT_INSIDE_SIMPLE_RECT_NEAR_BORDER,
-                GeoUtil.contains(SIMPLE_RECT_WITH_HOLE_IN_CENTER, POINT_INSIDE_SIMPLE_RECT_NEAR_BORDER)
-        );
+        Assertions.assertTrue(GeoUtil.contains(SIMPLE_RECT, POINT_INSIDE_SIMPLE_RECT_CENTER),
+                "Polygon " + SIMPLE_RECT + " must contain the dot " + POINT_INSIDE_SIMPLE_RECT_CENTER
+                );
+        Assertions.assertTrue(GeoUtil.contains(SIMPLE_RECT, POINT_INSIDE_SIMPLE_RECT_NEAR_BORDER),
+                "Polygon " + SIMPLE_RECT + " must contain the dot " + POINT_INSIDE_SIMPLE_RECT_NEAR_BORDER
+                );
+        Assertions.assertTrue(GeoUtil.contains(SIMPLE_RECT_WITH_HOLE_IN_CENTER, POINT_INSIDE_SIMPLE_RECT_NEAR_BORDER),
+                "Polygon " + SIMPLE_RECT_WITH_HOLE_IN_CENTER + " must contain the dot "
+                                + POINT_INSIDE_SIMPLE_RECT_NEAR_BORDER
+                );
 
-        Assert.assertFalse("Polygon " + SIMPLE_RECT + " must not contain the dot "
-                        + POINT_OUTSIDE_SIMPLE_RECT,
-                GeoUtil.contains(SIMPLE_RECT, POINT_OUTSIDE_SIMPLE_RECT)
-        );
-        Assert.assertFalse("Polygon " + SIMPLE_RECT_WITH_HOLE_IN_CENTER + " must not contain the dot "
-                        + POINT_OUTSIDE_SIMPLE_RECT,
-                GeoUtil.contains(SIMPLE_RECT_WITH_HOLE_IN_CENTER, POINT_OUTSIDE_SIMPLE_RECT)
-        );
-        Assert.assertFalse("Polygon " + SIMPLE_RECT_WITH_HOLE_IN_CENTER + " must not contain the dot "
-                        + POINT_INSIDE_SIMPLE_RECT_CENTER,
-                GeoUtil.contains(SIMPLE_RECT_WITH_HOLE_IN_CENTER, POINT_INSIDE_SIMPLE_RECT_CENTER)
-        );
+        Assertions.assertFalse(GeoUtil.contains(SIMPLE_RECT, POINT_OUTSIDE_SIMPLE_RECT),
+                "Polygon " + SIMPLE_RECT + " must not contain the dot "
+                                + POINT_OUTSIDE_SIMPLE_RECT
+                );
+        Assertions.assertFalse(GeoUtil.contains(SIMPLE_RECT_WITH_HOLE_IN_CENTER, POINT_OUTSIDE_SIMPLE_RECT),
+                "Polygon " + SIMPLE_RECT_WITH_HOLE_IN_CENTER + " must not contain the dot "
+                                + POINT_OUTSIDE_SIMPLE_RECT
+                );
+        Assertions.assertFalse(GeoUtil.contains(SIMPLE_RECT_WITH_HOLE_IN_CENTER, POINT_INSIDE_SIMPLE_RECT_CENTER),
+                "Polygon " + SIMPLE_RECT_WITH_HOLE_IN_CENTER + " must not contain the dot "
+                                + POINT_INSIDE_SIMPLE_RECT_CENTER
+                );
     }
 
     @Test
     public void testPointsInComplexPolygons() {
-        Assert.assertTrue("Polygon " + SAND_CLOCK + " must contain the dot " + POINT_INSIDE_SAND_CLOCK_CENTER,
-                GeoUtil.contains(SAND_CLOCK, POINT_INSIDE_SAND_CLOCK_CENTER)
-        );
-        Assert.assertTrue("Polygon " + SAND_CLOCK + " must contain the dot " + POINT_INSIDE_SAND_CLOCK_NEAR_BORDER,
-                GeoUtil.contains(SAND_CLOCK, POINT_INSIDE_SAND_CLOCK_NEAR_BORDER)
-        );
-        Assert.assertTrue("Polygon " + SAND_CLOCK_WITH_HOLE_IN_CENTER + " must contain the dot "
-                        + POINT_INSIDE_SAND_CLOCK_NEAR_BORDER,
-                GeoUtil.contains(SAND_CLOCK_WITH_HOLE_IN_CENTER, POINT_INSIDE_SAND_CLOCK_NEAR_BORDER)
-        );
+        Assertions.assertTrue(GeoUtil.contains(SAND_CLOCK, POINT_INSIDE_SAND_CLOCK_CENTER),
+                "Polygon " + SAND_CLOCK + " must contain the dot " + POINT_INSIDE_SAND_CLOCK_CENTER
+                );
+        Assertions.assertTrue(GeoUtil.contains(SAND_CLOCK, POINT_INSIDE_SAND_CLOCK_NEAR_BORDER),
+                "Polygon " + SAND_CLOCK + " must contain the dot " + POINT_INSIDE_SAND_CLOCK_NEAR_BORDER
+                );
+        Assertions.assertTrue(GeoUtil.contains(SAND_CLOCK_WITH_HOLE_IN_CENTER, POINT_INSIDE_SAND_CLOCK_NEAR_BORDER),
+                "Polygon " + SAND_CLOCK_WITH_HOLE_IN_CENTER + " must contain the dot "
+                                + POINT_INSIDE_SAND_CLOCK_NEAR_BORDER
+                );
 
-        Assert.assertFalse("Polygon " + SAND_CLOCK + " must not contain the dot "
-                        + POINT_OUTSIDE_SAND_CLOCK_1,
-                GeoUtil.contains(SAND_CLOCK, POINT_OUTSIDE_SAND_CLOCK_1)
-        );
-        Assert.assertFalse("Polygon " + SAND_CLOCK + " must not contain the dot "
-                        + POINT_OUTSIDE_SAND_CLOCK_2,
-                GeoUtil.contains(SAND_CLOCK, POINT_OUTSIDE_SAND_CLOCK_2)
-        );
-        Assert.assertFalse("Polygon " + SAND_CLOCK_WITH_HOLE_IN_CENTER + " must not contain the dot "
-                        + POINT_INSIDE_SAND_CLOCK_CENTER,
-                GeoUtil.contains(SAND_CLOCK_WITH_HOLE_IN_CENTER, POINT_INSIDE_SAND_CLOCK_CENTER)
-        );
-        Assert.assertFalse("Polygon " + SAND_CLOCK_WITH_HOLE_IN_CENTER + " must not contain the dot "
-                        + POINT_OUTSIDE_SAND_CLOCK_1,
-                GeoUtil.contains(SAND_CLOCK_WITH_HOLE_IN_CENTER, POINT_OUTSIDE_SAND_CLOCK_1)
-        );
-        Assert.assertFalse("Polygon " + SAND_CLOCK_WITH_HOLE_IN_CENTER + " must not contain the dot "
-                        + POINT_OUTSIDE_SAND_CLOCK_2,
-                GeoUtil.contains(SAND_CLOCK_WITH_HOLE_IN_CENTER, POINT_OUTSIDE_SAND_CLOCK_2)
-        );
+        Assertions.assertFalse(GeoUtil.contains(SAND_CLOCK, POINT_OUTSIDE_SAND_CLOCK_1),
+                "Polygon " + SAND_CLOCK + " must not contain the dot "
+                                + POINT_OUTSIDE_SAND_CLOCK_1
+                );
+        Assertions.assertFalse(GeoUtil.contains(SAND_CLOCK, POINT_OUTSIDE_SAND_CLOCK_2),
+                "Polygon " + SAND_CLOCK + " must not contain the dot "
+                                + POINT_OUTSIDE_SAND_CLOCK_2
+                );
+        Assertions.assertFalse(GeoUtil.contains(SAND_CLOCK_WITH_HOLE_IN_CENTER, POINT_INSIDE_SAND_CLOCK_CENTER),
+                "Polygon " + SAND_CLOCK_WITH_HOLE_IN_CENTER + " must not contain the dot "
+                                + POINT_INSIDE_SAND_CLOCK_CENTER
+                );
+        Assertions.assertFalse(GeoUtil.contains(SAND_CLOCK_WITH_HOLE_IN_CENTER, POINT_OUTSIDE_SAND_CLOCK_1),
+                "Polygon " + SAND_CLOCK_WITH_HOLE_IN_CENTER + " must not contain the dot "
+                                + POINT_OUTSIDE_SAND_CLOCK_1
+                );
+        Assertions.assertFalse(GeoUtil.contains(SAND_CLOCK_WITH_HOLE_IN_CENTER, POINT_OUTSIDE_SAND_CLOCK_2),
+                "Polygon " + SAND_CLOCK_WITH_HOLE_IN_CENTER + " must not contain the dot "
+                                + POINT_OUTSIDE_SAND_CLOCK_2
+                );
     }
 
     @Test
     public void testPointsInSelfIntersectingPolygons() {
-        Assert.assertTrue("Polygon " + SELF_INTERSECTING + " must contain the dot "
-                        + POINT_INSIDE_SELF_INTERSECTING_UPPER_CENTER,
-                GeoUtil.contains(SELF_INTERSECTING, POINT_INSIDE_SELF_INTERSECTING_UPPER_CENTER)
-        );
-        Assert.assertTrue("Polygon " + SELF_INTERSECTING + " must contain the dot "
-                        + POINT_INSIDE_SELF_INTERSECTING_LOWER_CENTER,
-                GeoUtil.contains(SELF_INTERSECTING, POINT_INSIDE_SELF_INTERSECTING_LOWER_CENTER)
-        );
-        Assert.assertTrue("Polygon " + SELF_INTERSECTING + " must contain the dot "
-                        + POINT_INSIDE_SELF_INTERSECTING_NEAR_BORDER,
-                GeoUtil.contains(SELF_INTERSECTING, POINT_INSIDE_SELF_INTERSECTING_NEAR_BORDER)
-        );
-        Assert.assertTrue("Polygon " + SELF_INTERSECTING_WITH_HOLES + " must contain the dot "
-                        + POINT_INSIDE_SAND_CLOCK_NEAR_BORDER,
-                GeoUtil.contains(SELF_INTERSECTING_WITH_HOLES, POINT_INSIDE_SELF_INTERSECTING_NEAR_BORDER)
-        );
+        Assertions.assertTrue(GeoUtil.contains(SELF_INTERSECTING, POINT_INSIDE_SELF_INTERSECTING_UPPER_CENTER),
+                "Polygon " + SELF_INTERSECTING + " must contain the dot "
+                                + POINT_INSIDE_SELF_INTERSECTING_UPPER_CENTER
+                );
+        Assertions.assertTrue(GeoUtil.contains(SELF_INTERSECTING, POINT_INSIDE_SELF_INTERSECTING_LOWER_CENTER),
+                "Polygon " + SELF_INTERSECTING + " must contain the dot "
+                                + POINT_INSIDE_SELF_INTERSECTING_LOWER_CENTER
+                );
+        Assertions.assertTrue(GeoUtil.contains(SELF_INTERSECTING, POINT_INSIDE_SELF_INTERSECTING_NEAR_BORDER),
+                "Polygon " + SELF_INTERSECTING + " must contain the dot "
+                                + POINT_INSIDE_SELF_INTERSECTING_NEAR_BORDER
+                );
+        Assertions.assertTrue(GeoUtil.contains(SELF_INTERSECTING_WITH_HOLES, POINT_INSIDE_SELF_INTERSECTING_NEAR_BORDER),
+                "Polygon " + SELF_INTERSECTING_WITH_HOLES + " must contain the dot "
+                                + POINT_INSIDE_SAND_CLOCK_NEAR_BORDER
+                );
 
-        Assert.assertFalse("Polygon " + SELF_INTERSECTING + " must not contain the dot "
-                        + POINT_OUTSIDE_SELF_INTERSECTING_1,
-                GeoUtil.contains(SELF_INTERSECTING, POINT_OUTSIDE_SELF_INTERSECTING_1)
-        );
-        Assert.assertFalse("Polygon " + SELF_INTERSECTING + " must not contain the dot "
-                        + POINT_OUTSIDE_SELF_INTERSECTING_2,
-                GeoUtil.contains(SELF_INTERSECTING, POINT_OUTSIDE_SELF_INTERSECTING_2)
-        );
-        Assert.assertFalse("Polygon " + SELF_INTERSECTING + " must not contain the dot "
-                        + POINT_OUTSIDE_SELF_INTERSECTING_3,
-                GeoUtil.contains(SELF_INTERSECTING, POINT_OUTSIDE_SELF_INTERSECTING_3)
-        );
-        Assert.assertFalse("Polygon " + SELF_INTERSECTING_WITH_HOLES + " must not contain the dot "
-                        + POINT_OUTSIDE_SELF_INTERSECTING_1,
-                GeoUtil.contains(SELF_INTERSECTING_WITH_HOLES, POINT_OUTSIDE_SELF_INTERSECTING_1)
-        );
-        Assert.assertFalse("Polygon " + SELF_INTERSECTING_WITH_HOLES + " must not contain the dot "
-                        + POINT_OUTSIDE_SELF_INTERSECTING_2,
-                GeoUtil.contains(SELF_INTERSECTING_WITH_HOLES, POINT_OUTSIDE_SELF_INTERSECTING_2)
-        );
-        Assert.assertFalse("Polygon " + SELF_INTERSECTING_WITH_HOLES + " must not contain the dot "
-                        + POINT_OUTSIDE_SELF_INTERSECTING_3,
-                GeoUtil.contains(SELF_INTERSECTING_WITH_HOLES, POINT_OUTSIDE_SELF_INTERSECTING_3)
-        );
-        Assert.assertFalse("Polygon " + SELF_INTERSECTING_WITH_HOLES + " must not contain the dot "
-                        + POINT_INSIDE_SELF_INTERSECTING_UPPER_CENTER,
-                GeoUtil.contains(SELF_INTERSECTING_WITH_HOLES, POINT_INSIDE_SELF_INTERSECTING_UPPER_CENTER)
-        );
-        Assert.assertFalse("Polygon " + SELF_INTERSECTING_WITH_HOLES + " must not contain the dot "
-                        + POINT_INSIDE_SELF_INTERSECTING_LOWER_CENTER,
-                GeoUtil.contains(SELF_INTERSECTING_WITH_HOLES, POINT_INSIDE_SELF_INTERSECTING_LOWER_CENTER)
-        );
+        Assertions.assertFalse(GeoUtil.contains(SELF_INTERSECTING, POINT_OUTSIDE_SELF_INTERSECTING_1),
+                "Polygon " + SELF_INTERSECTING + " must not contain the dot "
+                                + POINT_OUTSIDE_SELF_INTERSECTING_1
+                );
+        Assertions.assertFalse(GeoUtil.contains(SELF_INTERSECTING, POINT_OUTSIDE_SELF_INTERSECTING_2),
+                "Polygon " + SELF_INTERSECTING + " must not contain the dot "
+                                + POINT_OUTSIDE_SELF_INTERSECTING_2
+                );
+        Assertions.assertFalse(GeoUtil.contains(SELF_INTERSECTING, POINT_OUTSIDE_SELF_INTERSECTING_3),
+                "Polygon " + SELF_INTERSECTING + " must not contain the dot "
+                                + POINT_OUTSIDE_SELF_INTERSECTING_3
+                );
+        Assertions.assertFalse(GeoUtil.contains(SELF_INTERSECTING_WITH_HOLES, POINT_OUTSIDE_SELF_INTERSECTING_1),
+                "Polygon " + SELF_INTERSECTING_WITH_HOLES + " must not contain the dot "
+                                + POINT_OUTSIDE_SELF_INTERSECTING_1
+                );
+        Assertions.assertFalse(GeoUtil.contains(SELF_INTERSECTING_WITH_HOLES, POINT_OUTSIDE_SELF_INTERSECTING_2),
+                "Polygon " + SELF_INTERSECTING_WITH_HOLES + " must not contain the dot "
+                                + POINT_OUTSIDE_SELF_INTERSECTING_2
+                );
+        Assertions.assertFalse(GeoUtil.contains(SELF_INTERSECTING_WITH_HOLES, POINT_OUTSIDE_SELF_INTERSECTING_3),
+                "Polygon " + SELF_INTERSECTING_WITH_HOLES + " must not contain the dot "
+                                + POINT_OUTSIDE_SELF_INTERSECTING_3
+                );
+        Assertions.assertFalse(GeoUtil.contains(SELF_INTERSECTING_WITH_HOLES, POINT_INSIDE_SELF_INTERSECTING_UPPER_CENTER),
+                "Polygon " + SELF_INTERSECTING_WITH_HOLES + " must not contain the dot "
+                                + POINT_INSIDE_SELF_INTERSECTING_UPPER_CENTER
+                );
+        Assertions.assertFalse(GeoUtil.contains(SELF_INTERSECTING_WITH_HOLES, POINT_INSIDE_SELF_INTERSECTING_LOWER_CENTER),
+                "Polygon " + SELF_INTERSECTING_WITH_HOLES + " must not contain the dot "
+                                + POINT_INSIDE_SELF_INTERSECTING_LOWER_CENTER
+                );
     }
 
 }
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/geo/TbGpsGeofencingActionNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/geo/TbGpsGeofencingActionNodeTest.java
index 5cd7e02c59..a0b57ba948 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/geo/TbGpsGeofencingActionNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/geo/TbGpsGeofencingActionNodeTest.java
@@ -30,6 +30,7 @@ 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.AttributeScope;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.msg.TbMsgType;
@@ -137,7 +138,7 @@ class TbGpsGeofencingActionNodeTest extends AbstractRuleNodeUpgradeTest {
         node.onMsg(ctx, msg);
 
         // THEN
-        verify(ctx.getAttributesService(), never()).find(any(), any(), any(), anyString());
+        verify(ctx.getAttributesService(), never()).find(any(), any(), any(AttributeScope.class), anyString());
         verify(ctx, never()).tellFailure(any(), any(Throwable.class));
         verify(ctx, never()).enqueueForTellNext(any(), eq(expectedOutput), any(), any());
         verify(ctx, never()).ack(any());
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/math/TbMathArgumentValueTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/math/TbMathArgumentValueTest.java
index 5a6fffbb18..073a9fb393 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/math/TbMathArgumentValueTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/math/TbMathArgumentValueTest.java
@@ -16,8 +16,8 @@
 package org.thingsboard.rule.engine.math;
 
 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.api.Test;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.msg.TbMsgMetaData;
 
@@ -32,7 +32,7 @@ public class TbMathArgumentValueTest {
         TbMathArgument tbMathArgument = new TbMathArgument(TbMathArgumentType.MESSAGE_BODY, "TestKey");
         tbMathArgument.setDefaultValue(5.0);
         TbMathArgumentValue result = TbMathArgumentValue.fromMessageBody(tbMathArgument, tbMathArgument.getKey(), Optional.ofNullable(JacksonUtil.newObjectNode()));
-        Assert.assertEquals(5.0, result.getValue(), 0d);
+        Assertions.assertEquals(5.0, result.getValue(), 0d);
     }
 
     @Test
@@ -41,14 +41,14 @@ public class TbMathArgumentValueTest {
         Throwable thrown = assertThrows(RuntimeException.class, () -> {
             TbMathArgumentValue result = TbMathArgumentValue.fromMessageBody(tbMathArgument, tbMathArgument.getKey(), Optional.empty());
         });
-        Assert.assertNotNull(thrown.getMessage());
+        Assertions.assertNotNull(thrown.getMessage());
     }
 
     @Test
     public void test_fromMessageBody_then_noKey() {
         TbMathArgument tbMathArgument = new TbMathArgument(TbMathArgumentType.MESSAGE_BODY, "TestKey");
         Throwable thrown = assertThrows(RuntimeException.class, () -> TbMathArgumentValue.fromMessageBody(tbMathArgument, tbMathArgument.getKey(), Optional.ofNullable(JacksonUtil.newObjectNode())));
-        Assert.assertNotNull(thrown.getMessage());
+        Assertions.assertNotNull(thrown.getMessage());
     }
 
     @Test
@@ -59,12 +59,12 @@ public class TbMathArgumentValueTest {
 
         //null value
         Throwable thrown = assertThrows(RuntimeException.class, () -> TbMathArgumentValue.fromMessageBody(tbMathArgument, tbMathArgument.getKey(), Optional.of(msgData)));
-        Assert.assertNotNull(thrown.getMessage());
+        Assertions.assertNotNull(thrown.getMessage());
 
         //empty value
         msgData.put("TestKey", "");
         thrown = assertThrows(RuntimeException.class, () -> TbMathArgumentValue.fromMessageBody(tbMathArgument, tbMathArgument.getKey(), Optional.of(msgData)));
-        Assert.assertNotNull(thrown.getMessage());
+        Assertions.assertNotNull(thrown.getMessage());
     }
 
     @Test
@@ -75,40 +75,40 @@ public class TbMathArgumentValueTest {
 
         //string value
         Throwable thrown = assertThrows(RuntimeException.class, () -> TbMathArgumentValue.fromMessageBody(tbMathArgument, tbMathArgument.getKey(), Optional.of(msgData)));
-        Assert.assertNotNull(thrown.getMessage());
+        Assertions.assertNotNull(thrown.getMessage());
 
         //object value
         msgData.set("TestKey", JacksonUtil.newObjectNode());
         thrown = assertThrows(RuntimeException.class, () -> TbMathArgumentValue.fromMessageBody(tbMathArgument, tbMathArgument.getKey(), Optional.of(msgData)));
-        Assert.assertNotNull(thrown.getMessage());
+        Assertions.assertNotNull(thrown.getMessage());
     }
 
     @Test
     public void test_fromMessageMetadata_then_noKey() {
         TbMathArgument tbMathArgument = new TbMathArgument(TbMathArgumentType.MESSAGE_BODY, "TestKey");
         Throwable thrown = assertThrows(RuntimeException.class, () -> TbMathArgumentValue.fromMessageMetadata(tbMathArgument, tbMathArgument.getKey(), new TbMsgMetaData()));
-        Assert.assertNotNull(thrown.getMessage());
+        Assertions.assertNotNull(thrown.getMessage());
     }
 
     @Test
     public void test_fromMessageMetadata_then_valueEmpty() {
         TbMathArgument tbMathArgument = new TbMathArgument(TbMathArgumentType.MESSAGE_BODY, "TestKey");
         Throwable thrown = assertThrows(RuntimeException.class, () -> TbMathArgumentValue.fromMessageMetadata(tbMathArgument, tbMathArgument.getKey(), null));
-        Assert.assertNotNull(thrown.getMessage());
+        Assertions.assertNotNull(thrown.getMessage());
     }
 
     @Test
     public void test_fromString_thenOK() {
         var value = "5.0";
         TbMathArgumentValue result = TbMathArgumentValue.fromString(value);
-        Assert.assertNotNull(result);
-        Assert.assertEquals(5.0, result.getValue(), 0d);
+        Assertions.assertNotNull(result);
+        Assertions.assertEquals(5.0, result.getValue(), 0d);
     }
 
     @Test
     public void test_fromString_then_failure() {
         var value = "Test";
         Throwable thrown = assertThrows(RuntimeException.class, () -> TbMathArgumentValue.fromString(value));
-        Assert.assertNotNull(thrown.getMessage());
+        Assertions.assertNotNull(thrown.getMessage());
     }
 }
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 3028840186..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;
@@ -39,6 +38,7 @@ import org.thingsboard.rule.engine.api.RuleEngineTelemetryService;
 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.AttributeScope;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.EntityId;
@@ -68,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;
@@ -77,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;
@@ -365,7 +362,7 @@ public class TbMathNodeTest {
 
         TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, originator, TbMsgMetaData.EMPTY, JacksonUtil.newObjectNode().toString());
 
-        when(attributesService.find(tenantId, originator, DataConstants.SERVER_SCOPE, "a"))
+        when(attributesService.find(tenantId, originator, AttributeScope.SERVER_SCOPE, "a"))
                 .thenReturn(Futures.immediateFuture(Optional.of(new BaseAttributeKvEntry(System.currentTimeMillis(), new DoubleDataEntry("a", 2.0)))));
 
         when(tsService.findLatest(tenantId, originator, "b"))
@@ -437,14 +434,14 @@ public class TbMathNodeTest {
 
         TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, originator, TbMsgMetaData.EMPTY, JacksonUtil.newObjectNode().put("a", 5).toString());
 
-        when(telemetryService.saveAttrAndNotify(any(), any(), anyString(), anyString(), anyDouble()))
+        when(telemetryService.saveAttrAndNotify(any(), any(), any(AttributeScope.class), anyString(), anyDouble()))
                 .thenReturn(Futures.immediateFuture(null));
 
         node.onMsg(ctx, msg);
 
         ArgumentCaptor<TbMsg> msgCaptor = ArgumentCaptor.forClass(TbMsg.class);
         verify(ctx, timeout(TIMEOUT)).tellSuccess(msgCaptor.capture());
-        verify(telemetryService, times(1)).saveAttrAndNotify(any(), any(), anyString(), anyString(), anyDouble());
+        verify(telemetryService, times(1)).saveAttrAndNotify(any(), any(), any(AttributeScope.class), anyString(), anyDouble());
 
         TbMsg resultMsg = msgCaptor.getValue();
         assertNotNull(resultMsg);
@@ -542,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
@@ -557,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
@@ -573,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);
 
@@ -713,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/metadata/TbGetAttributesNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNodeTest.java
index 9b870cc55b..9eb74b5627 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNodeTest.java
@@ -18,21 +18,21 @@ package org.thingsboard.rule.engine.metadata;
 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.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Assertions;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.thingsboard.common.util.AbstractListeningExecutor;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.rule.engine.api.TbContext;
 import org.thingsboard.rule.engine.api.TbNodeConfiguration;
 import org.thingsboard.rule.engine.api.TbNodeException;
 import org.thingsboard.rule.engine.util.TbMsgSource;
-import org.thingsboard.server.common.data.DataConstants;
+import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.TenantId;
@@ -54,17 +54,18 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.timeout;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class TbGetAttributesNodeTest {
 
     private static final EntityId ORIGINATOR = new DeviceId(Uuids.timeBased());
@@ -85,7 +86,7 @@ public class TbGetAttributesNodeTest {
     private long ts;
     private TbGetAttributesNode node;
 
-    @Before
+    @BeforeEach
     public void before() throws TbNodeException {
         dbExecutor = new AbstractListeningExecutor() {
             @Override
@@ -95,10 +96,10 @@ public class TbGetAttributesNodeTest {
         };
         dbExecutor.init();
 
-        when(ctxMock.getAttributesService()).thenReturn(attributesServiceMock);
-        when(ctxMock.getTimeseriesService()).thenReturn(timeseriesServiceMock);
-        when(ctxMock.getTenantId()).thenReturn(TENANT_ID);
-        when(ctxMock.getDbCallbackExecutor()).thenReturn(dbExecutor);
+        lenient().when(ctxMock.getAttributesService()).thenReturn(attributesServiceMock);
+        lenient().when(ctxMock.getTimeseriesService()).thenReturn(timeseriesServiceMock);
+        lenient().when(ctxMock.getTenantId()).thenReturn(TENANT_ID);
+        lenient().when(ctxMock.getDbCallbackExecutor()).thenReturn(dbExecutor);
 
         clientAttributes = getAttributeNames("client");
         serverAttributes = getAttributeNames("server");
@@ -106,20 +107,20 @@ public class TbGetAttributesNodeTest {
         tsKeys = List.of("temperature", "humidity", "unknown");
         ts = System.currentTimeMillis();
 
-        when(attributesServiceMock.find(TENANT_ID, ORIGINATOR, DataConstants.CLIENT_SCOPE, clientAttributes))
+        lenient().when(attributesServiceMock.find(TENANT_ID, ORIGINATOR, AttributeScope.CLIENT_SCOPE, clientAttributes))
                 .thenReturn(Futures.immediateFuture(getListAttributeKvEntry(clientAttributes, ts)));
 
-        when(attributesServiceMock.find(TENANT_ID, ORIGINATOR, DataConstants.SERVER_SCOPE, serverAttributes))
+        lenient().when(attributesServiceMock.find(TENANT_ID, ORIGINATOR, AttributeScope.SERVER_SCOPE, serverAttributes))
                 .thenReturn(Futures.immediateFuture(getListAttributeKvEntry(serverAttributes, ts)));
 
-        when(attributesServiceMock.find(TENANT_ID, ORIGINATOR, DataConstants.SHARED_SCOPE, sharedAttributes))
+        lenient().when(attributesServiceMock.find(TENANT_ID, ORIGINATOR, AttributeScope.SHARED_SCOPE, sharedAttributes))
                 .thenReturn(Futures.immediateFuture(getListAttributeKvEntry(sharedAttributes, ts)));
 
-        when(timeseriesServiceMock.findLatest(TENANT_ID, ORIGINATOR, tsKeys))
+        lenient().when(timeseriesServiceMock.findLatest(TENANT_ID, ORIGINATOR, tsKeys))
                 .thenReturn(Futures.immediateFuture(getListTsKvEntry(tsKeys, ts)));
     }
 
-    @After
+    @AfterEach
     public void after() {
         dbExecutor.destroy();
     }
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNodeTest.java
index da08c0cd2c..f4e69b9079 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNodeTest.java
@@ -33,6 +33,7 @@ import org.thingsboard.rule.engine.api.TbContext;
 import org.thingsboard.rule.engine.api.TbNodeConfiguration;
 import org.thingsboard.rule.engine.api.TbNodeException;
 import org.thingsboard.rule.engine.util.TbMsgSource;
+import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.Customer;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.Device;
@@ -278,7 +279,7 @@ public class TbGetCustomerAttributeNodeTest {
         doReturn(device).when(deviceServiceMock).findDeviceById(eq(TENANT_ID), eq(device.getId()));
 
         when(ctxMock.getAttributesService()).thenReturn(attributesServiceMock);
-        when(attributesServiceMock.find(eq(TENANT_ID), eq(CUSTOMER_ID), eq(DataConstants.SERVER_SCOPE), argThat(new ListMatcher<>(expectedPatternProcessedKeysList))))
+        when(attributesServiceMock.find(eq(TENANT_ID), eq(CUSTOMER_ID), eq(AttributeScope.SERVER_SCOPE), argThat(new ListMatcher<>(expectedPatternProcessedKeysList))))
                 .thenReturn(Futures.immediateFuture(attributesList));
 
         when(ctxMock.getDbCallbackExecutor()).thenReturn(DB_EXECUTOR);
@@ -325,7 +326,7 @@ public class TbGetCustomerAttributeNodeTest {
         doReturn(Futures.immediateFuture(user)).when(userServiceMock).findUserByIdAsync(eq(TENANT_ID), eq(user.getId()));
 
         when(ctxMock.getAttributesService()).thenReturn(attributesServiceMock);
-        when(attributesServiceMock.find(eq(TENANT_ID), eq(CUSTOMER_ID), eq(DataConstants.SERVER_SCOPE), argThat(new ListMatcher<>(expectedPatternProcessedKeysList))))
+        when(attributesServiceMock.find(eq(TENANT_ID), eq(CUSTOMER_ID), eq(AttributeScope.SERVER_SCOPE), argThat(new ListMatcher<>(expectedPatternProcessedKeysList))))
                 .thenReturn(Futures.immediateFuture(attributesList));
 
         when(ctxMock.getDbCallbackExecutor()).thenReturn(DB_EXECUTOR);
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetDeviceAttrNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetDeviceAttrNodeTest.java
index f40ab2bed8..ac6bb38be5 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetDeviceAttrNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetDeviceAttrNodeTest.java
@@ -16,7 +16,7 @@
 package org.thingsboard.rule.engine.metadata;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Assertions;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.util.TbPair;
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNodeTest.java
index 28c9c45822..1efc1c1e73 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNodeTest.java
@@ -34,6 +34,7 @@ import org.thingsboard.rule.engine.api.TbNodeConfiguration;
 import org.thingsboard.rule.engine.api.TbNodeException;
 import org.thingsboard.rule.engine.data.RelationsQuery;
 import org.thingsboard.rule.engine.util.TbMsgSource;
+import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.Customer;
 import org.thingsboard.server.common.data.Dashboard;
 import org.thingsboard.server.common.data.DataConstants;
@@ -291,7 +292,7 @@ public class TbGetRelatedAttributeNodeTest {
         doReturn(Futures.immediateFuture(List.of(entityRelation))).when(relationServiceMock).findByQuery(eq(TENANT_ID), any());
 
         when(ctxMock.getAttributesService()).thenReturn(attributesServiceMock);
-        when(attributesServiceMock.find(eq(TENANT_ID), eq(user.getId()), eq(DataConstants.SERVER_SCOPE), argThat(new ListMatcher<>(expectedPatternProcessedKeysList))))
+        when(attributesServiceMock.find(eq(TENANT_ID), eq(user.getId()), eq(AttributeScope.SERVER_SCOPE), argThat(new ListMatcher<>(expectedPatternProcessedKeysList))))
                 .thenReturn(Futures.immediateFuture(attributes));
 
         when(ctxMock.getDbCallbackExecutor()).thenReturn(DB_EXECUTOR);
@@ -342,7 +343,7 @@ public class TbGetRelatedAttributeNodeTest {
         doReturn(Futures.immediateFuture(List.of(entityRelation))).when(relationServiceMock).findByQuery(eq(TENANT_ID), any());
 
         when(ctxMock.getAttributesService()).thenReturn(attributesServiceMock);
-        when(attributesServiceMock.find(eq(TENANT_ID), eq(secondCustomer.getId()), eq(DataConstants.SERVER_SCOPE), argThat(new ListMatcher<>(expectedPatternProcessedKeysList))))
+        when(attributesServiceMock.find(eq(TENANT_ID), eq(secondCustomer.getId()), eq(AttributeScope.SERVER_SCOPE), argThat(new ListMatcher<>(expectedPatternProcessedKeysList))))
                 .thenReturn(Futures.immediateFuture(attributes));
 
         when(ctxMock.getDbCallbackExecutor()).thenReturn(DB_EXECUTOR);
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTelemetryNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTelemetryNodeTest.java
index 990688611e..6ecd1b6eb9 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTelemetryNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTelemetryNodeTest.java
@@ -15,8 +15,8 @@
  */
 package org.thingsboard.rule.engine.metadata;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Assertions;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.rule.engine.api.TbContext;
@@ -37,7 +37,7 @@ public class TbGetTelemetryNodeTest {
     TbNodeConfiguration nodeConfiguration;
     TbContext ctx;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         ctx = mock(TbContext.class);
         node = spy(new TbGetTelemetryNode());
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNodeTest.java
index 71e8f208ee..cb9c913a4e 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNodeTest.java
@@ -32,6 +32,7 @@ import org.thingsboard.rule.engine.api.TbContext;
 import org.thingsboard.rule.engine.api.TbNodeConfiguration;
 import org.thingsboard.rule.engine.api.TbNodeException;
 import org.thingsboard.rule.engine.util.TbMsgSource;
+import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.DeviceId;
@@ -217,7 +218,7 @@ public class TbGetTenantAttributeNodeTest {
         when(ctxMock.getTenantId()).thenReturn(TENANT_ID);
 
         when(ctxMock.getAttributesService()).thenReturn(attributesServiceMock);
-        when(attributesServiceMock.find(eq(TENANT_ID), eq(TENANT_ID), eq(DataConstants.SERVER_SCOPE), argThat(new ListMatcher<>(expectedPatternProcessedKeysList))))
+        when(attributesServiceMock.find(eq(TENANT_ID), eq(TENANT_ID), eq(AttributeScope.SERVER_SCOPE), argThat(new ListMatcher<>(expectedPatternProcessedKeysList))))
                 .thenReturn(Futures.immediateFuture(attributesList));
 
         when(ctxMock.getDbCallbackExecutor()).thenReturn(DB_EXECUTOR);
@@ -258,7 +259,7 @@ public class TbGetTenantAttributeNodeTest {
         when(ctxMock.getTenantId()).thenReturn(TENANT_ID);
 
         when(ctxMock.getAttributesService()).thenReturn(attributesServiceMock);
-        when(attributesServiceMock.find(eq(TENANT_ID), eq(TENANT_ID), eq(DataConstants.SERVER_SCOPE), argThat(new ListMatcher<>(expectedPatternProcessedKeysList))))
+        when(attributesServiceMock.find(eq(TENANT_ID), eq(TENANT_ID), eq(AttributeScope.SERVER_SCOPE), argThat(new ListMatcher<>(expectedPatternProcessedKeysList))))
                 .thenReturn(Futures.immediateFuture(attributesList));
 
         when(ctxMock.getDbCallbackExecutor()).thenReturn(DB_EXECUTOR);
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/profile/AlarmStateTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/profile/AlarmStateTest.java
index 7cc6781abb..08d445b89d 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/profile/AlarmStateTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/profile/AlarmStateTest.java
@@ -15,7 +15,7 @@
  */
 package org.thingsboard.rule.engine.profile;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.device.profile.AlarmCondition;
 import org.thingsboard.server.common.data.device.profile.AlarmConditionSpec;
@@ -28,9 +28,9 @@ import org.thingsboard.server.common.msg.TbMsgMetaData;
 
 import java.util.concurrent.TimeUnit;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.mockito.Mockito.mock;
 
 public class AlarmStateTest {
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/profile/DeviceStateTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/profile/DeviceStateTest.java
index 6058b7960d..5cee1aa5b3 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/profile/DeviceStateTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/profile/DeviceStateTest.java
@@ -16,12 +16,13 @@
 package org.thingsboard.rule.engine.profile;
 
 import com.google.common.util.concurrent.Futures;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.rule.engine.api.RuleEngineAlarmService;
 import org.thingsboard.rule.engine.api.TbContext;
+import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.alarm.Alarm;
 import org.thingsboard.server.common.data.alarm.AlarmApiCallResult;
@@ -68,14 +69,14 @@ public class DeviceStateTest {
 
     private TbContext ctx;
 
-    @Before
+    @BeforeEach
     public void beforeEach() {
         ctx = mock(TbContext.class);
 
         when(ctx.getDeviceService()).thenReturn(mock(DeviceService.class));
 
         AttributesService attributesService = mock(AttributesService.class);
-        when(attributesService.find(any(), any(), any(), anyCollection())).thenReturn(Futures.immediateFuture(Collections.emptyList()));
+        when(attributesService.find(any(), any(), any(AttributeScope.class), anyCollection())).thenReturn(Futures.immediateFuture(Collections.emptyList()));
         when(ctx.getAttributesService()).thenReturn(attributesService);
 
         RuleEngineAlarmService alarmService = mock(RuleEngineAlarmService.class);
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/profile/TbDeviceProfileNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/profile/TbDeviceProfileNodeTest.java
index 37277b70f8..19eabf0bdc 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/profile/TbDeviceProfileNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/profile/TbDeviceProfileNodeTest.java
@@ -18,21 +18,20 @@ package org.thingsboard.rule.engine.profile;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.rule.engine.api.RuleEngineAlarmService;
 import org.thingsboard.rule.engine.api.RuleEngineDeviceProfileCache;
 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.AttributeScope;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.DeviceProfile;
-import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.alarm.Alarm;
 import org.thingsboard.server.common.data.alarm.AlarmApiCallResult;
 import org.thingsboard.server.common.data.alarm.AlarmInfo;
@@ -59,7 +58,6 @@ import org.thingsboard.server.common.data.msg.TbMsgType;
 import org.thingsboard.server.common.data.query.BooleanFilterPredicate;
 import org.thingsboard.server.common.data.query.DynamicValue;
 import org.thingsboard.server.common.data.query.DynamicValueSourceType;
-import org.thingsboard.server.common.data.query.EntityKeyType;
 import org.thingsboard.server.common.data.query.EntityKeyValueType;
 import org.thingsboard.server.common.data.query.FilterPredicateValue;
 import org.thingsboard.server.common.data.query.NumericFilterPredicate;
@@ -88,7 +86,7 @@ import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class TbDeviceProfileNodeTest {
 
     private TbDeviceProfileNode node;
@@ -211,7 +209,7 @@ public class TbDeviceProfileNodeTest {
 
         registerCreateAlarmMock(alarmService.updateAlarm(any()), false);
 
-
+        Thread.sleep(1);
         TbMsg msg2 = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, deviceId, TbMsgMetaData.EMPTY,
                 TbMsgDataType.JSON, JacksonUtil.toString(data), null, null);
         node.onMsg(ctx, msg2);
@@ -321,12 +319,13 @@ public class TbDeviceProfileNodeTest {
         device.setCustomerId(customerId);
 
         AttributeKvCompositeKey compositeKey = new AttributeKvCompositeKey(
-                EntityType.TENANT, deviceId.getId(), "SERVER_SCOPE", "alarmEnabled"
+                deviceId.getId(), AttributeScope.SERVER_SCOPE.getId(), 10
         );
 
         AttributeKvEntity attributeKvEntity = new AttributeKvEntity();
         attributeKvEntity.setId(compositeKey);
         attributeKvEntity.setBooleanValue(Boolean.TRUE);
+        attributeKvEntity.setStrKey("alarmEnabled");
         attributeKvEntity.setLastUpdateTs(System.currentTimeMillis());
 
         AttributeKvEntry entry = attributeKvEntity.toData();
@@ -372,7 +371,7 @@ public class TbDeviceProfileNodeTest {
                 .thenReturn(null);
         registerCreateAlarmMock(alarmService.createAlarm(any()), true);
         Mockito.when(ctx.getAttributesService()).thenReturn(attributesService);
-        Mockito.when(attributesService.find(eq(tenantId), eq(deviceId), Mockito.anyString(), Mockito.anySet()))
+        Mockito.when(attributesService.find(eq(tenantId), eq(deviceId), Mockito.any(AttributeScope.class), Mockito.anySet()))
                 .thenReturn(attrListListenableFuture);
 
         TbMsg theMsg = TbMsg.newMsg(TbMsgType.ALARM, deviceId, TbMsgMetaData.EMPTY, TbMsg.EMPTY_STRING);
@@ -403,11 +402,12 @@ public class TbDeviceProfileNodeTest {
         device.setCustomerId(customerId);
 
         AttributeKvCompositeKey compositeKey = new AttributeKvCompositeKey(
-                EntityType.TENANT, tenantId.getId(), "SERVER_SCOPE", "alarmEnabled"
+                tenantId.getId(), AttributeScope.SERVER_SCOPE.getId(), 10
         );
 
         AttributeKvEntity attributeKvEntity = new AttributeKvEntity();
         attributeKvEntity.setId(compositeKey);
+        attributeKvEntity.setStrKey("alarmEnabled");
         attributeKvEntity.setBooleanValue(Boolean.TRUE);
         attributeKvEntity.setLastUpdateTs(System.currentTimeMillis());
 
@@ -455,11 +455,11 @@ public class TbDeviceProfileNodeTest {
                 .thenReturn(null);
         registerCreateAlarmMock(alarmService.createAlarm(any()), true);
         Mockito.when(ctx.getAttributesService()).thenReturn(attributesService);
-        Mockito.when(attributesService.find(eq(tenantId), eq(deviceId), Mockito.anyString(), Mockito.anySet()))
+        Mockito.when(attributesService.find(eq(tenantId), eq(deviceId), Mockito.any(AttributeScope.class), Mockito.anySet()))
                 .thenReturn(Futures.immediateFuture(Collections.emptyList()));
-        Mockito.when(attributesService.find(eq(tenantId), eq(customerId), Mockito.anyString(), Mockito.anyString()))
+        Mockito.when(attributesService.find(eq(tenantId), eq(customerId), Mockito.any(AttributeScope.class), Mockito.anyString()))
                 .thenReturn(Futures.immediateFuture(Optional.empty()));
-        Mockito.when(attributesService.find(eq(tenantId), eq(tenantId), Mockito.anyString(), Mockito.anyString()))
+        Mockito.when(attributesService.find(eq(tenantId), eq(tenantId), Mockito.any(AttributeScope.class), Mockito.anyString()))
                 .thenReturn(attrListListenableFuture);
 
         TbMsg theMsg = TbMsg.newMsg(TbMsgType.ALARM, deviceId, TbMsgMetaData.EMPTY, TbMsg.EMPTY_STRING);
@@ -486,11 +486,12 @@ public class TbDeviceProfileNodeTest {
         DeviceProfileData deviceProfileData = new DeviceProfileData();
 
         AttributeKvCompositeKey compositeKey = new AttributeKvCompositeKey(
-                EntityType.TENANT, deviceId.getId(), "SERVER_SCOPE", "greaterAttribute"
+                deviceId.getId(), AttributeScope.SERVER_SCOPE.getId(), 10
         );
 
         AttributeKvEntity attributeKvEntity = new AttributeKvEntity();
         attributeKvEntity.setId(compositeKey);
+        attributeKvEntity.setStrKey("greaterAttribute");
         attributeKvEntity.setLongValue(30L);
         attributeKvEntity.setLastUpdateTs(0L);
 
@@ -528,7 +529,7 @@ public class TbDeviceProfileNodeTest {
                 .thenReturn(null);
         registerCreateAlarmMock(alarmService.createAlarm(any()), true);
         Mockito.when(ctx.getAttributesService()).thenReturn(attributesService);
-        Mockito.when(attributesService.find(eq(tenantId), eq(deviceId), Mockito.anyString(), Mockito.anySet()))
+        Mockito.when(attributesService.find(eq(tenantId), eq(deviceId), Mockito.any(AttributeScope.class), Mockito.anySet()))
                 .thenReturn(listListenableFutureWithLess);
 
         TbMsg theMsg = TbMsg.newMsg(TbMsgType.ALARM, deviceId, TbMsgMetaData.EMPTY, TbMsg.EMPTY_STRING);
@@ -555,20 +556,22 @@ public class TbDeviceProfileNodeTest {
         DeviceProfileData deviceProfileData = new DeviceProfileData();
 
         AttributeKvCompositeKey compositeKey = new AttributeKvCompositeKey(
-                EntityType.TENANT, deviceId.getId(), "SERVER_SCOPE", "greaterAttribute"
+                deviceId.getId(), AttributeScope.SERVER_SCOPE.getId(), 10
         );
 
         AttributeKvEntity attributeKvEntity = new AttributeKvEntity();
         attributeKvEntity.setId(compositeKey);
+        attributeKvEntity.setStrKey("greaterAttribute");
         attributeKvEntity.setLongValue(30L);
         attributeKvEntity.setLastUpdateTs(0L);
 
         AttributeKvCompositeKey alarmDelayCompositeKey = new AttributeKvCompositeKey(
-                EntityType.TENANT, deviceId.getId(), "SERVER_SCOPE", "alarm_delay"
+                deviceId.getId(), AttributeScope.SERVER_SCOPE.getId(), 11
         );
 
         AttributeKvEntity alarmDelayAttributeKvEntity = new AttributeKvEntity();
         alarmDelayAttributeKvEntity.setId(alarmDelayCompositeKey);
+        alarmDelayAttributeKvEntity.setStrKey("alarm_delay");
         long alarmDelayInSeconds = 5L;
         alarmDelayAttributeKvEntity.setLongValue(alarmDelayInSeconds);
         alarmDelayAttributeKvEntity.setLastUpdateTs(0L);
@@ -622,7 +625,7 @@ public class TbDeviceProfileNodeTest {
                 .thenReturn(null);
         registerCreateAlarmMock(alarmService.createAlarm(any()), true);
         Mockito.when(ctx.getAttributesService()).thenReturn(attributesService);
-        Mockito.when(attributesService.find(eq(tenantId), eq(deviceId), Mockito.anyString(), Mockito.anySet()))
+        Mockito.when(attributesService.find(eq(tenantId), eq(deviceId), Mockito.any(AttributeScope.class), Mockito.anySet()))
                 .thenReturn(listListenableFuture);
 
         TbMsg theMsg = TbMsg.newMsg(TbMsgType.ALARM, deviceId, TbMsgMetaData.EMPTY, TbMsg.EMPTY_STRING);
@@ -644,7 +647,7 @@ public class TbDeviceProfileNodeTest {
 
         verify(ctx, Mockito.never()).tellNext(theMsg, "Alarm Created");
 
-        Thread.sleep(halfOfAlarmDelay);
+        Thread.sleep(halfOfAlarmDelay + 1);
 
         TbMsg msg2 = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, deviceId, TbMsgMetaData.EMPTY,
                 TbMsgDataType.JSON, JacksonUtil.toString(data), null, null);
@@ -669,20 +672,22 @@ public class TbDeviceProfileNodeTest {
 
 
         AttributeKvCompositeKey compositeKey = new AttributeKvCompositeKey(
-                EntityType.TENANT, deviceId.getId(), "SERVER_SCOPE", "greaterAttribute"
+                deviceId.getId(), AttributeScope.SERVER_SCOPE.getId(), 10
         );
 
         AttributeKvEntity attributeKvEntity = new AttributeKvEntity();
         attributeKvEntity.setId(compositeKey);
+        attributeKvEntity.setStrKey("greaterAttribute");
         attributeKvEntity.setLongValue(30L);
         attributeKvEntity.setLastUpdateTs(0L);
 
         AttributeKvCompositeKey alarmDelayCompositeKey = new AttributeKvCompositeKey(
-                EntityType.TENANT, deviceId.getId(), "SERVER_SCOPE", "alarm_delay"
+                deviceId.getId(), AttributeScope.SERVER_SCOPE.getId(), 11
         );
 
         AttributeKvEntity alarmDelayAttributeKvEntity = new AttributeKvEntity();
         alarmDelayAttributeKvEntity.setId(alarmDelayCompositeKey);
+        alarmDelayAttributeKvEntity.setStrKey("alarm_delay");
         long alarmDelayInSeconds = 5L;
         alarmDelayAttributeKvEntity.setLongValue(alarmDelayInSeconds);
         alarmDelayAttributeKvEntity.setLastUpdateTs(0L);
@@ -740,13 +745,13 @@ public class TbDeviceProfileNodeTest {
                 .thenReturn(null);
         registerCreateAlarmMock(alarmService.createAlarm(any()), true);
         Mockito.when(ctx.getAttributesService()).thenReturn(attributesService);
-        Mockito.when(attributesService.find(eq(tenantId), eq(tenantId), Mockito.anyString(), Mockito.anyString()))
+        Mockito.when(attributesService.find(eq(tenantId), eq(tenantId), Mockito.any(AttributeScope.class), Mockito.anyString()))
                 .thenReturn(optionalDurationAttribute);
         Mockito.when(ctx.getDeviceService().findDeviceById(tenantId, deviceId))
                 .thenReturn(device);
-        Mockito.when(attributesService.find(eq(tenantId), eq(customerId), eq(DataConstants.SERVER_SCOPE), Mockito.anyString()))
+        Mockito.when(attributesService.find(eq(tenantId), eq(customerId), eq(AttributeScope.SERVER_SCOPE), Mockito.anyString()))
                 .thenReturn(emptyOptional);
-        Mockito.when(attributesService.find(eq(tenantId), eq(deviceId), Mockito.anyString(), Mockito.anySet()))
+        Mockito.when(attributesService.find(eq(tenantId), eq(deviceId), Mockito.any(AttributeScope.class), Mockito.anySet()))
                 .thenReturn(listNoDurationAttribute);
 
         TbMsg theMsg = TbMsg.newMsg(TbMsgType.ALARM, deviceId, TbMsgMetaData.EMPTY, TbMsg.EMPTY_STRING);
@@ -768,7 +773,7 @@ public class TbDeviceProfileNodeTest {
 
         verify(ctx, Mockito.never()).tellNext(theMsg, "Alarm Created");
 
-        Thread.sleep(halfOfAlarmDelay);
+        Thread.sleep(halfOfAlarmDelay + 1);
 
         TbMsg msg2 = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, deviceId, TbMsgMetaData.EMPTY,
                 TbMsgDataType.JSON, JacksonUtil.toString(data), null, null);
@@ -788,20 +793,22 @@ public class TbDeviceProfileNodeTest {
         DeviceProfileData deviceProfileData = new DeviceProfileData();
 
         AttributeKvCompositeKey compositeKey = new AttributeKvCompositeKey(
-                EntityType.TENANT, deviceId.getId(), "SERVER_SCOPE", "greaterAttribute"
+                deviceId.getId(), AttributeScope.SERVER_SCOPE.getId(), 10
         );
 
         AttributeKvEntity attributeKvEntity = new AttributeKvEntity();
         attributeKvEntity.setId(compositeKey);
+        attributeKvEntity.setStrKey("greaterAttribute");
         attributeKvEntity.setLongValue(30L);
         attributeKvEntity.setLastUpdateTs(0L);
 
         AttributeKvCompositeKey alarmDelayCompositeKey = new AttributeKvCompositeKey(
-                EntityType.TENANT, deviceId.getId(), "SERVER_SCOPE", "alarm_delay"
+                deviceId.getId(), AttributeScope.SERVER_SCOPE.getId(), 11
         );
 
         AttributeKvEntity alarmDelayAttributeKvEntity = new AttributeKvEntity();
         alarmDelayAttributeKvEntity.setId(alarmDelayCompositeKey);
+        alarmDelayAttributeKvEntity.setStrKey("alarm_delay");
         long alarmRepeating = 2;
         alarmDelayAttributeKvEntity.setLongValue(alarmRepeating);
         alarmDelayAttributeKvEntity.setLastUpdateTs(0L);
@@ -855,7 +862,7 @@ public class TbDeviceProfileNodeTest {
                 .thenReturn(null);
         registerCreateAlarmMock(alarmService.createAlarm(any()), true);
         Mockito.when(ctx.getAttributesService()).thenReturn(attributesService);
-        Mockito.when(attributesService.find(eq(tenantId), eq(deviceId), Mockito.anyString(), Mockito.anySet()))
+        Mockito.when(attributesService.find(eq(tenantId), eq(deviceId), Mockito.any(AttributeScope.class), Mockito.anySet()))
                 .thenReturn(listListenableFuture);
 
         TbMsg theMsg = TbMsg.newMsg(TbMsgType.ALARM, deviceId, TbMsgMetaData.EMPTY, TbMsg.EMPTY_STRING);
@@ -891,7 +898,7 @@ public class TbDeviceProfileNodeTest {
         DeviceProfileData deviceProfileData = new DeviceProfileData();
 
         AttributeKvCompositeKey compositeKey = new AttributeKvCompositeKey(
-                EntityType.TENANT, deviceId.getId(), "SERVER_SCOPE", "greaterAttribute"
+                deviceId.getId(), AttributeScope.SERVER_SCOPE.getId(), 10
         );
 
         Device device = new Device();
@@ -900,15 +907,17 @@ public class TbDeviceProfileNodeTest {
 
         AttributeKvEntity attributeKvEntity = new AttributeKvEntity();
         attributeKvEntity.setId(compositeKey);
+        attributeKvEntity.setStrKey("greaterAttribute");
         attributeKvEntity.setLongValue(30L);
         attributeKvEntity.setLastUpdateTs(0L);
 
         AttributeKvCompositeKey alarmDelayCompositeKey = new AttributeKvCompositeKey(
-                EntityType.TENANT, deviceId.getId(), "SERVER_SCOPE", "alarm_delay"
+                deviceId.getId(), AttributeScope.SERVER_SCOPE.getId(), 11
         );
 
         AttributeKvEntity alarmDelayAttributeKvEntity = new AttributeKvEntity();
         alarmDelayAttributeKvEntity.setId(alarmDelayCompositeKey);
+        alarmDelayAttributeKvEntity.setStrKey("alarm_delay");
         long repeatingCondition = 2;
         alarmDelayAttributeKvEntity.setLongValue(repeatingCondition);
         alarmDelayAttributeKvEntity.setLastUpdateTs(0L);
@@ -965,13 +974,13 @@ public class TbDeviceProfileNodeTest {
                 .thenReturn(null);
         registerCreateAlarmMock(alarmService.createAlarm(any()), true);
         Mockito.when(ctx.getAttributesService()).thenReturn(attributesService);
-        Mockito.when(attributesService.find(eq(tenantId), eq(tenantId), Mockito.anyString(), Mockito.anyString()))
+        Mockito.when(attributesService.find(eq(tenantId), eq(tenantId), Mockito.any(AttributeScope.class), Mockito.anyString()))
                 .thenReturn(optionalDurationAttribute);
         Mockito.when(ctx.getDeviceService().findDeviceById(tenantId, deviceId))
                 .thenReturn(device);
-        Mockito.when(attributesService.find(eq(tenantId), eq(customerId), eq(DataConstants.SERVER_SCOPE), Mockito.anyString()))
+        Mockito.when(attributesService.find(eq(tenantId), eq(customerId), eq(AttributeScope.SERVER_SCOPE), Mockito.anyString()))
                 .thenReturn(emptyOptional);
-        Mockito.when(attributesService.find(eq(tenantId), eq(deviceId), Mockito.anyString(), Mockito.anySet()))
+        Mockito.when(attributesService.find(eq(tenantId), eq(deviceId), Mockito.any(AttributeScope.class), Mockito.anySet()))
                 .thenReturn(listNoDurationAttribute);
 
         TbMsg theMsg = TbMsg.newMsg(TbMsgType.ALARM, deviceId, TbMsgMetaData.EMPTY, TbMsg.EMPTY_STRING);
@@ -1012,11 +1021,12 @@ public class TbDeviceProfileNodeTest {
         device.setCustomerId(customerId);
 
         AttributeKvCompositeKey compositeKey = new AttributeKvCompositeKey(
-                EntityType.TENANT, deviceId.getId(), "SERVER_SCOPE", "greaterAttribute"
+                deviceId.getId(), AttributeScope.SERVER_SCOPE.getId(), 10
         );
 
         AttributeKvEntity attributeKvEntity = new AttributeKvEntity();
         attributeKvEntity.setId(compositeKey);
+        attributeKvEntity.setStrKey("greaterAttribute");
         attributeKvEntity.setLongValue(30L);
         attributeKvEntity.setLastUpdateTs(0L);
 
@@ -1067,7 +1077,7 @@ public class TbDeviceProfileNodeTest {
                 .thenReturn(null);
         registerCreateAlarmMock(alarmService.createAlarm(any()), true);
         Mockito.when(ctx.getAttributesService()).thenReturn(attributesService);
-        Mockito.when(attributesService.find(eq(tenantId), eq(deviceId), Mockito.anyString(), Mockito.anySet()))
+        Mockito.when(attributesService.find(eq(tenantId), eq(deviceId), Mockito.any(AttributeScope.class), Mockito.anySet()))
                 .thenReturn(listListenableFuture);
 
         TbMsg theMsg = TbMsg.newMsg(TbMsgType.ALARM, deviceId, TbMsgMetaData.EMPTY, TbMsg.EMPTY_STRING);
@@ -1089,7 +1099,7 @@ public class TbDeviceProfileNodeTest {
 
         verify(ctx, Mockito.never()).tellNext(theMsg, "Alarm Created");
 
-        Thread.sleep(halfOfAlarmDelay);
+        Thread.sleep(halfOfAlarmDelay + 1);
 
         TbMsg msg2 = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, deviceId, TbMsgMetaData.EMPTY,
                 TbMsgDataType.JSON, JacksonUtil.toString(data), null, null);
@@ -1113,11 +1123,12 @@ public class TbDeviceProfileNodeTest {
         device.setCustomerId(customerId);
 
         AttributeKvCompositeKey compositeKey = new AttributeKvCompositeKey(
-                EntityType.TENANT, deviceId.getId(), "SERVER_SCOPE", "greaterAttribute"
+                deviceId.getId(), AttributeScope.SERVER_SCOPE.getId(), 10
         );
 
         AttributeKvEntity attributeKvEntity = new AttributeKvEntity();
         attributeKvEntity.setId(compositeKey);
+        attributeKvEntity.setStrKey("greaterAttribute");
         attributeKvEntity.setLongValue(30L);
         attributeKvEntity.setLastUpdateTs(0L);
 
@@ -1165,7 +1176,7 @@ public class TbDeviceProfileNodeTest {
                 .thenReturn(null);
         registerCreateAlarmMock(alarmService.createAlarm(any()), true);
         Mockito.when(ctx.getAttributesService()).thenReturn(attributesService);
-        Mockito.when(attributesService.find(eq(tenantId), eq(deviceId), Mockito.anyString(), Mockito.anySet()))
+        Mockito.when(attributesService.find(eq(tenantId), eq(deviceId), Mockito.any(AttributeScope.class), Mockito.anySet()))
                 .thenReturn(listListenableFuture);
 
         TbMsg theMsg = TbMsg.newMsg(TbMsgType.ALARM, deviceId, TbMsgMetaData.EMPTY, TbMsg.EMPTY_STRING);
@@ -1196,11 +1207,12 @@ public class TbDeviceProfileNodeTest {
         device.setCustomerId(customerId);
 
         AttributeKvCompositeKey compositeKeyActiveSchedule = new AttributeKvCompositeKey(
-                EntityType.TENANT, deviceId.getId(), "SERVER_SCOPE", "dynamicValueActiveSchedule"
+                deviceId.getId(), AttributeScope.SERVER_SCOPE.getId(), 10
         );
 
         AttributeKvEntity attributeKvEntityActiveSchedule = new AttributeKvEntity();
         attributeKvEntityActiveSchedule.setId(compositeKeyActiveSchedule);
+        attributeKvEntityActiveSchedule.setStrKey("dynamicValueActiveSchedule");
         attributeKvEntityActiveSchedule.setJsonValue(
                 "{\"timezone\":\"Europe/Kiev\",\"items\":[{\"enabled\":true,\"dayOfWeek\":1,\"startsOn\":0,\"endsOn\":8.64e+7},{\"enabled\":true,\"dayOfWeek\":2,\"startsOn\":0,\"endsOn\":8.64e+7},{\"enabled\":true,\"dayOfWeek\":3,\"startsOn\":0,\"endsOn\":8.64e+7},{\"enabled\":true,\"dayOfWeek\":4,\"startsOn\":0,\"endsOn\":8.64e+7},{\"enabled\":true,\"dayOfWeek\":5,\"startsOn\":0,\"endsOn\":8.64e+7},{\"enabled\":true,\"dayOfWeek\":6,\"startsOn\":0,\"endsOn\":8.64e+7},{\"enabled\":true,\"dayOfWeek\":7,\"startsOn\":0,\"endsOn\":8.64e+7}],\"dynamicValue\":null}"
         );
@@ -1247,7 +1259,7 @@ public class TbDeviceProfileNodeTest {
                 .thenReturn(null);
         registerCreateAlarmMock(alarmService.createAlarm(any()), true);
         Mockito.when(ctx.getAttributesService()).thenReturn(attributesService);
-        Mockito.when(attributesService.find(eq(tenantId), eq(deviceId), Mockito.anyString(), Mockito.anySet()))
+        Mockito.when(attributesService.find(eq(tenantId), eq(deviceId), Mockito.any(AttributeScope.class), Mockito.anySet()))
                 .thenReturn(listListenableFutureActiveSchedule);
 
         TbMsg theMsg = TbMsg.newMsg(TbMsgType.ALARM, deviceId, TbMsgMetaData.EMPTY, TbMsg.EMPTY_STRING);
@@ -1280,11 +1292,12 @@ public class TbDeviceProfileNodeTest {
         device.setCustomerId(customerId);
 
         AttributeKvCompositeKey compositeKeyInactiveSchedule = new AttributeKvCompositeKey(
-                EntityType.TENANT, deviceId.getId(), "SERVER_SCOPE", "dynamicValueInactiveSchedule"
+                deviceId.getId(), AttributeScope.SERVER_SCOPE.getId(), 10
         );
 
         AttributeKvEntity attributeKvEntityInactiveSchedule = new AttributeKvEntity();
         attributeKvEntityInactiveSchedule.setId(compositeKeyInactiveSchedule);
+        attributeKvEntityInactiveSchedule.setStrKey("dynamicValueInactiveSchedule");
         attributeKvEntityInactiveSchedule.setJsonValue(
                 "{\"timezone\":\"Europe/Kiev\",\"items\":[{\"enabled\":false,\"dayOfWeek\":1,\"startsOn\":0,\"endsOn\":0},{\"enabled\":false,\"dayOfWeek\":2,\"startsOn\":0,\"endsOn\":0},{\"enabled\":false,\"dayOfWeek\":3,\"startsOn\":0,\"endsOn\":0},{\"enabled\":false,\"dayOfWeek\":4,\"startsOn\":0,\"endsOn\":0},{\"enabled\":false,\"dayOfWeek\":5,\"startsOn\":0,\"endsOn\":0},{\"enabled\":false,\"dayOfWeek\":6,\"startsOn\":0,\"endsOn\":0},{\"enabled\":false,\"dayOfWeek\":7,\"startsOn\":0,\"endsOn\":0}],\"dynamicValue\":null}"
         );
@@ -1343,7 +1356,7 @@ public class TbDeviceProfileNodeTest {
         Mockito.when(alarmService.findLatestActiveByOriginatorAndType(tenantId, deviceId, "highTemperatureAlarm"))
                 .thenReturn(null);
         Mockito.when(ctx.getAttributesService()).thenReturn(attributesService);
-        Mockito.when(attributesService.find(eq(tenantId), eq(deviceId), Mockito.anyString(), Mockito.anySet()))
+        Mockito.when(attributesService.find(eq(tenantId), eq(deviceId), Mockito.any(AttributeScope.class), Mockito.anySet()))
                 .thenReturn(listListenableFutureInactiveSchedule);
 
         TbMsg theMsg = TbMsg.newMsg(TbMsgType.ALARM, deviceId, TbMsgMetaData.EMPTY, TbMsg.EMPTY_STRING);
@@ -1372,11 +1385,12 @@ public class TbDeviceProfileNodeTest {
         device.setCustomerId(customerId);
 
         AttributeKvCompositeKey compositeKey = new AttributeKvCompositeKey(
-                EntityType.CUSTOMER, deviceId.getId(), "SERVER_SCOPE", "lessAttribute"
+                deviceId.getId(), AttributeScope.SERVER_SCOPE.getId(), 10
         );
 
         AttributeKvEntity attributeKvEntity = new AttributeKvEntity();
         attributeKvEntity.setId(compositeKey);
+        attributeKvEntity.setStrKey("lessAttribute");
         attributeKvEntity.setLongValue(30L);
         attributeKvEntity.setLastUpdateTs(0L);
 
@@ -1417,11 +1431,11 @@ public class TbDeviceProfileNodeTest {
                 .thenReturn(null);
         registerCreateAlarmMock(alarmService.createAlarm(any()), true);
         Mockito.when(ctx.getAttributesService()).thenReturn(attributesService);
-        Mockito.when(attributesService.find(eq(tenantId), eq(deviceId), Mockito.anyString(), Mockito.anySet()))
+        Mockito.when(attributesService.find(eq(tenantId), eq(deviceId), Mockito.any(AttributeScope.class), Mockito.anySet()))
                 .thenReturn(listListenableFutureWithLess);
         Mockito.when(ctx.getDeviceService().findDeviceById(tenantId, deviceId))
                 .thenReturn(device);
-        Mockito.when(attributesService.find(eq(tenantId), eq(customerId), eq(DataConstants.SERVER_SCOPE), Mockito.anyString()))
+        Mockito.when(attributesService.find(eq(tenantId), eq(customerId), eq(AttributeScope.SERVER_SCOPE), Mockito.anyString()))
                 .thenReturn(optionalListenableFutureWithLess);
 
         TbMsg theMsg = TbMsg.newMsg(TbMsgType.ALARM, deviceId, TbMsgMetaData.EMPTY, TbMsg.EMPTY_STRING);
@@ -1447,11 +1461,12 @@ public class TbDeviceProfileNodeTest {
         DeviceProfileData deviceProfileData = new DeviceProfileData();
 
         AttributeKvCompositeKey compositeKey = new AttributeKvCompositeKey(
-                EntityType.TENANT, deviceId.getId(), "SERVER_SCOPE", "lessAttribute"
+                deviceId.getId(), AttributeScope.SERVER_SCOPE.getId(), 10
         );
 
         AttributeKvEntity attributeKvEntity = new AttributeKvEntity();
         attributeKvEntity.setId(compositeKey);
+        attributeKvEntity.setStrKey("lessAttribute");
         attributeKvEntity.setLongValue(50L);
         attributeKvEntity.setLastUpdateTs(0L);
 
@@ -1492,9 +1507,9 @@ public class TbDeviceProfileNodeTest {
                 .thenReturn(null);
         registerCreateAlarmMock(alarmService.createAlarm(any()), true);
         Mockito.when(ctx.getAttributesService()).thenReturn(attributesService);
-        Mockito.when(attributesService.find(eq(tenantId), eq(deviceId), Mockito.anyString(), Mockito.anySet()))
+        Mockito.when(attributesService.find(eq(tenantId), eq(deviceId), Mockito.any(AttributeScope.class), Mockito.anySet()))
                 .thenReturn(listListenableFutureWithLess);
-        Mockito.when(attributesService.find(eq(tenantId), eq(tenantId), eq(DataConstants.SERVER_SCOPE), Mockito.anyString()))
+        Mockito.when(attributesService.find(eq(tenantId), eq(tenantId), eq(AttributeScope.SERVER_SCOPE), Mockito.anyString()))
                 .thenReturn(optionalListenableFutureWithLess);
 
         TbMsg theMsg = TbMsg.newMsg(TbMsgType.ALARM, deviceId, TbMsgMetaData.EMPTY, TbMsg.EMPTY_STRING);
@@ -1520,7 +1535,7 @@ public class TbDeviceProfileNodeTest {
         DeviceProfileData deviceProfileData = new DeviceProfileData();
 
         AttributeKvCompositeKey compositeKey = new AttributeKvCompositeKey(
-                EntityType.TENANT, deviceId.getId(), "SERVER_SCOPE", "tenantAttribute"
+                deviceId.getId(), AttributeScope.SERVER_SCOPE.getId(), 10
         );
 
         Device device = new Device();
@@ -1529,6 +1544,7 @@ public class TbDeviceProfileNodeTest {
 
         AttributeKvEntity attributeKvEntity = new AttributeKvEntity();
         attributeKvEntity.setId(compositeKey);
+        attributeKvEntity.setStrKey("tenantAttribute");
         attributeKvEntity.setLongValue(100L);
         attributeKvEntity.setLastUpdateTs(0L);
 
@@ -1573,11 +1589,11 @@ public class TbDeviceProfileNodeTest {
         Mockito.when(ctx.getAttributesService()).thenReturn(attributesService);
         Mockito.when(ctx.getDeviceService().findDeviceById(tenantId, deviceId))
                 .thenReturn(device);
-        Mockito.when(attributesService.find(eq(tenantId), eq(deviceId), Mockito.anyString(), Mockito.anySet()))
+        Mockito.when(attributesService.find(eq(tenantId), eq(deviceId), Mockito.any(AttributeScope.class), Mockito.anySet()))
                 .thenReturn(listListenableFutureWithLess);
-        Mockito.when(attributesService.find(eq(tenantId), eq(customerId), Mockito.anyString(), Mockito.anyString()))
+        Mockito.when(attributesService.find(eq(tenantId), eq(customerId),  Mockito.any(AttributeScope.class), Mockito.anyString()))
                 .thenReturn(emptyOptionalFuture);
-        Mockito.when(attributesService.find(eq(tenantId), eq(tenantId), eq(DataConstants.SERVER_SCOPE), Mockito.anyString()))
+        Mockito.when(attributesService.find(eq(tenantId), eq(tenantId), eq(AttributeScope.SERVER_SCOPE), Mockito.anyString()))
                 .thenReturn(optionalListenableFutureWithLess);
 
         TbMsg theMsg = TbMsg.newMsg(TbMsgType.ALARM, deviceId, TbMsgMetaData.EMPTY, TbMsg.EMPTY_STRING);
@@ -1605,7 +1621,7 @@ public class TbDeviceProfileNodeTest {
         DeviceProfileData deviceProfileData = new DeviceProfileData();
 
         AttributeKvCompositeKey compositeKey = new AttributeKvCompositeKey(
-                EntityType.DEVICE, deviceId.getId(), EntityKeyType.SERVER_ATTRIBUTE.name(), "tenantAttribute"
+                deviceId.getId(), AttributeScope.SERVER_SCOPE.getId(), 10
         );
 
         Device device = new Device();
@@ -1614,6 +1630,7 @@ public class TbDeviceProfileNodeTest {
 
         AttributeKvEntity attributeKvEntity = new AttributeKvEntity();
         attributeKvEntity.setId(compositeKey);
+        attributeKvEntity.setStrKey("tenantAttribute");
         attributeKvEntity.setLongValue(100L);
         attributeKvEntity.setLastUpdateTs(0L);
 
@@ -1658,11 +1675,11 @@ public class TbDeviceProfileNodeTest {
         Mockito.when(ctx.getAttributesService()).thenReturn(attributesService);
         Mockito.when(ctx.getDeviceService().findDeviceById(tenantId, deviceId))
                 .thenReturn(device);
-        Mockito.when(attributesService.find(eq(tenantId), eq(deviceId), Mockito.anyString(), Mockito.anySet()))
+        Mockito.when(attributesService.find(eq(tenantId), eq(deviceId), Mockito.any(AttributeScope.class), Mockito.anySet()))
                 .thenReturn(listListenableFutureWithLess);
-        Mockito.when(attributesService.find(eq(tenantId), eq(customerId), Mockito.anyString(), Mockito.anyString()))
+        Mockito.when(attributesService.find(eq(tenantId), eq(customerId), Mockito.any(AttributeScope.class), Mockito.anyString()))
                 .thenReturn(emptyOptionalFuture);
-        Mockito.when(attributesService.find(eq(tenantId), eq(tenantId), eq(DataConstants.SERVER_SCOPE), Mockito.anyString()))
+        Mockito.when(attributesService.find(eq(tenantId), eq(tenantId), eq(AttributeScope.SERVER_SCOPE), Mockito.anyString()))
                 .thenReturn(optionalListenableFutureWithLess);
 
         TbMsg theMsg = TbMsg.newMsg(TbMsgType.ALARM, deviceId, TbMsgMetaData.EMPTY, TbMsg.EMPTY_STRING);
@@ -1683,10 +1700,10 @@ public class TbDeviceProfileNodeTest {
     private void init() throws TbNodeException {
         Mockito.when(ctx.getTenantId()).thenReturn(tenantId);
         Mockito.when(ctx.getDeviceProfileCache()).thenReturn(cache);
-        Mockito.when(ctx.getTimeseriesService()).thenReturn(timeseriesService);
-        Mockito.when(ctx.getAlarmService()).thenReturn(alarmService);
+        Mockito.lenient().when(ctx.getTimeseriesService()).thenReturn(timeseriesService);
+        Mockito.lenient().when(ctx.getAlarmService()).thenReturn(alarmService);
         Mockito.when(ctx.getDeviceService()).thenReturn(deviceService);
-        Mockito.when(ctx.getAttributesService()).thenReturn(attributesService);
+        Mockito.lenient().when(ctx.getAttributesService()).thenReturn(attributesService);
         TbNodeConfiguration nodeConfiguration = new TbNodeConfiguration(JacksonUtil.newObjectNode());
         node = new TbDeviceProfileNode();
         node.init(ctx, nodeConfiguration);
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 b8e9aa3e38..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,14 +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.springframework.web.client.AsyncRestTemplate;
-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;
@@ -48,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;
@@ -143,10 +138,7 @@ public class TbHttpClientTest {
         config.setRestEndpointUrlPattern(endpointUrl);
         config.setUseSimpleClientHttpFactory(true);
 
-        var asyncRestTemplate = new AsyncRestTemplate();
-
         var httpClient = new TbHttpClient(config, eventLoop);
-        httpClient.setHttpClient(asyncRestTemplate);
 
         var msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, new DeviceId(EntityId.NULL_UUID), TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_OBJECT);
         var successMsg = TbMsg.newMsg(
@@ -226,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/rest/TbRestApiCallNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rest/TbRestApiCallNodeTest.java
index c3d0c5bd89..98695c1570 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rest/TbRestApiCallNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rest/TbRestApiCallNodeTest.java
@@ -25,13 +25,13 @@ import org.apache.http.impl.bootstrap.HttpServer;
 import org.apache.http.impl.bootstrap.ServerBootstrap;
 import org.apache.http.protocol.HttpContext;
 import org.apache.http.protocol.HttpRequestHandler;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Assertions;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.rule.engine.api.TbContext;
 import org.thingsboard.rule.engine.api.TbNodeConfiguration;
@@ -51,15 +51,14 @@ import java.util.Collections;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.verify;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class TbRestApiCallNodeTest {
-	
+
     private TbRestApiCallNode restNode;
 
     @Mock
@@ -71,17 +70,17 @@ public class TbRestApiCallNodeTest {
     private RuleChainId ruleChainId = new RuleChainId(Uuids.timeBased());
     private RuleNodeId ruleNodeId = new RuleNodeId(Uuids.timeBased());
 
-	private HttpServer server;
+    private HttpServer server;
 
     public void setupServer(String pattern, HttpRequestHandler handler) throws IOException {
-        SocketConfig config  = SocketConfig.custom().setSoReuseAddress(true).setTcpNoDelay(true).build();
-    	server = ServerBootstrap.bootstrap()
+        SocketConfig config = SocketConfig.custom().setSoReuseAddress(true).setTcpNoDelay(true).build();
+        server = ServerBootstrap.bootstrap()
                 .setSocketConfig(config)
-    			.registerHandler(pattern, handler)
-    			.create();
+                .registerHandler(pattern, handler)
+                .create();
         server.start();
     }
-    
+
     private void initWithConfig(TbRestApiCallNodeConfiguration config) {
         try {
             TbNodeConfiguration nodeConfiguration = new TbNodeConfiguration(JacksonUtil.valueToTree(config));
@@ -92,27 +91,26 @@ public class TbRestApiCallNodeTest {
         }
     }
 
-    @After
+    @AfterEach
     public void teardown() {
         if (server != null) {
             server.stop();
         }
     }
-    
+
     @Test
     public void deleteRequestWithoutBody() throws IOException, InterruptedException {
         final CountDownLatch latch = new CountDownLatch(1);
         final String path = "/path/to/delete";
-    	setupServer("*", new HttpRequestHandler() {
-			
-			@Override
-			public void handle(HttpRequest request, HttpResponse response, HttpContext context)
-					throws HttpException, IOException {
+        setupServer("*", new HttpRequestHandler() {
+
+            @Override
+            public void handle(HttpRequest request, HttpResponse response, HttpContext context)
+                    throws HttpException, IOException {
                 try {
-                    assertEquals("Request path matches", request.getRequestLine().getUri(), path);
-                    assertFalse("Content-Type not included", request.containsHeader("Content-Type"));
-                    assertTrue("Custom header included", request.containsHeader("Foo"));
-                    assertEquals("Custom header value", "Bar", request.getFirstHeader("Foo").getValue());
+                    assertEquals(request.getRequestLine().getUri(), path, "Request path matches");
+                    assertTrue(request.containsHeader("Foo"), "Custom header included");
+                    assertEquals("Bar", request.getFirstHeader("Foo").getValue(), "Custom header value");
                     response.setStatusCode(200);
                     new Thread(new Runnable() {
                         @Override
@@ -126,13 +124,13 @@ public class TbRestApiCallNodeTest {
                             }
                         }
                     }).start();
-                } catch ( Exception e ) {
+                } catch (Exception e) {
                     System.out.println("Exception handling request: " + e.toString());
                     e.printStackTrace();
                     latch.countDown();
                 }
             }
-		});
+        });
 
         TbRestApiCallNodeConfiguration config = new TbRestApiCallNodeConfiguration().defaultConfiguration();
         config.setRequestMethod("DELETE");
@@ -144,7 +142,7 @@ public class TbRestApiCallNodeTest {
         TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, originator, metaData, TbMsgDataType.JSON, TbMsg.EMPTY_JSON_OBJECT, ruleChainId, ruleNodeId);
         restNode.onMsg(ctx, msg);
 
-        assertTrue("Server handled request", latch.await(10, TimeUnit.SECONDS));
+        assertTrue(latch.await(10, TimeUnit.SECONDS), "Server handled request");
 
         ArgumentCaptor<TbMsg> msgCaptor = ArgumentCaptor.forClass(TbMsg.class);
         ArgumentCaptor<TbMsgMetaData> metadataCaptor = ArgumentCaptor.forClass(TbMsgMetaData.class);
@@ -165,15 +163,15 @@ public class TbRestApiCallNodeTest {
             public void handle(HttpRequest request, HttpResponse response, HttpContext context)
                     throws HttpException, IOException {
                 try {
-                    assertEquals("Request path matches", path, request.getRequestLine().getUri());
-                    assertTrue("Content-Type included", request.containsHeader("Content-Type"));
-                    assertEquals("Content-Type value", "text/plain;charset=ISO-8859-1",
-                            request.getFirstHeader("Content-Type").getValue());
-                    assertTrue("Content-Length included", request.containsHeader("Content-Length"));
-                    assertEquals("Content-Length value", "2",
-                            request.getFirstHeader("Content-Length").getValue());
-                    assertTrue("Custom header included", request.containsHeader("Foo"));
-                    assertEquals("Custom header value", "Bar", request.getFirstHeader("Foo").getValue());
+                    assertEquals(path, request.getRequestLine().getUri(), "Request path matches");
+                    assertTrue(request.containsHeader("Content-Type"), "Content-Type included");
+                    assertEquals("text/plain;charset=UTF-8",
+                            request.getFirstHeader("Content-Type").getValue(), "Content-Type value");
+                    assertTrue(request.containsHeader("Content-Length"), "Content-Length included");
+                    assertEquals("2",
+                            request.getFirstHeader("Content-Length").getValue(), "Content-Length value");
+                    assertTrue(request.containsHeader("Foo"), "Custom header included");
+                    assertEquals("Bar", request.getFirstHeader("Foo").getValue(), "Custom header value");
                     response.setStatusCode(200);
                     new Thread(new Runnable() {
                         @Override
@@ -187,7 +185,7 @@ public class TbRestApiCallNodeTest {
                             }
                         }
                     }).start();
-                } catch ( Exception e ) {
+                } catch (Exception e) {
                     System.out.println("Exception handling request: " + e.toString());
                     e.printStackTrace();
                     latch.countDown();
@@ -205,13 +203,13 @@ public class TbRestApiCallNodeTest {
         TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, originator, metaData, TbMsgDataType.JSON, TbMsg.EMPTY_JSON_OBJECT, ruleChainId, ruleNodeId);
         restNode.onMsg(ctx, msg);
 
-        assertTrue("Server handled request", latch.await(10, TimeUnit.SECONDS));
+        assertTrue(latch.await(10, TimeUnit.SECONDS), "Server handled request");
 
         ArgumentCaptor<TbMsg> msgCaptor = ArgumentCaptor.forClass(TbMsg.class);
         ArgumentCaptor<TbMsgMetaData> metadataCaptor = ArgumentCaptor.forClass(TbMsgMetaData.class);
         ArgumentCaptor<String> dataCaptor = ArgumentCaptor.forClass(String.class);
         verify(ctx).transformMsg(msgCaptor.capture(), metadataCaptor.capture(), dataCaptor.capture());
-        
+
         assertNotSame(metaData, metadataCaptor.getValue());
         assertEquals(TbMsg.EMPTY_JSON_OBJECT, dataCaptor.getValue());
     }
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rpc/TbSendRPCReplyNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rpc/TbSendRPCReplyNodeTest.java
index 454c1a9fe6..db632fe3c7 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rpc/TbSendRPCReplyNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rpc/TbSendRPCReplyNodeTest.java
@@ -16,12 +16,12 @@
 package org.thingsboard.rule.engine.rpc;
 
 import com.google.common.util.concurrent.SettableFuture;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.common.util.ListeningExecutor;
 import org.thingsboard.rule.engine.api.RuleEngineRpcService;
@@ -43,7 +43,7 @@ import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class TbSendRPCReplyNodeTest {
 
     private static final String DUMMY_SERVICE_ID = "testServiceId";
@@ -68,7 +68,7 @@ public class TbSendRPCReplyNodeTest {
     @Mock
     private ListeningExecutor listeningExecutor;
 
-    @Before
+    @BeforeEach
     public void setUp() throws TbNodeException {
         node = new TbSendRPCReplyNode();
         TbSendRpcReplyNodeConfiguration config = new TbSendRpcReplyNodeConfiguration().defaultConfiguration();
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/telemetry/TbMsgAttributesNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/telemetry/TbMsgAttributesNodeTest.java
index 23e4b37c92..66ab5826b7 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/telemetry/TbMsgAttributesNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/telemetry/TbMsgAttributesNodeTest.java
@@ -30,7 +30,7 @@ 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.DataConstants;
+import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.kv.AttributeKvEntry;
@@ -156,7 +156,7 @@ class TbMsgAttributesNodeTest extends AbstractRuleNodeUpgradeTest {
         when(ctxMock.getTenantId()).thenReturn(tenantId);
         when(ctxMock.getTelemetryService()).thenReturn(telemetryServiceMock);
         willCallRealMethod().given(node).init(any(TbContext.class), any(TbNodeConfiguration.class));
-        willCallRealMethod().given(node).saveAttr(any(), eq(ctxMock), any(TbMsg.class), anyString(), anyBoolean());
+        willCallRealMethod().given(node).saveAttr(any(), eq(ctxMock), any(TbMsg.class), any(AttributeScope.class), anyBoolean());
 
         node.init(ctxMock, tbNodeConfiguration);
 
@@ -168,12 +168,12 @@ class TbMsgAttributesNodeTest extends AbstractRuleNodeUpgradeTest {
         var testTbMsg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, deviceId, md, TbMsg.EMPTY_STRING);
         List<AttributeKvEntry> testAttrList = List.of(new BaseAttributeKvEntry(0L, new StringDataEntry("testKey", "testValue")));
 
-        node.saveAttr(testAttrList, ctxMock, testTbMsg, DataConstants.SHARED_SCOPE, false);
+        node.saveAttr(testAttrList, ctxMock, testTbMsg, AttributeScope.SHARED_SCOPE, false);
 
         ArgumentCaptor<Boolean> notifyDeviceCaptor = ArgumentCaptor.forClass(Boolean.class);
 
         verify(telemetryServiceMock, times(1)).saveAndNotify(
-                eq(tenantId), eq(deviceId), eq(DataConstants.SHARED_SCOPE),
+                eq(tenantId), eq(deviceId), eq(AttributeScope.SHARED_SCOPE),
                 eq(testAttrList), notifyDeviceCaptor.capture(), any()
         );
         boolean notifyDevice = notifyDeviceCaptor.getValue();
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/telemetry/TbMsgDeleteAttributesNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/telemetry/TbMsgDeleteAttributesNodeTest.java
index 35069af08d..3d546c80f7 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/telemetry/TbMsgDeleteAttributesNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/telemetry/TbMsgDeleteAttributesNodeTest.java
@@ -25,6 +25,7 @@ import org.thingsboard.rule.engine.api.RuleEngineTelemetryService;
 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.AttributeScope;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.msg.TbMsgType;
@@ -81,7 +82,7 @@ public class TbMsgDeleteAttributesNodeTest {
             callBack.onSuccess(null);
             return null;
         }).given(telemetryService).deleteAndNotify(
-                any(), any(), anyString(), anyList(), anyBoolean(), any());
+                any(), any(), any(AttributeScope.class), anyList(), anyBoolean(), any());
     }
 
     @AfterEach
@@ -152,6 +153,6 @@ public class TbMsgDeleteAttributesNodeTest {
         }
         verify(ctx, times(1)).tellSuccess(newMsgCaptor.capture());
         verify(ctx, never()).tellFailure(any(), any());
-        verify(telemetryService, times(1)).deleteAndNotify(any(), any(), anyString(), anyList(), eq(notifyDevice || notifyDeviceMetadata), any());
+        verify(telemetryService, times(1)).deleteAndNotify(any(), any(), any(AttributeScope.class), anyList(), eq(notifyDevice || notifyDeviceMetadata), any());
     }
 }
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNodeTest.java
index e9803289bb..952a566695 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNodeTest.java
@@ -17,12 +17,12 @@ package org.thingsboard.rule.engine.transform;
 
 import com.datastax.oss.driver.api.core.uuid.Uuids;
 import com.google.common.util.concurrent.Futures;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+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.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.common.util.ListeningExecutor;
 import org.thingsboard.rule.engine.TestDbCallbackExecutor;
@@ -43,14 +43,14 @@ import org.thingsboard.server.dao.asset.AssetService;
 
 import java.util.NoSuchElementException;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.ArgumentMatchers.same;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class TbChangeOriginatorNodeTest {
 
     private static final String CUSTOMER_SOURCE = "CUSTOMER";
@@ -64,14 +64,14 @@ public class TbChangeOriginatorNodeTest {
 
     private ListeningExecutor dbExecutor;
 
-    @Before
-    public void before() {
+    @BeforeEach
+    public void before() throws TbNodeException {
         dbExecutor = new TestDbCallbackExecutor();
+        init();
     }
 
     @Test
-    public void originatorCanBeChangedToCustomerId() throws TbNodeException {
-        init();
+    public void originatorCanBeChangedToCustomerId() {
         AssetId assetId = new AssetId(Uuids.timeBased());
         CustomerId customerId = new CustomerId(Uuids.timeBased());
         Asset asset = new Asset();
@@ -95,8 +95,7 @@ public class TbChangeOriginatorNodeTest {
     }
 
     @Test
-    public void newChainCanBeStarted() throws TbNodeException {
-        init();
+    public void newChainCanBeStarted() {
         AssetId assetId = new AssetId(Uuids.timeBased());
         CustomerId customerId = new CustomerId(Uuids.timeBased());
         Asset asset = new Asset();
@@ -119,8 +118,7 @@ public class TbChangeOriginatorNodeTest {
     }
 
     @Test
-    public void exceptionThrownIfCannotFindNewOriginator() throws TbNodeException {
-        init();
+    public void exceptionThrownIfCannotFindNewOriginator() {
         AssetId assetId = new AssetId(Uuids.timeBased());
         CustomerId customerId = new CustomerId(Uuids.timeBased());
         Asset asset = new Asset();
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbTransformMsgNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbTransformMsgNodeTest.java
index a410b84532..98ecc237b6 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbTransformMsgNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbTransformMsgNodeTest.java
@@ -17,11 +17,11 @@ package org.thingsboard.rule.engine.transform;
 
 import com.datastax.oss.driver.api.core.uuid.Uuids;
 import com.google.common.util.concurrent.Futures;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.rule.engine.api.ScriptEngine;
 import org.thingsboard.rule.engine.api.TbContext;
@@ -37,12 +37,12 @@ import org.thingsboard.server.common.msg.TbMsgMetaData;
 
 import java.util.Collections;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.ArgumentMatchers.same;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class TbTransformMsgNodeTest {
 
     private TbTransformMsgNode node;
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..47fa03e08e 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
@@ -15,13 +15,13 @@
  */
 package org.thingsboard.rule.engine.util;
 
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+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.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.thingsboard.common.util.AbstractListeningExecutor;
 import org.thingsboard.rule.engine.api.RuleEngineAlarmService;
 import org.thingsboard.rule.engine.api.RuleEngineApiUsageStateService;
@@ -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;
@@ -86,7 +88,7 @@ import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.when;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class TenantIdLoaderTest {
 
     @Mock
@@ -135,13 +137,15 @@ public class TenantIdLoaderTest {
     private NotificationRequestService notificationRequestService;
     @Mock
     private NotificationRuleService notificationRuleService;
+    @Mock
+    private QueueStatsService queueStatsService;
 
     private TenantId tenantId;
     private TenantProfileId tenantProfileId;
     private NotificationId notificationId;
     private AbstractListeningExecutor dbExecutor;
 
-    @Before
+    @BeforeEach
     public void before() {
         dbExecutor = new AbstractListeningExecutor() {
             @Override
@@ -161,7 +165,7 @@ public class TenantIdLoaderTest {
         }
     }
 
-    @After
+    @AfterEach
     public void after() {
         dbExecutor.destroy();
     }
@@ -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);
         }
@@ -374,9 +384,9 @@ public class TenantIdLoaderTest {
             TenantId targetTenantId = TenantIdLoader.findTenantId(ctx, entityId);
             String msg = "Check entity type <" + entityType.name() + ">:";
             if (equals) {
-                Assert.assertEquals(msg, targetTenantId, checkTenantId);
+                Assertions.assertEquals(targetTenantId, checkTenantId, msg);
             } else {
-                Assert.assertNotEquals(msg, targetTenantId, checkTenantId);
+                Assertions.assertNotEquals(targetTenantId, checkTenantId, msg);
             }
         }
     }
diff --git a/rule-engine/rule-engine-components/src/test/resources/junit-platform.properties b/rule-engine/rule-engine-components/src/test/resources/junit-platform.properties
new file mode 100644
index 0000000000..f2ed301920
--- /dev/null
+++ b/rule-engine/rule-engine-components/src/test/resources/junit-platform.properties
@@ -0,0 +1,3 @@
+junit.jupiter.execution.parallel.enabled = true
+junit.jupiter.execution.parallel.mode.default = concurrent
+junit.jupiter.execution.parallel.mode.classes.default = concurrent
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/tools/pom.xml b/tools/pom.xml
index 9a2cfe21d2..38309f35b0 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.6.3-SNAPSHOT</version>
+        <version>3.7.0-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <artifactId>tools</artifactId>
diff --git a/tools/src/main/java/org/thingsboard/client/tools/migrator/DictionaryParser.java b/tools/src/main/java/org/thingsboard/client/tools/migrator/DictionaryParser.java
index d5e5081807..9bd40bfed1 100644
--- a/tools/src/main/java/org/thingsboard/client/tools/migrator/DictionaryParser.java
+++ b/tools/src/main/java/org/thingsboard/client/tools/migrator/DictionaryParser.java
@@ -40,7 +40,7 @@ public class DictionaryParser {
     }
 
     private boolean isBlockStarted(String line) {
-        return line.startsWith("COPY public.ts_kv_dictionary (");
+        return line.startsWith("COPY public.key_dictionary (");
     }
 
     private void parseDictionaryDump(LineIterator iterator) throws IOException {
diff --git a/transport/coap/pom.xml b/transport/coap/pom.xml
index 46fa896663..e894528e0b 100644
--- a/transport/coap/pom.xml
+++ b/transport/coap/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.6.3-SNAPSHOT</version>
+        <version>3.7.0-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.transport</groupId>
diff --git a/transport/coap/src/main/resources/tb-coap-transport.yml b/transport/coap/src/main/resources/tb-coap-transport.yml
index faa5f43065..17a6a53aca 100644
--- a/transport/coap/src/main/resources/tb-coap-transport.yml
+++ b/transport/coap/src/main/resources/tb-coap-transport.yml
@@ -94,6 +94,17 @@ redis:
   db: "${REDIS_DB:0}"
   # db password
   password: "${REDIS_PASSWORD:}"
+  ssl:
+    # Enable/disable secure connection
+    enabled: "${TB_REDIS_SSL_ENABLED:false}"
+    # Server SSL credentials (only PEM format is supported)
+    credentials:
+      # Path redis server (CA) certificate
+      cert_file: "${TB_REDIS_SSL_PEM_CERT:}"
+      # Path to user certificate file. This is optional for the client and can be used for two-way authentication for the client
+      user_cert_file: "${TB_REDIS_SSL_PEM_KEY:}"
+      # Path to user private key file. This is optional for the client and only needed if ‘user_cert_file’ is configured.
+      user_key_file: "${TB_REDIS_SSL_PEM_KEY_PASSWORD:}"
   # pool config
   pool_config:
     # Maximum number of connections that can be allocated by the connection pool
@@ -144,6 +155,17 @@ transport:
       # CoAP DTLS bind port
       bind_port: "${COAP_DTLS_BIND_PORT:5684}"
       # Server DTLS credentials
+      # Server DTLS credentials
+      # CoAP DTLS connection ID length. RFC 9146, Connection Identifier for DTLS 1.2
+      # Default: off
+      # Control usage of DTLS connection ID length (CID).
+      # - 'off' to deactivate it.
+      # - 'on' to activate Connection ID support (same as CID 0 or more 0).
+      # - A positive value defines generated CID size in bytes.
+      # - A value of 0 means we accept using CID but will not generate one for foreign peer (enables support but not for incoming traffic).
+      # - A value between 0 and <= 4: SingleNodeConnectionIdGenerator is used
+      # - A value that are > 4: MultiNodeConnectionIdGenerator is used
+      connection_id_length: "${COAP_DTLS_CONNECTION_ID_LENGTH:}"
       credentials:
         # Server credentials type (PEM - pem certificate file; KEYSTORE - java keystore)
         type:  "${COAP_DTLS_CREDENTIALS_TYPE:PEM}"
@@ -277,6 +299,8 @@ queue:
       transport-api: "${TB_QUEUE_KAFKA_TA_TOPIC_PROPERTIES:retention.ms:604800000;segment.bytes:26214400;retention.bytes:1048576000;partitions:10;min.insync.replicas:1}"
       # Kafka properties for Notifications topics
       notifications: "${TB_QUEUE_KAFKA_NOTIFICATIONS_TOPIC_PROPERTIES:retention.ms:604800000;segment.bytes:26214400;retention.bytes:1048576000;partitions:1;min.insync.replicas:1}"
+      # Kafka properties for Housekeeper tasks topic
+      housekeeper: "${TB_QUEUE_KAFKA_HOUSEKEEPER_TOPIC_PROPERTIES:retention.ms:604800000;segment.bytes:26214400;retention.bytes:1048576000;partitions:10;min.insync.replicas:1}"
   aws_sqs:
     # Use the default credentials provider for AWS SQS
     use_default_credential_provider_chain: "${TB_QUEUE_AWS_SQS_USE_DEFAULT_CREDENTIAL_PROVIDER_CHAIN:false}"
@@ -398,6 +422,9 @@ queue:
       enabled: "${TB_QUEUE_CORE_STATS_ENABLED:false}"
       # Statistics printing interval for Core microservices
       print-interval-ms: "${TB_QUEUE_CORE_STATS_PRINT_INTERVAL_MS:10000}"
+    housekeeper:
+      # Topic name for Housekeeper tasks
+      topic: "${TB_HOUSEKEEPER_TOPIC:tb_housekeeper}"
   js:
     # JS Eval request topic
     request_topic: "${REMOTE_JS_EVAL_REQUEST_TOPIC:js_eval.requests}"
diff --git a/transport/http/pom.xml b/transport/http/pom.xml
index 8b37976941..373518134f 100644
--- a/transport/http/pom.xml
+++ b/transport/http/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.6.3-SNAPSHOT</version>
+        <version>3.7.0-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.transport</groupId>
diff --git a/transport/http/src/main/resources/tb-http-transport.yml b/transport/http/src/main/resources/tb-http-transport.yml
index 49bf202200..4252dfac06 100644
--- a/transport/http/src/main/resources/tb-http-transport.yml
+++ b/transport/http/src/main/resources/tb-http-transport.yml
@@ -127,6 +127,17 @@ redis:
   db: "${REDIS_DB:0}"
   # db password
   password: "${REDIS_PASSWORD:}"
+  ssl:
+    # Enable/disable secure connection
+    enabled: "${TB_REDIS_SSL_ENABLED:false}"
+    # Server SSL credentials (only PEM format is supported)
+    credentials:
+      # Path redis server (CA) certificate
+      cert_file: "${TB_REDIS_SSL_PEM_CERT:}"
+      # Path to user certificate file. This is optional for the client and can be used for two-way authentication for the client
+      user_cert_file: "${TB_REDIS_SSL_PEM_KEY:}"
+      # Path to user private key file. This is optional for the client and only needed if ‘user_cert_file’ is configured.
+      user_key_file: "${TB_REDIS_SSL_PEM_KEY_PASSWORD:}"
   # pool config
   pool_config:
     # Maximum number of connections that can be allocated by the connection pool
@@ -261,6 +272,8 @@ queue:
       transport-api: "${TB_QUEUE_KAFKA_TA_TOPIC_PROPERTIES:retention.ms:604800000;segment.bytes:26214400;retention.bytes:1048576000;partitions:10;min.insync.replicas:1}"
       # Kafka properties for Notifications topics
       notifications: "${TB_QUEUE_KAFKA_NOTIFICATIONS_TOPIC_PROPERTIES:retention.ms:604800000;segment.bytes:26214400;retention.bytes:1048576000;partitions:1;min.insync.replicas:1}"
+      # Kafka properties for Housekeeper tasks topic
+      housekeeper: "${TB_QUEUE_KAFKA_HOUSEKEEPER_TOPIC_PROPERTIES:retention.ms:604800000;segment.bytes:26214400;retention.bytes:1048576000;partitions:10;min.insync.replicas:1}"
   aws_sqs:
     # Use default credentials provider for AWS SQS
     use_default_credential_provider_chain: "${TB_QUEUE_AWS_SQS_USE_DEFAULT_CREDENTIAL_PROVIDER_CHAIN:false}"
@@ -383,6 +396,9 @@ queue:
       enabled: "${TB_QUEUE_CORE_STATS_ENABLED:false}"
       # Statistics printing interval for Core microservices
       print-interval-ms: "${TB_QUEUE_CORE_STATS_PRINT_INTERVAL_MS:10000}"
+    housekeeper:
+      # Topic name for Housekeeper tasks
+      topic: "${TB_HOUSEKEEPER_TOPIC:tb_housekeeper}"
   js:
     # JS Eval request topic
     request_topic: "${REMOTE_JS_EVAL_REQUEST_TOPIC:js_eval.requests}"
diff --git a/transport/lwm2m/pom.xml b/transport/lwm2m/pom.xml
index 97e653c0cc..2540b57383 100644
--- a/transport/lwm2m/pom.xml
+++ b/transport/lwm2m/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.6.3-SNAPSHOT</version>
+        <version>3.7.0-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.transport</groupId>
diff --git a/transport/lwm2m/src/main/resources/tb-lwm2m-transport.yml b/transport/lwm2m/src/main/resources/tb-lwm2m-transport.yml
index b6dc7248ab..cf1ba51240 100644
--- a/transport/lwm2m/src/main/resources/tb-lwm2m-transport.yml
+++ b/transport/lwm2m/src/main/resources/tb-lwm2m-transport.yml
@@ -94,6 +94,17 @@ redis:
   db: "${REDIS_DB:0}"
   # db password
   password: "${REDIS_PASSWORD:}"
+  ssl:
+    # Enable/disable secure connection
+    enabled: "${TB_REDIS_SSL_ENABLED:false}"
+    # Server SSL credentials (only PEM format is supported)
+    credentials:
+      # Path redis server (CA) certificate
+      cert_file: "${TB_REDIS_SSL_PEM_CERT:}"
+      # Path to user certificate file. This is optional for the client and can be used for two-way authentication for the client
+      user_cert_file: "${TB_REDIS_SSL_PEM_KEY:}"
+      # Path to user private key file. This is optional for the client and only needed if ‘user_cert_file’ is configured.
+      user_key_file: "${TB_REDIS_SSL_PEM_KEY_PASSWORD:}"
   # pool config
   pool_config:
     # Maximum number of connections that can be allocated by the connection pool
@@ -155,8 +166,16 @@ transport:
     dtls:
       # RFC7925_RETRANSMISSION_TIMEOUT_IN_MILLISECONDS = 9000
       retransmission_timeout: "${LWM2M_DTLS_RETRANSMISSION_TIMEOUT_MS:9000}"
-      # "" disables connection id support, 0 enables support but not for incoming traffic, any value greater than 0 set the connection id size in bytes
-      connection_id_length: "${LWM2M_DTLS_CONNECTION_ID_LENGTH:6}"
+      # CoAP DTLS connection ID length for LWM2M. RFC 9146, Connection Identifier for DTLS 1.2
+      # Default: off
+      # Control usage of DTLS connection ID length (CID).
+      # - 'off' to deactivate it.
+      # - 'on' to activate Connection ID support (same as CID 0 or more 0).
+      # - A positive value defines generated CID size in bytes.
+      # - A value of 0 means we accept using CID but will not generate one for foreign peer (enables support but not for incoming traffic).
+      # - A value between 0 and <= 4: SingleNodeConnectionIdGenerator is used
+      # - A value that are > 4: MultiNodeConnectionIdGenerator is used
+      connection_id_length: "${LWM2M_DTLS_CONNECTION_ID_LENGTH:}"
     server:
       # LwM2M Server ID
       id: "${LWM2M_SERVER_ID:123}"
@@ -358,6 +377,8 @@ queue:
       transport-api: "${TB_QUEUE_KAFKA_TA_TOPIC_PROPERTIES:retention.ms:604800000;segment.bytes:26214400;retention.bytes:1048576000;partitions:10;min.insync.replicas:1}"
       # Kafka properties for Notifications topics
       notifications: "${TB_QUEUE_KAFKA_NOTIFICATIONS_TOPIC_PROPERTIES:retention.ms:604800000;segment.bytes:26214400;retention.bytes:1048576000;partitions:1;min.insync.replicas:1}"
+      # Kafka properties for Housekeeper tasks topic
+      housekeeper: "${TB_QUEUE_KAFKA_HOUSEKEEPER_TOPIC_PROPERTIES:retention.ms:604800000;segment.bytes:26214400;retention.bytes:1048576000;partitions:10;min.insync.replicas:1}"
   aws_sqs:
     # Use the default credentials provider for AWS SQS
     use_default_credential_provider_chain: "${TB_QUEUE_AWS_SQS_USE_DEFAULT_CREDENTIAL_PROVIDER_CHAIN:false}"
@@ -477,6 +498,9 @@ queue:
       enabled: "${TB_QUEUE_CORE_STATS_ENABLED:false}"
       # Statistics printing interval for Core microservices
       print-interval-ms: "${TB_QUEUE_CORE_STATS_PRINT_INTERVAL_MS:10000}"
+    housekeeper:
+      # Topic name for Housekeeper tasks
+      topic: "${TB_HOUSEKEEPER_TOPIC:tb_housekeeper}"
   js:
     # JS Eval request topic
     request_topic: "${REMOTE_JS_EVAL_REQUEST_TOPIC:js_eval.requests}"
diff --git a/transport/mqtt/pom.xml b/transport/mqtt/pom.xml
index 94e7b5129c..47fa56d50e 100644
--- a/transport/mqtt/pom.xml
+++ b/transport/mqtt/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.6.3-SNAPSHOT</version>
+        <version>3.7.0-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.transport</groupId>
diff --git a/transport/mqtt/src/main/resources/tb-mqtt-transport.yml b/transport/mqtt/src/main/resources/tb-mqtt-transport.yml
index 55223caf4e..d210138852 100644
--- a/transport/mqtt/src/main/resources/tb-mqtt-transport.yml
+++ b/transport/mqtt/src/main/resources/tb-mqtt-transport.yml
@@ -95,6 +95,17 @@ redis:
   db: "${REDIS_DB:0}"
   # db password
   password: "${REDIS_PASSWORD:}"
+  ssl:
+    # Enable/disable secure connection
+    enabled: "${TB_REDIS_SSL_ENABLED:false}"
+    # Server SSL credentials (only PEM format is supported)
+    credentials:
+      # Path redis server (CA) certificate
+      cert_file: "${TB_REDIS_SSL_PEM_CERT:}"
+      # Path to user certificate file. This is optional for the client and can be used for two-way authentication for the client
+      user_cert_file: "${TB_REDIS_SSL_PEM_KEY:}"
+      # Path to user private key file. This is optional for the client and only needed if ‘user_cert_file’ is configured.
+      user_key_file: "${TB_REDIS_SSL_PEM_KEY_PASSWORD:}"
   # pool config
   pool_config:
     # Maximum number of connections that can be allocated by the connection pool
@@ -293,6 +304,8 @@ queue:
       transport-api: "${TB_QUEUE_KAFKA_TA_TOPIC_PROPERTIES:retention.ms:604800000;segment.bytes:26214400;retention.bytes:1048576000;partitions:10;min.insync.replicas:1}"
       # Kafka properties for Notifications topics
       notifications: "${TB_QUEUE_KAFKA_NOTIFICATIONS_TOPIC_PROPERTIES:retention.ms:604800000;segment.bytes:26214400;retention.bytes:1048576000;partitions:1;min.insync.replicas:1}"
+      # Kafka properties for Housekeeper tasks topic
+      housekeeper: "${TB_QUEUE_KAFKA_HOUSEKEEPER_TOPIC_PROPERTIES:retention.ms:604800000;segment.bytes:26214400;retention.bytes:1048576000;partitions:10;min.insync.replicas:1}"
   aws_sqs:
     # Use the default credentials provider for AWS SQS
     use_default_credential_provider_chain: "${TB_QUEUE_AWS_SQS_USE_DEFAULT_CREDENTIAL_PROVIDER_CHAIN:false}"
@@ -414,6 +427,9 @@ queue:
       enabled: "${TB_QUEUE_CORE_STATS_ENABLED:false}"
       # Statistics printing interval for Core microservices
       print-interval-ms: "${TB_QUEUE_CORE_STATS_PRINT_INTERVAL_MS:10000}"
+    housekeeper:
+      # Topic name for Housekeeper tasks
+      topic: "${TB_HOUSEKEEPER_TOPIC:tb_housekeeper}"
   js:
     # JS Eval request topic
     request_topic: "${REMOTE_JS_EVAL_REQUEST_TOPIC:js_eval.requests}"
diff --git a/transport/pom.xml b/transport/pom.xml
index ac9858e2da..49009b83b0 100644
--- a/transport/pom.xml
+++ b/transport/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.6.3-SNAPSHOT</version>
+        <version>3.7.0-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <artifactId>transport</artifactId>
diff --git a/transport/snmp/pom.xml b/transport/snmp/pom.xml
index d7a0096a09..5f236adb9a 100644
--- a/transport/snmp/pom.xml
+++ b/transport/snmp/pom.xml
@@ -21,7 +21,7 @@
 
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.6.3-SNAPSHOT</version>
+        <version>3.7.0-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
 
diff --git a/transport/snmp/src/main/resources/tb-snmp-transport.yml b/transport/snmp/src/main/resources/tb-snmp-transport.yml
index a40374e1f6..76f6abdb61 100644
--- a/transport/snmp/src/main/resources/tb-snmp-transport.yml
+++ b/transport/snmp/src/main/resources/tb-snmp-transport.yml
@@ -94,6 +94,17 @@ redis:
   db: "${REDIS_DB:0}"
   # db password
   password: "${REDIS_PASSWORD:}"
+  ssl:
+    # Enable/disable secure connection
+    enabled: "${TB_REDIS_SSL_ENABLED:false}"
+    # Server SSL credentials (only PEM format is supported)
+    credentials:
+      # Path redis server (CA) certificate
+      cert_file: "${TB_REDIS_SSL_PEM_CERT:}"
+      # Path to user certificate file. This is optional for the client and can be used for two-way authentication for the client
+      user_cert_file: "${TB_REDIS_SSL_PEM_KEY:}"
+      # Path to user private key file. This is optional for the client and only needed if ‘user_cert_file’ is configured.
+      user_key_file: "${TB_REDIS_SSL_PEM_KEY_PASSWORD:}"
   # pool config
   pool_config:
     # Maximum number of connections that can be allocated by the connection pool
@@ -243,6 +254,8 @@ queue:
       transport-api: "${TB_QUEUE_KAFKA_TA_TOPIC_PROPERTIES:retention.ms:604800000;segment.bytes:26214400;retention.bytes:1048576000;partitions:10;min.insync.replicas:1}"
       # Kafka properties for Notifications topics
       notifications: "${TB_QUEUE_KAFKA_NOTIFICATIONS_TOPIC_PROPERTIES:retention.ms:604800000;segment.bytes:26214400;retention.bytes:1048576000;partitions:1;min.insync.replicas:1}"
+      # Kafka properties for Housekeeper tasks topic
+      housekeeper: "${TB_QUEUE_KAFKA_HOUSEKEEPER_TOPIC_PROPERTIES:retention.ms:604800000;segment.bytes:26214400;retention.bytes:1048576000;partitions:10;min.insync.replicas:1}"
     consumer-stats:
       # Prints lag between consumer group offset and last messages offset in Kafka topics
       enabled: "${TB_QUEUE_KAFKA_CONSUMER_STATS_ENABLED:true}"
@@ -371,6 +384,9 @@ queue:
       enabled: "${TB_QUEUE_CORE_STATS_ENABLED:false}"
       # Statistics printing interval for Core microservices
       print-interval-ms: "${TB_QUEUE_CORE_STATS_PRINT_INTERVAL_MS:10000}"
+    housekeeper:
+      # Topic name for Housekeeper tasks
+      topic: "${TB_HOUSEKEEPER_TOPIC:tb_housekeeper}"
   js:
     # JS Eval request topic
     request_topic: "${REMOTE_JS_EVAL_REQUEST_TOPIC:js_eval.requests}"
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 ab60ebd525..b8a8e4c9a9 100644
--- a/ui-ngx/package.json
+++ b/ui-ngx/package.json
@@ -1,6 +1,6 @@
 {
   "name": "thingsboard",
-  "version": "3.6.3",
+  "version": "3.7.0",
   "scripts": {
     "ng": "ng",
     "start": "node --max_old_space_size=8048 ./node_modules/@angular/cli/bin/ng serve --configuration development --host 0.0.0.0 --open",
@@ -14,23 +14,23 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^15.2.9",
+    "@angular/animations": "^15.2.10",
     "@angular/cdk": "^15.2.9",
-    "@angular/common": "^15.2.9",
-    "@angular/compiler": "^15.2.9",
-    "@angular/core": "^15.2.9",
+    "@angular/common": "^15.2.10",
+    "@angular/compiler": "^15.2.10",
+    "@angular/core": "^15.2.10",
     "@angular/flex-layout": "^15.0.0-beta.42",
-    "@angular/forms": "^15.2.9",
+    "@angular/forms": "^15.2.10",
     "@angular/material": "^15.2.9",
-    "@angular/platform-browser": "^15.2.9",
-    "@angular/platform-browser-dynamic": "^15.2.9",
-    "@angular/router": "^15.2.9",
+    "@angular/platform-browser": "^15.2.10",
+    "@angular/platform-browser-dynamic": "^15.2.10",
+    "@angular/router": "^15.2.10",
     "@auth0/angular-jwt": "^5.1.2",
     "@date-io/core": "1.3.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,23 +54,23 @@
     "core-js": "^3.29.1",
     "date-fns": "2.0.0-alpha.27",
     "dayjs": "1.11.4",
-    "echarts": "^5.4.3",
+    "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",
     "html2canvas": "^1.4.1",
     "jquery": "^3.6.3",
     "jquery.terminal": "^2.35.3",
-    "js-beautify": "^1.14.7",
+    "js-beautify": "1.14.7",
     "json-schema-defaults": "^0.4.0",
     "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",
@@ -112,16 +111,16 @@
   },
   "devDependencies": {
     "@angular-builders/custom-webpack": "~15.0.0",
-    "@angular-devkit/build-angular": "^15.2.8",
+    "@angular-devkit/build-angular": "^15.2.10",
     "@angular-eslint/builder": "15.2.1",
     "@angular-eslint/eslint-plugin": "15.2.1",
     "@angular-eslint/eslint-plugin-template": "15.2.1",
     "@angular-eslint/schematics": "15.2.1",
     "@angular-eslint/template-parser": "15.2.1",
-    "@angular/cli": "^15.2.8",
-    "@angular/compiler-cli": "^15.2.9",
-    "@angular/language-service": "^15.2.9",
-    "@ngtools/webpack": "15.2.1",
+    "@angular/cli": "^15.2.10",
+    "@angular/compiler-cli": "^15.2.10",
+    "@angular/language-service": "^15.2.10",
+    "@ngtools/webpack": "15.2.10",
     "@types/ace-diff": "^2.1.1",
     "@types/canvas-gauges": "^2.1.4",
     "@types/flot": "^0.0.32",
@@ -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",
@@ -166,11 +165,14 @@
     "raw-loader": "^4.0.2",
     "ts-node": "^10.9.1",
     "typescript": "~4.9.5",
-    "webpack": "^5.77.0"
+    "webpack": "5.77.0"
   },
   "resolutions": {
     "@types/react": "17.0.37",
     "ace-builds": "1.4.13",
-    "@date-io/core": "1.3.7"
+    "@date-io/core": "1.3.7",
+    "rc-virtual-list": "3.4.13",
+    "read-package-json": "6.0.0",
+    "cacache": "17.0.4"
   }
 }
diff --git a/ui-ngx/patches/@angular+core+15.2.9.patch b/ui-ngx/patches/@angular+core+15.2.10.patch
similarity index 97%
rename from ui-ngx/patches/@angular+core+15.2.9.patch
rename to ui-ngx/patches/@angular+core+15.2.10.patch
index 3797e6b48c..3265415263 100644
--- a/ui-ngx/patches/@angular+core+15.2.9.patch
+++ b/ui-ngx/patches/@angular+core+15.2.10.patch
@@ -1,5 +1,5 @@
 diff --git a/node_modules/@angular/core/fesm2020/core.mjs b/node_modules/@angular/core/fesm2020/core.mjs
-index 3e93015..9efcb96 100755
+index e9a9b75..17044d9 100755
 --- a/node_modules/@angular/core/fesm2020/core.mjs
 +++ b/node_modules/@angular/core/fesm2020/core.mjs
 @@ -11053,13 +11053,13 @@ function findDirectiveDefMatches(tView, tNode) {
diff --git a/ui-ngx/pom.xml b/ui-ngx/pom.xml
index a13d364052..c8b50c4149 100644
--- a/ui-ngx/pom.xml
+++ b/ui-ngx/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.6.3-SNAPSHOT</version>
+        <version>3.7.0-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <groupId>org.thingsboard</groupId>
@@ -56,7 +56,7 @@
                             <goal>install-node-and-yarn</goal>
                         </goals>
                         <configuration>
-                            <nodeVersion>v16.20.2</nodeVersion>
+                            <nodeVersion>v20.11.1</nodeVersion>
                             <yarnVersion>v1.22.17</yarnVersion>
                         </configuration>
                     </execution>
@@ -66,7 +66,7 @@
                             <goal>yarn</goal>
                         </goals>
                         <configuration>
-                            <arguments>install</arguments>
+                            <arguments>install --non-interactive --network-concurrency 4 --network-timeout 100000 --mutex network</arguments>
                         </configuration>
                     </execution>
                 </executions>
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 c11c08ad2b..5bce9115e8 100644
--- a/ui-ngx/src/app/core/api/data-aggregator.ts
+++ b/ui-ngx/src/app/core/api/data-aggregator.ts
@@ -14,24 +14,23 @@
 /// limitations under the License.
 ///
 
+import { AggKey, IndexedSubscriptionData, } from '@app/shared/models/telemetry/telemetry.models';
 import {
-  AggKey,
-  IndexedSubscriptionData,
-} from '@app/shared/models/telemetry/telemetry.models';
-import {
-  AggregationType, calculateAggIntervalWithSubscriptionTimeWindow,
+  AggregationType,
+  calculateAggIntervalWithSubscriptionTimeWindow,
   calculateIntervalComparisonEndTime,
   calculateIntervalEndTime,
   calculateIntervalStartEndTime,
   getCurrentTime,
-  getTime, IntervalMath,
+  getTime,
+  IntervalMath,
   SubscriptionTimewindow
 } from '@shared/models/time/time.models';
 import { UtilsService } from '@core/services/utils.service';
 import { deepClone, isDefinedAndNotNull, isNumber, isNumeric } from '@core/utils';
-import Timeout = NodeJS.Timeout;
 import { DataEntry, DataSet, IndexedData } from '@shared/models/widget.models';
 import BTree from 'sorted-btree';
+import Timeout = NodeJS.Timeout;
 
 export declare type onAggregatedData = (data: IndexedData, detectChanges: boolean) => void;
 
@@ -318,7 +317,9 @@ export class DataAggregator {
           this.startTs += tickTs;
           this.endTs += tickTs;
         }
-        this.updateLastInterval();
+        if (this.subsTw.aggregation.type !== AggregationType.NONE) {
+          this.updateLastInterval();
+        }
         this.data = this.updateData();
         this.elapsed = this.elapsed - delta * this.aggregationTimeout;
       }
@@ -377,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) {
@@ -397,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 ff16af7740..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,
@@ -61,9 +61,8 @@ import {
   deepClone,
   flatFormattedData,
   formattedDataFormDatasourceData,
-  isDefined,
   isDefinedAndNotNull,
-  isEqual,
+  isEqual, isUndefined,
   parseHttpErrorMessage
 } from '@core/utils';
 import { EntityId } from '@app/shared/models/id/entity-id';
@@ -355,7 +354,7 @@ export class WidgetSubscription implements IWidgetSubscription {
       }
 
       this.units = options.units || '';
-      this.decimals = isDefined(options.decimals) ? options.decimals : 2;
+      this.decimals = isDefinedAndNotNull(options.decimals) ? options.decimals : 2;
 
       this.loadingData = false;
 
@@ -514,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;
@@ -1469,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;
             });
           }
         });
@@ -1491,7 +1491,8 @@ export class WidgetSubscription implements IWidgetSubscription {
     let datasourceDataArray: Array<DatasourceData> = [];
     datasourceDataArray = datasourceDataArray.concat(datasource.dataKeys.map((dataKey, keyIndex) => {
       dataKey.hidden = !!dataKey.settings.hideDataByDefault;
-      dataKey.inLegend = !dataKey.settings.removeFromLegend;
+      dataKey.inLegend = dataKey.settings.showInLegend ||
+        (isUndefined(dataKey.settings.showInLegend) && !dataKey.settings.removeFromLegend);
       dataKey.label = this.ctx.utils.customTranslation(dataKey.label, dataKey.label);
       const datasourceData: DatasourceData = {
         datasource,
@@ -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..032197057e 100644
--- a/ui-ngx/src/app/core/core.module.ts
+++ b/ui-ngx/src/app/core/core.module.ts
@@ -16,7 +16,7 @@
 
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { HTTP_INTERCEPTORS, HttpClient, HttpClientModule } from '@angular/common/http';
+import { HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http';
 import { StoreModule } from '@ngrx/store';
 import { EffectsModule } from '@ngrx/effects';
 import { StoreDevtoolsModule } from '@ngrx/store-devtools';
@@ -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,10 +40,7 @@ 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';
-
-export function HttpLoaderFactory(http: HttpClient) {
-  return new TranslateHttpLoader(http, './assets/locale/locale.constant-', '.json');
-}
+import { TranslateDefaultLoader } from '@core/translate/translate-default-loader';
 
 @NgModule({
   imports: [
@@ -59,8 +55,7 @@ export function HttpLoaderFactory(http: HttpClient) {
     TranslateModule.forRoot({
       loader: {
         provide: TranslateLoader,
-        useFactory: HttpLoaderFactory,
-        deps: [HttpClient]
+        useClass: TranslateDefaultLoader
       },
       missingTranslationHandler: {
         provide: MissingTranslationHandler,
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..8777cc9780 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);
         }
@@ -765,6 +766,8 @@ export class EntityService {
         entityFieldKeys.push(entityFields.firstName.keyName);
         entityFieldKeys.push(entityFields.lastName.keyName);
         entityFieldKeys.push(entityFields.phone.keyName);
+        entityFieldKeys.push(entityFields.ownerName.keyName);
+        entityFieldKeys.push(entityFields.ownerType.keyName);
         break;
       case EntityType.TENANT:
       case EntityType.CUSTOMER:
@@ -781,6 +784,8 @@ export class EntityService {
       case EntityType.ENTITY_VIEW:
         entityFieldKeys.push(entityFields.name.keyName);
         entityFieldKeys.push(entityFields.type.keyName);
+        entityFieldKeys.push(entityFields.ownerName.keyName);
+        entityFieldKeys.push(entityFields.ownerType.keyName);
         break;
       case EntityType.DEVICE:
       case EntityType.EDGE:
@@ -788,13 +793,21 @@ export class EntityService {
         entityFieldKeys.push(entityFields.name.keyName);
         entityFieldKeys.push(entityFields.type.keyName);
         entityFieldKeys.push(entityFields.label.keyName);
+        entityFieldKeys.push(entityFields.ownerName.keyName);
+        entityFieldKeys.push(entityFields.ownerType.keyName);
         break;
       case EntityType.DASHBOARD:
         entityFieldKeys.push(entityFields.title.keyName);
+        entityFieldKeys.push(entityFields.ownerName.keyName);
+        entityFieldKeys.push(entityFields.ownerType.keyName);
         break;
       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/dialog.service.ts b/ui-ngx/src/app/core/services/dialog.service.ts
index 011a21987f..8a2de4a694 100644
--- a/ui-ngx/src/app/core/services/dialog.service.ts
+++ b/ui-ngx/src/app/core/services/dialog.service.ts
@@ -21,22 +21,25 @@ import { TranslateService } from '@ngx-translate/core';
 import { AuthService } from '@core/auth/auth.service';
 import {
   ColorPickerDialogComponent,
-  ColorPickerDialogData, ColorPickerDialogResult
+  ColorPickerDialogData,
+  ColorPickerDialogResult
 } from '@shared/components/dialog/color-picker-dialog.component';
 import {
   MaterialIconsDialogComponent,
-  MaterialIconsDialogData, MaterialIconsDialogResult
+  MaterialIconsDialogData,
+  MaterialIconsDialogResult
 } from '@shared/components/dialog/material-icons-dialog.component';
-import { ConfirmDialogComponent } from '@shared/components/dialog/confirm-dialog.component';
-import { AlertDialogComponent } from '@shared/components/dialog/alert-dialog.component';
-import { ErrorAlertDialogComponent } from '@shared/components/dialog/error-alert-dialog.component';
+import { ConfirmDialogComponent, ConfirmDialogData } from '@shared/components/dialog/confirm-dialog.component';
+import { AlertDialogComponent, AlertDialogData } from '@shared/components/dialog/alert-dialog.component';
+import {
+  ErrorAlertDialogComponent,
+  ErrorAlertDialogData
+} from '@shared/components/dialog/error-alert-dialog.component';
 import { TodoDialogComponent } from '@shared/components/dialog/todo-dialog.component';
 
-@Injectable(
-  {
-    providedIn: 'root'
-  }
-)
+@Injectable({
+  providedIn: 'root'
+})
 export class DialogService {
 
   constructor(
@@ -47,7 +50,7 @@ export class DialogService {
   }
 
   confirm(title: string, message: string, cancel: string = null, ok: string = null, fullscreen: boolean = false): Observable<boolean> {
-    const dialogConfig: MatDialogConfig = {
+    const dialogConfig: MatDialogConfig<ConfirmDialogData> = {
       disableClose: true,
       data: {
         title,
@@ -59,12 +62,12 @@ export class DialogService {
     if (fullscreen) {
       dialogConfig.panelClass = ['tb-fullscreen-dialog'];
     }
-    const dialogRef = this.dialog.open(ConfirmDialogComponent, dialogConfig);
+    const dialogRef = this.dialog.open<ConfirmDialogComponent, ConfirmDialogData, boolean>(ConfirmDialogComponent, dialogConfig);
     return dialogRef.afterClosed();
   }
 
   alert(title: string, message: string, ok: string = null, fullscreen: boolean = false): Observable<boolean> {
-    const dialogConfig: MatDialogConfig = {
+    const dialogConfig: MatDialogConfig<AlertDialogData> = {
       disableClose: true,
       data: {
         title,
@@ -75,12 +78,12 @@ export class DialogService {
     if (fullscreen) {
       dialogConfig.panelClass = ['tb-fullscreen-dialog'];
     }
-    const dialogRef = this.dialog.open(AlertDialogComponent, dialogConfig);
+    const dialogRef = this.dialog.open<AlertDialogComponent, AlertDialogData, boolean>(AlertDialogComponent, dialogConfig);
     return dialogRef.afterClosed();
   }
 
-  errorAlert(title: string, message: string, error: any, ok: string = null, fullscreen: boolean = false): Observable<any> {
-    const dialogConfig: MatDialogConfig = {
+  errorAlert(title: string, message: string, error: any, ok: string = null, fullscreen: boolean = false): Observable<boolean> {
+    const dialogConfig: MatDialogConfig<ErrorAlertDialogData> = {
       disableClose: true,
       data: {
         title,
@@ -92,7 +95,7 @@ export class DialogService {
     if (fullscreen) {
       dialogConfig.panelClass = ['tb-fullscreen-dialog'];
     }
-    const dialogRef = this.dialog.open(ErrorAlertDialogComponent, dialogConfig);
+    const dialogRef = this.dialog.open<ErrorAlertDialogComponent, ErrorAlertDialogData, boolean>(ErrorAlertDialogComponent, dialogConfig);
     return dialogRef.afterClosed();
   }
 
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..3730878237 100644
--- a/ui-ngx/src/app/core/settings/settings.utils.ts
+++ b/ui-ngx/src/app/core/settings/settings.utils.ts
@@ -17,8 +17,9 @@
 import { environment as env } from '@env/environment';
 import { TranslateService } from '@ngx-translate/core';
 import * as _moment from 'moment';
+import { Observable } from 'rxjs';
 
-export function updateUserLang(translate: TranslateService, userLang: string) {
+export function updateUserLang(translate: TranslateService, userLang: string, translations = env.supportedLangs): Observable<any> {
   let targetLang = userLang;
   if (!env.production) {
     console.log(`User lang: ${targetLang}`);
@@ -29,18 +30,18 @@ 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}`);
   }
-  translate.use(detectedSupportedLang);
   _moment.locale([detectedSupportedLang]);
+  return translate.use(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 +51,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..a64ef48da0
--- /dev/null
+++ b/ui-ngx/src/app/core/translate/translate-default-loader.ts
@@ -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.
+///
+
+import { TranslateLoader } from '@ngx-translate/core';
+import { Observable } from 'rxjs';
+import { HttpClient } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+
+@Injectable({ providedIn: 'root' })
+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/add-widget-dialog.component.ts b/ui-ngx/src/app/modules/home/components/dashboard-page/add-widget-dialog.component.ts
index 0d02fc956f..2089c03d5d 100644
--- a/ui-ngx/src/app/modules/home/components/dashboard-page/add-widget-dialog.component.ts
+++ b/ui-ngx/src/app/modules/home/components/dashboard-page/add-widget-dialog.component.ts
@@ -29,6 +29,7 @@ import { WidgetConfigComponentData, WidgetInfo } from '@home/models/widget-compo
 import { isDefined, isDefinedAndNotNull, isString } from '@core/utils';
 import { TranslateService } from '@ngx-translate/core';
 import { WidgetConfigComponent } from '@home/components/widget/widget-config.component';
+import { DataKeySettingsFunction } from '@home/components/widget/config/data-keys.component.models';
 
 export interface AddWidgetDialogData {
   dashboard: Dashboard;
@@ -97,6 +98,7 @@ export class AddWidgetDialogComponent extends DialogComponent<AddWidgetDialogCom
     const rawDataKeySettingsSchema = widgetInfo.typeDataKeySettingsSchema || widgetInfo.dataKeySettingsSchema;
     const rawLatestDataKeySettingsSchema = widgetInfo.typeLatestDataKeySettingsSchema || widgetInfo.latestDataKeySettingsSchema;
     const typeParameters = widgetInfo.typeParameters;
+    const dataKeySettingsFunction: DataKeySettingsFunction = typeParameters?.dataKeySettingsFunction;
     const actionSources = widgetInfo.actionSources;
     const isDataEnabled = isDefined(widgetInfo.typeParameters) ? !widgetInfo.typeParameters.useCustomDatasources : true;
     let settingsSchema;
@@ -129,6 +131,7 @@ export class AddWidgetDialogComponent extends DialogComponent<AddWidgetDialogCom
       settingsSchema,
       dataKeySettingsSchema,
       latestDataKeySettingsSchema,
+      dataKeySettingsFunction,
       settingsDirective: widgetInfo.settingsDirective,
       dataKeySettingsDirective: widgetInfo.dataKeySettingsDirective,
       latestDataKeySettingsDirective: widgetInfo.latestDataKeySettingsDirective,
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/dashboard-page/edit-widget.component.ts b/ui-ngx/src/app/modules/home/components/dashboard-page/edit-widget.component.ts
index fbd16bf54c..feb6230d93 100644
--- a/ui-ngx/src/app/modules/home/components/dashboard-page/edit-widget.component.ts
+++ b/ui-ngx/src/app/modules/home/components/dashboard-page/edit-widget.component.ts
@@ -27,6 +27,7 @@ import { WidgetConfigComponentData } from '../../models/widget-component.models'
 import { isDefined, isDefinedAndNotNull, isString } from '@core/utils';
 import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
 import { WidgetConfigComponent } from '@home/components/widget/widget-config.component';
+import { DataKeySettingsFunction } from '@home/components/widget/config/data-keys.component.models';
 
 @Component({
   selector: 'tb-edit-widget',
@@ -133,6 +134,7 @@ export class EditWidgetComponent extends PageComponent implements OnInit, OnChan
     const rawDataKeySettingsSchema = widgetInfo.typeDataKeySettingsSchema || widgetInfo.dataKeySettingsSchema;
     const rawLatestDataKeySettingsSchema = widgetInfo.typeLatestDataKeySettingsSchema || widgetInfo.latestDataKeySettingsSchema;
     const typeParameters = widgetInfo.typeParameters;
+    const dataKeySettingsFunction: DataKeySettingsFunction = typeParameters?.dataKeySettingsFunction;
     const actionSources = widgetInfo.actionSources;
     const isDataEnabled = isDefined(widgetInfo.typeParameters) ? !widgetInfo.typeParameters.useCustomDatasources : true;
     let settingsSchema;
@@ -165,6 +167,7 @@ export class EditWidgetComponent extends PageComponent implements OnInit, OnChan
       settingsSchema,
       dataKeySettingsSchema,
       latestDataKeySettingsSchema,
+      dataKeySettingsFunction,
       settingsDirective: widgetInfo.settingsDirective,
       dataKeySettingsDirective: widgetInfo.dataKeySettingsDirective,
       latestDataKeySettingsDirective: widgetInfo.latestDataKeySettingsDirective,
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/profile/device/lwm2m/lwm2m-profile-config.models.ts b/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-profile-config.models.ts
index efcd3e7bb7..e5c292ef0a 100644
--- a/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-profile-config.models.ts
+++ b/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-profile-config.models.ts
@@ -25,7 +25,7 @@ export const ATTRIBUTE = 'attribute';
 export const TELEMETRY = 'telemetry';
 export const KEY_NAME = 'keyName';
 export const DEFAULT_ID_SERVER = 123;
-export const DEFAULT_ID_BOOTSTRAP = 111;
+export const DEFAULT_ID_BOOTSTRAP = 0;
 export const DEFAULT_LOCAL_HOST_NAME = 'localhost';
 export const DEFAULT_PORT_SERVER_NO_SEC = 5685;
 export const DEFAULT_PORT_BOOTSTRAP_NO_SEC = 5687;
diff --git a/ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.html b/ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.html
index 867cd74f3b..ef024fe0a2 100644
--- a/ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.html
+++ b/ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.html
@@ -571,6 +571,14 @@
                           [type]="rateLimitsType.EDGE_EVENTS_PER_EDGE_RATE_LIMIT">
           </tb-rate-limits>
         </div>
+        <div fxFlex fxLayout="row" fxLayout.xs="column" fxLayoutGap.gt-xs="16px">
+          <tb-rate-limits fxFlex="50" formControlName="edgeUplinkMessagesRateLimits"
+                          [type]="rateLimitsType.EDGE_UPLINK_MESSAGES_RATE_LIMIT">
+          </tb-rate-limits>
+          <tb-rate-limits fxFlex="50" formControlName="edgeUplinkMessagesRateLimitsPerEdge"
+                          [type]="rateLimitsType.EDGE_UPLINK_MESSAGES_PER_EDGE_RATE_LIMIT">
+          </tb-rate-limits>
+        </div>
       </ng-template>
     </mat-expansion-panel>
   </fieldset>
diff --git a/ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.ts b/ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.ts
index 0c95324d85..c13eed9c03 100644
--- a/ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.ts
+++ b/ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.ts
@@ -108,7 +108,9 @@ export class DefaultTenantProfileConfigurationComponent implements ControlValueA
       wsUpdatesPerSessionRateLimit: [null, []],
       cassandraQueryTenantRateLimitsConfiguration: [null, []],
       edgeEventRateLimits: [null, []],
-      edgeEventRateLimitsPerEdge: [null, []]
+      edgeEventRateLimitsPerEdge: [null, []],
+      edgeUplinkMessagesRateLimits: [null, []],
+      edgeUplinkMessagesRateLimitsPerEdge: [null, []]
     });
 
     this.defaultTenantProfileConfigurationFormGroup.get('smsEnabled').valueChanges.pipe(
diff --git a/ui-ngx/src/app/modules/home/components/profile/tenant/rate-limits/rate-limits.models.ts b/ui-ngx/src/app/modules/home/components/profile/tenant/rate-limits/rate-limits.models.ts
index 8924682aa1..ee13ea9b23 100644
--- a/ui-ngx/src/app/modules/home/components/profile/tenant/rate-limits/rate-limits.models.ts
+++ b/ui-ngx/src/app/modules/home/components/profile/tenant/rate-limits/rate-limits.models.ts
@@ -37,7 +37,9 @@ export enum RateLimitsType {
   TENANT_NOTIFICATION_REQUEST_RATE_LIMIT = 'TENANT_NOTIFICATION_REQUEST_RATE_LIMIT',
   TENANT_NOTIFICATION_REQUESTS_PER_RULE_RATE_LIMIT = 'TENANT_NOTIFICATION_REQUESTS_PER_RULE_RATE_LIMIT',
   EDGE_EVENTS_RATE_LIMIT = 'EDGE_EVENTS_RATE_LIMIT',
-  EDGE_EVENTS_PER_EDGE_RATE_LIMIT = 'EDGE_EVENTS_PER_EDGE_RATE_LIMIT'
+  EDGE_EVENTS_PER_EDGE_RATE_LIMIT = 'EDGE_EVENTS_PER_EDGE_RATE_LIMIT',
+  EDGE_UPLINK_MESSAGES_RATE_LIMIT = 'EDGE_UPLINK_MESSAGES_RATE_LIMIT',
+  EDGE_UPLINK_MESSAGES_PER_EDGE_RATE_LIMIT = 'EDGE_UPLINK_MESSAGES_PER_EDGE_RATE_LIMIT'
 }
 
 export const rateLimitsLabelTranslationMap = new Map<RateLimitsType, string>(
@@ -58,6 +60,8 @@ export const rateLimitsLabelTranslationMap = new Map<RateLimitsType, string>(
     [RateLimitsType.TENANT_NOTIFICATION_REQUESTS_PER_RULE_RATE_LIMIT, 'tenant-profile.tenant-notification-requests-per-rule-rate-limit'],
     [RateLimitsType.EDGE_EVENTS_RATE_LIMIT, 'tenant-profile.rate-limits.edge-events-rate-limit'],
     [RateLimitsType.EDGE_EVENTS_PER_EDGE_RATE_LIMIT, 'tenant-profile.rate-limits.edge-events-per-edge-rate-limit'],
+    [RateLimitsType.EDGE_UPLINK_MESSAGES_RATE_LIMIT, 'tenant-profile.rate-limits.edge-uplink-messages-rate-limit'],
+    [RateLimitsType.EDGE_UPLINK_MESSAGES_PER_EDGE_RATE_LIMIT, 'tenant-profile.rate-limits.edge-uplink-messages-per-edge-rate-limit'],
   ]
 );
 
@@ -79,6 +83,8 @@ export const rateLimitsDialogTitleTranslationMap = new Map<RateLimitsType, strin
     [RateLimitsType.TENANT_NOTIFICATION_REQUESTS_PER_RULE_RATE_LIMIT, 'tenant-profile.rate-limits.edit-tenant-notification-requests-per-rule-rate-limit-title'],
     [RateLimitsType.EDGE_EVENTS_RATE_LIMIT, 'tenant-profile.rate-limits.edit-edge-events-rate-limit'],
     [RateLimitsType.EDGE_EVENTS_PER_EDGE_RATE_LIMIT, 'tenant-profile.rate-limits.edit-edge-events-per-edge-rate-limit'],
+    [RateLimitsType.EDGE_UPLINK_MESSAGES_RATE_LIMIT, 'tenant-profile.rate-limits.edit-edge-uplink-messages-rate-limit'],
+    [RateLimitsType.EDGE_UPLINK_MESSAGES_PER_EDGE_RATE_LIMIT, 'tenant-profile.rate-limits.edit-edge-uplink-messages-per-edge-rate-limit'],
   ]
 );
 
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/action/widget-action-dialog.component.ts b/ui-ngx/src/app/modules/home/components/widget/action/widget-action-dialog.component.ts
index b10085c294..2c7f94b8d5 100644
--- a/ui-ngx/src/app/modules/home/components/widget/action/widget-action-dialog.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/action/widget-action-dialog.component.ts
@@ -20,11 +20,11 @@ import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
 import {
+  FormBuilder,
+  FormControl,
+  FormGroup,
   FormGroupDirective,
   NgForm,
-  UntypedFormBuilder,
-  UntypedFormControl,
-  UntypedFormGroup,
   ValidatorFn,
   Validators
 } from '@angular/forms';
@@ -32,13 +32,15 @@ import { Subject } from 'rxjs';
 import { Router } from '@angular/router';
 import { DialogComponent } from '@app/shared/components/dialog.component';
 import {
+  toWidgetActionDescriptor,
   WidgetActionCallbacks,
   WidgetActionDescriptorInfo,
   WidgetActionsData
 } from '@home/components/widget/action/manage-widget-actions.component.models';
 import { UtilsService } from '@core/services/utils.service';
 import {
-  actionDescriptorToAction, defaultWidgetAction,
+  actionDescriptorToAction,
+  defaultWidgetAction,
   WidgetActionSource,
   widgetType
 } from '@shared/models/widget.models';
@@ -65,7 +67,7 @@ export class WidgetActionDialogComponent extends DialogComponent<WidgetActionDia
 
   private destroy$ = new Subject<void>();
 
-  widgetActionFormGroup: UntypedFormGroup;
+  widgetActionFormGroup: FormGroup;
 
   isAdd: boolean;
   action: WidgetActionDescriptorInfo;
@@ -83,7 +85,7 @@ export class WidgetActionDialogComponent extends DialogComponent<WidgetActionDia
               @Inject(MAT_DIALOG_DATA) public data: WidgetActionDialogData,
               @SkipSelf() private errorStateMatcher: ErrorStateMatcher,
               public dialogRef: MatDialogRef<WidgetActionDialogComponent, WidgetActionDescriptorInfo>,
-              public fb: UntypedFormBuilder) {
+              public fb: FormBuilder) {
     super(store, router, dialogRef);
     this.isAdd = data.isAdd;
     if (this.isAdd) {
@@ -100,19 +102,14 @@ export class WidgetActionDialogComponent extends DialogComponent<WidgetActionDia
   }
 
   ngOnInit(): void {
-    this.widgetActionFormGroup = this.fb.group({});
-    this.widgetActionFormGroup.addControl('actionSourceId',
-      this.fb.control(this.action.actionSourceId, [Validators.required]));
-    this.widgetActionFormGroup.addControl('name',
-      this.fb.control(this.action.name, [this.validateActionName(), Validators.required]));
-    this.widgetActionFormGroup.addControl('icon',
-      this.fb.control(this.action.icon, [Validators.required]));
-    this.widgetActionFormGroup.addControl('useShowWidgetActionFunction',
-      this.fb.control(this.action.useShowWidgetActionFunction, []));
-    this.widgetActionFormGroup.addControl('showWidgetActionFunction',
-      this.fb.control(this.action.showWidgetActionFunction || 'return true;', []));
-    this.widgetActionFormGroup.addControl('widgetAction',
-      this.fb.control(actionDescriptorToAction(this.action), [Validators.required]));
+    this.widgetActionFormGroup = this.fb.group({
+      actionSourceId: [this.action.actionSourceId, Validators.required],
+      name: [this.action.name, [this.validateActionName(), Validators.required]],
+      icon: [this.action.icon, Validators.required],
+      useShowWidgetActionFunction: [this.action.useShowWidgetActionFunction],
+      showWidgetActionFunction: [this.action.showWidgetActionFunction || 'return true;'],
+      widgetAction: [actionDescriptorToAction(toWidgetActionDescriptor(this.action)), Validators.required]
+    });
     this.updateShowWidgetActionForm();
     this.widgetActionFormGroup.get('actionSourceId').valueChanges.pipe(
       takeUntil(this.destroy$)
@@ -159,9 +156,9 @@ export class WidgetActionDialogComponent extends DialogComponent<WidgetActionDia
   }
 
   private validateActionName(): ValidatorFn {
-    return (c: UntypedFormControl) => {
+    return (c: FormControl) => {
       const newName = c.value;
-      const valid = this.checkActionName(newName, this.widgetActionFormGroup.get('actionSourceId').value);
+      const valid = this.checkActionName(newName, c.parent?.get('actionSourceId').value);
       return !valid ? {
         actionNameNotUnique: true
       } : null;
@@ -182,7 +179,7 @@ export class WidgetActionDialogComponent extends DialogComponent<WidgetActionDia
     return actionNameIsUnique;
   }
 
-  isErrorState(control: UntypedFormControl | null, form: FormGroupDirective | NgForm | null): boolean {
+  isErrorState(control: FormControl | null, form: FormGroupDirective | NgForm | null): boolean {
     const originalErrorState = this.errorStateMatcher.isErrorState(control, form);
     const customErrorState = !!(control && control.invalid && this.submitted);
     return originalErrorState || customErrorState;
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 c4aaac2a9e..18b80f86a5 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
@@ -107,6 +107,28 @@ import { SliderBasicConfigComponent } from '@home/components/widget/config/basic
 import {
   ToggleButtonBasicConfigComponent
 } from '@home/components/widget/config/basic/button/toggle-button-basic-config.component';
+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';
+import {
+  BarChartBasicConfigComponent
+} from '@home/components/widget/config/basic/chart/bar-chart-basic-config.component';
+import {
+  PolarAreaChartBasicConfigComponent
+} from '@home/components/widget/config/basic/chart/polar-area-chart-basic-config.component';
+import {
+  RadarChartBasicConfigComponent
+} from '@home/components/widget/config/basic/chart/radar-chart-basic-config.component';
 
 @NgModule({
   declarations: [
@@ -141,7 +163,15 @@ import {
     CommandButtonBasicConfigComponent,
     PowerButtonBasicConfigComponent,
     SliderBasicConfigComponent,
-    ToggleButtonBasicConfigComponent
+    ToggleButtonBasicConfigComponent,
+    TimeSeriesChartBasicConfigComponent,
+    ComparisonKeyRowComponent,
+    ComparisonKeysTableComponent,
+    StatusWidgetBasicConfigComponent,
+    PieChartBasicConfigComponent,
+    BarChartBasicConfigComponent,
+    PolarAreaChartBasicConfigComponent,
+    RadarChartBasicConfigComponent
   ],
   imports: [
     CommonModule,
@@ -180,7 +210,13 @@ import {
     CommandButtonBasicConfigComponent,
     PowerButtonBasicConfigComponent,
     SliderBasicConfigComponent,
-    ToggleButtonBasicConfigComponent
+    ToggleButtonBasicConfigComponent,
+    TimeSeriesChartBasicConfigComponent,
+    StatusWidgetBasicConfigComponent,
+    PieChartBasicConfigComponent,
+    BarChartBasicConfigComponent,
+    PolarAreaChartBasicConfigComponent,
+    RadarChartBasicConfigComponent
   ]
 })
 export class BasicWidgetConfigModule {
@@ -213,5 +249,11 @@ export const basicWidgetConfigComponentsMap: {[key: string]: Type<IBasicWidgetCo
   'tb-command-button-basic-config': CommandButtonBasicConfigComponent,
   'tb-power-button-basic-config': PowerButtonBasicConfigComponent,
   'tb-slider-basic-config': SliderBasicConfigComponent,
-  'tb-toggle-button-basic-config': ToggleButtonBasicConfigComponent
+  'tb-toggle-button-basic-config': ToggleButtonBasicConfigComponent,
+  'tb-time-series-chart-basic-config': TimeSeriesChartBasicConfigComponent,
+  'tb-status-widget-basic-config': StatusWidgetBasicConfigComponent,
+  'tb-pie-chart-basic-config': PieChartBasicConfigComponent,
+  'tb-bar-chart-basic-config': BarChartBasicConfigComponent,
+  'tb-polar-area-chart-basic-config': PolarAreaChartBasicConfigComponent,
+  'tb-radar-chart-basic-config': RadarChartBasicConfigComponent
 };
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/cards/aggregated-data-keys-panel.component.ts b/ui-ngx/src/app/modules/home/components/widget/config/basic/cards/aggregated-data-keys-panel.component.ts
index 6f3175c3e2..cb93e516fb 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/basic/cards/aggregated-data-keys-panel.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/cards/aggregated-data-keys-panel.component.ts
@@ -152,7 +152,8 @@ export class AggregatedDataKeysPanelComponent implements ControlValueAccessor, O
   }
 
   addKey() {
-    const dataKey = this.callbacks.generateDataKey(this.keyName, this.dataKeyType, null);
+    const dataKey = this.callbacks.generateDataKey(this.keyName, this.dataKeyType, null,
+      true,null);
     dataKey.decimals = 0;
     dataKey.settings = {...aggregatedValueCardDefaultKeySettings};
     const keysArray = this.keysListFormGroup.get('keys') as UntypedFormArray;
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/bar-chart-basic-config.component.html b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/bar-chart-basic-config.component.html
new file mode 100644
index 0000000000..ebf40b52ff
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/bar-chart-basic-config.component.html
@@ -0,0 +1,261 @@
+<!--
+
+    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]="barChartWidgetConfigForm">
+  <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 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]="barChartWidgetConfigForm.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]="barChartWidgetConfigForm.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="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">
+    <div class="tb-form-panel-title" translate>widgets.bar-chart.bar-appearance</div>
+    <tb-chart-bar-settings
+        formControlName="barSettings"
+        [series]="false">
+    </tb-chart-bar-settings>
+  </div>
+  <div class="tb-form-panel">
+    <div class="tb-form-panel-title" translate>widgets.bar-chart.bar-axis</div>
+    <div class="tb-form-row space-between column-xs">
+      <div translate>widgets.chart.chart-axis.scale</div>
+      <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+        <div class="tb-small-label" translate>widgets.chart.chart-axis.scale-min</div>
+        <mat-form-field appearance="outline" class="number" subscriptSizing="dynamic">
+          <input matInput formControlName="axisMin"
+                 type="number" placeholder="{{ 'widgets.chart.chart-axis.scale-auto' | translate }}">
+        </mat-form-field>
+        <div class="tb-small-label" translate>widgets.chart.chart-axis.scale-max</div>
+        <mat-form-field appearance="outline" class="number" subscriptSizing="dynamic">
+          <input matInput formControlName="axisMax"
+                 type="number" placeholder="{{ 'widgets.chart.chart-axis.scale-auto' | translate }}">
+        </mat-form-field>
+        <tb-font-settings formControlName="axisTickLabelFont"
+                          clearButton
+                          disabledLineHeight
+                          forceSizeUnit="px"
+                          previewText="100">
+        </tb-font-settings>
+        <tb-color-input asBoxInput
+                        colorClearButton
+                        formControlName="axisTickLabelColor">
+        </tb-color-input>
+      </div>
+    </div>
+  </div>
+  <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">
+        <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]="barChartWidgetConfigForm.get('showTooltip').value" [disabled]="!barChartWidgetConfigForm.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-chart-animation-settings
+      formControlName="animation">
+  </tb-chart-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/bar-chart-basic-config.component.ts b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/bar-chart-basic-config.component.ts
new file mode 100644
index 0000000000..da8b94410d
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/bar-chart-basic-config.component.ts
@@ -0,0 +1,316 @@
+///
+/// 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 {
+  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 {
+  barChartWidgetDefaultSettings,
+  BarChartWidgetSettings
+} from '@home/components/widget/lib/chart/bar-chart-widget.models';
+
+@Component({
+  selector: 'tb-bar-chart-basic-config',
+  templateUrl: './bar-chart-basic-config.component.html',
+  styleUrls: ['../basic-config.scss']
+})
+export class BarChartBasicConfigComponent extends BasicWidgetConfigComponent {
+
+  public get datasource(): Datasource {
+    const datasources: Datasource[] = this.barChartWidgetConfigForm.get('datasources').value;
+    if (datasources && datasources.length) {
+      return datasources[0];
+    } else {
+      return null;
+    }
+  }
+
+  public get displayTimewindowConfig(): boolean {
+    const datasources = this.barChartWidgetConfigForm.get('datasources').value;
+    return datasourcesHasAggregation(datasources);
+  }
+
+  public onlyHistoryTimewindow(): boolean {
+    const datasources = this.barChartWidgetConfigForm.get('datasources').value;
+    return datasourcesHasOnlyComparisonAggregation(datasources);
+  }
+
+  legendPositions = legendPositions;
+
+  legendPositionTranslationMap = legendPositionTranslationMap;
+
+  latestChartTooltipValueTypes = latestChartTooltipValueTypes;
+
+  latestChartTooltipValueTypeTranslationMap = latestChartTooltipValueTypeTranslations;
+
+  barChartWidgetConfigForm: 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.barChartWidgetConfigForm;
+  }
+
+  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: BarChartWidgetSettings = mergeDeep<BarChartWidgetSettings>({} as BarChartWidgetSettings,
+      barChartWidgetDefaultSettings, configData.config.settings as BarChartWidgetSettings);
+    this.barChartWidgetConfigForm = this.fb.group({
+      timewindowConfig: [getTimewindowConfig(configData.config), []],
+      datasources: [configData.config.datasources, []],
+
+      series: [this.getSeries(configData.config.datasources), []],
+
+      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, []],
+
+      sortSeries: [settings.sortSeries, []],
+
+      units: [configData.config.units, []],
+      decimals: [configData.config.decimals, []],
+
+      barSettings: [settings.barSettings, []],
+
+      axisMin: [settings.axisMin, []],
+      axisMax: [settings.axisMax, []],
+      axisTickLabelFont: [settings.axisTickLabelFont, []],
+      axisTickLabelColor: [settings.axisTickLabelColor, []],
+
+      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.sortSeries = config.sortSeries;
+
+    this.widgetConfig.config.units = config.units;
+    this.widgetConfig.config.decimals = config.decimals;
+
+    this.widgetConfig.config.settings.barSettings = config.barSettings;
+
+    this.widgetConfig.config.settings.axisMin = config.axisMin;
+    this.widgetConfig.config.settings.axisMax = config.axisMax;
+    this.widgetConfig.config.settings.axisTickLabelFont = config.axisTickLabelFont;
+    this.widgetConfig.config.settings.axisTickLabelColor = config.axisTickLabelColor;
+
+    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 ['showTitle', 'showTitleIcon', 'showLegend', 'showTooltip'];
+  }
+
+  protected updateValidators(emitEvent: boolean, trigger?: string) {
+    const showTitle: boolean = this.barChartWidgetConfigForm.get('showTitle').value;
+    const showTitleIcon: boolean = this.barChartWidgetConfigForm.get('showTitleIcon').value;
+    const showLegend: boolean = this.barChartWidgetConfigForm.get('showLegend').value;
+    const showTooltip: boolean = this.barChartWidgetConfigForm.get('showTooltip').value;
+
+    if (showTitle) {
+      this.barChartWidgetConfigForm.get('title').enable();
+      this.barChartWidgetConfigForm.get('titleFont').enable();
+      this.barChartWidgetConfigForm.get('titleColor').enable();
+      this.barChartWidgetConfigForm.get('showTitleIcon').enable({emitEvent: false});
+      if (showTitleIcon) {
+        this.barChartWidgetConfigForm.get('titleIcon').enable();
+        this.barChartWidgetConfigForm.get('iconColor').enable();
+      } else {
+        this.barChartWidgetConfigForm.get('titleIcon').disable();
+        this.barChartWidgetConfigForm.get('iconColor').disable();
+      }
+    } else {
+      this.barChartWidgetConfigForm.get('title').disable();
+      this.barChartWidgetConfigForm.get('titleFont').disable();
+      this.barChartWidgetConfigForm.get('titleColor').disable();
+      this.barChartWidgetConfigForm.get('showTitleIcon').disable({emitEvent: false});
+      this.barChartWidgetConfigForm.get('titleIcon').disable();
+      this.barChartWidgetConfigForm.get('iconColor').disable();
+    }
+    if (showLegend) {
+      this.barChartWidgetConfigForm.get('legendPosition').enable();
+      this.barChartWidgetConfigForm.get('legendLabelFont').enable();
+      this.barChartWidgetConfigForm.get('legendLabelColor').enable();
+      this.barChartWidgetConfigForm.get('legendValueFont').enable();
+      this.barChartWidgetConfigForm.get('legendValueColor').enable();
+    } else {
+      this.barChartWidgetConfigForm.get('legendPosition').disable();
+      this.barChartWidgetConfigForm.get('legendLabelFont').disable();
+      this.barChartWidgetConfigForm.get('legendLabelColor').disable();
+      this.barChartWidgetConfigForm.get('legendValueFont').disable();
+      this.barChartWidgetConfigForm.get('legendValueColor').disable();
+    }
+    if (showTooltip) {
+      this.barChartWidgetConfigForm.get('tooltipValueType').enable();
+      this.barChartWidgetConfigForm.get('tooltipValueDecimals').enable();
+      this.barChartWidgetConfigForm.get('tooltipValueFont').enable();
+      this.barChartWidgetConfigForm.get('tooltipValueColor').enable();
+      this.barChartWidgetConfigForm.get('tooltipBackgroundColor').enable();
+      this.barChartWidgetConfigForm.get('tooltipBackgroundBlur').enable();
+    } else {
+      this.barChartWidgetConfigForm.get('tooltipValueType').disable();
+      this.barChartWidgetConfigForm.get('tooltipValueDecimals').disable();
+      this.barChartWidgetConfigForm.get('tooltipValueFont').disable();
+      this.barChartWidgetConfigForm.get('tooltipValueColor').disable();
+      this.barChartWidgetConfigForm.get('tooltipBackgroundColor').disable();
+      this.barChartWidgetConfigForm.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.barChartWidgetConfigForm.get('units').value;
+    const decimals: number = this.barChartWidgetConfigForm.get('decimals').value;
+    return formatValue(110, decimals, units, false);
+  }
+
+  private _tooltipValuePreviewFn(): string {
+    const tooltipValueType: LatestChartTooltipValueType = this.barChartWidgetConfigForm.get('tooltipValueType').value;
+    const decimals: number = this.barChartWidgetConfigForm.get('tooltipValueDecimals').value;
+    if (tooltipValueType === LatestChartTooltipValueType.percentage) {
+      return formatValue(35, decimals, '%', false);
+    } else {
+      const units: string = this.barChartWidgetConfigForm.get('units').value;
+      return formatValue(110, decimals, units, false);
+    }
+  }
+}
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 f6af2d1cad..0d8537a3a6 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.chart.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.chart.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.chart.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-chart-fill-settings
+        formControlName="barBackgroundSettings"
+        title="widgets.chart.background"
+        fillNoneTitle="widgets.chart.fill-type-solid">
+    </tb-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
@@ -195,8 +270,10 @@
             {{ 'tooltip.date' | translate }}
           </mat-slide-toggle>
           <div fxFlex.gt-xs fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
-            <tb-date-format-select fxFlex excludeLastUpdateAgo formControlName="tooltipDateFormat"></tb-date-format-select>
+            <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
@@ -205,6 +282,13 @@
             </tb-color-input>
           </div>
         </div>
+        <div class="tb-form-row">
+          <mat-slide-toggle class="mat-slide" formControlName="tooltipDateInterval">
+            <div tb-hint-tooltip-icon="{{'tooltip.show-date-time-interval-hint' | translate}}">
+              {{ 'tooltip.show-date-time-interval' | translate }}
+            </div>
+          </mat-slide-toggle>
+        </div>
         <div class="tb-form-row space-between">
           <div>{{ 'tooltip.background-color' | translate }}</div>
           <tb-color-input asBoxInput
@@ -222,6 +306,9 @@
       </ng-template>
     </mat-expansion-panel>
   </div>
+  <tb-chart-animation-settings
+      formControlName="animation">
+  </tb-chart-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">
@@ -241,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 467693dcf4..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,28 +107,48 @@ 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, []],
       tooltipDateFormat: [settings.tooltipDateFormat, []],
       tooltipDateFont: [settings.tooltipDateFont, []],
       tooltipDateColor: [settings.tooltipDateColor, []],
+      tooltipDateInterval: [settings.tooltipDateInterval, []],
+
       tooltipBackgroundColor: [settings.tooltipBackgroundColor, []],
       tooltipBackgroundBlur: [settings.tooltipBackgroundBlur, []],
 
@@ -134,6 +156,7 @@ export class BarChartWithLabelsBasicConfigComponent extends BasicWidgetConfigCom
 
       cardButtons: [this.getCardButtons(configData.config), []],
       borderRadius: [configData.config.borderRadius, []],
+      padding: [settings.padding, []],
 
       actions: [configData.config.actions || {}, []]
     });
@@ -156,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;
@@ -163,21 +188,39 @@ 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;
     this.widgetConfig.config.settings.tooltipDateFormat = config.tooltipDateFormat;
     this.widgetConfig.config.settings.tooltipDateFont = config.tooltipDateFont;
     this.widgetConfig.config.settings.tooltipDateColor = config.tooltipDateColor;
+    this.widgetConfig.config.settings.tooltipDateInterval = config.tooltipDateInterval;
     this.widgetConfig.config.settings.tooltipBackgroundColor = config.tooltipBackgroundColor;
     this.widgetConfig.config.settings.tooltipBackgroundBlur = config.tooltipBackgroundBlur;
 
@@ -185,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) {
@@ -199,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;
@@ -245,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();
@@ -257,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});
@@ -266,18 +317,23 @@ export class BarChartWithLabelsBasicConfigComponent extends BasicWidgetConfigCom
         this.barChartWidgetConfigForm.get('tooltipDateFormat').enable();
         this.barChartWidgetConfigForm.get('tooltipDateFont').enable();
         this.barChartWidgetConfigForm.get('tooltipDateColor').enable();
+        this.barChartWidgetConfigForm.get('tooltipDateInterval').enable();
       } else {
         this.barChartWidgetConfigForm.get('tooltipDateFormat').disable();
         this.barChartWidgetConfigForm.get('tooltipDateFont').disable();
         this.barChartWidgetConfigForm.get('tooltipDateColor').disable();
+        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});
       this.barChartWidgetConfigForm.get('tooltipDateFormat').disable();
       this.barChartWidgetConfigForm.get('tooltipDateFont').disable();
       this.barChartWidgetConfigForm.get('tooltipDateColor').disable();
+      this.barChartWidgetConfigForm.get('tooltipDateInterval').disable();
       this.barChartWidgetConfigForm.get('tooltipBackgroundColor').disable();
       this.barChartWidgetConfigForm.get('tooltipBackgroundBlur').disable();
     }
@@ -320,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..13a4985647 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-chart-animation-settings
+      formControlName="animation">
+  </tb-chart-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..bdc94b1479
--- /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-chart-animation-settings
+      formControlName="animation">
+  </tb-chart-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..e8d34933c3
--- /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/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/polar-area-chart-basic-config.component.html b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/polar-area-chart-basic-config.component.html
new file mode 100644
index 0000000000..92b94b5912
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/polar-area-chart-basic-config.component.html
@@ -0,0 +1,268 @@
+<!--
+
+    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]="polarAreaChartWidgetConfigForm">
+  <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 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]="polarAreaChartWidgetConfigForm.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]="polarAreaChartWidgetConfigForm.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="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">
+    <div class="tb-form-panel-title" translate>widgets.bar-chart.bar-appearance</div>
+    <tb-chart-bar-settings
+        formControlName="barSettings"
+        pieLabelPosition
+        [series]="false">
+    </tb-chart-bar-settings>
+  </div>
+  <div class="tb-form-panel">
+    <div class="tb-form-panel-title" translate>widgets.polar-area-chart.polar-axis</div>
+    <div class="tb-form-row space-between column-xs">
+      <div translate>widgets.chart.chart-axis.scale</div>
+      <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+        <div class="tb-small-label" translate>widgets.chart.chart-axis.scale-min</div>
+        <mat-form-field appearance="outline" class="number" subscriptSizing="dynamic">
+          <input matInput formControlName="axisMin"
+                 type="number" placeholder="{{ 'widgets.chart.chart-axis.scale-auto' | translate }}">
+        </mat-form-field>
+        <div class="tb-small-label" translate>widgets.chart.chart-axis.scale-max</div>
+        <mat-form-field appearance="outline" class="number" subscriptSizing="dynamic">
+          <input matInput formControlName="axisMax"
+                 type="number" placeholder="{{ 'widgets.chart.chart-axis.scale-auto' | translate }}">
+        </mat-form-field>
+        <tb-font-settings formControlName="axisTickLabelFont"
+                          clearButton
+                          disabledLineHeight
+                          forceSizeUnit="px"
+                          previewText="100">
+        </tb-font-settings>
+        <tb-color-input asBoxInput
+                        colorClearButton
+                        formControlName="axisTickLabelColor">
+        </tb-color-input>
+      </div>
+    </div>
+    <div class="tb-form-row space-between">
+      <div translate>widgets.polar-area-chart.start-angle</div>
+      <mat-form-field appearance="outline" class="number" subscriptSizing="dynamic">
+        <input matInput formControlName="angleAxisStartAngle" type="number" min="0" max="360" 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]="polarAreaChartWidgetConfigForm.get('showLegend').value" [disabled]="!polarAreaChartWidgetConfigForm.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]="polarAreaChartWidgetConfigForm.get('showTooltip').value" [disabled]="!polarAreaChartWidgetConfigForm.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-chart-animation-settings
+      formControlName="animation">
+  </tb-chart-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/polar-area-chart-basic-config.component.ts b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/polar-area-chart-basic-config.component.ts
new file mode 100644
index 0000000000..0d195dde38
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/polar-area-chart-basic-config.component.ts
@@ -0,0 +1,318 @@
+///
+/// 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 {
+  polarAreaChartWidgetDefaultSettings,
+  PolarAreaChartWidgetSettings
+} from '@home/components/widget/lib/chart/polar-area-widget.models';
+
+@Component({
+  selector: 'tb-polar-area-chart-basic-config',
+  templateUrl: './polar-area-chart-basic-config.component.html',
+  styleUrls: ['../basic-config.scss']
+})
+export class PolarAreaChartBasicConfigComponent extends BasicWidgetConfigComponent {
+
+  public get datasource(): Datasource {
+    const datasources: Datasource[] = this.polarAreaChartWidgetConfigForm.get('datasources').value;
+    if (datasources && datasources.length) {
+      return datasources[0];
+    } else {
+      return null;
+    }
+  }
+
+  public get displayTimewindowConfig(): boolean {
+    const datasources = this.polarAreaChartWidgetConfigForm.get('datasources').value;
+    return datasourcesHasAggregation(datasources);
+  }
+
+  public onlyHistoryTimewindow(): boolean {
+    const datasources = this.polarAreaChartWidgetConfigForm.get('datasources').value;
+    return datasourcesHasOnlyComparisonAggregation(datasources);
+  }
+
+  legendPositions = legendPositions;
+
+  legendPositionTranslationMap = legendPositionTranslationMap;
+
+  latestChartTooltipValueTypes = latestChartTooltipValueTypes;
+
+  latestChartTooltipValueTypeTranslationMap = latestChartTooltipValueTypeTranslations;
+
+  polarAreaChartWidgetConfigForm: 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.polarAreaChartWidgetConfigForm;
+  }
+
+  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: PolarAreaChartWidgetSettings = mergeDeep<PolarAreaChartWidgetSettings>({} as PolarAreaChartWidgetSettings,
+      polarAreaChartWidgetDefaultSettings, configData.config.settings as PolarAreaChartWidgetSettings);
+    this.polarAreaChartWidgetConfigForm = this.fb.group({
+      timewindowConfig: [getTimewindowConfig(configData.config), []],
+      datasources: [configData.config.datasources, []],
+
+      series: [this.getSeries(configData.config.datasources), []],
+
+      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, []],
+
+      sortSeries: [settings.sortSeries, []],
+
+      units: [configData.config.units, []],
+      decimals: [configData.config.decimals, []],
+
+      barSettings: [settings.barSettings, []],
+
+      axisMin: [settings.axisMin, []],
+      axisMax: [settings.axisMax, []],
+      axisTickLabelFont: [settings.axisTickLabelFont, []],
+      axisTickLabelColor: [settings.axisTickLabelColor, []],
+      angleAxisStartAngle: [settings.angleAxisStartAngle, [Validators.min(0), Validators.max(360)]],
+
+      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.sortSeries = config.sortSeries;
+
+    this.widgetConfig.config.units = config.units;
+    this.widgetConfig.config.decimals = config.decimals;
+
+    this.widgetConfig.config.settings.barSettings = config.barSettings;
+
+    this.widgetConfig.config.settings.axisMin = config.axisMin;
+    this.widgetConfig.config.settings.axisMax = config.axisMax;
+    this.widgetConfig.config.settings.axisTickLabelFont = config.axisTickLabelFont;
+    this.widgetConfig.config.settings.axisTickLabelColor = config.axisTickLabelColor;
+    this.widgetConfig.config.settings.angleAxisStartAngle = config.angleAxisStartAngle;
+
+    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 ['showTitle', 'showTitleIcon', 'showLegend', 'showTooltip'];
+  }
+
+  protected updateValidators(emitEvent: boolean, trigger?: string) {
+    const showTitle: boolean = this.polarAreaChartWidgetConfigForm.get('showTitle').value;
+    const showTitleIcon: boolean = this.polarAreaChartWidgetConfigForm.get('showTitleIcon').value;
+    const showLegend: boolean = this.polarAreaChartWidgetConfigForm.get('showLegend').value;
+    const showTooltip: boolean = this.polarAreaChartWidgetConfigForm.get('showTooltip').value;
+
+    if (showTitle) {
+      this.polarAreaChartWidgetConfigForm.get('title').enable();
+      this.polarAreaChartWidgetConfigForm.get('titleFont').enable();
+      this.polarAreaChartWidgetConfigForm.get('titleColor').enable();
+      this.polarAreaChartWidgetConfigForm.get('showTitleIcon').enable({emitEvent: false});
+      if (showTitleIcon) {
+        this.polarAreaChartWidgetConfigForm.get('titleIcon').enable();
+        this.polarAreaChartWidgetConfigForm.get('iconColor').enable();
+      } else {
+        this.polarAreaChartWidgetConfigForm.get('titleIcon').disable();
+        this.polarAreaChartWidgetConfigForm.get('iconColor').disable();
+      }
+    } else {
+      this.polarAreaChartWidgetConfigForm.get('title').disable();
+      this.polarAreaChartWidgetConfigForm.get('titleFont').disable();
+      this.polarAreaChartWidgetConfigForm.get('titleColor').disable();
+      this.polarAreaChartWidgetConfigForm.get('showTitleIcon').disable({emitEvent: false});
+      this.polarAreaChartWidgetConfigForm.get('titleIcon').disable();
+      this.polarAreaChartWidgetConfigForm.get('iconColor').disable();
+    }
+    if (showLegend) {
+      this.polarAreaChartWidgetConfigForm.get('legendPosition').enable();
+      this.polarAreaChartWidgetConfigForm.get('legendLabelFont').enable();
+      this.polarAreaChartWidgetConfigForm.get('legendLabelColor').enable();
+      this.polarAreaChartWidgetConfigForm.get('legendValueFont').enable();
+      this.polarAreaChartWidgetConfigForm.get('legendValueColor').enable();
+    } else {
+      this.polarAreaChartWidgetConfigForm.get('legendPosition').disable();
+      this.polarAreaChartWidgetConfigForm.get('legendLabelFont').disable();
+      this.polarAreaChartWidgetConfigForm.get('legendLabelColor').disable();
+      this.polarAreaChartWidgetConfigForm.get('legendValueFont').disable();
+      this.polarAreaChartWidgetConfigForm.get('legendValueColor').disable();
+    }
+    if (showTooltip) {
+      this.polarAreaChartWidgetConfigForm.get('tooltipValueType').enable();
+      this.polarAreaChartWidgetConfigForm.get('tooltipValueDecimals').enable();
+      this.polarAreaChartWidgetConfigForm.get('tooltipValueFont').enable();
+      this.polarAreaChartWidgetConfigForm.get('tooltipValueColor').enable();
+      this.polarAreaChartWidgetConfigForm.get('tooltipBackgroundColor').enable();
+      this.polarAreaChartWidgetConfigForm.get('tooltipBackgroundBlur').enable();
+    } else {
+      this.polarAreaChartWidgetConfigForm.get('tooltipValueType').disable();
+      this.polarAreaChartWidgetConfigForm.get('tooltipValueDecimals').disable();
+      this.polarAreaChartWidgetConfigForm.get('tooltipValueFont').disable();
+      this.polarAreaChartWidgetConfigForm.get('tooltipValueColor').disable();
+      this.polarAreaChartWidgetConfigForm.get('tooltipBackgroundColor').disable();
+      this.polarAreaChartWidgetConfigForm.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.polarAreaChartWidgetConfigForm.get('units').value;
+    const decimals: number = this.polarAreaChartWidgetConfigForm.get('decimals').value;
+    return formatValue(110, decimals, units, false);
+  }
+
+  private _tooltipValuePreviewFn(): string {
+    const tooltipValueType: LatestChartTooltipValueType = this.polarAreaChartWidgetConfigForm.get('tooltipValueType').value;
+    const decimals: number = this.polarAreaChartWidgetConfigForm.get('tooltipValueDecimals').value;
+    if (tooltipValueType === LatestChartTooltipValueType.percentage) {
+      return formatValue(35, decimals, '%', false);
+    } else {
+      const units: string = this.polarAreaChartWidgetConfigForm.get('units').value;
+      return formatValue(110, decimals, units, false);
+    }
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/radar-chart-basic-config.component.html b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/radar-chart-basic-config.component.html
new file mode 100644
index 0000000000..4b627b57a1
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/radar-chart-basic-config.component.html
@@ -0,0 +1,340 @@
+<!--
+
+    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]="radarChartWidgetConfigForm">
+  <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 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]="radarChartWidgetConfigForm.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]="radarChartWidgetConfigForm.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="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">
+    <div class="tb-form-panel-title" translate>widgets.radar-chart.radar-appearance</div>
+    <div class="tb-form-row space-between">
+      <div>{{ 'widgets.radar-chart.shape' | translate }}</div>
+      <mat-form-field class="medium-width" appearance="outline" subscriptSizing="dynamic">
+        <mat-select formControlName="shape">
+          <mat-option *ngFor="let shape of radarChartShapes" [value]="shape">
+            {{ radarChartShapeTranslations.get(shape) | translate }}
+          </mat-option>
+        </mat-select>
+      </mat-form-field>
+    </div>
+    <div class="tb-form-row space-between">
+      <div translate>widgets.radar-chart.color</div>
+      <tb-color-input asBoxInput
+                      colorClearButton
+                      formControlName="color">
+      </tb-color-input>
+    </div>
+    <div class="tb-form-row space-between column-xs">
+      <mat-slide-toggle class="mat-slide" formControlName="showLine">
+        {{ 'widgets.radar-chart.line' | translate }}
+      </mat-slide-toggle>
+      <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+        <mat-form-field class="medium-width" fxFlex.xs appearance="outline" subscriptSizing="dynamic">
+          <mat-select formControlName="lineType">
+            <mat-option *ngFor="let type of chartLineTypes" [value]="type">
+              {{ chartLineTypeTranslations.get(type) | translate }}
+            </mat-option>
+          </mat-select>
+        </mat-form-field>
+        <mat-form-field appearance="outline" class="number fixed-width" subscriptSizing="dynamic">
+          <input matInput formControlName="lineWidth"
+                 type="number" min="0" step="1" placeholder="{{ 'widget-config.set' | translate }}">
+        </mat-form-field>
+      </div>
+    </div>
+    <div class="tb-form-row space-between column-xs">
+      <mat-slide-toggle class="mat-slide" formControlName="showPoints">
+        {{ 'widgets.radar-chart.points' | translate }}
+      </mat-slide-toggle>
+      <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+        <mat-form-field class="medium-width" fxFlex.xs appearance="outline" subscriptSizing="dynamic">
+          <mat-select formControlName="pointShape">
+            <mat-option *ngFor="let shape of chartShapes" [value]="shape">
+              {{ chartShapeTranslations.get(shape) | translate }}
+            </mat-option>
+          </mat-select>
+        </mat-form-field>
+        <mat-form-field appearance="outline" class="number fixed-width" subscriptSizing="dynamic">
+          <input matInput formControlName="pointSize"
+                 type="number" min="0" step="1" placeholder="{{ 'widget-config.set' | translate }}">
+        </mat-form-field>
+      </div>
+    </div>
+    <div class="tb-form-row space-between column-lt-md">
+      <mat-slide-toggle class="mat-slide" formControlName="showLabel">
+        {{ 'widgets.radar-chart.points-label' | translate }}
+      </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="labelPosition">
+            <mat-option *ngFor="let position of chartLabelPositions" [value]="position">
+              {{ chartLabelPositionTranslations.get(position) | translate }}
+            </mat-option>
+          </mat-select>
+        </mat-form-field>
+        <tb-font-settings formControlName="labelFont"
+                          clearButton
+                          disabledLineHeight
+                          forceSizeUnit="px"
+                          [previewText]="valuePreviewFn">
+        </tb-font-settings>
+        <tb-color-input asBoxInput
+                        colorClearButton
+                        formControlName="labelColor">
+        </tb-color-input>
+      </div>
+    </div>
+    <tb-chart-fill-settings
+        formControlName="fillAreaSettings">
+    </tb-chart-fill-settings>
+  </div>
+  <div class="tb-form-panel">
+    <div class="tb-form-panel-title" translate>widgets.radar-chart.radar-axis</div>
+    <div class="tb-form-row space-between">
+      <mat-slide-toggle class="mat-slide" formControlName="axisShowLabel">
+        {{ 'widgets.radar-chart.axis-label' | translate }}
+      </mat-slide-toggle>
+      <tb-font-settings formControlName="axisLabelFont"
+                        clearButton
+                        disabledLineHeight
+                        forceSizeUnit="px"
+                        previewText="Wind">
+      </tb-font-settings>
+    </div>
+    <div class="tb-form-row space-between">
+      <mat-slide-toggle class="mat-slide" formControlName="axisShowTickLabels">
+        {{ 'widgets.radar-chart.ticks-label' | translate }}
+      </mat-slide-toggle>
+      <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+        <tb-font-settings formControlName="axisTickLabelFont"
+                          clearButton
+                          disabledLineHeight
+                          forceSizeUnit="px"
+                          previewText="100">
+        </tb-font-settings>
+        <tb-color-input asBoxInput
+                        colorClearButton
+                        formControlName="axisTickLabelColor">
+        </tb-color-input>
+      </div>
+    </div>
+  </div>
+  <div class="tb-form-panel tb-slide-toggle">
+    <mat-expansion-panel class="tb-settings" [expanded]="radarChartWidgetConfigForm.get('showLegend').value" [disabled]="!radarChartWidgetConfigForm.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]="radarChartWidgetConfigForm.get('showTooltip').value" [disabled]="!radarChartWidgetConfigForm.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-chart-animation-settings
+      formControlName="animation">
+  </tb-chart-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/radar-chart-basic-config.component.ts b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/radar-chart-basic-config.component.ts
new file mode 100644
index 0000000000..68f66873d2
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/radar-chart-basic-config.component.ts
@@ -0,0 +1,414 @@
+///
+/// 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 {
+  radarChartWidgetDefaultSettings,
+  RadarChartWidgetSettings
+} from '@home/components/widget/lib/chart/radar-chart-widget.models';
+import { radarChartShapes, radarChartShapeTranslations } from '@home/components/widget/lib/chart/radar-chart.models';
+import {
+  chartLabelPositions,
+  chartLabelPositionTranslations,
+  chartLineTypes,
+  chartLineTypeTranslations,
+  chartShapes,
+  chartShapeTranslations
+} from '@home/components/widget/lib/chart/chart.models';
+
+@Component({
+  selector: 'tb-radar-chart-basic-config',
+  templateUrl: './radar-chart-basic-config.component.html',
+  styleUrls: ['../basic-config.scss']
+})
+export class RadarChartBasicConfigComponent extends BasicWidgetConfigComponent {
+
+  public get datasource(): Datasource {
+    const datasources: Datasource[] = this.radarChartWidgetConfigForm.get('datasources').value;
+    if (datasources && datasources.length) {
+      return datasources[0];
+    } else {
+      return null;
+    }
+  }
+
+  public get displayTimewindowConfig(): boolean {
+    const datasources = this.radarChartWidgetConfigForm.get('datasources').value;
+    return datasourcesHasAggregation(datasources);
+  }
+
+  public onlyHistoryTimewindow(): boolean {
+    const datasources = this.radarChartWidgetConfigForm.get('datasources').value;
+    return datasourcesHasOnlyComparisonAggregation(datasources);
+  }
+
+  radarChartShapes = radarChartShapes;
+
+  radarChartShapeTranslations = radarChartShapeTranslations;
+
+  chartLineTypes = chartLineTypes;
+
+  chartLineTypeTranslations = chartLineTypeTranslations;
+
+  chartShapes = chartShapes;
+
+  chartShapeTranslations = chartShapeTranslations;
+
+  chartLabelPositions = chartLabelPositions;
+
+  chartLabelPositionTranslations = chartLabelPositionTranslations;
+
+  legendPositions = legendPositions;
+
+  legendPositionTranslationMap = legendPositionTranslationMap;
+
+  latestChartTooltipValueTypes = latestChartTooltipValueTypes;
+
+  latestChartTooltipValueTypeTranslationMap = latestChartTooltipValueTypeTranslations;
+
+  radarChartWidgetConfigForm: 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.radarChartWidgetConfigForm;
+  }
+
+  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: RadarChartWidgetSettings = mergeDeep<RadarChartWidgetSettings>({} as RadarChartWidgetSettings,
+      radarChartWidgetDefaultSettings, configData.config.settings as RadarChartWidgetSettings);
+    this.radarChartWidgetConfigForm = this.fb.group({
+      timewindowConfig: [getTimewindowConfig(configData.config), []],
+      datasources: [configData.config.datasources, []],
+
+      series: [this.getSeries(configData.config.datasources), []],
+
+      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, []],
+
+      sortSeries: [settings.sortSeries, []],
+
+      units: [configData.config.units, []],
+      decimals: [configData.config.decimals, []],
+
+      shape: [settings.shape, []],
+      color: [settings.color, []],
+      showLine: [settings.showLine, []],
+      lineType: [settings.lineType, []],
+      lineWidth: [settings.lineWidth, [Validators.min(0)]],
+      showPoints: [settings.showPoints, []],
+      pointShape: [settings.pointShape, []],
+      pointSize: [settings.pointSize, [Validators.min(0)]],
+      showLabel: [settings.showLabel, []],
+      labelPosition: [settings.labelPosition, []],
+      labelFont: [settings.labelFont, []],
+      labelColor: [settings.labelColor, []],
+      fillAreaSettings: [settings.fillAreaSettings, []],
+
+      axisShowLabel: [settings.axisShowLabel, []],
+      axisLabelFont: [settings.axisLabelFont, []],
+      axisShowTickLabels: [settings.axisShowTickLabels, []],
+      axisTickLabelFont: [settings.axisTickLabelFont, []],
+      axisTickLabelColor: [settings.axisTickLabelColor, []],
+
+      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.sortSeries = config.sortSeries;
+
+    this.widgetConfig.config.units = config.units;
+    this.widgetConfig.config.decimals = config.decimals;
+
+    this.widgetConfig.config.settings.shape = config.shape;
+    this.widgetConfig.config.settings.color = config.color;
+    this.widgetConfig.config.settings.showLine = config.showLine;
+    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.pointShape = config.pointShape;
+    this.widgetConfig.config.settings.pointSize = config.pointSize;
+    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.fillAreaSettings = config.fillAreaSettings;
+
+    this.widgetConfig.config.settings.axisShowLabel = config.axisShowLabel;
+    this.widgetConfig.config.settings.axisLabelFont = config.axisLabelFont;
+    this.widgetConfig.config.settings.axisShowTickLabels = config.axisShowTickLabels;
+    this.widgetConfig.config.settings.axisTickLabelFont = config.axisTickLabelFont;
+    this.widgetConfig.config.settings.axisTickLabelColor = config.axisTickLabelColor;
+
+    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 ['showTitle', 'showTitleIcon', 'showLine', 'showPoints', 'showLabel', 'axisShowLabel',
+      'axisShowTickLabels', 'showLegend', 'showTooltip'];
+  }
+
+  protected updateValidators(emitEvent: boolean, trigger?: string) {
+    const showTitle: boolean = this.radarChartWidgetConfigForm.get('showTitle').value;
+    const showTitleIcon: boolean = this.radarChartWidgetConfigForm.get('showTitleIcon').value;
+    const showLine: boolean = this.radarChartWidgetConfigForm.get('showLine').value;
+    const showPoints: boolean = this.radarChartWidgetConfigForm.get('showPoints').value;
+    const showLabel: boolean = this.radarChartWidgetConfigForm.get('showLabel').value;
+    const axisShowLabel: boolean = this.radarChartWidgetConfigForm.get('axisShowLabel').value;
+    const axisShowTickLabels: boolean = this.radarChartWidgetConfigForm.get('axisShowTickLabels').value;
+    const showLegend: boolean = this.radarChartWidgetConfigForm.get('showLegend').value;
+    const showTooltip: boolean = this.radarChartWidgetConfigForm.get('showTooltip').value;
+
+    if (showTitle) {
+      this.radarChartWidgetConfigForm.get('title').enable();
+      this.radarChartWidgetConfigForm.get('titleFont').enable();
+      this.radarChartWidgetConfigForm.get('titleColor').enable();
+      this.radarChartWidgetConfigForm.get('showTitleIcon').enable({emitEvent: false});
+      if (showTitleIcon) {
+        this.radarChartWidgetConfigForm.get('titleIcon').enable();
+        this.radarChartWidgetConfigForm.get('iconColor').enable();
+      } else {
+        this.radarChartWidgetConfigForm.get('titleIcon').disable();
+        this.radarChartWidgetConfigForm.get('iconColor').disable();
+      }
+    } else {
+      this.radarChartWidgetConfigForm.get('title').disable();
+      this.radarChartWidgetConfigForm.get('titleFont').disable();
+      this.radarChartWidgetConfigForm.get('titleColor').disable();
+      this.radarChartWidgetConfigForm.get('showTitleIcon').disable({emitEvent: false});
+      this.radarChartWidgetConfigForm.get('titleIcon').disable();
+      this.radarChartWidgetConfigForm.get('iconColor').disable();
+    }
+
+    if (showLine) {
+      this.radarChartWidgetConfigForm.get('lineType').enable();
+      this.radarChartWidgetConfigForm.get('lineWidth').enable();
+    } else {
+      this.radarChartWidgetConfigForm.get('lineType').disable();
+      this.radarChartWidgetConfigForm.get('lineWidth').disable();
+    }
+
+    if (showPoints) {
+      this.radarChartWidgetConfigForm.get('pointShape').enable();
+      this.radarChartWidgetConfigForm.get('pointSize').enable();
+    } else {
+      this.radarChartWidgetConfigForm.get('pointShape').disable();
+      this.radarChartWidgetConfigForm.get('pointSize').disable();
+    }
+
+    if (showLabel) {
+      this.radarChartWidgetConfigForm.get('labelPosition').enable();
+      this.radarChartWidgetConfigForm.get('labelFont').enable();
+      this.radarChartWidgetConfigForm.get('labelColor').enable();
+    } else {
+      this.radarChartWidgetConfigForm.get('labelPosition').disable();
+      this.radarChartWidgetConfigForm.get('labelFont').disable();
+      this.radarChartWidgetConfigForm.get('labelColor').disable();
+    }
+
+    if (axisShowLabel) {
+      this.radarChartWidgetConfigForm.get('axisLabelFont').enable();
+    } else {
+      this.radarChartWidgetConfigForm.get('axisLabelFont').disable();
+    }
+
+    if (axisShowTickLabels) {
+      this.radarChartWidgetConfigForm.get('axisTickLabelFont').enable();
+      this.radarChartWidgetConfigForm.get('axisTickLabelColor').enable();
+    } else {
+      this.radarChartWidgetConfigForm.get('axisTickLabelFont').disable();
+      this.radarChartWidgetConfigForm.get('axisTickLabelColor').disable();
+    }
+
+    if (showLegend) {
+      this.radarChartWidgetConfigForm.get('legendPosition').enable();
+      this.radarChartWidgetConfigForm.get('legendLabelFont').enable();
+      this.radarChartWidgetConfigForm.get('legendLabelColor').enable();
+      this.radarChartWidgetConfigForm.get('legendValueFont').enable();
+      this.radarChartWidgetConfigForm.get('legendValueColor').enable();
+    } else {
+      this.radarChartWidgetConfigForm.get('legendPosition').disable();
+      this.radarChartWidgetConfigForm.get('legendLabelFont').disable();
+      this.radarChartWidgetConfigForm.get('legendLabelColor').disable();
+      this.radarChartWidgetConfigForm.get('legendValueFont').disable();
+      this.radarChartWidgetConfigForm.get('legendValueColor').disable();
+    }
+    if (showTooltip) {
+      this.radarChartWidgetConfigForm.get('tooltipValueType').enable();
+      this.radarChartWidgetConfigForm.get('tooltipValueDecimals').enable();
+      this.radarChartWidgetConfigForm.get('tooltipValueFont').enable();
+      this.radarChartWidgetConfigForm.get('tooltipValueColor').enable();
+      this.radarChartWidgetConfigForm.get('tooltipBackgroundColor').enable();
+      this.radarChartWidgetConfigForm.get('tooltipBackgroundBlur').enable();
+    } else {
+      this.radarChartWidgetConfigForm.get('tooltipValueType').disable();
+      this.radarChartWidgetConfigForm.get('tooltipValueDecimals').disable();
+      this.radarChartWidgetConfigForm.get('tooltipValueFont').disable();
+      this.radarChartWidgetConfigForm.get('tooltipValueColor').disable();
+      this.radarChartWidgetConfigForm.get('tooltipBackgroundColor').disable();
+      this.radarChartWidgetConfigForm.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.radarChartWidgetConfigForm.get('units').value;
+    const decimals: number = this.radarChartWidgetConfigForm.get('decimals').value;
+    return formatValue(110, decimals, units, false);
+  }
+
+  private _tooltipValuePreviewFn(): string {
+    const tooltipValueType: LatestChartTooltipValueType = this.radarChartWidgetConfigForm.get('tooltipValueType').value;
+    const decimals: number = this.radarChartWidgetConfigForm.get('tooltipValueDecimals').value;
+    if (tooltipValueType === LatestChartTooltipValueType.percentage) {
+      return formatValue(35, decimals, '%', false);
+    } else {
+      const units: string = this.radarChartWidgetConfigForm.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 e64e8130cf..eb1b2298a7 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 chartLineTypes" [value]="lineType">
+              {{ chartLineTypeTranslations.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 chartLabelPositions" [value]="position">
+                {{ chartLabelPositionTranslations.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 chartShapes" [value]="shape">
+              {{ chartShapeTranslations.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,14 +326,15 @@
                             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>
           <div fxFlex.gt-xs fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
-            <tb-date-format-select fxFlex excludeLastUpdateAgo formControlName="tooltipDateFormat"></tb-date-format-select>
+            <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
@@ -179,6 +343,13 @@
             </tb-color-input>
           </div>
         </div>
+        <div class="tb-form-row">
+          <mat-slide-toggle class="mat-slide" formControlName="tooltipDateInterval">
+            <div tb-hint-tooltip-icon="{{'tooltip.show-date-time-interval-hint' | translate}}">
+              {{ 'tooltip.show-date-time-interval' | translate }}
+            </div>
+          </mat-slide-toggle>
+        </div>
         <div class="tb-form-row space-between">
           <div>{{ 'tooltip.background-color' | translate }}</div>
           <tb-color-input asBoxInput
@@ -196,6 +367,9 @@
       </ng-template>
     </mat-expansion-panel>
   </div>
+  <tb-chart-animation-settings
+      formControlName="animation">
+  </tb-chart-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">
@@ -215,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 b2a1b75f66..8e29d43a3e 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,18 @@ import {
   rangeChartDefaultSettings,
   RangeChartWidgetSettings
 } from '@home/components/widget/lib/chart/range-chart-widget.models';
+import {
+  lineSeriesStepTypes,
+  lineSeriesStepTypeTranslations
+} from '@home/components/widget/lib/chart/time-series-chart.models';
+import {
+  chartLabelPositions,
+  chartLabelPositionTranslations,
+  chartLineTypes,
+  chartLineTypeTranslations,
+  chartShapes,
+  chartShapeTranslations
+} from '@home/components/widget/lib/chart/chart.models';
 
 @Component({
   selector: 'tb-range-chart-basic-config',
@@ -46,12 +64,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;
+
+  chartLineTypes = chartLineTypes;
+
+  chartLineTypeTranslations = chartLineTypeTranslations;
+
+  chartLabelPositions = chartLabelPositions;
+
+  chartLabelPositionTranslations = chartLabelPositionTranslations;
+
+  chartShapes = chartShapes;
+
+  chartShapeTranslations = chartShapeTranslations;
+
   legendPositions = legendPositions;
 
   legendPositionTranslationMap = legendPositionTranslationMap;
 
   rangeChartWidgetConfigForm: UntypedFormGroup;
 
+  pointLabelPreviewFn = this._pointLabelPreviewFn.bind(this);
+
   tooltipValuePreviewFn = this._tooltipValuePreviewFn.bind(this);
 
   tooltipDatePreviewFn = this._tooltipDatePreviewFn.bind(this);
@@ -72,7 +117,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 +136,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,12 +178,16 @@ 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, []],
       tooltipDateFormat: [settings.tooltipDateFormat, []],
       tooltipDateFont: [settings.tooltipDateFont, []],
       tooltipDateColor: [settings.tooltipDateColor, []],
+      tooltipDateInterval: [settings.tooltipDateInterval, []],
+
       tooltipBackgroundColor: [settings.tooltipBackgroundColor, []],
       tooltipBackgroundBlur: [settings.tooltipBackgroundBlur, []],
 
@@ -115,6 +195,7 @@ export class RangeChartBasicConfigComponent extends BasicWidgetConfigComponent {
 
       cardButtons: [this.getCardButtons(configData.config), []],
       borderRadius: [configData.config.borderRadius, []],
+      padding: [settings.padding, []],
 
       actions: [configData.config.actions || {}, []]
     });
@@ -136,12 +217,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;
@@ -149,12 +262,15 @@ 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;
     this.widgetConfig.config.settings.tooltipDateFormat = config.tooltipDateFormat;
     this.widgetConfig.config.settings.tooltipDateFont = config.tooltipDateFont;
     this.widgetConfig.config.settings.tooltipDateColor = config.tooltipDateColor;
+    this.widgetConfig.config.settings.tooltipDateInterval = config.tooltipDateInterval;
     this.widgetConfig.config.settings.tooltipBackgroundColor = config.tooltipBackgroundColor;
     this.widgetConfig.config.settings.tooltipBackgroundBlur = config.tooltipBackgroundBlur;
 
@@ -162,18 +278,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;
@@ -205,6 +329,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();
@@ -216,6 +388,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});
@@ -225,18 +399,23 @@ export class RangeChartBasicConfigComponent extends BasicWidgetConfigComponent {
         this.rangeChartWidgetConfigForm.get('tooltipDateFormat').enable();
         this.rangeChartWidgetConfigForm.get('tooltipDateFont').enable();
         this.rangeChartWidgetConfigForm.get('tooltipDateColor').enable();
+        this.rangeChartWidgetConfigForm.get('tooltipDateInterval').enable();
       } else {
         this.rangeChartWidgetConfigForm.get('tooltipDateFormat').disable();
         this.rangeChartWidgetConfigForm.get('tooltipDateFont').disable();
         this.rangeChartWidgetConfigForm.get('tooltipDateColor').disable();
+        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});
       this.rangeChartWidgetConfigForm.get('tooltipDateFormat').disable();
       this.rangeChartWidgetConfigForm.get('tooltipDateFont').disable();
       this.rangeChartWidgetConfigForm.get('tooltipDateColor').disable();
+      this.rangeChartWidgetConfigForm.get('tooltipDateInterval').disable();
       this.rangeChartWidgetConfigForm.get('tooltipBackgroundColor').disable();
       this.rangeChartWidgetConfigForm.get('tooltipBackgroundBlur').disable();
     }
@@ -254,6 +433,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
new file mode 100644
index 0000000000..3d0fe04e4c
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/time-series-chart-basic-config.component.html
@@ -0,0 +1,363 @@
+<!--
+
+    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]="timeSeriesChartWidgetConfigForm">
+  <tb-timewindow-config-panel formControlName="timewindowConfig">
+  </tb-timewindow-config-panel>
+  <tb-datasources
+      [configMode]="basicMode"
+      hideDatasourceLabel
+      hideDataKeys
+      forceSingleDatasource
+      formControlName="datasources">
+  </tb-datasources>
+  <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)">
+  </tb-time-series-chart-y-axes-panel>
+  <tb-time-series-chart-thresholds-panel
+    formControlName="thresholds"
+    [aliasController]="aliasController"
+    [dataKeyCallbacks]="callbacks"
+    [datasource]="datasource"
+    [widgetConfig]="widgetConfig?.config"
+    [yAxisIds]="yAxisIds">
+  </tb-time-series-chart-thresholds-panel>
+  <div class="tb-form-panel">
+    <div class="tb-form-panel-title" translate>widget-config.appearance</div>
+    <div class="tb-form-row column-xs">
+      <mat-slide-toggle class="mat-slide fixed-title-width" formControlName="showTitle">
+        {{ 'widget-config.title' | 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="title" placeholder="{{ 'widget-config.set' | translate }}">
+        </mat-form-field>
+        <tb-font-settings formControlName="titleFont"
+                          clearButton
+                          [previewText]="timeSeriesChartWidgetConfigForm.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 column-xs">
+      <mat-slide-toggle class="mat-slide fixed-title-width" formControlName="showIcon">
+        {{ 'widget-config.card-icon' | translate }}
+      </mat-slide-toggle>
+      <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
+                                 iconClearButton
+                                 [color]="timeSeriesChartWidgetConfigForm.get('iconColor').value"
+                                 formControlName="icon">
+        </tb-material-icon-select>
+        <tb-color-input asBoxInput
+                        colorClearButton
+                        formControlName="iconColor">
+        </tb-color-input>
+      </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 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}}">
+          {{ 'widgets.time-series-chart.stack-mode' | translate }}
+        </div>
+      </mat-slide-toggle>
+    </div>
+  </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-no-aggregation-bar-width-settings
+    *ngIf="chartType === TimeSeriesChartType.default || chartType === TimeSeriesChartType.bar"
+    formControlName="noAggregationBarWidthSettings">
+  </tb-time-series-no-aggregation-bar-width-settings>
+  <div class="tb-form-panel tb-slide-toggle">
+    <mat-expansion-panel class="tb-settings" [expanded]="timeSeriesChartWidgetConfigForm.get('showLegend').value"
+                         [disabled]="!timeSeriesChartWidgetConfigForm.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.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
+                            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"
+                              [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>
+      </ng-template>
+    </mat-expansion-panel>
+  </div>
+  <div class="tb-form-panel tb-slide-toggle">
+    <mat-expansion-panel class="tb-settings" [expanded]="timeSeriesChartWidgetConfigForm.get('showTooltip').value"
+                         [disabled]="!timeSeriesChartWidgetConfigForm.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">
+          <div>{{ 'tooltip.trigger' | translate }}</div>
+          <mat-chip-listbox class="center-stretch" formControlName="tooltipTrigger">
+            <mat-chip-option [selectable]="timeSeriesChartWidgetConfigForm.get('tooltipTrigger').value !== EChartsTooltipTrigger.point"
+                             [value]="EChartsTooltipTrigger.point">{{ 'tooltip.trigger-point' | translate }}</mat-chip-option>
+            <mat-chip-option [selectable]="timeSeriesChartWidgetConfigForm.get('tooltipTrigger').value !== EChartsTooltipTrigger.axis"
+                             [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
+                            colorClearButton
+                            formControlName="tooltipValueColor">
+            </tb-color-input>
+          </div>
+        </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>
+          <div fxFlex.gt-xs fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+            <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
+                            colorClearButton
+                            formControlName="tooltipDateColor">
+            </tb-color-input>
+          </div>
+        </div>
+        <div class="tb-form-row">
+          <mat-slide-toggle class="mat-slide" formControlName="tooltipDateInterval">
+            <div tb-hint-tooltip-icon="{{'tooltip.show-date-time-interval-hint' | translate}}">
+              {{ 'tooltip.show-date-time-interval' | translate }}
+            </div>
+          </mat-slide-toggle>
+        </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-chart-animation-settings
+    formControlName="animation">
+  </tb-chart-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 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">
+  </tb-widget-actions-panel>
+</ng-container>
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
new file mode 100644
index 0000000000..9a8cb6a7b3
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/time-series-chart-basic-config.component.ts
@@ -0,0 +1,450 @@
+///
+/// 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 { 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,
+  DatasourceType,
+  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, isDefinedAndNotNull, isUndefined, mergeDeep } from '@core/utils';
+import {
+  cssSizeToStrSize,
+  DateFormatProcessor,
+  DateFormatSettings,
+  resolveCssSize
+} from '@shared/models/widget-settings.models';
+import {
+  timeSeriesChartWidgetDefaultSettings,
+  TimeSeriesChartWidgetSettings
+} from '@home/components/widget/lib/chart/time-series-chart-widget.models';
+import {
+  TimeSeriesChartTooltipTrigger,
+  TimeSeriesChartKeySettings,
+  TimeSeriesChartType,
+  TimeSeriesChartYAxes,
+  TimeSeriesChartYAxisId
+} from '@home/components/widget/lib/chart/time-series-chart.models';
+
+@Component({
+  selector: 'tb-time-series-chart-basic-config',
+  templateUrl: './time-series-chart-basic-config.component.html',
+  styleUrls: ['../basic-config.scss']
+})
+export class TimeSeriesChartBasicConfigComponent extends BasicWidgetConfigComponent {
+
+  public get datasource(): Datasource {
+    const datasources: Datasource[] = this.timeSeriesChartWidgetConfigForm.get('datasources').value;
+    if (datasources && datasources.length) {
+      return datasources[0];
+    } else {
+      return null;
+    }
+  }
+
+  public get yAxisIds(): TimeSeriesChartYAxisId[] {
+    const yAxes: TimeSeriesChartYAxes = this.timeSeriesChartWidgetConfigForm.get('yAxes').value;
+    return Object.keys(yAxes);
+  }
+
+  TimeSeriesChartType = TimeSeriesChartType;
+
+  EChartsTooltipTrigger = TimeSeriesChartTooltipTrigger;
+
+  legendPositions = legendPositions;
+
+  legendPositionTranslationMap = legendPositionTranslationMap;
+
+  timeSeriesChartWidgetConfigForm: UntypedFormGroup;
+
+  tooltipValuePreviewFn = this._tooltipValuePreviewFn.bind(this);
+
+  tooltipDatePreviewFn = this._tooltipDatePreviewFn.bind(this);
+
+  chartType: TimeSeriesChartType = TimeSeriesChartType.default;
+
+  seriesMode = 'series';
+
+  constructor(protected store: Store<AppState>,
+              protected widgetConfigComponent: WidgetConfigComponent,
+              private $injector: Injector,
+              private fb: UntypedFormBuilder) {
+    super(store, widgetConfigComponent);
+  }
+
+  public yAxisRemoved(yAxisId: TimeSeriesChartYAxisId): void {
+    if (this.widgetConfig.config.datasources && this.widgetConfig.config.datasources.length > 1) {
+      for (let i = 1; i < this.widgetConfig.config.datasources.length; i++) {
+        const datasource = this.widgetConfig.config.datasources[i];
+        this.removeYaxisId(datasource.dataKeys, yAxisId);
+      }
+    }
+  }
+
+  seriesModeChange(seriesMode: string) {
+    this.seriesMode = seriesMode;
+    this.updateSeriesState();
+  }
+
+  protected configForm(): UntypedFormGroup {
+    return this.timeSeriesChartWidgetConfigForm;
+  }
+
+  protected setupConfig(widgetConfig: WidgetConfigComponentData) {
+    const params = widgetConfig.typeParameters as any;
+    if (isDefinedAndNotNull(params.chartType)) {
+      this.chartType = params.chartType;
+    }
+    super.setupConfig(widgetConfig);
+  }
+
+  protected defaultDataKeys(configData: WidgetConfigComponentData): DataKey[] {
+    return [{ name: 'temperature', label: 'Temperature', type: DataKeyType.timeseries, units: '°C', decimals: 0 }];
+  }
+
+  protected onConfigSet(configData: WidgetConfigComponentData) {
+    const settings: TimeSeriesChartWidgetSettings = mergeDeep<TimeSeriesChartWidgetSettings>({} as TimeSeriesChartWidgetSettings,
+      timeSeriesChartWidgetDefaultSettings, configData.config.settings as TimeSeriesChartWidgetSettings);
+    const iconSize = resolveCssSize(configData.config.iconSize);
+    this.timeSeriesChartWidgetConfigForm = this.fb.group({
+      timewindowConfig: [getTimewindowConfig(configData.config), []],
+      datasources: [configData.config.datasources, []],
+
+      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, []],
+      title: [configData.config.title, []],
+      titleFont: [configData.config.titleFont, []],
+      titleColor: [configData.config.titleColor, []],
+
+      showIcon: [configData.config.showTitleIcon, []],
+      iconSize: [iconSize[0], [Validators.min(0)]],
+      iconSizeUnit: [iconSize[1], []],
+      icon: [configData.config.titleIcon, []],
+      iconColor: [configData.config.iconColor, []],
+
+      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, []],
+      tooltipDateFormat: [settings.tooltipDateFormat, []],
+      tooltipDateFont: [settings.tooltipDateFont, []],
+      tooltipDateColor: [settings.tooltipDateColor, []],
+      tooltipDateInterval: [settings.tooltipDateInterval, []],
+
+      tooltipBackgroundColor: [settings.tooltipBackgroundColor, []],
+      tooltipBackgroundBlur: [settings.tooltipBackgroundBlur, []],
+
+      animation: [settings.animation, []],
+
+      background: [settings.background, []],
+
+      cardButtons: [this.getCardButtons(configData.config), []],
+      borderRadius: [configData.config.borderRadius, []],
+      padding: [settings.padding, []],
+
+      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 {
+    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.showIcon;
+    this.widgetConfig.config.iconSize = cssSizeToStrSize(config.iconSize, config.iconSizeUnit);
+    this.widgetConfig.config.titleIcon = config.icon;
+    this.widgetConfig.config.iconColor = config.iconColor;
+
+    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;
+    this.widgetConfig.config.settings.tooltipDateFormat = config.tooltipDateFormat;
+    this.widgetConfig.config.settings.tooltipDateFont = config.tooltipDateFont;
+    this.widgetConfig.config.settings.tooltipDateColor = config.tooltipDateColor;
+    this.widgetConfig.config.settings.tooltipDateInterval = config.tooltipDateInterval;
+    this.widgetConfig.config.settings.tooltipBackgroundColor = config.tooltipBackgroundColor;
+    this.widgetConfig.config.settings.tooltipBackgroundBlur = config.tooltipBackgroundBlur;
+
+    this.widgetConfig.config.settings.animation = config.animation;
+
+    this.widgetConfig.config.settings.background = config.background;
+
+    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;
+
+    if (this.chartType === TimeSeriesChartType.state) {
+      this.widgetConfig.config.settings.states = config.states;
+    }
+    return this.widgetConfig;
+  }
+
+  protected validatorTriggers(): string[] {
+    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();
+      this.timeSeriesChartWidgetConfigForm.get('titleColor').enable();
+      this.timeSeriesChartWidgetConfigForm.get('showIcon').enable({emitEvent: false});
+      if (showIcon) {
+        this.timeSeriesChartWidgetConfigForm.get('iconSize').enable();
+        this.timeSeriesChartWidgetConfigForm.get('iconSizeUnit').enable();
+        this.timeSeriesChartWidgetConfigForm.get('icon').enable();
+        this.timeSeriesChartWidgetConfigForm.get('iconColor').enable();
+      } else {
+        this.timeSeriesChartWidgetConfigForm.get('iconSize').disable();
+        this.timeSeriesChartWidgetConfigForm.get('iconSizeUnit').disable();
+        this.timeSeriesChartWidgetConfigForm.get('icon').disable();
+        this.timeSeriesChartWidgetConfigForm.get('iconColor').disable();
+      }
+    } else {
+      this.timeSeriesChartWidgetConfigForm.get('title').disable();
+      this.timeSeriesChartWidgetConfigForm.get('titleFont').disable();
+      this.timeSeriesChartWidgetConfigForm.get('titleColor').disable();
+      this.timeSeriesChartWidgetConfigForm.get('showIcon').disable({emitEvent: false});
+      this.timeSeriesChartWidgetConfigForm.get('iconSize').disable();
+      this.timeSeriesChartWidgetConfigForm.get('iconSizeUnit').disable();
+      this.timeSeriesChartWidgetConfigForm.get('icon').disable();
+      this.timeSeriesChartWidgetConfigForm.get('iconColor').disable();
+    }
+
+    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});
+      this.timeSeriesChartWidgetConfigForm.get('tooltipBackgroundColor').enable();
+      this.timeSeriesChartWidgetConfigForm.get('tooltipBackgroundBlur').enable();
+      if (tooltipShowDate) {
+        this.timeSeriesChartWidgetConfigForm.get('tooltipDateFormat').enable();
+        this.timeSeriesChartWidgetConfigForm.get('tooltipDateFont').enable();
+        this.timeSeriesChartWidgetConfigForm.get('tooltipDateColor').enable();
+        this.timeSeriesChartWidgetConfigForm.get('tooltipDateInterval').enable();
+      } else {
+        this.timeSeriesChartWidgetConfigForm.get('tooltipDateFormat').disable();
+        this.timeSeriesChartWidgetConfigForm.get('tooltipDateFont').disable();
+        this.timeSeriesChartWidgetConfigForm.get('tooltipDateColor').disable();
+        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});
+      this.timeSeriesChartWidgetConfigForm.get('tooltipDateFormat').disable();
+      this.timeSeriesChartWidgetConfigForm.get('tooltipDateFont').disable();
+      this.timeSeriesChartWidgetConfigForm.get('tooltipDateColor').disable();
+      this.timeSeriesChartWidgetConfigForm.get('tooltipDateInterval').disable();
+      this.timeSeriesChartWidgetConfigForm.get('tooltipBackgroundColor').disable();
+      this.timeSeriesChartWidgetConfigForm.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 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) {
+      series.forEach(key => {
+        const keySettings = ((key.settings || {}) as TimeSeriesChartKeySettings);
+        if (keySettings.yAxisId === yAxisId) {
+          keySettings.yAxisId = 'default';
+          changed = true;
+        }
+      });
+    }
+    return changed;
+  }
+
+  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 _tooltipValuePreviewFn(): string {
+    return formatValue(22, 0, '°C', false);
+  }
+
+  private _tooltipDatePreviewFn(): string {
+    const dateFormat: DateFormatSettings = this.timeSeriesChartWidgetConfigForm.get('tooltipDateFormat').value;
+    const processor = DateFormatProcessor.fromSettings(this.$injector, dateFormat);
+    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-key-row.component.html b/ui-ngx/src/app/modules/home/components/widget/config/basic/common/data-key-row.component.html
index 8b233f0b09..0c8be80bf6 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/basic/common/data-key-row.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/common/data-key-row.component.html
@@ -22,126 +22,46 @@
       <mat-option [value]="true">{{ 'datakey.latest' | translate }}</mat-option>
     </mat-select>
   </mat-form-field>
-  <mat-form-field class="tb-inline-field tb-key-field" subscriptSizing="dynamic">
-    <mat-chip-grid #chipList [formControl]="keysFormControl">
-      <mat-chip-row class="tb-datakey-chip" *ngIf="modelValue?.type"
-                    (removed)="removeKey()">
-        <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="4px" class="tb-attribute-chip">
-          <div class="tb-chip-labels">
-            <div class="tb-chip-label tb-chip-text tb-chip-icon">
-              <ng-container *ngIf="isEntityDatasource">
-                <mat-icon class="tb-mat-18 tb-datakey-icon" *ngIf="modelValue.type === dataKeyTypes.alarm"
-                          matTooltip="{{'datakey.alarm' | translate }}"
-                          matTooltipPosition="above">notifications</mat-icon>
-                <mat-icon class="tb-mat-18 tb-datakey-icon" *ngIf="modelValue.type === dataKeyTypes.attribute"
-                          matTooltip="{{'datakey.attributes' | translate }}"
-                          matTooltipPosition="above" svgIcon="mdi:alpha-a-circle-outline"></mat-icon>
-                <mat-icon class="tb-mat-18 tb-datakey-icon" *ngIf="modelValue.type === dataKeyTypes.entityField"
-                          matTooltip="{{'datakey.entity-field' | translate }}"
-                          matTooltipPosition="above" svgIcon="mdi:alpha-e-circle-outline"></mat-icon>
-                <mat-icon class="tb-mat-18 tb-datakey-icon" *ngIf="modelValue.type === dataKeyTypes.timeseries"
-                          matTooltip="{{'datakey.timeseries' | translate }}"
-                          matTooltipPosition="above">timeline</mat-icon>
-              </ng-container>
-            </div>
-            <div class="tb-chip-label tb-chip-text">
-              <strong>
-                <ng-container *ngTemplateOutlet="keyName"></ng-container>
-              </strong>
-            </div>
-          </div>
-          <button type="button"
-                  (click)="editKey()" mat-icon-button class="tb-mat-24">
-            <mat-icon class="tb-mat-18">edit</mat-icon>
-          </button>
-          <button matChipRemove
-                  type="button"
-                  mat-icon-button class="tb-mat-24">
-            <mat-icon class="tb-mat-18">close</mat-icon>
-          </button>
-        </div>
-      </mat-chip-row>
-      <input matInput
-             type="text"
-             placeholder="{{ 'widget-config.set' | translate }}"
-             #keyInput
-             [formControl]="keyFormControl"
-             matAutocompleteOrigin
-             [fxHide]="!!modelValue?.type"
-             [readonly]="!!modelValue?.type"
-             #origin="matAutocompleteOrigin"
-             [matAutocompleteConnectedTo]="origin"
-             (focusin)="onKeyInputFocus()"
-             (drop)="$event.preventDefault();"
-             [matAutocomplete]="keyAutocomplete"
-             [matChipInputFor]="chipList"
-             [matChipInputSeparatorKeyCodes]="separatorKeysCodes"
-             (matChipInputTokenEnd)="addKey($event)"
-      />
-    </mat-chip-grid>
-    <mat-autocomplete #keyAutocomplete="matAutocomplete"
-                      class="tb-autocomplete"
-                      panelWidth="fit-content"
-                      [displayWith]="displayKeyFn">
-      <mat-option *ngFor="let key of filteredKeys | async" [value]="key">
-      <span style="white-space: nowrap;">
-        <ng-container *ngIf="isEntityDatasource">
-          <mat-icon class="tb-datakey-icon" *ngIf="key.type === dataKeyTypes.alarm"
-                    matTooltip="{{'datakey.alarm' | translate }}"
-                    matTooltipPosition="above">notifications</mat-icon>
-          <mat-icon class="tb-datakey-icon" *ngIf="key.type === dataKeyTypes.attribute"
-                    matTooltip="{{'datakey.attributes' | translate }}"
-                    matTooltipPosition="above" svgIcon="mdi:alpha-a-circle-outline"></mat-icon>
-          <mat-icon class="tb-datakey-icon" *ngIf="key.type === dataKeyTypes.entityField"
-                    matTooltip="{{'datakey.entity-field' | translate }}"
-                    matTooltipPosition="above" svgIcon="mdi:alpha-e-circle-outline"></mat-icon>
-          <mat-icon class="tb-datakey-icon" *ngIf="key.type === dataKeyTypes.timeseries"
-                    matTooltip="{{'datakey.timeseries' | translate }}"
-                    matTooltipPosition="above">timeline</mat-icon>
-        </ng-container>
-        <span [innerHTML]="key.name | highlight:keySearchText"></span>
-      </span>
-      </mat-option>
-      <mat-option *ngIf="!(filteredKeys | async)?.length" [value]="null" class="tb-not-found">
-        <div class="tb-not-found-content" (click)="$event.stopPropagation()">
-          <div *ngIf="!textIsNotEmpty(keySearchText); else searchNotEmpty">
-            <span translate>entity.no-keys-found</span>
-          </div>
-          <ng-template #searchNotEmpty>
-          <span>
-            {{ translate.get('entity.no-key-matching',
-            {key: truncate.transform(keySearchText, true, 6, &apos;...&apos;)}) | async }}
-          </span>
-            <span *ngIf="!isEntityDatasource; else createEntityKey">
-            <a translate (click)="createKey(keySearchText)">entity.create-new-key</a>
-          </span>
-            <ng-template #createEntityKey>
-              <span>{{'entity.create-new-key' | translate }}  </span>
-              <mat-icon class="tb-datakey-icon new-key" *ngIf="widgetType === widgetTypes.alarm"
-                        matTooltip="{{'datakey.alarm' | translate }}"
-                        matTooltipPosition="above"
-                        (click)="createKey(keySearchText, dataKeyTypes.alarm)">notifications</mat-icon>
-              <mat-icon class="tb-datakey-icon new-key" *ngIf="widgetType === widgetTypes.latest || widgetType === widgetTypes.alarm"
-                        matTooltip="{{'datakey.attributes' | translate }}"
-                        matTooltipPosition="above" svgIcon="mdi:alpha-a-circle-outline"
-                        (click)="createKey(keySearchText, dataKeyTypes.attribute)"></mat-icon>
-              <mat-icon class="tb-datakey-icon new-key" *ngIf="widgetType === widgetTypes.latest || widgetType === widgetTypes.alarm"
-                        matTooltip="{{'datakey.entity-field' | translate }}"
-                        matTooltipPosition="above" svgIcon="mdi:alpha-e-circle-outline"
-                        (click)="createKey(keySearchText, dataKeyTypes.entityField)"></mat-icon>
-              <mat-icon class="tb-datakey-icon new-key"
-                        matTooltip="{{'datakey.timeseries' | translate }}"
-                        matTooltipPosition="above"
-                        (click)="createKey(keySearchText, dataKeyTypes.timeseries)">timeline</mat-icon>
-            </ng-template>
-          </ng-template>
-        </div>
-      </mat-option>
-    </mat-autocomplete>
-  </mat-form-field>
+  <tb-data-key-input
+    [required]="required"
+    [widgetType]="widgetType"
+    [datasourceType]="datasourceType"
+    [entityAliasId]="entityAliasId"
+    [deviceId]="deviceId"
+    [dataKeyType]="dataKeyType"
+    [isLatestDataKeys]="isLatestDataKeys"
+    [callbacks]="callbacks"
+    [generateKey]="generateDataKey"
+    (keyEdit)="editKey()"
+    [formControl]="keyFormControl">
+  </tb-data-key-input>
   <mat-form-field *ngIf="!hideDataKeyLabel" class="tb-inline-field tb-label-field" appearance="outline" subscriptSizing="dynamic">
     <input matInput formControlName="label" placeholder="{{ 'widget-config.set' | translate }}">
   </mat-form-field>
+  <div *ngIf="timeSeriesChart && showTimeSeriesType" class="tb-time-series-type-field">
+    <mat-form-field *ngIf="displayUnitsOrDigits" class="tb-inline-field fixed-height" appearance="outline" subscriptSizing="dynamic">
+      <mat-select formControlName="timeSeriesType" panelClass="tb-time-series-type-field">
+        <mat-select-trigger>
+          <tb-icon *ngIf="keyRowFormGroup.get('timeSeriesType').value">
+            {{ timeSeriesChartSeriesTypeIcons.get(keyRowFormGroup.get('timeSeriesType').value) }}
+          </tb-icon>
+        </mat-select-trigger>
+        <mat-option *ngFor="let type of timeSeriesChartSeriesTypes" [value]="type" class="flex">
+          <tb-icon>{{ timeSeriesChartSeriesTypeIcons.get(type) }}</tb-icon>
+          <span>{{ timeSeriesChartSeriesTypeTranslations.get(type) | translate }}</span>
+        </mat-option>
+      </mat-select>
+    </mat-form-field>
+  </div>
+  <div *ngIf="timeSeriesChart" class="tb-y-axis-field">
+    <mat-form-field *ngIf="displayUnitsOrDigits" class="tb-inline-field fixed-height" appearance="outline" subscriptSizing="dynamic">
+      <mat-select formControlName="yAxis">
+        <mat-option *ngFor="let yAxis of yAxisIds" [value]="yAxis">
+          {{ yAxis }}
+        </mat-option>
+      </mat-select>
+    </mat-form-field>
+  </div>
   <div *ngIf="!hideDataKeyColor" class="tb-color-field">
     <tb-color-input asBoxInput
                     formControlName="color">
@@ -178,19 +98,3 @@
     </button>
   </div>
 </div>
-<ng-template #keyName>
-  <ng-container *ngIf="dataKeyHasPostprocessing(); else keyName">
-    <span>f(</span><ng-container *ngTemplateOutlet="keyNameTemplate"></ng-container><span>)</span>
-  </ng-container>
-  <ng-template #keyName>
-    <ng-container *ngTemplateOutlet="keyNameTemplate"></ng-container>
-  </ng-template>
-</ng-template>
-<ng-template #keyNameTemplate>
-  <ng-container *ngIf="dataKeyHasAggregation(); else keyName;">
-    <span class="tb-agg-func">{{ modelValue?.aggregationType }}</span><span>({{ modelValue?.name }})</span>
-  </ng-container>
-  <ng-template #keyName>
-    <span>{{modelValue?.name}}</span>
-  </ng-template>
-</ng-template>
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/common/data-key-row.component.scss b/ui-ngx/src/app/modules/home/components/widget/config/basic/common/data-key-row.component.scss
index 06b740a8fb..01e042e0a8 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/basic/common/data-key-row.component.scss
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/common/data-key-row.component.scss
@@ -16,37 +16,13 @@
 @import '../../../../../../../../scss/constants';
 
 .tb-data-key-row {
-  .mat-mdc-form-field.tb-inline-field.tb-key-field {
-    .mat-mdc-text-field-wrapper:not(.mdc-text-field--outlined) {
-      padding-left: 8px;
-      padding-right: 0;
-      .mat-mdc-form-field-infix {
-        padding-top: 0;
-        padding-bottom: 6px;
-        .mdc-evolution-chip-set .mdc-evolution-chip {
-          margin: 0;
-        }
-        input.mat-mdc-chip-input {
-          height: 32px;
-          margin-left: 0;
-        }
-      }
-    }
-    .mat-mdc-chip.mat-mdc-standard-chip.tb-datakey-chip {
-      .tb-attribute-chip {
-        .tb-chip-labels {
-          background: transparent;
-        }
-      }
-    }
-  }
 
   .tb-source-field {
     width: 108px;
     min-width: 108px;
   }
 
-  .tb-key-field {
+  .tb-data-key-input {
     flex: 1;
     min-width: 150px;
     @media #{$mat-gt-sm} {
@@ -59,7 +35,7 @@
     min-width: 100px;
   }
 
-  .tb-color-field, .tb-units-field, .tb-decimals-field {
+  .tb-color-field, .tb-units-field, .tb-decimals-field, .tb-time-series-type-field {
     display: flex;
     flex-direction: row;
     place-content: center;
@@ -81,10 +57,41 @@
     min-width: 60px;
   }
 
+  .tb-y-axis-field {
+    width: 100px;
+    min-width: 100px;
+    .mat-mdc-form-field {
+      width: 100%;
+    }
+  }
+
+  .tb-time-series-type-field {
+    width: 60px;
+    min-width: 60px;
+    .mat-icon {
+      color: rgba(0,0,0,0.76);
+    }
+  }
+
   .tb-label-field, .tb-units-field, .tb-color-field, .tb-decimals-field {
     display: none;
     @media #{$mat-gt-sm} {
-      display: block;
+      display: flex;
+    }
+  }
+
+  .tb-y-axis-field {
+    @media #{$mat-md} {
+      display: none;
+    }
+  }
+
+  .tb-time-series-type-field {
+    @media #{$mat-xs} {
+      display: none;
+    }
+    @media #{$mat-md} {
+      display: none;
     }
   }
 
@@ -113,3 +120,11 @@
     }
   }
 }
+
+.tb-time-series-type-field {
+  .mat-mdc-option:not(.mdc-list-item--selected) {
+    .mat-icon {
+      color: rgba(0,0,0,0.54);
+    }
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/common/data-key-row.component.ts b/ui-ngx/src/app/modules/home/components/widget/config/basic/common/data-key-row.component.ts
index b75b9c09a4..72eedc21a0 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/basic/common/data-key-row.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/common/data-key-row.component.ts
@@ -17,15 +17,11 @@
 import {
   ChangeDetectorRef,
   Component,
-  ElementRef,
   EventEmitter,
   forwardRef,
-  Input,
-  OnChanges,
+  Input, OnChanges,
   OnInit,
-  Output,
-  SimpleChanges,
-  ViewChild,
+  Output, SimpleChanges,
   ViewEncapsulation
 } from '@angular/core';
 import {
@@ -49,15 +45,8 @@ import {
   widgetType
 } from '@shared/models/widget.models';
 import { DataKeyType } from '@shared/models/telemetry/telemetry.models';
-import { AggregationType } from '@shared/models/time/time.models';
-import { COMMA, ENTER, SEMICOLON } from '@angular/cdk/keycodes';
-import { MatChipGrid, MatChipInputEvent } from '@angular/material/chips';
-import { DataKeysCallbacks } from '@home/components/widget/config/data-keys.component.models';
-import { MatAutocomplete, MatAutocompleteTrigger } from '@angular/material/autocomplete';
-import { Observable, of } from 'rxjs';
-import { filter, map, mergeMap, publishReplay, refCount, share, tap } from 'rxjs/operators';
-import { TranslateService } from '@ngx-translate/core';
-import { TruncatePipe } from '@shared/pipe/truncate.pipe';
+import { DataKeysCallbacks, DataKeySettingsFunction } from '@home/components/widget/config/data-keys.component.models';
+import { merge } from 'rxjs';
 import {
   DataKeyConfigDialogComponent,
   DataKeyConfigDialogData
@@ -66,8 +55,13 @@ import { deepClone } from '@core/utils';
 import { Dashboard } from '@shared/models/dashboard.models';
 import { IAliasController } from '@core/api/widget-api.models';
 import { coerceBoolean } from '@shared/decorators/coercion';
-import { alarmFields } from '@shared/models/alarm.models';
-import { UtilsService } from '@core/services/utils.service';
+import {
+  TimeSeriesChartKeySettings,
+  TimeSeriesChartSeriesType,
+  timeSeriesChartSeriesTypeIcons,
+  timeSeriesChartSeriesTypes,
+  timeSeriesChartSeriesTypeTranslations, TimeSeriesChartYAxisId
+} from '@home/components/widget/lib/chart/time-series-chart.models';
 
 export const dataKeyValid = (key: DataKey): boolean => !!key && !!key.type && !!key.name;
 
@@ -96,15 +90,9 @@ export const dataKeyRowValidator = (control: AbstractControl): ValidationErrors
 })
 export class DataKeyRowComponent implements ControlValueAccessor, OnInit, OnChanges {
 
-  dataKeyTypes = DataKeyType;
-  widgetTypes = widgetType;
-
-  separatorKeysCodes: number[] = [ENTER, COMMA, SEMICOLON];
-
-  @ViewChild('keyInput') keyInput: ElementRef<HTMLInputElement>;
-  @ViewChild('keyAutocomplete') matAutocomplete: MatAutocomplete;
-  @ViewChild(MatAutocompleteTrigger) autocomplete: MatAutocompleteTrigger;
-  @ViewChild('chipList') chipList: MatChipGrid;
+  timeSeriesChartSeriesTypes = timeSeriesChartSeriesTypes;
+  timeSeriesChartSeriesTypeTranslations = timeSeriesChartSeriesTypeTranslations;
+  timeSeriesChartSeriesTypeIcons = timeSeriesChartSeriesTypeIcons;
 
   @Input()
   disabled: boolean;
@@ -150,6 +138,17 @@ export class DataKeyRowComponent implements ControlValueAccessor, OnInit, OnChan
   @coerceBoolean()
   hideDecimals = false;
 
+  @Input()
+  @coerceBoolean()
+  timeSeriesChart = false;
+
+  @Input()
+  @coerceBoolean()
+  showTimeSeriesType = false;
+
+  @Input()
+  yAxisIds: TimeSeriesChartYAxisId[];
+
   @Input()
   @coerceBoolean()
   singleRow = true;
@@ -166,23 +165,13 @@ export class DataKeyRowComponent implements ControlValueAccessor, OnInit, OnChan
   @Output()
   keyRemoved = new EventEmitter();
 
-  keysFormControl: UntypedFormControl;
-
   keyFormControl: UntypedFormControl;
 
   keyRowFormGroup: UntypedFormGroup;
 
   modelValue: DataKey;
 
-  filteredKeys: Observable<Array<DataKey>>;
-
-  keySearchText = '';
-
-  alarmKeys: Array<DataKey>;
-  functionTypeKeys: Array<DataKey>;
-
-  private latestKeySearchTextResult: Array<DataKey> = null;
-  private keyFetchObservable$: Observable<Array<DataKey>> = null;
+  generateDataKey = this._generateDataKey.bind(this);
 
   get widgetType(): widgetType {
     return this.widgetConfigComponent.widgetType;
@@ -220,6 +209,10 @@ export class DataKeyRowComponent implements ControlValueAccessor, OnInit, OnChan
     return this.widgetConfigComponent.modelValue?.latestDataKeySettingsDirective;
   }
 
+  get dataKeySettingsFunction(): DataKeySettingsFunction {
+    return this.widgetConfigComponent.modelValue?.dataKeySettingsFunction;
+  }
+
   get isEntityDatasource(): boolean {
     return [DatasourceType.device, DatasourceType.entity].includes(this.datasourceType);
   }
@@ -237,29 +230,11 @@ export class DataKeyRowComponent implements ControlValueAccessor, OnInit, OnChan
   constructor(private fb: UntypedFormBuilder,
               private dialog: MatDialog,
               private cd: ChangeDetectorRef,
-              public translate: TranslateService,
-              public truncate: TruncatePipe,
-              private utils: UtilsService,
               private widgetConfigComponent: WidgetConfigComponent) {
   }
 
   ngOnInit() {
-    this.alarmKeys = [];
-    for (const name of Object.keys(alarmFields)) {
-      this.alarmKeys.push({
-        name,
-        type: DataKeyType.alarm
-      });
-    }
-    this.functionTypeKeys = [];
-    for (const type of this.utils.getPredefinedFunctionsList()) {
-      this.functionTypeKeys.push({
-        name: type,
-        type: DataKeyType.function
-      });
-    }
-    this.keyFormControl = this.fb.control('');
-    this.keysFormControl = this.fb.control([], this.required ? [Validators.required] : []);
+    this.keyFormControl = this.fb.control(null, this.required ? [Validators.required] : []);
     this.keyRowFormGroup = this.fb.group({
       label: [null, []],
       color: [null, []],
@@ -268,52 +243,24 @@ export class DataKeyRowComponent implements ControlValueAccessor, OnInit, OnChan
     });
     if (this.hasAdditionalLatestDataKeys) {
       this.keyRowFormGroup.addControl('latest', this.fb.control(false));
-      this.keyRowFormGroup.valueChanges.subscribe(
-        () => this.clearKeySearchCache()
-      );
     }
-    this.keyRowFormGroup.valueChanges.subscribe(
+    if (this.timeSeriesChart) {
+      this.keyRowFormGroup.addControl('yAxis', this.fb.control(null));
+      this.keyRowFormGroup.addControl('timeSeriesType', this.fb.control(null));
+    }
+    merge(this.keyFormControl.valueChanges, this.keyRowFormGroup.valueChanges).subscribe(
       () => this.updateModel()
     );
-    this.filteredKeys = this.keyFormControl.valueChanges
-      .pipe(
-        tap((value: string | DataKey) => {
-          if (value && typeof value !== 'string') {
-            this.addKeyFromChipValue(value);
-          } else if (value === null) {
-            this.clearKeyChip(this.keyInput.nativeElement.value);
-          }
-        }),
-        filter((value) => typeof value === 'string'),
-        map((value) => value ? (typeof value === 'string' ? value : value.name) : ''),
-        mergeMap(name => this.fetchKeys(name) ),
-        share()
-      );
-  }
-
-  private reset() {
-    if (this.keyInput) {
-      this.keyInput.nativeElement.value = '';
-    }
-    this.keyFormControl.patchValue('', {emitEvent: false});
-    this.latestKeySearchTextResult = null;
   }
 
   ngOnChanges(changes: SimpleChanges): void {
     for (const propName of Object.keys(changes)) {
       const change = changes[propName];
       if (!change.firstChange && change.currentValue !== change.previousValue) {
-        if (['deviceId', 'entityAliasId'].includes(propName)) {
-          this.clearKeySearchCache();
-        } else if (['datasourceType'].includes(propName)) {
-          if ([DatasourceType.device, DatasourceType.entity].includes(change.previousValue) &&
-              [DatasourceType.device, DatasourceType.entity].includes(change.currentValue)) {
-            this.clearKeySearchCache();
-          } else {
-            this.clearKeySearchCache();
-            setTimeout(() => {
-              this.reset();
-            }, 1);
+        if (this.timeSeriesChart && ['yAxisIds'].includes(propName)) {
+          if (this.modelValue?.settings?.yAxisId &&
+            !this.yAxisIds.includes(this.modelValue.settings.yAxisId)) {
+            this.keyRowFormGroup.patchValue({yAxis: 'default'}, {emitEvent: true});
           }
         }
       }
@@ -330,10 +277,10 @@ export class DataKeyRowComponent implements ControlValueAccessor, OnInit, OnChan
   setDisabledState(isDisabled: boolean): void {
     this.disabled = isDisabled;
     if (isDisabled) {
-      this.keysFormControl.disable({emitEvent: false});
+      this.keyFormControl.disable({emitEvent: false});
       this.keyRowFormGroup.disable({emitEvent: false});
     } else {
-      this.keysFormControl.enable({emitEvent: false});
+      this.keyFormControl.enable({emitEvent: false});
       this.keyRowFormGroup.enable({emitEvent: false});
     }
   }
@@ -353,34 +300,17 @@ export class DataKeyRowComponent implements ControlValueAccessor, OnInit, OnChan
         latest: (value as any)?.latest
       }, {emitEvent: false});
     }
-    this.keysFormControl.patchValue(this.modelValue ? [this.modelValue] : [], {emitEvent: false});
-    this.cd.markForCheck();
-  }
-
-  dataKeyHasAggregation(): boolean {
-    return this.widgetConfigComponent.widgetType === widgetType.latest && this.modelValue?.type === DataKeyType.timeseries
-      && this.modelValue?.aggregationType && this.modelValue?.aggregationType !== AggregationType.NONE;
-  }
-
-  dataKeyHasPostprocessing(): boolean {
-    return !!this.modelValue?.postFuncBody;
-  }
-
-  displayKeyFn(key?: DataKey): string | undefined {
-    return key ? key.name : undefined;
-  }
-
-  createKey(name: string, dataKeyType: DataKeyType = this.dataKeyType) {
-    this.addKeyFromChipValue({name: name ? name.trim() : '', type: dataKeyType});
-  }
-
-  addKey(event: MatChipInputEvent): void {
-    const value = event.value;
-    if ((value || '').trim() && this.dataKeyType) {
-      this.addKeyFromChipValue({name: value.trim(), type: this.dataKeyType});
-    } else {
-      this.clearKeyChip();
+    if (this.timeSeriesChart) {
+      const settings = value?.settings as TimeSeriesChartKeySettings;
+      const yAxis = settings?.yAxisId || 'default';
+      const timeSeriesType = settings?.type || TimeSeriesChartSeriesType.line;
+      this.keyRowFormGroup.patchValue({
+        yAxis,
+        timeSeriesType
+      }, {emitEvent: false});
     }
+    this.keyFormControl.patchValue(deepClone(this.modelValue), {emitEvent: false});
+    this.cd.markForCheck();
   }
 
   editKey(advanced = false) {
@@ -413,109 +343,41 @@ export class DataKeyRowComponent implements ControlValueAccessor, OnInit, OnChan
         this.keyRowFormGroup.get('color').patchValue(this.modelValue.color, {emitEvent: false});
         this.keyRowFormGroup.get('units').patchValue(this.modelValue.units, {emitEvent: false});
         this.keyRowFormGroup.get('decimals').patchValue(this.modelValue.decimals, {emitEvent: false});
+        if (this.timeSeriesChart) {
+          this.keyRowFormGroup.get('yAxis').patchValue(this.modelValue.settings?.yAxisId, {emitEvent: false});
+          this.keyRowFormGroup.get('timeSeriesType').patchValue(this.modelValue.settings?.type, {emitEvent: false});
+        }
+        this.keyFormControl.patchValue(deepClone(this.modelValue), {emitEvent: false});
         this.updateModel();
         this.cd.markForCheck();
       }
     });
   }
 
-  removeKey() {
-    this.modelValue = null;
-    this.updateModel();
-    this.clearKeyChip();
-  }
-
-  textIsNotEmpty(text: string): boolean {
-    return text && text.length > 0;
-  }
-
-  clearKeyChip(value: string = '', focus = true) {
-    this.autocomplete.closePanel();
-    this.keyInput.nativeElement.value = value;
-    this.keyFormControl.patchValue(value, {emitEvent: focus});
-    if (focus) {
-      setTimeout(() => {
-        this.keyInput.nativeElement.blur();
-        this.keyInput.nativeElement.focus();
-      }, 0);
-    }
-  }
-
-  onKeyInputFocus() {
-    if (!this.modelValue?.type) {
-      this.keyFormControl.updateValueAndValidity({onlySelf: true, emitEvent: true});
-    }
-  }
-
-  private fetchKeys(searchText?: string): Observable<Array<DataKey>> {
-    if (this.keySearchText !== searchText || this.latestKeySearchTextResult === null) {
-      this.keySearchText = searchText;
-      const dataKeyFilter = this.createDataKeyFilter(this.keySearchText);
-      return this.getKeys().pipe(
-        map(name => name.filter(dataKeyFilter)),
-        tap(res => this.latestKeySearchTextResult = res)
-      );
-    }
-    return of(this.latestKeySearchTextResult);
-  }
-
-  private getKeys(): Observable<Array<DataKey>> {
-    if (this.keyFetchObservable$ === null) {
-      let fetchObservable: Observable<Array<DataKey>>;
-      if (this.datasourceType === DatasourceType.function) {
-        const targetKeysList = this.widgetType === widgetType.alarm ? this.alarmKeys : this.functionTypeKeys;
-        fetchObservable = of(targetKeysList);
-      } else if (this.datasourceType === DatasourceType.entity && this.entityAliasId ||
-        this.datasourceType === DatasourceType.device && this.deviceId) {
-        const dataKeyTypes = [DataKeyType.timeseries];
-        if (this.isLatestDataKeys || this.widgetType === widgetType.latest || this.widgetType === widgetType.alarm) {
-          dataKeyTypes.push(DataKeyType.attribute);
-          dataKeyTypes.push(DataKeyType.entityField);
-          if (this.widgetType === widgetType.alarm) {
-            dataKeyTypes.push(DataKeyType.alarm);
-          }
-        }
-        if (this.datasourceType === DatasourceType.device) {
-          fetchObservable = this.callbacks.fetchEntityKeysForDevice(this.deviceId, dataKeyTypes);
-        } else {
-          fetchObservable = this.callbacks.fetchEntityKeys(this.entityAliasId, dataKeyTypes);
-        }
-      } else {
-        fetchObservable = of([]);
-      }
-      this.keyFetchObservable$ = fetchObservable.pipe(
-        publishReplay(1),
-        refCount()
-      );
-    }
-    return this.keyFetchObservable$;
-  }
-
-  private createDataKeyFilter(query: string): (key: DataKey) => boolean {
-    const lowercaseQuery = query.toLowerCase();
-    return key => key.name.toLowerCase().startsWith(lowercaseQuery);
-  }
-
-  private addKeyFromChipValue(chip: DataKey) {
-    this.modelValue = this.callbacks.generateDataKey(chip.name, chip.type, this.dataKeySettingsSchema);
+  private _generateDataKey(key: DataKey): DataKey {
+    key = this.callbacks.generateDataKey(key.name, key.type, this.dataKeySettingsSchema, this.isLatestDataKeys,
+      this.dataKeySettingsFunction);
     if (!this.keyRowFormGroup.get('label').value) {
-      this.keyRowFormGroup.get('label').patchValue(this.modelValue.label, {emitEvent: false});
+      this.keyRowFormGroup.get('label').patchValue(key.label, {emitEvent: false});
     }
-    this.updateModel();
-    this.clearKeyChip('', false);
-  }
-
-  private clearKeySearchCache() {
-    this.keySearchText = '';
-    this.keyFetchObservable$ = null;
-    this.latestKeySearchTextResult = null;
+    if (this.timeSeriesChart) {
+      this.keyRowFormGroup.get('yAxis').patchValue(key.settings?.yAxisId, {emitEvent: false});
+      this.keyRowFormGroup.get('timeSeriesType').patchValue(key.settings?.type, {emitEvent: false});
+    }
+    return key;
   }
 
   private updateModel() {
-    this.keysFormControl.patchValue(this.modelValue ? [this.modelValue] : [], {emitEvent: false});
+    this.modelValue = this.keyFormControl.value;
     if (this.modelValue !== null) {
       const value: DataKey = this.keyRowFormGroup.value;
       this.modelValue = {...this.modelValue, ...value};
+      if (this.timeSeriesChart) {
+        this.modelValue.settings.yAxisId = (this.modelValue as any).yAxis;
+        this.modelValue.settings.type = (this.modelValue as any).timeSeriesType;
+        delete (this.modelValue as any).yAxis;
+        delete (this.modelValue as any).timeSeriesType;
+      }
     }
     this.propagateChange(this.modelValue);
   }
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 2771229326..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,13 +15,17 @@
     limitations under the License.
 
 -->
-<div class="tb-form-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>
       <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 *ngIf="timeSeriesChart && showTimeSeriesType" class="tb-form-table-header-cell tb-time-series-type-header" translate>widgets.time-series-chart.series.type</div>
+      <div *ngIf="timeSeriesChart" class="tb-form-table-header-cell tb-y-axis-header" translate>widgets.time-series-chart.axis.y-axis</div>
       <div *ngIf="!hideDataKeyColor" class="tb-form-table-header-cell tb-color-header" translate>datakey.color</div>
       <div *ngIf="!hideUnits" class="tb-form-table-header-cell tb-units-header" translate>widget-config.units-short</div>
       <div *ngIf="!hideDecimals" class="tb-form-table-header-cell tb-decimals-header" translate>widget-config.decimals-short</div>
@@ -43,6 +47,9 @@
                          [hasAdditionalLatestDataKeys]="hasAdditionalLatestDataKeys"
                          [hideDataKeyColor]="hideDataKeyColor"
                          [hideDecimals]="hideDecimals"
+                         [timeSeriesChart]="timeSeriesChart"
+                         [showTimeSeriesType]="showTimeSeriesType"
+                         [yAxisIds]="yAxisIds"
                          [hideUnits]="hideUnits"
                          [hideDataKeyDecimals]="hideDataKeyDecimals"
                          [hideDataKeyUnits]="hideDataKeyUnits"
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/common/data-keys-panel.component.scss b/ui-ngx/src/app/modules/home/components/widget/config/basic/common/data-keys-panel.component.scss
index 1e4960c40c..a3862c1c58 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/basic/common/data-keys-panel.component.scss
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/common/data-keys-panel.component.scss
@@ -15,52 +15,86 @@
  */
 @import '../../../../../../../../scss/constants';
 
-.tb-form-table-header-cell {
-  &.tb-source-header {
-    width: 108px;
-    min-width: 108px;
-  }
-  &.tb-key-header {
-    flex: 1;
-    min-width: 150px;
-    @media #{$mat-gt-sm} {
-      flex: 1 1 60%;
+.tb-data-keys-panel {
+  .tb-form-table-header-cell {
+    &.tb-source-header {
+      width: 108px;
+      min-width: 108px;
     }
-  }
-  &.tb-label-header {
-    flex: 1 1 40%;
-    min-width: 100px;
-  }
-  &.tb-units-header {
-    width: 80px;
-    min-width: 80px;
-  }
-  &.tb-color-header {
-    width: 40px;
-    min-width: 40px;
-  }
-  &.tb-decimals-header {
-    width: 60px;
-    min-width: 60px;
-  }
-  &.tb-actions-header {
-    width: 40px;
-    min-width: 40px;
-    @media #{$mat-gt-md} {
-      width: 120px;
-      min-width: 120px;
+
+    &.tb-key-header {
+      flex: 1;
+      min-width: 150px;
+      @media #{$mat-gt-sm} {
+        flex: 1 1 60%;
+      }
     }
-  }
-  &.tb-label-header, &.tb-units-header, &.tb-color-header, &.tb-decimals-header {
-    display: none;
-    @media #{$mat-gt-sm} {
-      display: block;
+
+    &.tb-label-header {
+      flex: 1 1 40%;
+      min-width: 100px;
+    }
+
+    &.tb-units-header {
+      width: 80px;
+      min-width: 80px;
+    }
+
+    &.tb-color-header {
+      width: 40px;
+      min-width: 40px;
+    }
+
+    &.tb-decimals-header {
+      width: 60px;
+      min-width: 60px;
+    }
+
+    &.tb-y-axis-header {
+      width: 100px;
+      min-width: 100px;
+    }
+
+    &.tb-time-series-type-header {
+      width: 60px;
+      min-width: 60px;
+    }
+
+    &.tb-actions-header {
+      width: 40px;
+      min-width: 40px;
+      @media #{$mat-gt-md} {
+        width: 120px;
+        min-width: 120px;
+      }
+    }
+
+    &.tb-label-header, &.tb-units-header, &.tb-color-header, &.tb-decimals-header {
+      display: none;
+      @media #{$mat-gt-sm} {
+        display: block;
+      }
+    }
+
+    &.tb-y-axis-header {
+      @media #{$mat-md} {
+        display: none;
+      }
+    }
+
+    &.tb-time-series-type-header {
+      @media #{$mat-xs} {
+        display: none;
+      }
+      @media #{$mat-md} {
+        display: none;
+      }
     }
   }
-}
 
-.tb-form-table-body {
-  tb-data-key-row {
-    overflow: hidden;
+  .tb-form-table-body {
+    tb-data-key-row {
+      overflow: hidden;
+    }
   }
 }
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 73a3b8027c..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
@@ -42,8 +42,9 @@ import { dataKeyRowValidator, dataKeyValid } from '@home/components/widget/confi
 import { CdkDragDrop } from '@angular/cdk/drag-drop';
 import { DataKeyType } from '@shared/models/telemetry/telemetry.models';
 import { UtilsService } from '@core/services/utils.service';
-import { DataKeysCallbacks } from '@home/components/widget/config/data-keys.component.models';
+import { DataKeysCallbacks, DataKeySettingsFunction } from '@home/components/widget/config/data-keys.component.models';
 import { coerceBoolean } from '@shared/decorators/coercion';
+import { TimeSeriesChartYAxisId } from '@home/components/widget/lib/chart/time-series-chart.models';
 
 @Component({
   selector: 'tb-data-keys-panel',
@@ -95,6 +96,10 @@ export class DataKeysPanelComponent implements ControlValueAccessor, OnInit, OnC
   @Input()
   deviceId: string;
 
+  @Input()
+  @coerceBoolean()
+  hidePanel = false;
+
   @Input()
   @coerceBoolean()
   hideDataKeyColor = false;
@@ -119,6 +124,17 @@ export class DataKeysPanelComponent implements ControlValueAccessor, OnInit, OnC
   @coerceBoolean()
   hideSourceSelection = false;
 
+  @Input()
+  @coerceBoolean()
+  timeSeriesChart = false;
+
+  @Input()
+  @coerceBoolean()
+  showTimeSeriesType = false;
+
+  @Input()
+  yAxisIds: TimeSeriesChartYAxisId[];
+
   dataKeyType: DataKeyType;
 
   keysListFormGroup: UntypedFormGroup;
@@ -142,6 +158,10 @@ export class DataKeysPanelComponent implements ControlValueAccessor, OnInit, OnC
     return this.widgetConfigComponent.modelValue?.dataKeySettingsSchema;
   }
 
+  get dataKeySettingsFunction(): DataKeySettingsFunction {
+    return this.widgetConfigComponent.modelValue?.dataKeySettingsFunction;
+  }
+
   get dragEnabled(): boolean {
     return this.keysFormArray().controls.length > 1;
   }
@@ -256,7 +276,8 @@ export class DataKeysPanelComponent implements ControlValueAccessor, OnInit, OnC
   }
 
   addKey() {
-    const dataKey = this.callbacks.generateDataKey('', null, this.datakeySettingsSchema);
+    const dataKey = this.callbacks.generateDataKey('', null, this.datakeySettingsSchema,
+      false, this.dataKeySettingsFunction);
     dataKey.label = '';
     dataKey.decimals = 0;
     if (this.hasAdditionalLatestDataKeys) {
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/config/data-key-config.component.html b/ui-ngx/src/app/modules/home/components/widget/config/data-key-config.component.html
index fe6c347649..f472325d8d 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/data-key-config.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/config/data-key-config.component.html
@@ -196,7 +196,9 @@
     <tb-widget-settings
       [dashboard]="dashboard"
       [aliasController]="aliasController"
+      [dataKeyCallbacks]="callbacks"
       [widget]="widget"
+      [widgetConfig]="widgetConfig"
       formControlName="settings">
     </tb-widget-settings>
   </div>
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/data-key-config.component.ts b/ui-ngx/src/app/modules/home/components/widget/config/data-key-config.component.ts
index b120a60809..9ebe8821cf 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/data-key-config.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/config/data-key-config.component.ts
@@ -40,7 +40,7 @@ import { UtilsService } from '@core/services/utils.service';
 import { TranslateService } from '@ngx-translate/core';
 import { MatDialog } from '@angular/material/dialog';
 import { EntityService } from '@core/http/entity.service';
-import { DataKeysCallbacks } from '@home/components/widget/config/data-keys.component.models';
+import { DataKeysCallbacks, DataKeySettingsFunction } from '@home/components/widget/config/data-keys.component.models';
 import { DataKeyType } from '@shared/models/telemetry/telemetry.models';
 import { Observable, of } from 'rxjs';
 import { map, mergeMap, publishReplay, refCount, tap } from 'rxjs/operators';
@@ -51,8 +51,10 @@ import { WidgetService } from '@core/http/widget.service';
 import { Dashboard } from '@shared/models/dashboard.models';
 import { IAliasController } from '@core/api/widget-api.models';
 import { aggregationTranslations, AggregationType, ComparisonDuration } from '@shared/models/time/time.models';
-import { genNextLabel } from '@core/utils';
+import { genNextLabel, isDefinedAndNotNull } from '@core/utils';
 import { coerceBoolean } from '@shared/decorators/coercion';
+import { WidgetConfigComponentData } from '@home/models/widget-component.models';
+import { WidgetComponentService } from '@home/components/widget/widget-component.service';
 
 @Component({
   selector: 'tb-data-key-config',
@@ -155,6 +157,8 @@ export class DataKeyConfigComponent extends PageComponent implements OnInit, Con
 
   modelValue: DataKey;
 
+  widgetConfig: WidgetConfigComponentData;
+
   private propagateChange = null;
 
   public dataKeyFormGroup: UntypedFormGroup;
@@ -180,12 +184,31 @@ export class DataKeyConfigComponent extends PageComponent implements OnInit, Con
               private dialog: MatDialog,
               private translate: TranslateService,
               private widgetService: WidgetService,
+              private widgetComponentService: WidgetComponentService,
               private fb: UntypedFormBuilder) {
     super(store);
     this.functionScopeVariables = this.widgetService.getWidgetScopeVariables();
   }
 
   ngOnInit(): void {
+
+    const widgetInfo = this.widgetComponentService.getInstantWidgetInfo(this.widget);
+    const typeParameters = widgetInfo.typeParameters;
+    const dataKeySettingsFunction: DataKeySettingsFunction = typeParameters?.dataKeySettingsFunction;
+
+    this.widgetConfig = {
+      widgetName: widgetInfo.widgetName,
+      config: this.widget.config,
+      widgetType: this.widget.type,
+      typeParameters,
+      dataKeySettingsFunction,
+      settingsDirective: widgetInfo.settingsDirective,
+      dataKeySettingsDirective: widgetInfo.dataKeySettingsDirective,
+      latestDataKeySettingsDirective: widgetInfo.latestDataKeySettingsDirective,
+      hasBasicMode: isDefinedAndNotNull(widgetInfo.hasBasicMode) ? widgetInfo.hasBasicMode : false,
+      basicModeDirective: widgetInfo.basicModeDirective
+    } as WidgetConfigComponentData;
+
     this.alarmKeys = [];
     for (const name of Object.keys(alarmFields)) {
       this.alarmKeys.push({
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/data-keys.component.models.ts b/ui-ngx/src/app/modules/home/components/widget/config/data-keys.component.models.ts
index 893631f57b..b0e80973f0 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/data-keys.component.models.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/config/data-keys.component.models.ts
@@ -18,8 +18,11 @@ import { DataKeyType } from '@shared/models/telemetry/telemetry.models';
 import { DataKey, JsonSettingsSchema } from '@shared/models/widget.models';
 import { Observable } from 'rxjs';
 
+export type DataKeySettingsFunction = (key: DataKey, isLatestDataKey: boolean) => any;
+
 export interface DataKeysCallbacks {
-  generateDataKey: (chip: any, type: DataKeyType, datakeySettingsSchema: JsonSettingsSchema) => DataKey;
+  generateDataKey: (chip: any, type: DataKeyType, datakeySettingsSchema: JsonSettingsSchema,
+                    isLatestDataKey: boolean, dataKeySettingsFunction: DataKeySettingsFunction) => DataKey;
   fetchEntityKeys: (entityAliasId: string, types: Array<DataKeyType>) => Observable<Array<DataKey>>;
   fetchEntityKeysForDevice: (deviceId: string, types: Array<DataKeyType>) => Observable<Array<DataKey>>;
 }
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/data-keys.component.ts b/ui-ngx/src/app/modules/home/components/widget/config/data-keys.component.ts
index 800c831b67..8c2df629de 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/data-keys.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/config/data-keys.component.ts
@@ -52,7 +52,7 @@ import { coerceBooleanProperty } from '@angular/cdk/coercion';
 import { DataKeyType } from '@shared/models/telemetry/telemetry.models';
 import { DataKey, DatasourceType, JsonSettingsSchema, Widget, widgetType } from '@shared/models/widget.models';
 import { IAliasController } from '@core/api/widget-api.models';
-import { DataKeysCallbacks } from './data-keys.component.models';
+import { DataKeysCallbacks, DataKeySettingsFunction } from './data-keys.component.models';
 import { alarmFields } from '@shared/models/alarm.models';
 import { UtilsService } from '@core/services/utils.service';
 import { ErrorStateMatcher } from '@angular/material/core';
@@ -139,6 +139,10 @@ export class DataKeysComponent implements ControlValueAccessor, OnInit, OnChange
   @Input()
   optDataKeys: boolean;
 
+  @Input()
+  @coerceBoolean()
+  latestDataKeys = false;
+
   @Input()
   @coerceBoolean()
   simpleDataKeysLabel = false;
@@ -149,6 +153,9 @@ export class DataKeysComponent implements ControlValueAccessor, OnInit, OnChange
   @Input()
   datakeySettingsSchema: JsonSettingsSchema;
 
+  @Input()
+  datakeySettingsFunction: DataKeySettingsFunction;
+
   @Input()
   dataKeySettingsDirective: string;
 
@@ -361,7 +368,8 @@ export class DataKeysComponent implements ControlValueAccessor, OnInit, OnChange
     if (this.widgetType === widgetType.alarm) {
       this.keys = this.utils.getDefaultAlarmDataKeys();
     } else if (this.isCountDatasource) {
-      this.keys = [this.callbacks.generateDataKey('count', DataKeyType.count, this.datakeySettingsSchema)];
+      this.keys = [this.callbacks.generateDataKey('count', DataKeyType.count, this.datakeySettingsSchema,
+        this.latestDataKeys, this.datakeySettingsFunction)];
     } else {
       this.keys = [];
     }
@@ -447,7 +455,8 @@ export class DataKeysComponent implements ControlValueAccessor, OnInit, OnChange
   }
 
   private addFromChipValue(chip: DataKey) {
-    const key = this.callbacks.generateDataKey(chip.name, chip.type, this.datakeySettingsSchema);
+    const key = this.callbacks.generateDataKey(chip.name, chip.type, this.datakeySettingsSchema, this.latestDataKeys,
+      this.datakeySettingsFunction);
     this.addKey(key);
   }
 
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/datasource.component.html b/ui-ngx/src/app/modules/home/components/widget/config/datasource.component.html
index b72f9f0e5d..13a52a295b 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/datasource.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/config/datasource.component.html
@@ -72,6 +72,7 @@
                   [aliasController]="aliasController"
                   [datakeySettingsSchema]="dataKeySettingsSchema"
                   [dataKeySettingsDirective]="dataKeySettingsDirective"
+                  [datakeySettingsFunction]="dataKeySettingsFunction"
                   [dashboard]="dashboard"
                   [widget]="widget"
                   [callbacks]="dataKeysCallbacks"
@@ -82,10 +83,12 @@
     <tb-data-keys *ngIf="hasAdditionalLatestDataKeys" class="tb-data-keys" fxFlex
                   [widgetType]="widgetTypes.latest"
                   [datasourceType]="datasourceFormGroup.get('type').value"
+                  latestDataKeys
                   [optDataKeys]="true"
                   [aliasController]="aliasController"
                   [datakeySettingsSchema]="latestDataKeySettingsSchema"
                   [dataKeySettingsDirective]="latestDataKeySettingsDirective"
+                  [datakeySettingsFunction]="dataKeySettingsFunction"
                   [dashboard]="dashboard"
                   [widget]="widget"
                   [callbacks]="dataKeysCallbacks"
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/datasource.component.ts b/ui-ngx/src/app/modules/home/components/widget/config/datasource.component.ts
index 1dd3aa3507..c134b5580c 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/datasource.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/config/datasource.component.ts
@@ -39,7 +39,7 @@ import { WidgetConfigComponent } from '@home/components/widget/widget-config.com
 import { IAliasController } from '@core/api/widget-api.models';
 import { EntityAliasSelectCallbacks } from '@home/components/alias/entity-alias-select.component.models';
 import { FilterSelectCallbacks } from '@home/components/filter/filter-select.component.models';
-import { DataKeysCallbacks } from '@home/components/widget/config/data-keys.component.models';
+import { DataKeysCallbacks, DataKeySettingsFunction } from '@home/components/widget/config/data-keys.component.models';
 import { EntityType } from '@shared/models/entity-type.models';
 import { DatasourcesComponent } from '@home/components/widget/config/datasources.component';
 
@@ -119,6 +119,10 @@ export class DatasourceComponent implements ControlValueAccessor, OnInit, Valida
     return this.widgetConfigComponent.modelValue?.latestDataKeySettingsDirective;
   }
 
+  public get dataKeySettingsFunction(): DataKeySettingsFunction {
+    return this.widgetConfigComponent.modelValue?.dataKeySettingsFunction;
+  }
+
   public get dashboard(): Dashboard {
     return this.widgetConfigComponent.dashboard;
   }
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/datasources.component.ts b/ui-ngx/src/app/modules/home/components/widget/config/datasources.component.ts
index a83d58a25e..6ad1972886 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/datasources.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/config/datasources.component.ts
@@ -39,7 +39,7 @@ import { CdkDragDrop } from '@angular/cdk/drag-drop';
 import { deepClone } from '@core/utils';
 import { DataKeyType } from '@shared/models/telemetry/telemetry.models';
 import { UtilsService } from '@core/services/utils.service';
-import { DataKeysCallbacks } from '@home/components/widget/config/data-keys.component.models';
+import { DataKeysCallbacks, DataKeySettingsFunction } from '@home/components/widget/config/data-keys.component.models';
 import { TranslateService } from '@ngx-translate/core';
 import { coerceBoolean } from '@shared/decorators/coercion';
 
@@ -337,7 +337,8 @@ export class DatasourcesComponent implements ControlValueAccessor, OnInit, Valid
     let newDatasource: Datasource;
     if (this.widgetConfigComponent.functionsOnly) {
       newDatasource = deepClone(this.utils.getDefaultDatasource(this.dataKeySettingsSchema.schema));
-      newDatasource.dataKeys = [this.dataKeysCallbacks.generateDataKey('Sin', DataKeyType.function, this.dataKeySettingsSchema)];
+      newDatasource.dataKeys = [this.dataKeysCallbacks.generateDataKey('Sin', DataKeyType.function, this.dataKeySettingsSchema,
+        false, this.dataKeySettingsFunction)];
     } else {
       const type = this.basicMode ? this.datasourcesMode : DatasourceType.entity;
       newDatasource = { type,
@@ -354,6 +355,10 @@ export class DatasourcesComponent implements ControlValueAccessor, OnInit, Valid
     return this.widgetConfigComponent.modelValue?.dataKeySettingsSchema;
   }
 
+  private get dataKeySettingsFunction(): DataKeySettingsFunction {
+    return this.widgetConfigComponent.modelValue?.dataKeySettingsFunction;
+  }
+
   private get dataKeysCallbacks(): DataKeysCallbacks {
     return this.widgetConfigComponent.widgetConfigCallbacks;
   }
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/widget-config.component.models.ts b/ui-ngx/src/app/modules/home/components/widget/config/widget-config.component.models.ts
index 441983a2e3..f3807d319d 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/widget-config.component.models.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/config/widget-config.component.models.ts
@@ -23,9 +23,8 @@ import { PageComponent } from '@shared/components/page.component';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
 import { AbstractControl, UntypedFormGroup } from '@angular/forms';
-import { DataKey, DatasourceType, KeyInfo, WidgetConfigMode, widgetType } from '@shared/models/widget.models';
+import { DataKey, DatasourceType, WidgetConfigMode, widgetType } from '@shared/models/widget.models';
 import { WidgetConfigComponent } from '@home/components/widget/widget-config.component';
-import { DataKeyType } from '@shared/models/telemetry/telemetry.models';
 import { isDefinedAndNotNull } from '@core/utils';
 import { IAliasController } from '@core/api/widget-api.models';
 
@@ -187,22 +186,23 @@ export abstract class BasicWidgetConfigComponent extends PageComponent implement
     if (keys && keys.length) {
       dataKeys.length = 0;
       keys.forEach(key => {
-        const dataKey = this.constructDataKey(configData, key);
+        const dataKey = this.constructDataKey(configData, key, false);
         dataKeys.push(dataKey);
       });
     }
     if (latestKeys && latestKeys.length) {
       latestDataKeys.length = 0;
       latestKeys.forEach(key => {
-        const dataKey = this.constructDataKey(configData, key);
+        const dataKey = this.constructDataKey(configData, key, true);
         latestDataKeys.push(dataKey);
       });
     }
   }
 
-  protected constructDataKey(configData: WidgetConfigComponentData, key: DataKey): DataKey {
+  protected constructDataKey(configData: WidgetConfigComponentData, key: DataKey, isLatestKey: boolean): DataKey {
     const dataKey =
-      this.widgetConfigComponent.widgetConfigCallbacks.generateDataKey(key.name, key.type, configData.dataKeySettingsSchema);
+      this.widgetConfigComponent.widgetConfigCallbacks.generateDataKey(key.name, key.type,
+        configData.dataKeySettingsSchema, isLatestKey, configData.dataKeySettingsFunction);
     if (key.label) {
       dataKey.label = key.label;
     }
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/widget-settings.component.ts b/ui-ngx/src/app/modules/home/components/widget/config/widget-settings.component.ts
index a4a2e9cc7e..8636db1f77 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/widget-settings.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/config/widget-settings.component.ts
@@ -49,6 +49,7 @@ import { Dashboard } from '@shared/models/dashboard.models';
 import { WidgetService } from '@core/http/widget.service';
 import { IAliasController } from '@core/api/widget-api.models';
 import { WidgetConfigComponentData } from '@home/models/widget-component.models';
+import { DataKeysCallbacks } from '@home/components/widget/config/data-keys.component.models';
 
 @Component({
   selector: 'tb-widget-settings',
@@ -77,6 +78,9 @@ export class WidgetSettingsComponent implements ControlValueAccessor, OnInit, On
   @Input()
   aliasController: IAliasController;
 
+  @Input()
+  dataKeyCallbacks: DataKeysCallbacks;
+
   @Input()
   dashboard: Dashboard;
 
@@ -98,7 +102,7 @@ export class WidgetSettingsComponent implements ControlValueAccessor, OnInit, On
   private definedSettingsComponent: IWidgetSettingsComponent;
 
   private widgetSettingsFormData: JsonFormComponentData;
-  private propagateChange = (v: any) => { };
+  private propagateChange = (_v: any) => { };
 
   constructor(private translate: TranslateService,
               private cfr: ComponentFactoryResolver,
@@ -138,6 +142,11 @@ export class WidgetSettingsComponent implements ControlValueAccessor, OnInit, On
             this.definedSettingsComponent.aliasController = this.aliasController;
           }
         }
+        if (propName === 'dataKeyCallbacks') {
+          if (this.definedSettingsComponent) {
+            this.definedSettingsComponent.dataKeyCallbacks = this.dataKeyCallbacks;
+          }
+        }
         if (propName === 'widgetConfig') {
           if (this.definedSettingsComponent) {
             this.definedSettingsComponent.widgetConfig = this.widgetConfig;
@@ -225,6 +234,7 @@ export class WidgetSettingsComponent implements ControlValueAccessor, OnInit, On
         this.definedSettingsComponentRef = this.definedSettingsContainer.createComponent(factory);
         this.definedSettingsComponent = this.definedSettingsComponentRef.instance;
         this.definedSettingsComponent.aliasController = this.aliasController;
+        this.definedSettingsComponent.dataKeyCallbacks = this.dataKeyCallbacks;
         this.definedSettingsComponent.dashboard = this.dashboard;
         this.definedSettingsComponent.widget = this.widget;
         this.definedSettingsComponent.widgetConfig = this.widgetConfig;
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/cards/aggregated-value-card-widget.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/cards/aggregated-value-card-widget.component.scss
index 65be3c924f..8304400818 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/cards/aggregated-value-card-widget.component.scss
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/cards/aggregated-value-card-widget.component.scss
@@ -92,6 +92,7 @@
       .tb-aggregated-value-card-chart-container {
         position: relative;
         flex: 1;
+        min-width: 0;
         margin-top: 8px;
         margin-bottom: 8px;
         .tb-aggregated-value-card-chart-element {
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/cards/aggregated-value-card-widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/cards/aggregated-value-card-widget.component.ts
index 25be87451e..908ed263e4 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/cards/aggregated-value-card-widget.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/cards/aggregated-value-card-widget.component.ts
@@ -37,6 +37,7 @@ import {
 import { WidgetContext } from '@home/models/widget-component.models';
 import { Observable } from 'rxjs';
 import {
+  autoDateFormat,
   backgroundStyle,
   ComponentStyle,
   DateFormatProcessor,
@@ -45,14 +46,19 @@ import {
   overlayStyle,
   textStyle
 } from '@shared/models/widget-settings.models';
-import { TbFlot } from '@home/components/widget/lib/flot-widget';
-import { TbFlotKeySettings, TbFlotSettings } from '@home/components/widget/lib/flot-widget.models';
 import { DataKey } from '@shared/models/widget.models';
 import { formatNumberValue, formatValue, isDefined, isDefinedAndNotNull, isNumeric } from '@core/utils';
 import { map } from 'rxjs/operators';
 import { ResizeObserver } from '@juggle/resize-observer';
 import { ImagePipe } from '@shared/pipe/image.pipe';
 import { DomSanitizer } from '@angular/platform-browser';
+import { TbTimeSeriesChart } from '@home/components/widget/lib/chart/time-series-chart';
+import {
+  TimeSeriesChartKeySettings,
+  TimeSeriesChartSeriesType,
+  TimeSeriesChartSettings
+} from '@home/components/widget/lib/chart/time-series-chart.models';
+import { DeepPartial } from '@shared/models/common';
 
 const valuesLayoutHeight = 66;
 const valuesLayoutVerticalPadding = 16;
@@ -101,8 +107,8 @@ export class AggregatedValueCardWidgetComponent implements OnInit, AfterViewInit
   backgroundStyle$: Observable<ComponentStyle>;
   overlayStyle: ComponentStyle = {};
 
-  private flot: TbFlot;
-  private flotDataKey: DataKey;
+  private lineChart: TbTimeSeriesChart;
+  private lineChartDataKey: DataKey;
 
   private lastUpdateTs: number;
 
@@ -141,12 +147,18 @@ export class AggregatedValueCardWidgetComponent implements OnInit, AfterViewInit
     this.showChart = this.settings.showChart;
     if (this.showChart) {
       if (this.ctx.defaultSubscription.firstDatasource?.dataKeys?.length) {
-        this.flotDataKey = this.ctx.defaultSubscription.firstDatasource?.dataKeys[0];
-        this.flotDataKey.settings = {
-          fillLines: false,
-          showLines: true,
-          lineWidth: 2
-        } as TbFlotKeySettings;
+        this.lineChartDataKey = this.ctx.defaultSubscription.firstDatasource?.dataKeys[0];
+        this.lineChartDataKey.settings = {
+          type: TimeSeriesChartSeriesType.line,
+          lineSettings: {
+            showLine: true,
+            step: false,
+            smooth: false,
+            lineWidth: 2,
+            showPoints: false,
+            showPointLabel: false
+          }
+        } as TimeSeriesChartKeySettings;
       }
     }
 
@@ -161,33 +173,35 @@ export class AggregatedValueCardWidgetComponent implements OnInit, AfterViewInit
 
   ngAfterViewInit(): void {
     if (this.showChart && this.ctx.datasources?.length) {
-      const settings = {
-        shadowSize: 0,
-        enableSelection: false,
-        smoothLines: false,
-        grid: {
-          tickColor: 'rgba(0,0,0,0.12)',
-          horizontalLines: true,
-          verticalLines: false,
-          outlineWidth: 0,
-          minBorderMargin: 0,
-          margin: 0
-        },
-        yaxis: {
-          showLabels: false,
-          tickGenerator: 'return [(axis.max + axis.min) / 2];'
-        },
-        xaxis: {
-          showLabels: false
-        }
-      } as TbFlotSettings;
-      this.flot = new TbFlot(this.ctx, 'line', $(this.chartElement.nativeElement), settings);
-      this.tickMin$ = this.flot.yMin$.pipe(
-        map((value) => formatValue(value, (this.flotDataKey?.decimals || this.ctx.decimals))
+      const settings: DeepPartial<TimeSeriesChartSettings> = {
+          dataZoom: false,
+          xAxis: {
+            show: false
+          },
+          yAxes: {
+            default: {
+              show: true,
+              showLine: false,
+              showTicks: false,
+              showTickLabels: false,
+              showSplitLines: true,
+              min: 'dataMin',
+              max: 'dataMax',
+              ticksGenerator: (extent?: number[]) => (extent ? [{ value: (extent[0] + extent[1]) / 2}] : [])
+            }
+          },
+          tooltipDateInterval: false,
+          tooltipDateFormat: autoDateFormat()
+      };
+
+      this.lineChart = new TbTimeSeriesChart(this.ctx, settings, this.chartElement.nativeElement, this.renderer, true);
+
+      this.tickMin$ =this.lineChart.yMin$.pipe(
+        map((value) => formatValue(value, (this.lineChartDataKey?.decimals || this.ctx.decimals))
+      ));
+      this.tickMax$ = this.lineChart.yMax$.pipe(
+        map((value) => formatValue(value, (this.lineChartDataKey?.decimals || this.ctx.decimals))
       ));
-      this.tickMax$ = this.flot.yMax$.pipe(
-        map((value) => formatValue(value, (this.flotDataKey?.decimals || this.ctx.decimals))
-        ));
     }
     if (this.settings.autoScale && this.showValues) {
       this.renderer.setStyle(this.valueCardValueContainer.nativeElement, 'height', valuesLayoutHeight + 'px');
@@ -221,7 +235,7 @@ export class AggregatedValueCardWidgetComponent implements OnInit, AfterViewInit
     }
 
     if (this.showChart) {
-      this.flot.update();
+      this.lineChart.update();
     }
 
     this.updateLastUpdateTs(ts);
@@ -256,20 +270,14 @@ export class AggregatedValueCardWidgetComponent implements OnInit, AfterViewInit
   }
 
   public onResize() {
-    if (this.showChart) {
-      this.flot.resize();
-    }
   }
 
   public onEditModeChanged() {
-    if (this.showChart) {
-      this.flot.checkMouseEvents();
-    }
   }
 
   public onDestroy() {
     if (this.showChart) {
-      this.flot.destroy();
+      this.lineChart.destroy();
     }
   }
 
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/cards/value-chart-card-widget.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/cards/value-chart-card-widget.component.html
index d945380a10..ba538d8104 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/cards/value-chart-card-widget.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/cards/value-chart-card-widget.component.html
@@ -18,8 +18,10 @@
 <div class="tb-value-chart-card-panel" [style]="backgroundStyle$ | async">
   <div class="tb-value-chart-card-overlay" [style]="overlayStyle"></div>
   <ng-container *ngTemplateOutlet="widgetTitlePanel"></ng-container>
-  <div #valueChartCardContent class="tb-value-chart-card-content" [class]="layout">
-    <div *ngIf="showValue" class="tb-value-chart-card-value" #valueChartCardValue [style]="valueStyle" [style.color]="valueColor.color">{{ valueText }}</div>
+  <div #valueChartCardContent class="tb-value-chart-card-content" [class]="layout" [class.auto-scale]="autoScale && showValue">
+    <div *ngIf="showValue" class="tb-value-chart-card-value-container">
+      <div class="tb-value-chart-card-value" #valueChartCardValue [style]="valueStyle" [style.color]="valueColor.color">{{ valueText }}</div>
+    </div>
     <div class="tb-value-chart-card-chart" #chartElement></div>
   </div>
 </div>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/cards/value-chart-card-widget.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/cards/value-chart-card-widget.component.scss
index f958bb6354..22e52e05dd 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/cards/value-chart-card-widget.component.scss
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/cards/value-chart-card-widget.component.scss
@@ -52,7 +52,18 @@
     }
     .tb-value-chart-card-chart {
       flex: 1;
+      min-width: 0;
       height: 100%;
     }
+    &.auto-scale {
+      .tb-value-chart-card-value-container {
+        width: 35%;
+        display: flex;
+        justify-content: flex-start;
+      }
+      .tb-value-chart-card-chart {
+        width: 65%;
+      }
+    }
   }
 }
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/cards/value-chart-card-widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/cards/value-chart-card-widget.component.ts
index d4b8404275..fe5953787a 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/cards/value-chart-card-widget.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/cards/value-chart-card-widget.component.ts
@@ -30,11 +30,14 @@ import {
 import { WidgetContext } from '@home/models/widget-component.models';
 import { formatValue, isDefinedAndNotNull, isNumeric } from '@core/utils';
 import {
+  autoDateFormat,
   backgroundStyle,
   ColorProcessor,
   ComponentStyle,
   getDataKey,
-  overlayStyle, resolveCssSize,
+  overlayStyle,
+  resolveCssSize,
+  simpleDateFormat,
   textStyle
 } from '@shared/models/widget-settings.models';
 import { WidgetComponent } from '@home/components/widget/widget.component';
@@ -44,16 +47,21 @@ import {
   ValueChartCardLayout,
   ValueChartCardWidgetSettings
 } from '@home/components/widget/lib/cards/value-chart-card-widget.models';
-import { TbFlot } from '@home/components/widget/lib/flot-widget';
 import { DataKey } from '@shared/models/widget.models';
-import { TbFlotKeySettings, TbFlotSettings } from '@home/components/widget/lib/flot-widget.models';
 import { getTsValueByLatestDataKey } from '@home/components/widget/lib/cards/aggregated-value-card.models';
 import { Observable } from 'rxjs';
 import { ImagePipe } from '@shared/pipe/image.pipe';
 import { DomSanitizer } from '@angular/platform-browser';
+import { TbTimeSeriesChart } from '@home/components/widget/lib/chart/time-series-chart';
+import {
+  TimeSeriesChartKeySettings,
+  TimeSeriesChartSeriesType,
+  TimeSeriesChartSettings
+} from '@home/components/widget/lib/chart/time-series-chart.models';
+import { DeepPartial } from '@shared/models/common';
 
 const layoutHeight = 56;
-const valueRelativeMaxWidth = 0.5;
+const valueRelativeWidth = 0.35;
 
 @Component({
   selector: 'tb-value-chart-card-widget',
@@ -81,6 +89,7 @@ export class ValueChartCardWidgetComponent implements OnInit, AfterViewInit, OnD
   widgetTitlePanel: TemplateRef<any>;
 
   layout: ValueChartCardLayout;
+  autoScale: boolean;
 
   showValue = true;
   valueText = 'N/A';
@@ -90,8 +99,8 @@ export class ValueChartCardWidgetComponent implements OnInit, AfterViewInit, OnD
   backgroundStyle$: Observable<ComponentStyle>;
   overlayStyle: ComponentStyle = {};
 
-  private flot: TbFlot;
-  private flotDataKey: DataKey;
+  private lineChart: TbTimeSeriesChart;
+  private lineChartDataKey: DataKey;
 
   private valueKey: DataKey;
   private contentResize$: ResizeObserver;
@@ -129,6 +138,7 @@ export class ValueChartCardWidgetComponent implements OnInit, AfterViewInit, OnD
     }
 
     this.layout = this.settings.layout;
+    this.autoScale = this.settings.autoScale;
 
     this.showValue = this.settings.showValue;
     this.valueStyle = textStyle(this.settings.valueFont);
@@ -138,37 +148,37 @@ export class ValueChartCardWidgetComponent implements OnInit, AfterViewInit, OnD
     this.overlayStyle = overlayStyle(this.settings.background.overlay);
 
     if (this.ctx.defaultSubscription.firstDatasource?.dataKeys?.length) {
-      this.flotDataKey = this.ctx.defaultSubscription.firstDatasource?.dataKeys[0];
-      this.flotDataKey.settings = {
-        fillLines: false,
-        showLines: true,
-        lineWidth: 2
-      } as TbFlotKeySettings;
+      this.lineChartDataKey = this.ctx.defaultSubscription.firstDatasource?.dataKeys[0];
+      this.lineChartDataKey.settings = {
+        type: TimeSeriesChartSeriesType.line,
+        lineSettings: {
+          showLine: true,
+          step: false,
+          smooth: true,
+          lineWidth: 2,
+          showPoints: false,
+          showPointLabel: false
+        }
+      } as TimeSeriesChartKeySettings;
     }
   }
 
   public ngAfterViewInit() {
-    const settings = {
-      shadowSize: 0,
-      enableSelection: false,
-      smoothLines: true,
-      grid: {
-        tickColor: 'rgba(0,0,0,0.12)',
-        horizontalLines: false,
-        verticalLines: false,
-        outlineWidth: 0,
-        minBorderMargin: 0,
-        margin: 0
+    const settings: DeepPartial<TimeSeriesChartSettings> = {
+      dataZoom: false,
+      xAxis: {
+        show: false
       },
-      yaxis: {
-        showLabels: false,
-        tickGenerator: 'return [(axis.max + axis.min) / 2];'
+      yAxes: {
+        default: {
+          show: false,
+        }
       },
-      xaxis: {
-        showLabels: false
-      }
-    } as TbFlotSettings;
-    this.flot = new TbFlot(this.ctx, 'line', $(this.chartElement.nativeElement), settings);
+      tooltipDateInterval: false,
+      tooltipDateFormat: autoDateFormat()
+    };
+
+    this.lineChart = new TbTimeSeriesChart(this.ctx, settings, this.chartElement.nativeElement, this.renderer, false);
 
     this.contentResize$ = new ResizeObserver(() => {
       this.onResize();
@@ -190,7 +200,9 @@ export class ValueChartCardWidgetComponent implements OnInit, AfterViewInit, OnD
   }
 
   public onDataUpdated() {
-    this.flot.update();
+    if (this.lineChart) {
+      this.lineChart.update();
+    }
   }
 
   public onLatestDataUpdated() {
@@ -206,20 +218,21 @@ export class ValueChartCardWidgetComponent implements OnInit, AfterViewInit, OnD
       this.valueColor.update(value);
       this.cd.detectChanges();
       setTimeout(() => {
-        this.onResize(false);
+        this.onResize();
       }, 0);
     }
   }
 
   public onEditModeChanged() {
-    this.flot.checkMouseEvents();
   }
 
   public onDestroy() {
-    this.flot.destroy();
+    if (this.lineChart) {
+      this.lineChart.destroy();
+    }
   }
 
-  private onResize(fitTargetHeight = true) {
+  private onResize(fitTargetWidth = true) {
     if (this.settings.autoScale && this.showValue) {
       const contentWidth = this.valueChartCardContent.nativeElement.getBoundingClientRect().width;
       const contentHeight = this.valueChartCardContent.nativeElement.getBoundingClientRect().height;
@@ -228,26 +241,26 @@ export class ValueChartCardWidgetComponent implements OnInit, AfterViewInit, OnD
         this.valueFontSize = resolveCssSize(fontSize)[0];
       }
       const valueRelativeHeight = Math.min(this.valueFontSize / layoutHeight, 1);
-      const targetValueHeight = contentHeight * valueRelativeHeight;
-      const maxValueWidth = contentWidth * valueRelativeMaxWidth;
-      this.setValueFontSize(targetValueHeight, maxValueWidth, fitTargetHeight);
+      const targetValueWidth = contentWidth * valueRelativeWidth;
+      const maxValueHeight = contentHeight * valueRelativeHeight;
+      this.setValueFontSize(targetValueWidth, maxValueHeight, fitTargetWidth);
     }
-    this.flot.resize();
+    this.lineChart.resize();
   }
 
-  private setValueFontSize(targetHeight: number, maxWidth: number, fitTargetHeight = true) {
+  private setValueFontSize(targetWidth: number, maxHeight: number, fitTargetWidth = true) {
     const fontSize = getComputedStyle(this.valueChartCardValue.nativeElement).fontSize;
     let valueFontSize = resolveCssSize(fontSize)[0];
     this.renderer.setStyle(this.valueChartCardValue.nativeElement, 'fontSize', valueFontSize + 'px');
     this.renderer.setStyle(this.valueChartCardValue.nativeElement, 'lineHeight', '1');
-    let valueHeight = this.valueChartCardValue.nativeElement.getBoundingClientRect().height;
-    while (fitTargetHeight && valueHeight < targetHeight) {
+    let valueWidth = this.valueChartCardValue.nativeElement.getBoundingClientRect().width;
+    while (fitTargetWidth && valueWidth < targetWidth) {
       valueFontSize++;
       this.renderer.setStyle(this.valueChartCardValue.nativeElement, 'fontSize', valueFontSize + 'px');
-      valueHeight = this.valueChartCardValue.nativeElement.getBoundingClientRect().height;
+      valueWidth = this.valueChartCardValue.nativeElement.getBoundingClientRect().width;
     }
-    let valueWidth = this.valueChartCardValue.nativeElement.getBoundingClientRect().width;
-    while ((valueHeight > targetHeight || valueWidth > maxWidth) && valueFontSize > 6) {
+    let valueHeight = this.valueChartCardValue.nativeElement.getBoundingClientRect().height;
+    while ((valueWidth > targetWidth || valueHeight > maxHeight) && valueFontSize > 6) {
       valueFontSize--;
       this.renderer.setStyle(this.valueChartCardValue.nativeElement, 'fontSize', valueFontSize + 'px');
       valueWidth = this.valueChartCardValue.nativeElement.getBoundingClientRect().width;
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/bar-chart-widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/bar-chart-widget.component.ts
new file mode 100644
index 0000000000..b39066cf8a
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/bar-chart-widget.component.ts
@@ -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.
+///
+
+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 {
+  LatestChartComponent,
+  LatestChartComponentCallbacks
+} from '@home/components/widget/lib/chart/latest-chart.component';
+import {
+  barChartWidgetBarsChartSettings,
+  barChartWidgetDefaultSettings,
+  BarChartWidgetSettings
+} from '@home/components/widget/lib/chart/bar-chart-widget.models';
+import { TbBarsChart } from '@home/components/widget/lib/chart/bars-chart';
+
+@Component({
+  selector: 'tb-bar-chart-widget',
+  templateUrl: './latest-chart-widget.component.html',
+  styleUrls: [],
+  encapsulation: ViewEncapsulation.None
+})
+export class BarChartWidgetComponent implements OnInit {
+
+  @ViewChild('latestChart')
+  latestChart: LatestChartComponent;
+
+  @Input()
+  ctx: WidgetContext;
+
+  @Input()
+  widgetTitlePanel: TemplateRef<any>;
+
+  settings: BarChartWidgetSettings;
+
+  callbacks: LatestChartComponentCallbacks;
+
+  constructor(private widgetComponent: WidgetComponent,
+              private translate: TranslateService) {
+  }
+
+  ngOnInit(): void {
+    this.ctx.$scope.barChartWidget = this;
+    this.settings = {...barChartWidgetDefaultSettings, ...this.ctx.settings};
+    this.callbacks = {
+      createChart: (chartShape, renderer) => {
+        const settings = barChartWidgetBarsChartSettings(this.settings);
+        return new TbBarsChart(this.ctx, settings, chartShape.nativeElement, renderer, this.translate, true);
+      }
+    };
+  }
+
+  public onInit() {
+    this.latestChart?.onInit();
+  }
+
+  public onDataUpdated() {
+    this.latestChart?.onDataUpdated();
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/bar-chart-widget.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/bar-chart-widget.models.ts
new file mode 100644
index 0000000000..b51368b071
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/bar-chart-widget.models.ts
@@ -0,0 +1,78 @@
+///
+/// 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 {
+  latestChartWidgetDefaultSettings,
+  LatestChartWidgetSettings
+} from '@home/components/widget/lib/chart/latest-chart.models';
+import { mergeDeep } from '@core/utils';
+import {
+  barsChartAnimationDefaultSettings,
+  BarsChartSettings
+} from '@home/components/widget/lib/chart/bars-chart.models';
+import { Font } from '@shared/models/widget-settings.models';
+import { DeepPartial } from '@shared/models/common';
+import {
+  ChartAnimationSettings,
+  chartBarDefaultSettings,
+  ChartBarSettings,
+  chartColorScheme
+} from '@home/components/widget/lib/chart/chart.models';
+
+export interface BarChartWidgetSettings extends LatestChartWidgetSettings {
+  axisMin?: number;
+  axisMax?: number;
+  axisTickLabelFont: Font;
+  axisTickLabelColor: string;
+  barSettings: ChartBarSettings;
+}
+
+export const barChartWidgetDefaultSettings: BarChartWidgetSettings = {
+  ...latestChartWidgetDefaultSettings,
+  animation: mergeDeep({} as ChartAnimationSettings,
+    barsChartAnimationDefaultSettings),
+  axisTickLabelFont: {
+    family: 'Roboto',
+    size: 12,
+    sizeUnit: 'px',
+    style: 'normal',
+    weight: '400',
+    lineHeight: '1'
+  },
+  axisTickLabelColor: chartColorScheme['axis.tickLabel'].light,
+  barSettings: mergeDeep({} as ChartBarSettings, chartBarDefaultSettings,
+    {barWidth: 80, showLabel: true} as ChartBarSettings)
+};
+
+export const barChartWidgetBarsChartSettings = (settings: BarChartWidgetSettings): DeepPartial<BarsChartSettings> => ({
+  polar: false,
+  axisMin: settings.axisMin,
+  axisMax: settings.axisMax,
+  axisTickLabelFont: settings.axisTickLabelFont,
+  axisTickLabelColor: settings.axisTickLabelColor,
+  barSettings: settings.barSettings,
+  sortSeries: settings.sortSeries,
+  showTotal: false,
+  animation: settings.animation,
+  showLegend: settings.showLegend,
+  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/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 2e2faf35e8..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,51 +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 { DataKey } from '@shared/models/widget.models';
+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,
-  echartsTooltipFormatter,
-  NamedDataSet,
-  toNamedData
-} from '@home/components/widget/lib/chart/echarts-widget.models';
-import { IntervalMath } from '@shared/models/time/time.models';
-
-interface BarChartDataItem {
-  id: string;
-  dataKey: DataKey;
-  data: NamedDataSet;
-  enabled: boolean;
-}
-
-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',
@@ -98,26 +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 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,
@@ -129,354 +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);
-    }
-  }
-
-  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 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
-        });
-      }
+    if (this.timeSeriesChart) {
+      this.timeSeriesChart.update();
     }
   }
 
-  private drawChart() {
-    echartsModule.init();
-    this.barChart = echarts.init(this.chartShape.nativeElement, null, {
-      renderer: 'canvas',
-    });
-    this.barChartOptions = {
-      tooltip: {
-        trigger: 'axis',
-        confine: true,
-        appendToBody: true,
-        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);
-          } 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();
+  public onLegendKeyEnter(key: DataKey) {
+    this.timeSeriesChart.keyEnter(key);
   }
 
-  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;
+  public onLegendKeyLeave(key: DataKey) {
+    this.timeSeriesChart.keyLeave(key);
   }
 
-  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 d0b54fed53..185922a3eb 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 { DeepPartial } from '@shared/models/common';
+import {
+  defaultTimeSeriesChartXAxisSettings,
+  defaultTimeSeriesChartYAxisSettings,
+  timeSeriesChartGridDefaultSettings,
+  TimeSeriesChartGridSettings,
+  TimeSeriesChartKeySettings,
+  timeSeriesChartNoAggregationBarWidthDefaultSettings,
+  TimeSeriesChartNoAggregationBarWidthSettings,
+  TimeSeriesChartSeriesType,
+  TimeSeriesChartSettings,
+  TimeSeriesChartThreshold,
+  TimeSeriesChartTooltipWidgetSettings,
+  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';
+import {
+  chartAnimationDefaultSettings,
+  ChartAnimationSettings,
+  ChartFillSettings,
+  ChartFillType
+} from '@home/components/widget/lib/chart/chart.models';
 
-export interface BarChartWithLabelsWidgetSettings extends EChartsTooltipWidgetSettings {
+export interface BarChartWithLabelsWidgetSettings extends TimeSeriesChartTooltipWidgetSettings {
+  dataZoom: boolean;
   showBarLabel: boolean;
   barLabelFont: Font;
   barLabelColor: string;
   showBarValue: boolean;
   barValueFont: Font;
   barValueColor: string;
+  showBarBorder: boolean;
+  barBorderWidth: number;
+  barBorderRadius: number;
+  barBackgroundSettings: ChartFillSettings;
+  noAggregationBarWidthSettings: TimeSeriesChartNoAggregationBarWidthSettings;
+  grid: TimeSeriesChartGridSettings;
+  yAxis: TimeSeriesChartYAxisSettings;
+  xAxis: TimeSeriesChartXAxisSettings;
+  animation: ChartAnimationSettings;
+  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: ChartFillType.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 ChartAnimationSettings,
+    chartAnimationDefaultSettings),
+  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,
@@ -75,6 +152,7 @@ export const barChartWithLabelsDefaultSettings: BarChartWithLabelsWidgetSettings
   },
   tooltipValueColor: 'rgba(0, 0, 0, 0.76)',
   tooltipShowDate: true,
+  tooltipDateInterval: true,
   tooltipDateFormat: customDateFormat('MMMM y'),
   tooltipDateFont: {
     family: 'Roboto',
@@ -95,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/bars-chart.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/bars-chart.models.ts
new file mode 100644
index 0000000000..a099d11f7d
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/bars-chart.models.ts
@@ -0,0 +1,61 @@
+///
+/// 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 { latestChartDefaultSettings, LatestChartSettings } from '@home/components/widget/lib/chart/latest-chart.models';
+import { mergeDeep } from '@core/utils';
+import {
+  chartAnimationDefaultSettings,
+  ChartAnimationSettings,
+  chartBarDefaultSettings,
+  ChartBarSettings,
+  chartColorScheme
+} from '@home/components/widget/lib/chart/chart.models';
+import { Font } from '@shared/models/widget-settings.models';
+
+export interface BarsChartSettings extends LatestChartSettings {
+  polar: boolean;
+  axisMin?: number | string;
+  axisMax?: number | string;
+  axisTickLabelFont: Font;
+  axisTickLabelColor: string;
+  angleAxisStartAngle?: number;
+  barSettings: ChartBarSettings;
+}
+
+export const barsChartAnimationDefaultSettings: ChartAnimationSettings =
+  mergeDeep({} as ChartAnimationSettings, chartAnimationDefaultSettings, {
+    animationDuration: 1000,
+    animationDurationUpdate: 500
+  } as ChartAnimationSettings);
+
+export const barsChartDefaultSettings: BarsChartSettings = {
+  ...latestChartDefaultSettings,
+  animation: mergeDeep({} as ChartAnimationSettings,
+    barsChartAnimationDefaultSettings),
+  polar: false,
+  axisTickLabelFont: {
+    family: 'Roboto',
+    size: 12,
+    sizeUnit: 'px',
+    style: 'normal',
+    weight: '400',
+    lineHeight: '1'
+  },
+  axisTickLabelColor: chartColorScheme['axis.tickLabel'].light,
+  angleAxisStartAngle: 0,
+  barSettings: mergeDeep({} as ChartBarSettings, chartBarDefaultSettings,
+    {barWidth: 80, showLabel: true} as ChartBarSettings)
+};
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/bars-chart.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/bars-chart.ts
new file mode 100644
index 0000000000..4458069eed
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/bars-chart.ts
@@ -0,0 +1,166 @@
+///
+/// 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 { TbLatestChart } from '@home/components/widget/lib/chart/latest-chart';
+import { barsChartDefaultSettings, BarsChartSettings } from '@home/components/widget/lib/chart/bars-chart.models';
+import { WidgetContext } from '@home/models/widget-component.models';
+import { DeepPartial } from '@shared/models/common';
+import { PieChartSettings } from '@home/components/widget/lib/chart/pie-chart.models';
+import { Renderer2 } from '@angular/core';
+import { TranslateService } from '@ngx-translate/core';
+import { ComponentStyle } from '@shared/models/widget-settings.models';
+import { LinearGradientObject } from 'zrender/lib/graphic/LinearGradient';
+import tinycolor from 'tinycolor2';
+import { BarDataItemOption, BarSeriesLabelOption } from 'echarts/types/src/chart/bar/BarSeries';
+import { formatValue, isDefinedAndNotNull } from '@core/utils';
+import {
+  ChartFillType,
+  ChartLabelPosition,
+  createChartTextStyle,
+  createLinearOpacityGradient, toAnimationOption
+} from '@home/components/widget/lib/chart/chart.models';
+import { ValueAxisBaseOption } from 'echarts/types/src/coord/axisCommonTypes';
+import { RadiusAxisOption, YAXisOption } from 'echarts/types/dist/shared';
+
+export class TbBarsChart extends TbLatestChart<BarsChartSettings> {
+
+  constructor(ctx: WidgetContext,
+              inputSettings: DeepPartial<PieChartSettings>,
+              chartElement: HTMLElement,
+              renderer: Renderer2,
+              translate: TranslateService,
+              autoResize = true) {
+
+    super(ctx, inputSettings, chartElement, renderer, translate, autoResize);
+  }
+
+  protected defaultSettings(): BarsChartSettings {
+    return barsChartDefaultSettings;
+  }
+
+  protected prepareLatestChartOption() {
+    let labelStyle: ComponentStyle = {};
+    if (this.settings.barSettings.showLabel) {
+      labelStyle = createChartTextStyle(this.settings.barSettings.labelFont,
+        this.settings.barSettings.labelColor, false, 'series.label', false);
+    }
+    const labelOption: BarSeriesLabelOption = {
+      show: this.settings.barSettings.showLabel,
+      position: this.settings.barSettings.labelPosition,
+      formatter: (params) => `{label|${params.name}}`,
+      rich: {
+        label: labelStyle
+      }
+    };
+    if (this.settings.barSettings.enableLabelBackground) {
+      labelOption.backgroundColor = this.settings.barSettings.labelBackground;
+      labelOption.padding = [4, 5];
+      labelOption.borderRadius = 4;
+    }
+    this.latestChartOption.series = [
+      {
+        type: 'bar',
+        barWidth: isDefinedAndNotNull(this.settings.barSettings.barWidth) ? this.settings.barSettings.barWidth + '%' : undefined,
+        itemStyle: {
+          borderWidth: this.settings.barSettings.showBorder ? this.settings.barSettings.borderWidth : 0
+        },
+        emphasis: {
+          focus: 'self'
+        },
+        coordinateSystem: this.settings.polar ? 'polar' : 'cartesian2d',
+        label: labelOption,
+        ...toAnimationOption(this.ctx, this.settings.animation)
+      }
+    ];
+
+    const axisTickLabelStyle = createChartTextStyle(this.settings.axisTickLabelFont,
+      this.settings.axisTickLabelColor, false, 'axis.tickLabel');
+    const valueAxis: ValueAxisBaseOption = {
+      type: 'value',
+      min: this.settings.axisMin,
+      max: this.settings.axisMax,
+      axisLabel: {
+        color: axisTickLabelStyle.color,
+        fontStyle: axisTickLabelStyle.fontStyle,
+        fontWeight: axisTickLabelStyle.fontWeight,
+        fontFamily: axisTickLabelStyle.fontFamily,
+        fontSize: axisTickLabelStyle.fontSize,
+        formatter: (value: any) => formatValue(value, this.decimals, this.units, false)
+      }
+    };
+    if (this.settings.polar) {
+      this.latestChartOption.polar = {
+        radius: '100%'
+      };
+      this.latestChartOption.radiusAxis = valueAxis as RadiusAxisOption;
+      this.latestChartOption.angleAxis = {
+        type: 'category',
+        data: [],
+        startAngle: this.settings.angleAxisStartAngle
+      };
+    } else {
+      let minTop = 0;
+      let minBottom = 0;
+      if (this.settings.barSettings.showLabel) {
+        if (this.settings.barSettings.labelPosition === ChartLabelPosition.top) {
+          minTop = this.settings.barSettings.labelFont.size;
+        } else if (this.settings.barSettings.labelPosition === ChartLabelPosition.bottom) {
+          minBottom = this.settings.barSettings.labelFont.size;
+        }
+      }
+      this.latestChartOption.grid = [{
+        containLabel: true,
+        top: minTop,
+        bottom: minBottom,
+        left: 0,
+        right: 0
+      }];
+      this.latestChartOption.xAxis = {
+        type: 'category',
+        data: []
+      };
+      this.latestChartOption.yAxis = valueAxis as YAXisOption;
+    }
+  }
+
+  protected doUpdateSeriesData() {
+    const seriesData: BarDataItemOption[] = [];
+    for (const dataItem of this.dataItems) {
+      if (dataItem.enabled && dataItem.hasValue) {
+        const barSettings = this.settings.barSettings;
+        let borderRadius: number[];
+        if (dataItem.value < 0) {
+          borderRadius = [0, 0, barSettings.borderRadius, barSettings.borderRadius];
+        } else {
+          borderRadius = [barSettings.borderRadius, barSettings.borderRadius, 0, 0];
+        }
+        let barColor: string | LinearGradientObject;
+        if (barSettings.backgroundSettings.type === ChartFillType.none) {
+          barColor = dataItem.dataKey.color;
+        } else if (barSettings.backgroundSettings.type === ChartFillType.opacity) {
+          barColor = tinycolor(dataItem.dataKey.color).setAlpha(barSettings.backgroundSettings.opacity).toRgbString();
+        } else {
+          barColor = createLinearOpacityGradient(dataItem.dataKey.color, barSettings.backgroundSettings.gradient);
+        }
+        seriesData.push(
+          {id: dataItem.id, value: dataItem.value, name: dataItem.dataKey.label,
+            itemStyle: {color: barColor, borderColor: dataItem.dataKey.color, borderRadius}}
+        );
+      }
+    }
+    this.latestChartOption.series[0].data = seriesData;
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/chart.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/chart.models.ts
new file mode 100644
index 0000000000..e52c7b77c8
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/chart.models.ts
@@ -0,0 +1,357 @@
+///
+/// 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 { isNumber } from '@core/utils';
+import { TbColorScheme } from '@shared/models/color.models';
+import { LinearGradientObject } from 'zrender/lib/graphic/LinearGradient';
+import tinycolor from 'tinycolor2';
+import { ComponentStyle, Font, textStyle } from '@shared/models/widget-settings.models';
+import { LabelFormatterCallback, RadialGradientObject } from 'echarts';
+import { AnimationOptionMixin, LabelLayoutOption } from 'echarts/types/src/util/types';
+import { LabelLayoutOptionCallback } from 'echarts/types/dist/shared';
+import { BuiltinTextPosition } from 'zrender/src/core/types';
+import { WidgetContext } from '@home/models/widget-component.models';
+
+export const chartColorScheme: TbColorScheme = {
+  'threshold.line': {
+    light: 'rgba(0, 0, 0, 0.76)',
+    dark: '#eee'
+  },
+  'threshold.label': {
+    light: 'rgba(0, 0, 0, 0.76)',
+    dark: '#eee'
+  },
+  'axis.line': {
+    light: 'rgba(0, 0, 0, 0.54)',
+    dark: '#B9B8CE'
+  },
+  'axis.label': {
+    light: 'rgba(0, 0, 0, 0.54)',
+    dark: '#B9B8CE'
+  },
+  'axis.ticks': {
+    light: 'rgba(0, 0, 0, 0.54)',
+    dark: '#B9B8CE'
+  },
+  'axis.tickLabel': {
+    light: 'rgba(0, 0, 0, 0.54)',
+    dark: '#B9B8CE'
+  },
+  'axis.splitLine': {
+    light: 'rgba(0, 0, 0, 0.12)',
+    dark: '#484753'
+  },
+  'series.label': {
+    light: 'rgba(0, 0, 0, 0.76)',
+    dark: '#eee'
+  }
+};
+
+export enum ChartShape {
+  emptyCircle = 'emptyCircle',
+  circle = 'circle',
+  rect = 'rect',
+  roundRect = 'roundRect',
+  triangle = 'triangle',
+  diamond = 'diamond',
+  pin = 'pin',
+  arrow = 'arrow',
+  none = 'none'
+}
+
+export const chartShapes = Object.keys(ChartShape) as ChartShape[];
+
+export const chartShapeTranslations = new Map<ChartShape, string>(
+  [
+    [ChartShape.emptyCircle, 'widgets.chart.shape-empty-circle'],
+    [ChartShape.circle, 'widgets.chart.shape-circle'],
+    [ChartShape.rect, 'widgets.chart.shape-rect'],
+    [ChartShape.roundRect, 'widgets.chart.shape-round-rect'],
+    [ChartShape.triangle, 'widgets.chart.shape-triangle'],
+    [ChartShape.diamond, 'widgets.chart.shape-diamond'],
+    [ChartShape.pin, 'widgets.chart.shape-pin'],
+    [ChartShape.arrow, 'widgets.chart.shape-arrow'],
+    [ChartShape.none, 'widgets.chart.shape-none']
+  ]
+);
+
+export enum ChartLineType {
+  solid = 'solid',
+  dashed = 'dashed',
+  dotted = 'dotted'
+}
+
+export const chartLineTypes = Object.keys(ChartLineType) as ChartLineType[];
+
+export const chartLineTypeTranslations = new Map<ChartLineType, string>(
+  [
+    [ChartLineType.solid, 'widgets.chart.line-type-solid'],
+    [ChartLineType.dashed, 'widgets.chart.line-type-dashed'],
+    [ChartLineType.dotted, 'widgets.chart.line-type-dotted']
+  ]
+);
+
+export enum ChartAnimationEasing {
+  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 chartAnimationEasings = Object.keys(ChartAnimationEasing) as ChartAnimationEasing[];
+
+export enum ChartFillType {
+  none = 'none',
+  opacity = 'opacity',
+  gradient = 'gradient'
+}
+
+export const chartFillTypes = Object.keys(ChartFillType) as ChartFillType[];
+
+export const chartFillTypeTranslations = new Map<ChartFillType, string>(
+  [
+    [ChartFillType.none, 'widgets.chart.fill-type-none'],
+    [ChartFillType.opacity, 'widgets.chart.fill-type-opacity'],
+    [ChartFillType.gradient, 'widgets.chart.fill-type-gradient']
+  ]
+);
+
+export enum ChartLabelPosition {
+  top = 'top',
+  bottom = 'bottom'
+}
+
+export const chartLabelPositions = Object.keys(ChartLabelPosition) as ChartLabelPosition[];
+
+export const chartLabelPositionTranslations = new Map<ChartLabelPosition, string>(
+  [
+    [ChartLabelPosition.top, 'widgets.chart.label-position-top'],
+    [ChartLabelPosition.bottom, 'widgets.chart.label-position-bottom']
+  ]
+);
+
+export enum PieChartLabelPosition {
+  inside = 'inside',
+  outside = 'outside'
+}
+
+export const pieChartLabelPositions = Object.keys(PieChartLabelPosition) as PieChartLabelPosition[];
+
+export const pieChartLabelPositionTranslations = new Map<PieChartLabelPosition, string>(
+  [
+    [PieChartLabelPosition.inside, 'widgets.chart.label-position-inside'],
+    [PieChartLabelPosition.outside, 'widgets.chart.label-position-outside']
+  ]
+);
+
+export interface ChartAnimationSettings {
+  animation: boolean;
+  animationThreshold: number;
+  animationDuration: number;
+  animationEasing: ChartAnimationEasing;
+  animationDelay: number;
+  animationDurationUpdate: number;
+  animationEasingUpdate: ChartAnimationEasing;
+  animationDelayUpdate: number;
+}
+
+export const chartAnimationDefaultSettings: ChartAnimationSettings = {
+  animation: true,
+  animationThreshold: 2000,
+  animationDuration: 500,
+  animationEasing: ChartAnimationEasing.cubicOut,
+  animationDelay: 0,
+  animationDurationUpdate: 300,
+  animationEasingUpdate: ChartAnimationEasing.cubicOut,
+  animationDelayUpdate: 0
+};
+
+export interface ChartFillSettings {
+  type: ChartFillType;
+  opacity: number;
+  gradient: {
+    start: number;
+    end: number;
+  };
+}
+
+export interface ChartBarSettings {
+  showBorder: boolean;
+  borderWidth: number;
+  borderRadius: number;
+  barWidth?: number;
+  showLabel: boolean;
+  labelPosition: ChartLabelPosition | PieChartLabelPosition | BuiltinTextPosition;
+  labelFont: Font;
+  labelColor: string;
+  enableLabelBackground: boolean;
+  labelBackground: string;
+  labelFormatter?: string | LabelFormatterCallback;
+  labelLayout?: LabelLayoutOption | LabelLayoutOptionCallback;
+  additionalLabelOption?: {[key: string]: any};
+  backgroundSettings: ChartFillSettings;
+}
+
+export const chartBarDefaultSettings: ChartBarSettings = {
+  showBorder: false,
+  borderWidth: 2,
+  borderRadius: 0,
+  showLabel: false,
+  labelPosition: ChartLabelPosition.top,
+  labelFont: {
+    family: 'Roboto',
+    size: 11,
+    sizeUnit: 'px',
+    style: 'normal',
+    weight: '400',
+    lineHeight: '1'
+  },
+  labelColor: chartColorScheme['series.label'].light,
+  enableLabelBackground: false,
+  labelBackground: 'rgba(255,255,255,0.56)',
+  backgroundSettings: {
+    type: ChartFillType.none,
+    opacity: 0.4,
+    gradient: {
+      start: 100,
+      end: 0
+    }
+  }
+};
+
+type ChartShapeOffsetFunction = (size: number) => number;
+
+const chartShapeOffsetFunctions = new Map<ChartShape, ChartShapeOffsetFunction>(
+  [
+    [ChartShape.emptyCircle, size => size / 2 + 1],
+    [ChartShape.circle, size => size / 2],
+    [ChartShape.rect, size => size / 2],
+    [ChartShape.roundRect, size => size / 2],
+    [ChartShape.triangle, size => size / 2],
+    [ChartShape.diamond, size => size / 2],
+    [ChartShape.pin, size => size],
+    [ChartShape.arrow, () => 0],
+    [ChartShape.none, () => 0],
+  ]
+);
+
+export const measureSymbolOffset = (symbol: string, symbolSize: any): number => {
+  if (isNumber(symbolSize)) {
+    if (symbol) {
+      const offsetFunction = chartShapeOffsetFunctions.get(symbol as ChartShape);
+      if (offsetFunction) {
+        return offsetFunction(symbolSize);
+      } else {
+        return symbolSize / 2;
+      }
+    }
+  } else {
+    return 0;
+  }
+};
+
+export const createLinearOpacityGradient = (color: string, gradient: {start: number; end: number}): LinearGradientObject => ({
+  type: 'linear',
+  x: 0,
+  y: 0,
+  x2: 0,
+  y2: 1,
+  colorStops: [{
+    offset: 0, color: tinycolor(color).setAlpha(gradient.start / 100).toRgbString() // color at 0%
+  }, {
+    offset: 1, color: tinycolor(color).setAlpha(gradient.end / 100).toRgbString() // color at 100%
+  }],
+  global: false
+});
+
+export const createRadialOpacityGradient = (color: string, gradient: {start: number; end: number}): RadialGradientObject => ({
+  type: 'radial',
+  x: 0.5,
+  y: 0.5,
+  r: 0.5,
+  colorStops: [{
+    offset: 0, color: tinycolor(color).setAlpha(gradient.end / 100).toRgbString() // color at 0%
+  }, {
+    offset: 1, color: tinycolor(color).setAlpha(gradient.start / 100).toRgbString() // color at 100%
+  }],
+  global: false
+});
+
+export const createChartTextStyle = (font: Font, color: string, darkMode: boolean, colorKey?: string, fill = false): ComponentStyle => {
+  const style = textStyle(font);
+  delete style.lineHeight;
+  style.fontSize = font.size;
+  if (fill) {
+    style.fill = prepareChartThemeColor(color, darkMode, colorKey);
+  } else {
+    style.color = prepareChartThemeColor(color, darkMode, colorKey);
+  }
+  return style;
+};
+
+export const prepareChartThemeColor = (color: string, darkMode: boolean, colorKey?: string): string => {
+  if (darkMode) {
+    let colorInstance = tinycolor(color);
+    if (colorInstance.isDark()) {
+      if (colorKey && chartColorScheme[colorKey]) {
+        return chartColorScheme[colorKey].dark;
+      } else {
+        const rgb = colorInstance.toRgb();
+        colorInstance = tinycolor({r: 255 - rgb.r, g: 255 - rgb.g, b: 255 - rgb.b, a: rgb.a});
+        return colorInstance.toRgbString();
+      }
+    }
+  }
+  return color;
+};
+
+export const toAnimationOption = (ctx: WidgetContext, settings: ChartAnimationSettings): AnimationOptionMixin => ({
+  animation: settings.animation,
+  animationThreshold: settings.animationThreshold,
+  animationDuration: settings.animationDuration,
+  animationEasing: settings.animationEasing,
+  animationDelay: settings.animationDelay,
+  animationDurationUpdate: settings.animationDurationUpdate,
+  animationEasingUpdate: settings.animationEasingUpdate,
+  animationDelayUpdate: settings.animationDelayUpdate
+});
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 723b581fc5..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,
-        appendToBody: true
-      },
-      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..c8c6f724e5 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 { 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 {
+  latestChartWidgetDefaultSettings,
+  LatestChartWidgetSettings
+} from '@home/components/widget/lib/chart/latest-chart.models';
+import { mergeDeep } from '@core/utils';
+import { ChartAnimationSettings } from '@home/components/widget/lib/chart/chart.models';
 
 export enum DoughnutLayout {
   default = 'default',
@@ -51,48 +53,22 @@ 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 => ({
-  layout: DoughnutLayout.default,
+  ...latestChartWidgetDefaultSettings,
   autoScale: true,
-  clockwise: false,
   sortSeries: false,
+  animation: mergeDeep({} as ChartAnimationSettings,
+    pieChartAnimationDefaultSettings),
+  legendPosition: horizontal ? LegendPosition.right : LegendPosition.bottom,
+  layout: DoughnutLayout.default,
+  clockwise: false,
   totalValueFont: {
     family: 'Roboto',
     size: 24,
@@ -101,48 +77,33 @@ export const doughnutDefaultSettings = (horizontal: boolean): DoughnutWidgetSett
     weight: '500',
     lineHeight: '1'
   },
-  totalValueColor: constantColor('rgba(0, 0, 0, 0.87)'),
-  showLegend: true,
-  legendPosition: horizontal ? LegendPosition.right : 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: DoughnutTooltipValueType.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
-    }
-  }
+  totalValueColor: constantColor('rgba(0, 0, 0, 0.87)')
+});
+
+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 515e47559d..f68e8dbacb 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,105 +15,67 @@
 ///
 
 import * as echarts from 'echarts/core';
-import { Axis } from 'echarts';
 import AxisModel from 'echarts/types/src/coord/cartesian/AxisModel';
-import { formatValue, isDefinedAndNotNull, isNumber, isString } from '@core/utils';
-import TimeScale from 'echarts/types/src/scale/Time';
+import { estimateLabelUnionRect } from 'echarts/lib/coord/axisHelper';
 import {
-  DataZoomComponent, DataZoomComponentOption,
-  GridComponent, GridComponentOption,
-  MarkLineComponent, MarkLineComponentOption,
-  TooltipComponent, TooltipComponentOption,
-  VisualMapComponent, VisualMapComponentOption
+  DataZoomComponent,
+  DataZoomComponentOption,
+  GridComponent,
+  GridComponentOption,
+  MarkLineComponent,
+  MarkLineComponentOption,
+  PolarComponent,
+  PolarComponentOption,
+  RadarComponent,
+  RadarComponentOption,
+  TooltipComponent,
+  TooltipComponentOption,
+  VisualMapComponent,
+  VisualMapComponentOption
 } from 'echarts/components';
 import {
   BarChart,
-  LineChart,
+  BarSeriesOption,
   CustomChart,
   CustomSeriesOption,
+  LineChart,
   LineSeriesOption,
-  BarSeriesOption, PieSeriesOption, PieChart
+  PieChart,
+  PieSeriesOption,
+  RadarChart,
+  RadarSeriesOption
 } from 'echarts/charts';
 import { LabelLayout } from 'echarts/features';
 import { CanvasRenderer, SVGRenderer } from 'echarts/renderers';
-import { DataEntry, DataSet } from '@shared/models/widget.models';
-import {
-  calculateAggIntervalWithWidgetTimeWindow,
-  Interval,
-  IntervalMath,
-  WidgetTimewindow
-} from '@shared/models/time/time.models';
 import { CallbackDataParams } 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 { measureSymbolOffset } from '@home/components/widget/lib/chart/chart.models';
 
 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,
         VisualMapComponent,
         DataZoomComponent,
         MarkLineComponent,
+        PolarComponent,
+        RadarComponent,
         LineChart,
         BarChart,
         PieChart,
+        RadarChart,
         CustomChart,
         LabelLayout,
         CanvasRenderer,
         SVGRenderer
       ]);
-
       this.initialized = true;
     }
   }
@@ -127,151 +89,176 @@ export type EChartsOption = echarts.ComposeOption<
   | VisualMapComponentOption
   | DataZoomComponentOption
   | MarkLineComponentOption
+  | PolarComponentOption
+  | RadarComponentOption
   | LineSeriesOption
   | CustomSeriesOption
   | BarSeriesOption
   | PieSeriesOption
+  | RadarSeriesOption
 >;
 
 export type ECharts = echarts.ECharts;
 
-export type EChartsDataItem = [number, any, number, number];
+export const getAxis = (chart: ECharts, mainType: string, axisId: string): Axis2D => {
+  const model: GlobalModel = (chart as any).getModel();
+  const models = model.queryComponents({mainType, id: axisId});
+  if (models?.length) {
+    const axisModel = models[0] as AxisModel;
+    return axisModel.axis;
+  }
+  return null;
+};
 
-export type NamedDataSet = {name: string; value: EChartsDataItem}[];
+export const calculateAxisSize = (chart: ECharts, mainType: string, axisId: string): number => {
+  const axis = getAxis(chart, mainType, axisId);
+  return _calculateAxisSize(axis);
+};
 
-export const toNamedData = (data: DataSet): NamedDataSet => {
-  if (!data?.length) {
-    return [];
-  } else {
-    return data.map(d => {
-      const ts = isDefinedAndNotNull(d[2]) ? d[2][0] : d[0];
-      return {
-        name: ts + '',
-        value: toEChartsDataItem(d)
-      };
-    });
+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 toEChartsDataItem = (entry: DataEntry): EChartsDataItem => {
-  const item: EChartsDataItem = [entry[0], entry[1], entry[0], entry[0]];
-  if (isDefinedAndNotNull(entry[2])) {
-    item[2] = entry[2][0];
-    item[3] = entry[2][1];
+const _calculateAxisSize = (axis: Axis2D): number => {
+  let size = 0;
+  if (axis && axis.model.option.show) {
+    const labelUnionRect = estimateLabelUnionRect(axis);
+    if (labelUnionRect) {
+      const margin = axis.model.get(['axisLabel', 'margin']);
+      const dimension = axis.isHorizontal() ? 'height' : 'width';
+      size += labelUnionRect[dimension] + margin;
+    }
+    if (!axis.scale.isBlank() && axis.model.get(['axisTick', 'show'])) {
+      const tickLength = axis.model.get(['axisTick', 'length']);
+      size += tickLength;
+    }
   }
-  return item;
+  return size;
 };
 
-export interface EChartsTooltipWidgetSettings {
-  showTooltip: boolean;
-  tooltipValueFont: Font;
-  tooltipValueColor: string;
-  tooltipShowDate: boolean;
-  tooltipDateFormat: DateFormatSettings;
-  tooltipDateFont: Font;
-  tooltipDateColor: string;
-  tooltipBackgroundColor: string;
-  tooltipBackgroundBlur: number;
-}
+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();
+    const models = model.queryComponents({mainType: 'series', id: thresholdId});
+    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');
+        const formatter = markLineModel.get(['label', 'formatter']);
+        let textWidth = 0;
+        if (Array.isArray(value)) {
+          for (const val of value) {
+            if (val >= extent[0] && val <= extent[1]) {
+              const textVal = typeof formatter === 'string' ? formatter : formatter({value: val} as CallbackDataParams);
+              textWidth = Math.max(textWidth, labelModel.getTextRect(textVal).width);
+            }
+          }
+        } else {
+          if (value >= extent[0] && value <= extent[1]) {
+            const textVal = typeof formatter === 'string' ? formatter : formatter({value} as CallbackDataParams);
+            textWidth = labelModel.getTextRect(textVal).width;
+          }
+        }
+        if (!textWidth) {
+          return offset;
+        }
+        const distanceOpt = markLineModel.get(['label', 'distance']);
+        let distance = 5;
+        if (distanceOpt) {
+          distance = typeof distanceOpt === 'number' ? distanceOpt : distanceOpt[0];
+        }
+        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') {
+          offset[0] = Math.max(offset[0], textOffset);
+        } else {
+          offset[1] = Math.max(offset[1], textOffset);
+        }
+      }
+    }
+  }
+  return offset;
+};
 
-export const echartsTooltipFormatter = (renderer: Renderer2,
-                                        tooltipDateFormat: DateFormatProcessor,
-                                        settings: EChartsTooltipWidgetSettings,
-                                        params: CallbackDataParams[],
-                                        decimals: number,
-                                        units: string,
-                                        focusedSeriesIndex: number): null | HTMLElement => {
-  if (!params.length || !params[0]) {
-    return null;
+export const getAxisExtent = (chart: ECharts, axisId: string): [number, number] => {
+  const axis = getAxis(chart, 'yAxis', axisId);
+  if (axis) {
+    return axis.scale.getExtent();
   }
-  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 = params[0].value[2];
-    const endTs = params[0].value[3];
-    if (startTs && endTs && (endTs - 1) > startTs) {
-      const startDateText = tooltipDateFormat.update(startTs);
-      const endDateText = tooltipDateFormat.update(endTs - 1);
-      if (startDateText === endDateText) {
-        dateText = startDateText;
-      } else {
-        dateText = startDateText + ' - ' + endDateText;
+  return [0,0];
+};
+
+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;
       }
-    } else {
-      const ts = params[0].value[0];
-      dateText = tooltipDateFormat.update(ts);
     }
-    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);
   }
-  let seriesParams: CallbackDataParams = null;
-  if (focusedSeriesIndex > -1) {
-    seriesParams = params.find(param => param.seriesIndex === focusedSeriesIndex);
-  }
-  if (seriesParams) {
-    renderer.appendChild(tooltipElement, constructEchartsTooltipSeriesElement(renderer, settings, seriesParams, decimals, units));
+  if (componentBlurredKey) {
+    const obj = model[componentBlurredKey];
+    return !!obj?.isBlured;
   } else {
-    for (seriesParams of params) {
-      renderer.appendChild(tooltipElement, constructEchartsTooltipSeriesElement(renderer, settings, seriesParams, decimals, units));
-    }
+    return false;
   }
-  return tooltipElement;
 };
 
-const constructEchartsTooltipSeriesElement = (renderer: Renderer2,
-                                              settings: EChartsTooltipWidgetSettings,
-                                              seriesParams: CallbackDataParams,
-                                              decimals: number,
-                                              units: string): HTMLElement => {
-  const labelValueElement: HTMLElement = renderer.createElement('div');
-  renderer.setStyle(labelValueElement, 'display', 'flex');
-  renderer.setStyle(labelValueElement, 'flex-direction', 'row');
-  renderer.setStyle(labelValueElement, 'align-items', 'center');
-  renderer.setStyle(labelValueElement, 'align-self', 'stretch');
-  renderer.setStyle(labelValueElement, 'gap', '12px');
-  const labelElement: HTMLElement = renderer.createElement('div');
-  renderer.setStyle(labelElement, 'display', 'flex');
-  renderer.setStyle(labelElement, 'align-items', 'center');
-  renderer.setStyle(labelElement, 'gap', '8px');
-  renderer.appendChild(labelValueElement, labelElement);
-  const circleElement: HTMLElement = renderer.createElement('div');
-  renderer.setStyle(circleElement, 'width', '8px');
-  renderer.setStyle(circleElement, 'height', '8px');
-  renderer.setStyle(circleElement, 'border-radius', '50%');
-  renderer.setStyle(circleElement, 'background', seriesParams.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(labelElement, labelTextElement);
-  const valueElement: HTMLElement = renderer.createElement('div');
-  const value = formatValue(seriesParams.value[1], decimals, units, false);
-  renderer.appendChild(valueElement, renderer.createText(value));
-  renderer.setStyle(valueElement, 'flex', '1');
-  renderer.setStyle(valueElement, 'text-align', 'end');
-  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(labelValueElement, valueElement);
-  return labelValueElement;
+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;
 };
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..dff371ec10
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/latest-chart.models.ts
@@ -0,0 +1,232 @@
+///
+/// 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, BackgroundType, Font } from '@shared/models/widget-settings.models';
+import { Renderer2 } from '@angular/core';
+import { CallbackDataParams } from 'echarts/types/dist/shared';
+import { formatValue, isDefinedAndNotNull, mergeDeep } from '@core/utils';
+import { chartAnimationDefaultSettings, ChartAnimationSettings } from '@home/components/widget/lib/chart/chart.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 const latestChartTooltipDefaultSettings: LatestChartTooltipSettings = {
+  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
+};
+
+export interface LatestChartSettings extends LatestChartTooltipSettings {
+  autoScale?: boolean;
+  sortSeries: boolean;
+  showTotal?: boolean;
+  showLegend: boolean;
+  animation: ChartAnimationSettings;
+}
+
+export const latestChartDefaultSettings: LatestChartSettings = {
+  ...latestChartTooltipDefaultSettings,
+  autoScale: false,
+  sortSeries: false,
+  showTotal: false,
+  showLegend: true,
+  animation: mergeDeep({} as ChartAnimationSettings, chartAnimationDefaultSettings)
+};
+
+export interface LatestChartWidgetSettings extends LatestChartSettings {
+  legendPosition: LegendPosition;
+  legendLabelFont: Font;
+  legendLabelColor: string;
+  legendValueFont: Font;
+  legendValueColor: string;
+  background: BackgroundSettings;
+}
+
+export const latestChartWidgetDefaultSettings: LatestChartWidgetSettings = {
+  ...latestChartDefaultSettings,
+  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)',
+  background: {
+    type: BackgroundType.color,
+    color: '#fff',
+    overlay: {
+      enabled: false,
+      color: 'rgba(255,255,255,0.72)',
+      blur: 3
+    }
+  }
+};
+
+export const latestChartTooltipFormatter = (renderer: Renderer2,
+                                            settings: LatestChartTooltipSettings,
+                                            params: CallbackDataParams,
+                                            units: string,
+                                            total: number,
+                                            dataItems: LatestChartDataItem[]): null | HTMLElement => {
+  if (params.value && Array.isArray(params.value)) {
+    const enabledDataItems = dataItems.filter(d => d.enabled && d.hasValue);
+    if (enabledDataItems.length && enabledDataItems.length === params.value.length) {
+      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');
+      for (let i = 0; i < enabledDataItems.length; i++) {
+        const dataItem = enabledDataItems[i];
+        const value = params.value[i];
+        renderer.appendChild(tooltipElement,
+          constructTooltipSeriesElement(renderer, settings, dataItem.dataKey.label, value as number, null,
+            units, total, dataItem.dataKey.color));
+      }
+      return tooltipElement;
+    } else {
+      return null;
+    }
+  } else if (params.name) {
+    return constructTooltipSeriesElement(renderer, settings, params.name,
+      params.value as number, params.percent, units, total);
+  } else {
+    return null;
+  }
+};
+
+const constructTooltipSeriesElement = (renderer: Renderer2,
+                                       settings: LatestChartTooltipSettings,
+                                       label: string,
+                                       value: number,
+                                       percent: number | undefined,
+                                       units: string,
+                                       total: number,
+                                       circleColor?: string): HTMLElement => {
+  let formattedValue: string;
+  if (settings.tooltipValueType === LatestChartTooltipValueType.percentage) {
+    const percents = isDefinedAndNotNull(percent) ? percent : value / total * 100;
+    formattedValue = formatValue(percents, settings.tooltipValueDecimals, '%', false);
+  } else {
+    formattedValue = formatValue(value, settings.tooltipValueDecimals, units, false);
+  }
+  const textElement: HTMLElement = renderer.createElement('div');
+  renderer.setStyle(textElement, 'display', 'flex');
+  renderer.setStyle(textElement, 'flex-direction', 'row');
+  renderer.setStyle(textElement, 'align-items', 'center');
+  renderer.setStyle(textElement, 'align-self', 'stretch');
+  renderer.setStyle(textElement, 'gap', '12px');
+  const labelElement: HTMLElement = renderer.createElement('div');
+  renderer.setStyle(labelElement, 'display', 'flex');
+  renderer.setStyle(labelElement, 'align-items', 'center');
+  renderer.setStyle(labelElement, 'gap', '8px');
+  renderer.appendChild(textElement, labelElement);
+  if (circleColor) {
+    const circleElement: HTMLElement = renderer.createElement('div');
+    renderer.setStyle(circleElement, 'width', '8px');
+    renderer.setStyle(circleElement, 'height', '8px');
+    renderer.setStyle(circleElement, 'border-radius', '50%');
+    renderer.setStyle(circleElement, 'background', circleColor);
+    renderer.appendChild(labelElement, circleElement);
+  }
+  const labelTextElement: HTMLElement = renderer.createElement('div');
+  renderer.appendChild(labelTextElement, renderer.createText(label));
+  renderer.setStyle(labelTextElement, 'font-family', 'Roboto');
+  renderer.setStyle(labelTextElement, 'font-size', '11px');
+  renderer.setStyle(labelTextElement, 'font-style', 'normal');
+  renderer.setStyle(labelTextElement, 'font-weight', '400');
+  renderer.setStyle(labelTextElement, 'line-height', '16px');
+  renderer.setStyle(labelTextElement, 'letter-spacing', '0.25px');
+  renderer.setStyle(labelTextElement, 'color', 'rgba(0, 0, 0, 0.38)');
+  renderer.appendChild(labelElement, labelTextElement);
+  const valueElement: HTMLElement = renderer.createElement('div');
+  renderer.appendChild(valueElement, renderer.createText(formattedValue));
+  renderer.setStyle(valueElement, 'flex', '1');
+  renderer.setStyle(valueElement, 'text-align', 'end');
+  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..e041a69084
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/latest-chart.ts
@@ -0,0 +1,377 @@
+///
+/// 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';
+import { toAnimationOption } from '@home/components/widget/lib/chart/chart.models';
+
+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(protected 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;
+  }
+
+  protected 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, this.dataItems)
+            : 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]
+      },
+      ...toAnimationOption(this.ctx, this.settings.animation)
+    };
+    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) {
+            if (this.forceRedrawOnResize()) {
+              this.latestChart.dispose();
+              this.drawChart();
+            } else {
+              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 forceRedrawOnResize(): boolean {
+    return false;
+  }
+
+  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..fe6cc158e8
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/pie-chart-widget.models.ts
@@ -0,0 +1,83 @@
+///
+/// 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 {
+  latestChartWidgetDefaultSettings,
+  LatestChartWidgetSettings
+} from '@home/components/widget/lib/chart/latest-chart.models';
+import { Font } from '@shared/models/widget-settings.models';
+import { DeepPartial } from '@shared/models/common';
+import { pieChartAnimationDefaultSettings, PieChartSettings } from '@home/components/widget/lib/chart/pie-chart.models';
+import { isDefinedAndNotNull, mergeDeep } from '@core/utils';
+import { ChartAnimationSettings, PieChartLabelPosition } from '@home/components/widget/lib/chart/chart.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 = {
+  ...latestChartWidgetDefaultSettings,
+  animation: mergeDeep({} as ChartAnimationSettings,
+    pieChartAnimationDefaultSettings),
+  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
+};
+
+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..ebe752eb4b
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/pie-chart.models.ts
@@ -0,0 +1,87 @@
+///
+/// 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 { latestChartDefaultSettings, LatestChartSettings } from '@home/components/widget/lib/chart/latest-chart.models';
+import { mergeDeep } from '@core/utils';
+import {
+  chartAnimationDefaultSettings,
+  ChartAnimationSettings,
+  PieChartLabelPosition
+} from '@home/components/widget/lib/chart/chart.models';
+
+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: ChartAnimationSettings =
+  mergeDeep({} as ChartAnimationSettings, chartAnimationDefaultSettings, {
+    animationDuration: 1000,
+    animationDurationUpdate: 500
+  } as ChartAnimationSettings);
+
+export const pieChartDefaultSettings: PieChartSettings = {
+  ...latestChartDefaultSettings,
+  animation: mergeDeep({} as ChartAnimationSettings,
+    pieChartAnimationDefaultSettings),
+  doughnut: false,
+  radius: '80%',
+  clockwise: false,
+  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)'
+};
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..5bd0c5bcf3
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/pie-chart.ts
@@ -0,0 +1,188 @@
+///
+/// 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';
+import { toAnimationOption } from '@home/components/widget/lib/chart/chart.models';
+
+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
+          }
+        },
+        ...toAnimationOption(this.ctx, this.settings.animation)
+      }
+    ];
+  }
+
+  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/polar-area-widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/polar-area-widget.component.ts
new file mode 100644
index 0000000000..07cffaefab
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/polar-area-widget.component.ts
@@ -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.
+///
+
+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 {
+  LatestChartComponent,
+  LatestChartComponentCallbacks
+} from '@home/components/widget/lib/chart/latest-chart.component';
+import { TbBarsChart } from '@home/components/widget/lib/chart/bars-chart';
+import {
+  polarAreaChartWidgetBarsChartSettings,
+  polarAreaChartWidgetDefaultSettings,
+  PolarAreaChartWidgetSettings
+} from '@home/components/widget/lib/chart/polar-area-widget.models';
+
+@Component({
+  selector: 'tb-polar-area-chart-widget',
+  templateUrl: './latest-chart-widget.component.html',
+  styleUrls: [],
+  encapsulation: ViewEncapsulation.None
+})
+export class PolarAreaWidgetComponent implements OnInit {
+
+  @ViewChild('latestChart')
+  latestChart: LatestChartComponent;
+
+  @Input()
+  ctx: WidgetContext;
+
+  @Input()
+  widgetTitlePanel: TemplateRef<any>;
+
+  settings: PolarAreaChartWidgetSettings;
+
+  callbacks: LatestChartComponentCallbacks;
+
+  constructor(private widgetComponent: WidgetComponent,
+              private translate: TranslateService) {
+  }
+
+  ngOnInit(): void {
+    this.ctx.$scope.polarAreaChartWidget = this;
+    this.settings = {...polarAreaChartWidgetDefaultSettings, ...this.ctx.settings};
+    this.callbacks = {
+      createChart: (chartShape, renderer) => {
+        const settings = polarAreaChartWidgetBarsChartSettings(this.settings);
+        return new TbBarsChart(this.ctx, settings, chartShape.nativeElement, renderer, this.translate, true);
+      }
+    };
+  }
+
+  public onInit() {
+    this.latestChart?.onInit();
+  }
+
+  public onDataUpdated() {
+    this.latestChart?.onDataUpdated();
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/polar-area-widget.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/polar-area-widget.models.ts
new file mode 100644
index 0000000000..6ef08f631e
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/polar-area-widget.models.ts
@@ -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.
+///
+
+import {
+  latestChartWidgetDefaultSettings,
+  LatestChartWidgetSettings
+} from '@home/components/widget/lib/chart/latest-chart.models';
+import { Font } from '@shared/models/widget-settings.models';
+import {
+  ChartAnimationSettings,
+  chartBarDefaultSettings,
+  ChartBarSettings,
+  chartColorScheme,
+  PieChartLabelPosition
+} from '@home/components/widget/lib/chart/chart.models';
+import { mergeDeep } from '@core/utils';
+import {
+  barsChartAnimationDefaultSettings,
+  BarsChartSettings
+} from '@home/components/widget/lib/chart/bars-chart.models';
+import { DeepPartial } from '@shared/models/common';
+
+export interface PolarAreaChartWidgetSettings extends LatestChartWidgetSettings {
+  axisMin?: number;
+  axisMax?: number;
+  axisTickLabelFont: Font;
+  axisTickLabelColor: string;
+  angleAxisStartAngle?: number;
+  barSettings: ChartBarSettings;
+}
+
+export const polarAreaChartWidgetDefaultSettings: PolarAreaChartWidgetSettings = {
+  ...latestChartWidgetDefaultSettings,
+  animation: mergeDeep({} as ChartAnimationSettings,
+    barsChartAnimationDefaultSettings),
+  axisTickLabelFont: {
+    family: 'Roboto',
+    size: 12,
+    sizeUnit: 'px',
+    style: 'normal',
+    weight: '400',
+    lineHeight: '1'
+  },
+  axisTickLabelColor: chartColorScheme['axis.tickLabel'].light,
+  angleAxisStartAngle: 90,
+  barSettings: mergeDeep({} as ChartBarSettings, chartBarDefaultSettings,
+    {barWidth: 100, showLabel: true, labelPosition: PieChartLabelPosition.outside} as ChartBarSettings)
+};
+
+export const polarAreaChartWidgetBarsChartSettings = (settings: PolarAreaChartWidgetSettings): DeepPartial<BarsChartSettings> => ({
+  polar: true,
+  axisMin: settings.axisMin,
+  axisMax: settings.axisMax,
+  axisTickLabelFont: settings.axisTickLabelFont,
+  axisTickLabelColor: settings.axisTickLabelColor,
+  angleAxisStartAngle: settings.angleAxisStartAngle,
+  barSettings: settings.barSettings,
+  sortSeries: settings.sortSeries,
+  showTotal: false,
+  animation: settings.animation,
+  showLegend: settings.showLegend,
+  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/radar-chart-widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/radar-chart-widget.component.ts
new file mode 100644
index 0000000000..2ae614fd03
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/radar-chart-widget.component.ts
@@ -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.
+///
+
+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 {
+  LatestChartComponent,
+  LatestChartComponentCallbacks
+} from '@home/components/widget/lib/chart/latest-chart.component';
+import {
+  radarChartWidgetDefaultSettings,
+  radarChartWidgetRadarChartSettings,
+  RadarChartWidgetSettings
+} from '@home/components/widget/lib/chart/radar-chart-widget.models';
+import { TbRadarChart } from '@home/components/widget/lib/chart/radar-chart';
+
+@Component({
+  selector: 'tb-radar-chart-widget',
+  templateUrl: './latest-chart-widget.component.html',
+  styleUrls: [],
+  encapsulation: ViewEncapsulation.None
+})
+export class RadarChartWidgetComponent implements OnInit {
+
+  @ViewChild('latestChart')
+  latestChart: LatestChartComponent;
+
+  @Input()
+  ctx: WidgetContext;
+
+  @Input()
+  widgetTitlePanel: TemplateRef<any>;
+
+  settings: RadarChartWidgetSettings;
+
+  callbacks: LatestChartComponentCallbacks;
+
+  constructor(private widgetComponent: WidgetComponent,
+              private translate: TranslateService) {
+  }
+
+  ngOnInit(): void {
+    this.ctx.$scope.radarChartWidget = this;
+    this.settings = {...radarChartWidgetDefaultSettings, ...this.ctx.settings};
+    this.callbacks = {
+      createChart: (chartShape, renderer) => {
+        const settings = radarChartWidgetRadarChartSettings(this.settings);
+        return new TbRadarChart(this.ctx, settings, chartShape.nativeElement, renderer, this.translate, true);
+      }
+    };
+  }
+
+  public onInit() {
+    this.latestChart?.onInit();
+  }
+
+  public onDataUpdated() {
+    this.latestChart?.onDataUpdated();
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/radar-chart-widget.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/radar-chart-widget.models.ts
new file mode 100644
index 0000000000..78275264cc
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/radar-chart-widget.models.ts
@@ -0,0 +1,142 @@
+///
+/// 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 {
+  latestChartWidgetDefaultSettings,
+  LatestChartWidgetSettings
+} from '@home/components/widget/lib/chart/latest-chart.models';
+import {
+  ChartAnimationSettings,
+  chartColorScheme,
+  ChartFillSettings,
+  ChartFillType,
+  ChartLabelPosition,
+  ChartLineType,
+  ChartShape
+} from '@home/components/widget/lib/chart/chart.models';
+import { Font } from '@shared/models/widget-settings.models';
+import { mergeDeep } from '@core/utils';
+import {
+  radarChartAnimationDefaultSettings,
+  RadarChartSettings,
+  RadarChartShape
+} from '@home/components/widget/lib/chart/radar-chart.models';
+import { DeepPartial } from '@shared/models/common';
+
+export interface RadarChartWidgetSettings extends LatestChartWidgetSettings {
+  shape: RadarChartShape;
+  color: string;
+  showLine: boolean;
+  lineType: ChartLineType;
+  lineWidth: number;
+  showPoints: boolean;
+  pointShape: ChartShape;
+  pointSize: number;
+  showLabel: boolean;
+  labelPosition: ChartLabelPosition;
+  labelFont: Font;
+  labelColor: string;
+  fillAreaSettings: ChartFillSettings;
+  axisShowLabel: boolean;
+  axisLabelFont: Font;
+  axisShowTickLabels: boolean;
+  axisTickLabelFont: Font;
+  axisTickLabelColor: string;
+}
+
+export const radarChartWidgetDefaultSettings: RadarChartWidgetSettings = {
+  ...latestChartWidgetDefaultSettings,
+  animation: mergeDeep({} as ChartAnimationSettings,
+    radarChartAnimationDefaultSettings),
+  shape: RadarChartShape.polygon,
+  color: '#3F52DD',
+  showLine: true,
+  lineType: ChartLineType.solid,
+  lineWidth: 2,
+  showPoints: true,
+  pointShape: ChartShape.circle,
+  pointSize: 4,
+  showLabel: false,
+  labelPosition: ChartLabelPosition.top,
+  labelFont: {
+    family: 'Roboto',
+    size: 11,
+    sizeUnit: 'px',
+    style: 'normal',
+    weight: '400',
+    lineHeight: '1'
+  },
+  labelColor: chartColorScheme['series.label'].light,
+  fillAreaSettings: {
+    type: ChartFillType.none,
+    opacity: 0.4,
+    gradient: {
+      start: 80,
+      end: 20
+    }
+  },
+  axisShowLabel: true,
+  axisLabelFont: {
+    family: 'Roboto',
+    size: 12,
+    sizeUnit: 'px',
+    style: 'normal',
+    weight: '600',
+    lineHeight: '1'
+  },
+  axisShowTickLabels: false,
+  axisTickLabelFont: {
+    family: 'Roboto',
+    size: 11,
+    sizeUnit: 'px',
+    style: 'normal',
+    weight: '400',
+    lineHeight: '1'
+  },
+  axisTickLabelColor: chartColorScheme['axis.tickLabel'].light
+};
+
+export const radarChartWidgetRadarChartSettings = (settings: RadarChartWidgetSettings): DeepPartial<RadarChartSettings> => ({
+  shape: settings.shape,
+  color: settings.color,
+  showLine: settings.showLine,
+  lineType: settings.lineType,
+  lineWidth: settings.lineWidth,
+  showPoints: settings.showPoints,
+  pointShape: settings.pointShape,
+  pointSize: settings.pointSize,
+  showLabel: settings.showLabel,
+  labelPosition: settings.labelPosition,
+  labelFont: settings.labelFont,
+  labelColor: settings.labelColor,
+  fillAreaSettings: settings.fillAreaSettings,
+  axisShowLabel: settings.axisShowLabel,
+  axisLabelFont: settings.axisLabelFont,
+  axisShowTickLabels: settings.axisShowTickLabels,
+  axisTickLabelFont: settings.axisTickLabelFont,
+  axisTickLabelColor: settings.axisTickLabelColor,
+  sortSeries: settings.sortSeries,
+  showTotal: false,
+  animation: settings.animation,
+  showLegend: settings.showLegend,
+  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/radar-chart.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/radar-chart.models.ts
new file mode 100644
index 0000000000..6ec3b001e9
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/radar-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 { latestChartDefaultSettings, LatestChartSettings } from '@home/components/widget/lib/chart/latest-chart.models';
+import {
+  chartAnimationDefaultSettings,
+  ChartAnimationSettings,
+  chartColorScheme,
+  ChartFillSettings,
+  ChartFillType,
+  ChartLabelPosition,
+  ChartLineType,
+  ChartShape
+} from '@home/components/widget/lib/chart/chart.models';
+import { Font } from '@shared/models/widget-settings.models';
+import { mergeDeep } from '@core/utils';
+
+export enum RadarChartShape {
+  polygon = 'polygon',
+  circle = 'circle'
+}
+
+export const radarChartShapes = Object.keys(RadarChartShape) as RadarChartShape[];
+
+export const radarChartShapeTranslations = new Map<RadarChartShape, string>(
+  [
+    [RadarChartShape.polygon, 'widgets.radar-chart.shape-polygon'],
+    [RadarChartShape.circle, 'widgets.radar-chart.shape-circle']
+  ]
+);
+
+export interface RadarChartSettings extends LatestChartSettings {
+  shape: RadarChartShape;
+  color: string;
+  showLine: boolean;
+  lineType: ChartLineType;
+  lineWidth: number;
+  showPoints: boolean;
+  pointShape: ChartShape;
+  pointSize: number;
+  showLabel: boolean;
+  labelPosition: ChartLabelPosition;
+  labelFont: Font;
+  labelColor: string;
+  fillAreaSettings: ChartFillSettings;
+  axisShowLabel: boolean;
+  axisLabelFont: Font;
+  axisShowTickLabels: boolean;
+  axisTickLabelFont: Font;
+  axisTickLabelColor: string;
+}
+
+export const radarChartAnimationDefaultSettings: ChartAnimationSettings =
+  mergeDeep({} as ChartAnimationSettings, chartAnimationDefaultSettings, {
+    animationDuration: 1000,
+    animationDurationUpdate: 500
+  } as ChartAnimationSettings);
+
+export const radarChartDefaultSettings: RadarChartSettings = {
+  ...latestChartDefaultSettings,
+  animation: mergeDeep({} as ChartAnimationSettings,
+    radarChartAnimationDefaultSettings),
+  shape: RadarChartShape.polygon,
+  color: '#3F52DD',
+  showLine: true,
+  lineType: ChartLineType.solid,
+  lineWidth: 2,
+  showPoints: true,
+  pointShape: ChartShape.circle,
+  pointSize: 4,
+  showLabel: false,
+  labelPosition: ChartLabelPosition.top,
+  labelFont: {
+    family: 'Roboto',
+    size: 11,
+    sizeUnit: 'px',
+    style: 'normal',
+    weight: '400',
+    lineHeight: '1'
+  },
+  labelColor: chartColorScheme['series.label'].light,
+  fillAreaSettings: {
+    type: ChartFillType.none,
+    opacity: 0.4,
+    gradient: {
+      start: 80,
+      end: 20
+    }
+  },
+  axisShowLabel: true,
+  axisLabelFont: {
+    family: 'Roboto',
+    size: 12,
+    sizeUnit: 'px',
+    style: 'normal',
+    weight: '600',
+    lineHeight: '1'
+  },
+  axisShowTickLabels: false,
+  axisTickLabelFont: {
+    family: 'Roboto',
+    size: 11,
+    sizeUnit: 'px',
+    style: 'normal',
+    weight: '400',
+    lineHeight: '1'
+  },
+  axisTickLabelColor: chartColorScheme['axis.tickLabel'].light
+};
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/radar-chart.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/radar-chart.ts
new file mode 100644
index 0000000000..6b01e4d904
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/radar-chart.ts
@@ -0,0 +1,172 @@
+///
+/// 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 { TbLatestChart } from '@home/components/widget/lib/chart/latest-chart';
+import { radarChartDefaultSettings, RadarChartSettings } from '@home/components/widget/lib/chart/radar-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 {
+  ChartFillType,
+  createChartTextStyle,
+  createLinearOpacityGradient, createRadialOpacityGradient, toAnimationOption
+} from '@home/components/widget/lib/chart/chart.models';
+import { formatValue, isDefinedAndNotNull, isEqual } from '@core/utils';
+import { ComponentStyle } from '@shared/models/widget-settings.models';
+import { AreaStyleOption, SeriesLabelOption } from 'echarts/types/src/util/types';
+import { RadarIndicatorOption } from 'echarts/types/src/coord/radar/RadarModel';
+import { DataKey } from '@shared/models/widget.models';
+
+export class TbRadarChart extends TbLatestChart<RadarChartSettings> {
+
+  constructor(ctx: WidgetContext,
+              inputSettings: DeepPartial<RadarChartSettings>,
+              chartElement: HTMLElement,
+              renderer: Renderer2,
+              translate: TranslateService,
+              autoResize = true) {
+
+    super(ctx, inputSettings, chartElement, renderer, translate, autoResize);
+  }
+
+  protected defaultSettings(): RadarChartSettings {
+    return radarChartDefaultSettings;
+  }
+
+  protected prepareLatestChartOption() {
+
+    const axisNameStyle = createChartTextStyle(this.settings.axisLabelFont,
+      '#000', false, 'axis.label');
+    const axisTickLabelStyle = createChartTextStyle(this.settings.axisTickLabelFont,
+      this.settings.axisTickLabelColor, false, 'axis.tickLabel');
+
+    this.latestChartOption.radar = [{
+      shape: this.settings.shape,
+      radius: '85%',
+      indicator: [{}],
+      axisName: {
+        show: this.settings.axisShowLabel,
+        fontStyle: axisNameStyle.fontStyle,
+        fontWeight: axisNameStyle.fontWeight,
+        fontFamily: axisNameStyle.fontFamily,
+        fontSize: axisNameStyle.fontSize
+      },
+      axisLabel: {
+        show: this.settings.axisShowTickLabels,
+        color: axisTickLabelStyle.color,
+        fontStyle: axisTickLabelStyle.fontStyle,
+        fontWeight: axisTickLabelStyle.fontWeight,
+        fontFamily: axisTickLabelStyle.fontFamily,
+        fontSize: axisTickLabelStyle.fontSize,
+        formatter: (value: any) => formatValue(value, this.decimals, this.units, false)
+      }
+    }];
+
+    let labelStyle: ComponentStyle = {};
+    if (this.settings.showLabel) {
+      labelStyle = createChartTextStyle(this.settings.labelFont, this.settings.labelColor, false, 'series.label');
+    }
+
+    const labelOption: SeriesLabelOption = {
+      show: this.settings.showLabel,
+      position: this.settings.labelPosition,
+      formatter: (params) => {
+        let result = '';
+        if (isDefinedAndNotNull(params.value)) {
+          result = formatValue(params.value, this.decimals, this.units, false);
+        }
+        return `{value|${result}}`;
+      },
+      rich: {
+        value: labelStyle
+      }
+    };
+
+    let areaStyleOption: AreaStyleOption;
+    if (this.settings.fillAreaSettings.type !== ChartFillType.none) {
+      areaStyleOption = {};
+      if (this.settings.fillAreaSettings.type === ChartFillType.opacity) {
+        areaStyleOption.opacity = this.settings.fillAreaSettings.opacity;
+      } else if (this.settings.fillAreaSettings.type === ChartFillType.gradient) {
+        areaStyleOption.opacity = 1;
+        areaStyleOption.color = createRadialOpacityGradient(this.settings.color, this.settings.fillAreaSettings.gradient);
+      }
+    }
+
+    this.latestChartOption.series = [
+      {
+        type: 'radar',
+        data: [{
+          id: 1,
+          itemStyle: {
+            color: this.settings.color
+          },
+          label: labelOption,
+          symbol: this.settings.showPoints ? this.settings.pointShape : 'none',
+          symbolSize: this.settings.pointSize,
+          lineStyle: {
+            width: this.settings.showLine ? this.settings.lineWidth : 0,
+            type: this.settings.lineType
+          },
+          areaStyle: areaStyleOption,
+          value: []
+        }],
+        emphasis: {
+          focus: 'self'
+        },
+        ...toAnimationOption(this.ctx, this.settings.animation)
+      }
+    ];
+  }
+
+  protected doUpdateSeriesData() {
+    const indicator: RadarIndicatorOption[] = [];
+    const value: number[] = [];
+    for (const dataItem of this.dataItems) {
+      if (dataItem.enabled && dataItem.hasValue) {
+        indicator.push({
+          name: dataItem.dataKey.label,
+          color: dataItem.dataKey.color
+        });
+        value.push(dataItem.value);
+      }
+    }
+    if (!indicator.length) {
+      indicator.push({});
+    }
+    this.latestChartOption.radar[0].indicator = indicator;
+    this.latestChartOption.series[0].data[0].value = value;
+  }
+
+  protected forceRedrawOnResize(): boolean {
+    return true;
+  }
+
+  public keyEnter(dataKey: DataKey): void {}
+
+  public keyLeave(dataKey: DataKey): void {}
+
+  public toggleKey(dataKey: DataKey): void {
+    const enable = dataKey.hidden;
+    const dataItem = this.dataItems.find(d => d.dataKey === dataKey);
+    if (dataItem) {
+      dataItem.enabled = enable;
+      this.updateSeriesData();
+      dataKey.hidden = !enable;
+    }
+  }
+}
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 0a8c15b247..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,143 +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';
-
-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',
@@ -192,24 +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 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,
@@ -230,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;
 
@@ -249,191 +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,
-        appendToBody: true,
-        axisPointer: {
-          type: 'shadow'
-        },
-        formatter: (params: CallbackDataParams[]) =>
-          this.settings.showTooltip ? echartsTooltipFormatter(this.renderer, this.tooltipDateFormat,
-            this.settings, params, this.decimals, this.units, 0) : 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 c50813f7b6..be6be1bc1b 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,87 @@ 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 {
+  createTimeSeriesChartVisualMapPiece,
+  defaultTimeSeriesChartXAxisSettings,
+  defaultTimeSeriesChartYAxisSettings,
+  LineSeriesStepType,
+  ThresholdLabelPosition,
+  timeSeriesChartGridDefaultSettings,
+  TimeSeriesChartGridSettings,
+  TimeSeriesChartKeySettings,
+  TimeSeriesChartSeriesType,
+  TimeSeriesChartSettings,
+  TimeSeriesChartThreshold,
+  timeSeriesChartThresholdDefaultSettings,
+  TimeSeriesChartThresholdType,
+  TimeSeriesChartTooltipWidgetSettings,
+  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';
+import {
+  chartAnimationDefaultSettings,
+  ChartAnimationSettings,
+  chartColorScheme,
+  ChartFillType,
+  ChartLabelPosition, ChartLineType,
+  ChartShape
+} from '@home/components/widget/lib/chart/chart.models';
 
-export interface RangeChartWidgetSettings extends EChartsTooltipWidgetSettings {
+export interface RangeItem {
+  index: number;
+  from?: number;
+  to?: number;
+  color: string;
+  label: string;
+  visible: boolean;
+  enabled: boolean;
+  piece: TimeSeriesChartVisualMapPiece;
+}
+
+export interface RangeChartWidgetSettings extends TimeSeriesChartTooltipWidgetSettings {
   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: ChartLineType;
+  lineWidth: number;
+  showPoints: boolean;
+  showPointLabel: boolean;
+  pointLabelPosition: ChartLabelPosition;
+  pointLabelFont: Font;
+  pointLabelColor: string;
+  enablePointLabelBackground: boolean;
+  pointLabelBackground: string;
+  pointShape: ChartShape;
+  pointSize: number;
+  grid: TimeSeriesChartGridSettings;
+  yAxis: TimeSeriesChartYAxisSettings;
+  xAxis: TimeSeriesChartXAxisSettings;
+  animation: ChartAnimationSettings;
+  thresholds: TimeSeriesChartThreshold[];
   showLegend: boolean;
   legendPosition: LegendPosition;
   legendLabelFont: Font;
   legendLabelColor: string;
   background: BackgroundSettings;
+  padding: string;
 }
 
 export const rangeChartDefaultSettings: RangeChartWidgetSettings = {
@@ -48,7 +113,53 @@ export const rangeChartDefaultSettings: RangeChartWidgetSettings = {
     {from: 40, color: '#D81838'}
   ],
   outOfRangeColor: '#ccc',
+  showRangeThresholds: true,
+  rangeThreshold: mergeDeep({} as Partial<TimeSeriesChartThreshold>,
+    timeSeriesChartThresholdDefaultSettings,
+    { lineColor: '#37383b',
+      lineType: ChartLineType.dashed,
+      startSymbol: ChartShape.circle,
+      startSymbolSize: 5,
+      endSymbol: ChartShape.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: ChartLineType.solid,
+  lineWidth: 2,
+  showPoints: false,
+  showPointLabel: false,
+  pointLabelPosition: ChartLabelPosition.top,
+  pointLabelFont: {
+    family: 'Roboto',
+    size: 11,
+    sizeUnit: 'px',
+    style: 'normal',
+    weight: '400',
+    lineHeight: '1'
+  },
+  pointLabelColor: chartColorScheme['series.label'].light,
+  enablePointLabelBackground: false,
+  pointLabelBackground: 'rgba(255,255,255,0.56)',
+  pointShape: ChartShape.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 ChartAnimationSettings,
+    chartAnimationDefaultSettings),
+  thresholds: [],
   showLegend: true,
   legendPosition: LegendPosition.top,
   legendLabelFont: {
@@ -61,6 +172,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,
@@ -71,6 +191,7 @@ export const rangeChartDefaultSettings: RangeChartWidgetSettings = {
   },
   tooltipValueColor: 'rgba(0, 0, 0, 0.76)',
   tooltipShowDate: true,
+  tooltipDateInterval: true,
   tooltipDateFormat: simpleDateFormat('dd MMM yyyy HH:mm'),
   tooltipDateFont: {
     family: 'Roboto',
@@ -91,5 +212,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 ? ChartFillType.opacity : ChartFillType.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
new file mode 100644
index 0000000000..22d2a26473
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart-bar.models.ts
@@ -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.
+///
+
+import { LinearGradientObject } from 'zrender/lib/graphic/LinearGradient';
+import { Interval, IntervalMath } from '@shared/models/time/time.models';
+import { LabelFormatterCallback } from 'echarts/types/src/util/types';
+import {
+  TimeSeriesChartDataItem,
+  TimeSeriesChartNoAggregationBarWidthStrategy
+} from '@home/components/widget/lib/chart/time-series-chart.models';
+import { CustomSeriesRenderItemParams } from 'echarts';
+import { CallbackDataParams, CustomSeriesRenderItemAPI, CustomSeriesRenderItemReturn } from 'echarts/types/dist/shared';
+import { isNumeric } from '@core/utils';
+import * as echarts from 'echarts/core';
+import { BarSeriesLabelOption } from 'echarts/types/src/chart/bar/BarSeries';
+
+export interface BarVisualSettings {
+  color: string | LinearGradientObject;
+  borderColor: string;
+  borderWidth: number;
+  borderRadius: number;
+}
+
+export interface BarRenderSharedContext {
+  barGap: number;
+  intervalGap: number;
+  timeInterval: Interval;
+  noAggregationBarWidthStrategy: TimeSeriesChartNoAggregationBarWidthStrategy;
+  noAggregationWidthRelative: boolean;
+  noAggregationWidth: number;
+}
+
+export interface BarRenderContext {
+  shared: BarRenderSharedContext;
+  barsCount?: number;
+  barIndex?: number;
+  noAggregation?: boolean;
+  visualSettings?: BarVisualSettings;
+  labelOption?: BarSeriesLabelOption;
+  additionalLabelOption?: {[key: string]: any};
+  barStackIndex?: number;
+  currentStackItems?: TimeSeriesChartDataItem[];
+}
+
+export const renderTimeSeriesBar = (params: CustomSeriesRenderItemParams, api: CustomSeriesRenderItemAPI,
+                                    renderCtx: BarRenderContext): CustomSeriesRenderItemReturn => {
+  const time = api.value(0) as number;
+  let start = api.value(2) as number;
+  let end = api.value(3) as number;
+  let interval = end - start;
+  const ts = start ? start : time;
+
+  const separateBar = renderCtx.noAggregation &&
+    renderCtx.shared.noAggregationBarWidthStrategy === TimeSeriesChartNoAggregationBarWidthStrategy.separate;
+
+  if (renderCtx.noAggregation) {
+    if (renderCtx.shared.noAggregationWidthRelative) {
+      const scaleWidth = api.getWidth() / api.size([1,0])[0];
+      interval = scaleWidth * (renderCtx.shared.noAggregationWidth / 100);
+    } else {
+      interval = renderCtx.shared.noAggregationWidth;
+    }
+    start = time - interval / 2;
+    end = time + interval / 2;
+  }
+  if (!start || !end || !interval) {
+    interval = IntervalMath.numberValue(renderCtx.shared.timeInterval);
+    start = time - interval / 2;
+  }
+
+  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;
+  let offset = 0;
+  if (renderCtx.currentStackItems?.length) {
+    for (let i = 0; i < renderCtx.barStackIndex; i++) {
+      const stackItem = renderCtx.currentStackItems[i];
+      const dataName = ts + '';
+      const data = stackItem.data.find(d => d.name === dataName);
+      if (data) {
+        const val = data.value[1];
+        if (isNumeric(val)) {
+          offset += Number(val);
+        }
+      }
+    }
+  }
+  let lowerLeft: number[];
+  if (offset !== 0 && isNumeric(value)) {
+    lowerLeft = api.coord([startTime, value >= 0 ? Number(value) + offset : offset]);
+  } else {
+    lowerLeft = api.coord([startTime, value >= 0 ? value : 0]);
+  }
+  const size = api.size([delta, value]);
+  const width = size[0];
+  const height = size[1];
+
+  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 zeroCoord = api.coord([0, offset]);
+  const zeroPos = Math.min(zeroCoord[1], coordSys.y + coordSys.height);
+
+  let style: any = {
+    fill: renderCtx.visualSettings.color,
+    stroke: renderCtx.visualSettings.borderColor,
+    lineWidth: renderCtx.visualSettings.borderWidth
+  };
+
+  if (renderCtx.labelOption.show) {
+    let position = renderCtx.labelOption.position;
+    if (value < 0) {
+      if (position === 'top') {
+        position = 'bottom';
+      } else if (position === 'bottom') {
+        position = 'top';
+      }
+    }
+    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[];
+  if (value < 0) {
+    borderRadius = [0, 0, renderCtx.visualSettings.borderRadius, renderCtx.visualSettings.borderRadius];
+  } else {
+    borderRadius = [renderCtx.visualSettings.borderRadius, renderCtx.visualSettings.borderRadius, 0, 0];
+  }
+  return rectShape && {
+    type: 'rect',
+    id: time + '',
+    shape: {...rectShape, r: borderRadius},
+    style,
+    focus: 'series',
+    transition: 'all',
+    enterFrom: {
+      style: { opacity: 0 },
+      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..35159ba944
--- /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,
+  TimeSeriesChartTooltipValueFormatFunction
+} from '@home/components/widget/lib/chart/time-series-chart.models';
+import { UtilsService } from '@core/services/utils.service';
+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: TimeSeriesChartTooltipValueFormatFunction;
+  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
new file mode 100644
index 0000000000..147214c355
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart-widget.component.html
@@ -0,0 +1,123 @@
+<!--
+
+    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-time-series-chart-panel" [style.padding]="padding"
+     [class.overlay]="overlayEnabled" [style]="backgroundStyle$ | async">
+  <div class="tb-time-series-chart-overlay" [style]="overlayStyle"></div>
+  <ng-container *ngTemplateOutlet="widgetTitlePanel"></ng-container>
+  <div class="tb-time-series-chart-content" [class]="legendClass">
+    <div #chartShape class="tb-time-series-chart-shape">
+    </div>
+    <div *ngIf="showLegend" class="tb-time-series-chart-legend" [class.tb-simple-legend]="!displayLegendValues">
+      <ng-container *ngIf="displayLegendValues; else simpleLegend">
+        <ng-container *ngIf="horizontalLegendPosition; else verticalLegend">
+          <ng-container *ngTemplateOutlet="horizontalLegend"></ng-container>
+        </ng-container>
+      </ng-container>
+    </div>
+    <ng-template #horizontalLegend>
+      <table class="tb-time-series-chart-legend-table">
+        <thead>
+        <tr>
+          <th></th>
+          <th *ngFor="let legendKey of legendKeys">
+            <ng-container *ngTemplateOutlet="legendItem; context:{legendKey: legendKey}"></ng-container>
+          </th>
+        </tr>
+        </thead>
+        <tbody>
+        <ng-container *ngIf="legendConfig.showMin === true">
+          <ng-container *ngTemplateOutlet="legendDataRow; context:{label: 'legend.Min', type: 'min'}"></ng-container>
+        </ng-container>
+        <ng-container *ngIf="legendConfig.showMax === true">
+          <ng-container *ngTemplateOutlet="legendDataRow; context:{label: 'legend.Max', type: 'max'}"></ng-container>
+        </ng-container>
+        <ng-container *ngIf="legendConfig.showAvg === true">
+          <ng-container *ngTemplateOutlet="legendDataRow; context:{label: 'legend.Avg', type: 'avg'}"></ng-container>
+        </ng-container>
+        <ng-container *ngIf="legendConfig.showTotal === true">
+          <ng-container *ngTemplateOutlet="legendDataRow; context:{label: 'legend.Total', type: 'total'}"></ng-container>
+        </ng-container>
+        <ng-container *ngIf="legendConfig.showLatest === true">
+          <ng-container *ngTemplateOutlet="legendDataRow; context:{label: 'legend.Latest', type: 'latest'}"></ng-container>
+        </ng-container>
+        </tbody>
+      </table>
+    </ng-template>
+    <ng-template #verticalLegend>
+      <table class="tb-time-series-chart-legend-table vertical">
+        <thead>
+        <tr>
+          <th></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>
+          <tr *ngFor="let legendKey of legendKeys">
+            <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" [style]="legendValueStyle">
+              {{ legendData.data[legendKey.dataIndex].min }}
+            </td>
+            <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" [style]="legendValueStyle">
+              {{ legendData.data[legendKey.dataIndex].avg }}
+            </td>
+            <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" [style]="legendValueStyle">
+              {{ legendData.data[legendKey.dataIndex].latest }}
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </ng-template>
+    <ng-template #simpleLegend>
+      <ng-container *ngFor="let legendKey of legendKeys">
+        <ng-container *ngTemplateOutlet="legendItem; context:{legendKey: legendKey}"></ng-container>
+      </ng-container>
+    </ng-template>
+    <ng-template #legendItem let-legendKey="legendKey" let-left="left">
+      <div class="tb-time-series-chart-legend-item"
+           [class.left]="left">
+        <div class="tb-time-series-chart-legend-item-label"
+             (mouseenter)="onLegendKeyEnter(legendKey)"
+             (mouseleave)="onLegendKeyLeave(legendKey)"
+             (click)="toggleLegendKey(legendKey)">
+          <div class="tb-time-series-chart-legend-item-label-circle" [style]="{background: !legendKey.dataKey.hidden ? legendKey.dataKey.color : null}"></div>
+          <div [style]="!legendKey.dataKey.hidden ? legendLabelStyle : disabledLegendLabelStyle">{{ legendKey.dataKey.label }}</div>
+        </div>
+      </div>
+    </ng-template>
+    <ng-template #legendDataRow let-label="label" let-type="type">
+      <tr>
+        <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>
+    </ng-template>
+  </div>
+</div>
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
new file mode 100644
index 0000000000..79a162a7ae
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart-widget.component.scss
@@ -0,0 +1,162 @@
+/**
+ * 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.
+ */
+
+$maxLegendWidth: 25%;
+$maxLegendHeight: 35%;
+
+.tb-time-series-chart-panel {
+  width: 100%;
+  height: 100%;
+  position: relative;
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+  &.overlay {
+    padding: 20px 24px 24px 24px;
+  }
+  > div:not(.tb-time-series-chart-overlay) {
+    z-index: 1;
+  }
+  .tb-time-series-chart-overlay {
+    position: absolute;
+    top: 12px;
+    left: 12px;
+    bottom: 12px;
+    right: 12px;
+  }
+  div.tb-widget-title {
+    padding: 0;
+  }
+  .tb-time-series-chart-content {
+    flex: 1;
+    min-width: 0;
+    min-height: 0;
+    display: flex;
+    flex-direction: column;
+    gap: 8px;
+    &.legend-top {
+      flex-direction: column-reverse;
+    }
+    &.legend-right {
+      flex-direction: row;
+    }
+    &.legend-left {
+      flex-direction: row-reverse;
+    }
+    .tb-time-series-chart-shape {
+      flex: 1;
+      min-width: 0;
+      min-height: 0;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+    }
+    &.legend-right, &.legend-left {
+      .tb-time-series-chart-legend {
+        display: inline-grid;
+        grid-auto-flow: column;
+        grid-template-rows: repeat(auto-fit, minmax(16px, min-content));
+        max-width: calc($maxLegendWidth - 8px);
+        height: fit-content;
+        max-height: 100%;
+      }
+    }
+    &.legend-top, &.legend-bottom {
+      .tb-time-series-chart-legend {
+        align-self: center;
+        &.tb-simple-legend {
+          justify-content: center;
+        }
+        &:not(.tb-simple-legend) {
+          width: 100%;
+        }
+      }
+    }
+    .tb-time-series-chart-legend {
+      display: flex;
+      align-items: flex-start;
+      align-self: stretch;
+      column-gap: 16px;
+      row-gap: 8px;
+      flex-wrap: wrap;
+      overflow: auto;
+      width: fit-content;
+      max-width: 100%;
+      max-height: calc($maxLegendHeight - 8px);
+      .tb-time-series-chart-legend-table {
+        border-spacing: 0;
+        table-layout: fixed;
+        &.vertical {
+          width: 100%;
+          table-layout: auto;
+          tbody {
+            th {
+              width: 95%;
+            }
+          }
+        }
+        th, td {
+          &:not(:last-child) {
+            padding-right: 16px;
+          }
+        }
+        thead tr, tbody tr:not(:last-child) {
+          th, td {
+            padding-bottom: 8px;
+          }
+        }
+        .tb-time-series-chart-legend-item {
+          align-items: flex-end;
+          &.left {
+            align-items: flex-start;
+          }
+        }
+      }
+      .tb-time-series-chart-legend-item {
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: flex-start;
+        user-select: none;
+        .tb-time-series-chart-legend-item-label {
+          display: flex;
+          align-items: center;
+          gap: 4px;
+          color: #ccc;
+          white-space: nowrap;
+          cursor: pointer;
+          .tb-time-series-chart-legend-item-label-circle {
+            width: 8px;
+            height: 8px;
+            border-radius: 50%;
+            background-color: #ccc;
+          }
+        }
+      }
+      .tb-time-series-chart-legend-type-label {
+        white-space: nowrap;
+        text-align: left;
+        &.right {
+          text-align: right;
+        }
+      }
+      .tb-time-series-chart-legend-value {
+        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
new file mode 100644
index 0000000000..48a328613e
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart-widget.component.ts
@@ -0,0 +1,176 @@
+///
+/// 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 {
+  timeSeriesChartKeyDefaultSettings,
+  TimeSeriesChartKeySettings
+} from '@home/components/widget/lib/chart/time-series-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 { ImagePipe } from '@shared/pipe/image.pipe';
+import { DomSanitizer } from '@angular/platform-browser';
+import { LegendConfig, LegendData, LegendKey, LegendPosition } from '@shared/models/widget.models';
+import { TbTimeSeriesChart } from '@home/components/widget/lib/chart/time-series-chart';
+import {
+  timeSeriesChartWidgetDefaultSettings,
+  TimeSeriesChartWidgetSettings
+} from '@home/components/widget/lib/chart/time-series-chart-widget.models';
+import { mergeDeep } from '@core/utils';
+
+@Component({
+  selector: 'tb-time-series-chart-widget',
+  templateUrl: './time-series-chart-widget.component.html',
+  styleUrls: ['./time-series-chart-widget.component.scss'],
+  encapsulation: ViewEncapsulation.None
+})
+export class TimeSeriesChartWidgetComponent implements OnInit, OnDestroy, AfterViewInit {
+
+  @ViewChild('chartShape', {static: false})
+  chartShape: ElementRef<HTMLElement>;
+
+  settings: TimeSeriesChartWidgetSettings;
+
+  @Input()
+  ctx: WidgetContext;
+
+  @Input()
+  widgetTitlePanel: TemplateRef<any>;
+
+  horizontalLegendPosition = false;
+
+  showLegend: boolean;
+  legendClass: string;
+  legendConfig: LegendConfig;
+  legendData: LegendData;
+  legendKeys: LegendKey[];
+
+  backgroundStyle$: Observable<ComponentStyle>;
+  overlayStyle: ComponentStyle = {};
+  overlayEnabled: boolean;
+  padding: string;
+
+  legendColumnTitleStyle: ComponentStyle;
+  legendLabelStyle: ComponentStyle;
+  disabledLegendLabelStyle: ComponentStyle;
+  legendValueStyle: ComponentStyle;
+
+  displayLegendValues = false;
+
+  private timeSeriesChart: TbTimeSeriesChart;
+
+  constructor(private imagePipe: ImagePipe,
+              private sanitizer: DomSanitizer,
+              private renderer: Renderer2,
+              private cd: ChangeDetectorRef) {
+  }
+
+  ngOnInit(): void {
+    this.ctx.$scope.timeSeriesChartWidget = this;
+    this.settings = {...timeSeriesChartWidgetDefaultSettings, ...this.ctx.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.showLegend = this.settings.showLegend;
+    if (this.showLegend) {
+      this.legendData = this.ctx.defaultSubscription.legendData;
+      this.legendConfig = this.settings.legendConfig;
+      this.legendKeys = this.legendData.keys;
+      if (this.legendConfig.sortDataKeys) {
+        this.legendKeys = this.legendData.keys.sort((key1, key2) => key1.dataKey.label.localeCompare(key2.dataKey.label));
+      }
+      this.legendKeys.forEach(legendKey => {
+        legendKey.dataKey.settings = mergeDeep<TimeSeriesChartKeySettings>({} as TimeSeriesChartKeySettings,
+          timeSeriesChartKeyDefaultSettings, legendKey.dataKey.settings);
+        legendKey.dataKey.hidden = legendKey.dataKey.settings.dataHiddenByDefault;
+      });
+      this.legendKeys = this.legendKeys.filter(legendKey => legendKey.dataKey.settings.showInLegend);
+      if (!this.legendKeys.length) {
+        this.showLegend = false;
+      }
+    }
+
+    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;
+    }
+  }
+
+  ngAfterViewInit() {
+    this.timeSeriesChart = new TbTimeSeriesChart(this.ctx, this.settings, this.chartShape.nativeElement, this.renderer);
+  }
+
+  ngOnDestroy() {
+    if (this.timeSeriesChart) {
+      this.timeSeriesChart.destroy();
+    }
+  }
+
+  public onInit() {
+    const borderRadius = this.ctx.$widgetElement.css('borderRadius');
+    this.overlayStyle = {...this.overlayStyle, ...{borderRadius}};
+    this.cd.detectChanges();
+  }
+
+  public onDataUpdated() {
+    if (this.timeSeriesChart) {
+      this.timeSeriesChart.update();
+    }
+  }
+
+  public onLatestDataUpdated() {
+    if (this.timeSeriesChart) {
+      this.timeSeriesChart.latestUpdated();
+    }
+  }
+
+  public onLegendKeyEnter(legendKey: LegendKey) {
+    this.timeSeriesChart.keyEnter(legendKey.dataKey);
+  }
+
+  public onLegendKeyLeave(legendKey: LegendKey) {
+    this.timeSeriesChart.keyLeave(legendKey.dataKey);
+  }
+
+  public toggleLegendKey(legendKey: LegendKey) {
+    this.timeSeriesChart.toggleKey(legendKey.dataKey);
+  }
+}
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
new file mode 100644
index 0000000000..6ee3409269
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart-widget.models.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 {
+  timeSeriesChartDefaultSettings,
+  TimeSeriesChartSettings
+} from '@home/components/widget/lib/chart/time-series-chart.models';
+import { BackgroundSettings, BackgroundType, Font } from '@shared/models/widget-settings.models';
+import { defaultLegendConfig, LegendConfig, LegendPosition, widgetType } from '@shared/models/widget.models';
+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;
+}
+
+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,
+      sizeUnit: 'px',
+      style: 'normal',
+      weight: '400',
+      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,
+      color: '#fff',
+      overlay: {
+        enabled: false,
+        color: 'rgba(255,255,255,0.72)',
+        blur: 3
+      }
+    },
+    padding: '12px'
+  } as TimeSeriesChartWidgetSettings);
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
new file mode 100644
index 0000000000..e2792c1793
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart.models.ts
@@ -0,0 +1,1724 @@
+///
+/// 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 {
+  ECharts,
+  EChartsOption,
+  measureThresholdOffset
+} from '@home/components/widget/lib/chart/echarts-widget.models';
+import {
+  autoDateFormat,
+  AutoDateFormatSettings,
+  ComponentStyle,
+  DateFormatProcessor,
+  DateFormatSettings,
+  Font,
+  tsToFormatTimeUnit
+} from '@shared/models/widget-settings.models';
+import {
+  CallbackDataParams,
+  TimeAxisBandWidthCalculator,
+  VisualMapComponentOption,
+  XAXisOption,
+  YAXisOption
+} from 'echarts/types/dist/shared';
+import { CustomSeriesOption, LineSeriesOption } from 'echarts/charts';
+import {
+  formatValue,
+  isDefinedAndNotNull,
+  isFunction,
+  isNumber,
+  isNumeric,
+  isUndefined,
+  isUndefinedOrNull,
+  mergeDeep,
+  parseFunction
+} from '@core/utils';
+import tinycolor from 'tinycolor2';
+import { TimeAxisBaseOption, ValueAxisBaseOption } from 'echarts/types/src/coord/axisCommonTypes';
+import { 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 {
+  DataEntry,
+  DataKey,
+  DataKeySettingsWithComparison,
+  DataSet,
+  Datasource,
+  FormattedData,
+  WidgetComparisonSettings
+} from '@shared/models/widget.models';
+import { DataKeyType } from '@shared/models/telemetry/telemetry.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 {
+  calculateAggIntervalWithWidgetTimeWindow,
+  Interval,
+  IntervalMath,
+  WidgetTimewindow
+} from '@shared/models/time/time.models';
+import { UtilsService } from '@core/services/utils.service';
+import { Renderer2 } from '@angular/core';
+import {
+  chartAnimationDefaultSettings,
+  ChartAnimationSettings,
+  chartBarDefaultSettings,
+  ChartBarSettings,
+  chartColorScheme,
+  ChartFillSettings,
+  ChartFillType,
+  ChartLabelPosition, ChartLineType,
+  ChartShape,
+  createChartTextStyle,
+  createLinearOpacityGradient,
+  PieChartLabelPosition,
+  prepareChartThemeColor
+} from '@home/components/widget/lib/chart/chart.models';
+import { BarSeriesLabelOption } from 'echarts/types/src/chart/bar/BarSeries';
+
+type TimeSeriesChartDataEntry = [number, any, number, number];
+
+type TimeSeriesChartDataSet = {name: string; value: TimeSeriesChartDataEntry}[];
+
+export const toTimeSeriesChartDataSet = (data: DataSet, valueConverter?: (value: any) => any): TimeSeriesChartDataSet => {
+  if (!data?.length) {
+    return [];
+  } else {
+    return data.map(d => {
+      const ts = isDefinedAndNotNull(d[2]) ? d[2][0] : d[0];
+      return {
+        name: ts + '',
+        value: toTimeSeriesChartDataEntry(d, valueConverter)
+      };
+    });
+  }
+};
+
+const toTimeSeriesChartDataEntry = (entry: DataEntry, valueConverter?: (value: any) => any): TimeSeriesChartDataEntry => {
+  const value = valueConverter ? valueConverter(entry[1]) : entry[1];
+  const item: TimeSeriesChartDataEntry = [entry[0], value, entry[0], entry[0]];
+  if (isDefinedAndNotNull(entry[2])) {
+    item[2] = entry[2][0];
+    item[3] = entry[2][1];
+  }
+  return item;
+};
+
+export type TimeSeriesChartTooltipValueFormatFunction =
+  (value: any, latestData: FormattedData, units?: string, decimals?: number) => string;
+
+export interface TimeSeriesChartDataItem {
+  id: string;
+  datasource: Datasource;
+  dataKey: DataKey;
+  data: TimeSeriesChartDataSet;
+  dataSet?: DataSet;
+  enabled: boolean;
+  units?: string;
+  decimals?: number;
+  latestData?: FormattedData;
+  tooltipValueFormatFunction?: TimeSeriesChartTooltipValueFormatFunction;
+  comparisonItem?: boolean;
+  xAxisIndex: number;
+  yAxisId: TimeSeriesChartYAxisId;
+  yAxisIndex: number;
+  option?: LineSeriesOption | CustomSeriesOption;
+  barRenderContext?: BarRenderContext;
+}
+
+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]));
+  }
+};
+
+
+const minDataTs = (dataSet: TimeSeriesChartDataSet): number => dataSet.length ? dataSet.map(data =>
+  Number(data.name)).reduce((a, b) => Math.min(a, b)) : undefined;
+
+const maxDataTs = (dataSet: TimeSeriesChartDataSet): number => dataSet.length ? dataSet.map(data =>
+  Number(data.name)).reduce((a, b) => Math.max(a, b)) : undefined;
+
+export const adjustTimeAxisExtentToData = (timeAxisOption: TimeAxisBaseOption,
+                                           dataItems: TimeSeriesChartDataItem[],
+                                           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;
+};
+
+export enum TimeSeriesChartTooltipTrigger {
+  point = 'point',
+  axis = 'axis'
+}
+
+export const tooltipTriggerTranslationMap = new Map<TimeSeriesChartTooltipTrigger, string>(
+  [
+    [ TimeSeriesChartTooltipTrigger.point, 'tooltip.trigger-point' ],
+    [ TimeSeriesChartTooltipTrigger.axis, 'tooltip.trigger-axis' ]
+  ]
+);
+
+export interface TimeSeriesChartTooltipWidgetSettings {
+  showTooltip: boolean;
+  tooltipTrigger?: TimeSeriesChartTooltipTrigger;
+  tooltipShowFocusedSeries?: boolean;
+  tooltipLabelFont: Font;
+  tooltipLabelColor: string;
+  tooltipValueFont: Font;
+  tooltipValueColor: string;
+  tooltipValueFormatter?: string | TimeSeriesChartTooltipValueFormatFunction;
+  tooltipShowDate: boolean;
+  tooltipDateInterval?: boolean;
+  tooltipDateFormat: DateFormatSettings;
+  tooltipDateFont: Font;
+  tooltipDateColor: string;
+  tooltipBackgroundColor: string;
+  tooltipBackgroundBlur: number;
+}
+
+export const createTooltipValueFormatFunction =
+  (tooltipValueFormatter: string | TimeSeriesChartTooltipValueFormatFunction): TimeSeriesChartTooltipValueFormatFunction => {
+    let tooltipValueFormatFunction: TimeSeriesChartTooltipValueFormatFunction;
+    if (isFunction(tooltipValueFormatter)) {
+      tooltipValueFormatFunction = tooltipValueFormatter as TimeSeriesChartTooltipValueFormatFunction;
+    } else if (typeof tooltipValueFormatter === 'string' && tooltipValueFormatter.length) {
+      try {
+        tooltipValueFormatFunction =
+          new Function('value', 'latestData', tooltipValueFormatter) as TimeSeriesChartTooltipValueFormatFunction;
+      } catch (e) {}
+    }
+    return tooltipValueFormatFunction;
+  };
+
+export const timeSeriesChartTooltipFormatter = (renderer: Renderer2,
+                                                tooltipDateFormat: DateFormatProcessor,
+                                                settings: TimeSeriesChartTooltipWidgetSettings,
+                                                params: CallbackDataParams[] | CallbackDataParams,
+                                                valueFormatFunction: TimeSeriesChartTooltipValueFormatFunction,
+                                                focusedSeriesIndex: number,
+                                                series?: TimeSeriesChartDataItem[],
+                                                interval?: Interval): null | HTMLElement => {
+
+  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', '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: TimeSeriesChartDataItem;
+}
+
+interface TooltipParams {
+  items: TooltipItem[];
+  comparisonItems: TooltipItem[];
+}
+
+const buildItemsTooltip = (tooltipElement: HTMLElement,
+                           items: TooltipItem[],
+                           renderer: Renderer2,
+                           tooltipDateFormat: DateFormatProcessor,
+                           settings: TimeSeriesChartTooltipWidgetSettings,
+                           valueFormatFunction: TimeSeriesChartTooltipValueFormatFunction,
+                           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,
+        constructTooltipDateElement(renderer, tooltipDateFormat, settings, items[0].param, interval));
+    }
+    for (const item of items) {
+      renderer.appendChild(tooltipItemsElement,
+        constructTooltipSeriesElement(renderer, settings, item, valueFormatFunction));
+    }
+  }
+};
+
+const mapTooltipParams = (params: CallbackDataParams[] | CallbackDataParams,
+                          series?: TimeSeriesChartDataItem[],
+                          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) {
+    seriesParams = params.find(param => param.seriesIndex === focusedSeriesIndex);
+  } else if (!Array.isArray(params)) {
+    seriesParams = params;
+  }
+  if (seriesParams) {
+    appendTooltipItem(result, seriesParams, series);
+  } else if (Array.isArray(params)) {
+    for (seriesParams of params) {
+      appendTooltipItem(result, seriesParams, series);
+    }
+  }
+  return result;
+};
+
+const appendTooltipItem = (tooltipParams: TooltipParams, seriesParams: CallbackDataParams, series?: TimeSeriesChartDataItem[]) => {
+  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 constructTooltipDateElement = (renderer: Renderer2,
+                                     tooltipDateFormat: DateFormatProcessor,
+                                     settings: TimeSeriesChartTooltipWidgetSettings,
+                                     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 constructTooltipSeriesElement = (renderer: Renderer2,
+                                       settings: TimeSeriesChartTooltipWidgetSettings,
+                                       item: TooltipItem,
+                                       valueFormatFunction: TimeSeriesChartTooltipValueFormatFunction): HTMLElement => {
+  const labelValueElement: HTMLElement = renderer.createElement('div');
+  renderer.setStyle(labelValueElement, 'display', 'flex');
+  renderer.setStyle(labelValueElement, 'flex-direction', 'row');
+  renderer.setStyle(labelValueElement, 'align-items', 'center');
+  renderer.setStyle(labelValueElement, 'align-self', 'stretch');
+  renderer.setStyle(labelValueElement, 'gap', '12px');
+  const labelElement: HTMLElement = renderer.createElement('div');
+  renderer.setStyle(labelElement, 'display', 'flex');
+  renderer.setStyle(labelElement, 'align-items', 'center');
+  renderer.setStyle(labelElement, 'gap', '8px');
+  renderer.appendChild(labelValueElement, labelElement);
+  const circleElement: HTMLElement = renderer.createElement('div');
+  renderer.setStyle(circleElement, 'width', '8px');
+  renderer.setStyle(circleElement, 'height', '8px');
+  renderer.setStyle(circleElement, 'border-radius', '50%');
+  renderer.setStyle(circleElement, 'background', item.param.color);
+  renderer.appendChild(labelElement, circleElement);
+  const labelTextElement: HTMLElement = renderer.createElement('div');
+  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 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 = 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');
+  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(labelValueElement, valueElement);
+  return labelValueElement;
+};
+
+
+export enum TimeSeriesChartType {
+  default = 'default',
+  line = 'line',
+  bar = 'bar',
+  point = 'point',
+  state = 'state'
+}
+
+export const timeSeriesChartTypeTranslations = new Map<TimeSeriesChartType, string>(
+  [
+    [TimeSeriesChartType.line, 'widgets.time-series-chart.type-line'],
+    [TimeSeriesChartType.bar, 'widgets.time-series-chart.type-bar'],
+    [TimeSeriesChartType.point, 'widgets.time-series-chart.type-point']
+  ]
+);
+
+export enum AxisPosition {
+  left = 'left',
+  right = 'right',
+  top = 'top',
+  bottom = 'bottom'
+}
+
+export const timeSeriesAxisPositions = Object.keys(AxisPosition) as AxisPosition[];
+
+export const timeSeriesAxisPositionTranslations = new Map<AxisPosition, string>(
+  [
+    [AxisPosition.left, 'widgets.time-series-chart.axis.position-left'],
+    [AxisPosition.right, 'widgets.time-series-chart.axis.position-right'],
+    [AxisPosition.top, 'widgets.time-series-chart.axis.position-top'],
+    [AxisPosition.bottom, 'widgets.time-series-chart.axis.position-bottom']
+  ]
+);
+
+export enum ThresholdLabelPosition {
+  start = 'start',
+  middle = 'middle',
+  end = 'end',
+  insideStart = 'insideStart',
+  insideStartTop = 'insideStartTop',
+  insideStartBottom = 'insideStartBottom',
+  insideMiddle = 'insideMiddle',
+  insideMiddleTop = 'insideMiddleTop',
+  insideMiddleBottom = 'insideMiddleBottom',
+  insideEnd = 'insideEnd',
+  insideEndTop = 'insideEndTop',
+  insideEndBottom = 'insideEndBottom'
+}
+
+export const timeSeriesThresholdLabelPositions = Object.keys(ThresholdLabelPosition) as ThresholdLabelPosition[];
+
+export const timeSeriesThresholdLabelPositionTranslations = new Map<ThresholdLabelPosition, string>(
+  [
+    [ThresholdLabelPosition.start, 'widgets.time-series-chart.threshold.label-position-start'],
+    [ThresholdLabelPosition.middle, 'widgets.time-series-chart.threshold.label-position-middle'],
+    [ThresholdLabelPosition.end, 'widgets.time-series-chart.threshold.label-position-end'],
+    [ThresholdLabelPosition.insideStart, 'widgets.time-series-chart.threshold.label-position-inside-start'],
+    [ThresholdLabelPosition.insideStartTop, 'widgets.time-series-chart.threshold.label-position-inside-start-top'],
+    [ThresholdLabelPosition.insideStartBottom, 'widgets.time-series-chart.threshold.label-position-inside-start-bottom'],
+    [ThresholdLabelPosition.insideMiddle, 'widgets.time-series-chart.threshold.label-position-inside-middle'],
+    [ThresholdLabelPosition.insideMiddleTop, 'widgets.time-series-chart.threshold.label-position-inside-middle-top'],
+    [ThresholdLabelPosition.insideMiddleBottom, 'widgets.time-series-chart.threshold.label-position-inside-middle-bottom'],
+    [ThresholdLabelPosition.insideEnd, 'widgets.time-series-chart.threshold.label-position-inside-end'],
+    [ThresholdLabelPosition.insideEndTop, 'widgets.time-series-chart.threshold.label-position-inside-end-top'],
+    [ThresholdLabelPosition.insideEndBottom, 'widgets.time-series-chart.threshold.label-position-inside-end-bottom']
+  ]
+);
+
+export enum TimeSeriesChartThresholdType {
+  constant = 'constant',
+  latestKey = 'latestKey',
+  entity = 'entity'
+}
+
+export const timeSeriesThresholdTypes = Object.keys(TimeSeriesChartThresholdType) as TimeSeriesChartThresholdType[];
+
+export const timeSeriesThresholdTypeTranslations = new Map<TimeSeriesChartThresholdType, string>(
+  [
+    [TimeSeriesChartThresholdType.constant, 'widgets.time-series-chart.threshold.type-constant'],
+    [TimeSeriesChartThresholdType.latestKey, 'widgets.time-series-chart.threshold.type-latest-key'],
+    [TimeSeriesChartThresholdType.entity, 'widgets.time-series-chart.threshold.type-entity']
+  ]
+);
+
+
+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 LineSeriesStepType {
+  start = 'start',
+  middle = 'middle',
+  end = 'end'
+}
+
+export const lineSeriesStepTypes = Object.keys(LineSeriesStepType) as LineSeriesStepType[];
+
+export const lineSeriesStepTypeTranslations = new Map<LineSeriesStepType, string>(
+  [
+    [LineSeriesStepType.start, 'widgets.time-series-chart.series.line.step-type-start'],
+    [LineSeriesStepType.middle, 'widgets.time-series-chart.series.line.step-type-middle'],
+    [LineSeriesStepType.end, 'widgets.time-series-chart.series.line.step-type-end']
+  ]
+);
+
+export enum TimeSeriesChartSeriesType {
+  line = 'line',
+  bar = 'bar'
+}
+
+export const timeSeriesChartSeriesTypes = Object.keys(TimeSeriesChartSeriesType) as TimeSeriesChartSeriesType[];
+
+export const timeSeriesChartSeriesTypeTranslations = new Map<TimeSeriesChartSeriesType, string>(
+  [
+    [TimeSeriesChartSeriesType.line, 'widgets.time-series-chart.series.type-line'],
+    [TimeSeriesChartSeriesType.bar, 'widgets.time-series-chart.series.type-bar']
+  ]
+);
+
+export const timeSeriesChartSeriesTypeIcons = new Map<TimeSeriesChartSeriesType, string>(
+  [
+    [TimeSeriesChartSeriesType.line, 'mdi:chart-line'],
+    [TimeSeriesChartSeriesType.bar, 'mdi:chart-bar']
+  ]
+);
+
+export interface TimeSeriesChartAxisSettings {
+  show: boolean;
+  label?: string;
+  labelFont?: Font;
+  labelColor?: string;
+  position: AxisPosition;
+  showTickLabels: boolean;
+  tickLabelFont: Font;
+  tickLabelColor: string;
+  showTicks: boolean;
+  ticksColor: string;
+  showLine: boolean;
+  lineColor: string;
+  showSplitLines: boolean;
+  splitLinesColor: string;
+}
+
+export interface TimeSeriesChartXAxisSettings extends TimeSeriesChartAxisSettings {
+  ticksFormat: AutoDateFormatSettings;
+}
+
+export const defaultXAxisTicksFormat: AutoDateFormatSettings = {
+  millisecond: 'HH:mm:ss SSS',
+  second: 'HH:mm:ss',
+  minute: 'HH:mm',
+  hour: 'HH:mm',
+  day: 'MMM dd',
+  month: 'MMM',
+  year: 'yyyy'
+};
+
+export type TimeSeriesChartYAxisId = 'default' | string;
+
+export type TimeSeriesChartTicksGenerator =
+  (extent?: number[], interval?: number, niceTickExtent?: number[], intervalPrecision?: number) => {value: number}[];
+
+export type TimeSeriesChartTicksFormatter =
+  (value: any) => string;
+
+export interface TimeSeriesChartYAxisSettings extends TimeSeriesChartAxisSettings {
+  id?: TimeSeriesChartYAxisId;
+  order?: number;
+  units?: string;
+  decimals?: number;
+  interval?: number;
+  splitNumber?: number;
+  min?: number | string;
+  max?: number | string;
+  ticksGenerator?: TimeSeriesChartTicksGenerator | string;
+  ticksFormatter?: TimeSeriesChartTicksFormatter | string;
+}
+
+export const timeSeriesChartYAxisValid = (axis: TimeSeriesChartYAxisSettings): boolean =>
+  !(!axis.id || isUndefinedOrNull(axis.order));
+
+export const timeSeriesChartYAxisValidator = (control: AbstractControl): ValidationErrors | null => {
+  const axis: TimeSeriesChartYAxisSettings = control.value;
+  if (!timeSeriesChartYAxisValid(axis)) {
+    return {
+      axis: true
+    };
+  }
+  return null;
+};
+
+export const getNextTimeSeriesYAxisId = (axes: TimeSeriesChartYAxisSettings[]): TimeSeriesChartYAxisId => {
+  let id = 0;
+  for (const axis of axes) {
+    const existingId = axis.id;
+    if (existingId.startsWith('axis')) {
+      const idSuffix = existingId.substring('axis'.length);
+      if (isNumeric(idSuffix)) {
+        id = Math.max(id, Number(idSuffix));
+      }
+    }
+  }
+  return 'axis' + (id+1);
+};
+
+export const defaultTimeSeriesChartYAxisSettings: TimeSeriesChartYAxisSettings = {
+  units: null,
+  decimals: 0,
+  show: true,
+    label: '',
+    labelFont: {
+    family: 'Roboto',
+      size: 12,
+      sizeUnit: 'px',
+      style: 'normal',
+      weight: '600',
+      lineHeight: '1'
+  },
+  labelColor: chartColorScheme['axis.label'].light,
+  position: AxisPosition.left,
+  showTickLabels: true,
+  tickLabelFont: {
+  family: 'Roboto',
+    size: 12,
+    sizeUnit: 'px',
+    style: 'normal',
+    weight: '400',
+    lineHeight: '1'
+  },
+  tickLabelColor: chartColorScheme['axis.tickLabel'].light,
+  ticksFormatter: null,
+  showTicks: true,
+  ticksColor: chartColorScheme['axis.ticks'].light,
+  showLine: true,
+  lineColor: chartColorScheme['axis.line'].light,
+  showSplitLines: true,
+  splitLinesColor: chartColorScheme['axis.splitLine'].light
+};
+
+export const defaultTimeSeriesChartXAxisSettings: TimeSeriesChartXAxisSettings = {
+  show: true,
+  label: '',
+  labelFont: {
+    family: 'Roboto',
+    size: 12,
+    sizeUnit: 'px',
+    style: 'normal',
+    weight: '600',
+    lineHeight: '1'
+  },
+  labelColor: chartColorScheme['axis.label'].light,
+  position: AxisPosition.bottom,
+  showTickLabels: true,
+  tickLabelFont: {
+    family: 'Roboto',
+    size: 10,
+    sizeUnit: 'px',
+    style: 'normal',
+    weight: '400',
+    lineHeight: '1'
+  },
+  tickLabelColor: chartColorScheme['axis.tickLabel'].light,
+  ticksFormat: {},
+  showTicks: true,
+  ticksColor: chartColorScheme['axis.ticks'].light,
+  showLine: true,
+  lineColor: chartColorScheme['axis.line'].light,
+  showSplitLines: true,
+  splitLinesColor: chartColorScheme['axis.splitLine'].light
+};
+
+export type TimeSeriesChartYAxes = {[id: TimeSeriesChartYAxisId]: TimeSeriesChartYAxisSettings};
+
+export interface TimeSeriesChartThreshold {
+  type: TimeSeriesChartThresholdType;
+  value?: number;
+  latestKey?: string;
+  latestKeyType?: DataKeyType.attribute | DataKeyType.timeseries;
+  entityAlias?: string;
+  entityKey?: string;
+  entityKeyType?: DataKeyType.attribute | DataKeyType.timeseries;
+  yAxisId: TimeSeriesChartYAxisId;
+  units?: string;
+  decimals?: number;
+  lineColor: string;
+  lineType: ChartLineType | number | number[];
+  lineWidth: number;
+  startSymbol: ChartShape;
+  startSymbolSize: number;
+  endSymbol: ChartShape;
+  endSymbolSize: number;
+  showLabel: boolean;
+  labelPosition: ThresholdLabelPosition;
+  labelFont: Font;
+  labelColor: string;
+  enableLabelBackground: boolean;
+  labelBackground: string;
+  additionalLabelOption?: {[key: string]: any};
+}
+
+export const timeSeriesChartThresholdValid = (threshold: TimeSeriesChartThreshold): boolean => {
+  if (!threshold.type || !threshold.yAxisId) {
+    return false;
+  }
+  switch (threshold.type) {
+    case TimeSeriesChartThresholdType.constant:
+      if (isUndefinedOrNull(threshold.value)) {
+        return false;
+      }
+      break;
+    case TimeSeriesChartThresholdType.latestKey:
+      if (!threshold.latestKey || !threshold.latestKeyType) {
+        return false;
+      }
+      break;
+    case TimeSeriesChartThresholdType.entity:
+      if (!threshold.entityAlias || !threshold.entityKey || !threshold.entityKeyType) {
+        return false;
+      }
+      break;
+  }
+  return true;
+};
+
+export const timeSeriesChartThresholdValidator = (control: AbstractControl): ValidationErrors | null => {
+  const threshold: TimeSeriesChartThreshold = control.value;
+  if (!timeSeriesChartThresholdValid(threshold)) {
+    return {
+      threshold: true
+    };
+  }
+  return null;
+};
+
+export const timeSeriesChartThresholdDefaultSettings: TimeSeriesChartThreshold = {
+  type: TimeSeriesChartThresholdType.constant,
+  yAxisId: 'default',
+  units: null,
+  decimals: 0,
+  lineColor: chartColorScheme['threshold.line'].light,
+  lineType: ChartLineType.solid,
+  lineWidth: 1,
+  startSymbol: ChartShape.none,
+  startSymbolSize: 5,
+  endSymbol: ChartShape.arrow,
+  endSymbolSize: 5,
+  showLabel: true,
+  labelPosition: ThresholdLabelPosition.end,
+  labelFont: {
+    family: 'Roboto',
+    size: 12,
+    sizeUnit: 'px',
+    style: 'normal',
+    weight: '400',
+    lineHeight: '1'
+  },
+  labelColor: chartColorScheme['threshold.label'].light,
+  enableLabelBackground: false,
+  labelBackground: 'rgba(255,255,255,0.56)'
+};
+
+export enum TimeSeriesChartNoAggregationBarWidthStrategy {
+  group = 'group',
+  separate = 'separate'
+}
+
+export const timeSeriesChartNoAggregationBarWidthStrategies =
+  Object.keys(TimeSeriesChartNoAggregationBarWidthStrategy) as TimeSeriesChartNoAggregationBarWidthStrategy[];
+
+export const timeSeriesChartNoAggregationBarWidthStrategyTranslations = new Map<TimeSeriesChartNoAggregationBarWidthStrategy, string>(
+  [
+    [TimeSeriesChartNoAggregationBarWidthStrategy.group, 'widgets.time-series-chart.no-aggregation-bar-width-strategy-group'],
+    [TimeSeriesChartNoAggregationBarWidthStrategy.separate, 'widgets.time-series-chart.no-aggregation-bar-width-strategy-separate']
+  ]
+);
+
+export interface TimeSeriesChartBarWidth {
+  relative?: boolean;
+  relativeWidth?: number;
+  absoluteWidth?: number;
+}
+
+export interface TimeSeriesChartNoAggregationBarWidthSettings {
+  strategy: TimeSeriesChartNoAggregationBarWidthStrategy;
+  groupWidth?: TimeSeriesChartBarWidth;
+  barWidth?: TimeSeriesChartBarWidth;
+}
+
+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 interface TimeSeriesChartGridSettings {
+  show: boolean;
+  backgroundColor: string;
+  borderWidth: number;
+  borderColor: string;
+}
+
+export const timeSeriesChartGridDefaultSettings: TimeSeriesChartGridSettings = {
+  show: false,
+  backgroundColor: null,
+  borderWidth: 1,
+  borderColor: '#ccc'
+};
+
+export interface TimeSeriesChartSettings extends TimeSeriesChartTooltipWidgetSettings, TimeSeriesChartComparisonSettings {
+  thresholds: TimeSeriesChartThreshold[];
+  darkMode: boolean;
+  dataZoom: boolean;
+  stack: boolean;
+  grid: TimeSeriesChartGridSettings;
+  yAxes: TimeSeriesChartYAxes;
+  xAxis: TimeSeriesChartXAxisSettings;
+  animation: ChartAnimationSettings;
+  barWidthSettings: TimeSeriesChartBarWidthSettings;
+  noAggregationBarWidthSettings: TimeSeriesChartNoAggregationBarWidthSettings;
+  visualMapSettings?: TimeSeriesChartVisualMapSettings;
+  states?: TimeSeriesChartStateSettings[];
+}
+
+export const timeSeriesChartDefaultSettings: TimeSeriesChartSettings = {
+  thresholds: [],
+  darkMode: false,
+  dataZoom: true,
+  stack: false,
+  grid: mergeDeep({} as TimeSeriesChartGridSettings,
+    timeSeriesChartGridDefaultSettings),
+  yAxes: {
+    default: mergeDeep({} as TimeSeriesChartYAxisSettings,
+                       defaultTimeSeriesChartYAxisSettings,
+                       { id: 'default', order: 0 } as TimeSeriesChartYAxisSettings)
+  },
+  xAxis: mergeDeep({} as TimeSeriesChartXAxisSettings,
+    defaultTimeSeriesChartXAxisSettings),
+  animation: mergeDeep({} as ChartAnimationSettings,
+    chartAnimationDefaultSettings),
+  barWidthSettings: {
+    barGap: 0.3,
+    intervalGap: 0.6
+  },
+  noAggregationBarWidthSettings: mergeDeep({} as TimeSeriesChartNoAggregationBarWidthSettings,
+    timeSeriesChartNoAggregationBarWidthDefaultSettings),
+  showTooltip: true,
+  tooltipTrigger: TimeSeriesChartTooltipTrigger.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,
+    sizeUnit: 'px',
+    style: 'normal',
+    weight: '500',
+    lineHeight: '16px'
+  },
+  tooltipValueColor: 'rgba(0, 0, 0, 0.76)',
+  tooltipShowDate: true,
+  tooltipDateFormat: autoDateFormat(),
+  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,
+  comparisonEnabled: false,
+  timeForComparison: 'previousInterval',
+  comparisonCustomIntervalValue: 7200000,
+  comparisonXAxis: mergeDeep({} as TimeSeriesChartXAxisSettings,
+    defaultTimeSeriesChartXAxisSettings,
+    { position: AxisPosition.top } as TimeSeriesChartXAxisSettings)
+};
+
+export interface LineSeriesSettings {
+  showLine: boolean;
+  step: boolean;
+  stepType: LineSeriesStepType;
+  smooth: boolean;
+  lineType: ChartLineType;
+  lineWidth: number;
+  showPoints: boolean;
+  showPointLabel: boolean;
+  pointLabelPosition: ChartLabelPosition;
+  pointLabelFont: Font;
+  pointLabelColor: string;
+  enablePointLabelBackground: boolean;
+  pointLabelBackground: string;
+  pointLabelFormatter?: string | LabelFormatterCallback;
+  pointShape: ChartShape;
+  pointSize: number;
+  fillAreaSettings: ChartFillSettings;
+}
+
+export interface TimeSeriesChartKeySettings extends DataKeySettingsWithComparison {
+  yAxisId: TimeSeriesChartYAxisId;
+  showInLegend: boolean;
+  dataHiddenByDefault: boolean;
+  type: TimeSeriesChartSeriesType;
+  lineSettings: LineSeriesSettings;
+  barSettings: ChartBarSettings;
+  tooltipValueFormatter?: string | TimeSeriesChartTooltipValueFormatFunction;
+}
+
+export const timeSeriesChartKeyDefaultSettings: TimeSeriesChartKeySettings = {
+  yAxisId: 'default',
+  showInLegend: true,
+  dataHiddenByDefault: false,
+  type: TimeSeriesChartSeriesType.line,
+  lineSettings: {
+    showLine: true,
+    step: false,
+    stepType: LineSeriesStepType.start,
+    smooth: false,
+    lineType: ChartLineType.solid,
+    lineWidth: 2,
+    showPoints: false,
+    showPointLabel: false,
+    pointLabelPosition: ChartLabelPosition.top,
+    pointLabelFont: {
+      family: 'Roboto',
+      size: 11,
+      sizeUnit: 'px',
+      style: 'normal',
+      weight: '400',
+      lineHeight: '1'
+    },
+    pointLabelColor: chartColorScheme['series.label'].light,
+    enablePointLabelBackground: false,
+    pointLabelBackground: 'rgba(255,255,255,0.56)',
+    pointShape: ChartShape.emptyCircle,
+    pointSize: 4,
+    fillAreaSettings: {
+      type: ChartFillType.none,
+      opacity: 0.4,
+      gradient: {
+        start: 100,
+        end: 0
+      }
+    }
+  },
+  barSettings: mergeDeep({} as ChartBarSettings, chartBarDefaultSettings),
+  comparisonSettings: {
+    showValuesForComparison: false,
+    comparisonValuesLabel: '',
+    color: ''
+  }
+};
+
+type TimeSeriesChartThresholdValue = number | string | (number | string)[];
+
+export interface TimeSeriesChartThresholdItem {
+  id: string;
+  yAxisId: TimeSeriesChartYAxisId;
+  yAxisIndex: number;
+  latestDataKey?: DataKey;
+  units?: string;
+  decimals?: number;
+  value: TimeSeriesChartThresholdValue;
+  settings: TimeSeriesChartThreshold;
+  option?: LineSeriesOption;
+}
+
+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');
+  const yAxisNameStyle = createChartTextStyle(settings.labelFont,
+    settings.labelColor, darkMode, 'axis.label');
+
+  let ticksFormatter: TimeSeriesChartTicksFormatter;
+  if (settings.ticksFormatter) {
+    if (isFunction(settings.ticksFormatter)) {
+      ticksFormatter = settings.ticksFormatter as TimeSeriesChartTicksFormatter;
+    } else if (settings.ticksFormatter.length) {
+      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)) {
+      configuredTicksGenerator = settings.ticksGenerator as TimeSeriesChartTicksGenerator;
+    } else if (settings.ticksGenerator.length) {
+      configuredTicksGenerator = parseFunction(settings.ticksGenerator, ['extent', 'interval', 'niceTickExtent', 'intervalPrecision']);
+    }
+  }
+  if (!configuredTicksGenerator) {
+    interval = settings.interval;
+    if (isUndefinedOrNull(interval)) {
+      if (isDefinedAndNotNull(settings.splitNumber)) {
+        splitNumber = settings.splitNumber;
+      } else {
+        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,
+      id: settings.id,
+      offset: 0,
+      alignTicks: true,
+      scale: true,
+      min: settings.min,
+      max: settings.max,
+      minInterval,
+      splitNumber,
+      interval,
+      ticksGenerator,
+      name: utils.customTranslation(settings.label, settings.label),
+      nameLocation: 'middle',
+      nameRotate: settings.position === AxisPosition.left ? 90 : -90,
+      nameTextStyle: {
+        color: yAxisNameStyle.color,
+        fontStyle: yAxisNameStyle.fontStyle,
+        fontWeight: yAxisNameStyle.fontWeight,
+        fontFamily: yAxisNameStyle.fontFamily,
+        fontSize: yAxisNameStyle.fontSize
+      },
+      axisLine: {
+        show: settings.showLine,
+        onZero: false,
+        lineStyle: {
+          color: prepareChartThemeColor(settings.lineColor, darkMode, 'axis.line')
+        }
+      },
+      axisTick: {
+        show: settings.showTicks,
+        lineStyle: {
+          color: prepareChartThemeColor(settings.ticksColor, darkMode, 'axis.ticks')
+        }
+      },
+      axisLabel: {
+        show: settings.showTickLabels,
+        color: yAxisTickLabelStyle.color,
+        fontStyle: yAxisTickLabelStyle.fontStyle,
+        fontWeight: yAxisTickLabelStyle.fontWeight,
+        fontFamily: yAxisTickLabelStyle.fontFamily,
+        fontSize: yAxisTickLabelStyle.fontSize,
+        formatter: (value: any) => {
+          let result: string;
+          if (ticksFormatter) {
+            try {
+              result = ticksFormatter(value);
+            } catch (_e) {
+            }
+          }
+          if (isUndefined(result)) {
+            result = formatValue(value, decimals, units, false);
+          }
+          return result;
+        }
+      },
+      splitLine: {
+        show: settings.showSplitLines,
+        lineStyle: {
+          color: prepareChartThemeColor(settings.splitLinesColor, darkMode, 'axis.splitLine')
+        }
+      }
+    }
+  };
+};
+
+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 {
+    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)'
+        }
+      },
+      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,
+                                  noAggregation: boolean,
+                                  barRenderSharedContext: BarRenderSharedContext,
+                                  darkMode: boolean): Array<LineSeriesOption | CustomSeriesOption> => {
+  let series = generateChartSeries(dataItems,
+    stack, noAggregation, barRenderSharedContext, darkMode);
+  if (thresholdItems.length) {
+    const thresholds = generateChartThresholds(thresholdItems);
+    series = series.concat(thresholds);
+  }
+  return series;
+};
+
+export const calculateThresholdsOffset = (chart: ECharts,
+                                          thresholdItems: TimeSeriesChartThresholdItem[],
+                                          yAxisList: TimeSeriesChartYAxis[]): [number, number] => {
+  const result: [number, number] = [0, 0];
+  for (const item of thresholdItems) {
+    const yAxis = yAxisList[item.yAxisIndex];
+    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]);
+  }
+  return result;
+};
+
+export const parseThresholdData = (value: any): TimeSeriesChartThresholdValue => {
+  let thresholdValue: TimeSeriesChartThresholdValue;
+  if (Array.isArray(value)) {
+    thresholdValue = value;
+  } else {
+    try {
+      const parsedData = JSON.parse(value);
+      thresholdValue = Array.isArray(parsedData) ? parsedData : [parsedData];
+    } catch (e) {
+      thresholdValue = [value];
+    }
+  }
+  return thresholdValue;
+};
+
+const generateChartThresholds = (thresholdItems: TimeSeriesChartThresholdItem[]): Array<LineSeriesOption> => {
+  const series: Array<LineSeriesOption> = [];
+  for (const item of thresholdItems) {
+    if (isDefinedAndNotNull(item.value)) {
+      let seriesOption = item.option;
+      if (!item.option) {
+        const thresholdLabelStyle = createChartTextStyle(item.settings.labelFont,
+          item.settings.labelColor, false, 'threshold.label');
+        seriesOption = {
+          type: 'line',
+          id: item.id,
+          dataGroupId: item.id,
+          yAxisIndex: item.yAxisIndex,
+          data: [],
+          markLine: {
+            tooltip: {
+              show: false
+            },
+            lineStyle: {
+              width: item.settings.lineWidth,
+              color: prepareChartThemeColor(item.settings.lineColor, false, 'threshold.line'),
+              type: item.settings.lineType
+            },
+            label: {
+              show: item.settings.showLabel,
+              position: item.settings.labelPosition,
+              color: thresholdLabelStyle.color,
+              fontStyle: thresholdLabelStyle.fontStyle,
+              fontWeight: thresholdLabelStyle.fontWeight,
+              fontFamily: thresholdLabelStyle.fontFamily,
+              fontSize: thresholdLabelStyle.fontSize,
+              formatter: params => formatValue(params.value, item.decimals,
+                item.units, false)
+            },
+            emphasis: {
+              disabled: true
+            }
+          }
+        };
+        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 = [];
+      if (Array.isArray(item.value)) {
+        for (const val of item.value) {
+          seriesOption.markLine.data.push(createThresholdData(val, item));
+        }
+      } else {
+        seriesOption.markLine.data.push(createThresholdData(item.value, item));
+      }
+      series.push(seriesOption);
+    }
+  }
+  return series;
+};
+
+const createThresholdData = (val: string | number, item: TimeSeriesChartThresholdItem): MarkLine2DDataItemOption => [
+    {
+      xAxis: 'min',
+      yAxis: val,
+      value: val,
+      symbol: item.settings.startSymbol,
+      symbolSize: item.settings.startSymbolSize
+    },
+    {
+      xAxis: 'max',
+      yAxis: val,
+      value: val,
+      symbol: item.settings.endSymbol,
+      symbolSize: item.settings.endSymbolSize
+    }
+  ];
+
+const generateChartSeries = (dataItems: TimeSeriesChartDataItem[],
+                             stack: boolean,
+                             noAggregation: boolean,
+                             barRenderSharedContext: BarRenderSharedContext,
+                             darkMode: boolean): Array<LineSeriesOption | CustomSeriesOption> => {
+  const series: Array<LineSeriesOption | CustomSeriesOption> = [];
+  const enabledDataItems = dataItems.filter(d => d.enabled);
+  const barDataItems = enabledDataItems.filter(d =>
+    d.dataKey.settings.type === TimeSeriesChartSeriesType.bar && d.data.length);
+  let barsCount = barDataItems.length;
+  const barGroups: number[] = [];
+  if (stack) {
+    barDataItems.forEach(item => {
+      if (barGroups.indexOf(item.yAxisIndex) === -1) {
+        barGroups.push(item.yAxisIndex);
+      }
+    });
+    barsCount = barGroups.length;
+  }
+  for (const item of enabledDataItems) {
+    if (item.dataKey.settings.type === TimeSeriesChartSeriesType.bar) {
+      if (!item.barRenderContext) {
+        item.barRenderContext = {noAggregation,
+          shared: barRenderSharedContext};
+      }
+      item.barRenderContext.noAggregation = noAggregation;
+      item.barRenderContext.barsCount = barsCount;
+      item.barRenderContext.barIndex = stack ? barGroups.indexOf(item.yAxisIndex) : barDataItems.indexOf(item);
+      if (stack) {
+        const stackItems = enabledDataItems.filter(d => d.yAxisIndex === item.yAxisIndex);
+        item.barRenderContext.currentStackItems = stackItems;
+        item.barRenderContext.barStackIndex = stackItems.indexOf(item);
+      }
+    }
+    const seriesOption = createTimeSeriesChartSeries(item, stack, darkMode);
+    series.push(seriesOption);
+  }
+  return series;
+};
+
+export const updateDarkMode = (options: EChartsOption,
+                               xAxisList: TimeSeriesChartXAxis[],
+                               yAxisList: TimeSeriesChartYAxis[],
+                               dataItems: TimeSeriesChartDataItem[],
+                               darkMode: boolean): EChartsOption => {
+  options.darkMode = darkMode;
+  if (Array.isArray(options.yAxis)) {
+    for (let i = 0; i < options.yAxis.length; i++) {
+      const yAxis = options.yAxis[i];
+      const yAxisSettings = yAxisList[i].settings;
+      yAxis.nameTextStyle.color = prepareChartThemeColor(yAxisSettings.labelColor, darkMode, 'axis.label');
+      yAxis.axisLabel.color = prepareChartThemeColor(yAxisSettings.tickLabelColor, darkMode, 'axis.tickLabel');
+      yAxis.axisLine.lineStyle.color = prepareChartThemeColor(yAxisSettings.lineColor, darkMode, 'axis.line');
+      yAxis.axisTick.lineStyle.color = prepareChartThemeColor(yAxisSettings.ticksColor, darkMode, 'axis.ticks');
+      yAxis.splitLine.lineStyle.color = prepareChartThemeColor(yAxisSettings.splitLinesColor, darkMode, 'axis.splitLine');
+    }
+  }
+  if (Array.isArray(options.xAxis)) {
+    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) {
+    if (item.dataKey.settings.type === TimeSeriesChartSeriesType.line) {
+      const lineSettings = item.dataKey.settings as LineSeriesSettings;
+      if (item.option.label?.show) {
+        item.option.label.rich.value.color = prepareChartThemeColor(lineSettings.pointLabelColor, darkMode, 'series.label');
+      }
+      if (Array.isArray(options.series)) {
+        const series = options.series.find(s => s.id === item.id);
+        if (series) {
+          if (series.label?.show) {
+            series.label.rich.value.color = prepareChartThemeColor(lineSettings.pointLabelColor, darkMode, 'series.label');
+          }
+        }
+      }
+    } else {
+      if (item.barRenderContext?.labelOption?.show) {
+        const barSettings = item.dataKey.settings as ChartBarSettings;
+        (item.barRenderContext.labelOption.rich.value as any).fill = prepareChartThemeColor(barSettings.labelColor,
+          darkMode, 'series.label');
+      }
+    }
+  }
+  return options;
+};
+
+const createTimeSeriesChartSeries = (item: TimeSeriesChartDataItem,
+                                     stack: boolean,
+                                     darkMode: boolean): LineSeriesOption | CustomSeriesOption => {
+  let seriesOption = item.option;
+  if (!seriesOption) {
+    const dataKey = item.dataKey;
+    const settings: TimeSeriesChartKeySettings = dataKey.settings;
+    const seriesColor = item.dataKey.color;
+    seriesOption = {
+      id: item.id,
+      dataGroupId: item.id,
+      xAxisIndex: item.xAxisIndex,
+      yAxisIndex: item.yAxisIndex,
+      name: item.dataKey.label,
+      color: seriesColor,
+      stack: stack ? (item.yAxisIndex + '') : undefined,
+      stackStrategy: 'all',
+      emphasis: {
+        focus: 'series'
+      },
+      dimensions: [
+        {name: 'x', type: 'time', stack},
+        {name: 'y', type: 'float'},
+        {name: 'intervalStart', type: 'time'},
+        {name: 'intervalEnd', type: 'time'}
+      ],
+      encode: {
+        x: [0, 2, 3],
+        y: [1]
+      }
+    };
+    item.option = seriesOption;
+    if (settings.type === TimeSeriesChartSeriesType.line) {
+      const lineSettings = settings.lineSettings;
+      const lineSeriesOption = seriesOption as LineSeriesOption;
+      lineSeriesOption.type = 'line';
+      lineSeriesOption.label = createSeriesLabelOption(item, lineSettings.showPointLabel,
+        lineSettings.pointLabelFont, lineSettings.pointLabelColor,
+        lineSettings.enablePointLabelBackground, lineSettings.pointLabelBackground,
+        lineSettings.pointLabelPosition,
+        lineSettings.pointLabelFormatter, false, darkMode) as SeriesLabelOption;
+      lineSeriesOption.step = lineSettings.step ? lineSettings.stepType : false;
+      lineSeriesOption.smooth = lineSettings.smooth ? 0.25 : false;
+      if (lineSettings.smooth) {
+        lineSeriesOption.smoothMonotone = 'none';
+      }
+      lineSeriesOption.lineStyle = {
+        width: lineSettings.showLine ? lineSettings.lineWidth : 0,
+        type: lineSettings.lineType
+      };
+      if (lineSettings.fillAreaSettings.type !== ChartFillType.none) {
+        lineSeriesOption.areaStyle = {};
+        if (lineSettings.fillAreaSettings.type === ChartFillType.opacity) {
+          lineSeriesOption.areaStyle.opacity = lineSettings.fillAreaSettings.opacity;
+        } else if (lineSettings.fillAreaSettings.type === ChartFillType.gradient) {
+          lineSeriesOption.areaStyle.opacity = 1;
+          lineSeriesOption.areaStyle.color = createLinearOpacityGradient(seriesColor, lineSettings.fillAreaSettings.gradient);
+        }
+      }
+      lineSeriesOption.showSymbol = lineSettings.showPoints;
+      lineSeriesOption.symbol = lineSettings.pointShape;
+      lineSeriesOption.symbolSize = lineSettings.pointSize;
+    } else {
+      const barSettings = settings.barSettings;
+      const barSeriesOption = (seriesOption as any) as CustomSeriesOption;
+      barSeriesOption.type = 'custom';
+      const barVisualSettings: BarVisualSettings = {
+        color: seriesColor,
+        borderColor: seriesColor,
+        borderWidth: barSettings.showBorder ? barSettings.borderWidth : 0,
+        borderRadius: barSettings.borderRadius
+      };
+      if (barSettings.backgroundSettings.type === ChartFillType.none) {
+        barVisualSettings.color = seriesColor;
+      } else if (barSettings.backgroundSettings.type === ChartFillType.opacity) {
+        barVisualSettings.color = tinycolor(seriesColor).setAlpha(barSettings.backgroundSettings.opacity).toRgbString();
+      } else {
+        barVisualSettings.color = createLinearOpacityGradient(seriesColor, barSettings.backgroundSettings.gradient);
+      }
+      item.barRenderContext.visualSettings = barVisualSettings;
+      item.barRenderContext.labelOption = createSeriesLabelOption(item, barSettings.showLabel,
+        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;
+  return seriesOption;
+};
+
+const createSeriesLabelOption = (item: TimeSeriesChartDataItem, show: boolean,
+                                 labelFont: Font, labelColor: string,
+                                 enableBackground: boolean, labelBackground: string,
+                                 position: ChartLabelPosition | PieChartLabelPosition | BuiltinTextPosition,
+                                 labelFormatter: string | LabelFormatterCallback,
+                                 labelColorFill: boolean,
+                                 darkMode: boolean): SeriesLabelOption | BarSeriesLabelOption => {
+  let labelStyle: ComponentStyle = {};
+  if (show) {
+    labelStyle = createChartTextStyle(labelFont, labelColor, darkMode, 'series.label', labelColorFill);
+  }
+  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 | BarSeriesLabelOption = {
+    show,
+    position,
+    formatter,
+    rich: {
+      value: labelStyle
+    }
+  };
+  if (enableBackground) {
+    labelOption.backgroundColor = labelBackground;
+    labelOption.padding = [4, 5];
+    labelOption.borderRadius = 4;
+  }
+  return labelOption;
+};
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
new file mode 100644
index 0000000000..86cf42de0c
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart.ts
@@ -0,0 +1,857 @@
+///
+/// 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 { WidgetContext } from '@home/models/widget-component.models';
+import {
+  adjustTimeAxisExtentToData,
+  calculateThresholdsOffset,
+  createTimeSeriesVisualMapOption,
+  createTimeSeriesXAxis,
+  createTimeSeriesYAxis,
+  createTooltipValueFormatFunction,
+  defaultTimeSeriesChartYAxisSettings,
+  generateChartData,
+  LineSeriesStepType,
+  parseThresholdData,
+  TimeSeriesChartAxis,
+  TimeSeriesChartDataItem,
+  timeSeriesChartDefaultSettings,
+  timeSeriesChartKeyDefaultSettings,
+  TimeSeriesChartKeySettings,
+  TimeSeriesChartNoAggregationBarWidthStrategy,
+  TimeSeriesChartSeriesType,
+  TimeSeriesChartSettings,
+  TimeSeriesChartThreshold,
+  timeSeriesChartThresholdDefaultSettings,
+  TimeSeriesChartThresholdItem,
+  TimeSeriesChartThresholdType,
+  timeSeriesChartTooltipFormatter,
+  TimeSeriesChartTooltipTrigger,
+  TimeSeriesChartTooltipValueFormatFunction,
+  TimeSeriesChartType,
+  TimeSeriesChartXAxis,
+  TimeSeriesChartYAxis,
+  TimeSeriesChartYAxisId,
+  TimeSeriesChartYAxisSettings,
+  toTimeSeriesChartDataSet,
+  updateDarkMode,
+  updateXAxisTimeWindow
+} from '@home/components/widget/lib/chart/time-series-chart.models';
+import { ResizeObserver } from '@juggle/resize-observer';
+import {
+  calculateAxisSize,
+  ECharts,
+  echartsModule,
+  EChartsOption,
+  getAxisExtent,
+  getFocusedSeriesIndex,
+  measureAxisNameSize
+} from '@home/components/widget/lib/chart/echarts-widget.models';
+import { DateFormatProcessor } from '@shared/models/widget-settings.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, PiecewiseVisualMapOption } from 'echarts/types/dist/shared';
+import { Renderer2 } from '@angular/core';
+import { BehaviorSubject } from 'rxjs';
+import { AggregationType } from '@shared/models/time/time.models';
+import { DataKeyType } from '@shared/models/telemetry/telemetry.models';
+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';
+import { ChartLabelPosition, ChartShape, toAnimationOption } from '@home/components/widget/lib/chart/chart.models';
+
+export class TbTimeSeriesChart {
+
+  public static dataKeySettings(type = TimeSeriesChartType.default): DataKeySettingsFunction {
+    return (_key, isLatestDataKey) => {
+      if (!isLatestDataKey) {
+        const settings = mergeDeep<TimeSeriesChartKeySettings>({} as TimeSeriesChartKeySettings,
+          timeSeriesChartKeyDefaultSettings);
+        if (type === TimeSeriesChartType.line) {
+          settings.type = TimeSeriesChartSeriesType.line;
+        } else if (type === TimeSeriesChartType.bar) {
+          settings.type = TimeSeriesChartSeriesType.bar;
+        } else if (type === TimeSeriesChartType.point) {
+          settings.type = TimeSeriesChartSeriesType.line;
+          settings.lineSettings.showLine = false;
+          settings.lineSettings.showPoints = true;
+          settings.lineSettings.pointShape = ChartShape.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 = ChartShape.circle;
+          settings.lineSettings.pointSize = 12;
+        }
+        return settings;
+      }
+      return null;
+    };
+  }
+
+  private get noAggregation(): boolean {
+    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: TimeSeriesChartTooltipValueFormatFunction;
+  private readonly stateValueConverter: TimeSeriesChartStateValueConverter;
+
+  private yMinSubject = new BehaviorSubject(-1);
+  private yMaxSubject = new BehaviorSubject(1);
+
+  private darkMode = false;
+
+  private darkModeObserver: MutationObserver;
+
+  private topPointLabels = false;
+
+  private componentIndexCounter = 0;
+
+  private highlightedDataKey: DataKey;
+
+  private barRenderSharedContext: BarRenderSharedContext;
+
+  private latestData: FormattedData[] = [];
+
+  yMin$ = this.yMinSubject.asObservable();
+  yMax$ = this.yMaxSubject.asObservable();
+
+  constructor(private ctx: WidgetContext,
+              private readonly inputSettings: DeepPartial<TimeSeriesChartSettings>,
+              private chartElement: HTMLElement,
+              private renderer: Renderer2,
+              private autoResize = true) {
+
+    this.settings = mergeDeep({} as TimeSeriesChartSettings,
+      timeSeriesChartDefaultSettings,
+      this.inputSettings as TimeSeriesChartSettings);
+    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();
+    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) {
+      this.shapeResize$ = new ResizeObserver(() => {
+        this.onResize();
+      });
+      this.shapeResize$.observe(this.chartElement);
+    }
+    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});
+    }
+  }
+
+  public update(): void {
+    for (const item of this.dataItems) {
+      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 ? toTimeSeriesChartDataSet(datasourceData.data, this.stateValueConverter?.valueConverter) : [];
+      }
+    }
+    this.onResize();
+    if (this.timeSeriesChart) {
+      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) {
+        this.keyEnter(this.highlightedDataKey);
+      }
+    }
+  }
+
+  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);
+          if (data.data[0]) {
+            item.value = parseThresholdData(data.data[0][1]);
+            update = true;
+          }
+        }
+      }
+    }
+    if (this.timeSeriesChart && update) {
+      this.updateSeriesData();
+    }
+  }
+
+  public keyEnter(dataKey: DataKey): void {
+    this.highlightedDataKey = dataKey;
+    const item = this.dataItems.find(d => d.dataKey === dataKey);
+    if (item) {
+      this.timeSeriesChart.dispatchAction({
+        type: 'highlight',
+        seriesId: item.id
+      });
+    }
+  }
+
+  public keyLeave(dataKey: DataKey): void {
+    this.highlightedDataKey = null;
+    const item = this.dataItems.find(d => d.dataKey === dataKey);
+    if (item) {
+      this.timeSeriesChart.dispatchAction({
+        type: 'downplay',
+        seriesId: item.id
+      });
+    }
+  }
+
+  public toggleKey(dataKey: DataKey): void {
+    const enable = dataKey.hidden;
+    const dataItem = this.dataItems.find(d => d.dataKey === dataKey);
+    if (dataItem) {
+      dataItem.enabled = enable;
+      if (!enable) {
+        this.timeSeriesChart.dispatchAction({
+          type: 'downplay',
+          seriesId: dataItem.id
+        });
+      }
+      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.stackMode ? {notMerge: true} : {replaceMerge: mergeList});
+      this.updateAxes();
+      dataKey.hidden = !enable;
+      if (enable) {
+        this.timeSeriesChart.dispatchAction({
+          type: 'highlight',
+          seriesId: dataItem.id
+        });
+      }
+    }
+  }
+
+  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();
+    }
+    if (this.timeSeriesChart) {
+      this.timeSeriesChart.dispose();
+    }
+    this.yMinSubject.complete();
+    this.yMaxSubject.complete();
+    this.darkModeObserver?.disconnect();
+  }
+
+  public resize(): void {
+    this.onResize();
+  }
+
+  public setDarkMode(darkMode: boolean): void {
+    if (this.darkMode !== darkMode) {
+      this.darkMode = darkMode;
+      if (this.timeSeriesChart) {
+        this.timeSeriesChartOptions = updateDarkMode(this.timeSeriesChartOptions,
+          this.xAxisList, this.yAxisList, this.dataItems, darkMode);
+        this.timeSeriesChart.setOption(this.timeSeriesChartOptions);
+      }
+    }
+  }
+
+  public isDarkMode(): boolean {
+    return this.darkMode;
+  }
+
+  private setupData(): void {
+    const noAggregationBarWidthSettings = this.settings.noAggregationBarWidthSettings;
+    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,
+      noAggregationWidth: targetBarWidth.relative ? targetBarWidth.relativeWidth : targetBarWidth.absoluteWidth
+    };
+    if (this.ctx.datasources.length) {
+      for (const datasource of this.ctx.datasources) {
+        const dataKeys = datasource.dataKeys;
+        for (const dataKey of dataKeys) {
+          const keySettings = mergeDeep<TimeSeriesChartKeySettings>({} as TimeSeriesChartKeySettings,
+            timeSeriesChartKeyDefaultSettings, dataKey.settings);
+          if ((keySettings.type === TimeSeriesChartSeriesType.line && keySettings.lineSettings.showPointLabel &&
+              keySettings.lineSettings.pointLabelPosition === ChartLabelPosition.top) ||
+            (keySettings.type === TimeSeriesChartSeriesType.bar &&
+              keySettings.barSettings.showLabel &&
+              [ChartLabelPosition.top, ChartLabelPosition.bottom]
+              .includes(keySettings.barSettings.labelPosition as ChartLabelPosition))) {
+            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 data = datasourceData?.data ?
+            toTimeSeriesChartDataSet(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);
+          let yAxisId = keySettings.yAxisId;
+          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,
+            enabled: !keySettings.dataHiddenByDefault,
+            tooltipValueFormatFunction: createTooltipValueFormatFunction(keySettings.tooltipValueFormatter)
+          });
+        }
+      }
+    }
+  }
+
+  private setupThresholds(): void {
+    const thresholdDatasources: Datasource[] = [];
+    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;
+      if (threshold.type === TimeSeriesChartThresholdType.latestKey) {
+        if (this.ctx.datasources.length) {
+          for (const datasource of this.ctx.datasources) {
+            latestDataKey = datasource.latestDataKeys?.find(d =>
+              (d.type === DataKeyType.function && d.label === threshold.latestKey) ||
+              (d.type !== DataKeyType.function && d.name === threshold.latestKey &&
+               d.type === threshold.latestKeyType));
+            if (latestDataKey) {
+              break;
+            }
+          }
+        }
+        if (!latestDataKey) {
+          continue;
+        }
+      } else if (threshold.type === TimeSeriesChartThresholdType.entity) {
+        const entityAliasId = this.ctx.aliasController.getEntityAliasId(threshold.entityAlias);
+        if (!entityAliasId) {
+          continue;
+        }
+        let datasource = thresholdDatasources.find(d => d.entityAliasId === entityAliasId);
+        entityDataKey = {
+          type: threshold.entityKeyType,
+          name: threshold.entityKey,
+          label: threshold.entityKey,
+          settings: {}
+        };
+        if (datasource) {
+          datasource.dataKeys.push(entityDataKey);
+        }
+        datasource = {
+          type: DatasourceType.entity,
+          name: threshold.entityAlias,
+          aliasName: threshold.entityAlias,
+          entityAliasId,
+          dataKeys: [ entityDataKey ]
+        };
+        thresholdDatasources.push(datasource);
+      } else { // constant
+        value = threshold.value;
+      }
+      const units = threshold.units && threshold.units.length ? threshold.units : this.ctx.units;
+      const decimals = isDefinedAndNotNull(threshold.decimals) ? threshold.decimals :
+        (isDefinedAndNotNull(this.ctx.decimals) ? this.ctx.decimals : 2);
+      let yAxisId = threshold.yAxisId;
+      if (!Object.keys(this.settings.yAxes).includes(yAxisId)) {
+        yAxisId = 'default';
+      }
+      const thresholdItem: TimeSeriesChartThresholdItem = {
+        id: this.nextComponentId(),
+        units,
+        decimals,
+        yAxisId,
+        yAxisIndex: this.getYAxisIndex(yAxisId),
+        value,
+        latestDataKey,
+        settings: threshold
+      };
+      if (entityDataKey) {
+        entityDataKey.settings.thresholdItemId = thresholdItem.id;
+      }
+      this.thresholdItems.push(thresholdItem);
+    }
+    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);
+    for (const yAxisSettings of yAxisSettingsList) {
+      const axisSettings = mergeDeep<TimeSeriesChartYAxisSettings>({} as TimeSeriesChartYAxisSettings,
+        defaultTimeSeriesChartYAxisSettings, yAxisSettings);
+      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);
+      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++) + '';
+  }
+
+  private getYAxisIndex(id: TimeSeriesChartYAxisId): number {
+    let yAxisIndex = this.yAxisList.findIndex(axis => axis.id === id);
+    if (yAxisIndex === -1) {
+      yAxisIndex = this.yAxisList.findIndex(axis => axis.id === 'default');
+      if (yAxisIndex === -1 && this.yAxisList.length) {
+        yAxisIndex = 0;
+      }
+    }
+    return yAxisIndex;
+  }
+
+  private subscribeForEntityThresholds(datasources: Datasource[]) {
+    if (datasources.length) {
+      const thresholdsSourcesSubscriptionOptions: WidgetSubscriptionOptions = {
+        datasources,
+        useDashboardTimewindow: false,
+        type: widgetType.latest,
+        callbacks: {
+          onDataUpdated: (subscription) => {
+            let update = false;
+            if (subscription.data) {
+              for (const item of this.thresholdItems) {
+                if (item.settings.type === TimeSeriesChartThresholdType.entity) {
+                  const data = subscription.data.find(d => d.dataKey.settings?.thresholdItemId === item.id);
+                  if (data.data[0]) {
+                    item.value = parseThresholdData(data.data[0][1]);
+                    update = true;
+                  }
+                }
+              }
+            }
+            if (this.timeSeriesChart && update) {
+              this.updateSeriesData();
+            }
+          }
+        }
+      };
+      this.ctx.subscriptionApi.createSubscription(thresholdsSourcesSubscriptionOptions, true).subscribe();
+    }
+  }
+
+  private drawChart() {
+    echartsModule.init();
+    this.renderer.setStyle(this.chartElement, 'letterSpacing', 'normal');
+    this.timeSeriesChart = echarts.init(this.chartElement,  null, {
+      renderer: 'canvas'
+    });
+    this.timeSeriesChartOptions = {
+      darkMode: this.darkMode,
+      backgroundColor: 'transparent',
+      tooltip: [{
+        trigger: this.settings.tooltipTrigger === TimeSeriesChartTooltipTrigger.axis ? 'axis' : 'item',
+        confine: true,
+        appendTo: 'body',
+        axisPointer: {
+          type: this.noAggregation ? 'line' : 'shadow'
+        },
+        formatter: (params: CallbackDataParams[]) =>
+          this.settings.showTooltip ? timeSeriesChartTooltipFormatter(this.renderer, this.tooltipDateFormat,
+            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: this.xAxisList.map(axis => axis.option),
+      yAxis: this.yAxisList.map(axis => axis.option),
+      dataZoom: [
+        {
+          type: 'inside',
+          disabled: !this.settings.dataZoom,
+          realtime: true,
+          filterMode: this.stateData ? 'none' : 'weakFilter'
+        },
+        {
+          type: 'slider',
+          show: this.settings.dataZoom,
+          showDetail: false,
+          realtime: true,
+          filterMode: this.stateData ? 'none' : 'weakFilter',
+          bottom: 10
+        }
+      ],
+      ...toAnimationOption(this.ctx, this.settings.animation)
+    };
+    if (this.hasVisualMap) {
+      this.timeSeriesChartOptions.visualMap =
+        createTimeSeriesVisualMapOption(this.settings.visualMapSettings, this.visualMapSelectedRanges);
+    }
+
+    this.timeSeriesChartOptions.xAxis[0].tbTimeWindow = this.ctx.defaultSubscription.timeWindow;
+
+    this.updateSeries();
+    if (this.updateYAxisScale(this.yAxisList)) {
+      this.timeSeriesChartOptions.yAxis = this.yAxisList.map(axis => axis.option);
+    }
+
+    this.timeSeriesChart.setOption(this.timeSeriesChartOptions);
+    this.updateAxes(false);
+
+    if (this.settings.dataZoom) {
+      this.timeSeriesChart.on('datazoom', () => {
+        this.updateAxes();
+      });
+    }
+  }
+
+  private updateSeriesData(updateScale = false): void {
+    this.updateSeries();
+    if (updateScale && this.updateYAxisScale(this.yAxisList)) {
+      this.timeSeriesChartOptions.yAxis = this.yAxisList.map(axis => axis.option);
+    }
+    this.timeSeriesChart.setOption(this.timeSeriesChartOptions);
+    this.updateAxes();
+  }
+
+  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(lazy = true) {
+    const leftAxisList = this.yAxisList.filter(axis => axis.option.position === 'left');
+    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.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();
+
+    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]);
+    rightOffset = Math.max(rightOffset, thresholdsOffset[1]);
+
+    if (this.timeSeriesChartOptions.grid[0].left !== leftOffset ||
+      this.timeSeriesChartOptions.grid[0].right !== rightOffset  ||
+      this.timeSeriesChartOptions.grid[0].bottom !== bottomOffset ||
+      this.timeSeriesChartOptions.grid[0].top !== topOffset) {
+      this.timeSeriesChartOptions.grid[0].left = leftOffset;
+      this.timeSeriesChartOptions.grid[0].right = rightOffset;
+      this.timeSeriesChartOptions.grid[0].bottom = bottomOffset;
+      this.timeSeriesChartOptions.grid[0].top = topOffset;
+      changed = true;
+    }
+    if (changed) {
+      this.timeSeriesChartOptions.yAxis = this.yAxisList.map(axis => axis.option);
+      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);
+      const min = extent[0];
+      const max = extent[1];
+      if (this.yMinSubject.value !== min) {
+        this.yMinSubject.next(min);
+      }
+      if (this.yMaxSubject.value !== max) {
+        this.yMaxSubject.next(max);
+      }
+    }
+  }
+
+  private updateAxisOffset(axisList: TimeSeriesChartAxis[]): {offset: number; changed: boolean} {
+    const result = {offset: 0, changed: false};
+    let size = 0;
+    for (const axis of axisList) {
+      const newSize = calculateAxisSize(this.timeSeriesChart, axis.option.mainType, axis.id);
+      if (size && newSize) {
+        result.offset += 5;
+      }
+      size = newSize;
+      const showLine = !!size && axis.settings.showLine;
+      if (axis.option.axisLine.show !== showLine) {
+        axis.option.axisLine.show = showLine;
+        result.changed = true;
+      }
+      if (axis.option.offset !== result.offset) {
+        axis.option.offset = result.offset;
+        result.changed = true;
+      }
+      if (axis.settings.label) {
+        if (!size) {
+          if (axis.option.name) {
+            axis.option.name = null;
+            result.changed = true;
+          }
+        } else {
+          if (!axis.option.name) {
+            axis.option.name = axis.settings.label;
+            result.changed = true;
+          }
+          const nameGap = size;
+          if (axis.option.nameGap !== nameGap) {
+            axis.option.nameGap = nameGap;
+            result.changed = true;
+          }
+          const nameSize = measureAxisNameSize(this.timeSeriesChart, axis.option.mainType, axis.id, axis.settings.label);
+          result.offset += nameSize;
+        }
+      }
+      result.offset += size;
+    }
+    return result;
+  }
+
+  private updateYAxisScale(axisList: TimeSeriesChartYAxis[]): boolean {
+    let changed = false;
+    for (const yAxis of axisList) {
+      const scaleYAxis = this.scaleYAxis(yAxis);
+      if (yAxis.option.scale !== scaleYAxis) {
+        yAxis.option.scale = scaleYAxis;
+        changed = true;
+      }
+    }
+    return changed;
+  }
+
+  private scaleYAxis(yAxis: TimeSeriesChartYAxis): boolean {
+    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) ? 25 :
+      (showTickLabels ? 10 : 5);
+  }
+
+  private minBottomOffset(): number {
+    return this.settings.dataZoom ? 45 : 5;
+  }
+
+  private onResize() {
+    const shapeWidth = this.chartElement.offsetWidth;
+    const shapeHeight = this.chartElement.offsetHeight;
+    if (shapeWidth && shapeHeight) {
+      if (!this.timeSeriesChart) {
+        this.drawChart();
+      } else {
+        const width = this.timeSeriesChart.getWidth();
+        const height = this.timeSeriesChart.getHeight();
+        if (width !== shapeWidth || height !== shapeHeight) {
+          let barItems: TimeSeriesChartDataItem[];
+          if (this.animationEnabled()) {
+            barItems =
+              this.dataItems.filter(d => d.enabled && d.data.length &&
+                d.dataKey.settings.type === TimeSeriesChartSeriesType.bar);
+            this.updateBarsAnimation(barItems, false);
+          }
+          this.timeSeriesChart.resize();
+          if (this.animationEnabled()) {
+            this.updateBarsAnimation(barItems, true);
+          }
+        }
+      }
+    }
+  }
+
+  private animationEnabled(): boolean {
+    return this.settings.animation.animation;
+  }
+
+  private updateBarsAnimation(barItems: TimeSeriesChartDataItem[], animation: boolean) {
+    if (barItems.length) {
+      barItems.forEach(item => {
+        item.option.animation = animation;
+      });
+      this.timeSeriesChart.setOption(this.timeSeriesChartOptions);
+    }
+  }
+}
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/flot-widget.ts b/ui-ngx/src/app/modules/home/components/widget/lib/flot-widget.ts
index 846c6b8331..2c46864388 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/flot-widget.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/flot-widget.ts
@@ -206,8 +206,8 @@ export class TbFlot {
 
       if (this.settings.yaxis) {
         this.yaxis.font.color = this.settings.yaxis.color || this.yaxis.font.color;
-        this.yaxis.min = isDefined(this.settings.yaxis.min) ? this.settings.yaxis.min : null;
-        this.yaxis.max = isDefined(this.settings.yaxis.max) ? this.settings.yaxis.max : null;
+        this.yaxis.min = isNumber(this.settings.yaxis.min) ? this.settings.yaxis.min : null;
+        this.yaxis.max = isNumber(this.settings.yaxis.max) ? this.settings.yaxis.max : null;
         this.yaxis.label = this.utils.customTranslation(this.settings.yaxis.title, this.settings.yaxis.title) || null;
         this.yaxis.labelFont.color = this.yaxis.font.color;
         this.yaxis.labelFont.size = this.yaxis.font.size + 2;
@@ -895,8 +895,8 @@ export class TbFlot {
       tickSize = yaxis.tickSize;
     }
     const position = keySettings.axisPosition && keySettings.axisPosition.length ? keySettings.axisPosition : 'left';
-    const min = isDefined(keySettings.axisMin) ? keySettings.axisMin : yaxis.min;
-    const max = isDefined(keySettings.axisMax) ? keySettings.axisMax : yaxis.max;
+    const min = isNumber(keySettings.axisMin) ? keySettings.axisMin : yaxis.min;
+    const max = isNumber(keySettings.axisMax) ? keySettings.axisMax : yaxis.max;
     yaxis.label = label;
     yaxis.min = min;
     yaxis.max = max;
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/gateway/gateway-connectors.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-connectors.component.scss
index 2245de8b12..87fe898568 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-connectors.component.scss
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-connectors.component.scss
@@ -104,8 +104,3 @@
     background-color: rgb(25, 128, 56);
   }
 }
-
-:host ::ng-deep tb-json-object-edit > div {
-  flex-grow: 1;
-}
-
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-connectors.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-connectors.component.ts
index e3019ad8f2..859300561a 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-connectors.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-connectors.component.ts
@@ -40,6 +40,7 @@ import { DatasourceType, widgetType } from '@shared/models/widget.models';
 import { UtilsService } from '@core/services/utils.service';
 import { EntityType } from '@shared/models/entity-type.models';
 import {
+  ConnectorType,
   GatewayConnector,
   GatewayConnectorDefaultTypesTranslates,
   GatewayLogLevel
@@ -213,10 +214,10 @@ export class GatewayConnectorComponent extends PageComponent implements AfterVie
   saveConnector(): void {
     const value = this.connectorForm.value;
     value.configuration = camelCase(value.name) + '.json';
-    if (value.type !== 'grpc') {
+    if (value.type !== ConnectorType.GRPC) {
       delete value.key;
     }
-    if (value.type !== 'custom') {
+    if (value.type !== ConnectorType.CUSTOM) {
       delete value.class;
     }
     value.ts = new Date().getTime();
@@ -328,7 +329,7 @@ export class GatewayConnectorComponent extends PageComponent implements AfterVie
     this.initialConnector = null;
     this.connectorForm.setValue({
       name: '',
-      type: 'mqtt',
+      type: ConnectorType.MQTT,
       logLevel: GatewayLogLevel.INFO,
       key: 'auto',
       class: '',
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-service-rpc-connector-template-dialog.html b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-service-rpc-connector-template-dialog.html
new file mode 100644
index 0000000000..d8b028361d
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-service-rpc-connector-template-dialog.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.
+
+-->
+<mat-toolbar color="primary">
+  <h2 translate>gateway.rpc.save-template</h2>
+  <span fxFlex></span>
+  <button mat-icon-button
+          (click)="close()"
+          type="button">
+    <mat-icon class="material-icons">close</mat-icon>
+  </button>
+</mat-toolbar>
+<div mat-dialog-content style="width: 600px" class="mat-content" fxLayout="column">
+  <mat-form-field class="mat-block tb-value-type" style="flex-grow: 0">
+    <mat-label translate>gateway.rpc.template-name</mat-label>
+    <input matInput [formControl]="templateNameCtrl" required/>
+    <mat-error
+      *ngIf="templateNameCtrl.hasError('required')">
+      {{ 'gateway.rpc.template-name-required' | translate }}
+    </mat-error>
+  </mat-form-field>
+  <div class="mat-mdc-form-field-error"
+       style="margin-top: -15px; padding-left: 10px; font-size: 14px;"
+       *ngIf="validateDuplicateName(templateNameCtrl)">
+    {{ 'gateway.rpc.template-name-duplicate' | translate }}
+  </div>
+</div>
+<div mat-dialog-actions fxLayoutAlign="end center">
+  <button mat-button
+          type="button"
+          (click)="close()">
+    {{ 'action.cancel' | translate }}
+  </button>
+  <button mat-raised-button  color="primary"
+          type="button"
+          [disabled]="!templateNameCtrl.valid"
+          (click)="save()">
+    {{ 'action.save' | translate }}
+  </button>
+</div>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-service-rpc-connector-template-dialog.ts b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-service-rpc-connector-template-dialog.ts
new file mode 100644
index 0000000000..5c70e1f233
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-service-rpc-connector-template-dialog.ts
@@ -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.
+///
+
+import { Component, Inject } from '@angular/core';
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
+import { Store } from '@ngrx/store';
+import { AppState } from '@core/core.state';
+import { DialogComponent } from '@shared/components/dialog.component';
+import { Router } from '@angular/router';
+import { FormBuilder, FormControl, UntypedFormControl, Validators } from '@angular/forms';
+import { RPCTemplate, SaveRPCTemplateData } from '@home/components/widget/lib/gateway/gateway-widget.models';
+
+@Component({
+  selector: 'gateway-service-rpc-connector-template-dialog',
+  templateUrl: './gateway-service-rpc-connector-template-dialog.html'
+})
+
+export class GatewayServiceRPCConnectorTemplateDialogComponent extends DialogComponent<GatewayServiceRPCConnectorTemplateDialogComponent, boolean> {
+
+  config: {
+    [key: string]: any;
+  };
+  templates: Array<RPCTemplate>;
+  templateNameCtrl: FormControl;
+
+  constructor(protected store: Store<AppState>,
+              protected router: Router,
+              @Inject(MAT_DIALOG_DATA) public data: SaveRPCTemplateData,
+              public dialogRef: MatDialogRef<GatewayServiceRPCConnectorTemplateDialogComponent, boolean>,
+              public fb: FormBuilder) {
+    super(store, router, dialogRef);
+    this.config = this.data.config;
+    this.templates = this.data.templates;
+    this.templateNameCtrl = this.fb.control('', [Validators.required]);
+  }
+
+  validateDuplicateName(c: UntypedFormControl) {
+    const name = c.value.trim();
+    return !!this.templates.find((template) => template.name === name);
+  };
+
+  close(): void {
+    this.dialogRef.close();
+  }
+
+  save(): void {
+    this.templateNameCtrl.setValue(this.templateNameCtrl.value.trim());
+    if (this.templateNameCtrl.valid) this.dialogRef.close(this.templateNameCtrl.value);
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-service-rpc-connector-templates.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-service-rpc-connector-templates.component.html
new file mode 100644
index 0000000000..c0f6997a36
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-service-rpc-connector-templates.component.html
@@ -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.
+
+-->
+<div class="mat-subtitle-1 title">{{ 'gateway.rpc.templates-title' | translate }}</div>
+<mat-expansion-panel hideToggle *ngFor="let template of rpcTemplates">
+  <mat-expansion-panel-header>
+    <mat-panel-title>
+      {{template.name}}
+    </mat-panel-title>
+    <mat-panel-description>
+      <button mat-icon-button matTooltip="Delete" (click)="deleteTemplate($event, template)">
+        <mat-icon class="material-icons">delete</mat-icon>
+      </button>
+      <button mat-icon-button matTooltip="Use" (click)="applyTemplate($event, template)">
+        <mat-icon class="material-icons">play_arrow</mat-icon>
+      </button>
+    </mat-panel-description>
+  </mat-expansion-panel-header>
+
+  <ng-container
+    *ngFor="let config of template.config | keyvalue : originalOrder"
+    [ngTemplateOutlet]="RPCTemplateRef"
+    [ngTemplateOutletContext]="{ $implicit: config, innerValue: false }">
+  </ng-container>
+  <ng-template #RPCTemplateRef let-config let-innerValue='innerValue'>
+    <div [fxLayout]="isObject(config.value) ? 'column': 'row'"
+         [fxLayoutAlign]="!isObject(config.value) ? 'space-between center' : ''"
+         [ngStyle]="{'padding-left': innerValue ? '16px': '0'}"
+         class="rpc-params-row">
+      <div class="template-key">
+        {{!innerValue ? ('gateway.rpc.' + config.key | translate) : config.key}}
+      </div>
+      <div *ngIf="!isObject(config.value) else RPCObjectRow"
+           [ngClass]="{'boolean-true': config.value === true,
+                   'boolean-false': config.value === false  }">
+        {{config.value}}</div>
+      <ng-template #RPCObjectRow>
+        <ng-container
+          *ngFor="let subConfig of config.value | keyvalue : originalOrder"
+          [ngTemplateOutlet]="RPCTemplateRef"
+          [ngTemplateOutletContext]="{ $implicit: subConfig, innerValue: true }">
+        </ng-container>
+      </ng-template>
+    </div>
+  </ng-template>
+</mat-expansion-panel>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-service-rpc-connector-templates.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-service-rpc-connector-templates.component.scss
new file mode 100644
index 0000000000..7e5c4af1f1
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-service-rpc-connector-templates.component.scss
@@ -0,0 +1,94 @@
+/**
+ * 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.
+ */
+:host {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  padding: 0;
+
+  .title {
+    font-weight: 500;
+  }
+
+  .template-key {
+    color: rgba(0, 0, 0, 0.38);
+    height: 32px;
+    line-height: 32px;
+  }
+
+  .boolean-true, .boolean-false {
+    border-radius: 3px;
+    height: 32px;
+    line-height: 32px;
+    padding: 0 12px;
+    width: fit-content;
+    font-size: 14px;
+    text-transform: capitalize;
+  }
+
+  .boolean-false {
+    color: #d12730;
+    background-color: rgba(209, 39, 48, 0.08);
+  }
+
+  .boolean-true {
+    color: #198038;
+    background-color: rgba(25, 128, 56, 0.08);
+  }
+
+  mat-expansion-panel {
+    margin-top: 10px;
+    overflow: visible;
+  }
+
+  .mat-expansion-panel-header-description {
+    flex-direction: row-reverse;
+    align-items: center;
+    margin-right: 0;
+
+    & > mat-icon {
+      margin-left: 15px;
+      color: rgba(0, 0, 0, 0.38);
+    }
+  }
+
+  .mat-expansion-panel-header {
+    padding: 0 0 0 12px;
+
+    &.mat-expansion-panel-header.mat-expanded {
+      height: 48px;
+    }
+
+    .mat-content.mat-content-hide-toggle {
+      margin-right: 0;
+    }
+  }
+
+  .rpc-params-row {
+    overflow: hidden;
+    white-space: nowrap;
+
+    & :not(:first-child) {
+      white-space: pre;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+  }
+
+}
+
+
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-service-rpc-connector-templates.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-service-rpc-connector-templates.component.ts
new file mode 100644
index 0000000000..4392b35f2d
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-service-rpc-connector-templates.component.ts
@@ -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.
+///
+
+import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import {
+  ConnectorType,
+  RPCTemplate
+} from '@home/components/widget/lib/gateway/gateway-widget.models';
+import { EntityType } from '@shared/models/entity-type.models';
+import { AttributeScope } from '@shared/models/telemetry/telemetry.models';
+import { AttributeService } from '@core/http/attribute.service';
+import { WidgetContext } from '@home/models/widget-component.models';
+import { isLiteralObject } from '@app/core/utils';
+
+@Component({
+  selector: 'tb-gateway-service-rpc-connector-templates',
+  templateUrl: './gateway-service-rpc-connector-templates.component.html',
+  styleUrls: ['./gateway-service-rpc-connector-templates.component.scss']
+})
+export class GatewayServiceRPCConnectorTemplatesComponent implements OnInit {
+
+  @Input()
+  connectorType: ConnectorType;
+
+  @Input()
+  ctx: WidgetContext;
+
+  @Output()
+  saveTemplate: EventEmitter<any> = new EventEmitter();
+
+  @Output()
+  useTemplate: EventEmitter<any> = new EventEmitter();
+
+  @Input()
+  rpcTemplates: Array<RPCTemplate>;
+
+  public readonly originalOrder = (): number => 0;
+  public readonly isObject = (value: any) => isLiteralObject(value);
+
+  constructor(private attributeService: AttributeService) {
+  }
+
+  ngOnInit() {
+  }
+
+  public applyTemplate($event: Event, template: RPCTemplate): void {
+    $event.stopPropagation();
+    this.useTemplate.emit(template);
+  }
+
+  public deleteTemplate($event: Event, template: RPCTemplate): void {
+    $event.stopPropagation();
+    const index = this.rpcTemplates.findIndex(data => {
+      return data.name == template.name;
+    })
+    this.rpcTemplates.splice(index, 1);
+    const key = `${this.connectorType}_template`;
+    this.attributeService.saveEntityAttributes(
+      {
+        id: this.ctx.defaultSubscription.targetDeviceId,
+        entityType: EntityType.DEVICE
+      }
+      , AttributeScope.SERVER_SCOPE, [{
+        key,
+        value: this.rpcTemplates
+      }]).subscribe(() => {
+    })
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-service-rpc-connector.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-service-rpc-connector.component.html
new file mode 100644
index 0000000000..2d992187f6
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-service-rpc-connector.component.html
@@ -0,0 +1,542 @@
+<!--
+
+    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 fxLayout="column" class="command-form" [formGroup]="commandForm">
+  <div
+    class="mat-subtitle-1 title">{{ 'gateway.rpc.title' | translate: {type: gatewayConnectorDefaultTypesTranslates.get(connectorType)} }}</div>
+  <ng-template [ngIf]="connectorType">
+    <ng-container [ngSwitch]="connectorType">
+      <ng-template [ngSwitchCase]="ConnectorType.MQTT">
+        <mat-form-field>
+          <mat-label>{{ 'gateway.rpc.methodFilter' | translate }}</mat-label>
+          <input matInput formControlName="methodFilter"
+                 placeholder="echo"/>
+        </mat-form-field>
+        <mat-form-field>
+          <mat-label>{{ 'gateway.rpc.requestTopicExpression' | translate }}</mat-label>
+          <input matInput formControlName="requestTopicExpression"
+                 placeholder="sensor/${deviceName}/request/${methodName}/${requestId}"/>
+        </mat-form-field>
+        <mat-slide-toggle class="margin" (click)="$event.stopPropagation()" [formControl]="isMQTTWithResponse">
+          {{ 'gateway.rpc.withResponse' | translate }}
+        </mat-slide-toggle>
+        <mat-form-field *ngIf="isMQTTWithResponse.value">
+          <mat-label>{{ 'gateway.rpc.responseTopicExpression' | translate }}</mat-label>
+          <input matInput formControlName="responseTopicExpression"
+                 placeholder="sensor/${deviceName}/response/${methodName}/${requestId}"/>
+        </mat-form-field>
+        <mat-form-field *ngIf="isMQTTWithResponse.value">
+          <mat-label>{{ 'gateway.rpc.responseTimeout' | translate }}</mat-label>
+          <input matInput formControlName="responseTimeout" type="number"
+                 placeholder="10000" min="10" step="1"/>
+        </mat-form-field>
+        <mat-form-field>
+          <mat-label>{{ 'gateway.rpc.valueExpression' | translate }}</mat-label>
+          <input matInput formControlName="valueExpression"
+                 placeholder="${params}"/>
+        </mat-form-field>
+      </ng-template>
+      <ng-template [ngSwitchCase]="ConnectorType.MODBUS">
+        <mat-form-field>
+          <mat-label>{{ 'gateway.rpc.tag' | translate }}</mat-label>
+          <input matInput formControlName="tag" placeholder="setValue"/>
+        </mat-form-field>
+        <div fxFlex fxLayout="row" fxLayoutGap="10px">
+          <mat-form-field fxFlex="50" class="mat-block">
+            <mat-label>{{ 'gateway.rpc.type' | translate }}</mat-label>
+            <mat-select formControlName="type">
+              <mat-option *ngFor="let type of modbusCommandTypes" [value]="type">
+                {{ type }}
+              </mat-option>
+            </mat-select>
+          </mat-form-field>
+          <mat-form-field fxFlex="50" class="mat-block">
+            <mat-label>{{ 'gateway.rpc.functionCode' | translate }}</mat-label>
+            <mat-select formControlName="functionCode">
+              <mat-option *ngFor="let code of codesArray" [value]="code">
+                {{ modbusCodesTranslate.get(code) | translate}}
+              </mat-option>
+            </mat-select>
+          </mat-form-field>
+        </div>
+        <mat-form-field *ngIf="commandForm.get('functionCode').value>4">
+          <mat-label>{{ 'gateway.rpc.value' | translate }}</mat-label>
+          <input matInput formControlName="value" placeholder="value"/>
+        </mat-form-field>
+        <div fxFlex fxLayout="row" fxLayoutGap="10px">
+          <mat-form-field fxFlex="50">
+            <mat-label>{{ 'gateway.rpc.address' | translate }}</mat-label>
+            <input matInput formControlName="address" type="number" min="0"
+                   placeholder="1" step="1"/>
+          </mat-form-field>
+          <mat-form-field fxFlex="50">
+            <mat-label>{{ 'gateway.rpc.objectsCount' | translate }}</mat-label>
+            <input matInput formControlName="objectsCount" type="number" min="0"
+                   placeholder="31" step="1"/>
+          </mat-form-field>
+        </div>
+      </ng-template>
+      <ng-template [ngSwitchCase]="ConnectorType.BACNET">
+        <mat-form-field>
+          <mat-label>{{ 'gateway.rpc.methodRPC' | translate }}</mat-label>
+          <input matInput formControlName="method" placeholder="set_state"/>
+        </mat-form-field>
+        <mat-form-field class="mat-block">
+          <mat-label>{{ 'gateway.rpc.requestType' | translate }}</mat-label>
+          <mat-select formControlName="requestType">
+            <mat-option *ngFor="let type of bACnetRequestTypes" [value]="type">
+              {{bACnetRequestTypesTranslates.get(type) | translate}}
+            </mat-option>
+          </mat-select>
+        </mat-form-field>
+        <mat-form-field>
+          <mat-label>{{ 'gateway.rpc.requestTimeout' | translate }}</mat-label>
+          <input matInput formControlName="requestTimeout" type="number"
+                 min="10" step="1" placeholder="1000"/>
+        </mat-form-field>
+        <div fxFlex fxLayout="row" fxLayoutGap="10px">
+          <mat-form-field fxFlex="50" class="mat-block">
+            <mat-label>{{ 'gateway.rpc.objectType' | translate }}</mat-label>
+            <mat-select formControlName="objectType">
+              <mat-option *ngFor="let type of bACnetObjectTypes" [value]="type">
+                {{bACnetObjectTypesTranslates.get(type) | translate}}
+              </mat-option>
+            </mat-select>
+          </mat-form-field>
+          <mat-form-field fxFlex="50">
+            <mat-label>{{ 'gateway.rpc.identifier' | translate }}</mat-label>
+            <input matInput formControlName="identifier" type="number"
+                   min="1" step="1" placeholder="1"/>
+          </mat-form-field>
+        </div>
+        <mat-form-field class="mat-block">
+          <mat-label>{{ 'gateway.rpc.propertyId' | translate }}</mat-label>
+          <input matInput formControlName="propertyId" placeholder="presentValue"/>
+        </mat-form-field>
+      </ng-template>
+      <ng-template [ngSwitchCase]="ConnectorType.BLE">
+        <mat-form-field>
+          <mat-label>{{ 'gateway.rpc.methodRPC' | translate }}</mat-label>
+          <input matInput formControlName="methodRPC" placeholder="rpcMethod1"/>
+        </mat-form-field>
+        <mat-form-field>
+          <mat-label>{{ 'gateway.rpc.characteristicUUID' | translate }}</mat-label>
+          <input matInput formControlName="characteristicUUID" placeholder="00002A00-0000-1000-8000-00805F9B34FB"/>
+        </mat-form-field>
+        <mat-form-field class="mat-block">
+          <mat-label>{{ 'gateway.rpc.methodProcessing' | translate }}</mat-label>
+          <mat-select formControlName="methodProcessing">
+            <mat-option *ngFor="let type of bLEMethods" [value]="type">
+              {{bLEMethodsTranslates.get(type) | translate}}
+            </mat-option>
+          </mat-select>
+        </mat-form-field>
+        <mat-slide-toggle class="mat-slide" formControlName="withResponse">
+          {{ 'gateway.rpc.withResponse' | translate }}
+        </mat-slide-toggle>
+      </ng-template>
+      <ng-template [ngSwitchCase]="ConnectorType.CAN">
+        <mat-form-field>
+          <mat-label>{{ 'gateway.rpc.methodRPC' | translate }}</mat-label>
+          <input matInput formControlName="method" placeholder="sendSameData"/>
+        </mat-form-field>
+        <mat-form-field>
+          <mat-label>{{ 'gateway.rpc.nodeID' | translate }}</mat-label>
+          <input matInput formControlName="nodeID" type="number" placeholder="4" min="0" step="1"/>
+        </mat-form-field>
+        <mat-slide-toggle class="mat-slide margin" formControlName="isExtendedID">
+          {{ 'gateway.rpc.isExtendedID' | translate }}
+        </mat-slide-toggle>
+        <mat-slide-toggle class="mat-slide margin" formControlName="isFD">
+          {{ 'gateway.rpc.isFD' | translate }}
+        </mat-slide-toggle>
+        <mat-slide-toggle class="mat-slide margin" formControlName="bitrateSwitch">
+          {{ 'gateway.rpc.bitrateSwitch' | translate }}
+        </mat-slide-toggle>
+        <div fxFlex fxLayout="row" fxLayoutGap="10px">
+          <mat-form-field fxFlex="50">
+            <mat-label>{{ 'gateway.rpc.dataLength' | translate }}</mat-label>
+            <input matInput formControlName="dataLength" type="number" placeholder="2" min="1" step="1"/>
+          </mat-form-field>
+          <mat-form-field class="mat-block" fxFlex="50">
+            <mat-label>{{ 'gateway.rpc.dataByteorder' | translate }}</mat-label>
+            <mat-select formControlName="dataByteorder">
+              <mat-option *ngFor="let order of cANByteOrders" [value]="order">
+                {{ order | translate }}
+              </mat-option>
+            </mat-select>
+          </mat-form-field>
+        </div>
+        <div fxFlex fxLayout="row" fxLayoutGap="10px">
+          <mat-form-field fxFlex="50">
+            <mat-label>{{ 'gateway.rpc.dataBefore' | translate }}</mat-label>
+            <input matInput formControlName="dataBefore" placeholder="00AA"/>
+          </mat-form-field>
+          <mat-form-field fxFlex="50">
+            <mat-label>{{ 'gateway.rpc.dataAfter' | translate }}</mat-label>
+            <input matInput formControlName="dataAfter" placeholder="0102"/>
+          </mat-form-field>
+        </div>
+        <mat-form-field>
+          <mat-label>{{ 'gateway.rpc.dataInHEX' | translate }}</mat-label>
+          <input matInput formControlName="dataInHEX"
+                 placeholder="aa bb cc dd ee ff   aa bb aa bb cc d ee ff"/>
+        </mat-form-field>
+        <mat-form-field>
+          <mat-label>{{ 'gateway.rpc.dataExpression' | translate }}</mat-label>
+          <input matInput formControlName="dataExpression"
+                 placeholder="userSpeed if maxAllowedSpeed > userSpeed else maxAllowedSpeed"/>
+        </mat-form-field>
+      </ng-template>
+      <ng-template [ngSwitchCase]="ConnectorType.FTP">
+        <mat-form-field>
+          <mat-label>{{ 'gateway.rpc.methodFilter' | translate }}</mat-label>
+          <input matInput formControlName="methodFilter" placeholder="read"/>
+        </mat-form-field>
+        <mat-form-field>
+          <mat-label>{{ 'gateway.rpc.valueExpression' | translate }}</mat-label>
+          <input matInput formControlName="valueExpression" placeholder="${params}"/>
+        </mat-form-field>
+      </ng-template>
+      <ng-template [ngSwitchCase]="ConnectorType.OCPP">
+        <mat-form-field>
+          <mat-label>{{ 'gateway.rpc.methodRPC' | translate }}</mat-label>
+          <input matInput formControlName="methodRPC" placeholder="rpc1"/>
+        </mat-form-field>
+        <mat-form-field>
+          <mat-label>{{ 'gateway.rpc.valueExpression' | translate }}</mat-label>
+          <input matInput formControlName="valueExpression" placeholder="${params}"/>
+        </mat-form-field>
+        <mat-slide-toggle class="mat-slide margin" formControlName="withResponse">
+          {{ 'gateway.rpc.withResponse' | translate }}
+        </mat-slide-toggle>
+      </ng-template>
+      <ng-template [ngSwitchCase]="ConnectorType.SOCKET">
+        <mat-form-field>
+          <mat-label>{{ 'gateway.rpc.methodRPC' | translate }}</mat-label>
+          <input matInput formControlName="methodRPC" placeholder="rpcMethod1"/>
+        </mat-form-field>
+        <mat-form-field class="mat-block">
+          <mat-label>{{ 'gateway.rpc.methodProcessing' | translate }}</mat-label>
+          <mat-select formControlName="methodProcessing">
+            <mat-option *ngFor="let method of socketMethodProcessings" [value]="method">
+              {{ SocketMethodProcessingsTranslates.get(method) | translate }}
+            </mat-option>
+          </mat-select>
+        </mat-form-field>
+        <mat-form-field class="mat-block">
+          <mat-label>{{ 'gateway.rpc.encoding' | translate }}</mat-label>
+          <input matInput formControlName="encoding" placeholder="{{socketEncodings[0]}}"/>
+        </mat-form-field>
+        <mat-slide-toggle class="mat-slide margin" formControlName="withResponse">
+          {{ 'gateway.rpc.withResponse' | translate }}
+        </mat-slide-toggle>
+      </ng-template>
+      <ng-template [ngSwitchCase]="ConnectorType.XMPP">
+        <mat-form-field>
+          <mat-label>{{ 'gateway.rpc.methodRPC' | translate }}</mat-label>
+          <input matInput formControlName="methodRPC" placeholder="rpc1"/>
+        </mat-form-field>
+        <mat-form-field>
+          <mat-label>{{ 'gateway.rpc.valueExpression' | translate }}</mat-label>
+          <input matInput formControlName="valueExpression" placeholder="${params}"/>
+        </mat-form-field>
+        <mat-slide-toggle class="mat-slide margin" formControlName="withResponse">
+          {{ 'gateway.rpc.withResponse' | translate }}
+        </mat-slide-toggle>
+      </ng-template>
+      <ng-template [ngSwitchCase]="ConnectorType.SNMP">
+        <mat-form-field>
+          <mat-label>{{ 'gateway.rpc.requestFilter' | translate }}</mat-label>
+          <input matInput formControlName="requestFilter" placeholder="setData"/>
+        </mat-form-field>
+        <mat-form-field class="mat-block">
+          <mat-label>{{ 'gateway.rpc.method' | translate }}</mat-label>
+          <mat-select formControlName="method">
+            <mat-option *ngFor="let method of sNMPMethods" [value]="method">
+              {{ SNMPMethodsTranslations.get(method) | translate }}
+            </mat-option>
+          </mat-select>
+        </mat-form-field>
+        <mat-slide-toggle class="mat-slide margin" formControlName="withResponse">
+          {{ 'gateway.rpc.withResponse' | translate }}
+        </mat-slide-toggle>
+        <fieldset class="fields border" fxLayout="column" fxLayoutGap="10px" formArrayName="oid">
+          <span class="fields-label">{{ 'gateway.rpc.oids' | translate }}*</span>
+          <div fxFlex fxLayout="row" fxLayoutGap="10px" fxLayoutAlign="center center"
+               *ngFor="let control of getFormArrayControls('oid'); let i = index">
+            <mat-form-field class="tb-inline-field" appearance="outline" fxFlex subscriptSizing="dynamic">
+              <input matInput [formControl]="control" required/>
+            </mat-form-field>
+            <mat-icon style="cursor:pointer;"
+                      fxFlex="30px"
+                      (click)="removeSNMPoid(i)"
+                      matTooltip="{{ 'gateway.rpc.remove' | translate }}">delete
+            </mat-icon>
+          </div>
+          <button mat-raised-button
+                  fxFlexAlign="start"
+                  (click)="addSNMPoid()">
+            {{ 'gateway.rpc.add-oid' | translate }}
+          </button>
+        </fieldset>
+      </ng-template>
+      <ng-template [ngSwitchCase]="ConnectorType.REST">
+        <mat-form-field>
+          <mat-label>{{ 'gateway.rpc.methodFilter' | translate }}</mat-label>
+          <input matInput formControlName="methodFilter" placeholder="post_attributes"/>
+        </mat-form-field>
+        <div fxFlex fxLayout="row" fxLayoutGap="10px">
+          <mat-form-field class="mat-block" fxFlex="33">
+            <mat-label>{{ 'gateway.rpc.httpMethod' | translate }}</mat-label>
+            <mat-select formControlName="httpMethod">
+              <mat-option *ngFor="let method of hTTPMethods" [value]="method">
+                {{ method }}
+              </mat-option>
+            </mat-select>
+          </mat-form-field>
+          <mat-form-field fxFlex>
+            <mat-label>{{ 'gateway.rpc.requestUrlExpression' | translate }}</mat-label>
+            <input matInput formControlName="requestUrlExpression"
+                   placeholder="http://127.0.0.1:5000/my_devices"/>
+          </mat-form-field>
+        </div>
+        <div fxFlex fxLayout="row" fxLayoutGap="10px">
+          <mat-form-field fxFlex="33">
+            <mat-label>{{ 'gateway.rpc.responseTimeout' | translate }}</mat-label>
+            <input matInput formControlName="responseTimeout" type="number"
+                   step="1" min="10" placeholder="10"/>
+          </mat-form-field>
+          <mat-form-field fxFlex>
+            <mat-label>{{ 'gateway.rpc.timeout' | translate }}</mat-label>
+            <input matInput formControlName="timeout" type="number"
+                   step="1" min="10" placeholder="1000"/>
+          </mat-form-field>
+          <mat-form-field fxFlex>
+            <mat-label>{{ 'gateway.rpc.tries' | translate }}</mat-label>
+            <input matInput formControlName="tries" type="number"
+                   step="1" min="1" placeholder="3"/>
+          </mat-form-field>
+        </div>
+        <mat-form-field>
+          <mat-label>{{ 'gateway.rpc.valueExpression' | translate }}</mat-label>
+          <input matInput formControlName="valueExpression" placeholder="${params}"/>
+        </mat-form-field>
+        <fieldset class="fields border" fxLayout="column" fxLayoutGap="10px" formArrayName="httpHeaders">
+          <span class="fields-label">{{ 'gateway.rpc.httpHeaders' | translate }}</span>
+          <div class="border" fxLayout="column" fxLayoutGap="10px" *ngIf="getFormArrayControls('httpHeaders').length">
+            <div fxLayout="row" fxLayoutGap="10px" fxLayoutAlign="center center">
+              <span fxFlex class="title">{{ 'gateway.rpc.header-name' | translate }}</span>
+              <span fxFlex class="title">{{ 'gateway.rpc.value' | translate }}</span>
+              <span fxFlex="30px"></span>
+            </div>
+            <mat-divider></mat-divider>
+            <div fxFlex fxLayout="row" fxLayoutGap="10px" fxLayoutAlign="center center"
+                 *ngFor="let control of getFormArrayControls('httpHeaders'); let i = index">
+              <ng-container [formGroupName]="i">
+                <mat-form-field appearance="outline" fxFlex>
+                  <input matInput formControlName="headerName"/>
+                </mat-form-field>
+                <mat-form-field appearance="outline" fxFlex>
+                  <input matInput formControlName="value" placeholder="application/json"/>
+                </mat-form-field>
+                <mat-icon style="cursor:pointer;"
+                          fxFlex="30px"
+                          (click)="removeHTTPHeader(i)"
+                          matTooltip="{{ 'gateway.rpc.remove' | translate }}">delete
+                </mat-icon>
+              </ng-container>
+            </div>
+          </div>
+          <button mat-raised-button
+                  fxFlexAlign="start"
+                  (click)="addHTTPHeader()">
+            {{ 'gateway.rpc.add-header' | translate }}
+          </button>
+        </fieldset>
+        <fieldset class="fields border" fxLayout="column" fxLayoutGap="10px" formArrayName="security">
+          <span class="fields-label">{{ 'gateway.rpc.security' | translate }}</span>
+          <div class="border" fxLayout="column" fxLayoutGap="10px" *ngIf="getFormArrayControls('security').length">
+            <div fxLayout="row" fxLayoutGap="10px" fxLayoutAlign="center center">
+              <span fxFlex class="title">{{ 'gateway.rpc.security-name' | translate }}</span>
+              <span fxFlex class="title">{{ 'gateway.rpc.value' | translate }}</span>
+              <span fxFlex="30px"></span>
+            </div>
+            <mat-divider></mat-divider>
+            <div fxFlex fxLayout="row" fxLayoutGap="10px" fxLayoutAlign="center center"
+                 *ngFor="let control of getFormArrayControls('security'); let i = index">
+              <ng-container [formGroupName]="i">
+                <mat-form-field appearance="outline" fxFlex>
+                  <input matInput formControlName="securityName"/>
+                </mat-form-field>
+                <mat-form-field appearance="outline" fxFlex>
+                  <input matInput formControlName="value" placeholder="anonymous"/>
+                </mat-form-field>
+                <mat-icon style="cursor:pointer;"
+                          fxFlex="30px"
+                          (click)="removeHTTPSecurity(i)"
+                          matTooltip="{{ 'gateway.rpc.remove' | translate }}">delete
+                </mat-icon>
+              </ng-container>
+            </div>
+          </div>
+          <button mat-raised-button
+                  fxFlexAlign="start"
+                  (click)="addHTTPSecurity()">
+            {{ 'gateway.rpc.add-security' | translate }}
+          </button>
+        </fieldset>
+      </ng-template>
+      <ng-template [ngSwitchCase]="ConnectorType.REQUEST">
+        <mat-form-field>
+          <mat-label>{{ 'gateway.rpc.methodFilter' | translate }}</mat-label>
+          <input matInput formControlName="methodFilter" placeholder="echo"/>
+        </mat-form-field>
+        <div fxFlex fxLayout="row" fxLayoutGap="10px">
+          <mat-form-field class="mat-block" fxFlex="33">
+            <mat-label>{{ 'gateway.rpc.httpMethod' | translate }}</mat-label>
+            <mat-select formControlName="httpMethod">
+              <mat-option *ngFor="let method of hTTPMethods" [value]="method">
+                {{ method }}
+              </mat-option>
+            </mat-select>
+          </mat-form-field>
+          <mat-form-field fxFlex>
+            <mat-label>{{ 'gateway.rpc.requestUrlExpression' | translate }}</mat-label>
+            <input matInput formControlName="requestUrlExpression" placeholder="http://127.0.0.1:5000/my_devices"/>
+          </mat-form-field>
+        </div>
+        <div fxFlex fxLayout="row" fxLayoutGap="10px">
+          <mat-form-field fxFlex="33">
+            <mat-label>{{ 'gateway.rpc.responseTimeout' | translate }}</mat-label>
+            <input matInput formControlName="responseTimeout" type="number"
+                   step="1" min="10" placeholder="10"/>
+          </mat-form-field>
+          <mat-form-field fxFlex>
+            <mat-label>{{ 'gateway.rpc.timeout' | translate }}</mat-label>
+            <input matInput formControlName="timeout" type="number"
+                   step="1" min="10" placeholder="10"/>
+          </mat-form-field>
+          <mat-form-field fxFlex>
+            <mat-label>{{ 'gateway.rpc.tries' | translate }}</mat-label>
+            <input matInput formControlName="tries" type="number"
+                   step="1" min="1" placeholder="1"/>
+          </mat-form-field>
+        </div>
+        <mat-form-field>
+          <mat-label>{{ 'gateway.rpc.requestValueExpression' | translate }}</mat-label>
+          <input matInput formControlName="requestValueExpression" placeholder="${params}"/>
+        </mat-form-field>
+        <mat-form-field>
+          <mat-label>{{ 'gateway.rpc.responseValueExpression' | translate }}</mat-label>
+          <input matInput formControlName="responseValueExpression" placeholder="${temp}"/>
+        </mat-form-field>
+        <fieldset class="fields border" fxLayout="column" fxLayoutGap="10px" formArrayName="httpHeaders">
+          <span class="fields-label">{{ 'gateway.rpc.httpHeaders' | translate }}</span>
+          <div class="border" fxLayout="column" fxLayoutGap="10px" *ngIf="getFormArrayControls('httpHeaders').length">
+            <div fxLayout="row" fxLayoutGap="10px" fxLayoutAlign="center center">
+              <span fxFlex class="title">{{ 'gateway.rpc.header-name' | translate }}</span>
+              <span fxFlex class="title">{{ 'gateway.rpc.value' | translate }}</span>
+              <span fxFlex="30px"></span>
+            </div>
+            <mat-divider></mat-divider>
+            <div fxFlex fxLayout="row" fxLayoutGap="10px" fxLayoutAlign="center center"
+                 *ngFor="let control of getFormArrayControls('httpHeaders'); let i = index">
+              <ng-container [formGroupName]="i">
+                <mat-form-field appearance="outline" fxFlex>
+                  <input matInput formControlName="headerName" placeholder="{{ 'gateway.rpc.set' | translate }}"/>
+                </mat-form-field>
+                <mat-form-field appearance="outline" fxFlex>
+                  <input matInput formControlName="value"/>
+                </mat-form-field>
+                <mat-icon style="cursor:pointer;"
+                          fxFlex="30px"
+                          (click)="removeHTTPHeader(i)"
+                          matTooltip="{{ 'gateway.rpc.remove' | translate }}">delete
+                </mat-icon>
+              </ng-container>
+            </div>
+          </div>
+          <button mat-raised-button
+                  fxFlexAlign="start"
+                  (click)="addHTTPHeader()">
+            {{ 'gateway.rpc.add-header' | translate }}
+          </button>
+        </fieldset>
+      </ng-template>
+      <ng-template [ngSwitchCase]="ConnectorType.OPCUA_ASYNCIO">
+        <ng-container *ngTemplateOutlet="OPCUAForm"></ng-container>
+      </ng-template>
+      <ng-template [ngSwitchCase]="ConnectorType.OPCUA" #OPCUAForm>
+        <mat-form-field >
+          <mat-label>{{ 'gateway.rpc.method' | translate }}</mat-label>
+          <input matInput formControlName="method" placeholder="multiply"/>
+        </mat-form-field>
+        <fieldset class="fields border" fxLayout="column" fxLayoutGap="10px" formArrayName="arguments">
+          <span class="fields-label">{{ 'gateway.rpc.arguments' | translate }}</span>
+          <div fxFlex fxLayout="row" fxLayoutGap="10px" fxLayoutAlign="center center"
+               *ngFor="let control of getFormArrayControls('arguments'); let i = index">
+            <mat-form-field appearance="outline" fxFlex>
+              <input matInput [formControl]="control" required/>
+            </mat-form-field>
+            <mat-icon style="cursor:pointer;"
+                      fxFlex="30px"
+                      (click)="removeOCPUAArguments(i)"
+                      matTooltip="{{ 'gateway.rpc.remove' | translate }}">delete
+            </mat-icon>
+          </div>
+          <button mat-raised-button
+                  fxFlexAlign="start"
+                  (click)="addOCPUAArguments()">
+            {{ 'gateway.rpc.add-argument' | translate }}
+          </button>
+        </fieldset>
+      </ng-template>
+      <ng-template ngSwitchDefault>
+        <mat-form-field>
+          <mat-label>{{ 'gateway.statistics.command' | translate }}</mat-label>
+          <input matInput formControlName="command"/>
+        </mat-form-field>
+        <mat-form-field fxFlex>
+          <mat-label>{{ 'widget-config.datasource-parameters' | translate }}</mat-label>
+          <input matInput formControlName="params" type="JSON" tb-json-to-string/>
+          <mat-icon class="material-icons-outlined" aria-hidden="false" aria-label="help-icon"
+                    matIconSuffix style="cursor:pointer;"
+                    (click)="openEditJSONDialog($event)"
+                    matTooltip="{{ 'gateway.rpc-command-edit-params' | translate }}">edit
+          </mat-icon>
+          <mat-error *ngIf="commandForm.get('params').hasError('invalidJSON')">
+            {{ 'gateway.rpc.json-value-invalid' | translate }}
+          </mat-error>
+        </mat-form-field>
+      </ng-template>
+    </ng-container>
+  </ng-template>
+  <div class="template-actions" fxFlex fxLayout="row" fxLayoutAlign="end center" fxLayoutGap="10px">
+    <button mat-raised-button
+            (click)="save()"
+            [disabled]="commandForm.invalid">
+      {{ 'gateway.rpc-command-save-template' | translate }}
+    </button>
+    <button mat-raised-button
+            color="primary"
+            (click)="sendCommand.emit()"
+            [disabled]="commandForm.invalid">
+      {{ 'gateway.rpc-command-send' | translate }}
+    </button>
+  </div>
+</div>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-service-rpc-connector.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-service-rpc-connector.component.scss
new file mode 100644
index 0000000000..a0af50aee8
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-service-rpc-connector.component.scss
@@ -0,0 +1,67 @@
+/**
+ * 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.
+ */
+:host {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  padding: 0;
+
+  .title {
+    font-weight: 500;
+  }
+
+  .command-form {
+    flex-wrap: nowrap;
+
+    & > button {
+      margin-top: 10px;
+    }
+  }
+
+  .mat-mdc-slide-toggle.margin {
+    margin-bottom: 10px;
+    margin-left: 10px;
+  }
+
+  .fields{
+    .fields-label {
+      font-weight: 500;
+    }
+  }
+
+  .border {
+    padding: 16px;
+    margin-bottom: 10px;
+    box-shadow: 0 0 0 0 rgb(0 0 0 / 20%), 0 0 0 0 rgb(0 0 0 / 14%), 0 0 0 0 rgb(0 0 0 / 12%);
+    border: solid 1px #e0e0e0;
+    border-radius: 4px;
+
+    .title {
+      color: rgba(0, 0, 0, .54);
+    }
+
+    .mat-icon {
+      color: rgba(0, 0, 0, .38);
+    }
+
+    .mat-divider {
+      margin-left: -16px;
+      margin-right: -16px;
+      margin-bottom: 16px;
+    }
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-service-rpc-connector.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-service-rpc-connector.component.ts
new file mode 100644
index 0000000000..69b785d133
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-service-rpc-connector.component.ts
@@ -0,0 +1,428 @@
+///
+/// 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, EventEmitter, forwardRef, Input, OnInit, Output } from '@angular/core';
+import {
+  ControlValueAccessor,
+  FormArray,
+  FormBuilder,
+  FormControl,
+  FormGroup,
+  NG_VALUE_ACCESSOR,
+  Validators
+} from '@angular/forms';
+import {
+  BACnetObjectTypes,
+  BACnetObjectTypesTranslates,
+  BACnetRequestTypes,
+  BACnetRequestTypesTranslates,
+  BLEMethods,
+  BLEMethodsTranslates,
+  CANByteOrders,
+  ConnectorType,
+  GatewayConnectorDefaultTypesTranslates,
+  HTTPMethods,
+  ModbusCodesTranslate,
+  ModbusCommandTypes,
+  RPCCommand,
+  RPCTemplateConfig,
+  SNMPMethods,
+  SNMPMethodsTranslations,
+  SocketEncodings,
+  SocketMethodProcessings,
+  SocketMethodProcessingsTranslates
+} from '@home/components/widget/lib/gateway/gateway-widget.models';
+import { MatDialog } from '@angular/material/dialog';
+import {
+  JsonObjectEditDialogComponent,
+  JsonObjectEditDialogData
+} from '@shared/components/dialog/json-object-edit-dialog.component';
+import { jsonRequired } from '@shared/components/json-object-edit.component';
+import { deepClone } from '@core/utils';
+
+export const noLeadTrailSpacesRegex: RegExp = /^(?! )[\S\s]*(?<! )$/;
+
+@Component({
+  selector: 'tb-gateway-service-rpc-connector',
+  templateUrl: './gateway-service-rpc-connector.component.html',
+  styleUrls: ['./gateway-service-rpc-connector.component.scss'],
+  providers: [
+    {
+      provide: NG_VALUE_ACCESSOR,
+      useExisting: forwardRef(() => GatewayServiceRPCConnectorComponent),
+      multi: true
+    }
+  ]
+})
+export class GatewayServiceRPCConnectorComponent implements OnInit, ControlValueAccessor {
+
+  @Input()
+  connectorType: ConnectorType;
+
+  @Output()
+  sendCommand: EventEmitter<RPCCommand> = new EventEmitter();
+
+  @Output()
+  saveTemplate: EventEmitter<RPCTemplateConfig> = new EventEmitter();
+
+  commandForm: FormGroup;
+  isMQTTWithResponse: FormControl;
+  codesArray: Array<number> = [1, 2, 3, 4, 5, 6, 15, 16];
+  ConnectorType = ConnectorType;
+  modbusCommandTypes = Object.values(ModbusCommandTypes) as ModbusCommandTypes[];
+  bACnetRequestTypes = Object.values(BACnetRequestTypes) as BACnetRequestTypes[];
+  bACnetObjectTypes = Object.values(BACnetObjectTypes) as BACnetObjectTypes[];
+  bLEMethods = Object.values(BLEMethods) as BLEMethods[];
+  cANByteOrders = Object.values(CANByteOrders) as CANByteOrders[];
+  socketMethodProcessings = Object.values(SocketMethodProcessings) as SocketMethodProcessings[];
+  socketEncodings = Object.values(SocketEncodings) as SocketEncodings[];
+  sNMPMethods = Object.values(SNMPMethods) as SNMPMethods[];
+  hTTPMethods = Object.values(HTTPMethods) as HTTPMethods[];
+
+  bACnetRequestTypesTranslates = BACnetRequestTypesTranslates;
+  bACnetObjectTypesTranslates = BACnetObjectTypesTranslates;
+  bLEMethodsTranslates = BLEMethodsTranslates;
+  SocketMethodProcessingsTranslates = SocketMethodProcessingsTranslates;
+  SNMPMethodsTranslations = SNMPMethodsTranslations;
+  gatewayConnectorDefaultTypesTranslates = GatewayConnectorDefaultTypesTranslates;
+  modbusCodesTranslate = ModbusCodesTranslate;
+
+  urlPattern = /^[-a-zA-Zd_$:{}?~+=\/.0-9-]*$/;
+  numbersOnlyPattern = /^[0-9]*$/;
+  hexOnlyPattern = /^[0-9A-Fa-f ]+$/;
+
+  private propagateChange = (v: any) => {
+  }
+
+  constructor(private fb: FormBuilder,
+              private dialog: MatDialog,) {
+  }
+
+  ngOnInit() {
+    this.commandForm = this.connectorParamsFormGroupByType(this.connectorType);
+    this.commandForm.valueChanges.subscribe(value => {
+      const httpHeaders = {};
+      const security = {};
+      switch (this.connectorType) {
+        case ConnectorType.REST:
+          value.httpHeaders.forEach(data => {
+            httpHeaders[data.headerName] = data.value;
+          })
+          value.httpHeaders = httpHeaders;
+          value.security.forEach(data => {
+            security[data.securityName] = data.value;
+          })
+          value.security = security;
+          break;
+        case ConnectorType.REQUEST:
+          value.httpHeaders.forEach(data => {
+            httpHeaders[data.headerName] = data.value;
+          })
+          value.httpHeaders = httpHeaders;
+          break;
+      }
+      if (this.commandForm.valid) {
+        this.propagateChange({...this.commandForm.value, ...value});
+      }
+    });
+    this.isMQTTWithResponse = this.fb.control(false);
+  }
+
+  connectorParamsFormGroupByType(type: ConnectorType): FormGroup {
+    let formGroup: FormGroup;
+
+    switch (type) {
+      case ConnectorType.MQTT:
+        formGroup = this.fb.group({
+          methodFilter: [null, [Validators.required, Validators.pattern(noLeadTrailSpacesRegex)]],
+          requestTopicExpression: [null, [Validators.required, Validators.pattern(noLeadTrailSpacesRegex)]],
+          responseTopicExpression: [null, [Validators.pattern(noLeadTrailSpacesRegex)]],
+          responseTimeout: [null, [Validators.min(10), Validators.pattern(this.numbersOnlyPattern)]],
+          valueExpression: [null, [Validators.required, Validators.pattern(noLeadTrailSpacesRegex)]],
+        })
+        break;
+      case ConnectorType.MODBUS:
+        formGroup = this.fb.group({
+          tag: [null, [Validators.required, Validators.pattern(noLeadTrailSpacesRegex)]],
+          type: [null, [Validators.required]],
+          functionCode: [null, [Validators.required]],
+          value: [null, []],
+          address: [null, [Validators.required, Validators.min(0), Validators.pattern(this.numbersOnlyPattern)]],
+          objectsCount: [null, [Validators.required, Validators.min(0), Validators.pattern(this.numbersOnlyPattern)]]
+        })
+        const valueForm = formGroup.get('value');
+        formGroup.get('functionCode').valueChanges.subscribe(value => {
+          if (value > 4) {
+            valueForm.addValidators([Validators.required, Validators.pattern(noLeadTrailSpacesRegex)]);
+          } else {
+            valueForm.clearValidators();
+            valueForm.setValue(null);
+          }
+          valueForm.updateValueAndValidity();
+        })
+        break;
+      case ConnectorType.BACNET:
+        formGroup = this.fb.group({
+          method: [null, [Validators.required, Validators.pattern(noLeadTrailSpacesRegex)]],
+          requestType: [null, [Validators.required, Validators.pattern(noLeadTrailSpacesRegex)]],
+          requestTimeout: [null, [Validators.required, Validators.min(10), Validators.pattern(this.numbersOnlyPattern)]],
+          objectType: [null, []],
+          identifier: [null, [Validators.required, Validators.min(1), Validators.pattern(this.numbersOnlyPattern)]],
+          propertyId: [null, [Validators.required, Validators.pattern(noLeadTrailSpacesRegex)]]
+        })
+        break;
+      case ConnectorType.BLE:
+        formGroup = this.fb.group({
+          methodRPC: [null, [Validators.required, Validators.pattern(noLeadTrailSpacesRegex)]],
+          characteristicUUID: ["00002A00-0000-1000-8000-00805F9B34FB", [Validators.required, Validators.pattern(noLeadTrailSpacesRegex)]],
+          methodProcessing: [null, [Validators.required]],
+          withResponse: [false, []]
+        })
+        break;
+      case ConnectorType.CAN:
+        formGroup = this.fb.group({
+          method: [null, [Validators.required, Validators.pattern(noLeadTrailSpacesRegex)]],
+          nodeID: [null, [Validators.required, Validators.min(0), Validators.pattern(this.numbersOnlyPattern)]],
+          isExtendedID: [false, []],
+          isFD: [false, []],
+          bitrateSwitch: [false, []],
+          dataLength: [null, [Validators.min(1), Validators.pattern(this.numbersOnlyPattern)]],
+          dataByteorder: [null, []],
+          dataBefore: [null, [Validators.pattern(noLeadTrailSpacesRegex), Validators.pattern(this.hexOnlyPattern)]],
+          dataAfter: [null, [Validators.pattern(noLeadTrailSpacesRegex), Validators.pattern(this.hexOnlyPattern)]],
+          dataInHEX: [null, [Validators.pattern(noLeadTrailSpacesRegex), Validators.pattern(this.hexOnlyPattern)]],
+          dataExpression: [null, [Validators.pattern(noLeadTrailSpacesRegex)]]
+        })
+        break;
+      case ConnectorType.FTP:
+        formGroup = this.fb.group({
+          methodFilter: [null, [Validators.required, Validators.pattern(noLeadTrailSpacesRegex)]],
+          valueExpression: [null, [Validators.required, Validators.pattern(noLeadTrailSpacesRegex)]]
+        })
+        break;
+      case ConnectorType.OCPP:
+        formGroup = this.fb.group({
+          methodRPC: [null, [Validators.required, Validators.pattern(noLeadTrailSpacesRegex)]],
+          valueExpression: [null, [Validators.required, Validators.pattern(noLeadTrailSpacesRegex)]],
+          withResponse: [false, []]
+        })
+        break;
+      case ConnectorType.SOCKET:
+        formGroup = this.fb.group({
+          methodRPC: [null, [Validators.required, Validators.pattern(noLeadTrailSpacesRegex)]],
+          methodProcessing: [null, [Validators.required]],
+          encoding: [SocketEncodings.UTF_8, [Validators.required, Validators.pattern(noLeadTrailSpacesRegex)]],
+          withResponse: [false, []]
+        })
+        break;
+      case ConnectorType.XMPP:
+        formGroup = this.fb.group({
+          methodRPC: [null, [Validators.required, Validators.pattern(noLeadTrailSpacesRegex)]],
+          valueExpression: [null, [Validators.required, Validators.pattern(noLeadTrailSpacesRegex)]],
+          withResponse: [false, []]
+        })
+        break;
+      case ConnectorType.SNMP:
+        formGroup = this.fb.group({
+          requestFilter: [null, [Validators.required, Validators.pattern(noLeadTrailSpacesRegex)]],
+          method: [null, [Validators.required]],
+          withResponse: [false, []],
+          oid: this.fb.array([], [Validators.required])
+        })
+        break;
+      case ConnectorType.REST:
+        formGroup = this.fb.group({
+          methodFilter: [null, [Validators.required, Validators.pattern(noLeadTrailSpacesRegex)]],
+          httpMethod: [null, [Validators.required]],
+          requestUrlExpression: [null, [Validators.required, Validators.pattern(this.urlPattern)]],
+          responseTimeout: [null, [Validators.required, Validators.min(10), Validators.pattern(this.numbersOnlyPattern)]],
+          timeout: [null, [Validators.required, Validators.min(10), Validators.pattern(this.numbersOnlyPattern)]],
+          tries: [null, [Validators.required, Validators.min(1), Validators.pattern(this.numbersOnlyPattern)]],
+          valueExpression: [null, [Validators.required, Validators.pattern(noLeadTrailSpacesRegex)]],
+          httpHeaders: this.fb.array([]),
+          security: this.fb.array([])
+        })
+        break;
+      case ConnectorType.REQUEST:
+        formGroup = this.fb.group({
+          methodFilter: [null, [Validators.required, Validators.pattern(noLeadTrailSpacesRegex)]],
+          httpMethod: [null, [Validators.required]],
+          requestUrlExpression: [null, [Validators.required, Validators.pattern(this.urlPattern)]],
+          responseTimeout: [null, [Validators.required, Validators.min(10), Validators.pattern(this.numbersOnlyPattern)]],
+          timeout: [null, [Validators.required, Validators.min(10), Validators.pattern(this.numbersOnlyPattern)]],
+          tries: [null, [Validators.required, Validators.min(1), Validators.pattern(this.numbersOnlyPattern)]],
+          requestValueExpression: [null, [Validators.required, Validators.pattern(noLeadTrailSpacesRegex)]],
+          responseValueExpression: [null, [Validators.pattern(noLeadTrailSpacesRegex)]],
+          httpHeaders: this.fb.array([]),
+        })
+        break;
+      case ConnectorType.OPCUA:
+      case ConnectorType.OPCUA_ASYNCIO:
+        formGroup = this.fb.group({
+          method: [null, [Validators.required, Validators.pattern(noLeadTrailSpacesRegex)]],
+          arguments: this.fb.array([]),
+        })
+        break;
+      default:
+        formGroup = this.fb.group({
+          command: [null, [Validators.required, Validators.pattern(noLeadTrailSpacesRegex)]],
+          params: [{}, [jsonRequired]],
+        })
+    }
+    return formGroup;
+  }
+
+  addSNMPoid(value: string = null) {
+    const oidsFA = this.commandForm.get('oid') as FormArray;
+    if (oidsFA) {
+      oidsFA.push(this.fb.control(value, [Validators.required, Validators.pattern(noLeadTrailSpacesRegex)]), {emitEvent: false});
+    }
+  }
+
+  removeSNMPoid(index: number) {
+    const oidsFA = this.commandForm.get('oid') as FormArray;
+    oidsFA.removeAt(index);
+  }
+
+  addHTTPHeader(value: { headerName: string, value: string } = {headerName: null, value: null}) {
+    const headerFA = this.commandForm.get('httpHeaders') as FormArray;
+    const formGroup = this.fb.group({
+      headerName: [value.headerName, [Validators.required, Validators.pattern(noLeadTrailSpacesRegex)]],
+      value: [value.value, [Validators.required, Validators.pattern(noLeadTrailSpacesRegex)]]
+    })
+    if (headerFA) {
+      headerFA.push(formGroup, {emitEvent: false});
+    }
+  }
+
+  removeHTTPHeader(index: number) {
+    const oidsFA = this.commandForm.get('httpHeaders') as FormArray;
+    oidsFA.removeAt(index);
+  }
+
+  addHTTPSecurity(value: { securityName: string, value: string } = {securityName: null, value: null}) {
+    const securityFA = this.commandForm.get('security') as FormArray;
+    const formGroup = this.fb.group({
+      securityName: [value.securityName, [Validators.required, Validators.pattern(noLeadTrailSpacesRegex)]],
+      value: [value.value, [Validators.required, Validators.pattern(noLeadTrailSpacesRegex)]]
+    })
+    if (securityFA) {
+      securityFA.push(formGroup, {emitEvent: false});
+    }
+  }
+
+  removeHTTPSecurity(index: number) {
+    const oidsFA = this.commandForm.get('security') as FormArray;
+    oidsFA.removeAt(index);
+  }
+
+  getFormArrayControls(path: string) {
+    return (this.commandForm.get(path) as FormArray).controls as FormControl[];
+  }
+
+  addOCPUAArguments(value: string = null) {
+    const oidsFA = this.commandForm.get('arguments') as FormArray;
+    if (oidsFA) {
+      oidsFA.push(this.fb.control(value, [Validators.required, Validators.pattern(noLeadTrailSpacesRegex)]), {emitEvent: false});
+    }
+  }
+
+  removeOCPUAArguments(index: number) {
+    const oidsFA = this.commandForm.get('arguments') as FormArray;
+    oidsFA.removeAt(index);
+  }
+
+  openEditJSONDialog($event: Event) {
+    if ($event) {
+      $event.stopPropagation();
+    }
+    this.dialog.open<JsonObjectEditDialogComponent, JsonObjectEditDialogData, object>(JsonObjectEditDialogComponent, {
+      disableClose: true,
+      panelClass: ['tb-dialog', 'tb-fullscreen-dialog'],
+      data: {
+        jsonValue: this.commandForm.get('params').value,
+        required: true
+      }
+    }).afterClosed().subscribe(
+      (res) => {
+        if (res) {
+          this.commandForm.get('params').setValue(res);
+        }
+      }
+    );
+  }
+
+  save() {
+    this.saveTemplate.emit();
+  }
+
+  registerOnChange(fn: any): void {
+    this.propagateChange = fn;
+  }
+
+  registerOnTouched(fn: any): void {
+  }
+
+  clearFromArrayByName(name: string) {
+    const formArray = this.commandForm.get(name) as FormArray;
+    while (formArray.length !== 0) {
+      formArray.removeAt(0)
+    }
+  }
+
+  writeValue(value: RPCTemplateConfig): void {
+    if (typeof value == "object") {
+      value = deepClone(value);
+      switch (this.connectorType) {
+        case ConnectorType.SNMP:
+          this.clearFromArrayByName("oids");
+          value.oids.forEach(value => {
+            this.addSNMPoid(value)
+          })
+          delete value.oids;
+          break;
+        case ConnectorType.REQUEST:
+          this.clearFromArrayByName("httpHeaders");
+          value.httpHeaders && Object.entries(value.httpHeaders).forEach(httpHeader => {
+            this.addHTTPHeader({headerName: httpHeader[0], value: httpHeader[1] as string})
+          })
+          delete value.httpHeaders;
+          break;
+        case ConnectorType.REST:
+          this.clearFromArrayByName("httpHeaders");
+          this.clearFromArrayByName("security");
+          value.security && Object.entries(value.security).forEach(securityHeader => {
+            this.addHTTPSecurity({securityName: securityHeader[0], value: securityHeader[1] as string})
+          })
+          delete value.security;
+          value.httpHeaders && Object.entries(value.httpHeaders).forEach(httpHeader => {
+            this.addHTTPHeader({headerName: httpHeader[0], value: httpHeader[1] as string})
+          })
+          delete value.httpHeaders;
+          break;
+        case ConnectorType.OPCUA:
+        case ConnectorType.OPCUA_ASYNCIO:
+          this.clearFromArrayByName("arguments");
+          value.arguments.forEach(value => {
+            this.addOCPUAArguments(value)
+          })
+          delete value.arguments;
+          break;
+      }
+      this.commandForm.patchValue(value, {onlySelf: false});
+    }
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-service-rpc.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-service-rpc.component.html
index 33ddef3f81..8368698087 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-service-rpc.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-service-rpc.component.html
@@ -15,51 +15,46 @@
     limitations under the License.
 
 -->
-<div fxLayout="row" fxLayout.lt-sm="column" class="command-form" fxLayoutGap="10px" [formGroup]="commandForm">
-  <ng-container *ngIf="!isConnector; else connectorForm">
-    <mat-form-field>
-      <mat-label>{{ 'gateway.statistics.command' | translate }}</mat-label>
-      <mat-select formControlName="command">
-        <mat-option *ngFor="let command of RPCCommands" [value]="command">
-          {{ command }}
-        </mat-option>
-      </mat-select>
-    </mat-form-field>
-    <mat-form-field fxFlex>
-      <mat-label>{{ 'gateway.statistics.timeout-ms' | translate }}</mat-label>
-      <input matInput formControlName="time" type="number" min="1"/>
-      <mat-error *ngIf="commandForm.get('time').hasError('min')">
-        {{ 'gateway.statistics.timeout-min' | translate }}
-      </mat-error>
-    </mat-form-field>
-  </ng-container>
-  <ng-template #connectorForm>
-    <mat-form-field>
-      <mat-label>{{ 'gateway.statistics.command' | translate }}</mat-label>
-      <input matInput formControlName="command"/>
-    </mat-form-field>
-    <mat-form-field fxFlex>
-      <mat-label>{{ 'widget-config.datasource-parameters' | translate }}</mat-label>
-      <input matInput formControlName="params" type="JSON"/>
-      <mat-icon class="material-icons-outlined" aria-hidden="false" aria-label="help-icon"
-                matIconSuffix style="cursor:pointer;"
-                (click)="openEditJSONDialog($event)"
-                matTooltip="{{ 'gateway.rpc-command-edit-params' | translate }}">edit
-      </mat-icon>
-    </mat-form-field>
-  </ng-template>
-  <button mat-raised-button
-          color="primary"
-          (click)="sendCommand()"
-          [disabled]="commandForm.invalid">
-    {{ 'gateway.rpc-command-send' | translate }}
-  </button>
+<div fxLayout="column" fxFlex [ngClass]="{'border': isConnector}">
+  <div fxLayout="row" fxLayout.lt-sm="column" class="command-form" fxLayoutGap="10px" [formGroup]="commandForm">
+    <ng-container *ngIf="!isConnector; else connectorForm">
+      <mat-form-field>
+        <mat-label>{{ 'gateway.statistics.command' | translate }}</mat-label>
+        <mat-select formControlName="command">
+          <mat-option *ngFor="let command of RPCCommands" [value]="command">
+            {{ command }}
+          </mat-option>
+        </mat-select>
+      </mat-form-field>
+      <mat-form-field fxFlex>
+        <mat-label>{{ 'gateway.statistics.timeout-ms' | translate }}</mat-label>
+        <input matInput formControlName="time" type="number" min="1"/>
+        <mat-error *ngIf="commandForm.get('time').hasError('min')">
+          {{ 'gateway.statistics.timeout-min' | translate }}
+        </mat-error>
+      </mat-form-field>
+      <button mat-raised-button
+              color="primary"
+              (click)="sendCommand()"
+              [disabled]="commandForm.invalid">
+        {{ 'gateway.rpc-command-send' | translate }}
+      </button>
+    </ng-container>
+    <ng-template #connectorForm>
+      <tb-gateway-service-rpc-connector formControlName="params" [connectorType]="connectorType"
+                                        (sendCommand)="sendCommand()" (saveTemplate)="saveTemplate()"/>
+    </ng-template>
+  </div>
+  <section class="result-block" [formGroup]="commandForm">
+    <span>{{ 'gateway.rpc-command-result' | translate }}
+      <div *ngIf="resultTime" class="result-time" fxFlex fxLayout="row" fxLayoutAlign="center center">
+        <mat-icon class="material-icons">schedule</mat-icon>
+        <span>{{ resultTime | date: 'yyyy/MM/dd HH:mm:ss' }}</span>
+      </div>
+    </span>
+    <tb-json-content [contentType]="contentTypes.JSON" readonly="true" formControlName="result"></tb-json-content>
+  </section>
 </div>
-<section class="result-block" [formGroup]="commandForm">
-  <span>{{ 'gateway.rpc-command-result' | translate }}
-    <div *ngIf="resultTime" class="result-time" fxFlex fxLayout="row" fxLayoutAlign="center center"> <mat-icon
-      class="material-icons">schedule</mat-icon>
-      <span>{{ resultTime | date: 'yyyy/MM/dd HH:mm:ss' }}</span> </div></span>
-  <tb-json-content [contentType]="contentTypes.JSON" readonly="true" formControlName="result"></tb-json-content>
-</section>
-
+<tb-gateway-service-rpc-connector-templates fxFlex="30" *ngIf="isConnector" class="border" [rpcTemplates]="templates"
+                                            [ctx]="ctx" [connectorType]="connectorType" (useTemplate)="useTemplate($event)">
+</tb-gateway-service-rpc-connector-templates>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-service-rpc.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-service-rpc.component.scss
index be5e215e81..f74097bbba 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-service-rpc.component.scss
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-service-rpc.component.scss
@@ -16,10 +16,20 @@
 :host {
   width: 100%;
   height: 100%;
-  overflow-x: auto;
+  overflow: auto;
   display: flex;
-  flex-direction: column;
-  padding: 0;
+  flex-direction: row;
+  padding: 0 5px;
+
+  & > * {
+    height: 100%;
+    overflow: auto;
+  }
+
+  & > tb-gateway-service-rpc-connector-templates:last-child {
+    margin-left: 10px;
+  }
+
 
   .command-form {
     flex-wrap: nowrap;
@@ -63,11 +73,11 @@
       flex: 1;
     }
   }
-}
 
-:host ::ng-deep {
-  .tb-json-content {
-    height: 100%;
+  .border {
+    padding: 16px;
+    box-shadow: 0 0 0 0 rgb(0 0 0 / 20%), 0 0 0 0 rgb(0 0 0 / 14%), 0 0 0 0 rgb(0 0 0 / 12%);
+    border: solid 1px #e0e0e0;
+    border-radius: 4px;
   }
 }
-
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-service-rpc.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-service-rpc.component.ts
index b157a94044..b5cde980f9 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-service-rpc.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-service-rpc.component.ts
@@ -14,23 +14,35 @@
 /// limitations under the License.
 ///
 
-import { AfterViewInit, Component, Input } from '@angular/core';
+import { ChangeDetectorRef, Component, Input, OnInit } from '@angular/core';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { MatDialog, MatDialogRef } from '@angular/material/dialog';
 import { WidgetContext } from '@home/models/widget-component.models';
 import { ContentType } from '@shared/models/constants';
-import {
-  JsonObjectEditDialogComponent,
-  JsonObjectEditDialogData
-} from '@shared/components/dialog/json-object-edit-dialog.component';
 import { jsonRequired } from '@shared/components/json-object-edit.component';
+import {
+  ConnectorType,
+  RPCCommand,
+  RPCTemplate,
+  RPCTemplateConfig,
+  SaveRPCTemplateData
+} from '@home/components/widget/lib/gateway/gateway-widget.models';
+import {
+  GatewayServiceRPCConnectorTemplateDialogComponent
+} from '@home/components/widget/lib/gateway/gateway-service-rpc-connector-template-dialog';
+import { AttributeService } from '@core/http/attribute.service';
+import { AttributeScope } from '@shared/models/telemetry/telemetry.models';
+import { EntityType } from '@shared/models/entity-type.models';
+import { DatasourceType, widgetType } from '@shared/models/widget.models';
+import { IWidgetSubscription, WidgetSubscriptionOptions } from '@core/api/widget-api.models';
+import { UtilsService } from '@core/services/utils.service';
 
 @Component({
   selector: 'tb-gateway-service-rpc',
   templateUrl: './gateway-service-rpc.component.html',
   styleUrls: ['./gateway-service-rpc.component.scss']
 })
-export class GatewayServiceRPCComponent implements AfterViewInit {
+export class GatewayServiceRPCComponent implements OnInit {
 
   @Input()
   ctx: WidgetContext;
@@ -56,61 +68,158 @@ export class GatewayServiceRPCComponent implements AfterViewInit {
     'Reboot'
   ];
 
-  private connectorType: string;
+  public connectorType: ConnectorType;
+  public templates: Array<RPCTemplate> = [];
+
+  private subscription: IWidgetSubscription;
+  private subscriptionOptions: WidgetSubscriptionOptions = {
+    callbacks: {
+      onDataUpdated: () => this.ctx.ngZone.run(() => {
+        this.updateTemplates()
+      }),
+      onDataUpdateError: (subscription, e) => this.ctx.ngZone.run(() => {
+        this.onDataUpdateError(e);
+      }),
+      dataLoading: () => {
+      }
+    }
+  };
 
   constructor(private fb: FormBuilder,
-              private dialog: MatDialog) {
+              private dialog: MatDialog,
+              private utils: UtilsService,
+              private cd: ChangeDetectorRef,
+              private attributeService: AttributeService) {
     this.commandForm = this.fb.group({
-      command: [null,[Validators.required]],
+      command: [null, [Validators.required]],
       time: [60, [Validators.required, Validators.min(1)]],
       params: ['{}', [jsonRequired]],
       result: [null]
     });
   }
 
-  ngAfterViewInit() {
+  ngOnInit() {
     this.isConnector = this.ctx.settings.isConnector;
     if (!this.isConnector) {
       this.commandForm.get('command').setValue(this.RPCCommands[0]);
     } else {
       this.connectorType = this.ctx.stateController.getStateParams().connector_rpc.value.type;
+      const subscriptionInfo = [{
+        type: DatasourceType.entity,
+        entityType: EntityType.DEVICE,
+        entityId: this.ctx.defaultSubscription.targetDeviceId,
+        entityName: 'Connector',
+        attributes: [{name: `${this.connectorType}_template`}]
+      }];
+      this.ctx.subscriptionApi.createSubscriptionFromInfo(widgetType.latest, subscriptionInfo,
+        this.subscriptionOptions, false, true).subscribe(subscription => {
+        this.subscription = subscription;
+      })
     }
   }
 
-  sendCommand() {
+  sendCommand(value?: RPCCommand) {
     this.resultTime = null;
-    const formValues = this.commandForm.value;
+    const formValues = value || this.commandForm.value;
     const commandPrefix = this.isConnector ? `${this.connectorType}_` : 'gateway_';
-    this.ctx.controlApi.sendTwoWayCommand(commandPrefix+formValues.command.toLowerCase(), formValues.params,formValues.time).subscribe({
+    const command = !this.isConnector ? formValues.command.toLowerCase() : this.getCommandFromParamsByType(formValues.params);
+    const params = formValues.params;
+    this.ctx.controlApi.sendTwoWayCommand(commandPrefix + command, params, formValues.time).subscribe({
       next: resp => {
-        this.resultTime  = new Date().getTime();
+        this.resultTime = new Date().getTime();
         this.commandForm.get('result').setValue(JSON.stringify(resp))
       },
       error: error => {
-        this.resultTime  = new Date().getTime();
+        this.resultTime = new Date().getTime();
         console.error(error);
         this.commandForm.get('result').setValue(JSON.stringify(error.error));
       }
     });
   }
 
-  openEditJSONDialog($event: Event) {
-    if ($event) {
-      $event.stopPropagation();
+  getCommandFromParamsByType(params: RPCTemplateConfig) {
+    switch (this.connectorType) {
+      case ConnectorType.MQTT:
+      case ConnectorType.FTP:
+      case ConnectorType.SNMP:
+      case ConnectorType.REST:
+      case ConnectorType.REQUEST:
+        return params.methodFilter;
+      case ConnectorType.MODBUS:
+        return params.tag;
+      case ConnectorType.BACNET:
+      case ConnectorType.CAN:
+      case ConnectorType.OPCUA:
+      case ConnectorType.OPCUA_ASYNCIO:
+        return params.method;
+      case ConnectorType.BLE:
+      case ConnectorType.OCPP:
+      case ConnectorType.SOCKET:
+      case ConnectorType.XMPP:
+        return params.methodRPC;
+      default:
+        return params.command;
     }
-    this.dialog.open<JsonObjectEditDialogComponent, JsonObjectEditDialogData, object>(JsonObjectEditDialogComponent, {
+  }
+
+  saveTemplate() {
+    this.dialog.open<GatewayServiceRPCConnectorTemplateDialogComponent, SaveRPCTemplateData>
+    (GatewayServiceRPCConnectorTemplateDialogComponent, {
       disableClose: true,
       panelClass: ['tb-dialog', 'tb-fullscreen-dialog'],
-      data: {
-        jsonValue: JSON.parse(this.commandForm.get('params').value),
-        required: true
-      }
+      data: {config: this.commandForm.value.params, templates: this.templates}
     }).afterClosed().subscribe(
       (res) => {
         if (res) {
-          this.commandForm.get('params').setValue(JSON.stringify(res));
+          const templateAttribute: RPCTemplate = {
+            name: res,
+            config: this.commandForm.value.params
+          }
+          const templatesArray = this.templates;
+          const existingIndex = templatesArray.findIndex(template => {
+            return template.name == templateAttribute.name;
+          })
+          if (existingIndex > -1) {
+            templatesArray.splice(existingIndex, 1)
+          }
+          templatesArray.push(templateAttribute)
+          const key = `${this.connectorType}_template`;
+          this.attributeService.saveEntityAttributes(
+            {
+              id: this.ctx.defaultSubscription.targetDeviceId,
+              entityType: EntityType.DEVICE
+            }
+            , AttributeScope.SERVER_SCOPE, [{
+              key,
+              value: templatesArray
+            }]).subscribe(() => {
+              this.cd.detectChanges();
+          })
         }
       }
     );
   }
+
+  useTemplate($event) {
+    this.commandForm.get('params').patchValue($event.config);
+  }
+
+  private updateTemplates() {
+    this.templates = this.subscription.data[0].data[0][1].length ?
+      JSON.parse(this.subscription.data[0].data[0][1]) : [];
+    if (this.templates.length && this.commandForm.get('params').value == "{}") {
+      this.commandForm.get('params').patchValue(this.templates[0].config);
+    }
+    this.cd.detectChanges();
+  }
+
+  private onDataUpdateError(e: any) {
+    const exceptionData = this.utils.parseException(e);
+    let errorText = exceptionData.name;
+    if (exceptionData.message) {
+      errorText += ': ' + exceptionData.message;
+    }
+    console.error(errorText);
+  }
+
 }
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-widget.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-widget.models.ts
index 603b06cc01..cffa206c3b 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-widget.models.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-widget.models.ts
@@ -107,27 +107,190 @@ export interface GatewayConnector {
   key?: string;
 }
 
+export enum ConnectorType {
+  MQTT = 'mqtt',
+  MODBUS = 'modbus',
+  GRPC = 'grpc',
+  OPCUA = 'opcua',
+  OPCUA_ASYNCIO = 'opcua_asyncio',
+  BLE = 'ble',
+  REQUEST = 'request',
+  CAN = 'can',
+  BACNET = 'bacnet',
+  ODBC = 'odbc',
+  REST = 'rest',
+  SNMP = 'snmp',
+  FTP = 'ftp',
+  SOCKET = 'socket',
+  XMPP = 'xmpp',
+  OCPP = 'ocpp',
+  CUSTOM = 'custom'
+}
 
-export const GatewayConnectorDefaultTypesTranslates = new Map<string, string>([
-  ['mqtt', 'MQTT'],
-  ['modbus', 'MODBUS'],
-  ['grpc', 'GRPC'],
-  ['opcua', 'OPCUA'],
-  ['opcua_asyncio', 'OPCUA ASYNCIO'],
-  ['ble', 'BLE'],
-  ['request', 'REQUEST'],
-  ['can', 'CAN'],
-  ['bacnet', 'BACNET'],
-  ['odbc', 'ODBC'],
-  ['rest', 'REST'],
-  ['snmp', 'SNMP'],
-  ['ftp', 'FTP'],
-  ['socket', 'SOCKET'],
-  ['xmpp', 'XMPP'],
-  ['ocpp', 'OCPP'],
-  ['custom', 'CUSTOM']
+export const GatewayConnectorDefaultTypesTranslates = new Map<ConnectorType, string>([
+  [ConnectorType.MQTT, 'MQTT'],
+  [ConnectorType.MODBUS, 'MODBUS'],
+  [ConnectorType.GRPC, 'GRPC'],
+  [ConnectorType.OPCUA, 'OPCUA'],
+  [ConnectorType.OPCUA_ASYNCIO, 'OPCUA ASYNCIO'],
+  [ConnectorType.BLE, 'BLE'],
+  [ConnectorType.REQUEST, 'REQUEST'],
+  [ConnectorType.CAN, 'CAN'],
+  [ConnectorType.BACNET, 'BACNET'],
+  [ConnectorType.ODBC, 'ODBC'],
+  [ConnectorType.REST, 'REST'],
+  [ConnectorType.SNMP, 'SNMP'],
+  [ConnectorType.FTP, 'FTP'],
+  [ConnectorType.SOCKET, 'SOCKET'],
+  [ConnectorType.XMPP, 'XMPP'],
+  [ConnectorType.OCPP, 'OCPP'],
+  [ConnectorType.CUSTOM, 'CUSTOM']
 ]);
 
+export interface RPCCommand {
+  command: string,
+  params: any,
+  time: number
+}
+
+
+export enum ModbusCommandTypes {
+  Bits = 'bits',
+  Bit = 'bit',
+  String = 'string',
+  Bytes = 'bytes',
+  Int8 = '8int',
+  Uint8 = '8uint',
+  Int16 = '16int',
+  Uint16 = '16uint',
+  Float16 = '16float',
+  Int32 = '32int',
+  Uint32 = '32uint',
+  Float32 = '32float',
+  Int64 = '64int',
+  Uint64 = '64uint',
+  Float64 = '64float'
+}
+
+export const ModbusCodesTranslate = new Map<number, string>([
+  [1, 'gateway.rpc.read-coils'],
+  [2, 'gateway.rpc.read-discrete-inputs'],
+  [3, 'gateway.rpc.read-multiple-holding-registers'],
+  [4, 'gateway.rpc.read-input-registers'],
+  [5, 'gateway.rpc.write-single-coil'],
+  [6, 'gateway.rpc.write-single-holding-register'],
+  [15, 'gateway.rpc.write-multiple-coils'],
+  [16, 'gateway.rpc.write-multiple-holding-registers']
+])
+
+export enum BACnetRequestTypes {
+  WriteProperty = 'writeProperty',
+  ReadProperty = 'readProperty'
+}
+
+export const BACnetRequestTypesTranslates = new Map<BACnetRequestTypes, string>([
+  [BACnetRequestTypes.WriteProperty, 'gateway.rpc.write-property'],
+  [BACnetRequestTypes.ReadProperty, "gateway.rpc.read-property"]
+])
+
+export enum BACnetObjectTypes {
+  BinaryInput = 'binaryInput',
+  BinaryOutput = 'binaryOutput',
+  AnalogInput = 'analogInput',
+  AnalogOutput = 'analogOutput',
+  BinaryValue = 'binaryValue',
+  AnalogValue = 'analogValue'
+}
+
+export const BACnetObjectTypesTranslates = new Map<BACnetObjectTypes, string>([
+  [BACnetObjectTypes.AnalogOutput, 'gateway.rpc.analog-output'],
+  [BACnetObjectTypes.AnalogInput, 'gateway.rpc.analog-input'],
+  [BACnetObjectTypes.BinaryOutput, 'gateway.rpc.binary-output'],
+  [BACnetObjectTypes.BinaryInput, 'gateway.rpc.binary-input'],
+  [BACnetObjectTypes.BinaryValue, 'gateway.rpc.binary-value'],
+  [BACnetObjectTypes.AnalogValue, 'gateway.rpc.analog-value']
+])
+
+export enum BLEMethods {
+  WRITE = 'write',
+  READ = 'read',
+  SCAN = 'scan'
+}
+
+export const BLEMethodsTranslates = new Map<BLEMethods, string>([
+  [BLEMethods.WRITE, 'gateway.rpc.write'],
+  [BLEMethods.READ, 'gateway.rpc.read'],
+  [BLEMethods.SCAN, 'gateway.rpc.scan'],
+])
+
+export enum CANByteOrders {
+  LITTLE = 'LITTLE',
+  BIG = 'BIG'
+}
+
+export enum SocketMethodProcessings {
+  WRITE = 'write'
+}
+
+export const SocketMethodProcessingsTranslates = new Map<SocketMethodProcessings, string>([
+  [SocketMethodProcessings.WRITE, 'gateway.rpc.write']
+])
+
+export enum SNMPMethods {
+  SET = 'set',
+  MULTISET = "multiset",
+  GET = "get",
+  BULKWALK = "bulkwalk",
+  TABLE = "table",
+  MULTIGET = "multiget",
+  GETNEXT = "getnext",
+  BULKGET = "bulkget",
+  WALKS = "walk"
+}
+
+export const SNMPMethodsTranslations = new Map<SNMPMethods, string>([
+  [SNMPMethods.SET, 'gateway.rpc.set'],
+  [SNMPMethods.MULTISET, 'gateway.rpc.multiset'],
+  [SNMPMethods.GET, 'gateway.rpc.get'],
+  [SNMPMethods.BULKWALK, 'gateway.rpc.bulk-walk'],
+  [SNMPMethods.TABLE, 'gateway.rpc.table'],
+  [SNMPMethods.MULTIGET, 'gateway.rpc.multi-get'],
+  [SNMPMethods.GETNEXT, 'gateway.rpc.get-next'],
+  [SNMPMethods.BULKGET, 'gateway.rpc.bul-kget'],
+  [SNMPMethods.WALKS, 'gateway.rpc.walk']
+])
+
+export enum HTTPMethods {
+  CONNECT = 'CONNECT',
+  DELETE = 'DELETE',
+  GET = 'GET',
+  HEAD = 'HEAD',
+  OPTIONS = 'OPTIONS',
+  PATCH = 'PATCH',
+  POST = 'POST',
+  PUT = 'PUT',
+  TRACE = 'TRACE'
+
+}
+
+export enum SocketEncodings {
+  UTF_8 = 'utf-8'
+}
+
+export interface RPCTemplate {
+  name?: string;
+  config: RPCTemplateConfig;
+}
+
+export interface RPCTemplateConfig {
+  [key: string]: any;
+}
+
+export interface SaveRPCTemplateData {
+  config: RPCTemplateConfig,
+  templates: Array<RPCTemplate>
+}
+
 export interface LogLink {
   name: string;
   key: string;
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/maps/map-widget2.ts b/ui-ngx/src/app/modules/home/components/widget/lib/maps/map-widget2.ts
index a760d1ece1..a46e6a8427 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/maps/map-widget2.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/maps/map-widget2.ts
@@ -298,6 +298,6 @@ export class MapWidgetController implements MapWidgetInterface {
     }
 }
 
-export let TbMapWidgetV2: MapWidgetStaticInterface = MapWidgetController;
+export const TbMapWidgetV2: MapWidgetStaticInterface = MapWidgetController;
 
 
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-widget-settings.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/bar-chart-widget-settings.component.html
new file mode 100644
index 0000000000..36ff5a4d0d
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/bar-chart-widget-settings.component.html
@@ -0,0 +1,169 @@
+<!--
+
+    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]="barChartWidgetSettingsForm">
+  <div class="tb-form-panel">
+    <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="sortSeries">
+        {{ 'widgets.latest-chart.sort-series' | translate }}
+      </mat-slide-toggle>
+    </div>
+    <div class="tb-form-panel">
+      <div class="tb-form-panel-title" translate>widgets.bar-chart.bar-appearance</div>
+      <tb-chart-bar-settings
+          formControlName="barSettings"
+          [series]="false">
+      </tb-chart-bar-settings>
+    </div>
+    <div class="tb-form-panel">
+      <div class="tb-form-panel-title" translate>widgets.bar-chart.bar-axis</div>
+      <div class="tb-form-row space-between column-xs">
+        <div translate>widgets.chart.chart-axis.scale</div>
+        <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+          <div class="tb-small-label" translate>widgets.chart.chart-axis.scale-min</div>
+          <mat-form-field appearance="outline" class="number" subscriptSizing="dynamic">
+            <input matInput formControlName="axisMin"
+                   type="number" placeholder="{{ 'widgets.chart.chart-axis.scale-auto' | translate }}">
+          </mat-form-field>
+          <div class="tb-small-label" translate>widgets.chart.chart-axis.scale-max</div>
+          <mat-form-field appearance="outline" class="number" subscriptSizing="dynamic">
+            <input matInput formControlName="axisMax"
+                   type="number" placeholder="{{ 'widgets.chart.chart-axis.scale-auto' | translate }}">
+          </mat-form-field>
+          <tb-font-settings formControlName="axisTickLabelFont"
+                            clearButton
+                            disabledLineHeight
+                            forceSizeUnit="px"
+                            previewText="100">
+          </tb-font-settings>
+          <tb-color-input asBoxInput
+                          colorClearButton
+                          formControlName="axisTickLabelColor">
+          </tb-color-input>
+        </div>
+      </div>
+    </div>
+    <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">
+          <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]="barChartWidgetSettingsForm.get('showTooltip').value" [disabled]="!barChartWidgetSettingsForm.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-chart-animation-settings
+        formControlName="animation">
+    </tb-chart-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/bar-chart-widget-settings.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/bar-chart-widget-settings.component.ts
new file mode 100644
index 0000000000..2074382257
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/bar-chart-widget-settings.component.ts
@@ -0,0 +1,160 @@
+///
+/// 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 {
+  barChartWidgetDefaultSettings,
+  BarChartWidgetSettings
+} from '@home/components/widget/lib/chart/bar-chart-widget.models';
+
+@Component({
+  selector: 'tb-bar-chart-widget-settings',
+  templateUrl: './bar-chart-widget-settings.component.html',
+  styleUrls: []
+})
+export class BarChartWidgetSettingsComponent extends WidgetSettingsComponent {
+
+  legendPositions = legendPositions;
+
+  legendPositionTranslationMap = legendPositionTranslationMap;
+
+  latestChartTooltipValueTypes = latestChartTooltipValueTypes;
+
+  latestChartTooltipValueTypeTranslationMap = latestChartTooltipValueTypeTranslations;
+
+  barChartWidgetSettingsForm: 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.barChartWidgetSettingsForm;
+  }
+
+  protected defaultSettings(): WidgetSettings {
+    return mergeDeep<BarChartWidgetSettings>({} as BarChartWidgetSettings, barChartWidgetDefaultSettings);
+  }
+
+  protected onSettingsSet(settings: WidgetSettings) {
+    this.barChartWidgetSettingsForm = this.fb.group({
+
+      sortSeries: [settings.sortSeries, []],
+
+      barSettings: [settings.barSettings, []],
+
+      axisMin: [settings.axisMin, []],
+      axisMax: [settings.axisMax, []],
+      axisTickLabelFont: [settings.axisTickLabelFont, []],
+      axisTickLabelColor: [settings.axisTickLabelColor, []],
+
+      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 ['showLegend', 'showTooltip'];
+  }
+
+  protected updateValidators(emitEvent: boolean) {
+    const showLegend: boolean = this.barChartWidgetSettingsForm.get('showLegend').value;
+    const showTooltip: boolean = this.barChartWidgetSettingsForm.get('showTooltip').value;
+
+    if (showLegend) {
+      this.barChartWidgetSettingsForm.get('legendPosition').enable();
+      this.barChartWidgetSettingsForm.get('legendLabelFont').enable();
+      this.barChartWidgetSettingsForm.get('legendLabelColor').enable();
+      this.barChartWidgetSettingsForm.get('legendValueFont').enable();
+      this.barChartWidgetSettingsForm.get('legendValueColor').enable();
+    } else {
+      this.barChartWidgetSettingsForm.get('legendPosition').disable();
+      this.barChartWidgetSettingsForm.get('legendLabelFont').disable();
+      this.barChartWidgetSettingsForm.get('legendLabelColor').disable();
+      this.barChartWidgetSettingsForm.get('legendValueFont').disable();
+      this.barChartWidgetSettingsForm.get('legendValueColor').disable();
+    }
+    if (showTooltip) {
+      this.barChartWidgetSettingsForm.get('tooltipValueType').enable();
+      this.barChartWidgetSettingsForm.get('tooltipValueDecimals').enable();
+      this.barChartWidgetSettingsForm.get('tooltipValueFont').enable();
+      this.barChartWidgetSettingsForm.get('tooltipValueColor').enable();
+      this.barChartWidgetSettingsForm.get('tooltipBackgroundColor').enable();
+      this.barChartWidgetSettingsForm.get('tooltipBackgroundBlur').enable();
+    } else {
+      this.barChartWidgetSettingsForm.get('tooltipValueType').disable();
+      this.barChartWidgetSettingsForm.get('tooltipValueDecimals').disable();
+      this.barChartWidgetSettingsForm.get('tooltipValueFont').disable();
+      this.barChartWidgetSettingsForm.get('tooltipValueColor').disable();
+      this.barChartWidgetSettingsForm.get('tooltipBackgroundColor').disable();
+      this.barChartWidgetSettingsForm.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.barChartWidgetSettingsForm.get('tooltipValueType').value;
+    const decimals: number = this.barChartWidgetSettingsForm.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/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 443ee4abc5..8965b462b1 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.chart.bar.show-border' | translate }}
+        </mat-slide-toggle>
+      </div>
+      <div class="tb-form-row space-between column-xs">
+        <div translate>widgets.chart.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.chart.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-chart-fill-settings
+          formControlName="barBackgroundSettings"
+          title="widgets.chart.background"
+          fillNoneTitle="widgets.chart.fill-type-solid">
+      </tb-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
@@ -114,8 +191,10 @@
               {{ 'tooltip.date' | translate }}
             </mat-slide-toggle>
             <div fxFlex.gt-xs fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
-              <tb-date-format-select fxFlex excludeLastUpdateAgo formControlName="tooltipDateFormat"></tb-date-format-select>
+              <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
@@ -124,6 +203,13 @@
               </tb-color-input>
             </div>
           </div>
+          <div class="tb-form-row">
+            <mat-slide-toggle class="mat-slide" formControlName="tooltipDateInterval">
+              <div tb-hint-tooltip-icon="{{'tooltip.show-date-time-interval-hint' | translate}}">
+                {{ 'tooltip.show-date-time-interval' | translate }}
+              </div>
+            </mat-slide-toggle>
+          </div>
           <div class="tb-form-row space-between">
             <div>{{ 'tooltip.background-color' | translate }}</div>
             <tb-color-input asBoxInput
@@ -141,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-chart-animation-settings
+        formControlName="animation">
+    </tb-chart-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 0d547922eb..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,19 +25,28 @@ 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({
   selector: 'tb-bar-chart-with-labels-widget-settings',
   templateUrl: './bar-chart-with-labels-widget-settings.component.html',
-  styleUrls: []
+  styleUrls: ['./../widget-settings.scss']
 })
 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,26 +103,32 @@ 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, []],
       tooltipDateFormat: [settings.tooltipDateFormat, []],
       tooltipDateFont: [settings.tooltipDateFont, []],
       tooltipDateColor: [settings.tooltipDateColor, []],
+      tooltipDateInterval: [settings.tooltipDateInterval, []],
+
       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;
@@ -117,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();
@@ -128,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});
@@ -137,18 +177,23 @@ export class BarChartWithLabelsWidgetSettingsComponent extends WidgetSettingsCom
         this.barChartWidgetSettingsForm.get('tooltipDateFormat').enable();
         this.barChartWidgetSettingsForm.get('tooltipDateFont').enable();
         this.barChartWidgetSettingsForm.get('tooltipDateColor').enable();
+        this.barChartWidgetSettingsForm.get('tooltipDateInterval').enable();
       } else {
         this.barChartWidgetSettingsForm.get('tooltipDateFormat').disable();
         this.barChartWidgetSettingsForm.get('tooltipDateFont').disable();
         this.barChartWidgetSettingsForm.get('tooltipDateColor').disable();
+        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});
       this.barChartWidgetSettingsForm.get('tooltipDateFormat').disable();
       this.barChartWidgetSettingsForm.get('tooltipDateFont').disable();
       this.barChartWidgetSettingsForm.get('tooltipDateColor').disable();
+      this.barChartWidgetSettingsForm.get('tooltipDateInterval').disable();
       this.barChartWidgetSettingsForm.get('tooltipBackgroundColor').disable();
       this.barChartWidgetSettingsForm.get('tooltipBackgroundBlur').disable();
     }
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..4f747206a0 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-chart-animation-settings
+        formControlName="animation">
+    </tb-chart-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..9674bb8d6f
--- /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-chart-animation-settings
+        formControlName="animation">
+    </tb-chart-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..19b49247cd
--- /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/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/polar-area-chart-widget-settings.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/polar-area-chart-widget-settings.component.html
new file mode 100644
index 0000000000..9201173d4d
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/polar-area-chart-widget-settings.component.html
@@ -0,0 +1,176 @@
+<!--
+
+    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]="polarAreaChartWidgetSettingsForm">
+  <div class="tb-form-panel">
+    <div class="tb-form-panel-title" translate>widgets.polar-area-chart.polar-area-chart-style</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">
+      <div class="tb-form-panel-title" translate>widgets.bar-chart.bar-appearance</div>
+      <tb-chart-bar-settings
+          formControlName="barSettings"
+          pieLabelPosition
+          [series]="false">
+      </tb-chart-bar-settings>
+    </div>
+    <div class="tb-form-panel">
+      <div class="tb-form-panel-title" translate>widgets.polar-area-chart.polar-axis</div>
+      <div class="tb-form-row space-between column-xs">
+        <div translate>widgets.chart.chart-axis.scale</div>
+        <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+          <div class="tb-small-label" translate>widgets.chart.chart-axis.scale-min</div>
+          <mat-form-field appearance="outline" class="number" subscriptSizing="dynamic">
+            <input matInput formControlName="axisMin"
+                   type="number" placeholder="{{ 'widgets.chart.chart-axis.scale-auto' | translate }}">
+          </mat-form-field>
+          <div class="tb-small-label" translate>widgets.chart.chart-axis.scale-max</div>
+          <mat-form-field appearance="outline" class="number" subscriptSizing="dynamic">
+            <input matInput formControlName="axisMax"
+                   type="number" placeholder="{{ 'widgets.chart.chart-axis.scale-auto' | translate }}">
+          </mat-form-field>
+          <tb-font-settings formControlName="axisTickLabelFont"
+                            clearButton
+                            disabledLineHeight
+                            forceSizeUnit="px"
+                            previewText="100">
+          </tb-font-settings>
+          <tb-color-input asBoxInput
+                          colorClearButton
+                          formControlName="axisTickLabelColor">
+          </tb-color-input>
+        </div>
+      </div>
+      <div class="tb-form-row space-between">
+        <div translate>widgets.polar-area-chart.start-angle</div>
+        <mat-form-field appearance="outline" class="number" subscriptSizing="dynamic">
+          <input matInput formControlName="angleAxisStartAngle" type="number" min="0" max="360" 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]="polarAreaChartWidgetSettingsForm.get('showLegend').value" [disabled]="!polarAreaChartWidgetSettingsForm.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]="polarAreaChartWidgetSettingsForm.get('showTooltip').value" [disabled]="!polarAreaChartWidgetSettingsForm.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-chart-animation-settings
+        formControlName="animation">
+    </tb-chart-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/polar-area-chart-widget-settings.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/polar-area-chart-widget-settings.component.ts
new file mode 100644
index 0000000000..64144b5319
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/polar-area-chart-widget-settings.component.ts
@@ -0,0 +1,161 @@
+///
+/// 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 {
+  polarAreaChartWidgetDefaultSettings,
+  PolarAreaChartWidgetSettings
+} from '@home/components/widget/lib/chart/polar-area-widget.models';
+
+@Component({
+  selector: 'tb-polar-area-chart-widget-settings',
+  templateUrl: './polar-area-chart-widget-settings.component.html',
+  styleUrls: []
+})
+export class PolarAreaChartWidgetSettingsComponent extends WidgetSettingsComponent {
+
+  legendPositions = legendPositions;
+
+  legendPositionTranslationMap = legendPositionTranslationMap;
+
+  latestChartTooltipValueTypes = latestChartTooltipValueTypes;
+
+  latestChartTooltipValueTypeTranslationMap = latestChartTooltipValueTypeTranslations;
+
+  polarAreaChartWidgetSettingsForm: 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.polarAreaChartWidgetSettingsForm;
+  }
+
+  protected defaultSettings(): WidgetSettings {
+    return mergeDeep<PolarAreaChartWidgetSettings>({} as PolarAreaChartWidgetSettings, polarAreaChartWidgetDefaultSettings);
+  }
+
+  protected onSettingsSet(settings: WidgetSettings) {
+    this.polarAreaChartWidgetSettingsForm = this.fb.group({
+
+      sortSeries: [settings.sortSeries, []],
+
+      barSettings: [settings.barSettings, []],
+
+      axisMin: [settings.axisMin, []],
+      axisMax: [settings.axisMax, []],
+      axisTickLabelFont: [settings.axisTickLabelFont, []],
+      axisTickLabelColor: [settings.axisTickLabelColor, []],
+      angleAxisStartAngle: [settings.angleAxisStartAngle, [Validators.min(0), Validators.max(360)]],
+
+      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 ['showLegend', 'showTooltip'];
+  }
+
+  protected updateValidators(emitEvent: boolean) {
+    const showLegend: boolean = this.polarAreaChartWidgetSettingsForm.get('showLegend').value;
+    const showTooltip: boolean = this.polarAreaChartWidgetSettingsForm.get('showTooltip').value;
+
+    if (showLegend) {
+      this.polarAreaChartWidgetSettingsForm.get('legendPosition').enable();
+      this.polarAreaChartWidgetSettingsForm.get('legendLabelFont').enable();
+      this.polarAreaChartWidgetSettingsForm.get('legendLabelColor').enable();
+      this.polarAreaChartWidgetSettingsForm.get('legendValueFont').enable();
+      this.polarAreaChartWidgetSettingsForm.get('legendValueColor').enable();
+    } else {
+      this.polarAreaChartWidgetSettingsForm.get('legendPosition').disable();
+      this.polarAreaChartWidgetSettingsForm.get('legendLabelFont').disable();
+      this.polarAreaChartWidgetSettingsForm.get('legendLabelColor').disable();
+      this.polarAreaChartWidgetSettingsForm.get('legendValueFont').disable();
+      this.polarAreaChartWidgetSettingsForm.get('legendValueColor').disable();
+    }
+    if (showTooltip) {
+      this.polarAreaChartWidgetSettingsForm.get('tooltipValueType').enable();
+      this.polarAreaChartWidgetSettingsForm.get('tooltipValueDecimals').enable();
+      this.polarAreaChartWidgetSettingsForm.get('tooltipValueFont').enable();
+      this.polarAreaChartWidgetSettingsForm.get('tooltipValueColor').enable();
+      this.polarAreaChartWidgetSettingsForm.get('tooltipBackgroundColor').enable();
+      this.polarAreaChartWidgetSettingsForm.get('tooltipBackgroundBlur').enable();
+    } else {
+      this.polarAreaChartWidgetSettingsForm.get('tooltipValueType').disable();
+      this.polarAreaChartWidgetSettingsForm.get('tooltipValueDecimals').disable();
+      this.polarAreaChartWidgetSettingsForm.get('tooltipValueFont').disable();
+      this.polarAreaChartWidgetSettingsForm.get('tooltipValueColor').disable();
+      this.polarAreaChartWidgetSettingsForm.get('tooltipBackgroundColor').disable();
+      this.polarAreaChartWidgetSettingsForm.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.polarAreaChartWidgetSettingsForm.get('tooltipValueType').value;
+    const decimals: number = this.polarAreaChartWidgetSettingsForm.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/radar-chart-widget-settings.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/radar-chart-widget-settings.component.html
new file mode 100644
index 0000000000..33c0dc1173
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/radar-chart-widget-settings.component.html
@@ -0,0 +1,248 @@
+<!--
+
+    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]="radarChartWidgetSettingsForm">
+  <div class="tb-form-panel">
+    <div class="tb-form-panel-title" translate>widgets.radar-chart.radar-chart-style</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">
+      <div class="tb-form-panel-title" translate>widgets.radar-chart.radar-appearance</div>
+      <div class="tb-form-row space-between">
+        <div>{{ 'widgets.radar-chart.shape' | translate }}</div>
+        <mat-form-field class="medium-width" appearance="outline" subscriptSizing="dynamic">
+          <mat-select formControlName="shape">
+            <mat-option *ngFor="let shape of radarChartShapes" [value]="shape">
+              {{ radarChartShapeTranslations.get(shape) | translate }}
+            </mat-option>
+          </mat-select>
+        </mat-form-field>
+      </div>
+      <div class="tb-form-row space-between">
+        <div translate>widgets.radar-chart.color</div>
+        <tb-color-input asBoxInput
+                        colorClearButton
+                        formControlName="color">
+        </tb-color-input>
+      </div>
+      <div class="tb-form-row space-between column-xs">
+        <mat-slide-toggle class="mat-slide" formControlName="showLine">
+          {{ 'widgets.radar-chart.line' | translate }}
+        </mat-slide-toggle>
+        <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+          <mat-form-field class="medium-width" fxFlex.xs appearance="outline" subscriptSizing="dynamic">
+            <mat-select formControlName="lineType">
+              <mat-option *ngFor="let type of chartLineTypes" [value]="type">
+                {{ chartLineTypeTranslations.get(type) | translate }}
+              </mat-option>
+            </mat-select>
+          </mat-form-field>
+          <mat-form-field appearance="outline" class="number fixed-width" subscriptSizing="dynamic">
+            <input matInput formControlName="lineWidth"
+                   type="number" min="0" step="1" placeholder="{{ 'widget-config.set' | translate }}">
+          </mat-form-field>
+        </div>
+      </div>
+      <div class="tb-form-row space-between column-xs">
+        <mat-slide-toggle class="mat-slide" formControlName="showPoints">
+          {{ 'widgets.radar-chart.points' | translate }}
+        </mat-slide-toggle>
+        <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+          <mat-form-field class="medium-width" fxFlex.xs appearance="outline" subscriptSizing="dynamic">
+            <mat-select formControlName="pointShape">
+              <mat-option *ngFor="let shape of chartShapes" [value]="shape">
+                {{ chartShapeTranslations.get(shape) | translate }}
+              </mat-option>
+            </mat-select>
+          </mat-form-field>
+          <mat-form-field appearance="outline" class="number fixed-width" subscriptSizing="dynamic">
+            <input matInput formControlName="pointSize"
+                   type="number" min="0" step="1" placeholder="{{ 'widget-config.set' | translate }}">
+          </mat-form-field>
+        </div>
+      </div>
+      <div class="tb-form-row space-between column-lt-md">
+        <mat-slide-toggle class="mat-slide" formControlName="showLabel">
+          {{ 'widgets.radar-chart.points-label' | translate }}
+        </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="labelPosition">
+              <mat-option *ngFor="let position of chartLabelPositions" [value]="position">
+                {{ chartLabelPositionTranslations.get(position) | translate }}
+              </mat-option>
+            </mat-select>
+          </mat-form-field>
+          <tb-font-settings formControlName="labelFont"
+                            clearButton
+                            disabledLineHeight
+                            forceSizeUnit="px"
+                            [previewText]="valuePreviewFn">
+          </tb-font-settings>
+          <tb-color-input asBoxInput
+                          colorClearButton
+                          formControlName="labelColor">
+          </tb-color-input>
+        </div>
+      </div>
+      <tb-chart-fill-settings
+          formControlName="fillAreaSettings">
+      </tb-chart-fill-settings>
+    </div>
+    <div class="tb-form-panel">
+      <div class="tb-form-panel-title" translate>widgets.radar-chart.radar-axis</div>
+      <div class="tb-form-row space-between">
+        <mat-slide-toggle class="mat-slide" formControlName="axisShowLabel">
+          {{ 'widgets.radar-chart.axis-label' | translate }}
+        </mat-slide-toggle>
+        <tb-font-settings formControlName="axisLabelFont"
+                          clearButton
+                          disabledLineHeight
+                          forceSizeUnit="px"
+                          previewText="Wind">
+        </tb-font-settings>
+      </div>
+      <div class="tb-form-row space-between">
+        <mat-slide-toggle class="mat-slide" formControlName="axisShowTickLabels">
+          {{ 'widgets.radar-chart.ticks-label' | translate }}
+        </mat-slide-toggle>
+        <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+          <tb-font-settings formControlName="axisTickLabelFont"
+                            clearButton
+                            disabledLineHeight
+                            forceSizeUnit="px"
+                            previewText="100">
+          </tb-font-settings>
+          <tb-color-input asBoxInput
+                          colorClearButton
+                          formControlName="axisTickLabelColor">
+          </tb-color-input>
+        </div>
+      </div>
+    </div>
+    <div class="tb-form-panel tb-slide-toggle">
+      <mat-expansion-panel class="tb-settings" [expanded]="radarChartWidgetSettingsForm.get('showLegend').value" [disabled]="!radarChartWidgetSettingsForm.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]="radarChartWidgetSettingsForm.get('showTooltip').value" [disabled]="!radarChartWidgetSettingsForm.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-chart-animation-settings
+        formControlName="animation">
+    </tb-chart-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/radar-chart-widget-settings.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/radar-chart-widget-settings.component.ts
new file mode 100644
index 0000000000..a4900aa51b
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/radar-chart-widget-settings.component.ts
@@ -0,0 +1,244 @@
+///
+/// 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 {
+  radarChartWidgetDefaultSettings,
+  RadarChartWidgetSettings
+} from '@home/components/widget/lib/chart/radar-chart-widget.models';
+import { radarChartShapes, radarChartShapeTranslations } from '@home/components/widget/lib/chart/radar-chart.models';
+import {
+  chartLabelPositions,
+  chartLabelPositionTranslations,
+  chartLineTypes,
+  chartLineTypeTranslations,
+  chartShapes,
+  chartShapeTranslations
+} from '@home/components/widget/lib/chart/chart.models';
+
+@Component({
+  selector: 'tb-radar-chart-widget-settings',
+  templateUrl: './radar-chart-widget-settings.component.html',
+  styleUrls: []
+})
+export class RadarChartWidgetSettingsComponent extends WidgetSettingsComponent {
+
+  radarChartShapes = radarChartShapes;
+
+  radarChartShapeTranslations = radarChartShapeTranslations;
+
+  chartLineTypes = chartLineTypes;
+
+  chartLineTypeTranslations = chartLineTypeTranslations;
+
+  chartShapes = chartShapes;
+
+  chartShapeTranslations = chartShapeTranslations;
+
+  chartLabelPositions = chartLabelPositions;
+
+  chartLabelPositionTranslations = chartLabelPositionTranslations;
+
+  legendPositions = legendPositions;
+
+  legendPositionTranslationMap = legendPositionTranslationMap;
+
+  latestChartTooltipValueTypes = latestChartTooltipValueTypes;
+
+  latestChartTooltipValueTypeTranslationMap = latestChartTooltipValueTypeTranslations;
+
+  radarChartWidgetSettingsForm: 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.radarChartWidgetSettingsForm;
+  }
+
+  protected defaultSettings(): WidgetSettings {
+    return mergeDeep<RadarChartWidgetSettings>({} as RadarChartWidgetSettings, radarChartWidgetDefaultSettings);
+  }
+
+  protected onSettingsSet(settings: WidgetSettings) {
+    this.radarChartWidgetSettingsForm = this.fb.group({
+
+      sortSeries: [settings.sortSeries, []],
+
+      shape: [settings.shape, []],
+      color: [settings.color, []],
+      showLine: [settings.showLine, []],
+      lineType: [settings.lineType, []],
+      lineWidth: [settings.lineWidth, [Validators.min(0)]],
+      showPoints: [settings.showPoints, []],
+      pointShape: [settings.pointShape, []],
+      pointSize: [settings.pointSize, [Validators.min(0)]],
+      showLabel: [settings.showLabel, []],
+      labelPosition: [settings.labelPosition, []],
+      labelFont: [settings.labelFont, []],
+      labelColor: [settings.labelColor, []],
+      fillAreaSettings: [settings.fillAreaSettings, []],
+
+      axisShowLabel: [settings.axisShowLabel, []],
+      axisLabelFont: [settings.axisLabelFont, []],
+      axisShowTickLabels: [settings.axisShowTickLabels, []],
+      axisTickLabelFont: [settings.axisTickLabelFont, []],
+      axisTickLabelColor: [settings.axisTickLabelColor, []],
+
+      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 ['showLine', 'showPoints', 'showLabel', 'axisShowLabel',
+      'axisShowTickLabels', 'showLegend', 'showTooltip'];
+  }
+
+  protected updateValidators(emitEvent: boolean) {
+    const showLine: boolean = this.radarChartWidgetSettingsForm.get('showLine').value;
+    const showPoints: boolean = this.radarChartWidgetSettingsForm.get('showPoints').value;
+    const showLabel: boolean = this.radarChartWidgetSettingsForm.get('showLabel').value;
+    const axisShowLabel: boolean = this.radarChartWidgetSettingsForm.get('axisShowLabel').value;
+    const axisShowTickLabels: boolean = this.radarChartWidgetSettingsForm.get('axisShowTickLabels').value;
+    const showLegend: boolean = this.radarChartWidgetSettingsForm.get('showLegend').value;
+    const showTooltip: boolean = this.radarChartWidgetSettingsForm.get('showTooltip').value;
+
+    if (showLine) {
+      this.radarChartWidgetSettingsForm.get('lineType').enable();
+      this.radarChartWidgetSettingsForm.get('lineWidth').enable();
+    } else {
+      this.radarChartWidgetSettingsForm.get('lineType').disable();
+      this.radarChartWidgetSettingsForm.get('lineWidth').disable();
+    }
+
+    if (showPoints) {
+      this.radarChartWidgetSettingsForm.get('pointShape').enable();
+      this.radarChartWidgetSettingsForm.get('pointSize').enable();
+    } else {
+      this.radarChartWidgetSettingsForm.get('pointShape').disable();
+      this.radarChartWidgetSettingsForm.get('pointSize').disable();
+    }
+
+    if (showLabel) {
+      this.radarChartWidgetSettingsForm.get('labelPosition').enable();
+      this.radarChartWidgetSettingsForm.get('labelFont').enable();
+      this.radarChartWidgetSettingsForm.get('labelColor').enable();
+    } else {
+      this.radarChartWidgetSettingsForm.get('labelPosition').disable();
+      this.radarChartWidgetSettingsForm.get('labelFont').disable();
+      this.radarChartWidgetSettingsForm.get('labelColor').disable();
+    }
+
+    if (axisShowLabel) {
+      this.radarChartWidgetSettingsForm.get('axisLabelFont').enable();
+    } else {
+      this.radarChartWidgetSettingsForm.get('axisLabelFont').disable();
+    }
+
+    if (axisShowTickLabels) {
+      this.radarChartWidgetSettingsForm.get('axisTickLabelFont').enable();
+      this.radarChartWidgetSettingsForm.get('axisTickLabelColor').enable();
+    } else {
+      this.radarChartWidgetSettingsForm.get('axisTickLabelFont').disable();
+      this.radarChartWidgetSettingsForm.get('axisTickLabelColor').disable();
+    }
+
+    if (showLegend) {
+      this.radarChartWidgetSettingsForm.get('legendPosition').enable();
+      this.radarChartWidgetSettingsForm.get('legendLabelFont').enable();
+      this.radarChartWidgetSettingsForm.get('legendLabelColor').enable();
+      this.radarChartWidgetSettingsForm.get('legendValueFont').enable();
+      this.radarChartWidgetSettingsForm.get('legendValueColor').enable();
+    } else {
+      this.radarChartWidgetSettingsForm.get('legendPosition').disable();
+      this.radarChartWidgetSettingsForm.get('legendLabelFont').disable();
+      this.radarChartWidgetSettingsForm.get('legendLabelColor').disable();
+      this.radarChartWidgetSettingsForm.get('legendValueFont').disable();
+      this.radarChartWidgetSettingsForm.get('legendValueColor').disable();
+    }
+    if (showTooltip) {
+      this.radarChartWidgetSettingsForm.get('tooltipValueType').enable();
+      this.radarChartWidgetSettingsForm.get('tooltipValueDecimals').enable();
+      this.radarChartWidgetSettingsForm.get('tooltipValueFont').enable();
+      this.radarChartWidgetSettingsForm.get('tooltipValueColor').enable();
+      this.radarChartWidgetSettingsForm.get('tooltipBackgroundColor').enable();
+      this.radarChartWidgetSettingsForm.get('tooltipBackgroundBlur').enable();
+    } else {
+      this.radarChartWidgetSettingsForm.get('tooltipValueType').disable();
+      this.radarChartWidgetSettingsForm.get('tooltipValueDecimals').disable();
+      this.radarChartWidgetSettingsForm.get('tooltipValueFont').disable();
+      this.radarChartWidgetSettingsForm.get('tooltipValueColor').disable();
+      this.radarChartWidgetSettingsForm.get('tooltipBackgroundColor').disable();
+      this.radarChartWidgetSettingsForm.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.radarChartWidgetSettingsForm.get('tooltipValueType').value;
+    const decimals: number = this.radarChartWidgetSettingsForm.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 7099ca19d8..a7ced000bf 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 chartLineTypes" [value]="lineType">
+                {{ chartLineTypeTranslations.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 chartLabelPositions" [value]="position">
+                  {{ chartLabelPositionTranslations.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 chartShapes" [value]="shape">
+                {{ chartShapeTranslations.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
@@ -104,8 +267,10 @@
               {{ 'tooltip.date' | translate }}
             </mat-slide-toggle>
             <div fxFlex.gt-xs fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
-              <tb-date-format-select fxFlex excludeLastUpdateAgo formControlName="tooltipDateFormat"></tb-date-format-select>
+              <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
@@ -114,6 +279,13 @@
               </tb-color-input>
             </div>
           </div>
+          <div class="tb-form-row">
+            <mat-slide-toggle class="mat-slide" formControlName="tooltipDateInterval">
+              <div tb-hint-tooltip-icon="{{'tooltip.show-date-time-interval-hint' | translate}}">
+                {{ 'tooltip.show-date-time-interval' | translate }}
+              </div>
+            </mat-slide-toggle>
+          </div>
           <div class="tb-form-row space-between">
             <div>{{ 'tooltip.background-color' | translate }}</div>
             <tb-color-input asBoxInput
@@ -131,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-chart-animation-settings
+        formControlName="animation">
+    </tb-chart-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 c0e043995d..2dd34a10d7 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,33 @@
 
 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
+} from '@home/components/widget/lib/chart/time-series-chart.models';
+import {
+  chartLabelPositions,
+  chartLabelPositionTranslations,
+  chartLineTypes,
+  chartLineTypeTranslations,
+  chartShapes,
+  chartShapeTranslations
+} from '@home/components/widget/lib/chart/chart.models';
 
 @Component({
   selector: 'tb-range-chart-widget-settings',
@@ -35,12 +51,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;
+
+  chartLineTypes = chartLineTypes;
+
+  chartLineTypeTranslations = chartLineTypeTranslations;
+
+  chartLabelPositions = chartLabelPositions;
+
+  chartLabelPositionTranslations = chartLabelPositionTranslations;
+
+  chartShapes = chartShapes;
+
+  chartShapeTranslations = chartShapeTranslations;
+
   legendPositions = legendPositions;
 
   legendPositionTranslationMap = legendPositionTranslationMap;
 
   rangeChartWidgetSettingsForm: UntypedFormGroup;
 
+  pointLabelPreviewFn = this._pointLabelPreviewFn.bind(this);
+
   tooltipValuePreviewFn = this._tooltipValuePreviewFn.bind(this);
 
   tooltipDatePreviewFn = this._tooltipDatePreviewFn.bind(this);
@@ -56,7 +99,7 @@ export class RangeChartWidgetSettingsComponent extends WidgetSettingsComponent {
   }
 
   protected defaultSettings(): WidgetSettings {
-    return {...rangeChartDefaultSettings};
+    return mergeDeep<RangeChartWidgetSettings>({} as RangeChartWidgetSettings, rangeChartDefaultSettings);
   }
 
   protected onSettingsSet(settings: WidgetSettings) {
@@ -64,7 +107,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,28 +144,88 @@ 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, []],
       tooltipDateFormat: [settings.tooltipDateFormat, []],
       tooltipDateFont: [settings.tooltipDateFont, []],
       tooltipDateColor: [settings.tooltipDateColor, []],
+      tooltipDateInterval: [settings.tooltipDateInterval, []],
+
       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) {
+  protected updateValidators() {
+    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();
@@ -105,6 +237,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});
@@ -114,23 +248,34 @@ export class RangeChartWidgetSettingsComponent extends WidgetSettingsComponent {
         this.rangeChartWidgetSettingsForm.get('tooltipDateFormat').enable();
         this.rangeChartWidgetSettingsForm.get('tooltipDateFont').enable();
         this.rangeChartWidgetSettingsForm.get('tooltipDateColor').enable();
+        this.rangeChartWidgetSettingsForm.get('tooltipDateInterval').enable();
       } else {
         this.rangeChartWidgetSettingsForm.get('tooltipDateFormat').disable();
         this.rangeChartWidgetSettingsForm.get('tooltipDateFont').disable();
         this.rangeChartWidgetSettingsForm.get('tooltipDateColor').disable();
+        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});
       this.rangeChartWidgetSettingsForm.get('tooltipDateFormat').disable();
       this.rangeChartWidgetSettingsForm.get('tooltipDateFont').disable();
       this.rangeChartWidgetSettingsForm.get('tooltipDateColor').disable();
+      this.rangeChartWidgetSettingsForm.get('tooltipDateInterval').disable();
       this.rangeChartWidgetSettingsForm.get('tooltipBackgroundColor').disable();
       this.rangeChartWidgetSettingsForm.get('tooltipBackgroundBlur').disable();
     }
   }
 
+  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;
@@ -143,5 +288,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-key-settings.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-key-settings.component.html
new file mode 100644
index 0000000000..1299f0574a
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-key-settings.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]="timeSeriesChartKeySettingsForm">
+  <div class="tb-form-panel">
+    <div class="tb-form-panel-title" translate>widgets.time-series-chart.series.legend-settings</div>
+    <mat-slide-toggle class="mat-slide" formControlName="showInLegend">
+      <div tb-hint-tooltip-icon="{{'widgets.time-series-chart.series.show-in-legend-hint' | translate}}">
+        {{ 'widgets.time-series-chart.series.show-in-legend' | translate }}
+      </div>
+    </mat-slide-toggle>
+    <mat-slide-toggle class="mat-slide" formControlName="dataHiddenByDefault">
+      <div tb-hint-tooltip-icon="{{'widgets.time-series-chart.series.hidden-by-default-hint' | translate}}">
+        {{ 'widgets.time-series-chart.series.hidden-by-default' | translate }}
+      </div>
+    </mat-slide-toggle>
+  </div>
+  <div class="tb-form-panel">
+    <div 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">
+          <mat-option *ngFor="let yAxis of yAxisIds" [value]="yAxis">
+            {{ yAxis }}
+          </mat-option>
+        </mat-select>
+      </mat-form-field>
+    </div>
+  </div>
+  <div class="tb-form-panel">
+    <div *ngIf="chartType === TimeSeriesChartType.default; else chartTypeTitle" fxLayout="row" fxLayoutAlign="space-between center">
+      <div class="tb-form-panel-title" translate>widgets.time-series-chart.series.series-type</div>
+      <tb-toggle-select formControlName="type">
+        <tb-toggle-option *ngFor="let type of timeSeriesChartSeriesTypes" [value]="type">{{ timeSeriesChartSeriesTypeTranslations.get(type) | translate }}</tb-toggle-option>
+      </tb-toggle-select>
+    </div>
+    <tb-time-series-chart-line-settings [fxShow]="timeSeriesChartKeySettingsForm.get('type').value === TimeSeriesChartSeriesType.line"
+                                        [chartType]="chartType"
+                                        formControlName="lineSettings">
+    </tb-time-series-chart-line-settings>
+    <tb-chart-bar-settings [fxShow]="timeSeriesChartKeySettingsForm.get('type').value === TimeSeriesChartSeriesType.bar"
+                                     formControlName="barSettings">
+    </tb-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>
+</ng-template>
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
new file mode 100644
index 0000000000..229607d7f3
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-key-settings.component.ts
@@ -0,0 +1,143 @@
+///
+/// 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 { WidgetSettings, WidgetSettingsComponent } from '@shared/models/widget.models';
+import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
+import { Store } from '@ngrx/store';
+import { AppState } from '@core/core.state';
+import { isDefinedAndNotNull, mergeDeep } from '@core/utils';
+import {
+  timeSeriesChartKeyDefaultSettings,
+  TimeSeriesChartKeySettings,
+  TimeSeriesChartSeriesType,
+  timeSeriesChartSeriesTypes,
+  timeSeriesChartSeriesTypeTranslations, TimeSeriesChartType, timeSeriesChartTypeTranslations, TimeSeriesChartYAxisId
+} 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',
+  templateUrl: './time-series-chart-key-settings.component.html',
+  styleUrls: ['./../widget-settings.scss']
+})
+export class TimeSeriesChartKeySettingsComponent extends WidgetSettingsComponent {
+
+  TimeSeriesChartType = TimeSeriesChartType;
+
+  timeSeriesChartTypeTranslations = timeSeriesChartTypeTranslations;
+
+  TimeSeriesChartSeriesType = TimeSeriesChartSeriesType;
+
+  timeSeriesChartSeriesTypes = timeSeriesChartSeriesTypes;
+
+  timeSeriesChartSeriesTypeTranslations = timeSeriesChartSeriesTypeTranslations;
+
+  timeSeriesChartKeySettingsForm: UntypedFormGroup;
+
+  chartType = TimeSeriesChartType.default;
+
+  yAxisIds: TimeSeriesChartYAxisId[];
+
+  comparisonEnabled: boolean;
+
+  functionScopeVariables = this.widgetService.getWidgetScopeVariables();
+
+  constructor(protected store: Store<AppState>,
+              private widgetService: WidgetService,
+              private fb: UntypedFormBuilder) {
+    super(store);
+  }
+
+  protected settingsForm(): UntypedFormGroup {
+    return this.timeSeriesChartKeySettingsForm;
+  }
+
+  protected onWidgetConfigSet(widgetConfig: WidgetConfigComponentData) {
+    const params = widgetConfig.typeParameters as any;
+    if (isDefinedAndNotNull(params.chartType)) {
+      this.chartType = params.chartType;
+    }
+    const widgetSettings = (widgetConfig.config?.settings || {}) as TimeSeriesChartWidgetSettings;
+    this.yAxisIds = widgetSettings.yAxes ? Object.keys(widgetSettings.yAxes) : ['default'];
+    this.comparisonEnabled = !!widgetSettings.comparisonEnabled;
+  }
+
+  protected defaultSettings(): WidgetSettings {
+    return mergeDeep<TimeSeriesChartKeySettings>({} as TimeSeriesChartKeySettings,
+      timeSeriesChartKeyDefaultSettings);
+  }
+
+  protected onSettingsSet(settings: WidgetSettings) {
+    const seriesSettings = settings as TimeSeriesChartKeySettings;
+    let yAxisId = seriesSettings.yAxisId;
+    if (!this.yAxisIds.includes(yAxisId)) {
+      yAxisId = 'default';
+    }
+    this.timeSeriesChartKeySettingsForm = this.fb.group({
+      yAxisId: [yAxisId, []],
+      showInLegend: [seriesSettings.showInLegend, []],
+      dataHiddenByDefault: [seriesSettings.dataHiddenByDefault, []],
+      type: [seriesSettings.type, []],
+      lineSettings: [seriesSettings.lineSettings, []],
+      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', '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 {
+      this.timeSeriesChartKeySettingsForm.get('dataHiddenByDefault').patchValue(false, {emitEvent: false});
+      this.timeSeriesChartKeySettingsForm.get('dataHiddenByDefault').disable();
+    }
+    if (type === TimeSeriesChartSeriesType.line) {
+      this.timeSeriesChartKeySettingsForm.get('lineSettings').enable();
+      this.timeSeriesChartKeySettingsForm.get('barSettings').disable();
+    } else if (type === TimeSeriesChartSeriesType.bar) {
+      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
new file mode 100644
index 0000000000..e71113cdbf
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-line-settings.component.html
@@ -0,0 +1,125 @@
+<!--
+
+    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]="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 *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>
+    </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 *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>
+    </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 chartLineTypes" [value]="lineType">
+            {{ chartLineTypeTranslations.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 *ngIf="chartType !== TimeSeriesChartType.point; else pointSettings" 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>
+    <ng-container *ngTemplateOutlet="pointSettings"></ng-container>
+  </div>
+  <tb-chart-fill-settings
+    formControlName="fillAreaSettings">
+  </tb-chart-fill-settings>
+</ng-container>
+<ng-template #pointSettings [formGroup]="lineSettingsFormGroup">
+  <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 chartLabelPositions" [value]="position">
+            {{ chartLabelPositionTranslations.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 chartShapes" [value]="shape">
+          {{ chartShapeTranslations.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>
+</ng-template>
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
new file mode 100644
index 0000000000..2f0ca0197a
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-line-settings.component.ts
@@ -0,0 +1,217 @@
+///
+/// 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 {
+  LineSeriesSettings,
+  lineSeriesStepTypes,
+  lineSeriesStepTypeTranslations,
+  TimeSeriesChartType
+} from '@home/components/widget/lib/chart/time-series-chart.models';
+import { Store } from '@ngrx/store';
+import { AppState } from '@core/core.state';
+import { merge } from 'rxjs';
+import { formatValue, isDefinedAndNotNull } from '@core/utils';
+import { DataKeyConfigComponent } from '@home/components/widget/config/data-key-config.component';
+import {
+  chartLabelPositions,
+  chartLabelPositionTranslations,
+  chartLineTypes,
+  chartLineTypeTranslations,
+  chartShapes,
+  chartShapeTranslations
+} from '@home/components/widget/lib/chart/chart.models';
+
+@Component({
+  selector: 'tb-time-series-chart-line-settings',
+  templateUrl: './time-series-chart-line-settings.component.html',
+  styleUrls: ['./../widget-settings.scss'],
+  providers: [
+    {
+      provide: NG_VALUE_ACCESSOR,
+      useExisting: forwardRef(() => TimeSeriesChartLineSettingsComponent),
+      multi: true
+    }
+  ]
+})
+export class TimeSeriesChartLineSettingsComponent implements OnInit, ControlValueAccessor {
+
+  TimeSeriesChartType = TimeSeriesChartType;
+
+  lineSeriesStepTypes = lineSeriesStepTypes;
+
+  lineSeriesStepTypeTranslations = lineSeriesStepTypeTranslations;
+
+  chartLineTypes = chartLineTypes;
+
+  chartLineTypeTranslations = chartLineTypeTranslations;
+
+  chartLabelPositions = chartLabelPositions;
+
+  chartLabelPositionTranslations = chartLabelPositionTranslations;
+
+  chartShapes = chartShapes;
+
+  chartShapeTranslations = chartShapeTranslations;
+
+  pointLabelPreviewFn = this._pointLabelPreviewFn.bind(this);
+
+  @Input()
+  disabled: boolean;
+
+  @Input()
+  chartType: TimeSeriesChartType;
+
+  private modelValue: LineSeriesSettings;
+
+  private propagateChange = null;
+
+  public lineSettingsFormGroup: UntypedFormGroup;
+
+  constructor(protected store: Store<AppState>,
+              private dataKeyConfigComponent: DataKeyConfigComponent,
+              private fb: UntypedFormBuilder) {
+  }
+
+  ngOnInit(): void {
+    this.lineSettingsFormGroup = this.fb.group({
+      showLine: [null, []],
+      step: [null, []],
+      stepType: [null, []],
+      smooth: [null, []],
+      lineType: [null, []],
+      lineWidth: [null, [Validators.min(0)]],
+      showPoints: [null, []],
+      showPointLabel: [null, []],
+      pointLabelPosition: [null, []],
+      pointLabelFont: [null, []],
+      pointLabelColor: [null, []],
+      enablePointLabelBackground: [null, []],
+      pointLabelBackground: [null, []],
+      pointShape: [null, []],
+      pointSize: [null, [Validators.min(0)]],
+      fillAreaSettings: [null, []]
+    });
+    this.lineSettingsFormGroup.valueChanges.subscribe(() => {
+      this.updateModel();
+    });
+    merge(this.lineSettingsFormGroup.get('showLine').valueChanges,
+      this.lineSettingsFormGroup.get('step').valueChanges,
+      this.lineSettingsFormGroup.get('showPointLabel').valueChanges,
+      this.lineSettingsFormGroup.get('enablePointLabelBackground').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.lineSettingsFormGroup.disable({emitEvent: false});
+    } else {
+      this.lineSettingsFormGroup.enable({emitEvent: false});
+      this.updateValidators();
+    }
+  }
+
+  writeValue(value: LineSeriesSettings): void {
+    this.modelValue = value;
+    this.lineSettingsFormGroup.patchValue(
+      value, {emitEvent: false}
+    );
+    this.updateValidators();
+  }
+
+  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) {
+      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});
+      } else {
+        this.lineSettingsFormGroup.get('stepType').disable({emitEvent: false});
+        this.lineSettingsFormGroup.get('smooth').enable({emitEvent: false});
+      }
+      this.lineSettingsFormGroup.get('lineType').enable({emitEvent: false});
+      this.lineSettingsFormGroup.get('lineWidth').enable({emitEvent: false});
+    } else {
+      this.lineSettingsFormGroup.get('step').disable({emitEvent: false});
+      this.lineSettingsFormGroup.get('stepType').disable({emitEvent: false});
+      this.lineSettingsFormGroup.get('smooth').disable({emitEvent: false});
+      this.lineSettingsFormGroup.get('lineType').disable({emitEvent: false});
+      this.lineSettingsFormGroup.get('lineWidth').disable({emitEvent: false});
+    }
+    if (showPointLabel) {
+      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});
+    }
+  }
+
+  private updateModel() {
+    this.modelValue = this.lineSettingsFormGroup.getRawValue();
+    this.propagateChange(this.modelValue);
+  }
+
+  private _pointLabelPreviewFn(): string {
+    const dataKey = this.dataKeyConfigComponent.modelValue;
+    const widgetConfig = this.dataKeyConfigComponent.widgetConfig;
+    const units = dataKey.units && dataKey.units.length ? dataKey.units : widgetConfig.config.units;
+    const decimals = isDefinedAndNotNull(dataKey.decimals) ? dataKey.decimals :
+      (isDefinedAndNotNull(widgetConfig.config.decimals) ? widgetConfig.config.decimals : 2);
+    return formatValue(22, decimals, units, 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
new file mode 100644
index 0000000000..79a517a7d8
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-widget-settings.component.html
@@ -0,0 +1,275 @@
+<!--
+
+    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]="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)"
+    advanced>
+  </tb-time-series-chart-y-axes-panel>
+  <tb-time-series-chart-thresholds-panel
+      formControlName="thresholds"
+      [aliasController]="aliasController"
+      [dataKeyCallbacks]="dataKeyCallbacks"
+      [datasource]="datasource"
+      [widgetConfig]="widgetConfig?.config"
+      [yAxisIds]="yAxisIds">
+  </tb-time-series-chart-thresholds-panel>
+  <div class="tb-form-panel">
+    <div class="tb-form-panel-title" translate>widgets.time-series-chart.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>
+    <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}}">
+          {{ 'widgets.time-series-chart.stack-mode' | translate }}
+        </div>
+      </mat-slide-toggle>
+    </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"
+          advanced
+          axisType="xAxis">
+      </tb-time-series-chart-axis-settings>
+    </div>
+    <tb-time-series-no-aggregation-bar-width-settings
+      *ngIf="chartType === TimeSeriesChartType.default || chartType === TimeSeriesChartType.bar"
+      formControlName="noAggregationBarWidthSettings">
+    </tb-time-series-no-aggregation-bar-width-settings>
+    <div class="tb-form-panel tb-slide-toggle">
+      <mat-expansion-panel class="tb-settings" [expanded]="timeSeriesChartWidgetSettingsForm.get('showLegend').value"
+                           [disabled]="!timeSeriesChartWidgetSettingsForm.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.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
+                              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"
+                                [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>
+        </ng-template>
+      </mat-expansion-panel>
+    </div>
+    <div class="tb-form-panel tb-slide-toggle">
+      <mat-expansion-panel class="tb-settings" [expanded]="timeSeriesChartWidgetSettingsForm.get('showTooltip').value"
+                           [disabled]="!timeSeriesChartWidgetSettingsForm.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">
+            <div>{{ 'tooltip.trigger' | translate }}</div>
+            <mat-chip-listbox class="center-stretch" formControlName="tooltipTrigger">
+              <mat-chip-option [selectable]="timeSeriesChartWidgetSettingsForm.get('tooltipTrigger').value !== EChartsTooltipTrigger.point"
+                               [value]="EChartsTooltipTrigger.point">{{ 'tooltip.trigger-point' | translate }}</mat-chip-option>
+              <mat-chip-option [selectable]="timeSeriesChartWidgetSettingsForm.get('tooltipTrigger').value !== EChartsTooltipTrigger.axis"
+                               [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
+                              colorClearButton
+                              formControlName="tooltipValueColor">
+              </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 }}
+            </mat-slide-toggle>
+            <div fxFlex.gt-xs fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+              <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
+                              colorClearButton
+                              formControlName="tooltipDateColor">
+              </tb-color-input>
+            </div>
+          </div>
+          <div class="tb-form-row">
+            <mat-slide-toggle class="mat-slide" formControlName="tooltipDateInterval">
+              <div tb-hint-tooltip-icon="{{'tooltip.show-date-time-interval-hint' | translate}}">
+                {{ 'tooltip.show-date-time-interval' | translate }}
+              </div>
+            </mat-slide-toggle>
+          </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-chart-animation-settings
+      formControlName="animation">
+    </tb-chart-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/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
new file mode 100644
index 0000000000..32d3f5dd80
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-widget-settings.component.ts
@@ -0,0 +1,270 @@
+///
+/// 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 {
+  DataKey,
+  Datasource,
+  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, isDefinedAndNotNull, mergeDeep } from '@core/utils';
+import { DateFormatProcessor, DateFormatSettings } from '@shared/models/widget-settings.models';
+import {
+  timeSeriesChartWidgetDefaultSettings,
+  TimeSeriesChartWidgetSettings
+} from '@home/components/widget/lib/chart/time-series-chart-widget.models';
+import {
+  TimeSeriesChartTooltipTrigger,
+  TimeSeriesChartKeySettings,
+  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',
+  templateUrl: './time-series-chart-widget-settings.component.html',
+  styleUrls: ['./../widget-settings.scss']
+})
+export class TimeSeriesChartWidgetSettingsComponent extends WidgetSettingsComponent {
+
+  public get datasource(): Datasource {
+    const datasources: Datasource[] = this.widgetConfig.config.datasources;
+    if (datasources && datasources.length) {
+      return datasources[0];
+    } else {
+      return null;
+    }
+  }
+
+  public get yAxisIds(): TimeSeriesChartYAxisId[] {
+    const yAxes: TimeSeriesChartYAxes = this.timeSeriesChartWidgetSettingsForm.get('yAxes').value;
+    return Object.keys(yAxes);
+  }
+
+  TimeSeriesChartType = TimeSeriesChartType;
+
+  EChartsTooltipTrigger = TimeSeriesChartTooltipTrigger;
+
+  legendPositions = legendPositions;
+
+  legendPositionTranslationMap = legendPositionTranslationMap;
+
+  timeSeriesChartWidgetSettingsForm: UntypedFormGroup;
+
+  tooltipValuePreviewFn = this._tooltipValuePreviewFn.bind(this);
+
+  tooltipDatePreviewFn = this._tooltipDatePreviewFn.bind(this);
+
+  chartType: TimeSeriesChartType = TimeSeriesChartType.default;
+
+  functionScopeVariables = this.widgetService.getWidgetScopeVariables();
+
+  constructor(protected store: Store<AppState>,
+              private $injector: Injector,
+              private widgetService: WidgetService,
+              private fb: UntypedFormBuilder) {
+    super(store);
+  }
+
+  public yAxisRemoved(yAxisId: TimeSeriesChartYAxisId): void {
+    if (this.widgetConfig.config.datasources && this.widgetConfig.config.datasources.length > 1) {
+      for (let i = 1; i < this.widgetConfig.config.datasources.length; i++) {
+        const datasource = this.widgetConfig.config.datasources[i];
+        this.removeYaxisId(datasource.dataKeys, yAxisId);
+      }
+    }
+  }
+
+  protected settingsForm(): UntypedFormGroup {
+    return this.timeSeriesChartWidgetSettingsForm;
+  }
+
+  protected onWidgetConfigSet(widgetConfig: WidgetConfigComponentData) {
+    const params = widgetConfig.typeParameters as any;
+    if (isDefinedAndNotNull(params.chartType)) {
+      this.chartType = params.chartType;
+    }
+  }
+
+  protected defaultSettings(): WidgetSettings {
+    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, []],
+      tooltipDateColor: [settings.tooltipDateColor, []],
+      tooltipDateInterval: [settings.tooltipDateInterval, []],
+
+      tooltipBackgroundColor: [settings.tooltipBackgroundColor, []],
+      tooltipBackgroundBlur: [settings.tooltipBackgroundBlur, []],
+
+      animation: [settings.animation, []],
+
+      background: [settings.background, []],
+      padding: [settings.padding, []]
+    });
+    if (this.chartType === TimeSeriesChartType.state) {
+      this.timeSeriesChartWidgetSettingsForm.addControl('states', this.fb.control(settings.states, []));
+    }
+  }
+
+  protected validatorTriggers(): string[] {
+    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();
+      if (tooltipShowDate) {
+        this.timeSeriesChartWidgetSettingsForm.get('tooltipDateFormat').enable();
+        this.timeSeriesChartWidgetSettingsForm.get('tooltipDateFont').enable();
+        this.timeSeriesChartWidgetSettingsForm.get('tooltipDateColor').enable();
+        this.timeSeriesChartWidgetSettingsForm.get('tooltipDateInterval').enable();
+      } else {
+        this.timeSeriesChartWidgetSettingsForm.get('tooltipDateFormat').disable();
+        this.timeSeriesChartWidgetSettingsForm.get('tooltipDateFont').disable();
+        this.timeSeriesChartWidgetSettingsForm.get('tooltipDateColor').disable();
+        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();
+      this.timeSeriesChartWidgetSettingsForm.get('tooltipDateColor').disable();
+      this.timeSeriesChartWidgetSettingsForm.get('tooltipDateInterval').disable();
+      this.timeSeriesChartWidgetSettingsForm.get('tooltipBackgroundColor').disable();
+      this.timeSeriesChartWidgetSettingsForm.get('tooltipBackgroundBlur').disable();
+    }
+  }
+
+  private removeYaxisId(series: DataKey[], yAxisId: TimeSeriesChartYAxisId): boolean {
+    let changed = false;
+    if (series) {
+      series.forEach(key => {
+        const keySettings = ((key.settings || {}) as TimeSeriesChartKeySettings);
+        if (keySettings.yAxisId === yAxisId) {
+          keySettings.yAxisId = 'default';
+          changed = true;
+        }
+      });
+    }
+    return changed;
+  }
+
+  private _tooltipValuePreviewFn(): string {
+    return formatValue(22, 0, '°C', false);
+  }
+
+  private _tooltipDatePreviewFn(): string {
+    const dateFormat: DateFormatSettings = this.timeSeriesChartWidgetSettingsForm.get('tooltipDateFormat').value;
+    const processor = DateFormatProcessor.fromSettings(this.$injector, dateFormat);
+    processor.update(Date.now());
+    return processor.formatted;
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/widget-action.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/widget-action.component.ts
index b7183a5b80..6c515ad0a7 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/widget-action.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/widget-action.component.ts
@@ -28,6 +28,7 @@ import { Component, ElementRef, forwardRef, Input, OnInit, ViewChild } from '@an
 import {
   WidgetAction,
   WidgetActionType,
+  widgetActionTypes,
   widgetActionTypeTranslationMap,
   widgetType
 } from '@shared/models/widget.models';
@@ -88,7 +89,7 @@ export class WidgetActionComponent implements ControlValueAccessor, OnInit, Vali
   @Input()
   callbacks: WidgetActionCallbacks;
 
-  widgetActionTypes = Object.keys(WidgetActionType);
+  widgetActionTypes = widgetActionTypes;
   widgetActionTypeTranslations = widgetActionTypeTranslationMap;
   widgetActionType = WidgetActionType;
 
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/auto-date-format-settings-panel.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/auto-date-format-settings-panel.component.html
new file mode 100644
index 0000000000..a88ea77488
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/auto-date-format-settings-panel.component.html
@@ -0,0 +1,49 @@
+<!--
+
+    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-auto-date-format-settings-panel" [formGroup]="autoDateFormatFormGroup">
+  <div class="tb-auto-date-format-settings-title" translate>date.time-granularity-formats</div>
+  <div class="tb-auto-date-format-settings-panel-content">
+    <div class="tb-form-row" *ngFor="let unit of formatTimeUnits">
+      <div class="fixed-title-width">{{ formatTimeUnitTranslations.get(unit) | translate }}</div>
+      <div fxFlex fxLayout="column" fxLayoutGap="8px"
+                  fxLayout.gt-xs="row" fxLayoutAlign.gt-xs="start center" fxLayoutGap.gt-xs="16px">
+        <mat-form-field class="tb-date-format-input flex" appearance="outline" subscriptSizing="dynamic">
+          <input required matInput [formControlName]="unit" placeholder="{{ 'widget-config.set' | translate }}">
+          <div matIconSuffix tb-help-popup="date/date-format" [tb-help-popup-style]="{width: '800px'}"></div>
+        </mat-form-field>
+        <mat-divider fxHide fxShow.gt-xs vertical></mat-divider>
+        <div class="preview-text" fxFlex>{{ previewText[unit] }}</div>
+      </div>
+    </div>
+  </div>
+  <div class="tb-auto-date-format-settings-panel-buttons">
+    <button mat-button
+            color="primary"
+            type="button"
+            (click)="cancel()">
+      {{ 'action.cancel' | translate }}
+    </button>
+    <button mat-raised-button
+            color="primary"
+            type="button"
+            (click)="applyAutoDateFormatSettings()"
+            [disabled]="autoDateFormatFormGroup.invalid || !autoDateFormatFormGroup.dirty">
+      {{ 'action.apply' | translate }}
+    </button>
+  </div>
+</div>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/auto-date-format-settings-panel.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/auto-date-format-settings-panel.component.scss
new file mode 100644
index 0000000000..be50f87af8
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/auto-date-format-settings-panel.component.scss
@@ -0,0 +1,73 @@
+/**
+ * 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-auto-date-format-settings-panel {
+  width: 620px;
+  display: flex;
+  flex-direction: column;
+  gap: 16px;
+  @media #{$mat-lt-md} {
+    width: 90vw;
+  }
+  .tb-auto-date-format-settings-title {
+    font-size: 16px;
+    font-weight: 500;
+    line-height: 24px;
+    letter-spacing: 0.25px;
+    color: rgba(0, 0, 0, 0.87);
+  }
+  .tb-auto-date-format-settings-panel-content {
+    display: flex;
+    flex-direction: column;
+    gap: 16px;
+    overflow: auto;
+    margin: -10px;
+    padding: 10px;
+  }
+  .tb-form-row {
+    .fixed-title-width {
+      min-width: 120px;
+    }
+    .mat-mdc-form-field.tb-date-format-input {
+      .mat-mdc-text-field-wrapper.mdc-text-field--outlined {
+        .mat-mdc-form-field-flex {
+          .mat-mdc-form-field-icon-suffix {
+            display: flex;
+            align-items: center;
+            line-height: normal;
+          }
+        }
+      }
+    }
+    .preview-text {
+      font-size: 14px;
+      font-style: normal;
+      font-weight: 400;
+      line-height: 20px;
+      letter-spacing: 0.2px;
+      color: rgba(0, 0, 0, 0.38);
+    }
+  }
+  .tb-auto-date-format-settings-panel-buttons {
+    height: 40px;
+    display: flex;
+    flex-direction: row;
+    gap: 16px;
+    justify-content: flex-end;
+    align-items: flex-end;
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/auto-date-format-settings-panel.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/auto-date-format-settings-panel.component.ts
new file mode 100644
index 0000000000..dcfc942778
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/auto-date-format-settings-panel.component.ts
@@ -0,0 +1,92 @@
+///
+/// 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, EventEmitter, Input, OnInit, Output, ViewEncapsulation } from '@angular/core';
+import { PageComponent } from '@shared/components/page.component';
+import {
+  AutoDateFormatSettings, defaultAutoDateFormatSettings,
+  FormatTimeUnit,
+  formatTimeUnits,
+  formatTimeUnitTranslations
+} from '@shared/models/widget-settings.models';
+import { TbPopoverComponent } from '@shared/components/popover.component';
+import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
+import { Store } from '@ngrx/store';
+import { AppState } from '@core/core.state';
+import { DatePipe } from '@angular/common';
+
+@Component({
+  selector: 'tb-auto-date-format-settings-panel',
+  templateUrl: './auto-date-format-settings-panel.component.html',
+  providers: [],
+  styleUrls: ['./auto-date-format-settings-panel.component.scss'],
+  encapsulation: ViewEncapsulation.None
+})
+export class AutoDateFormatSettingsPanelComponent extends PageComponent implements OnInit {
+
+  formatTimeUnits = formatTimeUnits;
+
+  formatTimeUnitTranslations = formatTimeUnitTranslations;
+
+  @Input()
+  autoDateFormatSettings: AutoDateFormatSettings;
+
+  @Input()
+  defaultValues = defaultAutoDateFormatSettings;
+
+  @Input()
+  popover: TbPopoverComponent<AutoDateFormatSettingsPanelComponent>;
+
+  @Output()
+  autoDateFormatSettingsApplied = new EventEmitter<AutoDateFormatSettings>();
+
+  autoDateFormatFormGroup: UntypedFormGroup;
+
+  previewText: {[unit in FormatTimeUnit]: string} = {} as any;
+
+  constructor(private date: DatePipe,
+              private fb: UntypedFormBuilder,
+              protected store: Store<AppState>) {
+    super(store);
+  }
+
+  ngOnInit(): void {
+    this.autoDateFormatFormGroup = this.fb.group({});
+    for (const unit of formatTimeUnits) {
+      this.autoDateFormatFormGroup.addControl(unit,
+        this.fb.control(this.autoDateFormatSettings[unit] || this.defaultValues[unit], [Validators.required]));
+      this.autoDateFormatFormGroup.get(unit).valueChanges.subscribe((value: string) => {
+        this.previewText[unit] = this.date.transform(Date.now(), value);
+      });
+      this.previewText[unit] = this.date.transform(Date.now(), this.autoDateFormatSettings[unit] || this.defaultValues[unit]);
+    }
+  }
+
+  cancel() {
+    this.popover?.hide();
+  }
+
+  applyAutoDateFormatSettings() {
+    const autoDateFormatSettings: AutoDateFormatSettings = this.autoDateFormatFormGroup.value;
+    for (const unit of formatTimeUnits) {
+      if (autoDateFormatSettings[unit] === this.defaultValues[unit]) {
+        delete autoDateFormatSettings[unit];
+      }
+    }
+    this.autoDateFormatSettingsApplied.emit(autoDateFormatSettings);
+  }
+
+}
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/auto-date-format-settings.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/auto-date-format-settings.component.html
new file mode 100644
index 0000000000..864ad3047c
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/auto-date-format-settings.component.html
@@ -0,0 +1,25 @@
+<!--
+
+    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
+        class="tb-box-button"
+        [disabled]="disabled"
+        #matButton
+        (click)="openAutoFormatSettingsPopup($event, matButton)">
+  <tb-icon matButtonIcon>mdi:clock-edit-outline</tb-icon>
+</button>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/auto-date-format-settings.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/auto-date-format-settings.component.ts
new file mode 100644
index 0000000000..cf5b9033fa
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/auto-date-format-settings.component.ts
@@ -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.
+///
+
+import { Component, forwardRef, Input, OnInit, Renderer2, ViewContainerRef } from '@angular/core';
+import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
+import { AutoDateFormatSettings, defaultAutoDateFormatSettings } from '@shared/models/widget-settings.models';
+import { MatButton } from '@angular/material/button';
+import { TbPopoverService } from '@shared/components/popover.service';
+import { deepClone, mergeDeep } from '@core/utils';
+import {
+  AutoDateFormatSettingsPanelComponent
+} from '@home/components/widget/lib/settings/common/auto-date-format-settings-panel.component';
+
+@Component({
+  selector: 'tb-auto-date-format-settings',
+  templateUrl: './auto-date-format-settings.component.html',
+  styleUrls: [],
+  providers: [
+    {
+      provide: NG_VALUE_ACCESSOR,
+      useExisting: forwardRef(() => AutoDateFormatSettingsComponent),
+      multi: true
+    }
+  ]
+})
+export class AutoDateFormatSettingsComponent implements OnInit, ControlValueAccessor {
+
+  @Input()
+  disabled: boolean;
+
+  @Input()
+  defaultValues = defaultAutoDateFormatSettings;
+
+  private modelValue: AutoDateFormatSettings;
+
+  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: AutoDateFormatSettings): void {
+    this.modelValue = value;
+  }
+
+  openAutoFormatSettingsPopup($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 = {
+        autoDateFormatSettings: deepClone(this.modelValue),
+        defaultValues: this.defaultValues
+      };
+      const autoDateFormatSettingsPanelPopover = this.popoverService.displayPopover(trigger, this.renderer,
+        this.viewContainerRef, AutoDateFormatSettingsPanelComponent, ['leftOnly', 'leftTopOnly', 'leftBottomOnly'], true, null,
+        ctx,
+        {},
+        {}, {}, true);
+      autoDateFormatSettingsPanelPopover.tbComponentRef.instance.popover = autoDateFormatSettingsPanelPopover;
+      autoDateFormatSettingsPanelPopover.tbComponentRef.instance.autoDateFormatSettingsApplied.subscribe((autoDateFormatSettings) => {
+        autoDateFormatSettingsPanelPopover.hide();
+        this.modelValue = autoDateFormatSettings;
+        this.propagateChange(this.modelValue);
+      });
+    }
+  }
+
+}
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/chart-animation-settings.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/chart-animation-settings.component.html
new file mode 100644
index 0000000000..b0a091a5bc
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/chart-animation-settings.component.html
@@ -0,0 +1,89 @@
+<!--
+
+    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]="animationSettingsFormGroup">
+  <div class="tb-form-panel tb-slide-toggle">
+    <mat-expansion-panel class="tb-settings" [(expanded)]="settingsExpanded"
+                         [disabled]="!animationSettingsFormGroup.get('animation').value">
+      <mat-expansion-panel-header fxLayout="row wrap">
+        <mat-panel-title>
+          <mat-slide-toggle class="mat-slide" formControlName="animation" (click)="$event.stopPropagation()"
+                            fxLayoutAlign="center">
+            {{ 'widgets.chart.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.chart.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.chart.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.chart.animation.animation-easing</div>
+          <mat-form-field class="medium-width" appearance="outline" subscriptSizing="dynamic">
+            <mat-select formControlName="animationEasing">
+              <mat-option *ngFor="let easing of chartAnimationEasings" [value]="easing">
+                {{ easing }}
+              </mat-option>
+            </mat-select>
+          </mat-form-field>
+        </div>
+        <div class="tb-form-row space-between column-xs">
+          <div>{{ 'widgets.chart.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.chart.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.chart.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 chartAnimationEasings" [value]="easing">
+                {{ easing }}
+              </mat-option>
+            </mat-select>
+          </mat-form-field>
+        </div>
+        <div class="tb-form-row space-between column-xs">
+          <div>{{ 'widgets.chart.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>
+          </mat-form-field>
+        </div>
+      </ng-template>
+    </mat-expansion-panel>
+  </div>
+</ng-container>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/chart-animation-settings.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/chart-animation-settings.component.ts
new file mode 100644
index 0000000000..19ccfcd18b
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/chart-animation-settings.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, forwardRef, Input, OnInit } from '@angular/core';
+import {
+  ControlValueAccessor,
+  NG_VALUE_ACCESSOR,
+  UntypedFormBuilder,
+  UntypedFormGroup,
+  Validators
+} from '@angular/forms';
+import { chartAnimationEasings, ChartAnimationSettings } from '@home/components/widget/lib/chart/chart.models';
+
+@Component({
+  selector: 'tb-chart-animation-settings',
+  templateUrl: './chart-animation-settings.component.html',
+  styleUrls: ['./../../widget-settings.scss'],
+  providers: [
+    {
+      provide: NG_VALUE_ACCESSOR,
+      useExisting: forwardRef(() => ChartAnimationSettingsComponent),
+      multi: true
+    }
+  ]
+})
+export class ChartAnimationSettingsComponent implements OnInit, ControlValueAccessor {
+
+  settingsExpanded = false;
+
+  chartAnimationEasings = chartAnimationEasings;
+
+  @Input()
+  disabled: boolean;
+
+  private modelValue: ChartAnimationSettings;
+
+  private propagateChange = null;
+
+  public animationSettingsFormGroup: UntypedFormGroup;
+
+  constructor(private fb: UntypedFormBuilder) {
+  }
+
+  ngOnInit(): void {
+    this.animationSettingsFormGroup = this.fb.group({
+      animation: [null, []],
+      animationThreshold: [null, [Validators.min(0)]],
+      animationDuration: [null, [Validators.min(0)]],
+      animationEasing: [null, []],
+      animationDelay: [null, [Validators.min(0)]],
+      animationDurationUpdate: [null, [Validators.min(0)]],
+      animationEasingUpdate: [null, []],
+      animationDelayUpdate: [null, [Validators.min(0)]]
+    });
+    this.animationSettingsFormGroup.valueChanges.subscribe(() => {
+      this.updateModel();
+    });
+    this.animationSettingsFormGroup.get('animation').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.animationSettingsFormGroup.disable({emitEvent: false});
+    } else {
+      this.animationSettingsFormGroup.enable({emitEvent: false});
+      this.updateValidators();
+    }
+  }
+
+  writeValue(value: ChartAnimationSettings): void {
+    this.modelValue = value;
+    this.animationSettingsFormGroup.patchValue(
+      value, {emitEvent: false}
+    );
+    this.updateValidators();
+    this.animationSettingsFormGroup.get('animation').valueChanges.subscribe((animation) => {
+      this.settingsExpanded = animation;
+    });
+  }
+
+  private updateValidators() {
+    const animation: boolean = this.animationSettingsFormGroup.get('animation').value;
+    if (animation) {
+      this.animationSettingsFormGroup.enable({emitEvent: false});
+    } else {
+      this.animationSettingsFormGroup.disable({emitEvent: false});
+      this.animationSettingsFormGroup.get('animation').enable({emitEvent: false});
+    }
+  }
+
+  private updateModel() {
+    this.modelValue = this.animationSettingsFormGroup.getRawValue();
+    this.propagateChange(this.modelValue);
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/chart-bar-settings.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/chart-bar-settings.component.html
new file mode 100644
index 0000000000..07fab8b7ce
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/chart-bar-settings.component.html
@@ -0,0 +1,83 @@
+<!--
+
+    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]="barSettingsFormGroup">
+  <div class="tb-form-row">
+    <mat-slide-toggle class="mat-slide" formControlName="showBorder">
+      {{ 'widgets.chart.bar.show-border' | translate }}
+    </mat-slide-toggle>
+  </div>
+  <div class="tb-form-row space-between column-xs">
+    <div translate>widgets.chart.bar.border-width</div>
+    <mat-form-field class="medium-width number" appearance="outline" subscriptSizing="dynamic">
+      <input matInput type="number" formControlName="borderWidth" 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.chart.bar.border-radius</div>
+    <mat-form-field class="medium-width number" appearance="outline" subscriptSizing="dynamic">
+      <input matInput type="number" formControlName="borderRadius" min="0" step="1" placeholder="{{ 'widget-config.set' | translate }}"/>
+    </mat-form-field>
+  </div>
+  <div *ngIf="!series" class="tb-form-row space-between column-xs">
+    <div translate>widgets.chart.bar.bar-width</div>
+    <mat-form-field class="medium-width number" appearance="outline" subscriptSizing="dynamic">
+      <input matInput type="number" formControlName="barWidth" min="0" max="100" placeholder="{{ 'widget-config.set' | translate }}"/>
+      <div matSuffix>%</div>
+    </mat-form-field>
+  </div>
+  <div class="tb-form-row space-between column-lt-md">
+    <mat-slide-toggle class="mat-slide" formControlName="showLabel">
+      <div tb-hint-tooltip-icon="{{(series ? 'widgets.chart.bar.series-label-hint' : 'widgets.chart.bar.label-hint') | translate}}">
+        {{ 'widgets.chart.bar.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="labelPosition">
+          <mat-option *ngFor="let position of chartLabelPositions" [value]="position">
+            {{ chartLabelPositionTranslations.get(position) | translate }}
+          </mat-option>
+        </mat-select>
+      </mat-form-field>
+      <tb-font-settings formControlName="labelFont"
+                        clearButton
+                        disabledLineHeight
+                        forceSizeUnit="px"
+                        [previewText]="labelPreviewFn">
+      </tb-font-settings>
+      <tb-color-input asBoxInput
+                      colorClearButton
+                      formControlName="labelColor">
+      </tb-color-input>
+    </div>
+  </div>
+  <div class="tb-form-row space-between">
+    <mat-slide-toggle class="mat-slide" formControlName="enableLabelBackground">
+      {{ 'widgets.chart.bar.label-background' | translate }}
+    </mat-slide-toggle>
+    <tb-color-input asBoxInput
+                    colorClearButton
+                    formControlName="labelBackground">
+    </tb-color-input>
+  </div>
+  <tb-chart-fill-settings
+    formControlName="backgroundSettings"
+    title="widgets.chart.background"
+    fillNoneTitle="widgets.chart.fill-type-solid">
+  </tb-chart-fill-settings>
+</ng-container>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/chart-bar-settings.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/chart-bar-settings.component.ts
new file mode 100644
index 0000000000..6fef380a40
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/chart-bar-settings.component.ts
@@ -0,0 +1,188 @@
+///
+/// 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, Optional } from '@angular/core';
+import {
+  ControlValueAccessor,
+  NG_VALUE_ACCESSOR,
+  UntypedFormBuilder,
+  UntypedFormGroup,
+  Validators
+} from '@angular/forms';
+import { Store } from '@ngrx/store';
+import { AppState } from '@core/core.state';
+import { merge } from 'rxjs';
+import { formatValue, isDefinedAndNotNull } from '@core/utils';
+import { DataKeyConfigComponent } from '@home/components/widget/config/data-key-config.component';
+import {
+  ChartBarSettings,
+  ChartLabelPosition,
+  chartLabelPositions,
+  chartLabelPositionTranslations,
+  PieChartLabelPosition,
+  pieChartLabelPositions,
+  pieChartLabelPositionTranslations
+} from '@home/components/widget/lib/chart/chart.models';
+import { coerceBoolean } from '@shared/decorators/coercion';
+
+@Component({
+  selector: 'tb-chart-bar-settings',
+  templateUrl: './chart-bar-settings.component.html',
+  styleUrls: ['./../../widget-settings.scss'],
+  providers: [
+    {
+      provide: NG_VALUE_ACCESSOR,
+      useExisting: forwardRef(() => ChartBarSettingsComponent),
+      multi: true
+    }
+  ]
+})
+export class ChartBarSettingsComponent implements OnInit, ControlValueAccessor {
+
+  chartLabelPositions: (ChartLabelPosition | PieChartLabelPosition)[];
+
+  chartLabelPositionTranslations: Map<ChartLabelPosition | PieChartLabelPosition, string>;
+
+  labelPreviewFn = this._labelPreviewFn.bind(this);
+
+  @Input()
+  disabled: boolean;
+
+  @Input()
+  @coerceBoolean()
+  series = true;
+
+  @Input()
+  @coerceBoolean()
+  pieLabelPosition = false;
+
+  private modelValue: ChartBarSettings;
+
+  private propagateChange = null;
+
+  public barSettingsFormGroup: UntypedFormGroup;
+
+  constructor(protected store: Store<AppState>,
+              @Optional() private dataKeyConfigComponent: DataKeyConfigComponent,
+              private fb: UntypedFormBuilder) {
+  }
+
+  ngOnInit(): void {
+    if (this.pieLabelPosition) {
+      this.chartLabelPositions = pieChartLabelPositions;
+      this.chartLabelPositionTranslations = pieChartLabelPositionTranslations;
+    } else {
+      this.chartLabelPositions = chartLabelPositions;
+      this.chartLabelPositionTranslations = chartLabelPositionTranslations;
+    }
+    this.barSettingsFormGroup = this.fb.group({
+      showBorder: [null, []],
+      borderWidth: [null, [Validators.min(0)]],
+      borderRadius: [null, [Validators.min(0)]],
+      showLabel: [null, []],
+      labelPosition: [null, []],
+      labelFont: [null, []],
+      labelColor: [null, []],
+      enableLabelBackground: [null, []],
+      labelBackground: [null, []],
+      backgroundSettings: [null, []]
+    });
+    if (!this.series) {
+      this.barSettingsFormGroup.addControl('barWidth', this.fb.control(null,
+        [Validators.min(0), Validators.max(100)]));
+    }
+    this.barSettingsFormGroup.valueChanges.subscribe(() => {
+      this.updateModel();
+    });
+    merge(this.barSettingsFormGroup.get('showBorder').valueChanges,
+      this.barSettingsFormGroup.get('showLabel').valueChanges,
+      this.barSettingsFormGroup.get('enableLabelBackground').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.barSettingsFormGroup.disable({emitEvent: false});
+    } else {
+      this.barSettingsFormGroup.enable({emitEvent: false});
+      this.updateValidators();
+    }
+  }
+
+  writeValue(value: ChartBarSettings): void {
+    this.modelValue = value;
+    this.barSettingsFormGroup.patchValue(
+      value, {emitEvent: false}
+    );
+    this.updateValidators();
+  }
+
+  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 {
+      this.barSettingsFormGroup.get('borderWidth').disable({emitEvent: false});
+    }
+    if (showLabel) {
+      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});
+    }
+  }
+
+  private updateModel() {
+    this.modelValue = this.barSettingsFormGroup.getRawValue();
+    this.propagateChange(this.modelValue);
+  }
+
+  private _labelPreviewFn(): string {
+    if (this.series) {
+      const dataKey = this.dataKeyConfigComponent.modelValue;
+      const widgetConfig = this.dataKeyConfigComponent.widgetConfig;
+      const units = dataKey.units && dataKey.units.length ? dataKey.units : widgetConfig.config.units;
+      const decimals = isDefinedAndNotNull(dataKey.decimals) ? dataKey.decimals :
+        (isDefinedAndNotNull(widgetConfig.config.decimals) ? widgetConfig.config.decimals : 2);
+      return formatValue(22, decimals, units, false);
+    } else {
+      return 'Wind';
+    }
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/chart-fill-settings.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/chart-fill-settings.component.html
new file mode 100644
index 0000000000..d79e84d98e
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/chart-fill-settings.component.html
@@ -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.
+
+-->
+<ng-container [formGroup]="fillSettingsFormGroup">
+  <div class="tb-form-row column">
+    <div class="tb-form-row no-border no-padding space-between">
+      <div>{{ title | translate }}</div>
+      <tb-toggle-select formControlName="type">
+        <tb-toggle-option *ngFor="let type of chartFillTypes" [value]="type">{{ chartFillTypeTranslationMap.get(type) | translate }}</tb-toggle-option>
+      </tb-toggle-select>
+    </div>
+    <ng-container *ngIf="fillSettingsFormGroup.get('type').value === ChartFillType.opacity">
+      <div class="tb-form-row space-between column-xs">
+        <div translate>widgets.chart.opacity</div>
+        <mat-form-field class="medium-width number" appearance="outline" subscriptSizing="dynamic">
+          <input matInput type="number" formControlName="opacity" min="0" max="1"
+                 step="0.1" placeholder="{{ 'widget-config.set' | translate }}"/>
+        </mat-form-field>
+      </div>
+    </ng-container>
+    <ng-container *ngIf="fillSettingsFormGroup.get('type').value === ChartFillType.gradient" formGroupName="gradient">
+      <div class="tb-form-row space-between column-xs">
+        <div translate>widgets.chart.gradient-stops</div>
+        <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+          <div class="tb-small-label" translate>widgets.chart.gradient-start</div>
+          <mat-form-field appearance="outline" class="number" subscriptSizing="dynamic">
+            <input matInput formControlName="start" min="0" max="100" step="1"
+                   type="number" placeholder="{{ 'widget-config.set' | translate }}">
+          </mat-form-field>
+          <div class="tb-small-label" translate>widgets.chart.gradient-end</div>
+          <mat-form-field appearance="outline" class="number" subscriptSizing="dynamic">
+            <input matInput formControlName="end" min="0" max="100" step="1"
+                   type="number" placeholder="{{ 'widget-config.set' | translate }}">
+          </mat-form-field>
+        </div>
+      </div>
+    </ng-container>
+  </div>
+</ng-container>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/chart-fill-settings.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/chart-fill-settings.component.ts
new file mode 100644
index 0000000000..718c4cce02
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/chart-fill-settings.component.ts
@@ -0,0 +1,143 @@
+///
+/// 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 { Store } from '@ngrx/store';
+import { AppState } from '@core/core.state';
+import {
+  ChartFillSettings,
+  ChartFillType,
+  chartFillTypes,
+  chartFillTypeTranslations
+} from '@home/components/widget/lib/chart/chart.models';
+
+@Component({
+  selector: 'tb-chart-fill-settings',
+  templateUrl: './chart-fill-settings.component.html',
+  styleUrls: ['./../../widget-settings.scss'],
+  providers: [
+    {
+      provide: NG_VALUE_ACCESSOR,
+      useExisting: forwardRef(() => ChartFillSettingsComponent),
+      multi: true
+    }
+  ]
+})
+export class ChartFillSettingsComponent implements OnInit, ControlValueAccessor {
+
+  chartFillTypes = chartFillTypes;
+
+  chartFillTypeTranslationMap: Map<ChartFillType, string> = new Map<ChartFillType, string>([]);
+
+  ChartFillType = ChartFillType;
+
+  @Input()
+  disabled: boolean;
+
+  @Input()
+  title = 'widgets.chart.fill';
+
+  @Input()
+  fillNoneTitle = 'widgets.chart.fill-type-none';
+
+  private modelValue: ChartFillSettings;
+
+  private propagateChange = null;
+
+  public fillSettingsFormGroup: UntypedFormGroup;
+
+  constructor(protected store: Store<AppState>,
+              private fb: UntypedFormBuilder) {
+  }
+
+  ngOnInit(): void {
+    this.fillSettingsFormGroup = this.fb.group({
+      type: [null, []],
+      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)]]
+      })
+    });
+    this.fillSettingsFormGroup.valueChanges.subscribe(() => {
+      this.updateModel();
+    });
+    this.fillSettingsFormGroup.get('type').valueChanges.subscribe(() => {
+      this.updateValidators();
+    });
+    for (const type of chartFillTypes) {
+      let translation: string;
+      if (type === ChartFillType.none) {
+        translation = this.fillNoneTitle;
+      } else {
+        translation = chartFillTypeTranslations.get(type);
+      }
+      this.chartFillTypeTranslationMap.set(type, translation);
+    }
+  }
+
+  registerOnChange(fn: any): void {
+    this.propagateChange = fn;
+  }
+
+  registerOnTouched(_fn: any): void {
+  }
+
+  setDisabledState(isDisabled: boolean): void {
+    this.disabled = isDisabled;
+    if (isDisabled) {
+      this.fillSettingsFormGroup.disable({emitEvent: false});
+    } else {
+      this.fillSettingsFormGroup.enable({emitEvent: false});
+      this.updateValidators();
+    }
+  }
+
+  writeValue(value: ChartFillSettings): void {
+    this.modelValue = value;
+    this.fillSettingsFormGroup.patchValue(
+      value, {emitEvent: false}
+    );
+    this.updateValidators();
+  }
+
+  private updateValidators() {
+    const type: ChartFillType = this.fillSettingsFormGroup.get('type').value;
+    if (type === ChartFillType.none) {
+      this.fillSettingsFormGroup.get('opacity').disable({emitEvent: false});
+      this.fillSettingsFormGroup.get('gradient').disable({emitEvent: false});
+    } else if (type === ChartFillType.opacity) {
+      this.fillSettingsFormGroup.get('opacity').enable({emitEvent: false});
+      this.fillSettingsFormGroup.get('gradient').disable({emitEvent: false});
+    } else if (type === ChartFillType.gradient) {
+      this.fillSettingsFormGroup.get('opacity').disable({emitEvent: false});
+      this.fillSettingsFormGroup.get('gradient').enable({emitEvent: false});
+    }
+  }
+
+  private updateModel() {
+    const value: ChartFillSettings = this.fillSettingsFormGroup.getRawValue();
+    this.modelValue = value;
+    this.propagateChange(this.modelValue);
+  }
+}
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-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
new file mode 100644
index 0000000000..dbc74d9ed1
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-axis-settings-panel.component.html
@@ -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.
+
+-->
+<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="axis"
+      alwaysExpanded
+      [advanced]="advanced"
+      [axisType]="axisType">
+    </tb-time-series-chart-axis-settings>
+  </div>
+  <div class="tb-axis-settings-panel-buttons">
+    <button mat-button
+            color="primary"
+            type="button"
+            (click)="cancel()">
+      {{ 'action.cancel' | translate }}
+    </button>
+    <button mat-raised-button
+            color="primary"
+            type="button"
+            (click)="applyAxisSettings()"
+            [disabled]="axisSettingsFormGroup.invalid || !axisSettingsFormGroup.dirty">
+      {{ 'action.apply' | translate }}
+    </button>
+  </div>
+</div>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-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
new file mode 100644
index 0000000000..853057c24e
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-axis-settings-panel.component.scss
@@ -0,0 +1,49 @@
+/**
+ * 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-axis-settings-panel {
+  width: 530px;
+  display: flex;
+  flex-direction: column;
+  gap: 16px;
+  @media #{$mat-lt-md} {
+    width: 90vw;
+  }
+  .tb-axis-settings-panel-content {
+    display: flex;
+    flex-direction: column;
+    gap: 16px;
+    overflow: auto;
+    margin: -10px;
+    padding: 10px;
+  }
+  .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-axis-settings-panel-buttons {
+    height: 40px;
+    display: flex;
+    flex-direction: row;
+    gap: 16px;
+    justify-content: flex-end;
+    align-items: flex-end;
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-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
new file mode 100644
index 0000000000..ebfbcf84a1
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-axis-settings-panel.component.ts
@@ -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.
+///
+
+import { Component, EventEmitter, Input, OnInit, Output, ViewEncapsulation } from '@angular/core';
+import { TbPopoverComponent } from '@shared/components/popover.component';
+import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
+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-axis-settings-panel',
+  templateUrl: './time-series-chart-axis-settings-panel.component.html',
+  providers: [],
+  styleUrls: ['./time-series-chart-axis-settings-panel.component.scss'],
+  encapsulation: ViewEncapsulation.None
+})
+export class TimeSeriesChartAxisSettingsPanelComponent implements OnInit {
+
+  @Input()
+  axisType: 'xAxis' | 'yAxis' = 'xAxis';
+
+  @Input()
+  panelTitle: string;
+
+  @Input()
+  axisSettings: TimeSeriesChartAxisSettings;
+
+  @Input()
+  @coerceBoolean()
+  advanced = false;
+
+  @Input()
+  popover: TbPopoverComponent<TimeSeriesChartAxisSettingsPanelComponent>;
+
+  @Output()
+  axisSettingsApplied = new EventEmitter<TimeSeriesChartAxisSettings>();
+
+  axisSettingsFormGroup: UntypedFormGroup;
+
+  constructor(private fb: UntypedFormBuilder) {
+  }
+
+  ngOnInit(): void {
+    this.axisSettingsFormGroup = this.fb.group(
+      {
+        axis: [this.axisSettings, []]
+      }
+    );
+  }
+
+  cancel() {
+    this.popover?.hide();
+  }
+
+  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
new file mode 100644
index 0000000000..7ee338bf21
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-axis-settings.component.html
@@ -0,0 +1,180 @@
+<!--
+
+    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]="axisSettingsFormGroup">
+  <div class="tb-form-panel stroked tb-slide-toggle">
+    <mat-expansion-panel class="tb-settings" [(expanded)]="alwaysExpanded || settingsExpanded"
+                         [disabled]="alwaysExpanded || !axisSettingsFormGroup.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.axis.show' | translate }}
+          </mat-slide-toggle>
+        </mat-panel-title>
+      </mat-expansion-panel-header>
+      <ng-template matExpansionPanelContent>
+        <div class="tb-form-row column-xs">
+          <div class="fixed-title-width" translate>widgets.time-series-chart.axis.label</div>
+          <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"
+                              clearButton
+                              disabledLineHeight
+                              forceSizeUnit="px"
+                              [previewText]="axisSettingsFormGroup.get('label').value">
+            </tb-font-settings>
+            <tb-color-input asBoxInput
+                            colorClearButton
+                            formControlName="labelColor">
+            </tb-color-input>
+          </div>
+        </div>
+        <div class="tb-form-row space-between column-xs">
+          <div translate>widgets.time-series-chart.axis.position</div>
+          <mat-form-field class="medium-width" appearance="outline" subscriptSizing="dynamic">
+            <mat-select formControlName="position">
+              <mat-option *ngFor="let position of axisPositions" [value]="position">
+                {{ timeSeriesAxisPositionTranslations.get(position) | translate }}
+              </mat-option>
+            </mat-select>
+          </mat-form-field>
+        </div>
+        <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' && !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">
+              <div translate>widgets.time-series-chart.axis.tick-labels</div>
+            </mat-slide-toggle>
+            <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+              <tb-auto-date-format-settings *ngIf="axisType === 'xAxis'"
+                                            formControlName="ticksFormat"
+                                            [defaultValues]="defaultXAxisTicksFormat">
+              </tb-auto-date-format-settings>
+              <tb-font-settings formControlName="tickLabelFont"
+                                clearButton
+                                disabledLineHeight
+                                forceSizeUnit="px"
+                                previewText="100">
+              </tb-font-settings>
+              <tb-color-input asBoxInput
+                              colorClearButton
+                              formControlName="tickLabelColor">
+              </tb-color-input>
+            </div>
+          </div>
+          <div *ngIf="axisType === 'yAxis' && advanced" class="tb-form-row no-border">
+            <tb-js-func fxFlex
+              formControlName="ticksFormatter"
+              [globalVariables]="functionScopeVariables"
+              [functionArgs]="['value']"
+              functionTitle="{{ 'widgets.time-series-chart.axis.ticks-formatter-function' | translate }}"
+              helpId="widget/lib/flot/ticks_formatter_fn">
+            </tb-js-func>
+          </div>
+        </div>
+        <div class="tb-form-row space-between">
+          <mat-slide-toggle class="mat-slide" formControlName="showTicks">
+            {{ 'widgets.time-series-chart.axis.show-ticks' | translate }}
+          </mat-slide-toggle>
+          <tb-color-input asBoxInput
+                          colorClearButton
+                          formControlName="ticksColor">
+          </tb-color-input>
+        </div>
+        <div class="tb-form-row space-between">
+          <mat-slide-toggle class="mat-slide" formControlName="showLine">
+            {{ 'widgets.time-series-chart.axis.show-line' | translate }}
+          </mat-slide-toggle>
+          <tb-color-input asBoxInput
+                          colorClearButton
+                          formControlName="lineColor">
+          </tb-color-input>
+        </div>
+        <div class="tb-form-row space-between">
+          <mat-slide-toggle class="mat-slide" formControlName="showSplitLines">
+            <div tb-hint-tooltip-icon="{{ (axisType === 'xAxis' ? 'widgets.time-series-chart.axis.show-split-lines-x-axis-hint'
+                                                                : 'widgets.time-series-chart.axis.show-split-lines-y-axis-hint') | translate}}">
+              {{ 'widgets.time-series-chart.axis.show-split-lines' | translate }}
+            </div>
+          </mat-slide-toggle>
+          <tb-color-input asBoxInput
+                          colorClearButton
+                          formControlName="splitLinesColor">
+          </tb-color-input>
+        </div>
+        <div *ngIf="axisType === 'yAxis'" class="tb-form-row space-between">
+          <div tb-hint-tooltip-icon="{{ 'widgets.time-series-chart.axis.ticks-interval-hint' | translate }}">
+            {{ 'widgets.time-series-chart.axis.ticks-interval' | translate }}
+          </div>
+          <mat-form-field appearance="outline" class="number" subscriptSizing="dynamic">
+            <input matInput formControlName="interval"
+                   type="number" min="0" placeholder="{{ 'widgets.chart.chart-axis.scale-auto' | translate }}">
+          </mat-form-field>
+        </div>
+        <div *ngIf="axisType === 'yAxis'" class="tb-form-row space-between">
+          <div tb-hint-tooltip-icon="{{ 'widgets.time-series-chart.axis.split-number-hint' | translate }}">
+            {{ 'widgets.time-series-chart.axis.split-number' | translate }}
+          </div>
+          <mat-form-field appearance="outline" class="number" subscriptSizing="dynamic">
+            <input matInput formControlName="splitNumber"
+                   type="number" min="1" placeholder="{{ 'widgets.chart.chart-axis.scale-auto' | translate }}">
+          </mat-form-field>
+        </div>
+      </ng-template>
+    </mat-expansion-panel>
+    <div *ngIf="axisType === 'yAxis'" class="tb-form-panel no-border no-padding-top">
+      <div class="tb-form-row space-between column-xs">
+        <div translate>widgets.chart.chart-axis.scale</div>
+        <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+          <div class="tb-small-label" translate>widgets.chart.chart-axis.scale-min</div>
+          <mat-form-field appearance="outline" class="number" subscriptSizing="dynamic">
+            <input matInput formControlName="min"
+                   type="number" placeholder="{{ 'widgets.chart.chart-axis.scale-auto' | translate }}">
+          </mat-form-field>
+          <div class="tb-small-label" translate>widgets.chart.chart-axis.scale-max</div>
+          <mat-form-field appearance="outline" class="number" subscriptSizing="dynamic">
+            <input matInput formControlName="max"
+                   type="number" placeholder="{{ 'widgets.chart.chart-axis.scale-auto' | translate }}">
+          </mat-form-field>
+        </div>
+      </div>
+    </div>
+  </div>
+</ng-container>
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
new file mode 100644
index 0000000000..91fe61caa3
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-axis-settings.component.ts
@@ -0,0 +1,221 @@
+///
+/// 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 {
+  AxisPosition, defaultXAxisTicksFormat,
+  timeSeriesAxisPositionTranslations,
+  TimeSeriesChartAxisSettings, TimeSeriesChartXAxisSettings,
+  TimeSeriesChartYAxisSettings
+} from '@home/components/widget/lib/chart/time-series-chart.models';
+import { merge } from 'rxjs';
+import { coerceBoolean } from '@shared/decorators/coercion';
+import { WidgetService } from '@core/http/widget.service';
+
+@Component({
+  selector: 'tb-time-series-chart-axis-settings',
+  templateUrl: './time-series-chart-axis-settings.component.html',
+  styleUrls: ['./../../widget-settings.scss'],
+  providers: [
+    {
+      provide: NG_VALUE_ACCESSOR,
+      useExisting: forwardRef(() => TimeSeriesChartAxisSettingsComponent),
+      multi: true
+    }
+  ]
+})
+export class TimeSeriesChartAxisSettingsComponent implements OnInit, ControlValueAccessor {
+
+  @Input()
+  @coerceBoolean()
+  alwaysExpanded = false;
+
+  settingsExpanded = false;
+
+  axisPositions: AxisPosition[];
+
+  timeSeriesAxisPositionTranslations = timeSeriesAxisPositionTranslations;
+
+  functionScopeVariables = this.widgetService.getWidgetScopeVariables();
+
+  defaultXAxisTicksFormat = defaultXAxisTicksFormat;
+
+  @Input()
+  disabled: boolean;
+
+  @Input()
+  axisType: 'xAxis' | 'yAxis' = 'xAxis';
+
+  @Input()
+  @coerceBoolean()
+  advanced = false;
+
+  @Input()
+  @coerceBoolean()
+  hideUnits = false;
+
+  @Input()
+  @coerceBoolean()
+  hideDecimals = false;
+
+  private modelValue: TimeSeriesChartXAxisSettings | TimeSeriesChartYAxisSettings;
+
+  private propagateChange = null;
+
+  public axisSettingsFormGroup: UntypedFormGroup;
+
+  constructor(private fb: UntypedFormBuilder,
+              private widgetService: WidgetService) {
+  }
+
+  ngOnInit(): void {
+
+    this.axisPositions = this.axisType === 'xAxis' ? [AxisPosition.top, AxisPosition.bottom] :
+      [AxisPosition.left, AxisPosition.right];
+
+    this.axisSettingsFormGroup = this.fb.group({
+      show: [null, []],
+      label: [null, []],
+      labelFont: [null, []],
+      labelColor: [null, []],
+      position: [null, []],
+      showTickLabels: [null, []],
+      tickLabelFont: [null, []],
+      tickLabelColor: [null, []],
+      showTicks: [null, []],
+      ticksColor: [null, []],
+      showLine: [null, []],
+      lineColor: [null, []],
+      showSplitLines: [null, []],
+      splitLinesColor: [null, []]
+    });
+    if (this.axisType === 'yAxis') {
+      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, []));
+      this.axisSettingsFormGroup.addControl('max', this.fb.control(null, []));
+    } else if (this.axisType === 'xAxis') {
+      this.axisSettingsFormGroup.addControl('ticksFormat', this.fb.control(null, []));
+    }
+    this.axisSettingsFormGroup.valueChanges.subscribe(() => {
+      this.updateModel();
+    });
+    merge(this.axisSettingsFormGroup.get('show').valueChanges,
+          this.axisSettingsFormGroup.get('showTickLabels').valueChanges,
+          this.axisSettingsFormGroup.get('showTicks').valueChanges,
+          this.axisSettingsFormGroup.get('showLine').valueChanges,
+          this.axisSettingsFormGroup.get('showSplitLines').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.axisSettingsFormGroup.disable({emitEvent: false});
+    } else {
+      this.axisSettingsFormGroup.enable({emitEvent: false});
+      this.updateValidators();
+    }
+  }
+
+  writeValue(value: TimeSeriesChartAxisSettings | TimeSeriesChartYAxisSettings): void {
+    this.modelValue = value;
+    this.axisSettingsFormGroup.patchValue(
+      value, {emitEvent: false}
+    );
+    this.updateValidators();
+    this.axisSettingsFormGroup.get('show').valueChanges.subscribe((show) => {
+      this.settingsExpanded = show;
+    });
+  }
+
+  private updateValidators() {
+    const show: boolean = this.axisSettingsFormGroup.get('show').value;
+    const showTickLabels: boolean = this.axisSettingsFormGroup.get('showTickLabels').value;
+    const showTicks: boolean = this.axisSettingsFormGroup.get('showTicks').value;
+    const showLine: boolean = this.axisSettingsFormGroup.get('showLine').value;
+    const showSplitLines: boolean = this.axisSettingsFormGroup.get('showSplitLines').value;
+    if (show) {
+      this.axisSettingsFormGroup.enable({emitEvent: false});
+      if (showTickLabels) {
+        this.axisSettingsFormGroup.get('tickLabelFont').enable({emitEvent: false});
+        this.axisSettingsFormGroup.get('tickLabelColor').enable({emitEvent: false});
+        if (this.axisType === 'yAxis') {
+          this.axisSettingsFormGroup.get('ticksFormatter').enable({emitEvent: false});
+        }
+        if (this.axisType === 'xAxis') {
+          this.axisSettingsFormGroup.get('ticksFormat').enable({emitEvent: false});
+        }
+      } else {
+        this.axisSettingsFormGroup.get('tickLabelFont').disable({emitEvent: false});
+        this.axisSettingsFormGroup.get('tickLabelColor').disable({emitEvent: false});
+        if (this.axisType === 'yAxis') {
+          this.axisSettingsFormGroup.get('ticksFormatter').disable({emitEvent: false});
+        }
+        if (this.axisType === 'xAxis') {
+          this.axisSettingsFormGroup.get('ticksFormat').disable({emitEvent: false});
+        }
+      }
+      if (showTicks) {
+        this.axisSettingsFormGroup.get('ticksColor').enable({emitEvent: false});
+      } else {
+        this.axisSettingsFormGroup.get('ticksColor').disable({emitEvent: false});
+      }
+      if (showLine) {
+        this.axisSettingsFormGroup.get('lineColor').enable({emitEvent: false});
+      } else {
+        this.axisSettingsFormGroup.get('lineColor').disable({emitEvent: false});
+      }
+      if (showSplitLines) {
+        this.axisSettingsFormGroup.get('splitLinesColor').enable({emitEvent: false});
+      } else {
+        this.axisSettingsFormGroup.get('splitLinesColor').disable({emitEvent: false});
+      }
+    } else {
+      this.axisSettingsFormGroup.disable({emitEvent: false});
+      this.axisSettingsFormGroup.get('show').enable({emitEvent: false});
+      if (this.axisType === 'yAxis') {
+        this.axisSettingsFormGroup.get('min').enable({emitEvent: false});
+        this.axisSettingsFormGroup.get('max').enable({emitEvent: false});
+      }
+    }
+  }
+
+  private updateModel() {
+    this.modelValue = this.axisSettingsFormGroup.getRawValue();
+    this.propagateChange(this.modelValue);
+  }
+}
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
new file mode 100644
index 0000000000..d0ea8f0ef3
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-threshold-row.component.html
@@ -0,0 +1,116 @@
+<!--
+
+    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]="thresholdFormGroup" class="tb-form-table-row tb-time-series-threshold-row">
+  <div class="tb-threshold-source-field">
+    <mat-form-field class="tb-inline-field tb-threshold-type-field" appearance="outline" subscriptSizing="dynamic">
+      <mat-select formControlName="type">
+        <mat-option *ngFor="let type of timeSeriesThresholdTypes" [value]="type">
+          {{ timeSeriesThresholdTypeTranslations.get(type) | translate }}
+        </mat-option>
+      </mat-select>
+    </mat-form-field>
+    <tb-entity-alias-input
+      *ngIf="thresholdFormGroup.get('type').value === TimeSeriesChartThresholdType.entity"
+      [aliasController]="aliasController"
+      required
+      formControlName="entityAlias">
+    </tb-entity-alias-input>
+  </div>
+  <div class="tb-threshold-key-value-field">
+    <mat-form-field *ngIf="thresholdFormGroup.get('type').value === TimeSeriesChartThresholdType.constant"
+                    appearance="outline" class="tb-inline-field number" subscriptSizing="dynamic"
+                    [class.tb-suffix-absolute]="!thresholdFormGroup.get('value').value">
+      <input required matInput formControlName="value" type="number" placeholder="{{ 'widget-config.set' | translate }}">
+      <mat-icon matSuffix
+                matTooltipPosition="above"
+                matTooltipClass="tb-error-tooltip"
+                [matTooltip]="'widgets.time-series-chart.threshold.threshold-value-required' | translate"
+                *ngIf="thresholdFormGroup.get('value').hasError('required')
+                       && thresholdFormGroup.get('value').touched"
+                class="tb-error">
+        warning
+      </mat-icon>
+    </mat-form-field>
+    <tb-data-key-input
+      *ngIf="thresholdFormGroup.get('type').value === TimeSeriesChartThresholdType.latestKey"
+      required
+      requiredText="widgets.time-series-chart.threshold.key-required"
+      [datasourceType]="datasource?.type"
+      [entityAliasId]="datasource?.entityAliasId"
+      [deviceId]="datasource?.deviceId"
+      [aliasController]="aliasController"
+      [dataKeyType]="datasource?.type === DatasourceType.function ? DataKeyType.function : null"
+      [dataKeyTypes]="[DataKeyType.attribute, DataKeyType.timeseries]"
+      [callbacks]="dataKeyCallbacks"
+      [editable]="false"
+      [formControl]="latestKeyFormControl">
+    </tb-data-key-input>
+    <tb-data-key-input
+      *ngIf="thresholdFormGroup.get('type').value === TimeSeriesChartThresholdType.entity"
+      required
+      requiredText="widgets.time-series-chart.threshold.entity-key-required"
+      [datasourceType]="DatasourceType.entity"
+      [aliasController]="aliasController"
+      [entityAlias]="thresholdFormGroup.get('entityAlias').value"
+      [dataKeyTypes]="[DataKeyType.attribute, DataKeyType.timeseries]"
+      [callbacks]="dataKeyCallbacks"
+      [editable]="false"
+      [formControl]="entityKeyFormControl">
+    </tb-data-key-input>
+  </div>
+  <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">
+          {{ yAxis }}
+        </mat-option>
+      </mat-select>
+    </mat-form-field>
+  </div>
+  <div class="tb-color-field">
+    <tb-color-input asBoxInput
+                    colorClearButton
+                    formControlName="lineColor">
+    </tb-color-input>
+  </div>
+  <div class="tb-units-field">
+    <tb-unit-input formControlName="units">
+    </tb-unit-input>
+  </div>
+  <div class="tb-decimals-field">
+    <mat-form-field appearance="outline" class="tb-inline-field 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-table-row-cell-buttons">
+    <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()"
+            matTooltip="{{ 'widgets.time-series-chart.threshold.remove-threshold' | 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-threshold-row.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-threshold-row.component.scss
new file mode 100644
index 0000000000..2ee42db765
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-threshold-row.component.scss
@@ -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.
+ */
+
+@import '../../../../../../../../../scss/constants';
+
+.tb-form-table-row.tb-time-series-threshold-row {
+  @media #{$mat-lt-md} {
+    align-items: flex-start;
+  }
+  .tb-threshold-source-field {
+    flex: 1;
+    min-width: 100px;
+    display: flex;
+    flex-direction: column;
+    gap: 8px;
+    @media #{$mat-gt-sm} {
+      flex-direction: row;
+      align-items: center;
+      gap: 12px;
+    }
+    @media #{$mat-gt-md} {
+      min-width: 200px;
+    }
+  }
+
+  .tb-threshold-type-field {
+    flex: 1;
+  }
+
+  .tb-entity-alias-input {
+    flex: 1;
+  }
+
+  .tb-threshold-key-value-field {
+    flex: 1;
+    min-width: 100px;
+    .tb-inline-field {
+      width: 100%;
+    }
+    @media #{$mat-gt-md} {
+      min-width: 150px;
+    }
+  }
+
+  .tb-y-axis-field {
+    width: 100px;
+    min-width: 100px;
+    .mat-mdc-form-field {
+      width: 100%;
+    }
+  }
+
+  .tb-color-field, .tb-units-field, .tb-decimals-field {
+    display: flex;
+    flex-direction: row;
+    place-content: center;
+    align-items: center;
+  }
+
+  .tb-units-field {
+    width: 80px;
+    min-width: 80px;
+  }
+
+  .tb-color-field {
+    width: 40px;
+    min-width: 40px;
+  }
+
+  .tb-decimals-field {
+    width: 60px;
+    min-width: 60px;
+  }
+
+  .tb-y-axis-field {
+    @media #{$mat-xs} {
+      display: none;
+    }
+  }
+
+  .tb-units-field, .tb-color-field, .tb-decimals-field {
+    display: none;
+    @media #{$mat-gt-md} {
+      display: flex;
+    }
+  }
+
+}
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
new file mode 100644
index 0000000000..168284ec13
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-threshold-row.component.ts
@@ -0,0 +1,271 @@
+///
+/// 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,
+  OnChanges,
+  OnInit,
+  Output,
+  SimpleChanges,
+  ViewEncapsulation
+} from '@angular/core';
+import {
+  ControlValueAccessor,
+  NG_VALUE_ACCESSOR,
+  UntypedFormBuilder,
+  UntypedFormControl,
+  UntypedFormGroup,
+  Validators
+} from '@angular/forms';
+import {
+  TimeSeriesChartThreshold,
+  TimeSeriesChartThresholdType,
+  TimeSeriesChartYAxisId,
+  timeSeriesThresholdTypes,
+  timeSeriesThresholdTypeTranslations
+} from '@home/components/widget/lib/chart/time-series-chart.models';
+import {
+  TimeSeriesChartThresholdsPanelComponent
+} from '@home/components/widget/lib/settings/common/chart/time-series-chart-thresholds-panel.component';
+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 { deepClone } from '@core/utils';
+import { coerceBoolean } from '@shared/decorators/coercion';
+
+@Component({
+  selector: 'tb-time-series-chart-threshold-row',
+  templateUrl: './time-series-chart-threshold-row.component.html',
+  styleUrls: ['./time-series-chart-threshold-row.component.scss'],
+  providers: [
+    {
+      provide: NG_VALUE_ACCESSOR,
+      useExisting: forwardRef(() => TimeSeriesChartThresholdRowComponent),
+      multi: true
+    }
+  ],
+  encapsulation: ViewEncapsulation.None
+})
+export class TimeSeriesChartThresholdRowComponent implements ControlValueAccessor, OnInit, OnChanges {
+
+  DataKeyType = DataKeyType;
+
+  DatasourceType = DatasourceType;
+
+  TimeSeriesChartThresholdType = TimeSeriesChartThresholdType;
+
+  timeSeriesThresholdTypes = timeSeriesThresholdTypes;
+
+  timeSeriesThresholdTypeTranslations = timeSeriesThresholdTypeTranslations;
+
+  get aliasController(): IAliasController {
+    return this.thresholdsPanel.aliasController;
+  }
+
+  get dataKeyCallbacks(): DataKeysCallbacks {
+    return this.thresholdsPanel.dataKeyCallbacks;
+  }
+
+  get datasource(): Datasource {
+    return this.thresholdsPanel.datasource;
+  }
+
+  get widgetConfig(): WidgetConfig {
+    return this.thresholdsPanel.widgetConfig;
+  }
+
+  @Input()
+  disabled: boolean;
+
+  @Input()
+  yAxisIds: TimeSeriesChartYAxisId[];
+
+  @Input()
+  @coerceBoolean()
+  hideYAxis = false;
+
+  @Output()
+  thresholdRemoved = new EventEmitter();
+
+  thresholdFormGroup: UntypedFormGroup;
+
+  modelValue: TimeSeriesChartThreshold;
+
+  latestKeyFormControl: UntypedFormControl;
+
+  entityKeyFormControl: UntypedFormControl;
+
+  thresholdSettingsFormControl: UntypedFormControl;
+
+  private propagateChange = (_val: any) => {};
+
+  constructor(private fb: UntypedFormBuilder,
+              private thresholdsPanel: TimeSeriesChartThresholdsPanelComponent,
+              private cd: ChangeDetectorRef) {
+  }
+
+  ngOnInit() {
+    this.thresholdFormGroup = this.fb.group({
+      type: [null, []],
+      value: [null, [Validators.required]],
+      entityAlias: [null, [Validators.required]],
+      yAxisId: [null, [Validators.required]],
+      lineColor: [null, []],
+      units: [null, []],
+      decimals: [null, []]
+    });
+    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()
+    );
+    this.latestKeyFormControl.valueChanges.subscribe(
+      () => this.updateModel()
+    );
+    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();
+    });
+  }
+
+  ngOnChanges(changes: SimpleChanges): void {
+    for (const propName of Object.keys(changes)) {
+      const change = changes[propName];
+      if (!change.firstChange && change.currentValue !== change.previousValue) {
+        if (['yAxisIds'].includes(propName)) {
+          if (this.modelValue?.yAxisId &&
+            !this.yAxisIds.includes(this.modelValue.yAxisId)) {
+            this.thresholdFormGroup.patchValue({yAxisId: 'default'}, {emitEvent: true});
+          }
+        }
+      }
+    }
+  }
+
+  registerOnChange(fn: any): void {
+    this.propagateChange = fn;
+  }
+
+  registerOnTouched(fn: any): void {
+  }
+
+  setDisabledState(isDisabled: boolean): void {
+    this.disabled = isDisabled;
+    if (isDisabled) {
+      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();
+    }
+  }
+
+  writeValue(value: TimeSeriesChartThreshold): void {
+    this.modelValue = value;
+    this.thresholdFormGroup.patchValue(
+      {
+        type: value.type,
+        value: value.value,
+        entityAlias: value.entityAlias,
+        yAxisId: value.yAxisId,
+        lineColor: value.lineColor,
+        units: value.units,
+        decimals: value.decimals,
+      }, {emitEvent: false}
+    );
+    if (value.type === TimeSeriesChartThresholdType.latestKey) {
+      this.latestKeyFormControl.patchValue({
+        type: value.latestKeyType,
+        name: value.latestKey
+      }, {emitEvent: false});
+    } else if (value.type === TimeSeriesChartThresholdType.entity) {
+      this.entityKeyFormControl.patchValue({
+        type: value.entityKeyType,
+        name: value.entityKey
+      }, {emitEvent: false});
+    }
+    this.thresholdSettingsFormControl.patchValue(deepClone(this.modelValue),
+      {emitEvent: false});
+    this.updateValidators();
+    this.cd.markForCheck();
+  }
+
+  private updateValidators() {
+    const type: TimeSeriesChartThresholdType = this.thresholdFormGroup.get('type').value;
+    if (type === TimeSeriesChartThresholdType.constant) {
+      this.thresholdFormGroup.get('value').enable({emitEvent: false});
+      this.thresholdFormGroup.get('entityAlias').disable({emitEvent: false});
+      this.latestKeyFormControl.disable({emitEvent: false});
+      this.entityKeyFormControl.disable({emitEvent: false});
+    } else if (type === TimeSeriesChartThresholdType.latestKey) {
+      this.thresholdFormGroup.get('value').disable({emitEvent: false});
+      this.thresholdFormGroup.get('entityAlias').disable({emitEvent: false});
+      this.latestKeyFormControl.enable({emitEvent: false});
+      this.entityKeyFormControl.disable({emitEvent: false});
+    } else if (type === TimeSeriesChartThresholdType.entity) {
+      this.thresholdFormGroup.get('value').disable({emitEvent: false});
+      this.thresholdFormGroup.get('entityAlias').enable({emitEvent: false});
+      this.latestKeyFormControl.disable({emitEvent: false});
+      this.entityKeyFormControl.enable({emitEvent: false});
+    }
+  }
+
+  private updateModel() {
+    const value = this.thresholdFormGroup.value;
+    this.modelValue.type = value.type;
+    this.modelValue.value = value.value;
+    this.modelValue.entityAlias = value.entityAlias;
+    this.modelValue.yAxisId = value.yAxisId;
+    this.modelValue.lineColor = value.lineColor;
+    this.modelValue.units = value.units;
+    this.modelValue.decimals = value.decimals;
+    if (value.type === TimeSeriesChartThresholdType.latestKey) {
+      const latestKey: DataKey = this.latestKeyFormControl.value;
+      this.modelValue.latestKey = latestKey?.name;
+      this.modelValue.latestKeyType = (latestKey?.type as any);
+    } else if (value.type === TimeSeriesChartThresholdType.entity) {
+      const entityKey: DataKey = this.entityKeyFormControl.value;
+      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
new file mode 100644
index 0000000000..196097e9e5
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-threshold-settings-panel.component.html
@@ -0,0 +1,152 @@
+<!--
+
+    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-threshold-settings-panel" [formGroup]="thresholdSettingsFormGroup">
+  <div class="tb-threshold-settings-title">{{ panelTitle | translate }}</div>
+  <div class="tb-threshold-settings-panel-content">
+    <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">
+          <mat-option *ngFor="let yAxis of yAxisIds" [value]="yAxis">
+            {{ yAxis }}
+          </mat-option>
+        </mat-select>
+      </mat-form-field>
+    </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 column-lt-md">
+      <mat-slide-toggle class="mat-slide" formControlName="showLabel">
+        {{ 'widgets.time-series-chart.threshold.label' | translate }}
+      </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="labelPosition">
+            <mat-option *ngFor="let position of timeSeriesThresholdLabelPositions" [value]="position">
+              {{ timeSeriesThresholdLabelPositionTranslations.get(position) | translate }}
+            </mat-option>
+          </mat-select>
+        </mat-form-field>
+        <tb-font-settings formControlName="labelFont"
+                          clearButton
+                          disabledLineHeight
+                          forceSizeUnit="px"
+                          [previewText]="labelPreviewFn">
+        </tb-font-settings>
+        <tb-color-input asBoxInput
+                        colorClearButton
+                        formControlName="labelColor">
+        </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">
+        <div translate>widgets.time-series-chart.threshold.line-color</div>
+        <tb-color-input asBoxInput
+                        colorClearButton
+                        formControlName="lineColor">
+        </tb-color-input>
+      </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 chartLineTypes" [value]="lineType">
+              {{ chartLineTypeTranslations.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 class="tb-form-row space-between column-xs">
+        <div translate>widgets.time-series-chart.threshold.start-symbol</div>
+        <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 chartShapes" [value]="shape">
+                {{ chartShapeTranslations.get(shape) | translate }}
+              </mat-option>
+            </mat-select>
+          </mat-form-field>
+          <div class="tb-small-label" translate>widgets.time-series-chart.threshold.symbol-size</div>
+          <mat-form-field appearance="outline" class="number flex" subscriptSizing="dynamic">
+            <input matInput formControlName="startSymbolSize"
+                   type="number" min="0" step="1" placeholder="{{ 'widget-config.set' | translate }}">
+          </mat-form-field>
+        </div>
+      </div>
+      <div class="tb-form-row space-between column-xs">
+        <div translate>widgets.time-series-chart.threshold.end-symbol</div>
+        <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 chartShapes" [value]="shape">
+                {{ chartShapeTranslations.get(shape) | translate }}
+              </mat-option>
+            </mat-select>
+          </mat-form-field>
+          <div class="tb-small-label" translate>widgets.time-series-chart.threshold.symbol-size</div>
+          <mat-form-field appearance="outline" class="number flex" subscriptSizing="dynamic">
+            <input matInput formControlName="endSymbolSize"
+                   type="number" min="0" step="1" placeholder="{{ 'widget-config.set' | translate }}">
+          </mat-form-field>
+        </div>
+      </div>
+    </div>
+  </div>
+  <div class="tb-threshold-settings-panel-buttons">
+    <button mat-button
+            color="primary"
+            type="button"
+            (click)="cancel()">
+      {{ 'action.cancel' | translate }}
+    </button>
+    <button mat-raised-button
+            color="primary"
+            type="button"
+            (click)="applyThresholdSettings()"
+            [disabled]="thresholdSettingsFormGroup.invalid || !thresholdSettingsFormGroup.dirty">
+      {{ 'action.apply' | translate }}
+    </button>
+  </div>
+</div>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-threshold-settings-panel.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-threshold-settings-panel.component.scss
new file mode 100644
index 0000000000..b65fa6ad65
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-threshold-settings-panel.component.scss
@@ -0,0 +1,49 @@
+/**
+ * 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-threshold-settings-panel {
+  width: 530px;
+  display: flex;
+  flex-direction: column;
+  gap: 16px;
+  @media #{$mat-lt-md} {
+    width: 90vw;
+  }
+  .tb-threshold-settings-panel-content {
+    display: flex;
+    flex-direction: column;
+    gap: 16px;
+    overflow: auto;
+    margin: -10px;
+    padding: 10px;
+  }
+  .tb-threshold-settings-title {
+    font-size: 16px;
+    font-weight: 500;
+    line-height: 24px;
+    letter-spacing: 0.25px;
+    color: rgba(0, 0, 0, 0.87);
+  }
+  .tb-threshold-settings-panel-buttons {
+    height: 40px;
+    display: flex;
+    flex-direction: row;
+    gap: 16px;
+    justify-content: flex-end;
+    align-items: flex-end;
+  }
+}
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
new file mode 100644
index 0000000000..eb0a2d79c8
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-threshold-settings-panel.component.ts
@@ -0,0 +1,168 @@
+///
+/// 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, EventEmitter, Input, OnInit, Output, ViewEncapsulation } from '@angular/core';
+import { TbPopoverComponent } from '@shared/components/popover.component';
+import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
+import {
+  TimeSeriesChartThreshold,
+  TimeSeriesChartYAxisId,
+  timeSeriesThresholdLabelPositions,
+  timeSeriesThresholdLabelPositionTranslations
+} from '@home/components/widget/lib/chart/time-series-chart.models';
+import { merge } from 'rxjs';
+import { WidgetConfig } from '@shared/models/widget.models';
+import { formatValue, isDefinedAndNotNull } from '@core/utils';
+import { coerceBoolean } from '@shared/decorators/coercion';
+import {
+  chartLineTypes, chartLineTypeTranslations,
+  ChartShape,
+  chartShapes,
+  chartShapeTranslations
+} from '@home/components/widget/lib/chart/chart.models';
+
+@Component({
+  selector: 'tb-time-series-chart-threshold-settings-panel',
+  templateUrl: './time-series-chart-threshold-settings-panel.component.html',
+  providers: [],
+  styleUrls: ['./time-series-chart-threshold-settings-panel.component.scss'],
+  encapsulation: ViewEncapsulation.None
+})
+export class TimeSeriesChartThresholdSettingsPanelComponent implements OnInit {
+
+  chartLineTypes = chartLineTypes;
+
+  chartLineTypeTranslations = chartLineTypeTranslations;
+
+  chartShapes = chartShapes;
+
+  chartShapeTranslations = chartShapeTranslations;
+
+  timeSeriesThresholdLabelPositions = timeSeriesThresholdLabelPositions;
+
+  timeSeriesThresholdLabelPositionTranslations = timeSeriesThresholdLabelPositionTranslations;
+
+  labelPreviewFn = this._labelPreviewFn.bind(this);
+
+  @Input()
+  thresholdSettings: Partial<TimeSeriesChartThreshold>;
+
+  @Input()
+  widgetConfig: WidgetConfig;
+
+  @Input()
+  yAxisIds: TimeSeriesChartYAxisId[];
+
+  @Input()
+  popover: TbPopoverComponent<TimeSeriesChartThresholdSettingsPanelComponent>;
+
+  @Input()
+  @coerceBoolean()
+  hideYAxis = false;
+
+  @Input()
+  panelTitle = 'widgets.time-series-chart.threshold.threshold-settings';
+
+  @Output()
+  thresholdSettingsApplied = new EventEmitter<Partial<TimeSeriesChartThreshold>>();
+
+  thresholdSettingsFormGroup: UntypedFormGroup;
+
+  constructor(private fb: UntypedFormBuilder) {
+  }
+
+  ngOnInit(): void {
+    this.thresholdSettingsFormGroup = this.fb.group(
+      {
+        yAxisId: [this.thresholdSettings.yAxisId, [Validators.required]],
+        units: [this.thresholdSettings.units, []],
+        decimals: [this.thresholdSettings.decimals, [Validators.min(0)]],
+        lineColor: [this.thresholdSettings.lineColor, []],
+        lineType: [this.thresholdSettings.lineType, []],
+        lineWidth: [this.thresholdSettings.lineWidth, [Validators.min(0)]],
+        startSymbol: [this.thresholdSettings.startSymbol, []],
+        startSymbolSize: [this.thresholdSettings.startSymbolSize, [Validators.min(0)]],
+        endSymbol: [this.thresholdSettings.endSymbol, []],
+        endSymbolSize: [this.thresholdSettings.endSymbolSize, [Validators.min(0)]],
+        showLabel: [this.thresholdSettings.showLabel, []],
+        labelPosition: [this.thresholdSettings.labelPosition, []],
+        labelFont: [this.thresholdSettings.labelFont, []],
+        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();
+    });
+    this.updateValidators();
+  }
+
+  cancel() {
+    this.popover?.hide();
+  }
+
+  applyThresholdSettings() {
+    const thresholdSettings = this.thresholdSettingsFormGroup.getRawValue();
+    this.thresholdSettingsApplied.emit(thresholdSettings);
+  }
+
+  private updateValidators() {
+    const showLabel: boolean = this.thresholdSettingsFormGroup.get('showLabel').value;
+    const enableLabelBackground: boolean = this.thresholdSettingsFormGroup.get('enableLabelBackground').value;
+    const startSymbol: ChartShape = this.thresholdSettingsFormGroup.get('startSymbol').value;
+    const endSymbol: ChartShape = 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 === ChartShape.none) {
+      this.thresholdSettingsFormGroup.get('startSymbolSize').disable({emitEvent: false});
+    } else {
+      this.thresholdSettingsFormGroup.get('startSymbolSize').enable({emitEvent: false});
+    }
+    if (endSymbol === ChartShape.none) {
+      this.thresholdSettingsFormGroup.get('endSymbolSize').disable({emitEvent: false});
+    } else {
+      this.thresholdSettingsFormGroup.get('endSymbolSize').enable({emitEvent: false});
+    }
+  }
+
+  private _labelPreviewFn(): string {
+    let units: string = this.thresholdSettingsFormGroup.get('units').value;
+    units = units && units.length ? units : this.widgetConfig.units;
+    let decimals: number = this.thresholdSettingsFormGroup.get('decimals').value;
+    decimals = isDefinedAndNotNull(decimals) ? decimals :
+      (isDefinedAndNotNull(this.widgetConfig.decimals) ? this.widgetConfig.decimals : 2);
+    return formatValue(22, decimals, units, 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
new file mode 100644
index 0000000000..ba0325da93
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-thresholds-panel.component.html
@@ -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.
+
+-->
+<div class="tb-form-panel tb-time-series-thresholds-panel">
+  <div class="tb-form-panel-title">{{ 'widgets.time-series-chart.threshold.thresholds' | translate }}</div>
+  <div class="tb-form-table">
+    <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 *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>
+      <div class="tb-form-table-header-cell tb-actions-header"></div>
+    </div>
+    <div *ngIf="thresholdsFormArray().controls.length; else noThresholds" class="tb-form-table-body">
+      <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>
+        <mat-divider *ngIf="!$last"></mat-divider>
+      </div>
+    </div>
+  </div>
+  <div>
+    <button type="button" mat-stroked-button color="primary" (click)="addThreshold()">
+      {{ 'widgets.time-series-chart.threshold.add-threshold' | translate }}
+    </button>
+  </div>
+</div>
+<ng-template #noThresholds>
+  <span fxLayoutAlign="center center"
+        class="tb-prompt">{{ 'widgets.time-series-chart.threshold.no-thresholds' | translate }}</span>
+</ng-template>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-thresholds-panel.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-thresholds-panel.component.scss
new file mode 100644
index 0000000000..e59fb35a72
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-thresholds-panel.component.scss
@@ -0,0 +1,85 @@
+/**
+ * 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-thresholds-panel {
+  .tb-form-table-header-cell {
+    &.tb-threshold-source-header {
+      flex: 1;
+      min-width: 100px;
+      @media #{$mat-gt-md} {
+        min-width: 200px;
+      }
+    }
+    &.tb-threshold-key-value-header {
+      flex: 1;
+      min-width: 100px;
+      @media #{$mat-gt-md} {
+        min-width: 150px;
+      }
+    }
+
+    &.tb-y-axis-header {
+      width: 100px;
+      min-width: 100px;
+    }
+
+    &.tb-units-header {
+      width: 80px;
+      min-width: 80px;
+    }
+
+    &.tb-color-header {
+      width: 40px;
+      min-width: 40px;
+    }
+
+    &.tb-decimals-header {
+      width: 60px;
+      min-width: 60px;
+    }
+
+    &.tb-actions-header {
+      width: 80px;
+      min-width: 80px;
+    }
+
+    &.tb-y-axis-header {
+      @media #{$mat-xs} {
+        display: none;
+      }
+    }
+
+    &.tb-units-header, &.tb-color-header, &.tb-decimals-header {
+      display: none;
+      @media #{$mat-gt-md} {
+        display: block;
+      }
+    }
+  }
+  .tb-form-table-body {
+    .tb-time-series-threshold-row {
+      overflow: hidden;
+    }
+    .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-thresholds-panel.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-thresholds-panel.component.ts
new file mode 100644
index 0000000000..95e3b242c3
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-thresholds-panel.component.ts
@@ -0,0 +1,221 @@
+///
+/// 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 {
+  TimeSeriesChartThreshold,
+  timeSeriesChartThresholdDefaultSettings,
+  TimeSeriesChartThresholdType,
+  timeSeriesChartThresholdValid,
+  timeSeriesChartThresholdValidator, TimeSeriesChartYAxisId
+} from '@home/components/widget/lib/chart/time-series-chart.models';
+import { mergeDeep } from '@core/utils';
+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',
+  templateUrl: './time-series-chart-thresholds-panel.component.html',
+  styleUrls: ['./time-series-chart-thresholds-panel.component.scss'],
+  providers: [
+    {
+      provide: NG_VALUE_ACCESSOR,
+      useExisting: forwardRef(() => TimeSeriesChartThresholdsPanelComponent),
+      multi: true
+    },
+    {
+      provide: NG_VALIDATORS,
+      useExisting: forwardRef(() => TimeSeriesChartThresholdsPanelComponent),
+      multi: true
+    }
+  ],
+  encapsulation: ViewEncapsulation.None
+})
+export class TimeSeriesChartThresholdsPanelComponent implements ControlValueAccessor, OnInit, Validator {
+
+  @Input()
+  disabled: boolean;
+
+  @Input()
+  aliasController: IAliasController;
+
+  @Input()
+  dataKeyCallbacks: DataKeysCallbacks;
+
+  @Input()
+  datasource: Datasource;
+
+  @Input()
+  widgetConfig: WidgetConfig;
+
+  @Input()
+  yAxisIds: TimeSeriesChartYAxisId[];
+
+  @Input()
+  @coerceBoolean()
+  hideYAxis = false;
+
+  thresholdsFormGroup: UntypedFormGroup;
+
+  private propagateChange = (_val: any) => {};
+
+  constructor(private fb: UntypedFormBuilder) {
+  }
+
+  ngOnInit() {
+    this.thresholdsFormGroup = this.fb.group({
+      thresholds: [this.fb.array([]), []]
+    });
+    this.thresholdsFormGroup.valueChanges.subscribe(
+      () => {
+        let thresholds: TimeSeriesChartThreshold[] = this.thresholdsFormGroup.get('thresholds').value;
+        if (thresholds) {
+          thresholds = thresholds.filter(t => timeSeriesChartThresholdValid(t));
+        }
+        this.updateLatestDataKeys(thresholds);
+        this.propagateChange(thresholds);
+      }
+    );
+  }
+
+  registerOnChange(fn: any): void {
+    this.propagateChange = fn;
+  }
+
+  registerOnTouched(fn: any): void {
+  }
+
+  setDisabledState(isDisabled: boolean): void {
+    this.disabled = isDisabled;
+    if (isDisabled) {
+      this.thresholdsFormGroup.disable({emitEvent: false});
+    } else {
+      this.thresholdsFormGroup.enable({emitEvent: false});
+    }
+  }
+
+  writeValue(value: TimeSeriesChartThreshold[] | undefined): void {
+    const thresholds = this.checkLatestDataKeys(value || []);
+    this.thresholdsFormGroup.setControl('thresholds', this.prepareThresholdsFormArray(thresholds), {emitEvent: false});
+  }
+
+  public validate(c: UntypedFormControl) {
+    const valid = this.thresholdsFormGroup.valid;
+    return valid ? null : {
+      thresholds: {
+        valid: false,
+      },
+    };
+  }
+
+  thresholdsFormArray(): UntypedFormArray {
+    return this.thresholdsFormGroup.get('thresholds') as UntypedFormArray;
+  }
+
+  trackByThreshold(index: number, thresholdControl: AbstractControl): any {
+    return thresholdControl;
+  }
+
+  removeThreshold(index: number) {
+    (this.thresholdsFormGroup.get('thresholds') as UntypedFormArray).removeAt(index);
+  }
+
+  addThreshold() {
+    const threshold = mergeDeep<TimeSeriesChartThreshold>({} as TimeSeriesChartThreshold,
+      timeSeriesChartThresholdDefaultSettings);
+    const thresholdsArray = this.thresholdsFormGroup.get('thresholds') as UntypedFormArray;
+    const thresholdControl = this.fb.control(threshold, [timeSeriesChartThresholdValidator]);
+    thresholdsArray.push(thresholdControl);
+  }
+
+  private prepareThresholdsFormArray(thresholds: TimeSeriesChartThreshold[] | undefined): UntypedFormArray {
+    const thresholdsControls: Array<AbstractControl> = [];
+    if (thresholds) {
+      thresholds.forEach((threshold) => {
+        thresholdsControls.push(this.fb.control(threshold, [timeSeriesChartThresholdValidator]));
+      });
+    }
+    return this.fb.array(thresholdsControls);
+  }
+
+  private checkLatestDataKeys(thresholds: TimeSeriesChartThreshold[]): TimeSeriesChartThreshold[] {
+    const result: TimeSeriesChartThreshold[] = [];
+    const latestKeys = this.datasource?.latestDataKeys || [];
+    for (const threshold of thresholds) {
+      if (threshold.type === TimeSeriesChartThresholdType.latestKey) {
+        const found = latestKeys.find(k => this.isThresholdKey(k, threshold));
+        if (found) {
+          result.push(threshold);
+        }
+      } else {
+        result.push(threshold);
+      }
+    }
+    return result;
+  }
+
+  private updateLatestDataKeys(thresholds: TimeSeriesChartThreshold[]) {
+    if (this.datasource) {
+      let latestKeys = this.datasource.latestDataKeys;
+      if (!latestKeys) {
+        latestKeys = [];
+        this.datasource.latestDataKeys = latestKeys;
+      }
+      const existingThresholdKeys = latestKeys.filter(k => k.settings?.__thresholdKey === true);
+      const foundThresholdKeys: DataKey[] = [];
+      for (const threshold of thresholds) {
+        if (threshold.type === TimeSeriesChartThresholdType.latestKey) {
+          const found = existingThresholdKeys.find(k => this.isThresholdKey(k, threshold));
+          if (!found) {
+            const newKey = this.dataKeyCallbacks.generateDataKey(threshold.latestKey, threshold.latestKeyType,
+              null, true, null);
+            newKey.settings.__thresholdKey = true;
+            latestKeys.push(newKey);
+          } else if (foundThresholdKeys.indexOf(found) === -1) {
+            foundThresholdKeys.push(found);
+          }
+        }
+      }
+      const toRemove = existingThresholdKeys.filter(k => foundThresholdKeys.indexOf(k) === -1);
+      for (const key of toRemove) {
+        const index = latestKeys.indexOf(key);
+        if (index > -1) {
+          latestKeys.splice(index, 1);
+        }
+      }
+    }
+  }
+
+  private isThresholdKey(d: DataKey, threshold: TimeSeriesChartThreshold): boolean {
+    return (d.type === DataKeyType.function && d.label === threshold.latestKey) ||
+    (d.type !== DataKeyType.function && d.name === threshold.latestKey &&
+      d.type === threshold.latestKeyType);
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-y-axes-panel.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-y-axes-panel.component.html
new file mode 100644
index 0000000000..d018b638d0
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-y-axes-panel.component.html
@@ -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.
+
+-->
+<div class="tb-form-panel tb-y-axes-panel">
+  <div class="tb-form-panel-title">{{ 'widgets.time-series-chart.y-axes' | translate }}</div>
+  <div class="tb-form-table">
+    <div class="tb-form-table-header no-padding-right">
+      <div class="tb-form-table-header-cell tb-axis-id-header" translate>widgets.time-series-chart.axis.id</div>
+      <div class="tb-form-table-header-cell tb-show-header" translate>widgets.time-series-chart.axis.show</div>
+      <div class="tb-form-table-header-cell tb-label-header" translate>widgets.time-series-chart.axis.label</div>
+      <div class="tb-form-table-header-cell tb-position-header" translate>widgets.time-series-chart.axis.position</div>
+      <div class="tb-form-table-header-cell tb-min-header" translate>widgets.time-series-chart.axis.min</div>
+      <div class="tb-form-table-header-cell tb-max-header" translate>widgets.time-series-chart.axis.max</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>
+      <div class="tb-form-table-header-cell tb-actions-header"></div>
+    </div>
+    <div class="tb-form-table-body tb-drop-list"
+         cdkDropList cdkDropListOrientation="vertical"
+         [cdkDropListDisabled]="!dragEnabled"
+         (cdkDropListDropped)="axisDrop($event)">
+      <div cdkDrag [cdkDragDisabled]="!dragEnabled"
+           class="tb-draggable-form-table-row"
+           *ngFor="let axisControl of axesFormArray().controls; trackBy: trackByAxis; let $index = index;">
+        <tb-time-series-chart-y-axis-row fxFlex
+                                            [formControl]="axisControl"
+                                            [advanced]="advanced"
+                                            (axisRemoved)="removeAxis($index)">
+        </tb-time-series-chart-y-axis-row>
+        <div class="tb-form-table-row-cell-buttons">
+          <button fxHide.lt-lg
+                  mat-icon-button
+                  type="button"
+                  cdkDragHandle
+                  [ngClass]="{'tb-hidden': !dragEnabled}"
+                  matTooltip="{{ 'action.drag' | translate }}"
+                  matTooltipPosition="above">
+            <mat-icon>drag_indicator</mat-icon>
+          </button>
+        </div>
+      </div>
+    </div>
+  </div>
+  <div>
+    <button type="button" mat-stroked-button color="primary" (click)="addAxis()">
+      {{ 'widgets.time-series-chart.axis.add-y-axis' | translate }}
+    </button>
+  </div>
+</div>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-y-axes-panel.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-y-axes-panel.component.scss
new file mode 100644
index 0000000000..52aa69f59d
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-y-axes-panel.component.scss
@@ -0,0 +1,87 @@
+/**
+ * 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-y-axes-panel {
+  .tb-form-table-header-cell {
+    &.tb-axis-id-header {
+      width: 60px;
+      min-width: 60px;
+    }
+
+    &.tb-label-header {
+      flex: 1 1 60%;
+      min-width: 100px;
+    }
+
+    &.tb-position-header {
+      flex: 1;
+      min-width: 60px;
+      @media #{$mat-gt-md} {
+        flex: 1 1 40%;
+      }
+    }
+
+    &.tb-units-header {
+      width: 80px;
+      min-width: 80px;
+    }
+
+    &.tb-decimals-header {
+      width: 60px;
+      min-width: 60px;
+    }
+
+    &.tb-min-header, &.tb-max-header {
+      width: 80px;
+      min-width: 80px;
+    }
+
+    &.tb-show-header {
+      width: 40px;
+      min-width: 40px;
+    }
+
+    &.tb-actions-header {
+      width: 80px;
+      min-width: 80px;
+      @media #{$mat-gt-md} {
+        width: 120px;
+        min-width: 120px;
+      }
+    }
+
+    &.tb-label-header, &.tb-units-header, &.tb-decimals-header {
+      display: none;
+      @media #{$mat-gt-md} {
+        display: block;
+      }
+    }
+
+    &.tb-min-header, &.tb-max-header {
+      display: none;
+      @media #{$mat-gt-xs} {
+        display: block;
+      }
+    }
+  }
+
+  .tb-form-table-body {
+    tb-time-series-chart-y-axis-row {
+      overflow: hidden;
+    }
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-y-axes-panel.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-y-axes-panel.component.ts
new file mode 100644
index 0000000000..9879ffe877
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-y-axes-panel.component.ts
@@ -0,0 +1,180 @@
+///
+/// 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, EventEmitter, forwardRef, Input, OnInit, Output, ViewEncapsulation } from '@angular/core';
+import {
+  AbstractControl,
+  ControlValueAccessor,
+  NG_VALIDATORS,
+  NG_VALUE_ACCESSOR,
+  UntypedFormArray,
+  UntypedFormBuilder,
+  UntypedFormControl,
+  UntypedFormGroup,
+  Validator
+} from '@angular/forms';
+import {
+  defaultTimeSeriesChartYAxisSettings,
+  getNextTimeSeriesYAxisId,
+  TimeSeriesChartYAxes, TimeSeriesChartYAxisId,
+  TimeSeriesChartYAxisSettings,
+  timeSeriesChartYAxisValid,
+  timeSeriesChartYAxisValidator
+} from '@home/components/widget/lib/chart/time-series-chart.models';
+import { mergeDeep } from '@core/utils';
+import { CdkDragDrop } from '@angular/cdk/drag-drop';
+import { coerceBoolean } from '@shared/decorators/coercion';
+
+@Component({
+  selector: 'tb-time-series-chart-y-axes-panel',
+  templateUrl: './time-series-chart-y-axes-panel.component.html',
+  styleUrls: ['./time-series-chart-y-axes-panel.component.scss'],
+  providers: [
+    {
+      provide: NG_VALUE_ACCESSOR,
+      useExisting: forwardRef(() => TimeSeriesChartYAxesPanelComponent),
+      multi: true
+    },
+    {
+      provide: NG_VALIDATORS,
+      useExisting: forwardRef(() => TimeSeriesChartYAxesPanelComponent),
+      multi: true
+    }
+  ],
+  encapsulation: ViewEncapsulation.None
+})
+export class TimeSeriesChartYAxesPanelComponent implements ControlValueAccessor, OnInit, Validator {
+
+  @Input()
+  disabled: boolean;
+
+  @Input()
+  @coerceBoolean()
+  advanced = false;
+
+  @Output()
+  axisRemoved = new EventEmitter<TimeSeriesChartYAxisId>();
+
+  yAxesFormGroup: UntypedFormGroup;
+
+  get dragEnabled(): boolean {
+    return this.axesFormArray().controls.length > 1;
+  }
+
+  private propagateChange = (_val: any) => {};
+
+  constructor(private fb: UntypedFormBuilder) {
+  }
+
+  ngOnInit() {
+    this.yAxesFormGroup = this.fb.group({
+      axes: [this.fb.array([]), []]
+    });
+    this.yAxesFormGroup.valueChanges.subscribe(
+      () => {
+        let axes: TimeSeriesChartYAxisSettings[] = this.yAxesFormGroup.get('axes').value;
+        for (let i = 0; i < axes.length; i++) {
+          axes[i].order = i;
+        }
+        if (axes) {
+          axes = axes.filter(axis => timeSeriesChartYAxisValid(axis));
+        }
+        const yAxes: TimeSeriesChartYAxes = {};
+        for (const axis of axes) {
+          yAxes[axis.id] = axis;
+        }
+        this.propagateChange(yAxes);
+      }
+    );
+  }
+
+  registerOnChange(fn: any): void {
+    this.propagateChange = fn;
+  }
+
+  registerOnTouched(fn: any): void {
+  }
+
+  setDisabledState(isDisabled: boolean): void {
+    this.disabled = isDisabled;
+    if (isDisabled) {
+      this.yAxesFormGroup.disable({emitEvent: false});
+    } else {
+      this.yAxesFormGroup.enable({emitEvent: false});
+    }
+  }
+
+  writeValue(value: TimeSeriesChartYAxes | undefined): void {
+    const yAxes: TimeSeriesChartYAxes = value || {};
+    if (!yAxes.default) {
+      yAxes.default = mergeDeep({} as TimeSeriesChartYAxisSettings, defaultTimeSeriesChartYAxisSettings,
+        {id: 'default', order: 0} as TimeSeriesChartYAxisSettings);
+    }
+    const yAxisSettingsList = Object.values(yAxes);
+    yAxisSettingsList.sort((a1, a2) => a1.order - a2.order);
+    this.yAxesFormGroup.setControl('axes', this.prepareAxesFormArray(yAxisSettingsList), {emitEvent: false});
+  }
+
+  public validate(c: UntypedFormControl) {
+    const valid = this.yAxesFormGroup.valid;
+    return valid ? null : {
+      yAxes: {
+        valid: false,
+      },
+    };
+  }
+
+  axisDrop(event: CdkDragDrop<string[]>) {
+    const axesArray = this.yAxesFormGroup.get('axes') as UntypedFormArray;
+    const axis = axesArray.at(event.previousIndex);
+    axesArray.removeAt(event.previousIndex);
+    axesArray.insert(event.currentIndex, axis);
+  }
+
+  axesFormArray(): UntypedFormArray {
+    return this.yAxesFormGroup.get('axes') as UntypedFormArray;
+  }
+
+  trackByAxis(index: number, axisControl: AbstractControl): any {
+    return axisControl;
+  }
+
+  removeAxis(index: number) {
+    const axis =
+      (this.yAxesFormGroup.get('axes') as UntypedFormArray).at(index).value as TimeSeriesChartYAxisSettings;
+    (this.yAxesFormGroup.get('axes') as UntypedFormArray).removeAt(index);
+    this.axisRemoved.emit(axis.id);
+  }
+
+  addAxis() {
+    const axis = mergeDeep<TimeSeriesChartYAxisSettings>({} as TimeSeriesChartYAxisSettings,
+      defaultTimeSeriesChartYAxisSettings);
+    const axes: TimeSeriesChartYAxisSettings[] = this.yAxesFormGroup.get('axes').value;
+    axis.id = getNextTimeSeriesYAxisId(axes);
+    axis.order = axes.length;
+    const axesArray = this.yAxesFormGroup.get('axes') as UntypedFormArray;
+    const axisControl = this.fb.control(axis, [timeSeriesChartYAxisValidator]);
+    axesArray.push(axisControl);
+  }
+
+  private prepareAxesFormArray(axes: TimeSeriesChartYAxisSettings[]): UntypedFormArray {
+    const axesControls: Array<AbstractControl> = [];
+    axes.forEach((axis) => {
+      axesControls.push(this.fb.control(axis, [timeSeriesChartYAxisValidator]));
+    });
+    return this.fb.array(axesControls);
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-y-axis-row.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-y-axis-row.component.html
new file mode 100644
index 0000000000..7291a2d4f7
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-y-axis-row.component.html
@@ -0,0 +1,72 @@
+<!--
+
+    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]="axisFormGroup" class="tb-form-table-row tb-axis-row">
+  <div class="tb-axis-id-field">
+    {{ modelValue.id }}
+  </div>
+  <mat-checkbox class="tb-show-field" formControlName="show"></mat-checkbox>
+  <mat-form-field class="tb-inline-field tb-label-field" appearance="outline" subscriptSizing="dynamic">
+    <input matInput formControlName="label" placeholder="{{ 'widget-config.set' | translate }}">
+  </mat-form-field>
+  <mat-form-field class="tb-inline-field tb-position-field" appearance="outline" subscriptSizing="dynamic">
+    <mat-select formControlName="position">
+      <mat-option *ngFor="let position of axisPositions" [value]="position">
+        {{ timeSeriesAxisPositionTranslations.get(position) | translate }}
+      </mat-option>
+    </mat-select>
+  </mat-form-field>
+  <div class="tb-min-field">
+    <mat-form-field appearance="outline" class="tb-inline-field number" subscriptSizing="dynamic">
+      <input matInput formControlName="min" type="number" placeholder="{{ 'widgets.chart.chart-axis.scale-auto' | translate }}">
+    </mat-form-field>
+  </div>
+  <div class="tb-max-field">
+    <mat-form-field appearance="outline" class="tb-inline-field number" subscriptSizing="dynamic">
+      <input matInput formControlName="max" type="number" placeholder="{{ 'widgets.chart.chart-axis.scale-auto' | translate }}">
+    </mat-form-field>
+  </div>
+  <div class="tb-units-field">
+    <tb-unit-input formControlName="units">
+    </tb-unit-input>
+  </div>
+  <div class="tb-decimals-field">
+    <mat-form-field appearance="outline" class="tb-inline-field 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-table-row-cell-buttons">
+    <button type="button"
+            mat-icon-button
+            #matButton
+            (click)="editAxis($event, matButton)"
+            matTooltip="{{ 'widgets.time-series-chart.axis.y-axis-settings' | translate }}"
+            matTooltipPosition="above">
+      <mat-icon>settings</mat-icon>
+    </button>
+    <div class="tb-remove-button">
+      <button *ngIf="modelValue.id !== 'default'"
+              type="button"
+              mat-icon-button
+              (click)="axisRemoved.emit()"
+              matTooltip="{{ 'widgets.time-series-chart.axis.remove-y-axis' | translate }}"
+              matTooltipPosition="above">
+        <mat-icon>delete</mat-icon>
+      </button>
+    </div>
+  </div>
+</div>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-y-axis-row.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-y-axis-row.component.scss
new file mode 100644
index 0000000000..12db0d9228
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-y-axis-row.component.scss
@@ -0,0 +1,95 @@
+/**
+ * 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-axis-row {
+
+  .tb-axis-id-field {
+    color: rgba(0, 0, 0, 0.76);
+    font-weight: 500;
+    font-size: 14px;
+    line-height: 20px;
+    letter-spacing: 0.2px;
+    width: 60px;
+    min-width: 60px;
+  }
+
+  .tb-label-field {
+    flex: 1 1 60%;
+    min-width: 100px;
+  }
+
+  .tb-position-field {
+    flex: 1;
+    min-width: 60px;
+    @media #{$mat-gt-md} {
+      flex: 1 1 40%;
+    }
+  }
+
+  .tb-units-field, .tb-decimals-field, .tb-min-field, .tb-max-field {
+    display: flex;
+    flex-direction: row;
+    place-content: center;
+    align-items: center;
+  }
+
+  .tb-units-field {
+    width: 80px;
+    min-width: 80px;
+  }
+
+  .tb-decimals-field {
+    width: 60px;
+    min-width: 60px;
+  }
+
+  .tb-min-field, .tb-max-field {
+    width: 80px;
+    min-width: 80px;
+  }
+
+  .tb-show-field {
+    width: 40px;
+    min-width: 40px;
+  }
+
+  .tb-label-field {
+    display: none;
+    @media #{$mat-gt-md} {
+      display: block;
+    }
+  }
+
+  .tb-units-field, .tb-decimals-field {
+    display: none;
+    @media #{$mat-gt-md} {
+      display: flex;
+    }
+  }
+
+  .tb-min-field, .tb-max-field {
+    display: none;
+    @media #{$mat-gt-xs} {
+      display: flex;
+    }
+  }
+
+  .tb-remove-button {
+    width: 40px;
+    min-width: 40px;
+  }
+}
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
new file mode 100644
index 0000000000..3fcde90cef
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-y-axis-row.component.ts
@@ -0,0 +1,205 @@
+///
+/// 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,
+  Renderer2,
+  ViewContainerRef,
+  ViewEncapsulation
+} from '@angular/core';
+import { ControlValueAccessor, NG_VALUE_ACCESSOR, UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
+import {
+  AxisPosition,
+  timeSeriesAxisPositionTranslations,
+  TimeSeriesChartYAxisSettings
+} from '@home/components/widget/lib/chart/time-series-chart.models';
+import { MatButton } from '@angular/material/button';
+import { TbPopoverService } from '@shared/components/popover.service';
+import { coerceBoolean } from '@shared/decorators/coercion';
+import {
+  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',
+  templateUrl: './time-series-chart-y-axis-row.component.html',
+  styleUrls: ['./time-series-chart-y-axis-row.component.scss'],
+  providers: [
+    {
+      provide: NG_VALUE_ACCESSOR,
+      useExisting: forwardRef(() => TimeSeriesChartYAxisRowComponent),
+      multi: true
+    }
+  ],
+  encapsulation: ViewEncapsulation.None
+})
+export class TimeSeriesChartYAxisRowComponent implements ControlValueAccessor, OnInit {
+
+  axisPositions = [AxisPosition.left, AxisPosition.right];
+
+  timeSeriesAxisPositionTranslations = timeSeriesAxisPositionTranslations;
+
+  @Input()
+  disabled: boolean;
+
+  @Input()
+  @coerceBoolean()
+  advanced = false;
+
+  @Output()
+  axisRemoved = new EventEmitter();
+
+  axisFormGroup: UntypedFormGroup;
+
+  modelValue: TimeSeriesChartYAxisSettings;
+
+  private propagateChange = (_val: any) => {};
+
+  constructor(private fb: UntypedFormBuilder,
+              private translate: TranslateService,
+              private popoverService: TbPopoverService,
+              private renderer: Renderer2,
+              private viewContainerRef: ViewContainerRef,
+              private cd: ChangeDetectorRef) {
+  }
+
+  ngOnInit() {
+    this.axisFormGroup = this.fb.group({
+      label: [null, []],
+      position: [null, []],
+      units: [null, []],
+      decimals: [null, []],
+      min: [null, []],
+      max: [null, []],
+      show: [null, []]
+    });
+    this.axisFormGroup.valueChanges.subscribe(
+      () => this.updateModel()
+    );
+    this.axisFormGroup.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.axisFormGroup.disable({emitEvent: false});
+    } else {
+      this.axisFormGroup.enable({emitEvent: false});
+      this.updateValidators();
+    }
+  }
+
+  writeValue(value: TimeSeriesChartYAxisSettings): void {
+    this.modelValue = value;
+    this.axisFormGroup.patchValue(
+      {
+        label: value.label,
+        position: value.position,
+        units: value.units,
+        decimals: value.decimals,
+        min: value.min,
+        max: value.max,
+        show: value.show,
+      }, {emitEvent: false}
+    );
+    this.updateValidators();
+    this.cd.markForCheck();
+  }
+
+  editAxis($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 = {
+        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, TimeSeriesChartAxisSettingsPanelComponent, ['leftOnly', 'leftTopOnly', 'leftBottomOnly'], true, null,
+        ctx,
+        {},
+        {}, {}, true);
+      yAxisSettingsPanelPopover.tbComponentRef.instance.popover = yAxisSettingsPanelPopover;
+      yAxisSettingsPanelPopover.tbComponentRef.instance.axisSettingsApplied.subscribe((yAxisSettings) => {
+        yAxisSettingsPanelPopover.hide();
+        this.modelValue = {...this.modelValue, ...yAxisSettings};
+        this.axisFormGroup.patchValue(
+          {
+            label: this.modelValue.label,
+            position: this.modelValue.position,
+            units: this.modelValue.units,
+            decimals: this.modelValue.decimals,
+            min: this.modelValue.min,
+            max: this.modelValue.max,
+            show: this.modelValue.show
+          },
+          {emitEvent: false});
+        this.updateValidators();
+        this.propagateChange(this.modelValue);
+      });
+    }
+  }
+
+  private updateValidators() {
+    const show: boolean = this.axisFormGroup.get('show').value;
+    if (show) {
+      this.axisFormGroup.get('label').enable({emitEvent: false});
+      this.axisFormGroup.get('position').enable({emitEvent: false});
+      this.axisFormGroup.get('units').enable({emitEvent: false});
+      this.axisFormGroup.get('decimals').enable({emitEvent: false});
+    } else {
+      this.axisFormGroup.get('label').disable({emitEvent: false});
+      this.axisFormGroup.get('position').disable({emitEvent: false});
+      this.axisFormGroup.get('units').disable({emitEvent: false});
+      this.axisFormGroup.get('decimals').disable({emitEvent: false});
+    }
+  }
+
+  private updateModel() {
+    const value = this.axisFormGroup.value;
+    this.modelValue.label = value.label;
+    this.modelValue.position = value.position;
+    this.modelValue.units = value.units;
+    this.modelValue.decimals = value.decimals;
+    this.modelValue.min = value.min;
+    this.modelValue.max = value.max;
+    this.modelValue.show = value.show;
+    this.propagateChange(this.modelValue);
+  }
+}
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
new file mode 100644
index 0000000000..28c79a1310
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-no-aggregation-bar-width-settings.component.html
@@ -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.
+
+-->
+<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">
+      <tb-toggle-option *ngFor="let strategy of timeSeriesChartNoAggregationBarWidthStrategies" [value]="strategy">
+        {{ timeSeriesChartNoAggregationBarWidthStrategyTranslations.get(strategy) | translate }}
+      </tb-toggle-option>
+    </tb-toggle-select>
+  </div>
+  <ng-container *ngIf="barWidthSettingsFormGroup.get('strategy').value === TimeSeriesChartNoAggregationBarWidthStrategy.group">
+    <ng-container
+      *ngTemplateOutlet="barWidth;
+      context: {
+        formGroup: barWidthSettingsFormGroup.get('groupWidth'),
+        label: 'widgets.time-series-chart.bar-group-width'
+      }">
+    </ng-container>
+  </ng-container>
+  <ng-container *ngIf="barWidthSettingsFormGroup.get('strategy').value === TimeSeriesChartNoAggregationBarWidthStrategy.separate">
+    <ng-container
+      *ngTemplateOutlet="barWidth;
+      context: {
+        formGroup: barWidthSettingsFormGroup.get('barWidth'),
+        label: 'widgets.time-series-chart.bar-width'
+      }">
+    </ng-container>
+  </ng-container>
+</div>
+<ng-template #barWidth let-label="label" let-formGroup="formGroup">
+  <div class="tb-form-row space-between column-lt-md" [formGroup]="formGroup">
+    <div translate>{{ label }}</div>
+    <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="relative">
+          <mat-select-trigger>
+            {{ (formGroup.get('relative').value ?
+               'widgets.time-series-chart.bar-width-relative' :
+               'widgets.time-series-chart.bar-width-absolute') | translate }}
+          </mat-select-trigger>
+          <mat-option [value]="true">
+            {{ 'widgets.time-series-chart.bar-width-relative' | translate }}
+          </mat-option>
+          <mat-option [value]="false">
+            {{ 'widgets.time-series-chart.bar-width-absolute' | translate }}
+          </mat-option>
+        </mat-select>
+      </mat-form-field>
+      <mat-form-field *ngIf="formGroup.get('relative').value" class="number fixed-width" appearance="outline" subscriptSizing="dynamic">
+        <input required matInput type="number" formControlName="relativeWidth" min="0.1" max="100" placeholder="{{ 'widget-config.set' | translate }}"/>
+        <span matSuffix>%</span>
+      </mat-form-field>
+      <mat-form-field *ngIf="!formGroup.get('relative').value" class="number fixed-width" appearance="outline" subscriptSizing="dynamic">
+        <input required matInput type="number" formControlName="absoluteWidth" min="100" step="1" placeholder="{{ 'widget-config.set' | translate }}"/>
+        <span matSuffix>ms</span>
+      </mat-form-field>
+    </div>
+  </div>
+</ng-template>
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
new file mode 100644
index 0000000000..8601c48159
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-no-aggregation-bar-width-settings.component.ts
@@ -0,0 +1,152 @@
+///
+/// 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 {
+  TimeSeriesChartNoAggregationBarWidthSettings,
+  timeSeriesChartNoAggregationBarWidthStrategies,
+  TimeSeriesChartNoAggregationBarWidthStrategy,
+  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',
+  templateUrl: './time-series-no-aggregation-bar-width-settings.component.html',
+  styleUrls: ['./../../widget-settings.scss'],
+  providers: [
+    {
+      provide: NG_VALUE_ACCESSOR,
+      useExisting: forwardRef(() => TimeSeriesNoAggregationBarWidthSettingsComponent),
+      multi: true
+    }
+  ]
+})
+export class TimeSeriesNoAggregationBarWidthSettingsComponent implements OnInit, ControlValueAccessor {
+
+  TimeSeriesChartNoAggregationBarWidthStrategy = TimeSeriesChartNoAggregationBarWidthStrategy;
+
+  timeSeriesChartNoAggregationBarWidthStrategies = timeSeriesChartNoAggregationBarWidthStrategies;
+
+  timeSeriesChartNoAggregationBarWidthStrategyTranslations = timeSeriesChartNoAggregationBarWidthStrategyTranslations;
+
+  @Input()
+  disabled: boolean;
+
+  @Input()
+  @coerceBoolean()
+  stroked = false;
+
+  private modelValue: TimeSeriesChartNoAggregationBarWidthSettings;
+
+  private propagateChange = null;
+
+  public barWidthSettingsFormGroup: UntypedFormGroup;
+
+  constructor(private fb: UntypedFormBuilder) {
+  }
+
+  ngOnInit(): void {
+    this.barWidthSettingsFormGroup = this.fb.group({
+      strategy: [null, []],
+      groupWidth: this.fb.group({
+        relative: [null, []],
+        relativeWidth: [null, [Validators.required, Validators.min(0.1), Validators.max(100)]],
+        absoluteWidth: [null, [Validators.required, Validators.min(100)]]
+      }),
+      barWidth: this.fb.group({
+        relative: [null, []],
+        relativeWidth: [null, [Validators.required, Validators.min(0.1), Validators.max(100)]],
+        absoluteWidth: [null, [Validators.required, Validators.min(100)]]
+      })
+    });
+    this.barWidthSettingsFormGroup.valueChanges.subscribe(() => {
+      this.updateModel();
+    });
+    merge(this.barWidthSettingsFormGroup.get('strategy').valueChanges,
+      this.barWidthSettingsFormGroup.get('groupWidth.relative').valueChanges,
+      this.barWidthSettingsFormGroup.get('barWidth.relative').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.barWidthSettingsFormGroup.disable({emitEvent: false});
+    } else {
+      this.barWidthSettingsFormGroup.enable({emitEvent: false});
+      this.updateValidators();
+    }
+  }
+
+  writeValue(value: TimeSeriesChartNoAggregationBarWidthSettings): void {
+    this.modelValue = value;
+    this.barWidthSettingsFormGroup.patchValue(
+      value, {emitEvent: false}
+    );
+    this.updateValidators();
+  }
+
+  private updateValidators() {
+    const strategy: TimeSeriesChartNoAggregationBarWidthStrategy =
+      this.barWidthSettingsFormGroup.get('strategy').value;
+    const groupWidthRelative: boolean = this.barWidthSettingsFormGroup.get('groupWidth.relative').value;
+    const barWidthRelative: boolean = this.barWidthSettingsFormGroup.get('barWidth.relative').value;
+    if (strategy === TimeSeriesChartNoAggregationBarWidthStrategy.group) {
+      this.barWidthSettingsFormGroup.get('groupWidth').enable({emitEvent: false});
+      this.barWidthSettingsFormGroup.get('barWidth').disable({emitEvent: false});
+      if (groupWidthRelative) {
+        this.barWidthSettingsFormGroup.get('groupWidth').get('relativeWidth').enable({emitEvent: false});
+        this.barWidthSettingsFormGroup.get('groupWidth').get('absoluteWidth').disable({emitEvent: false});
+      } else {
+        this.barWidthSettingsFormGroup.get('groupWidth').get('relativeWidth').disable({emitEvent: false});
+        this.barWidthSettingsFormGroup.get('groupWidth').get('absoluteWidth').enable({emitEvent: false});
+      }
+    } else if (strategy === TimeSeriesChartNoAggregationBarWidthStrategy.separate) {
+      this.barWidthSettingsFormGroup.get('groupWidth').disable({emitEvent: false});
+      this.barWidthSettingsFormGroup.get('barWidth').enable({emitEvent: false});
+      if (barWidthRelative) {
+        this.barWidthSettingsFormGroup.get('barWidth').get('relativeWidth').enable({emitEvent: false});
+        this.barWidthSettingsFormGroup.get('barWidth').get('absoluteWidth').disable({emitEvent: false});
+      } else {
+        this.barWidthSettingsFormGroup.get('barWidth').get('relativeWidth').disable({emitEvent: false});
+        this.barWidthSettingsFormGroup.get('barWidth').get('absoluteWidth').enable({emitEvent: false});
+      }
+    }
+  }
+
+  private updateModel() {
+    this.modelValue = this.barWidthSettingsFormGroup.getRawValue();
+    this.propagateChange(this.modelValue);
+  }
+}
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
new file mode 100644
index 0000000000..d5cc9a183e
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/data-key-input.component.html
@@ -0,0 +1,164 @@
+<!--
+
+    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.
+
+-->
+<mat-form-field class="tb-inline-field tb-key-field" subscriptSizing="dynamic"
+                [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">
+          <div class="tb-chip-label tb-chip-text tb-chip-icon">
+            <ng-container *ngIf="isEntityDatasource">
+              <mat-icon class="tb-mat-18 tb-datakey-icon" *ngIf="modelValue.type === DataKeyType.alarm"
+                        matTooltip="{{'datakey.alarm' | translate }}"
+                        matTooltipPosition="above">notifications</mat-icon>
+              <mat-icon class="tb-mat-18 tb-datakey-icon" *ngIf="modelValue.type === DataKeyType.attribute"
+                        matTooltip="{{'datakey.attributes' | translate }}"
+                        matTooltipPosition="above" svgIcon="mdi:alpha-a-circle-outline"></mat-icon>
+              <mat-icon class="tb-mat-18 tb-datakey-icon" *ngIf="modelValue.type === DataKeyType.entityField"
+                        matTooltip="{{'datakey.entity-field' | translate }}"
+                        matTooltipPosition="above" svgIcon="mdi:alpha-e-circle-outline"></mat-icon>
+              <mat-icon class="tb-mat-18 tb-datakey-icon" *ngIf="modelValue.type === DataKeyType.timeseries"
+                        matTooltip="{{'datakey.timeseries' | translate }}"
+                        matTooltipPosition="above">timeline</mat-icon>
+            </ng-container>
+          </div>
+          <div class="tb-chip-label tb-chip-text">
+            <strong>
+              <ng-container *ngTemplateOutlet="keyName"></ng-container>
+            </strong>
+          </div>
+        </div>
+        <button *ngIf="editable"
+                type="button"
+                (click)="editKey()" mat-icon-button class="tb-mat-24">
+          <mat-icon class="tb-mat-18">edit</mat-icon>
+        </button>
+        <button *ngIf="removable"
+                matChipRemove
+                type="button"
+                mat-icon-button class="tb-mat-24">
+          <mat-icon class="tb-mat-18">close</mat-icon>
+        </button>
+      </div>
+    </mat-chip-row>
+    <input matInput
+           type="text"
+           placeholder="{{ 'widget-config.set' | translate }}"
+           #keyInput
+           [required]="required"
+           [formControl]="keyFormControl"
+           matAutocompleteOrigin
+           [fxHide]="!!modelValue?.type"
+           [readonly]="!!modelValue?.type"
+           #origin="matAutocompleteOrigin"
+           [matAutocompleteConnectedTo]="origin"
+           (focusin)="onKeyInputFocus()"
+           (drop)="$event.preventDefault();"
+           [matAutocomplete]="keyAutocomplete"
+           [matChipInputFor]="chipList"
+           [matChipInputSeparatorKeyCodes]="separatorKeysCodes"
+           (matChipInputTokenEnd)="addKey($event)"
+    />
+  </mat-chip-grid>
+  <mat-icon matSuffix
+            matTooltipPosition="above"
+            matTooltipClass="tb-error-tooltip"
+            [matTooltip]="requiredText | translate"
+            *ngIf="requiredText && keysFormControl.hasError('required')
+                                && keysFormControl.touched"
+            class="tb-error">
+    warning
+  </mat-icon>
+  <mat-autocomplete #keyAutocomplete="matAutocomplete"
+                    class="tb-autocomplete"
+                    panelWidth="fit-content"
+                    [displayWith]="displayKeyFn">
+    <mat-option *ngFor="let key of filteredKeys | async" [value]="key">
+      <span style="white-space: nowrap;">
+        <ng-container *ngIf="isEntityDatasource">
+          <mat-icon class="tb-datakey-icon" *ngIf="key.type === DataKeyType.alarm"
+                    matTooltip="{{'datakey.alarm' | translate }}"
+                    matTooltipPosition="above">notifications</mat-icon>
+          <mat-icon class="tb-datakey-icon" *ngIf="key.type === DataKeyType.attribute"
+                    matTooltip="{{'datakey.attributes' | translate }}"
+                    matTooltipPosition="above" svgIcon="mdi:alpha-a-circle-outline"></mat-icon>
+          <mat-icon class="tb-datakey-icon" *ngIf="key.type === DataKeyType.entityField"
+                    matTooltip="{{'datakey.entity-field' | translate }}"
+                    matTooltipPosition="above" svgIcon="mdi:alpha-e-circle-outline"></mat-icon>
+          <mat-icon class="tb-datakey-icon" *ngIf="key.type === DataKeyType.timeseries"
+                    matTooltip="{{'datakey.timeseries' | translate }}"
+                    matTooltipPosition="above">timeline</mat-icon>
+        </ng-container>
+        <span [innerHTML]="key.name | highlight:keySearchText"></span>
+      </span>
+    </mat-option>
+    <mat-option *ngIf="!(filteredKeys | async)?.length" [value]="null" class="tb-not-found">
+      <div class="tb-not-found-content" (click)="$event.stopPropagation()">
+        <div *ngIf="!textIsNotEmpty(keySearchText); else searchNotEmpty">
+          <span translate>entity.no-keys-found</span>
+        </div>
+        <ng-template #searchNotEmpty>
+          <span>
+            {{ translate.get('entity.no-key-matching',
+            {key: truncate.transform(keySearchText, true, 6, &apos;...&apos;)}) | async }}
+          </span>
+          <span *ngIf="!isEntityDatasource; else createEntityKey">
+            <a translate (click)="createKey(keySearchText)">entity.create-new-key</a>
+          </span>
+          <ng-template #createEntityKey>
+            <span>{{'entity.create-new-key' | translate }}  </span>
+            <mat-icon class="tb-datakey-icon new-key" *ngIf="allowedDataKeyTypes.includes(DataKeyType.alarm)"
+                      matTooltip="{{'datakey.alarm' | translate }}"
+                      matTooltipPosition="above"
+                      (click)="createKey(keySearchText, DataKeyType.alarm)">notifications</mat-icon>
+            <mat-icon class="tb-datakey-icon new-key" *ngIf="allowedDataKeyTypes.includes(DataKeyType.attribute)"
+                      matTooltip="{{'datakey.attributes' | translate }}"
+                      matTooltipPosition="above" svgIcon="mdi:alpha-a-circle-outline"
+                      (click)="createKey(keySearchText, DataKeyType.attribute)"></mat-icon>
+            <mat-icon class="tb-datakey-icon new-key" *ngIf="allowedDataKeyTypes.includes(DataKeyType.entityField)"
+                      matTooltip="{{'datakey.entity-field' | translate }}"
+                      matTooltipPosition="above" svgIcon="mdi:alpha-e-circle-outline"
+                      (click)="createKey(keySearchText, DataKeyType.entityField)"></mat-icon>
+            <mat-icon class="tb-datakey-icon new-key" *ngIf="allowedDataKeyTypes.includes(DataKeyType.timeseries)"
+                      matTooltip="{{'datakey.timeseries' | translate }}"
+                      matTooltipPosition="above"
+                      (click)="createKey(keySearchText, DataKeyType.timeseries)">timeline</mat-icon>
+          </ng-template>
+        </ng-template>
+      </div>
+    </mat-option>
+  </mat-autocomplete>
+</mat-form-field>
+<ng-template #keyName>
+  <ng-container *ngIf="dataKeyHasPostprocessing(); else keyName">
+    <span>f(</span><ng-container *ngTemplateOutlet="keyNameTemplate"></ng-container><span>)</span>
+  </ng-container>
+  <ng-template #keyName>
+    <ng-container *ngTemplateOutlet="keyNameTemplate"></ng-container>
+  </ng-template>
+</ng-template>
+<ng-template #keyNameTemplate>
+  <ng-container *ngIf="dataKeyHasAggregation(); else keyName;">
+    <span class="tb-agg-func">{{ modelValue?.aggregationType }}</span><span>({{ modelValue?.name }})</span>
+  </ng-container>
+  <ng-template #keyName>
+    <span>{{modelValue?.name}}</span>
+  </ng-template>
+</ng-template>
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
new file mode 100644
index 0000000000..f8564a46ac
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/data-key-input.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.
+ */
+.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;
+
+      .mat-mdc-form-field-infix {
+        padding-top: 0;
+        padding-bottom: 6px;
+
+        .mdc-evolution-chip-set .mdc-evolution-chip {
+          margin: 0;
+        }
+
+        input.mat-mdc-chip-input {
+          height: 32px;
+          margin-left: 0;
+        }
+      }
+    }
+
+    .mat-mdc-chip.mat-mdc-standard-chip.tb-datakey-chip {
+      .tb-attribute-chip {
+        .tb-chip-labels {
+          background: transparent;
+        }
+      }
+    }
+  }
+}
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
new file mode 100644
index 0000000000..47d093be54
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/data-key-input.component.ts
@@ -0,0 +1,405 @@
+///
+/// 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,
+  ElementRef,
+  EventEmitter,
+  forwardRef,
+  HostBinding,
+  Input,
+  OnChanges,
+  OnInit,
+  Output,
+  SimpleChanges,
+  ViewChild,
+  ViewEncapsulation
+} from '@angular/core';
+import {
+  ControlValueAccessor,
+  NG_VALUE_ACCESSOR,
+  UntypedFormBuilder,
+  UntypedFormControl,
+  Validators
+} from '@angular/forms';
+import { DataKeyType } from '@shared/models/telemetry/telemetry.models';
+import { COMMA, ENTER, SEMICOLON } from '@angular/cdk/keycodes';
+import { MatAutocomplete, MatAutocompleteTrigger } from '@angular/material/autocomplete';
+import { MatChipGrid, MatChipInputEvent } from '@angular/material/chips';
+import { coerceBoolean } from '@shared/decorators/coercion';
+import { DataKey, DatasourceType, widgetType } from '@shared/models/widget.models';
+import { Observable, of } from 'rxjs';
+import { MatDialog } from '@angular/material/dialog';
+import { TranslateService } from '@ngx-translate/core';
+import { TruncatePipe } from '@shared/pipe/truncate.pipe';
+import { UtilsService } from '@core/services/utils.service';
+import { alarmFields } from '@shared/models/alarm.models';
+import { filter, map, mergeMap, publishReplay, refCount, share, tap } from 'rxjs/operators';
+import { AggregationType } from '@shared/models/time/time.models';
+import { DataKeysCallbacks } from '@home/components/widget/config/data-keys.component.models';
+import { IAliasController } from '@core/api/widget-api.models';
+
+@Component({
+  selector: 'tb-data-key-input',
+  templateUrl: './data-key-input.component.html',
+  styleUrls: ['./data-key-input.component.scss', '../../../config/data-keys.component.scss'],
+  providers: [
+    {
+      provide: NG_VALUE_ACCESSOR,
+      useExisting: forwardRef(() => DataKeyInputComponent),
+      multi: true
+    }
+  ],
+  encapsulation: ViewEncapsulation.None
+})
+export class DataKeyInputComponent implements ControlValueAccessor, OnInit, OnChanges {
+
+  @HostBinding('class')
+  hostClass = 'tb-data-key-input';
+
+  DataKeyType = DataKeyType;
+
+  separatorKeysCodes: number[] = [ENTER, COMMA, SEMICOLON];
+
+  @ViewChild('keyInput') keyInput: ElementRef<HTMLInputElement>;
+  @ViewChild('keyAutocomplete') matAutocomplete: MatAutocomplete;
+  @ViewChild(MatAutocompleteTrigger) autocomplete: MatAutocompleteTrigger;
+  @ViewChild('chipList') chipList: MatChipGrid;
+
+  @Input()
+  disabled: boolean;
+
+  @Input()
+  @coerceBoolean()
+  required = false;
+
+  @Input()
+  requiredText: string;
+
+  @Input()
+  @coerceBoolean()
+  isLatestDataKeys = false;
+
+  @Input()
+  @coerceBoolean()
+  editable = true;
+
+  @Input()
+  @coerceBoolean()
+  removable = true;
+
+  @Input()
+  datasourceType: DatasourceType;
+
+  @Input()
+  entityAliasId: string;
+
+  @Input()
+  entityAlias: string;
+
+  @Input()
+  deviceId: string;
+
+  @Input()
+  widgetType: widgetType;
+
+  @Input()
+  callbacks: DataKeysCallbacks;
+
+  @Input()
+  aliasController: IAliasController;
+
+  @Input()
+  dataKeyType: DataKeyType;
+
+  @Input()
+  dataKeyTypes: DataKeyType[];
+
+  @Input()
+  generateKey: (key: DataKey) => DataKey = (key) => key;
+
+  @Output()
+  keyEdit = new EventEmitter<DataKey>();
+
+  keysFormControl: UntypedFormControl;
+
+  keyFormControl: UntypedFormControl;
+
+  modelValue: DataKey;
+
+  filteredKeys: Observable<Array<DataKey>>;
+
+  keySearchText = '';
+
+  alarmKeys: Array<DataKey>;
+  functionTypeKeys: Array<DataKey>;
+
+  allowedDataKeyTypes: DataKeyType[] = [];
+
+  private latestKeySearchTextResult: Array<DataKey> = null;
+  private keyFetchObservable$: Observable<Array<DataKey>> = null;
+
+  get isEntityDatasource(): boolean {
+    return [DatasourceType.device, DatasourceType.entity].includes(this.datasourceType);
+  }
+
+  private propagateChange = (_val: any) => {};
+
+  constructor(private fb: UntypedFormBuilder,
+              private dialog: MatDialog,
+              private cd: ChangeDetectorRef,
+              public translate: TranslateService,
+              public truncate: TruncatePipe,
+              private utils: UtilsService) {
+  }
+
+  ngOnInit() {
+    this.alarmKeys = [];
+    for (const name of Object.keys(alarmFields)) {
+      this.alarmKeys.push({
+        name,
+        type: DataKeyType.alarm
+      });
+    }
+    this.functionTypeKeys = [];
+    for (const type of this.utils.getPredefinedFunctionsList()) {
+      this.functionTypeKeys.push({
+        name: type,
+        type: DataKeyType.function
+      });
+    }
+    this.keyFormControl = this.fb.control('');
+    this.keysFormControl = this.fb.control([], this.required ? [Validators.required] : []);
+    this.filteredKeys = this.keyFormControl.valueChanges
+    .pipe(
+      tap((value: string | DataKey) => {
+        if (value && typeof value !== 'string') {
+          this.addKeyFromChipValue(value);
+        } else if (value === null) {
+          this.clearKeyChip(this.keyInput.nativeElement.value);
+        }
+      }),
+      filter((value) => typeof value === 'string'),
+      map((value) => value ? (typeof value === 'string' ? value : value.name) : ''),
+      mergeMap(name => this.fetchKeys(name) ),
+      share()
+    );
+    this.updateAllowedDataKeys();
+  }
+
+  private updateAllowedDataKeys() {
+    this.allowedDataKeyTypes.length = 0;
+    if (this.dataKeyTypes?.length) {
+      this.allowedDataKeyTypes = this.allowedDataKeyTypes.concat(this.dataKeyTypes);
+    } else {
+      this.allowedDataKeyTypes = [DataKeyType.timeseries];
+      if (this.isLatestDataKeys || this.widgetType === widgetType.latest || this.widgetType === widgetType.alarm) {
+        this.allowedDataKeyTypes.push(DataKeyType.attribute);
+        this.allowedDataKeyTypes.push(DataKeyType.entityField);
+        if (this.widgetType === widgetType.alarm) {
+          this.allowedDataKeyTypes.push(DataKeyType.alarm);
+        }
+      }
+    }
+  }
+
+  private reset() {
+    if (this.keyInput) {
+      this.keyInput.nativeElement.value = '';
+    }
+    this.keyFormControl.patchValue('', {emitEvent: false});
+    this.latestKeySearchTextResult = null;
+  }
+
+  ngOnChanges(changes: SimpleChanges): void {
+    for (const propName of Object.keys(changes)) {
+      const change = changes[propName];
+      if (!change.firstChange && change.currentValue !== change.previousValue) {
+        if (['deviceId', 'entityAliasId', 'entityAlias', 'isLatestDataKeys'].includes(propName)) {
+          this.clearKeySearchCache();
+          if (propName === 'isLatestDataKeys') {
+            this.updateAllowedDataKeys();
+            if (!this.isLatestDataKeys) {
+              if (this.widgetType === widgetType.timeseries &&
+                this.modelValue?.type &&
+                this.modelValue.type !== DataKeyType.timeseries) {
+                setTimeout(() => {
+                  this.modelValue = null;
+                  this.updateModel();
+                  this.clearKeyChip('', false);
+                }, 1);
+              }
+            }
+          }
+        } else if (['datasourceType'].includes(propName)) {
+          if ([DatasourceType.device, DatasourceType.entity].includes(change.previousValue) &&
+            [DatasourceType.device, DatasourceType.entity].includes(change.currentValue)) {
+            this.clearKeySearchCache();
+          } else {
+            this.clearKeySearchCache();
+            setTimeout(() => {
+              this.reset();
+            }, 1);
+          }
+        }
+      }
+    }
+  }
+
+  registerOnChange(fn: any): void {
+    this.propagateChange = fn;
+  }
+
+  registerOnTouched(fn: any): void {
+  }
+
+  setDisabledState(isDisabled: boolean): void {
+    this.disabled = isDisabled;
+    if (isDisabled) {
+      this.keysFormControl.disable({emitEvent: false});
+    } else {
+      this.keysFormControl.enable({emitEvent: false});
+    }
+  }
+
+  writeValue(value: DataKey): void {
+    this.modelValue = (value?.name && value?.type) ? value : null;
+    this.keysFormControl.patchValue(this.modelValue ? [this.modelValue] : [], {emitEvent: false});
+    this.cd.markForCheck();
+  }
+
+  dataKeyHasAggregation(): boolean {
+    return this.widgetType === widgetType.latest && this.modelValue?.type === DataKeyType.timeseries
+      && this.modelValue?.aggregationType && this.modelValue?.aggregationType !== AggregationType.NONE;
+  }
+
+  dataKeyHasPostprocessing(): boolean {
+    return !!this.modelValue?.postFuncBody;
+  }
+
+  displayKeyFn(key?: DataKey): string | undefined {
+    return key ? key.name : undefined;
+  }
+
+  createKey(name: string, dataKeyType: DataKeyType = this.dataKeyType) {
+    this.addKeyFromChipValue({name: name ? name.trim() : '', type: dataKeyType});
+  }
+
+  addKey(event: MatChipInputEvent): void {
+    const value = event.value;
+    if ((value || '').trim() && this.dataKeyType) {
+      this.addKeyFromChipValue({name: value.trim(), type: this.dataKeyType});
+    } else {
+      this.clearKeyChip();
+    }
+  }
+
+  editKey() {
+    this.keyEdit.emit(this.modelValue);
+  }
+
+  removeKey() {
+    this.modelValue = null;
+    this.updateModel();
+    this.clearKeyChip();
+  }
+
+  textIsNotEmpty(text: string): boolean {
+    return text && text.length > 0;
+  }
+
+  clearKeyChip(value: string = '', focus = true) {
+    this.autocomplete.closePanel();
+    this.keyInput.nativeElement.value = value;
+    this.keyFormControl.patchValue(value, {emitEvent: focus});
+    if (focus) {
+      setTimeout(() => {
+        this.keyInput.nativeElement.blur();
+        this.keyInput.nativeElement.focus();
+      }, 0);
+    }
+  }
+
+  onKeyInputFocus() {
+    if (!this.modelValue?.type) {
+      this.keyFormControl.updateValueAndValidity({onlySelf: true, emitEvent: true});
+    }
+  }
+
+  private fetchKeys(searchText?: string): Observable<Array<DataKey>> {
+    if (this.keySearchText !== searchText || this.latestKeySearchTextResult === null) {
+      this.keySearchText = searchText;
+      const dataKeyFilter = this.createDataKeyFilter(this.keySearchText);
+      return this.getKeys().pipe(
+        map(name => name.filter(dataKeyFilter)),
+        tap(res => this.latestKeySearchTextResult = res)
+      );
+    }
+    return of(this.latestKeySearchTextResult);
+  }
+
+  private getKeys(): Observable<Array<DataKey>> {
+    if (this.keyFetchObservable$ === null) {
+      let fetchObservable: Observable<Array<DataKey>>;
+      if (this.datasourceType === DatasourceType.function) {
+        const targetKeysList = this.widgetType === widgetType.alarm ? this.alarmKeys : this.functionTypeKeys;
+        fetchObservable = of(targetKeysList);
+      } else if (this.datasourceType === DatasourceType.entity && (this.entityAliasId || this.entityAlias) ||
+        this.datasourceType === DatasourceType.device && this.deviceId) {
+        if (this.datasourceType === DatasourceType.device) {
+          fetchObservable = this.callbacks.fetchEntityKeysForDevice(this.deviceId, this.allowedDataKeyTypes);
+        } else {
+          let entityAliasId = this.entityAliasId;
+          if (!entityAliasId && this.entityAlias && this.aliasController) {
+            entityAliasId = this.aliasController.getEntityAliasId(this.entityAlias);
+          }
+          fetchObservable = entityAliasId ? this.callbacks.fetchEntityKeys(entityAliasId, this.allowedDataKeyTypes) : of([]);
+        }
+      } else {
+        fetchObservable = of([]);
+      }
+      this.keyFetchObservable$ = fetchObservable.pipe(
+        publishReplay(1),
+        refCount()
+      );
+    }
+    return this.keyFetchObservable$;
+  }
+
+  private createDataKeyFilter(query: string): (key: DataKey) => boolean {
+    const lowercaseQuery = query.toLowerCase();
+    return key => key.name.toLowerCase().startsWith(lowercaseQuery);
+  }
+
+  private addKeyFromChipValue(chip: DataKey) {
+    this.modelValue = this.generateKey(chip);
+    this.updateModel();
+    this.clearKeyChip('', false);
+  }
+
+  private clearKeySearchCache() {
+    this.keySearchText = '';
+    this.keyFetchObservable$ = null;
+    this.latestKeySearchTextResult = null;
+  }
+
+  private updateModel() {
+    this.keysFormControl.patchValue(this.modelValue ? [this.modelValue] : [], {emitEvent: false});
+    this.propagateChange(this.modelValue);
+  }
+
+}
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/date-format-select.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/date-format-select.component.html
index 79854d0a65..93d4ec68c6 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/date-format-select.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/date-format-select.component.html
@@ -23,4 +23,9 @@
           *ngIf="dateFormatFormControl.value?.custom" matSuffix mat-icon-button (click)="openDateFormatSettingsPopup($event, customFormatButton)">
     <tb-icon>edit</tb-icon>
   </button>
+  <button #autoFormatButton
+          *ngIf="dateFormatFormControl.value?.auto && !dateFormatFormControl.value?.custom"
+          matSuffix mat-icon-button (click)="openAutoFormatSettingsPopup($event, autoFormatButton)">
+    <tb-icon>edit</tb-icon>
+  </button>
 </mat-form-field>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/date-format-select.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/date-format-select.component.ts
index 3e2393d6ff..144f02fe46 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/date-format-select.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/date-format-select.component.ts
@@ -16,16 +16,26 @@
 
 import { Component, forwardRef, Input, OnInit, Renderer2, ViewChild, ViewContainerRef } from '@angular/core';
 import { ControlValueAccessor, NG_VALUE_ACCESSOR, UntypedFormControl } from '@angular/forms';
-import { compareDateFormats, dateFormats, DateFormatSettings } from '@shared/models/widget-settings.models';
+import {
+  AutoDateFormatSettings,
+  compareDateFormats,
+  dateFormats,
+  DateFormatSettings,
+  dateFormatsWithAuto,
+  defaultAutoDateFormatSettings
+} from '@shared/models/widget-settings.models';
 import { TranslateService } from '@ngx-translate/core';
 import { DatePipe } from '@angular/common';
 import { MatButton } from '@angular/material/button';
 import { TbPopoverService } from '@shared/components/popover.service';
-import { deepClone } from '@core/utils';
+import { deepClone, mergeDeep } from '@core/utils';
 import {
   DateFormatSettingsPanelComponent
 } from '@home/components/widget/lib/settings/common/date-format-settings-panel.component';
 import { coerceBoolean } from '@shared/decorators/coercion';
+import {
+  AutoDateFormatSettingsPanelComponent
+} from '@home/components/widget/lib/settings/common/auto-date-format-settings-panel.component';
 
 @Component({
   selector: 'tb-date-format-select',
@@ -51,6 +61,10 @@ export class DateFormatSelectComponent implements OnInit, ControlValueAccessor {
   @coerceBoolean()
   excludeLastUpdateAgo = false;
 
+  @Input()
+  @coerceBoolean()
+  includeAuto = false;
+
   dateFormatList: DateFormatSettings[];
 
   dateFormatsCompare = compareDateFormats;
@@ -70,8 +84,9 @@ export class DateFormatSelectComponent implements OnInit, ControlValueAccessor {
               private viewContainerRef: ViewContainerRef) {}
 
   ngOnInit(): void {
+    const targetDateFormats = this.includeAuto ? dateFormatsWithAuto : dateFormats;
     this.dateFormatList = this.excludeLastUpdateAgo ?
-      dateFormats.filter(format => !format.lastUpdateAgo) : dateFormats;
+      targetDateFormats.filter(format => !format.lastUpdateAgo) : dateFormats;
     this.dateFormatFormControl = new UntypedFormControl();
     this.dateFormatFormControl.valueChanges.subscribe((value: DateFormatSettings) => {
       this.updateModel(value);
@@ -116,6 +131,8 @@ export class DateFormatSelectComponent implements OnInit, ControlValueAccessor {
       return this.translate.instant('date.custom-date');
     } else if (value.lastUpdateAgo) {
       return this.translate.instant('date.last-update-n-ago');
+    } else if (value.auto) {
+      return this.translate.instant('date.auto');
     } else {
       if (!this.formatCache[value.format]) {
         this.formatCache[value.format] = this.date.transform(Date.now(), value.format);
@@ -148,4 +165,30 @@ export class DateFormatSelectComponent implements OnInit, ControlValueAccessor {
       });
     }
   }
+
+  openAutoFormatSettingsPopup($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 = {
+        autoDateFormatSettings: mergeDeep({} as AutoDateFormatSettings,
+          defaultAutoDateFormatSettings, this.modelValue.autoDateFormatSettings)
+      };
+      const autoDateFormatSettingsPanelPopover = this.popoverService.displayPopover(trigger, this.renderer,
+        this.viewContainerRef, AutoDateFormatSettingsPanelComponent, ['leftOnly', 'leftTopOnly', 'leftBottomOnly'], true, null,
+        ctx,
+        {},
+        {}, {}, true);
+      autoDateFormatSettingsPanelPopover.tbComponentRef.instance.popover = autoDateFormatSettingsPanelPopover;
+      autoDateFormatSettingsPanelPopover.tbComponentRef.instance.autoDateFormatSettingsApplied.subscribe((autoDateFormatSettings) => {
+        autoDateFormatSettingsPanelPopover.hide();
+        this.modelValue.autoDateFormatSettings = autoDateFormatSettings;
+        this.propagateChange(this.modelValue);
+      });
+    }
+  }
 }
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/entity-alias-input.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/entity-alias-input.component.html
new file mode 100644
index 0000000000..78d0533865
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/entity-alias-input.component.html
@@ -0,0 +1,49 @@
+<!--
+
+    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.
+
+-->
+<mat-form-field class="tb-inline-field" appearance="outline" subscriptSizing="dynamic"
+                [class.tb-suffix-absolute]="required && !entityAliasFormControl.value">
+  <input [required]="required"
+         matInput type="text"
+         placeholder="{{ 'entity.entity-alias' | translate }}"
+         #entityAliasInput
+         [formControl]="entityAliasFormControl"
+         (focusin)="onEntityAliasFocus()"
+         [matAutocomplete]="entityAliasAutocomplete">
+  <mat-icon matSuffix
+            matTooltipPosition="above"
+            matTooltipClass="tb-error-tooltip"
+            [matTooltip]="'entity.alias-required' | translate"
+            *ngIf="required && entityAliasFormControl.hasError('required')
+                       && entityAliasFormControl.touched"
+            class="tb-error">
+    warning
+  </mat-icon>
+  <button *ngIf="entityAliasFormControl.value && !entityAliasFormControl.disabled"
+          type="button"
+          matSuffix mat-icon-button aria-label="Clear"
+          (click)="clearEntityAlias()">
+    <mat-icon class="material-icons">close</mat-icon>
+  </button>
+  <mat-autocomplete
+    class="tb-autocomplete"
+    #entityAliasAutocomplete="matAutocomplete">
+    <mat-option *ngFor="let entityAlias of filteredEntityAliases | async" [value]="entityAlias">
+      <span [innerHTML]="entityAlias | highlight:aliasSearchText"></span>
+    </mat-option>
+  </mat-autocomplete>
+</mat-form-field>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/entity-alias-input.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/entity-alias-input.component.scss
new file mode 100644
index 0000000000..baccbf2ab7
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/entity-alias-input.component.scss
@@ -0,0 +1,20 @@
+/**
+ * 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-entity-alias-input {
+  .mat-mdc-form-field.tb-inline-field {
+    width: 100%;
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/entity-alias-input.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/entity-alias-input.component.ts
new file mode 100644
index 0000000000..dd6d19f14e
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/entity-alias-input.component.ts
@@ -0,0 +1,156 @@
+///
+/// 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,
+  ElementRef,
+  forwardRef,
+  HostBinding,
+  Input,
+  OnInit,
+  ViewChild,
+  ViewEncapsulation
+} from '@angular/core';
+import {
+  ControlValueAccessor,
+  NG_VALUE_ACCESSOR,
+  UntypedFormBuilder,
+  UntypedFormControl,
+  Validators
+} from '@angular/forms';
+import { coerceBoolean } from '@shared/decorators/coercion';
+import { IAliasController } from '@core/api/widget-api.models';
+import { map, mergeMap } from 'rxjs/operators';
+import { Observable, of } from 'rxjs';
+import { TimeSeriesChartThresholdType } from '@home/components/widget/lib/chart/time-series-chart.models';
+
+@Component({
+  selector: 'tb-entity-alias-input',
+  templateUrl: './entity-alias-input.component.html',
+  styleUrls: ['./entity-alias-input.component.scss'],
+  providers: [
+    {
+      provide: NG_VALUE_ACCESSOR,
+      useExisting: forwardRef(() => EntityAliasInputComponent),
+      multi: true
+    }
+  ],
+  encapsulation: ViewEncapsulation.None
+})
+export class EntityAliasInputComponent implements ControlValueAccessor, OnInit {
+
+  @HostBinding('class')
+  hostClass = 'tb-entity-alias-input';
+
+  @ViewChild('entityAliasInput') entityAliasInput: ElementRef;
+
+  @Input()
+  disabled: boolean;
+
+  @Input()
+  @coerceBoolean()
+  required = false;
+
+  @Input()
+  aliasController: IAliasController;
+
+  entityAliasFormControl: UntypedFormControl;
+
+  filteredEntityAliases: Observable<Array<string>>;
+  aliasSearchText = '';
+
+  private entityAliasList: Array<string> = [];
+  private entityAliasDirty = false;
+
+  private propagateChange = (_val: any) => {};
+
+  constructor(private fb: UntypedFormBuilder,
+              private cd: ChangeDetectorRef) {
+  }
+
+  ngOnInit() {
+    this.entityAliasFormControl = this.fb.control(null, this.required ? [Validators.required] : []);
+    this.entityAliasFormControl.valueChanges.subscribe(
+      () => this.updateModel()
+    );
+
+    this.filteredEntityAliases = this.entityAliasFormControl.valueChanges
+    .pipe(
+      map(value => value ? value : ''),
+      mergeMap(name => this.fetchEntityAliases(name) )
+    );
+
+    if (this.aliasController) {
+      const entityAliases = this.aliasController.getEntityAliases();
+      for (const aliasId of Object.keys(entityAliases)) {
+        this.entityAliasList.push(entityAliases[aliasId].alias);
+      }
+    }
+  }
+
+  registerOnChange(fn: any): void {
+    this.propagateChange = fn;
+  }
+
+  registerOnTouched(fn: any): void {
+  }
+
+  setDisabledState(isDisabled: boolean): void {
+    this.disabled = isDisabled;
+    if (isDisabled) {
+      this.entityAliasFormControl.disable({emitEvent: false});
+    } else {
+      this.entityAliasFormControl.enable({emitEvent: false});
+    }
+  }
+
+  writeValue(value: string): void {
+    this.entityAliasFormControl.patchValue(value, {emitEvent: false});
+    this.entityAliasDirty = true;
+  }
+
+  onEntityAliasFocus() {
+    if (this.entityAliasDirty) {
+      this.entityAliasFormControl.updateValueAndValidity({onlySelf: true});
+      this.entityAliasDirty = false;
+    }
+  }
+
+  clearEntityAlias() {
+    this.entityAliasFormControl.patchValue(null, {emitEvent: true});
+    setTimeout(() => {
+      this.entityAliasInput.nativeElement.blur();
+      this.entityAliasInput.nativeElement.focus();
+    }, 0);
+  }
+
+  private fetchEntityAliases(searchText?: string): Observable<Array<string>> {
+    this.aliasSearchText = searchText;
+    let result = this.entityAliasList;
+    if (searchText && searchText.length) {
+      result = this.entityAliasList.filter((entityAlias) => entityAlias.toLowerCase().includes(searchText.toLowerCase()));
+    }
+    return of(result);
+  }
+
+  private updateModel() {
+    const value = this.entityAliasFormControl.value;
+    this.propagateChange(value);
+  }
+
+  protected readonly TimeSeriesChartThresholdType = TimeSeriesChartThresholdType;
+}
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/legend-config.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/legend-config.component.html
index 44ab1d0bad..3dd5e08860 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/legend-config.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/legend-config.component.html
@@ -16,7 +16,7 @@
 
 -->
 <ng-container [formGroup]="legendConfigForm">
-  <div class="tb-form-row space-between">
+  <div *ngIf="!hideDirection" class="tb-form-row space-between">
     <div>{{ 'legend.direction' | translate }}</div>
     <mat-form-field class="medium-width" appearance="outline" subscriptSizing="dynamic">
       <mat-select formControlName="direction">
@@ -31,8 +31,9 @@
     <mat-form-field class="medium-width" appearance="outline" subscriptSizing="dynamic">
       <mat-select formControlName="position">
         <mat-option *ngFor="let pos of legendPositions" [value]="pos"
-                    [disabled]="legendConfigForm.get('direction').value === legendDirection.row &&
-                                (pos === legendPosition.left || pos === legendPosition.right)">
+                    [disabled]="!hideDirection &&
+                                 legendConfigForm.get('direction').value === legendDirection.row &&
+                                 (pos === legendPosition.left || pos === legendPosition.right)">
           {{ legendPositionTranslations.get(legendPosition[pos]) | translate }}
         </mat-option>
       </mat-select>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/legend-config.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/legend-config.component.ts
index cf7b3d4e29..8b065247f3 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/legend-config.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/legend-config.component.ts
@@ -25,6 +25,7 @@ import {
   legendPositionTranslationMap
 } from '@shared/models/widget.models';
 import { Subscription } from 'rxjs';
+import { coerceBoolean } from '@shared/decorators/coercion';
 
 // @dynamic
 @Component({
@@ -43,6 +44,10 @@ export class LegendConfigComponent implements OnInit, OnDestroy, ControlValueAcc
 
   @Input() disabled: boolean;
 
+  @Input()
+  @coerceBoolean()
+  hideDirection = false;
+
   legendConfigForm: UntypedFormGroup;
   legendDirection = LegendDirection;
   legendDirections = Object.keys(LegendDirection);
@@ -60,15 +65,17 @@ export class LegendConfigComponent implements OnInit, OnDestroy, ControlValueAcc
 
   ngOnInit(): void {
     this.legendConfigForm = this.fb.group({
-      direction: [null, []],
       position: [null, []],
       showValues: [[], []],
       sortDataKeys: [null, []]
     });
-    this.legendSettingsFormDirectionChanges$ = this.legendConfigForm.get('direction').valueChanges
+    if (!this.hideDirection) {
+      this.legendConfigForm.addControl('direction', this.fb.control([null, []]));
+      this.legendSettingsFormDirectionChanges$ = this.legendConfigForm.get('direction').valueChanges
       .subscribe((direction: LegendDirection) => {
         this.onDirectionChanged(direction);
       });
+    }
     this.legendSettingsFormChanges$ = this.legendConfigForm.valueChanges.subscribe(
       () => this.legendConfigUpdated()
     );
@@ -114,23 +121,30 @@ export class LegendConfigComponent implements OnInit, OnDestroy, ControlValueAcc
 
   writeValue(legendConfig: LegendConfig): void {
     if (legendConfig) {
-      this.legendConfigForm.patchValue({
-        direction: legendConfig.direction,
+      const value: any = {
         position: legendConfig.position,
         showValues: this.getShowValues(legendConfig),
         sortDataKeys: isDefined(legendConfig.sortDataKeys) ? legendConfig.sortDataKeys : false
-      }, {emitEvent: false});
+      };
+      if (!this.hideDirection) {
+        value.direction = legendConfig.direction;
+      }
+      this.legendConfigForm.patchValue(value, {emitEvent: false});
+    }
+    if (!this.hideDirection) {
+      this.onDirectionChanged(legendConfig?.direction);
     }
-    this.onDirectionChanged(legendConfig.direction);
   }
 
   private legendConfigUpdated() {
     const configValue = this.legendConfigForm.value;
     const legendConfig: Partial<LegendConfig> = {
-      direction: configValue.direction,
       position: configValue.position,
       sortDataKeys: configValue.sortDataKeys
     };
+    if (!this.hideDirection) {
+      legendConfig.direction = configValue.direction;
+    }
     this.setShowValues(configValue.showValues, legendConfig);
     this.propagateChange(legendConfig);
   }
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 e39c079f75..bbe3dfb20c 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
@@ -92,6 +92,63 @@ import {
 import {
   WidgetButtonCustomStylePanelComponent
 } from '@home/components/widget/lib/settings/common/button/widget-button-custom-style-panel.component';
+import {
+  TimeSeriesChartAxisSettingsComponent
+} from '@home/components/widget/lib/settings/common/chart/time-series-chart-axis-settings.component';
+import {
+  TimeSeriesChartThresholdsPanelComponent
+} from '@home/components/widget/lib/settings/common/chart/time-series-chart-thresholds-panel.component';
+import {
+  TimeSeriesChartThresholdRowComponent
+} from '@home/components/widget/lib/settings/common/chart/time-series-chart-threshold-row.component';
+import { DataKeyInputComponent } from '@home/components/widget/lib/settings/common/data-key-input.component';
+import { EntityAliasInputComponent } from '@home/components/widget/lib/settings/common/entity-alias-input.component';
+import {
+  TimeSeriesChartThresholdSettingsPanelComponent
+} from '@home/components/widget/lib/settings/common/chart/time-series-chart-threshold-settings-panel.component';
+import {
+  TimeSeriesNoAggregationBarWidthSettingsComponent
+} from '@home/components/widget/lib/settings/common/chart/time-series-no-aggregation-bar-width-settings.component';
+import {
+  TimeSeriesChartYAxesPanelComponent
+} from '@home/components/widget/lib/settings/common/chart/time-series-chart-y-axes-panel.component';
+import {
+  TimeSeriesChartYAxisRowComponent
+} from '@home/components/widget/lib/settings/common/chart/time-series-chart-y-axis-row.component';
+import {
+  TimeSeriesChartAxisSettingsPanelComponent
+} from '@home/components/widget/lib/settings/common/chart/time-series-chart-axis-settings-panel.component';
+import {
+  ChartAnimationSettingsComponent
+} from '@home/components/widget/lib/settings/common/chart/chart-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 {
+  ChartFillSettingsComponent
+} from '@home/components/widget/lib/settings/common/chart/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';
+import { ChartBarSettingsComponent } from '@home/components/widget/lib/settings/common/chart/chart-bar-settings.component';
 
 @NgModule({
   declarations: [
@@ -105,6 +162,8 @@ import {
     CssSizeInputComponent,
     DateFormatSelectComponent,
     DateFormatSettingsPanelComponent,
+    AutoDateFormatSettingsComponent,
+    AutoDateFormatSettingsPanelComponent,
     BackgroundSettingsComponent,
     BackgroundSettingsPanelComponent,
     ValueSourceComponent,
@@ -127,7 +186,26 @@ import {
     WidgetActionSettingsPanelComponent,
     WidgetButtonAppearanceComponent,
     WidgetButtonCustomStyleComponent,
-    WidgetButtonCustomStylePanelComponent
+    WidgetButtonCustomStylePanelComponent,
+    TimeSeriesChartAxisSettingsComponent,
+    TimeSeriesChartThresholdsPanelComponent,
+    TimeSeriesChartThresholdRowComponent,
+    TimeSeriesChartThresholdSettingsPanelComponent,
+    TimeSeriesNoAggregationBarWidthSettingsComponent,
+    TimeSeriesChartYAxesPanelComponent,
+    TimeSeriesChartYAxisRowComponent,
+    TimeSeriesChartAxisSettingsPanelComponent,
+    TimeSeriesChartAxisSettingsButtonComponent,
+    ChartAnimationSettingsComponent,
+    ChartFillSettingsComponent,
+    ChartBarSettingsComponent,
+    TimeSeriesChartThresholdSettingsComponent,
+    TimeSeriesChartStatesPanelComponent,
+    TimeSeriesChartStateRowComponent,
+    TimeSeriesChartGridSettingsComponent,
+    StatusWidgetStateSettingsComponent,
+    DataKeyInputComponent,
+    EntityAliasInputComponent
   ],
   imports: [
     CommonModule,
@@ -145,6 +223,8 @@ import {
     CssSizeInputComponent,
     DateFormatSelectComponent,
     DateFormatSettingsPanelComponent,
+    AutoDateFormatSettingsComponent,
+    AutoDateFormatSettingsPanelComponent,
     BackgroundSettingsComponent,
     BackgroundSettingsPanelComponent,
     ValueSourceComponent,
@@ -167,7 +247,26 @@ import {
     WidgetActionSettingsPanelComponent,
     WidgetButtonAppearanceComponent,
     WidgetButtonCustomStyleComponent,
-    WidgetButtonCustomStylePanelComponent
+    WidgetButtonCustomStylePanelComponent,
+    TimeSeriesChartAxisSettingsComponent,
+    TimeSeriesChartThresholdsPanelComponent,
+    TimeSeriesChartThresholdRowComponent,
+    TimeSeriesChartThresholdSettingsPanelComponent,
+    TimeSeriesNoAggregationBarWidthSettingsComponent,
+    TimeSeriesChartYAxesPanelComponent,
+    TimeSeriesChartYAxisRowComponent,
+    TimeSeriesChartAxisSettingsPanelComponent,
+    TimeSeriesChartAxisSettingsButtonComponent,
+    ChartAnimationSettingsComponent,
+    ChartFillSettingsComponent,
+    ChartBarSettingsComponent,
+    TimeSeriesChartThresholdSettingsComponent,
+    TimeSeriesChartStatesPanelComponent,
+    TimeSeriesChartStateRowComponent,
+    TimeSeriesChartGridSettingsComponent,
+    StatusWidgetStateSettingsComponent,
+    DataKeyInputComponent,
+    EntityAliasInputComponent
   ],
   providers: [
     ColorSettingsComponentService,
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 2943b4cc09..c71f0fd658 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
@@ -330,6 +330,30 @@ import {
 import {
   ToggleButtonWidgetSettingsComponent
 } from '@home/components/widget/lib/settings/button/toggle-button-widget-settings.component';
+import {
+  TimeSeriesChartKeySettingsComponent
+} from '@home/components/widget/lib/settings/chart/time-series-chart-key-settings.component';
+import {
+  TimeSeriesChartLineSettingsComponent
+} from '@home/components/widget/lib/settings/chart/time-series-chart-line-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';
+import {
+  BarChartWidgetSettingsComponent
+} from '@home/components/widget/lib/settings/chart/bar-chart-widget-settings.component';
+import {
+  PolarAreaChartWidgetSettingsComponent
+} from '@home/components/widget/lib/settings/chart/polar-area-chart-widget-settings.component';
+import {
+  RadarChartWidgetSettingsComponent
+} from '@home/components/widget/lib/settings/chart/radar-chart-widget-settings.component';
 
 @NgModule({
   declarations: [
@@ -448,7 +472,15 @@ import {
     CommandButtonWidgetSettingsComponent,
     PowerButtonWidgetSettingsComponent,
     SliderWidgetSettingsComponent,
-    ToggleButtonWidgetSettingsComponent
+    ToggleButtonWidgetSettingsComponent,
+    TimeSeriesChartKeySettingsComponent,
+    TimeSeriesChartLineSettingsComponent,
+    TimeSeriesChartWidgetSettingsComponent,
+    StatusWidgetSettingsComponent,
+    PieChartWidgetSettingsComponent,
+    BarChartWidgetSettingsComponent,
+    PolarAreaChartWidgetSettingsComponent,
+    RadarChartWidgetSettingsComponent
   ],
   imports: [
     CommonModule,
@@ -572,7 +604,15 @@ import {
     CommandButtonWidgetSettingsComponent,
     PowerButtonWidgetSettingsComponent,
     SliderWidgetSettingsComponent,
-    ToggleButtonWidgetSettingsComponent
+    ToggleButtonWidgetSettingsComponent,
+    TimeSeriesChartKeySettingsComponent,
+    TimeSeriesChartLineSettingsComponent,
+    TimeSeriesChartWidgetSettingsComponent,
+    StatusWidgetSettingsComponent,
+    PieChartWidgetSettingsComponent,
+    BarChartWidgetSettingsComponent,
+    PolarAreaChartWidgetSettingsComponent,
+    RadarChartWidgetSettingsComponent
   ]
 })
 export class WidgetSettingsModule {
@@ -663,5 +703,12 @@ export const widgetSettingsComponentsMap: {[key: string]: Type<IWidgetSettingsCo
   'tb-command-button-widget-settings': CommandButtonWidgetSettingsComponent,
   'tb-power-button-widget-settings': PowerButtonWidgetSettingsComponent,
   'tb-slider-widget-settings': SliderWidgetSettingsComponent,
-  'tb-toggle-button-widget-settings': ToggleButtonWidgetSettingsComponent
+  'tb-toggle-button-widget-settings': ToggleButtonWidgetSettingsComponent,
+  'tb-time-series-chart-key-settings': TimeSeriesChartKeySettingsComponent,
+  'tb-time-series-chart-widget-settings': TimeSeriesChartWidgetSettingsComponent,
+  'tb-status-widget-settings': StatusWidgetSettingsComponent,
+  'tb-pie-chart-widget-settings': PieChartWidgetSettingsComponent,
+  'tb-bar-chart-widget-settings': BarChartWidgetSettingsComponent,
+  'tb-polar-area-chart-widget-settings': PolarAreaChartWidgetSettingsComponent,
+  'tb-radar-chart-widget-settings': RadarChartWidgetSettingsComponent
 };
diff --git a/ui-ngx/src/app/modules/home/components/widget/widget-component.service.ts b/ui-ngx/src/app/modules/home/components/widget/widget-component.service.ts
index 6037a4ea43..f1801561bd 100644
--- a/ui-ngx/src/app/modules/home/components/widget/widget-component.service.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/widget-component.service.ts
@@ -55,6 +55,7 @@ import { HOME_COMPONENTS_MODULE_TOKEN } from '@home/components/tokens';
 import { widgetSettingsComponentsMap } from '@home/components/widget/lib/settings/widget-settings.module';
 import { basicWidgetConfigComponentsMap } from '@home/components/widget/config/basic/basic-widget-config.module';
 import { IBasicWidgetConfigComponent } from '@home/components/widget/config/widget-config.component.models';
+import { TbTimeSeriesChart } from '@home/components/widget/lib/chart/time-series-chart';
 
 @Injectable()
 export class WidgetComponentService {
@@ -148,6 +149,11 @@ export class WidgetComponentService {
           (window as any).TbFlot = mod.TbFlot;
         }))
       );
+      widgetModulesTasks.push(from(import('@home/components/widget/lib/chart/time-series-chart')).pipe(
+        tap((mod) => {
+          (window as any).TbTimeSeriesChart = mod.TbTimeSeriesChart;
+        }))
+      );
       widgetModulesTasks.push(from(import('@home/components/widget/lib/analogue-compass')).pipe(
         tap((mod) => {
           (window as any).TbAnalogueCompass = mod.TbAnalogueCompass;
@@ -577,6 +583,9 @@ export class WidgetComponentService {
       if (!isFunction(result.typeParameters.defaultLatestDataKeysFunction)) {
         result.typeParameters.defaultLatestDataKeysFunction = null;
       }
+      if (!isFunction(result.typeParameters.dataKeySettingsFunction)) {
+        result.typeParameters.dataKeySettingsFunction = null;
+      }
       if (isUndefined(result.typeParameters.displayRpcMessageToast)) {
         result.typeParameters.displayRpcMessageToast = true;
       }
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 03bd97dd41..69185b6dd2 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
@@ -47,6 +47,12 @@ import { GatewayConnectorComponent } from '@home/components/widget/lib/gateway/g
 import { GatewayLogsComponent } from '@home/components/widget/lib/gateway/gateway-logs.component';
 import { GatewayStatisticsComponent } from '@home/components/widget/lib/gateway/gateway-statistics.component';
 import { GatewayServiceRPCComponent } from '@home/components/widget/lib/gateway/gateway-service-rpc.component';
+import {
+  GatewayServiceRPCConnectorComponent
+} from '@home/components/widget/lib/gateway/gateway-service-rpc-connector.component';
+import {
+  GatewayServiceRPCConnectorTemplatesComponent
+} from '@home/components/widget/lib/gateway/gateway-service-rpc-connector-templates.component';
 import { DeviceGatewayCommandComponent } from '@home/components/widget/lib/gateway/device-gateway-command.component';
 import { GatewayConfigurationComponent } from '@home/components/widget/lib/gateway/gateway-configuration.component';
 import {
@@ -70,12 +76,22 @@ import { RangeChartWidgetComponent } from '@home/components/widget/lib/chart/ran
 import {
   BarChartWithLabelsWidgetComponent
 } from '@home/components/widget/lib/chart/bar-chart-with-labels-widget.component';
+import {
+  GatewayServiceRPCConnectorTemplateDialogComponent
+} from '@home/components/widget/lib/gateway/gateway-service-rpc-connector-template-dialog';
 import { SingleSwitchWidgetComponent } from '@home/components/widget/lib/rpc/single-switch-widget.component';
 import { ActionButtonWidgetComponent } from '@home/components/widget/lib/button/action-button-widget.component';
 import { CommandButtonWidgetComponent } from '@home/components/widget/lib/button/command-button-widget.component';
 import { PowerButtonWidgetComponent } from '@home/components/widget/lib/rpc/power-button-widget.component';
 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';
+import { BarChartWidgetComponent } from '@home/components/widget/lib/chart/bar-chart-widget.component';
+import { PolarAreaWidgetComponent } from '@home/components/widget/lib/chart/polar-area-widget.component';
+import { RadarChartWidgetComponent } from '@home/components/widget/lib/chart/radar-chart-widget.component';
 
 @NgModule({
   declarations:
@@ -104,9 +120,12 @@ import { ToggleButtonWidgetComponent } from '@home/components/widget/lib/button/
       GatewayLogsComponent,
       GatewayStatisticsComponent,
       GatewayServiceRPCComponent,
+      GatewayServiceRPCConnectorComponent,
+      GatewayServiceRPCConnectorTemplatesComponent,
       DeviceGatewayCommandComponent,
       GatewayConfigurationComponent,
       GatewayRemoteConfigurationDialogComponent,
+      GatewayServiceRPCConnectorTemplateDialogComponent,
       ValueCardWidgetComponent,
       AggregatedValueCardWidgetComponent,
       CountWidgetComponent,
@@ -124,7 +143,14 @@ import { ToggleButtonWidgetComponent } from '@home/components/widget/lib/button/
       CommandButtonWidgetComponent,
       PowerButtonWidgetComponent,
       SliderWidgetComponent,
-      ToggleButtonWidgetComponent
+      ToggleButtonWidgetComponent,
+      TimeSeriesChartWidgetComponent,
+      StatusWidgetComponent,
+      LatestChartComponent,
+      PieChartWidgetComponent,
+      BarChartWidgetComponent,
+      PolarAreaWidgetComponent,
+      RadarChartWidgetComponent
     ],
   imports: [
     CommonModule,
@@ -155,11 +181,14 @@ import { ToggleButtonWidgetComponent } from '@home/components/widget/lib/button/
         FlotWidgetComponent,
         GatewayConnectorComponent,
         GatewayLogsComponent,
+        GatewayServiceRPCConnectorComponent,
+        GatewayServiceRPCConnectorTemplatesComponent,
         GatewayStatisticsComponent,
         GatewayServiceRPCComponent,
         DeviceGatewayCommandComponent,
         GatewayConfigurationComponent,
         GatewayRemoteConfigurationDialogComponent,
+        GatewayServiceRPCConnectorTemplateDialogComponent,
         ValueCardWidgetComponent,
         AggregatedValueCardWidgetComponent,
         CountWidgetComponent,
@@ -177,7 +206,13 @@ import { ToggleButtonWidgetComponent } from '@home/components/widget/lib/button/
         CommandButtonWidgetComponent,
         PowerButtonWidgetComponent,
         SliderWidgetComponent,
-        ToggleButtonWidgetComponent
+        ToggleButtonWidgetComponent,
+        TimeSeriesChartWidgetComponent,
+        StatusWidgetComponent,
+        PieChartWidgetComponent,
+        BarChartWidgetComponent,
+        PolarAreaWidgetComponent,
+        RadarChartWidgetComponent
     ],
   providers: [
     {provide: WIDGET_COMPONENTS_MODULE_TOKEN, useValue: WidgetComponentsModule }
diff --git a/ui-ngx/src/app/modules/home/components/widget/widget-config.component.html b/ui-ngx/src/app/modules/home/components/widget/widget-config.component.html
index 407ef94107..300a7f54d1 100644
--- a/ui-ngx/src/app/modules/home/components/widget/widget-config.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/widget-config.component.html
@@ -288,6 +288,7 @@
     <div *ngIf="displayAdvancedAppearance" style="height: 100%;" [formGroup]="advancedSettings">
       <tb-widget-settings
         [aliasController]="aliasController"
+        [dataKeyCallbacks]="widgetConfigCallbacks"
         [dashboard]="dashboard"
         [widget]="widget"
         [widgetConfig]="modelValue"
diff --git a/ui-ngx/src/app/modules/home/components/widget/widget-config.component.ts b/ui-ngx/src/app/modules/home/components/widget/widget-config.component.ts
index 49e4e2ea59..5ace8ac616 100644
--- a/ui-ngx/src/app/modules/home/components/widget/widget-config.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/widget-config.component.ts
@@ -84,6 +84,7 @@ import { coerceBoolean } from '@shared/decorators/coercion';
 import { basicWidgetConfigComponentsMap } from '@home/components/widget/config/basic/basic-widget-config.module';
 import { TimewindowConfigData } from '@home/components/widget/config/timewindow-config-panel.component';
 import Timeout = NodeJS.Timeout;
+import { DataKeySettingsFunction } from '@home/components/widget/config/data-keys.component.models';
 
 const emptySettingsSchema: JsonSchema = {
   type: 'object',
@@ -734,7 +735,8 @@ export class WidgetConfigComponent extends PageComponent implements OnInit, OnDe
     }
   }
 
-  public generateDataKey(chip: any, type: DataKeyType, datakeySettingsSchema: JsonSettingsSchema): DataKey {
+  public generateDataKey(chip: any, type: DataKeyType, datakeySettingsSchema: JsonSettingsSchema,
+                         isLatestDataKey: boolean, dataKeySettingsFunction: DataKeySettingsFunction): DataKey {
     if (isObject(chip)) {
       (chip as DataKey)._hash = Math.random();
       return chip;
@@ -767,6 +769,11 @@ export class WidgetConfigComponent extends PageComponent implements OnInit, OnDe
       }
       if (datakeySettingsSchema && isDefined(datakeySettingsSchema.schema)) {
         result.settings = this.utils.generateObjectFromJsonSchema(datakeySettingsSchema.schema);
+      } else if (dataKeySettingsFunction) {
+        const settings = dataKeySettingsFunction(result, isLatestDataKey);
+        if (settings) {
+          result.settings = settings;
+        }
       }
       return result;
     }
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/entity/entities-table-config.models.ts b/ui-ngx/src/app/modules/home/models/entity/entities-table-config.models.ts
index e1a7700d67..9dd434101d 100644
--- a/ui-ngx/src/app/modules/home/models/entity/entities-table-config.models.ts
+++ b/ui-ngx/src/app/modules/home/models/entity/entities-table-config.models.ts
@@ -120,8 +120,9 @@ export class EntityLinkTableColumn<T extends BaseData<HasId>> extends BaseEntity
               public title: string,
               public width: string = '0px',
               public cellContentFunction: CellContentFunction<T> = (entity, property) => entity[property] ? entity[property] : '',
-              public entityURL: (entity) => string) {
-    super('link', key, title, width, false);
+              public entityURL: (entity) => string,
+              public sortable: boolean = true) {
+    super('link', key, title, width, sortable);
   }
 }
 
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 2ea34377d6..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
@@ -102,6 +102,8 @@ import { ImagePipe, MillisecondsToTimeStringPipe, TelemetrySubscriber } from '@a
 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;
@@ -193,6 +195,7 @@ export class WidgetContext {
   customDialog: CustomDialogService;
   resourceService: ResourceService;
   userSettingsService: UserSettingsService;
+  utilsService: UtilsService;
   telemetryWsService: TelemetryWebsocketService;
   telemetrySubscribers?: TelemetrySubscriber[];
   date: DatePipe;
@@ -549,6 +552,7 @@ export interface WidgetConfigComponentData {
   settingsSchema: JsonSettingsSchema;
   dataKeySettingsSchema: JsonSettingsSchema;
   latestDataKeySettingsSchema: JsonSettingsSchema;
+  dataKeySettingsFunction: DataKeySettingsFunction;
   settingsDirective: string;
   dataKeySettingsDirective: string;
   latestDataKeySettingsDirective: string;
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/home/pages/notification/rule/rule-notification-dialog.component.html b/ui-ngx/src/app/modules/home/pages/notification/rule/rule-notification-dialog.component.html
index 5b477d0345..f5a2ddba17 100644
--- a/ui-ngx/src/app/modules/home/pages/notification/rule/rule-notification-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/pages/notification/rule/rule-notification-dialog.component.html
@@ -581,6 +581,19 @@
         </section>
       </form>
     </mat-step>
+
+    <mat-step *ngIf="ruleNotificationForm.get('triggerType').value === triggerType.TASK_PROCESSING_FAILURE"
+              [stepControl]="taskProcessingFailureTemplateForm">
+      <ng-template matStepLabel>{{ 'notification.task-processing-failure-trigger-settings' | translate }}</ng-template>
+      <form [formGroup]="ruleNotificationForm">
+        <section formGroupName="additionalConfig">
+          <mat-form-field class="mat-block">
+            <mat-label translate>notification.description</mat-label>
+            <input matInput formControlName="description">
+          </mat-form-field>
+        </section>
+      </form>
+    </mat-step>
   </mat-horizontal-stepper>
 </div>
 <mat-divider></mat-divider>
diff --git a/ui-ngx/src/app/modules/home/pages/notification/rule/rule-notification-dialog.component.ts b/ui-ngx/src/app/modules/home/pages/notification/rule/rule-notification-dialog.component.ts
index 89488b7517..bc6935b4e7 100644
--- a/ui-ngx/src/app/modules/home/pages/notification/rule/rule-notification-dialog.component.ts
+++ b/ui-ngx/src/app/modules/home/pages/notification/rule/rule-notification-dialog.component.ts
@@ -101,6 +101,7 @@ export class RuleNotificationDialogComponent extends
   rateLimitsTemplateForm: FormGroup;
   edgeCommunicationFailureTemplateForm: FormGroup;
   edgeConnectionTemplateForm: FormGroup;
+  taskProcessingFailureTemplateForm: FormGroup;
 
   triggerType = TriggerType;
   triggerTypes: TriggerType[];
@@ -337,6 +338,12 @@ export class RuleNotificationDialogComponent extends
       })
     });
 
+    this.taskProcessingFailureTemplateForm = this.fb.group({
+      triggerConfig: this.fb.group({
+        taskTypes: []
+      })
+    });
+
     this.triggerTypeFormsMap = new Map<TriggerType, FormGroup>([
       [TriggerType.ALARM, this.alarmTemplateForm],
       [TriggerType.ALARM_COMMENT, this.alarmCommentTemplateForm],
@@ -349,7 +356,8 @@ export class RuleNotificationDialogComponent extends
       [TriggerType.NEW_PLATFORM_VERSION, this.newPlatformVersionTemplateForm],
       [TriggerType.RATE_LIMITS, this.rateLimitsTemplateForm],
       [TriggerType.EDGE_COMMUNICATION_FAILURE, this.edgeCommunicationFailureTemplateForm],
-      [TriggerType.EDGE_CONNECTION, this.edgeConnectionTemplateForm]
+      [TriggerType.EDGE_CONNECTION, this.edgeConnectionTemplateForm],
+      [TriggerType.TASK_PROCESSING_FAILURE, this.taskProcessingFailureTemplateForm]
     ]);
 
     if (data.isAdd || data.isCopy) {
@@ -488,7 +496,8 @@ export class RuleNotificationDialogComponent extends
       TriggerType.ENTITIES_LIMIT,
       TriggerType.API_USAGE_LIMIT,
       TriggerType.NEW_PLATFORM_VERSION,
-      TriggerType.RATE_LIMITS
+      TriggerType.RATE_LIMITS,
+      TriggerType.TASK_PROCESSING_FAILURE
     ]);
 
     if (this.isSysAdmin()) {
diff --git a/ui-ngx/src/app/modules/home/pages/notification/sent/sent-table-config.resolver.ts b/ui-ngx/src/app/modules/home/pages/notification/sent/sent-table-config.resolver.ts
index 97b353555a..baee27ff73 100644
--- a/ui-ngx/src/app/modules/home/pages/notification/sent/sent-table-config.resolver.ts
+++ b/ui-ngx/src/app/modules/home/pages/notification/sent/sent-table-config.resolver.ts
@@ -165,8 +165,7 @@ export class SentTableConfigResolver implements Resolve<EntityTableConfig<Notifi
     if (!stats?.errors) {
       return '';
     }
-    let countError = 0;
-    Object.keys(stats.errors).forEach(method => countError += Object.keys(stats.errors[method]).length);
+    const countError = stats.totalErrors;
     if (countError === 0) {
       return '';
     }
diff --git a/ui-ngx/src/app/modules/home/pages/notification/template/configuration/notification-action-button-configuration.component.html b/ui-ngx/src/app/modules/home/pages/notification/template/configuration/notification-action-button-configuration.component.html
index b195775d48..6ce736ead1 100644
--- a/ui-ngx/src/app/modules/home/pages/notification/template/configuration/notification-action-button-configuration.component.html
+++ b/ui-ngx/src/app/modules/home/pages/notification/template/configuration/notification-action-button-configuration.component.html
@@ -20,10 +20,12 @@
                        [expanded]="actionButtonConfigForm.get('enabled').value">
     <mat-expansion-panel-header fxLayout="row wrap" class="fill-width">
       <mat-panel-title fxFlex="60">
-        <mat-slide-toggle class="mat-slide" formControlName="enabled" (click)="$event.stopPropagation()"
-                          fxLayoutAlign="center">
-          {{ actionTitle }}
-        </mat-slide-toggle>
+        <div tb-hint-tooltip-icon="{{ sliderHint }}" class="tb-form-row no-border no-padding">
+          <mat-slide-toggle class="mat-slide" formControlName="enabled" (click)="$event.stopPropagation()"
+                            fxLayoutAlign="center">
+            {{ actionTitle }}
+          </mat-slide-toggle>
+        </div>
       </mat-panel-title>
     </mat-expansion-panel-header>
     <ng-template matExpansionPanelContent class="tb-extension-panel">
diff --git a/ui-ngx/src/app/modules/home/pages/notification/template/configuration/notification-action-button-configuration.component.ts b/ui-ngx/src/app/modules/home/pages/notification/template/configuration/notification-action-button-configuration.component.ts
index af7e0a997b..e62d647694 100644
--- a/ui-ngx/src/app/modules/home/pages/notification/template/configuration/notification-action-button-configuration.component.ts
+++ b/ui-ngx/src/app/modules/home/pages/notification/template/configuration/notification-action-button-configuration.component.ts
@@ -52,6 +52,9 @@ export class NotificationActionButtonConfigurationComponent implements ControlVa
   @Input()
   actionTitle: string;
 
+  @Input()
+  sliderHint: string;
+
   private hideButtonTextValue = false;
 
   get hideButtonText(): boolean {
diff --git a/ui-ngx/src/app/modules/home/pages/notification/template/configuration/notification-template-configuration.component.html b/ui-ngx/src/app/modules/home/pages/notification/template/configuration/notification-template-configuration.component.html
index 0a992618b9..88d31996ca 100644
--- a/ui-ngx/src/app/modules/home/pages/notification/template/configuration/notification-template-configuration.component.html
+++ b/ui-ngx/src/app/modules/home/pages/notification/template/configuration/notification-template-configuration.component.html
@@ -30,7 +30,7 @@
   <section class="tb-form-panel tb-slide-toggle stroked"
            [formGroupName]="NotificationDeliveryMethod.WEB"
            *ngIf="templateConfigurationForm.get('WEB.enabled').value">
-    <mat-expansion-panel class="tb-settings" expanded>
+    <mat-expansion-panel class="tb-settings" expanded="{{ expandedForm(NotificationDeliveryMethod.WEB) }}">
       <mat-expansion-panel-header fxLayout="row wrap" class="fill-width">
         <mat-panel-title class="template-tittle">
           <tb-icon>{{ NotificationDeliveryMethodInfoMap.get(NotificationDeliveryMethod.WEB).icon }}</tb-icon>
@@ -83,7 +83,7 @@
   <section class="tb-form-panel tb-slide-toggle stroked"
            [formGroupName]="NotificationDeliveryMethod.MOBILE_APP"
            *ngIf="templateConfigurationForm.get('MOBILE_APP.enabled').value">
-    <mat-expansion-panel class="tb-settings" expanded>
+    <mat-expansion-panel class="tb-settings" expanded="{{ expandedForm(NotificationDeliveryMethod.MOBILE_APP) }}">
       <mat-expansion-panel-header fxLayout="row wrap" class="fill-width">
         <mat-panel-title class="template-tittle">
           <tb-icon>{{ NotificationDeliveryMethodInfoMap.get(NotificationDeliveryMethod.MOBILE_APP).icon }}</tb-icon>
@@ -120,10 +120,25 @@
             }}
           </mat-error>
         </mat-form-field>
-        <div formGroupName="additionalConfig">
+        <div formGroupName="additionalConfig" class="tb-form-panel no-padding no-border">
+          <div class="tb-form-row space-between" formGroupName="icon">
+            <mat-slide-toggle formControlName="enabled" class="mat-slide">
+              {{ 'icon.icon' | translate }}
+            </mat-slide-toggle>
+            <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+              <tb-material-icon-select asBoxInput
+                                       [color]="templateConfigurationForm.get('MOBILE_APP.additionalConfig.icon.color').value"
+                                       formControlName="icon">
+              </tb-material-icon-select>
+              <tb-color-input asBoxInput
+                              formControlName="color">
+              </tb-color-input>
+            </div>
+          </div>
           <tb-notification-action-button-configuration
             formControlName="onClick"
             hideButtonText
+            [sliderHint]="notificationTapActionHint"
             actionTitle="{{ 'notification.notification-tap-action' | translate }}">
           </tb-notification-action-button-configuration>
         </div>
@@ -133,7 +148,7 @@
   <section class="tb-form-panel tb-slide-toggle stroked"
            [formGroupName]="NotificationDeliveryMethod.SMS"
            *ngIf="templateConfigurationForm.get('SMS.enabled').value">
-    <mat-expansion-panel class="tb-settings" expanded>
+    <mat-expansion-panel class="tb-settings" expanded="{{ expandedForm(NotificationDeliveryMethod.SMS) }}">
       <mat-expansion-panel-header fxLayout="row wrap" class="fill-width">
         <mat-panel-title class="template-tittle">
           <tb-icon>{{ NotificationDeliveryMethodInfoMap.get(NotificationDeliveryMethod.SMS).icon }}</tb-icon>
@@ -165,7 +180,7 @@
   <section class="tb-form-panel tb-slide-toggle stroked"
            [formGroupName]="NotificationDeliveryMethod.EMAIL"
            *ngIf="templateConfigurationForm.get('EMAIL.enabled').value">
-    <mat-expansion-panel class="tb-settings" expanded>
+    <mat-expansion-panel class="tb-settings" expanded="{{ expandedForm(NotificationDeliveryMethod.EMAIL) }}">
       <mat-expansion-panel-header fxLayout="row wrap" class="fill-width">
         <mat-panel-title class="template-tittle">
           <tb-icon>{{ NotificationDeliveryMethodInfoMap.get(NotificationDeliveryMethod.EMAIL).icon }}</tb-icon>
@@ -195,7 +210,7 @@
   <section class="tb-form-panel tb-slide-toggle stroked"
            [formGroupName]="NotificationDeliveryMethod.SLACK"
            *ngIf="templateConfigurationForm.get('SLACK.enabled').value">
-    <mat-expansion-panel class="tb-settings" expanded>
+    <mat-expansion-panel class="tb-settings" expanded="{{ expandedForm(NotificationDeliveryMethod.SLACK) }}">
       <mat-expansion-panel-header fxLayout="row wrap" class="fill-width">
         <mat-panel-title class="template-tittle">
           <tb-icon>{{ NotificationDeliveryMethodInfoMap.get(NotificationDeliveryMethod.SLACK).icon }}</tb-icon>
@@ -221,7 +236,7 @@
   <section class="tb-form-panel tb-slide-toggle stroked"
            [formGroupName]="NotificationDeliveryMethod.MICROSOFT_TEAMS"
            *ngIf="templateConfigurationForm.get('MICROSOFT_TEAMS.enabled').value">
-    <mat-expansion-panel class="tb-settings" expanded>
+    <mat-expansion-panel class="tb-settings" expanded="{{ expandedForm(NotificationDeliveryMethod.MICROSOFT_TEAMS) }}">
       <mat-expansion-panel-header fxLayout="row wrap" class="fill-width">
         <mat-panel-title class="template-tittle">
           <tb-icon>{{ NotificationDeliveryMethodInfoMap.get(NotificationDeliveryMethod.MICROSOFT_TEAMS).icon }}</tb-icon>
diff --git a/ui-ngx/src/app/modules/home/pages/notification/template/configuration/notification-template-configuration.component.ts b/ui-ngx/src/app/modules/home/pages/notification/template/configuration/notification-template-configuration.component.ts
index 1f54784d64..eac2dc5a7e 100644
--- a/ui-ngx/src/app/modules/home/pages/notification/template/configuration/notification-template-configuration.component.ts
+++ b/ui-ngx/src/app/modules/home/pages/notification/template/configuration/notification-template-configuration.component.ts
@@ -34,8 +34,9 @@ import {
 } from '@shared/models/notification.models';
 import { takeUntil } from 'rxjs/operators';
 import { Subject } from 'rxjs';
-import { isDefinedAndNotNull } from '@core/utils';
+import { deepClone, isDefinedAndNotNull } from '@core/utils';
 import { coerceBoolean } from '@shared/decorators/coercion';
+import { TranslateService } from '@ngx-translate/core';
 
 @Component({
   selector: 'tb-template-configuration',
@@ -65,6 +66,7 @@ export class NotificationTemplateConfigurationComponent implements OnDestroy, Co
     if (isDefinedAndNotNull(value)) {
       this.templateConfigurationForm.patchValue(value, {emitEvent: false});
       this.updateDisabledForms();
+      this.updateExpandedForm();
       this.templateConfigurationForm.updateValueAndValidity();
     }
   }
@@ -95,8 +97,10 @@ export class NotificationTemplateConfigurationComponent implements OnDestroy, Co
 
   private propagateChange = (v: any) => { };
   private readonly destroy$ = new Subject<void>();
+  private expendedBlocks: NotificationDeliveryMethod[];
 
-  constructor(private fb: FormBuilder) {
+  constructor(private fb: FormBuilder,
+              private translate: TranslateService) {
     this.templateConfigurationForm = this.buildForm();
     this.templateConfigurationForm.valueChanges.pipe(
       takeUntil(this.destroy$)
@@ -110,8 +114,17 @@ export class NotificationTemplateConfigurationComponent implements OnDestroy, Co
     this.destroy$.complete();
   }
 
-  writeValue(value: any) {
-    this.templateConfigurationForm.patchValue(value, {emitEvent: false});
+  writeValue(value: Partial<DeliveryMethodsTemplates>) {
+    const settings = deepClone(value);
+    if (isDefinedAndNotNull(settings)) {
+      for (const method of Object.values(NotificationDeliveryMethod)) {
+        if (isDefinedAndNotNull(settings[method]?.enabled)) {
+          delete settings[method].enabled;
+        }
+      }
+    }
+    this.templateConfigurationForm.patchValue(settings, {emitEvent: false});
+    this.updateExpandedForm();
   }
 
   registerOnChange(fn: any): void {
@@ -137,6 +150,29 @@ export class NotificationTemplateConfigurationComponent implements OnDestroy, Co
     };
   }
 
+  get notificationTapActionHint(): string {
+    switch (this.notificationType) {
+      case NotificationType.ALARM:
+      case NotificationType.ALARM_ASSIGNMENT:
+      case NotificationType.ALARM_COMMENT:
+        return this.translate.instant('notification.notification-tap-action-hint');
+    }
+    return '';
+  }
+
+  expandedForm(name: NotificationDeliveryMethod): boolean {
+    return this.expendedBlocks.includes(name);
+  }
+
+  private updateExpandedForm() {
+    this.expendedBlocks = [];
+    Object.keys(this.templateConfigurationForm.controls).forEach((name: NotificationDeliveryMethod) => {
+      if (this.templateConfigurationForm.get(name).invalid) {
+        this.expendedBlocks.push(name);
+      }
+    });
+  }
+
   private updateDisabledForms(){
     Object.values(NotificationDeliveryMethod).forEach((method) => {
       const form = this.templateConfigurationForm.get(method);
@@ -148,6 +184,9 @@ export class NotificationTemplateConfigurationComponent implements OnDestroy, Co
            case NotificationDeliveryMethod.WEB:
              form.get('additionalConfig.icon.enabled').updateValueAndValidity({onlySelf: true});
              break;
+           case NotificationDeliveryMethod.MOBILE_APP:
+             form.get('additionalConfig.icon.enabled').updateValueAndValidity({onlySelf: true});
+             break;
          }
       }
     });
@@ -213,9 +252,25 @@ export class NotificationTemplateConfigurationComponent implements OnDestroy, Co
           subject: ['', [Validators.required, Validators.maxLength(50)]],
           body: ['', [Validators.required, Validators.maxLength(150)]],
           additionalConfig: this.fb.group({
+            icon: this.fb.group({
+              enabled: [false],
+              icon: [{value: 'notifications', disabled: true}, Validators.required],
+              color: [{value: '#757575', disabled: true}]
+            }),
             onClick: [null]
           })
         });
+        deliveryMethodForm.get('additionalConfig.icon.enabled').valueChanges.pipe(
+          takeUntil(this.destroy$)
+        ).subscribe((value) => {
+          if (value) {
+            deliveryMethodForm.get('additionalConfig.icon.icon').enable({emitEvent: false});
+            deliveryMethodForm.get('additionalConfig.icon.color').enable({emitEvent: false});
+          } else {
+            deliveryMethodForm.get('additionalConfig.icon.icon').disable({emitEvent: false});
+            deliveryMethodForm.get('additionalConfig.icon.color').disable({emitEvent: false});
+          }
+        });
         break;
       case NotificationDeliveryMethod.MICROSOFT_TEAMS:
         deliveryMethodForm = this.fb.group({
diff --git a/ui-ngx/src/app/modules/home/pages/notification/template/template-notification-dialog.component.ts b/ui-ngx/src/app/modules/home/pages/notification/template/template-notification-dialog.component.ts
index c0ae4f1abb..ccbcb6bf22 100644
--- a/ui-ngx/src/app/modules/home/pages/notification/template/template-notification-dialog.component.ts
+++ b/ui-ngx/src/app/modules/home/pages/notification/template/template-notification-dialog.component.ts
@@ -179,7 +179,8 @@ export class TemplateNotificationDialogComponent
       NotificationType.ENTITIES_LIMIT,
       NotificationType.API_USAGE_LIMIT,
       NotificationType.NEW_PLATFORM_VERSION,
-      NotificationType.RATE_LIMITS
+      NotificationType.RATE_LIMITS,
+      NotificationType.TASK_PROCESSING_FAILURE
     ]);
 
     if (this.isSysAdmin()) {
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/dialog/alert-dialog.component.ts b/ui-ngx/src/app/shared/components/dialog/alert-dialog.component.ts
index da539bd328..c0e78cb968 100644
--- a/ui-ngx/src/app/shared/components/dialog/alert-dialog.component.ts
+++ b/ui-ngx/src/app/shared/components/dialog/alert-dialog.component.ts
@@ -16,6 +16,10 @@
 
 import { Component, Inject } from '@angular/core';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
+import { DialogComponent } from '@shared/components/dialog.component';
+import { AppState } from '@core/core.state';
+import { Router } from '@angular/router';
+import { Store } from '@ngrx/store';
 
 export interface AlertDialogData {
   title: string;
@@ -29,7 +33,11 @@ export interface AlertDialogData {
   templateUrl: './alert-dialog.component.html',
   styleUrls: ['./alert-dialog.component.scss']
 })
-export class AlertDialogComponent {
-  constructor(public dialogRef: MatDialogRef<AlertDialogComponent>,
-              @Inject(MAT_DIALOG_DATA) public data: AlertDialogData) {}
+export class AlertDialogComponent extends DialogComponent<AlertDialogComponent, boolean>{
+  constructor(protected store: Store<AppState>,
+              protected router: Router,
+              public dialogRef: MatDialogRef<AlertDialogComponent, boolean>,
+              @Inject(MAT_DIALOG_DATA) public data: AlertDialogData) {
+    super(store,  router, dialogRef);
+  }
 }
diff --git a/ui-ngx/src/app/shared/components/dialog/confirm-dialog.component.ts b/ui-ngx/src/app/shared/components/dialog/confirm-dialog.component.ts
index d315dad6a9..e2cf5ec7d7 100644
--- a/ui-ngx/src/app/shared/components/dialog/confirm-dialog.component.ts
+++ b/ui-ngx/src/app/shared/components/dialog/confirm-dialog.component.ts
@@ -16,6 +16,10 @@
 
 import { Component, Inject } from '@angular/core';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
+import { DialogComponent } from '@shared/components/dialog.component';
+import { AppState } from '@core/core.state';
+import { Router } from '@angular/router';
+import { Store } from '@ngrx/store';
 
 export interface ConfirmDialogData {
   title: string;
@@ -30,7 +34,11 @@ export interface ConfirmDialogData {
   templateUrl: './confirm-dialog.component.html',
   styleUrls: ['./confirm-dialog.component.scss']
 })
-export class ConfirmDialogComponent {
-  constructor(public dialogRef: MatDialogRef<ConfirmDialogComponent>,
-              @Inject(MAT_DIALOG_DATA) public data: ConfirmDialogData) {}
+export class ConfirmDialogComponent extends DialogComponent<ConfirmDialogComponent, boolean>{
+  constructor(protected store: Store<AppState>,
+              protected router: Router,
+              public dialogRef: MatDialogRef<ConfirmDialogComponent>,
+              @Inject(MAT_DIALOG_DATA) public data: ConfirmDialogData) {
+    super(store, router, dialogRef);
+  }
 }
diff --git a/ui-ngx/src/app/shared/components/dialog/error-alert-dialog.component.ts b/ui-ngx/src/app/shared/components/dialog/error-alert-dialog.component.ts
index f8a3859b44..e1418f26ea 100644
--- a/ui-ngx/src/app/shared/components/dialog/error-alert-dialog.component.ts
+++ b/ui-ngx/src/app/shared/components/dialog/error-alert-dialog.component.ts
@@ -16,6 +16,10 @@
 
 import { Component, Inject } from '@angular/core';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
+import { AppState } from '@core/core.state';
+import { Router } from '@angular/router';
+import { Store } from '@ngrx/store';
+import { DialogComponent } from '@shared/components/dialog.component';
 
 export interface ErrorAlertDialogData {
   title: string;
@@ -29,15 +33,18 @@ export interface ErrorAlertDialogData {
   templateUrl: './error-alert-dialog.component.html',
   styleUrls: ['./error-alert-dialog.component.scss']
 })
-export class ErrorAlertDialogComponent {
+export class ErrorAlertDialogComponent extends DialogComponent<ErrorAlertDialogComponent, boolean>{
 
   title: string;
   message: string;
   errorMessage: string;
   errorDetails?: string;
 
-  constructor(public dialogRef: MatDialogRef<ErrorAlertDialogComponent>,
+  constructor(protected store: Store<AppState>,
+              protected router: Router,
+              public dialogRef: MatDialogRef<ErrorAlertDialogComponent>,
               @Inject(MAT_DIALOG_DATA) public data: ErrorAlertDialogData) {
+    super(store, router, dialogRef);
     this.title = this.data.title;
     this.message = this.data.message;
     this.errorMessage = this.data.error.message ? this.data.error.message : JSON.stringify(this.data.error);
diff --git a/ui-ngx/src/app/shared/components/image/embed-image-dialog.component.scss b/ui-ngx/src/app/shared/components/image/embed-image-dialog.component.scss
index eeaff6e83c..045f51b808 100644
--- a/ui-ngx/src/app/shared/components/image/embed-image-dialog.component.scss
+++ b/ui-ngx/src/app/shared/components/image/embed-image-dialog.component.scss
@@ -16,6 +16,7 @@
 :host {
   .mat-mdc-dialog-content {
     display: flex;
+    width: 780px;
     flex-direction: column;
     gap: 16px;
     .tb-embed-image-text {
diff --git a/ui-ngx/src/app/shared/components/image/image-dialog.component.ts b/ui-ngx/src/app/shared/components/image/image-dialog.component.ts
index b140c6bf32..40e7d2ec89 100644
--- a/ui-ngx/src/app/shared/components/image/image-dialog.component.ts
+++ b/ui-ngx/src/app/shared/components/image/image-dialog.component.ts
@@ -66,7 +66,7 @@ export class ImageDialogComponent extends
     this.image = data.image;
     this.readonly = data.readonly;
     this.imagePreviewData = {
-      url: this.image.public ? this.image.publicLink : this.image.link
+      url: this.image.link
     };
   }
 
@@ -155,8 +155,6 @@ export class ImageDialogComponent extends
         let url;
         if (result.base64) {
           url = result.base64;
-        } else if (this.image.public) {
-          url = `${this.image.publicLink}?ts=${new Date().getTime()}`;
         } else {
           url = this.image.link;
         }
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/components/toggle-select.component.ts b/ui-ngx/src/app/shared/components/toggle-select.component.ts
index 9be788c08d..484ea19b2e 100644
--- a/ui-ngx/src/app/shared/components/toggle-select.component.ts
+++ b/ui-ngx/src/app/shared/components/toggle-select.component.ts
@@ -43,7 +43,7 @@ export class ToggleSelectComponent extends _ToggleBase implements ControlValueAc
   disabled: boolean;
 
   @Input()
-  selectMediaBreakpoint;
+  selectMediaBreakpoint: string;
 
   @Input()
   appearance: ToggleHeaderAppearance = 'stroked';
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/color.models.ts b/ui-ngx/src/app/shared/models/color.models.ts
new file mode 100644
index 0000000000..7c1d08baf8
--- /dev/null
+++ b/ui-ngx/src/app/shared/models/color.models.ts
@@ -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.
+///
+
+export interface TbColor {
+  light: string;
+  dark: string;
+}
+
+export interface TbColorScheme {
+  [key: string]: TbColor;
+}
diff --git a/ui-ngx/src/app/shared/models/common.ts b/ui-ngx/src/app/shared/models/common.ts
new file mode 100644
index 0000000000..c331cc5127
--- /dev/null
+++ b/ui-ngx/src/app/shared/models/common.ts
@@ -0,0 +1,19 @@
+///
+/// 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.
+///
+
+export type DeepPartial<T> = T extends object ? {
+  [P in keyof T]?: DeepPartial<T[P]>;
+} : T;
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..cf8acd1c33 100644
--- a/ui-ngx/src/app/shared/models/entity.models.ts
+++ b/ui-ngx/src/app/shared/models/entity.models.ts
@@ -161,6 +161,26 @@ 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'
+  },
+  ownerName: {
+    keyName: 'ownerName',
+    name: 'entity-field.owner-name',
+    value: 'ownerName'
+  },
+  ownerType: {
+    keyName: 'ownerType',
+    name: 'entity-field.owner-type',
+    value: 'ownerType'
   }
 };
 
diff --git a/ui-ngx/src/app/shared/models/limited-api.models.ts b/ui-ngx/src/app/shared/models/limited-api.models.ts
index d0e2e0cb76..291af807da 100644
--- a/ui-ngx/src/app/shared/models/limited-api.models.ts
+++ b/ui-ngx/src/app/shared/models/limited-api.models.ts
@@ -26,7 +26,9 @@ export enum LimitedApi {
   TRANSPORT_MESSAGES_PER_TENANT = 'TRANSPORT_MESSAGES_PER_TENANT',
   TRANSPORT_MESSAGES_PER_DEVICE = 'TRANSPORT_MESSAGES_PER_DEVICE',
   EDGE_EVENTS = 'EDGE_EVENTS',
-  EDGE_EVENTS_PER_EDGE = 'EDGE_EVENTS_PER_EDGE'
+  EDGE_EVENTS_PER_EDGE = 'EDGE_EVENTS_PER_EDGE',
+  EDGE_UPLINK_MESSAGES = 'EDGE_UPLINK_MESSAGES',
+  EDGE_UPLINK_MESSAGES_PER_EDGE = 'EDGE_UPLINK_MESSAGES_PER_EDGE'
 }
 
 export const LimitedApiTranslationMap = new Map<LimitedApi, string>(
@@ -43,5 +45,7 @@ export const LimitedApiTranslationMap = new Map<LimitedApi, string>(
     [LimitedApi.TRANSPORT_MESSAGES_PER_DEVICE, 'api-limit.transport-messages-per-device'],
     [LimitedApi.EDGE_EVENTS, 'api-limit.edge-events'],
     [LimitedApi.EDGE_EVENTS_PER_EDGE, 'api-limit.edge-events-per-edge'],
+    [LimitedApi.EDGE_UPLINK_MESSAGES, 'api-limit.edge-uplink-messages'],
+    [LimitedApi.EDGE_UPLINK_MESSAGES_PER_EDGE, 'api-limit.edge-uplink-messages-per-edge']
   ]
 );
diff --git a/ui-ngx/src/app/shared/models/notification.models.ts b/ui-ngx/src/app/shared/models/notification.models.ts
index 2cc7d8547b..cfb1312209 100644
--- a/ui-ngx/src/app/shared/models/notification.models.ts
+++ b/ui-ngx/src/app/shared/models/notification.models.ts
@@ -81,7 +81,7 @@ export interface NotificationRequestPreview {
 export interface NotificationRequestStats {
   sent: Map<NotificationDeliveryMethod, any>;
   errors: { [key in NotificationDeliveryMethod]: {[errorKey in string]: string}};
-  processedRecipients: Map<NotificationDeliveryMethod, Set<UserId>>;
+  totalErrors: number;
 }
 
 export interface NotificationRequestConfig {
@@ -523,7 +523,8 @@ export enum NotificationType {
   RULE_NODE = 'RULE_NODE',
   RATE_LIMITS = 'RATE_LIMITS',
   EDGE_CONNECTION = 'EDGE_CONNECTION',
-  EDGE_COMMUNICATION_FAILURE = 'EDGE_COMMUNICATION_FAILURE'
+  EDGE_COMMUNICATION_FAILURE = 'EDGE_COMMUNICATION_FAILURE',
+  TASK_PROCESSING_FAILURE = 'TASK_PROCESSING_FAILURE'
 }
 
 export const NotificationTypeIcons = new Map<NotificationType, string | null>([
@@ -535,6 +536,7 @@ export const NotificationTypeIcons = new Map<NotificationType, string | null>([
   [NotificationType.RULE_ENGINE_COMPONENT_LIFECYCLE_EVENT, 'settings_ethernet'],
   [NotificationType.ENTITIES_LIMIT, 'data_thresholding'],
   [NotificationType.API_USAGE_LIMIT, 'insert_chart'],
+  [NotificationType.TASK_PROCESSING_FAILURE, 'warning']
 ]);
 
 export const AlarmSeverityNotificationColors = new Map<AlarmSeverity, string>(
@@ -646,7 +648,13 @@ export const NotificationTemplateTypeTranslateMap = new Map<NotificationType, No
       name: 'notification.template-type.edge-communication-failure',
       helpId: 'notification/edge_communication_failure'
     }
-  ]
+  ],
+  [NotificationType.TASK_PROCESSING_FAILURE,
+    {
+      name: 'notification.template-type.task-processing-failure',
+      helpId: 'notification/task_processing_failure'
+    }
+  ],
 ]);
 
 export enum TriggerType {
@@ -661,7 +669,8 @@ export enum TriggerType {
   NEW_PLATFORM_VERSION = 'NEW_PLATFORM_VERSION',
   RATE_LIMITS = 'RATE_LIMITS',
   EDGE_CONNECTION = 'EDGE_CONNECTION',
-  EDGE_COMMUNICATION_FAILURE = 'EDGE_COMMUNICATION_FAILURE'
+  EDGE_COMMUNICATION_FAILURE = 'EDGE_COMMUNICATION_FAILURE',
+  TASK_PROCESSING_FAILURE = 'TASK_PROCESSING_FAILURE',
 }
 
 export const TriggerTypeTranslationMap = new Map<TriggerType, string>([
@@ -676,7 +685,8 @@ export const TriggerTypeTranslationMap = new Map<TriggerType, string>([
   [TriggerType.NEW_PLATFORM_VERSION, 'notification.trigger.new-platform-version'],
   [TriggerType.RATE_LIMITS, 'notification.trigger.rate-limits'],
   [TriggerType.EDGE_CONNECTION, 'notification.trigger.edge-connection'],
-  [TriggerType.EDGE_COMMUNICATION_FAILURE, 'notification.trigger.edge-communication-failure']
+  [TriggerType.EDGE_COMMUNICATION_FAILURE, 'notification.trigger.edge-communication-failure'],
+  [TriggerType.TASK_PROCESSING_FAILURE, 'notification.trigger.task-processing-failure']
 ]);
 
 export interface NotificationUserSettings {
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/time/time.models.ts b/ui-ngx/src/app/shared/models/time/time.models.ts
index 8d821b6689..deec2ee8f9 100644
--- a/ui-ngx/src/app/shared/models/time/time.models.ts
+++ b/ui-ngx/src/app/shared/models/time/time.models.ts
@@ -1116,8 +1116,13 @@ export const endIntervalDate = (current: moment_.Moment, interval: IntervalType)
 };
 
 export const calculateAggIntervalWithSubscriptionTimeWindow
-  = (subsTw: SubscriptionTimewindow, endTs: number, timestamp: number): [number, number] =>
-  calculateInterval(subsTw.startTs, endTs, subsTw.aggregation.interval, subsTw.tsOffset, subsTw.timezone, timestamp);
+  = (subsTw: SubscriptionTimewindow, endTs: number, timestamp: number): [number, number] => {
+  if (subsTw.aggregation.type === AggregationType.NONE) {
+    return [timestamp, timestamp];
+  } else {
+    return calculateInterval(subsTw.startTs, endTs, subsTw.aggregation.interval, subsTw.tsOffset, subsTw.timezone, timestamp);
+  }
+};
 
 export const calculateAggIntervalWithWidgetTimeWindow
   = (widgetTimeWindow: WidgetTimewindow, timestamp: number): [number, number] =>
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-settings.models.ts b/ui-ngx/src/app/shared/models/widget-settings.models.ts
index 8e60c0d9cb..f3722c54b1 100644
--- a/ui-ngx/src/app/shared/models/widget-settings.models.ts
+++ b/ui-ngx/src/app/shared/models/widget-settings.models.ts
@@ -14,7 +14,7 @@
 /// limitations under the License.
 ///
 
-import { isDefinedAndNotNull, isNumber, isNumeric, isUndefinedOrNull, parseFunction } from '@core/utils';
+import { isDefinedAndNotNull, isNumber, isNumeric, isUndefinedOrNull, mergeDeep, parseFunction } from '@core/utils';
 import {
   DataEntry,
   DataKey,
@@ -34,6 +34,8 @@ import { Observable, of } from 'rxjs';
 import { ImagePipe } from '@shared/pipe/image.pipe';
 import { map } from 'rxjs/operators';
 import { DomSanitizer } from '@angular/platform-browser';
+import { AVG_MONTH, DAY, HOUR, Interval, IntervalMath, MINUTE, SECOND, YEAR } from '@shared/models/time/time.models';
+import moment from 'moment';
 
 export type ComponentStyle = {[klass: string]: any};
 
@@ -323,35 +325,85 @@ class FunctionColorProcessor extends ColorProcessor {
   }
 }
 
+export type FormatTimeUnit = 'millisecond' | 'second' | 'minute' | 'hour'
+  | 'day' | 'month' | 'year';
+
+
+export const formatTimeUnits: FormatTimeUnit[] = [
+  'year', 'month', 'day', 'hour', 'minute', 'second', 'millisecond'
+];
+
+export const formatTimeUnitTranslations = new Map<FormatTimeUnit, string>(
+  [
+    ['year', 'date.unit-year'],
+    ['month', 'date.unit-month'],
+    ['day', 'date.unit-day'],
+    ['hour', 'date.unit-hour'],
+    ['minute', 'date.unit-minute'],
+    ['second', 'date.unit-second'],
+    ['millisecond', 'date.unit-millisecond']
+  ]
+);
+
+export type AutoDateFormatSettings = {
+  [unit in FormatTimeUnit]?: string;
+};
+
 export interface DateFormatSettings {
   format?: string;
   lastUpdateAgo?: boolean;
   custom?: boolean;
+  auto?: boolean;
   hideLastUpdatePrefix?: boolean;
+  autoDateFormatSettings?: AutoDateFormatSettings;
 }
 
 export const simpleDateFormat = (format: string): DateFormatSettings => ({
   format,
   lastUpdateAgo: false,
-  custom: false
+  custom: false,
+  auto: false
 });
 
 export const lastUpdateAgoDateFormat = (): DateFormatSettings => ({
   format: null,
   lastUpdateAgo: true,
-  custom: false
+  custom: false,
+  auto: false
 });
 
 export const customDateFormat = (format: string): DateFormatSettings => ({
   format,
   lastUpdateAgo: false,
-  custom: true
+  custom: true,
+  auto: false
+});
+
+export const defaultAutoDateFormatSettings: AutoDateFormatSettings = {
+  millisecond: 'MMM dd yyyy HH:mm:ss.SSS',
+  second: 'MMM dd yyyy HH:mm:ss',
+  minute: 'MMM dd yyyy HH:mm',
+  hour: 'MMM dd yyyy HH:mm',
+  day: 'MMM dd yyyy',
+  month: 'MMM yyyy',
+  year: 'yyyy'
+};
+
+export const autoDateFormat = (): DateFormatSettings => ({
+  format: null,
+  lastUpdateAgo: false,
+  custom: false,
+  auto: true,
+  autoDateFormatSettings: {}
 });
 
-export const dateFormats = ['MMM dd yyyy HH:mm', 'dd MMM yyyy HH:mm', 'yyyy MMM dd HH:mm',
-  'MM/dd/yyyy HH:mm', 'dd/MM/yyyy HH:mm', 'yyyy/MM/dd HH:mm:ss', 'yyyy-MM-dd HH:mm:ss', 'yyyy-MM-dd HH:mm:ss.SSS']
+export const dateFormats = ['MMM yyyy', 'MMM dd yyyy', 'MMM dd yyyy HH:mm', 'dd MMM yyyy HH:mm', 'dd MMM yyyy HH:mm:ss',
+  'yyyy MMM dd HH:mm', 'MM/dd/yyyy HH:mm', 'dd/MM/yyyy HH:mm', 'MMM dd yyyy HH:mm:ss', 'yyyy/MM/dd HH:mm:ss', 'yyyy-MM-dd HH:mm:ss',
+  'MMM dd yyyy HH:mm:ss.SSS', 'yyyy-MM-dd HH:mm:ss.SSS']
   .map(f => simpleDateFormat(f)).concat([lastUpdateAgoDateFormat(), customDateFormat('EEE, MMMM dd, yyyy')]);
 
+export const dateFormatsWithAuto = [autoDateFormat()].concat(dateFormats);
+
 export const compareDateFormats = (df1: DateFormatSettings, df2: DateFormatSettings): boolean => {
   if (df1 === df2) {
     return true;
@@ -360,7 +412,9 @@ export const compareDateFormats = (df1: DateFormatSettings, df2: DateFormatSetti
       return true;
     } else if (df1.custom && df2.custom) {
       return true;
-    } else if (!df1.lastUpdateAgo && !df2.lastUpdateAgo && !df1.custom && !df2.custom) {
+    } else if (df1.auto && df2.auto && !df1.custom && !df2.custom) {
+      return true;
+    } else if (!df1.lastUpdateAgo && !df2.lastUpdateAgo && !df1.custom && !df2.custom && !df1.auto && !df2.auto) {
       return df1.format === df2.format;
     }
   }
@@ -372,6 +426,8 @@ export abstract class DateFormatProcessor {
   static fromSettings($injector: Injector, settings: DateFormatSettings): DateFormatProcessor {
     if (settings.lastUpdateAgo) {
       return new LastUpdateAgoDateFormatProcessor($injector, settings);
+    } else if (settings.auto && !settings.custom) {
+      return new AutoDateFormatProcessor($injector, settings);
     } else {
       return new SimpleDateFormatProcessor($injector, settings);
     }
@@ -383,7 +439,7 @@ export abstract class DateFormatProcessor {
                         protected settings: DateFormatSettings) {
   }
 
-  abstract update(ts: string | number | Date): string;
+  abstract update(ts: string | number | Date, interval?: Interval): string;
 
 }
 
@@ -437,6 +493,91 @@ export class LastUpdateAgoDateFormatProcessor extends DateFormatProcessor {
 
 }
 
+export class AutoDateFormatProcessor extends DateFormatProcessor {
+
+  private datePipe: DatePipe;
+  private readonly autoDateFormatSettings: AutoDateFormatSettings;
+
+  constructor(protected $injector: Injector,
+              protected settings: DateFormatSettings) {
+    super($injector, settings);
+    this.datePipe = $injector.get(DatePipe);
+    this.autoDateFormatSettings = mergeDeep({} as AutoDateFormatSettings,
+      defaultAutoDateFormatSettings, this.settings.autoDateFormatSettings);
+  }
+
+  update(ts: string| number | Date, interval?: Interval): string {
+    if (ts) {
+      const unit = interval ? intervalToFormatTimeUnit(interval) : tsToFormatTimeUnit(ts);
+      const format = this.autoDateFormatSettings[unit];
+      if (format) {
+        this.formatted = this.datePipe.transform(ts, format);
+      } else {
+        this.formatted = '&nbsp;';
+      }
+    } else {
+      this.formatted = '&nbsp;';
+    }
+    return this.formatted;
+  }
+}
+
+const intervalToFormatTimeUnit = (interval: Interval): FormatTimeUnit => {
+  const intervalValue = IntervalMath.numberValue(interval);
+  if (intervalValue < SECOND) {
+    return 'millisecond';
+  } else if (intervalValue < MINUTE) {
+    return 'second';
+  } else if (intervalValue < HOUR) {
+    return 'minute';
+  } else if (intervalValue < DAY) {
+    return 'hour';
+  } else if (intervalValue < AVG_MONTH) {
+    return 'day';
+  } else if (intervalValue < YEAR) {
+    return 'month';
+  } else {
+    return 'year';
+  }
+};
+
+export const tsToFormatTimeUnit = (ts: string | number | Date): FormatTimeUnit => {
+  const date = moment(ts);
+  const M = date.month() + 1;
+  const d = date.date();
+  const h = date.hours();
+  const m = date.minutes();
+  const s = date.seconds();
+  const S = date.milliseconds();
+  const isSecond = S === 0;
+  const isMinute = isSecond && s === 0;
+  const isHour = isMinute && m === 0;
+  const isDay = isHour && h === 0;
+  const isMonth = isDay && d === 1;
+  const isYear = isMonth && M === 1;
+  if (isYear) {
+    return 'year';
+  }
+  else if (isMonth) {
+    return 'month';
+  }
+  else if (isDay) {
+    return 'day';
+  }
+  else if (isHour) {
+    return 'hour';
+  }
+  else if (isMinute) {
+    return 'minute';
+  }
+  else if (isSecond) {
+    return 'second';
+  }
+  else {
+    return 'millisecond';
+  }
+};
+
 export enum BackgroundType {
   image = 'image',
   color = 'color'
diff --git a/ui-ngx/src/app/shared/models/widget.models.ts b/ui-ngx/src/app/shared/models/widget.models.ts
index 5f4ca8f7be..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,
@@ -38,11 +37,12 @@ import { AbstractControl, UntypedFormGroup } from '@angular/forms';
 import { Observable } from 'rxjs';
 import { Dashboard } from '@shared/models/dashboard.models';
 import { IAliasController } from '@core/api/widget-api.models';
-import { isNotEmptyStr } from '@core/utils';
+import { isNotEmptyStr, mergeDeep } from '@core/utils';
 import { WidgetConfigComponentData } from '@home/models/widget-component.models';
 import { ComponentStyle, Font, TimewindowStyle } from '@shared/models/widget-settings.models';
 import { NULL_UUID } from '@shared/models/id/has-uuid';
 import { HasTenantId } from '@shared/models/entity.models';
+import { DataKeysCallbacks, DataKeySettingsFunction } from '@home/components/widget/config/data-keys.component.models';
 
 export enum widgetType {
   timeseries = 'timeseries',
@@ -184,6 +184,7 @@ export interface WidgetTypeParameters {
   hideDataSettings?: boolean;
   defaultDataKeysFunction?: (configComponent: any, configData: any) => DataKey[];
   defaultLatestDataKeysFunction?: (configComponent: any, configData: any) => DataKey[];
+  dataKeySettingsFunction?: DataKeySettingsFunction;
   displayRpcMessageToast?: boolean;
 }
 
@@ -553,6 +554,8 @@ export enum WidgetMobileActionType {
   takeScreenshot = 'takeScreenshot'
 }
 
+export const widgetActionTypes = Object.keys(WidgetActionType) as WidgetActionType[];
+
 export const widgetActionTypeTranslationMap = new Map<WidgetActionType, string>(
   [
     [ WidgetActionType.openDashboardState, 'widget-action.open-dashboard-state' ],
@@ -706,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;
 }
@@ -813,6 +829,7 @@ export interface WidgetSize {
 
 export interface IWidgetSettingsComponent {
   aliasController: IAliasController;
+  dataKeyCallbacks: DataKeysCallbacks;
   dashboard: Dashboard;
   widget: Widget;
   widgetConfig: WidgetConfigComponentData;
@@ -830,6 +847,8 @@ export abstract class WidgetSettingsComponent extends PageComponent implements
 
   aliasController: IAliasController;
 
+  dataKeyCallbacks: DataKeysCallbacks;
+
   dashboard: Dashboard;
 
   widget: Widget;
@@ -855,7 +874,7 @@ export abstract class WidgetSettingsComponent extends PageComponent implements
     if (!value) {
       this.settingsValue = this.defaultSettings();
     } else {
-      this.settingsValue = {...this.defaultSettings(), ...value};
+      this.settingsValue = mergeDeep(this.defaultSettings(), value);
     }
     if (!this.settingsSet) {
       this.settingsSet = true;
diff --git a/ui-ngx/src/assets/dashboard/api_usage.json b/ui-ngx/src/assets/dashboard/api_usage.json
index b1cea42249..5564223512 100644
--- a/ui-ngx/src/assets/dashboard/api_usage.json
+++ b/ui-ngx/src/assets/dashboard/api_usage.json
@@ -1,4926 +1,8781 @@
 {
-  "title": "Api Usage",
-  "image": null,
-  "mobileHide": false,
-  "mobileOrder": null,
-  "configuration": {
-    "description": "",
-    "widgets": {
-      "fd6df872-2ddf-0921-3929-2e7f55062fad": {
-        "type": "latest",
-        "sizeX": 7.5,
-        "sizeY": 3,
-        "config": {
-          "datasources": [
-            {
-              "type": "entity",
-              "name": null,
-              "entityAliasId": "40193437-33ac-3172-eefd-0b08eb849062",
-              "filterId": null,
-              "dataKeys": [
-                {
-                  "name": "jsExecutionApiState",
-                  "type": "timeseries",
-                  "label": "jsApiState",
-                  "color": "#2196f3",
-                  "settings": {},
-                  "_hash": 0.8830669138660703,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": true,
-                  "postFuncBody": "return value ? value : 'ENABLED';",
-                  "aggregationType": "NONE"
-                },
-                {
-                  "name": "jsExecutionLimit",
-                  "type": "timeseries",
-                  "label": "jsLimit",
-                  "color": "#4caf50",
-                  "settings": {},
-                  "_hash": 0.5463603803546802,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": null,
-                  "postFuncBody": null,
-                  "aggregationType": "NONE"
-                },
-                {
-                  "name": "jsExecutionCount",
-                  "type": "timeseries",
-                  "label": "jsCount",
-                  "color": "#f44336",
-                  "settings": {},
-                  "_hash": 0.5564241862015964,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": null,
-                  "postFuncBody": null,
-                  "aggregationType": "NONE"
+    "title": "Api Usage",
+    "image": null,
+    "mobileHide": false,
+    "mobileOrder": null,
+    "configuration": {
+        "description": "",
+        "widgets": {
+            "a669cf86-e715-efa4-dd9a-b839abf499e9": {
+                "type": "timeseries",
+                "sizeX": 24,
+                "sizeY": 5,
+                "config": {
+                    "datasources": [
+                        {
+                            "type": "entity",
+                            "entityAliasId": "2e4c97b0-257a-a1b9-690c-141d9bf2ec6f",
+                            "dataKeys": [
+                                {
+                                    "name": "ruleEngineException",
+                                    "type": "timeseries",
+                                    "label": "Rule Chain",
+                                    "color": "#2196f3",
+                                    "settings": {
+                                        "useCellStyleFunction": false,
+                                        "useCellContentFunction": true,
+                                        "cellContentFunction": "return JSON.parse(value).ruleChainName;"
+                                    },
+                                    "_hash": 0.9954481282345906
+                                },
+                                {
+                                    "name": "ruleEngineException",
+                                    "type": "timeseries",
+                                    "label": "Rule Node",
+                                    "color": "#4caf50",
+                                    "settings": {
+                                        "useCellStyleFunction": false,
+                                        "useCellContentFunction": true,
+                                        "cellContentFunction": "return JSON.parse(value).ruleNodeName;"
+                                    },
+                                    "_hash": 0.18580357036589978
+                                },
+                                {
+                                    "name": "ruleEngineException",
+                                    "type": "timeseries",
+                                    "label": "Latest Error",
+                                    "color": "#f44336",
+                                    "settings": {
+                                        "useCellStyleFunction": false,
+                                        "useCellContentFunction": true,
+                                        "cellContentFunction": "return JSON.parse(value).message;"
+                                    },
+                                    "_hash": 0.7255162989552142
+                                }
+                            ],
+                            "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": {
+                        "hideInterval": false,
+                        "hideAggregation": false,
+                        "hideAggInterval": false,
+                        "selectedTab": 0,
+                        "realtime": {
+                            "timewindowMs": 2592000000,
+                            "interval": 1000
+                        },
+                        "aggregation": {
+                            "type": "NONE",
+                            "limit": 1000
+                        }
+                    },
+                    "showTitle": true,
+                    "backgroundColor": "rgb(255, 255, 255)",
+                    "color": "rgba(0, 0, 0, 0.87)",
+                    "padding": "8px",
+                    "settings": {
+                        "showTimestamp": true,
+                        "displayPagination": true,
+                        "defaultPageSize": 10
+                    },
+                    "title": "{i18n:api-usage.exceptions}",
+                    "dropShadow": true,
+                    "enableFullscreen": true,
+                    "titleStyle": {
+                        "fontSize": "16px",
+                        "fontWeight": 400
+                    },
+                    "useDashboardTimewindow": false,
+                    "showLegend": false,
+                    "widgetStyle": {},
+                    "actions": {},
+                    "showTitleIcon": false,
+                    "titleIcon": null,
+                    "iconColor": "rgba(0, 0, 0, 0.87)",
+                    "iconSize": "24px",
+                    "titleTooltip": "",
+                    "displayTimewindow": true,
+                    "widgetCss": "",
+                    "pageSize": 1024,
+                    "noDataDisplayMessage": "",
+                    "configMode": "basic"
                 },
-                {
-                  "name": "jsExecutionApiState",
-                  "type": "timeseries",
-                  "label": "cardId",
-                  "color": "#607d8b",
-                  "settings": {},
-                  "_hash": 0.051659774305067296,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": true,
-                  "postFuncBody": "return (Math.random()*100000).toFixed(0);"
+                "id": "a669cf86-e715-efa4-dd9a-b839abf499e9",
+                "typeFullFqn": "system.cards.timeseries_table"
+            },
+            "aab68ab5-8e40-8694-c55c-8eb1c89b88fb": {
+                "typeFullFqn": "system.cards.markdown_card",
+                "type": "latest",
+                "sizeX": 5,
+                "sizeY": 3.5,
+                "config": {
+                    "datasources": [
+                        {
+                            "type": "entity",
+                            "name": null,
+                            "entityAliasId": "40193437-33ac-3172-eefd-0b08eb849062",
+                            "filterId": null,
+                            "dataKeys": [
+                                {
+                                    "name": "transportMsgLimit",
+                                    "type": "timeseries",
+                                    "label": "limit",
+                                    "color": "#4caf50",
+                                    "settings": {},
+                                    "_hash": 0.5463603803546802,
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": true,
+                                    "postFuncBody": "return value !== '' ? parseInt(value, 10) : 0;",
+                                    "aggregationType": "NONE"
+                                },
+                                {
+                                    "name": "transportMsgCount",
+                                    "type": "timeseries",
+                                    "label": "count",
+                                    "color": "#f44336",
+                                    "settings": {},
+                                    "_hash": 0.5564241862015964,
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": true,
+                                    "postFuncBody": "return value !== '' ? parseInt(value, 10) : 0;\n",
+                                    "aggregationType": "NONE"
+                                },
+                                {
+                                    "name": "transportDataPointsLimit",
+                                    "type": "timeseries",
+                                    "label": "pointsLimit",
+                                    "color": "#9c27b0",
+                                    "settings": {},
+                                    "_hash": 0.22082255831864894,
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": true,
+                                    "postFuncBody": "return value !== '' ? parseInt(value, 10) : 0;",
+                                    "aggregationType": "NONE"
+                                },
+                                {
+                                    "name": "transportDataPointsCount",
+                                    "type": "timeseries",
+                                    "label": "pointsCount",
+                                    "color": "#8bc34a",
+                                    "settings": {},
+                                    "_hash": 0.6340356364819146,
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": true,
+                                    "postFuncBody": "return value !== '' ? parseInt(value, 10) : 0;",
+                                    "aggregationType": "NONE"
+                                },
+                                {
+                                    "name": "transportApiState",
+                                    "type": "timeseries",
+                                    "label": "title",
+                                    "color": "#3f51b5",
+                                    "settings": {},
+                                    "_hash": 0.6894070537030252,
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": true,
+                                    "postFuncBody": "return \"{i18n:api-usage.transport}\";"
+                                },
+                                {
+                                    "name": "transportApiState",
+                                    "type": "timeseries",
+                                    "label": "apiStatus",
+                                    "color": "#3f51b5",
+                                    "settings": {},
+                                    "_hash": 0.430957831457494,
+                                    "aggregationType": "NONE",
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": true,
+                                    "postFuncBody": "return value ? value.toLowerCase() : 'enabled';"
+                                },
+                                {
+                                    "name": "transportApiState",
+                                    "type": "timeseries",
+                                    "label": "unit",
+                                    "color": "#8bc34a",
+                                    "settings": {},
+                                    "_hash": 0.662147926074595,
+                                    "aggregationType": "NONE",
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": true,
+                                    "postFuncBody": "return '{i18n:api-usage.messages}';"
+                                },
+                                {
+                                    "name": "transportApiState",
+                                    "type": "timeseries",
+                                    "label": "pointsUnit",
+                                    "color": "#3f51b5",
+                                    "settings": {},
+                                    "_hash": 0.44620898738917947,
+                                    "aggregationType": "NONE",
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": true,
+                                    "postFuncBody": "return '{i18n:api-usage.data-points}';"
+                                }
+                            ],
+                            "alarmFilterConfig": {
+                                "statusList": [
+                                    "ACTIVE"
+                                ]
+                            }
+                        }
+                    ],
+                    "timewindow": {
+                        "displayValue": "",
+                        "selectedTab": 0,
+                        "realtime": {
+                            "realtimeType": 1,
+                            "interval": 1000,
+                            "timewindowMs": 60000,
+                            "quickInterval": "CURRENT_DAY"
+                        },
+                        "history": {
+                            "historyType": 0,
+                            "interval": 1000,
+                            "timewindowMs": 60000,
+                            "fixedTimewindow": {
+                                "startTimeMs": 1708518962586,
+                                "endTimeMs": 1708605362586
+                            },
+                            "quickInterval": "CURRENT_DAY"
+                        },
+                        "aggregation": {
+                            "type": "AVG",
+                            "limit": 25000
+                        }
+                    },
+                    "showTitle": false,
+                    "backgroundColor": "#fff",
+                    "color": "rgba(0, 0, 0, 0.87)",
+                    "padding": "0px",
+                    "settings": {
+                        "useMarkdownTextFunction": true,
+                        "markdownTextPattern": "",
+                        "markdownTextFunction": "function toShortNumber(number) {\n    const rounder = Math.pow(10, 1);\n    const powers = [\n      {key: 'Q', value: Math.pow(10, 15)},\n      {key: 'T', value: Math.pow(10, 12)},\n      {key: 'B', value: Math.pow(10, 9)},\n      {key: 'M', value: Math.pow(10, 6)},\n      {key: 'K', value: 1000}\n    ];\n    let key = '';\n    for (const power of powers) {\n        const reduced = number / power.value;\n        for (const power of powers) {\n            let reduced = number / power.value;\n            reduced = Math.round(reduced * rounder) / rounder;\n            if (reduced >= 1) {\n                number = reduced;\n                key = power.key;\n                break;\n            }\n        }\n    }\n    \n    return number + key;\n}\n\nfunction calculateBarValues(count, limit) {\n    let apiUsageBar = '0%';\n    let apiUsagePercent = '';\n    let apiUsageValue = `${toShortNumber(count)}  / ∞`;\n    if (Number.isFinite(limit) && limit > 0) {\n        var percent = Math.min(100, ((count / limit) * 100));\n        apiUsageBar = `${percent}%`\n        apiUsagePercent = `${percent.toFixed(2)}%`;\n        apiUsageValue = `${toShortNumber(count)} / ${toShortNumber(limit)}`;\n    }\n    \n    return [apiUsageBar, apiUsagePercent, apiUsageValue]\n}\n\nconst [apiUsageBar, apiUsagePercent, apiUsageValue] = calculateBarValues(data[0].count, data[0].limit);\nconst [apiUsageBar2, apiUsagePercent2, apiUsageValue2] = calculateBarValues(data[0].pointsCount, data[0].pointsLimit);\n\n\nreturn  `<div class=\"card ${data[0].apiStatus.toLowerCase()}\">` +\n            '<div class=\"content\">' +\n                '<div class=\"column\">' +\n                    '<div class=\"title-row\">' +\n                        '<div class=\"title\">' +\n                            `<span>${data[0].title}</span>` +\n                        '</div>' +\n                        `<div class=\"state\">${data[0].apiStatus.toUpperCase()}</div>` +\n                    '</div>' +\n                    '<div class=\"bars-row\">' +\n                        '<div class=\"bar-column\" style=\"margin-right: 10px;\">' +\n                            '<div class=\"bar-container\">' +\n                                `<div class=\"unit\">${data[0].unit}</div>` +\n                                '<div class=\"bar\">' +\n                                    `<div class=\"bar-fill\" style=\"width: ${apiUsageBar}\"></div>` +\n                                '</div>' +\n                                '<div class=\"bar-labels\">' +\n                                    `<div>${apiUsagePercent}</div>` +\n                                    '<div style=\"flex: 1;\"></div>' +\n                                    `<div>${apiUsageValue}</div>` +\n                                '</div>' +\n                            '</div>' +\n                        '</div>' +\n                        '<div class=\"bar-column\" style=\"margin-left: 10px;\">' +\n                            '<div class=\"bar-container\">' +\n                                `<div class=\"unit\">${data[0].pointsUnit}</div>` +\n                                '<div class=\"bar\">' +\n                                    `<div class=\"bar-fill\" style=\"width: ${apiUsageBar2}\"></div>` +\n                                '</div>' +\n                                '<div class=\"bar-labels\">' +\n                                    `<div>${apiUsagePercent2}</div>` +\n                                    '<div style=\"flex: 1;\"></div>' +\n                                    `<div>${apiUsageValue2}</div>` +\n                                '</div>' +\n                            '</div>' +   \n                        '</div>' +\n                    '</div>' +\n                '</div>' +\n            '</div>' +\n            '<mat-divider></mat-divider>' +\n            '<div class=\"action-row\">'+\n                '<button id=\"transport_details\" mat-button color=\"primary\">{i18n:api-usage.view-details}</button>' +\n            '</div>' +\n        '</div>'\n",
+                        "applyDefaultMarkdownStyle": false,
+                        "markdownCss": "\n"
+                    },
+                    "title": "Transport",
+                    "showTitleIcon": false,
+                    "iconColor": "rgba(0, 0, 0, 0.87)",
+                    "iconSize": "24px",
+                    "titleTooltip": "",
+                    "dropShadow": true,
+                    "enableFullscreen": false,
+                    "widgetStyle": {},
+                    "titleStyle": {
+                        "fontSize": "16px",
+                        "fontWeight": 400
+                    },
+                    "showLegend": false,
+                    "useDashboardTimewindow": true,
+                    "displayTimewindow": true,
+                    "widgetCss": "",
+                    "pageSize": 1024,
+                    "noDataDisplayMessage": "",
+                    "actions": {
+                        "elementClick": [
+                            {
+                                "name": "transport_details",
+                                "icon": "insert_chart",
+                                "useShowWidgetActionFunction": null,
+                                "showWidgetActionFunction": "return true;",
+                                "type": "openDashboardState",
+                                "targetDashboardStateId": "transport",
+                                "setEntityId": false,
+                                "stateEntityParamName": null,
+                                "openRightLayout": false,
+                                "openInSeparateDialog": false,
+                                "openInPopover": false,
+                                "id": "a60e09be-1bea-dfc3-6abb-f87e73256899"
+                            }
+                        ]
+                    }
                 },
-                {
-                  "name": "jsExecutionApiState",
-                  "type": "timeseries",
-                  "label": "title",
-                  "color": "#9c27b0",
-                  "settings": {},
-                  "_hash": 0.7673280949238444,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": true,
-                  "postFuncBody": "return \"{i18n:api-usage.scripts}\";",
-                  "aggregationType": "NONE"
+                "row": 0,
+                "col": 0,
+                "id": "aab68ab5-8e40-8694-c55c-8eb1c89b88fb"
+            },
+            "a84fa70a-ddfa-3b24-9aa4-cf9ce91f919a": {
+                "typeFullFqn": "system.cards.markdown_card",
+                "type": "latest",
+                "sizeX": 5,
+                "sizeY": 3.5,
+                "config": {
+                    "datasources": [
+                        {
+                            "type": "entity",
+                            "name": null,
+                            "entityAliasId": "40193437-33ac-3172-eefd-0b08eb849062",
+                            "filterId": null,
+                            "dataKeys": [
+                                {
+                                    "name": "ruleEngineApiState",
+                                    "type": "timeseries",
+                                    "label": "apiStatus",
+                                    "color": "#2196f3",
+                                    "settings": {},
+                                    "_hash": 0.8830669138660703,
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": true,
+                                    "postFuncBody": "return value ? value : 'enabled';",
+                                    "aggregationType": "NONE"
+                                },
+                                {
+                                    "name": "ruleEngineExecutionLimit",
+                                    "type": "timeseries",
+                                    "label": "limit",
+                                    "color": "#4caf50",
+                                    "settings": {},
+                                    "_hash": 0.5463603803546802,
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": true,
+                                    "postFuncBody": "return value !== '' ? parseInt(value, 10) : 0;",
+                                    "aggregationType": "NONE"
+                                },
+                                {
+                                    "name": "ruleEngineExecutionCount",
+                                    "type": "timeseries",
+                                    "label": "count",
+                                    "color": "#f44336",
+                                    "settings": {},
+                                    "_hash": 0.5564241862015964,
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": true,
+                                    "postFuncBody": "return value !== '' ? parseInt(value, 10) : 0;",
+                                    "aggregationType": "NONE"
+                                },
+                                {
+                                    "name": "ruleEngineApiState",
+                                    "type": "timeseries",
+                                    "label": "title",
+                                    "color": "#9c27b0",
+                                    "settings": {},
+                                    "_hash": 0.3551317421302518,
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": true,
+                                    "postFuncBody": "return \"{i18n:api-usage.rule-engine}\";"
+                                },
+                                {
+                                    "name": "ruleEngineApiState",
+                                    "type": "timeseries",
+                                    "label": "unit",
+                                    "color": "#8bc34a",
+                                    "settings": {},
+                                    "_hash": 0.5100381746798048,
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": true,
+                                    "postFuncBody": "return \"{i18n:api-usage.executions}\";"
+                                }
+                            ],
+                            "alarmFilterConfig": {
+                                "statusList": [
+                                    "ACTIVE"
+                                ]
+                            }
+                        }
+                    ],
+                    "timewindow": {
+                        "displayValue": "",
+                        "selectedTab": 0,
+                        "realtime": {
+                            "realtimeType": 1,
+                            "interval": 1000,
+                            "timewindowMs": 60000,
+                            "quickInterval": "CURRENT_DAY"
+                        },
+                        "history": {
+                            "historyType": 0,
+                            "interval": 1000,
+                            "timewindowMs": 60000,
+                            "fixedTimewindow": {
+                                "startTimeMs": 1708518962586,
+                                "endTimeMs": 1708605362586
+                            },
+                            "quickInterval": "CURRENT_DAY"
+                        },
+                        "aggregation": {
+                            "type": "AVG",
+                            "limit": 25000
+                        }
+                    },
+                    "showTitle": false,
+                    "backgroundColor": "#fff",
+                    "color": "rgba(0, 0, 0, 0.87)",
+                    "padding": "0px",
+                    "settings": {
+                        "useMarkdownTextFunction": true,
+                        "markdownTextPattern": "",
+                        "markdownTextFunction": "function toShortNumber(number) {\n    const rounder = Math.pow(10, 1);\n    const powers = [\n      {key: 'Q', value: Math.pow(10, 15)},\n      {key: 'T', value: Math.pow(10, 12)},\n      {key: 'B', value: Math.pow(10, 9)},\n      {key: 'M', value: Math.pow(10, 6)},\n      {key: 'K', value: 1000}\n    ];\n    let key = '';\n    for (const power of powers) {\n        let reduced = number / power.value;\n        reduced = Math.round(reduced * rounder) / rounder;\n        if (reduced >= 1) {\n            number = reduced;\n            key = power.key;\n            break;\n        }\n    }\n    \n    return number + key;\n}\n\nfunction calculateBarValues(count, limit) {\n    let apiUsageBar = '0%';\n    let apiUsagePercent = '';\n    let apiUsageValue = `${toShortNumber(count)}  / ∞`;\n    if (Number.isFinite(limit) && limit > 0) {\n        var percent = Math.min(100, ((count / limit) * 100));\n        apiUsageBar = `${percent}%`\n        apiUsagePercent = `${percent.toFixed(2)}%`;\n        apiUsageValue = `${toShortNumber(count)} / ${toShortNumber(limit)}`;\n    }\n    \n    return [apiUsageBar, apiUsagePercent, apiUsageValue]\n}\n\nconst [apiUsageBar, apiUsagePercent, apiUsageValue] = calculateBarValues(data[0].count, data[0].limit);\n\n\nreturn  `<div class=\"card ${data[0].apiStatus.toLowerCase()}\">` +\n            '<div class=\"content\">' +\n                '<div class=\"column\">' +\n                    '<div class=\"title-row\">' +\n                        '<div class=\"title\">${title}</div>' +\n                        `<div class=\"state\">${data[0].apiStatus.toUpperCase()}</div>` +\n                    '</div>' +\n                    '<div class=\"bar-container\">' +\n                        `<div class=\"unit\">${data[0].unit}</div>` +\n                        '<div class=\"bar\">' +\n                            `<div class=\"bar-fill\" style=\"width: ${apiUsageBar}\"></div>` +\n                        '</div>' +\n                        '<div class=\"bar-labels\">' +\n                            `<div>${apiUsagePercent}</div>` +\n                            '<div style=\"flex: 1;\"></div>' +\n                            `<div>${apiUsageValue}</div>` +\n                        '</div>' +\n                    '</div>' +\n                '</div>' +\n            '</div>' +\n            '<mat-divider></mat-divider>' +\n            '<div class=\"action-row\">'+\n                '<button id=\"rule_engine_statistics_details\" mat-button color=\"primary\">{i18n:api-usage.view-statistics}</button>' +\n                '<button id=\"rule_engine_execution_details\" mat-button color=\"primary\">{i18n:api-usage.view-details}</button>' +\n            '</div>' +\n        '</div>'\n",
+                        "applyDefaultMarkdownStyle": false,
+                        "markdownCss": "\n"
+                    },
+                    "title": "Rule Engine execution",
+                    "showTitleIcon": false,
+                    "iconColor": "rgba(0, 0, 0, 0.87)",
+                    "iconSize": "24px",
+                    "titleTooltip": "",
+                    "dropShadow": true,
+                    "enableFullscreen": false,
+                    "widgetStyle": {},
+                    "titleStyle": {
+                        "fontSize": "16px",
+                        "fontWeight": 400
+                    },
+                    "showLegend": false,
+                    "useDashboardTimewindow": true,
+                    "displayTimewindow": true,
+                    "widgetCss": "",
+                    "pageSize": 1024,
+                    "noDataDisplayMessage": "",
+                    "actions": {
+                        "elementClick": [
+                            {
+                                "name": "rule_engine_execution_details",
+                                "icon": "insert_chart",
+                                "type": "openDashboardState",
+                                "targetDashboardStateId": "rule_engine_execution",
+                                "setEntityId": false,
+                                "stateEntityParamName": null,
+                                "openRightLayout": false,
+                                "id": "3c30248f-0cd8-fb97-a917-bc1e09984a79"
+                            },
+                            {
+                                "name": "rule_engine_statistics_details",
+                                "icon": "show_chart",
+                                "type": "openDashboardState",
+                                "targetDashboardStateId": "rule_engine_statistics",
+                                "setEntityId": false,
+                                "stateEntityParamName": null,
+                                "openRightLayout": false,
+                                "id": "04e4565a-9e24-23df-f376-f2ec70a8165f"
+                            }
+                        ]
+                    }
                 },
-                {
-                  "name": "jsExecutionApiState",
-                  "type": "timeseries",
-                  "label": "jsUnit",
-                  "color": "#8bc34a",
-                  "settings": {},
-                  "_hash": 0.7926918686567068,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": true,
-                  "postFuncBody": "return \"{i18n:api-usage.javascript}\";",
-                  "aggregationType": "NONE"
+                "row": 0,
+                "col": 0,
+                "id": "a84fa70a-ddfa-3b24-9aa4-cf9ce91f919a"
+            },
+            "d70d26d4-e22d-4ca9-9ea7-f9c87c093321": {
+                "typeFullFqn": "system.cards.markdown_card",
+                "type": "latest",
+                "sizeX": 5,
+                "sizeY": 3.5,
+                "config": {
+                    "datasources": [
+                        {
+                            "type": "entity",
+                            "name": null,
+                            "entityAliasId": "40193437-33ac-3172-eefd-0b08eb849062",
+                            "filterId": null,
+                            "dataKeys": [
+                                {
+                                    "name": "jsExecutionApiState",
+                                    "type": "timeseries",
+                                    "label": "jsApiState",
+                                    "color": "#2196f3",
+                                    "settings": {},
+                                    "_hash": 0.8830669138660703,
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": true,
+                                    "postFuncBody": "return value ? value : 'ENABLED';",
+                                    "aggregationType": "NONE"
+                                },
+                                {
+                                    "name": "jsExecutionLimit",
+                                    "type": "timeseries",
+                                    "label": "jsLimit",
+                                    "color": "#4caf50",
+                                    "settings": {},
+                                    "_hash": 0.5463603803546802,
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": true,
+                                    "postFuncBody": "return value !== '' ? parseInt(value, 10) : 0;",
+                                    "aggregationType": "NONE"
+                                },
+                                {
+                                    "name": "jsExecutionCount",
+                                    "type": "timeseries",
+                                    "label": "jsCount",
+                                    "color": "#f44336",
+                                    "settings": {},
+                                    "_hash": 0.5564241862015964,
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": true,
+                                    "postFuncBody": "return value !== '' ? parseInt(value, 10) : 0;",
+                                    "aggregationType": "NONE"
+                                },
+                                {
+                                    "name": "jsExecutionApiState",
+                                    "type": "timeseries",
+                                    "label": "title",
+                                    "color": "#9c27b0",
+                                    "settings": {},
+                                    "_hash": 0.7673280949238444,
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": true,
+                                    "postFuncBody": "return \"{i18n:api-usage.scripts}\";",
+                                    "aggregationType": "NONE"
+                                },
+                                {
+                                    "name": "jsExecutionApiState",
+                                    "type": "timeseries",
+                                    "label": "jsUnit",
+                                    "color": "#8bc34a",
+                                    "settings": {},
+                                    "_hash": 0.7926918686567068,
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": true,
+                                    "postFuncBody": "return \"{i18n:api-usage.javascript}\";",
+                                    "aggregationType": "NONE"
+                                },
+                                {
+                                    "name": "tbelExecutionApiState",
+                                    "type": "timeseries",
+                                    "label": "tbelApiState",
+                                    "color": "#3f51b5",
+                                    "settings": {},
+                                    "_hash": 0.2002981454581909,
+                                    "aggregationType": "NONE",
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": true,
+                                    "postFuncBody": "return value ? value : 'ENABLED';"
+                                },
+                                {
+                                    "name": "tbelExecutionLimit",
+                                    "type": "timeseries",
+                                    "label": "tbelLimit",
+                                    "color": "#ffeb3b",
+                                    "settings": {},
+                                    "_hash": 0.5039854873031677,
+                                    "aggregationType": "NONE",
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": true,
+                                    "postFuncBody": "return value !== '' ? parseInt(value, 10) : 0;"
+                                },
+                                {
+                                    "name": "tbelExecutionCount",
+                                    "type": "timeseries",
+                                    "label": "tbelCount",
+                                    "color": "#e91e63",
+                                    "settings": {},
+                                    "_hash": 0.9506731992087107,
+                                    "aggregationType": "NONE",
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": true,
+                                    "postFuncBody": "return value !== '' ? parseInt(value, 10) : 0;"
+                                },
+                                {
+                                    "name": "tbelExecutionApiState",
+                                    "type": "timeseries",
+                                    "label": "tbelUnit",
+                                    "color": "#ffeb3b",
+                                    "settings": {},
+                                    "_hash": 0.3673530683177082,
+                                    "aggregationType": "NONE",
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": true,
+                                    "postFuncBody": "return \"{i18n:api-usage.tbel}\";"
+                                }
+                            ],
+                            "alarmFilterConfig": {
+                                "statusList": [
+                                    "ACTIVE"
+                                ]
+                            }
+                        }
+                    ],
+                    "timewindow": {
+                        "displayValue": "",
+                        "selectedTab": 0,
+                        "realtime": {
+                            "realtimeType": 1,
+                            "interval": 1000,
+                            "timewindowMs": 60000,
+                            "quickInterval": "CURRENT_DAY"
+                        },
+                        "history": {
+                            "historyType": 0,
+                            "interval": 1000,
+                            "timewindowMs": 60000,
+                            "fixedTimewindow": {
+                                "startTimeMs": 1708518962586,
+                                "endTimeMs": 1708605362586
+                            },
+                            "quickInterval": "CURRENT_DAY"
+                        },
+                        "aggregation": {
+                            "type": "AVG",
+                            "limit": 25000
+                        }
+                    },
+                    "showTitle": false,
+                    "backgroundColor": "#fff",
+                    "color": "rgba(0, 0, 0, 0.87)",
+                    "padding": "0px",
+                    "settings": {
+                        "useMarkdownTextFunction": true,
+                        "markdownTextPattern": "",
+                        "markdownTextFunction": "function toShortNumber(number) {\n    const rounder = Math.pow(10, 1);\n    const powers = [\n      {key: 'Q', value: Math.pow(10, 15)},\n      {key: 'T', value: Math.pow(10, 12)},\n      {key: 'B', value: Math.pow(10, 9)},\n      {key: 'M', value: Math.pow(10, 6)},\n      {key: 'K', value: 1000}\n    ];\n    let key = '';\n    for (const power of powers) {\n        const reduced = number / power.value;\n        for (const power of powers) {\n            let reduced = number / power.value;\n            reduced = Math.round(reduced * rounder) / rounder;\n            if (reduced >= 1) {\n                number = reduced;\n                key = power.key;\n                break;\n            }\n        }\n    }\n    \n    return number + key;\n}\n\nfunction calculateBarValues(count, limit) {\n    let apiUsageBar = '0%';\n    let apiUsagePercent = '';\n    let apiUsageValue = `${toShortNumber(count)}  / ∞`;\n    if (Number.isFinite(limit) && limit > 0) {\n        var percent = Math.min(100, ((count / limit) * 100));\n        apiUsageBar = `${percent}%`\n        apiUsagePercent = `${percent.toFixed(2)}%`;\n        apiUsageValue = `${toShortNumber(count)} / ${toShortNumber(limit)}`;\n    }\n    \n    return [apiUsageBar, apiUsagePercent, apiUsageValue]\n}\n\nconst [jsUsageBar, jsUsagePercent, jsUsageValue] = calculateBarValues(data[0].jsCount, data[0].jsLimit);\nconst [tbelUsageBar, tbelUsagePercent, tbelUsageValue] = calculateBarValues(data[0].tbelCount, data[0].tbelLimit);\n\nconst jsApiState = data[0].jsApiState;\nconst tbelApiState = data[0].tbelApiState;\nlet currentState;\nif (jsApiState === 'DISABLED' || tbelApiState === 'DISABLED') {\n    currentState = 'DISABLED';\n} else if (jsApiState === 'WARNING' || tbelApiState === 'WARNING') {\n    currentState = 'WARNING';\n} else {\n    currentState = 'ENABLED';\n}\nconst cardClass = currentState.toLowerCase()\n\nreturn  `<div class=\"card ${cardClass}\">` +\n            '<div class=\"content\">' +\n                '<div class=\"column\">' +\n                    '<div class=\"title-row\">' +\n                        '<div class=\"title\">' +\n                            `<span>${data[0].title}</span>` +\n                        '</div>' +\n                        `<div class=\"state\">${currentState}</div>` +\n                    '</div>' +\n                    '<div class=\"bars-row\">' +\n                        '<div class=\"bar-column\" style=\"margin-right: 10px;\">' +\n                            '<div class=\"bar-container\">' +\n                                `<div class=\"unit\">${data[0].jsUnit}</div>` +\n                                '<div class=\"bar\">' +\n                                    `<div class=\"bar-fill\" style=\"width: ${jsUsageBar}\"></div>` +\n                                '</div>' +\n                                '<div class=\"bar-labels\">' +\n                                    `<div>${jsUsagePercent}</div>` +\n                                    '<div style=\"flex: 1;\"></div>' +\n                                    `<div>${jsUsageValue}</div>` +\n                                '</div>' +\n                            '</div>' +\n                        '</div>' +\n                        '<div class=\"bar-column\" style=\"margin-left: 10px;\">' +\n                            '<div class=\"bar-container\">' +\n                                `<div class=\"unit\">${data[0].tbelUnit}</div>` +\n                                '<div class=\"bar\">' +\n                                    `<div class=\"bar-fill\" style=\"width: ${tbelUsageBar}\"></div>` +\n                                '</div>' +\n                                '<div class=\"bar-labels\">' +\n                                    `<div>${tbelUsagePercent}</div>` +\n                                    '<div style=\"flex: 1;\"></div>' +\n                                    `<div>${tbelUsageValue}</div>` +\n                                '</div>' +\n                            '</div>' +   \n                        '</div>' +\n                    '</div>' +\n                '</div>' +\n            '</div>' +\n            '<mat-divider></mat-divider>' +\n            '<div class=\"action-row\">'+\n                '<button id=\"script_functions_details\" mat-button color=\"primary\">{i18n:api-usage.view-details}</button>' +\n            '</div>' +\n        '</div>'\n",
+                        "applyDefaultMarkdownStyle": false,
+                        "markdownCss": "\n"
+                    },
+                    "title": "JavaScript functions",
+                    "showTitleIcon": false,
+                    "iconColor": "rgba(0, 0, 0, 0.87)",
+                    "iconSize": "24px",
+                    "titleTooltip": "",
+                    "dropShadow": true,
+                    "enableFullscreen": false,
+                    "widgetStyle": {},
+                    "titleStyle": {
+                        "fontSize": "16px",
+                        "fontWeight": 400
+                    },
+                    "showLegend": false,
+                    "useDashboardTimewindow": true,
+                    "displayTimewindow": true,
+                    "widgetCss": "",
+                    "pageSize": 1024,
+                    "noDataDisplayMessage": "",
+                    "actions": {
+                        "elementClick": [
+                            {
+                                "name": "script_functions_details",
+                                "icon": "insert_chart",
+                                "useShowWidgetActionFunction": null,
+                                "showWidgetActionFunction": "return true;",
+                                "type": "openDashboardState",
+                                "targetDashboardStateId": "script_functions",
+                                "setEntityId": false,
+                                "stateEntityParamName": null,
+                                "openRightLayout": false,
+                                "openInSeparateDialog": false,
+                                "openInPopover": false,
+                                "id": "d4961bea-84de-e1af-e50f-666b98d34cd5"
+                            }
+                        ]
+                    }
                 },
-                {
-                  "name": "tbelExecutionApiState",
-                  "type": "timeseries",
-                  "label": "tbelApiState",
-                  "color": "#3f51b5",
-                  "settings": {},
-                  "_hash": 0.2002981454581909,
-                  "aggregationType": "NONE",
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": true,
-                  "postFuncBody": "return value ? value : 'ENABLED';"
+                "row": 0,
+                "col": 0,
+                "id": "d70d26d4-e22d-4ca9-9ea7-f9c87c093321"
+            },
+            "4d3ea95c-3188-9872-1817-2f989c7729e0": {
+                "typeFullFqn": "system.cards.markdown_card",
+                "type": "latest",
+                "sizeX": 5,
+                "sizeY": 3.5,
+                "config": {
+                    "datasources": [
+                        {
+                            "type": "entity",
+                            "name": null,
+                            "entityAliasId": "40193437-33ac-3172-eefd-0b08eb849062",
+                            "filterId": null,
+                            "dataKeys": [
+                                {
+                                    "name": "storageDataPointsLimit",
+                                    "type": "timeseries",
+                                    "label": "limit",
+                                    "color": "#4caf50",
+                                    "settings": {},
+                                    "_hash": 0.5463603803546802,
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": true,
+                                    "postFuncBody": "return value !== '' ? parseInt(value, 10) : 0;",
+                                    "aggregationType": "NONE"
+                                },
+                                {
+                                    "name": "storageDataPointsCount",
+                                    "type": "timeseries",
+                                    "label": "count",
+                                    "color": "#f44336",
+                                    "settings": {},
+                                    "_hash": 0.5564241862015964,
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": true,
+                                    "postFuncBody": "return value !== '' ? parseInt(value, 10) : 0;",
+                                    "aggregationType": "NONE"
+                                },
+                                {
+                                    "name": "dbApiState",
+                                    "type": "timeseries",
+                                    "label": "apiStatus",
+                                    "color": "#ffc107",
+                                    "settings": {},
+                                    "_hash": 0.8737107059960671,
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": true,
+                                    "postFuncBody": "return value ? value : 'enabled';",
+                                    "aggregationType": "NONE"
+                                },
+                                {
+                                    "name": "dbApiState",
+                                    "type": "timeseries",
+                                    "label": "title",
+                                    "color": "#9c27b0",
+                                    "settings": {},
+                                    "_hash": 0.6301889725474652,
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": true,
+                                    "postFuncBody": "return \"{i18n:api-usage.telemetry}\";"
+                                },
+                                {
+                                    "name": "dbApiState",
+                                    "type": "timeseries",
+                                    "label": "unit",
+                                    "color": "#8bc34a",
+                                    "settings": {},
+                                    "_hash": 0.0027742924142306613,
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": true,
+                                    "postFuncBody": "return \"{i18n:api-usage.data-points-storage-days}\";"
+                                }
+                            ],
+                            "alarmFilterConfig": {
+                                "statusList": [
+                                    "ACTIVE"
+                                ]
+                            }
+                        }
+                    ],
+                    "timewindow": {
+                        "displayValue": "",
+                        "selectedTab": 0,
+                        "realtime": {
+                            "realtimeType": 1,
+                            "interval": 1000,
+                            "timewindowMs": 60000,
+                            "quickInterval": "CURRENT_DAY"
+                        },
+                        "history": {
+                            "historyType": 0,
+                            "interval": 1000,
+                            "timewindowMs": 60000,
+                            "fixedTimewindow": {
+                                "startTimeMs": 1708518962586,
+                                "endTimeMs": 1708605362586
+                            },
+                            "quickInterval": "CURRENT_DAY"
+                        },
+                        "aggregation": {
+                            "type": "AVG",
+                            "limit": 25000
+                        }
+                    },
+                    "showTitle": false,
+                    "backgroundColor": "#fff",
+                    "color": "rgba(0, 0, 0, 0.87)",
+                    "padding": "0px",
+                    "settings": {
+                        "useMarkdownTextFunction": true,
+                        "markdownTextPattern": "",
+                        "markdownTextFunction": "function toShortNumber(number) {\n    const rounder = Math.pow(10, 1);\n    const powers = [\n      {key: 'Q', value: Math.pow(10, 15)},\n      {key: 'T', value: Math.pow(10, 12)},\n      {key: 'B', value: Math.pow(10, 9)},\n      {key: 'M', value: Math.pow(10, 6)},\n      {key: 'K', value: 1000}\n    ];\n    let key = '';\n    for (const power of powers) {\n        let reduced = number / power.value;\n        reduced = Math.round(reduced * rounder) / rounder;\n        if (reduced >= 1) {\n            number = reduced;\n            key = power.key;\n            break;\n        }\n    }\n    \n    return number + key;\n}\n\nfunction calculateBarValues(count, limit) {\n    let apiUsageBar = '0%';\n    let apiUsagePercent = '';\n    let apiUsageValue = `${toShortNumber(count)}  / ∞`;\n    if (Number.isFinite(limit) && limit > 0) {\n        var percent = Math.min(100, ((count / limit) * 100));\n        apiUsageBar = `${percent}%`\n        apiUsagePercent = `${percent.toFixed(2)}%`;\n        apiUsageValue = `${toShortNumber(count)} / ${toShortNumber(limit)}`;\n    }\n    \n    return [apiUsageBar, apiUsagePercent, apiUsageValue]\n}\n\nconst [apiUsageBar, apiUsagePercent, apiUsageValue] = calculateBarValues(data[0].count, data[0].limit);\n\n\nreturn  `<div class=\"card ${data[0].apiStatus.toLowerCase()}\">` +\n            '<div class=\"content\">' +\n                '<div class=\"column\">' +\n                    '<div class=\"title-row\">' +\n                        '<div class=\"title\">${title}</div>' +\n                        `<div class=\"state\">${data[0].apiStatus.toUpperCase()}</div>` +\n                    '</div>' +\n                    '<div class=\"bar-container\">' +\n                        `<div class=\"unit\">${data[0].unit}</div>` +\n                        '<div class=\"bar\">' +\n                            `<div class=\"bar-fill\" style=\"width: ${apiUsageBar}\"></div>` +\n                        '</div>' +\n                        '<div class=\"bar-labels\">' +\n                            `<div>${apiUsagePercent}</div>` +\n                            '<div style=\"flex: 1;\"></div>' +\n                            `<div>${apiUsageValue}</div>` +\n                        '</div>' +\n                    '</div>' +\n                '</div>' +\n            '</div>' +\n            '<mat-divider></mat-divider>' +\n            '<div class=\"action-row\">'+\n                '<button id=\"telemetry_persistence_details\" mat-button color=\"primary\">{i18n:api-usage.view-details}</button>' +\n            '</div>' +\n        '</div>'\n",
+                        "applyDefaultMarkdownStyle": false,
+                        "markdownCss": "\n"
+                    },
+                    "title": "Telemetry persistence",
+                    "showTitleIcon": false,
+                    "iconColor": "rgba(0, 0, 0, 0.87)",
+                    "iconSize": "24px",
+                    "titleTooltip": "",
+                    "dropShadow": true,
+                    "enableFullscreen": false,
+                    "widgetStyle": {},
+                    "titleStyle": {
+                        "fontSize": "16px",
+                        "fontWeight": 400
+                    },
+                    "showLegend": false,
+                    "useDashboardTimewindow": true,
+                    "displayTimewindow": true,
+                    "widgetCss": "",
+                    "pageSize": 1024,
+                    "noDataDisplayMessage": "",
+                    "actions": {
+                        "elementClick": [
+                            {
+                                "name": "telemetry_persistence_details",
+                                "icon": "insert_chart",
+                                "type": "openDashboardState",
+                                "targetDashboardStateId": "telemetry_persistence",
+                                "setEntityId": false,
+                                "stateEntityParamName": null,
+                                "openRightLayout": false,
+                                "id": "6248831c-5b3f-8879-8548-afcf43f10610"
+                            }
+                        ]
+                    }
                 },
-                {
-                  "name": "tbelExecutionLimit",
-                  "type": "timeseries",
-                  "label": "tbelLimit",
-                  "color": "#ffeb3b",
-                  "settings": {},
-                  "_hash": 0.5039854873031677,
-                  "aggregationType": "NONE",
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": null,
-                  "postFuncBody": null
+                "row": 0,
+                "col": 0,
+                "id": "4d3ea95c-3188-9872-1817-2f989c7729e0"
+            },
+            "2d0d6ff6-cd59-51d4-b916-38e22cdd0702": {
+                "typeFullFqn": "system.cards.markdown_card",
+                "type": "latest",
+                "sizeX": 5,
+                "sizeY": 3.5,
+                "config": {
+                    "datasources": [
+                        {
+                            "type": "entity",
+                            "name": null,
+                            "entityAliasId": "40193437-33ac-3172-eefd-0b08eb849062",
+                            "filterId": null,
+                            "dataKeys": [
+                                {
+                                    "name": "createdAlarmsLimit",
+                                    "type": "timeseries",
+                                    "label": "limit",
+                                    "color": "#4caf50",
+                                    "settings": {},
+                                    "_hash": 0.5463603803546802,
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": true,
+                                    "postFuncBody": "return value !== '' ? parseInt(value, 10) : 0;",
+                                    "aggregationType": "NONE"
+                                },
+                                {
+                                    "name": "createdAlarmsCount",
+                                    "type": "timeseries",
+                                    "label": "count",
+                                    "color": "#f44336",
+                                    "settings": {},
+                                    "_hash": 0.5564241862015964,
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": true,
+                                    "postFuncBody": "return value !== '' ? parseInt(value, 10) : 0;",
+                                    "aggregationType": "NONE"
+                                },
+                                {
+                                    "name": "alarmApiState",
+                                    "type": "timeseries",
+                                    "label": "apiStatus",
+                                    "color": "#ffc107",
+                                    "settings": {},
+                                    "_hash": 0.8737107059960671,
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": true,
+                                    "postFuncBody": "return value ? value : 'enabled';",
+                                    "aggregationType": "NONE"
+                                },
+                                {
+                                    "name": "alarmApiState",
+                                    "type": "timeseries",
+                                    "label": "title",
+                                    "color": "#9c27b0",
+                                    "settings": {},
+                                    "_hash": 0.43439375716502227,
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": true,
+                                    "postFuncBody": "return \"{i18n:api-usage.alarm}\";"
+                                },
+                                {
+                                    "name": "alarmApiState",
+                                    "type": "timeseries",
+                                    "label": "unit",
+                                    "color": "#8bc34a",
+                                    "settings": {},
+                                    "_hash": 0.9964061963495883,
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": true,
+                                    "postFuncBody": "return \"{i18n:api-usage.alarms-created}\";"
+                                }
+                            ],
+                            "alarmFilterConfig": {
+                                "statusList": [
+                                    "ACTIVE"
+                                ]
+                            }
+                        }
+                    ],
+                    "timewindow": {
+                        "displayValue": "",
+                        "selectedTab": 0,
+                        "realtime": {
+                            "realtimeType": 1,
+                            "interval": 1000,
+                            "timewindowMs": 60000,
+                            "quickInterval": "CURRENT_DAY"
+                        },
+                        "history": {
+                            "historyType": 0,
+                            "interval": 1000,
+                            "timewindowMs": 60000,
+                            "fixedTimewindow": {
+                                "startTimeMs": 1708518962586,
+                                "endTimeMs": 1708605362586
+                            },
+                            "quickInterval": "CURRENT_DAY"
+                        },
+                        "aggregation": {
+                            "type": "AVG",
+                            "limit": 25000
+                        }
+                    },
+                    "showTitle": false,
+                    "backgroundColor": "#fff",
+                    "color": "rgba(0, 0, 0, 0.87)",
+                    "padding": "0px",
+                    "settings": {
+                        "useMarkdownTextFunction": true,
+                        "markdownTextPattern": "",
+                        "markdownTextFunction": "function toShortNumber(number) {\n    const rounder = Math.pow(10, 1);\n    const powers = [\n      {key: 'Q', value: Math.pow(10, 15)},\n      {key: 'T', value: Math.pow(10, 12)},\n      {key: 'B', value: Math.pow(10, 9)},\n      {key: 'M', value: Math.pow(10, 6)},\n      {key: 'K', value: 1000}\n    ];\n    let key = '';\n    for (const power of powers) {\n        let reduced = number / power.value;\n        reduced = Math.round(reduced * rounder) / rounder;\n        if (reduced >= 1) {\n            number = reduced;\n            key = power.key;\n            break;\n        }\n    }\n    \n    return number + key;\n}\n\nfunction calculateBarValues(count, limit) {\n    let apiUsageBar = '0%';\n    let apiUsagePercent = '';\n    let apiUsageValue = `${toShortNumber(count)}  / ∞`;\n    if (Number.isFinite(limit) && limit > 0) {\n        var percent = Math.min(100, ((count / limit) * 100));\n        apiUsageBar = `${percent}%`\n        apiUsagePercent = `${percent.toFixed(2)}%`;\n        apiUsageValue = `${toShortNumber(count)} / ${toShortNumber(limit)}`;\n    }\n    \n    return [apiUsageBar, apiUsagePercent, apiUsageValue]\n}\n\nconst [apiUsageBar, apiUsagePercent, apiUsageValue] = calculateBarValues(data[0].count, data[0].limit);\n\n\nreturn  `<div class=\"card ${data[0].apiStatus.toLowerCase()}\">` +\n            '<div class=\"content\">' +\n                '<div class=\"column\">' +\n                    '<div class=\"title-row\">' +\n                        '<div class=\"title\">${title}</div>' +\n                        `<div class=\"state\">${data[0].apiStatus.toUpperCase()}</div>` +\n                    '</div>' +\n                    '<div class=\"bar-container\">' +\n                        `<div class=\"unit\">${data[0].unit}</div>` +\n                        '<div class=\"bar\">' +\n                            `<div class=\"bar-fill\" style=\"width: ${apiUsageBar}\"></div>` +\n                        '</div>' +\n                        '<div class=\"bar-labels\">' +\n                            `<div>${apiUsagePercent}</div>` +\n                            '<div style=\"flex: 1;\"></div>' +\n                            `<div>${apiUsageValue}</div>` +\n                        '</div>' +\n                    '</div>' +\n                '</div>' +\n            '</div>' +\n            '<mat-divider></mat-divider>' +\n            '<div class=\"action-row\">'+\n                '<button id=\"email_messages_details\" mat-button color=\"primary\">{i18n:api-usage.view-details}</button>' +\n            '</div>' +\n        '</div>'\n",
+                        "applyDefaultMarkdownStyle": false,
+                        "markdownCss": "\n"
+                    },
+                    "title": "Alarm created",
+                    "showTitleIcon": false,
+                    "iconColor": "rgba(0, 0, 0, 0.87)",
+                    "iconSize": "24px",
+                    "titleTooltip": "",
+                    "dropShadow": true,
+                    "enableFullscreen": false,
+                    "widgetStyle": {},
+                    "titleStyle": {
+                        "fontSize": "16px",
+                        "fontWeight": 400
+                    },
+                    "showLegend": false,
+                    "useDashboardTimewindow": true,
+                    "displayTimewindow": true,
+                    "widgetCss": "",
+                    "pageSize": 1024,
+                    "noDataDisplayMessage": "",
+                    "actions": {
+                        "elementClick": [
+                            {
+                                "name": "email_messages_details",
+                                "icon": "insert_chart",
+                                "type": "openDashboardState",
+                                "targetDashboardStateId": "alarms_created",
+                                "setEntityId": false,
+                                "stateEntityParamName": null,
+                                "openInSeparateDialog": null,
+                                "dialogTitle": null,
+                                "dialogHideDashboardToolbar": true,
+                                "dialogWidth": null,
+                                "dialogHeight": null,
+                                "openRightLayout": false,
+                                "id": "946ba769-84ac-1507-6baa-94701de8967b"
+                            }
+                        ]
+                    }
                 },
-                {
-                  "name": "tbelExecutionCount",
-                  "type": "timeseries",
-                  "label": "tbelCount",
-                  "color": "#e91e63",
-                  "settings": {},
-                  "_hash": 0.9506731992087107,
-                  "aggregationType": "NONE",
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": null,
-                  "postFuncBody": null
+                "row": 0,
+                "col": 0,
+                "id": "2d0d6ff6-cd59-51d4-b916-38e22cdd0702"
+            },
+            "120573cc-e246-eb49-7d80-68e5d3b3c0cc": {
+                "typeFullFqn": "system.cards.markdown_card",
+                "type": "latest",
+                "sizeX": 5,
+                "sizeY": 3.5,
+                "config": {
+                    "datasources": [
+                        {
+                            "type": "entity",
+                            "name": null,
+                            "entityAliasId": "40193437-33ac-3172-eefd-0b08eb849062",
+                            "filterId": null,
+                            "dataKeys": [
+                                {
+                                    "name": "emailApiState",
+                                    "type": "timeseries",
+                                    "label": "apiState",
+                                    "color": "#2196f3",
+                                    "settings": {},
+                                    "_hash": 0.8830669138660703,
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": null,
+                                    "postFuncBody": null
+                                },
+                                {
+                                    "name": "emailLimit",
+                                    "type": "timeseries",
+                                    "label": "limit",
+                                    "color": "#4caf50",
+                                    "settings": {},
+                                    "_hash": 0.5463603803546802,
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": true,
+                                    "postFuncBody": "return value !== '' ? parseInt(value, 10) : 0;",
+                                    "aggregationType": "NONE"
+                                },
+                                {
+                                    "name": "emailCount",
+                                    "type": "timeseries",
+                                    "label": "count",
+                                    "color": "#f44336",
+                                    "settings": {},
+                                    "_hash": 0.5564241862015964,
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": true,
+                                    "postFuncBody": "return value !== '' ? parseInt(value, 10) : 0;",
+                                    "aggregationType": "NONE"
+                                },
+                                {
+                                    "name": "smsApiState",
+                                    "type": "timeseries",
+                                    "label": "apiStatePoint",
+                                    "color": "#e91e63",
+                                    "settings": {},
+                                    "_hash": 0.2969682764607864,
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": null,
+                                    "postFuncBody": null
+                                },
+                                {
+                                    "name": "smsLimit",
+                                    "type": "timeseries",
+                                    "label": "pointsLimit",
+                                    "color": "#9c27b0",
+                                    "settings": {},
+                                    "_hash": 0.22082255831864894,
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": true,
+                                    "postFuncBody": "return value !== '' ? parseInt(value, 10) : 0;",
+                                    "aggregationType": "NONE"
+                                },
+                                {
+                                    "name": "smsCount",
+                                    "type": "timeseries",
+                                    "label": "pointsCount",
+                                    "color": "#8bc34a",
+                                    "settings": {},
+                                    "_hash": 0.6340356364819146,
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": true,
+                                    "postFuncBody": "return value !== '' ? parseInt(value, 10) : 0;",
+                                    "aggregationType": "NONE"
+                                },
+                                {
+                                    "name": "notificationApiState",
+                                    "type": "timeseries",
+                                    "label": "title",
+                                    "color": "#3f51b5",
+                                    "settings": {},
+                                    "_hash": 0.6894070537030252,
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": true,
+                                    "postFuncBody": "return \"{i18n:api-usage.notifications}\";",
+                                    "aggregationType": "NONE"
+                                },
+                                {
+                                    "name": "notificationApiState",
+                                    "type": "timeseries",
+                                    "label": "unit",
+                                    "color": "#3f51b5",
+                                    "settings": {},
+                                    "_hash": 0.0005447336528170421,
+                                    "aggregationType": "NONE",
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": true,
+                                    "postFuncBody": "return '{i18n:api-usage.email}';"
+                                },
+                                {
+                                    "name": "notificationApiState",
+                                    "type": "timeseries",
+                                    "label": "pointsUnit",
+                                    "color": "#e91e63",
+                                    "settings": {},
+                                    "_hash": 0.12117146988088967,
+                                    "aggregationType": "NONE",
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": true,
+                                    "postFuncBody": "return '{i18n:api-usage.sms}';"
+                                }
+                            ],
+                            "alarmFilterConfig": {
+                                "statusList": [
+                                    "ACTIVE"
+                                ]
+                            }
+                        }
+                    ],
+                    "timewindow": {
+                        "displayValue": "",
+                        "selectedTab": 0,
+                        "realtime": {
+                            "realtimeType": 1,
+                            "interval": 1000,
+                            "timewindowMs": 60000,
+                            "quickInterval": "CURRENT_DAY"
+                        },
+                        "history": {
+                            "historyType": 0,
+                            "interval": 1000,
+                            "timewindowMs": 60000,
+                            "fixedTimewindow": {
+                                "startTimeMs": 1708518962586,
+                                "endTimeMs": 1708605362586
+                            },
+                            "quickInterval": "CURRENT_DAY"
+                        },
+                        "aggregation": {
+                            "type": "AVG",
+                            "limit": 25000
+                        }
+                    },
+                    "showTitle": false,
+                    "backgroundColor": "#fff",
+                    "color": "rgba(0, 0, 0, 0.87)",
+                    "padding": "0px",
+                    "settings": {
+                        "useMarkdownTextFunction": true,
+                        "markdownTextPattern": "",
+                        "markdownTextFunction": "function toShortNumber(number) {\n    const rounder = Math.pow(10, 1);\n    const powers = [\n      {key: 'Q', value: Math.pow(10, 15)},\n      {key: 'T', value: Math.pow(10, 12)},\n      {key: 'B', value: Math.pow(10, 9)},\n      {key: 'M', value: Math.pow(10, 6)},\n      {key: 'K', value: 1000}\n    ];\n    let key = '';\n    for (const power of powers) {\n        const reduced = number / power.value;\n        for (const power of powers) {\n            let reduced = number / power.value;\n            reduced = Math.round(reduced * rounder) / rounder;\n            if (reduced >= 1) {\n                number = reduced;\n                key = power.key;\n                break;\n            }\n        }\n    }\n    \n    return number + key;\n}\n\nfunction calculateBarValues(count, limit) {\n    let apiUsageBar = '0%';\n    let apiUsagePercent = '';\n    let apiUsageValue = `${toShortNumber(count)}  / ∞`;\n    if (Number.isFinite(limit) && limit > 0) {\n        var percent = Math.min(100, ((count / limit) * 100));\n        apiUsageBar = `${percent}%`\n        apiUsagePercent = `${percent.toFixed(2)}%`;\n        apiUsageValue = `${toShortNumber(count)} / ${toShortNumber(limit)}`;\n    }\n    \n    return [apiUsageBar, apiUsagePercent, apiUsageValue]\n}\n\nconst [apiUsageBar, apiUsagePercent, apiUsageValue] = calculateBarValues(data[0].count, data[0].limit);\nconst [apiUsageBar2, apiUsagePercent2, apiUsageValue2] = calculateBarValues(data[0].pointsCount, data[0].pointsLimit);\n\nconst apiState = data[0].apiState;\nconst apiStatePoint = data[0].apiStatePoint;\nlet currentState;\nif (apiState === 'DISABLED' || apiStatePoint === 'DISABLED') {\n    currentState = 'DISABLED';\n} else if (apiState === 'WARNING' || apiStatePoint === 'WARNING') {\n    currentState = 'WARNING';\n} else {\n    currentState = 'ENABLED';\n}\n\n\n\nreturn  `<div class=\"card ${currentState.toLowerCase()}\">` +\n            '<div class=\"content\">' +\n                '<div class=\"column\">' +\n                    '<div class=\"title-row\">' +\n                        '<div class=\"title\">' +\n                            `<span>${data[0].title}</span>` +\n                        '</div>' +\n                        `<div class=\"state\">${currentState}</div>` +\n                    '</div>' +\n                    '<div class=\"bars-row\">' +\n                        '<div class=\"bar-column\" style=\"margin-right: 10px;\">' +\n                            '<div class=\"bar-container\">' +\n                                `<div class=\"unit\">${data[0].unit}</div>` +\n                                '<div class=\"bar\">' +\n                                    `<div class=\"bar-fill\" style=\"width: ${apiUsageBar}\"></div>` +\n                                '</div>' +\n                                '<div class=\"bar-labels\">' +\n                                    `<div>${apiUsagePercent}</div>` +\n                                    '<div style=\"flex: 1;\"></div>' +\n                                    `<div>${apiUsageValue}</div>` +\n                                '</div>' +\n                            '</div>' +\n                        '</div>' +\n                        '<div class=\"bar-column\" style=\"margin-left: 10px;\">' +\n                            '<div class=\"bar-container\">' +\n                                `<div class=\"unit\">${data[0].pointsUnit}</div>` +\n                                '<div class=\"bar\">' +\n                                    `<div class=\"bar-fill\" style=\"width: ${apiUsageBar2}\"></div>` +\n                                '</div>' +\n                                '<div class=\"bar-labels\">' +\n                                    `<div>${apiUsagePercent2}</div>` +\n                                    '<div style=\"flex: 1;\"></div>' +\n                                    `<div>${apiUsageValue2}</div>` +\n                                '</div>' +\n                            '</div>' +   \n                        '</div>' +\n                    '</div>' +\n                '</div>' +\n            '</div>' +\n            '<mat-divider></mat-divider>' +\n            '<div class=\"action-row\">'+\n                '<button id=\"transport_details\" mat-button color=\"primary\">{i18n:api-usage.view-details}</button>' +\n            '</div>' +\n        '</div>'\n",
+                        "applyDefaultMarkdownStyle": false,
+                        "markdownCss": "\n"
+                    },
+                    "title": "Notifications (Email/SMS)",
+                    "showTitleIcon": false,
+                    "iconColor": "rgba(0, 0, 0, 0.87)",
+                    "iconSize": "24px",
+                    "titleTooltip": "",
+                    "dropShadow": true,
+                    "enableFullscreen": false,
+                    "widgetStyle": {},
+                    "titleStyle": {
+                        "fontSize": "16px",
+                        "fontWeight": 400
+                    },
+                    "showLegend": false,
+                    "useDashboardTimewindow": true,
+                    "displayTimewindow": true,
+                    "widgetCss": "",
+                    "pageSize": 1024,
+                    "noDataDisplayMessage": "",
+                    "actions": {
+                        "elementClick": [
+                            {
+                                "name": "transport_details",
+                                "icon": "insert_chart",
+                                "type": "openDashboardState",
+                                "targetDashboardStateId": "notifications",
+                                "setEntityId": false,
+                                "stateEntityParamName": null,
+                                "openInSeparateDialog": null,
+                                "dialogTitle": null,
+                                "dialogHideDashboardToolbar": true,
+                                "dialogWidth": null,
+                                "dialogHeight": null,
+                                "openRightLayout": false,
+                                "id": "46b7cefe-e1f2-67c1-4055-3a214520f869"
+                            }
+                        ]
+                    }
                 },
-                {
-                  "name": "tbelExecutionApiState",
-                  "type": "timeseries",
-                  "label": "tbelUnit",
-                  "color": "#ffeb3b",
-                  "settings": {},
-                  "_hash": 0.3673530683177082,
-                  "aggregationType": "NONE",
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": true,
-                  "postFuncBody": "return \"{i18n:api-usage.tbel}\";"
-                }
-              ]
-            }
-          ],
-          "timewindow": {
-            "displayValue": "",
-            "selectedTab": 0,
-            "realtime": {
-              "realtimeType": 1,
-              "interval": 1000,
-              "timewindowMs": 60000,
-              "quickInterval": "CURRENT_DAY"
-            },
-            "history": {
-              "historyType": 0,
-              "interval": 1000,
-              "timewindowMs": 60000,
-              "fixedTimewindow": {
-                "startTimeMs": 1694083375825,
-                "endTimeMs": 1694169775825
-              },
-              "quickInterval": "CURRENT_DAY"
+                "row": 0,
+                "col": 0,
+                "id": "120573cc-e246-eb49-7d80-68e5d3b3c0cc"
             },
-            "aggregation": {
-              "type": "AVG",
-              "limit": 25000
-            }
-          },
-          "showTitle": false,
-          "backgroundColor": "#fff",
-          "color": "#666666",
-          "padding": "0",
-          "settings": {
-            "cardHtml": "<div class='card'>\n    <img src=\"data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7\" onload=\"initializeCard_${cardId:0}(event);\">\n    <script type=\"text/javascript\">\n        function initializeCard_${cardId:0}(e) {\n            \n            function toShortNumber(number) {\n                var rounder = Math.pow(10, 1);\n                var powers = [\n                  {key: 'Q', value: Math.pow(10, 15)},\n                  {key: 'T', value: Math.pow(10, 12)},\n                  {key: 'B', value: Math.pow(10, 9)},\n                  {key: 'M', value: Math.pow(10, 6)},\n                  {key: 'K', value: 1000}\n                ];\n                \n                var key = '';\n                \n                for (var i = 0; i < powers.length; i++) {\n                    var reduced = number / powers[i].value;\n                    reduced = Math.round(reduced * rounder) / rounder;\n                    if (reduced >= 1) {\n                        number = reduced;\n                        key = powers[i].key;\n                        break;\n                    }\n                }\n                return number + key;\n            }\n            \n            var imgTag = e.target;\n            var parentTag = imgTag.parentNode;\n            var jsCount = \"${jsCount:0}\";\n            var jsLimit = \"${jsLimit:0}\";\n            jsCount = jsCount.length > 0 ? parseInt(jsCount, 10) : 0;\n            jsLimit = jsLimit.length > 0 ? parseInt(jsLimit, 10) : 0;\n            var jsPercentElement = $('#js-api-usage-percent', parentTag);\n            var jsValueElement = $('#js-api-usage-value', parentTag);\n            var jsBarElement = $('#js-api-usage-bar', parentTag);\n            if (Number.isFinite(jsLimit) && jsLimit > 0) {\n                var jsPercent = Math.min(100, ((jsCount / jsLimit) * 100));\n                jsBarElement.width(jsPercent + '%');\n                jsPercent = jsPercent.toFixed(2);\n                jsPercentElement.text(jsPercent + '%');\n                jsValueElement.text(toShortNumber(jsCount) + ' / ' + toShortNumber(jsLimit));\n            } else {\n                jsBarElement.width('0%');\n                jsPercentElement.text('');\n                jsValueElement.text(toShortNumber(jsCount) + ' / ∞');\n            }\n            var tbelCount = \"${tbelCount:0}\";\n            var tbelLimit = \"${tbelLimit:0}\";\n            tbelCount = tbelCount.length > 0 ? parseInt(tbelCount, 10) : 0;\n            tbelLimit = tbelLimit.length > 0 ? parseInt(tbelLimit, 10) : 0;\n            var tbelPercentElement = $('#tbel-api-usage-percent', parentTag);\n            var tbelValueElement = $('#tbel-api-usage-value', parentTag);\n            var tbelBarElement = $('#tbel-api-usage-bar', parentTag);\n            if (Number.isFinite(tbelLimit) && tbelLimit > 0) {\n                var tbelPercent = Math.min(100, ((tbelCount / tbelLimit) * 100));\n                tbelBarElement.width(tbelPercent + '%');\n                tbelPercent = tbelPercent.toFixed(2);\n                tbelPercentElement.text(tbelPercent + '%');\n                tbelValueElement.text(toShortNumber(tbelCount) + ' / ' + toShortNumber(tbelLimit));\n            } else {\n                tbelBarElement.width('0%');\n                tbelPercentElement.text('');\n                tbelValueElement.text(toShortNumber(tbelCount) + ' / ∞');\n            }\n            var jsApiState = \"${jsApiState}\";\n            var tbelApiState = \"${tbelApiState}\";\n            var currentState;\n            if (jsApiState === 'DISABLED' || tbelApiState === 'DISABLED') {\n                currentState = 'DISABLED';\n            } else if (jsApiState === 'WARNING' || tbelApiState === 'WARNING') {\n                currentState = 'WARNING';\n            } else {\n                currentState = 'ENABLED';\n            }\n            var stateTitle = $('#api-state', parentTag);\n            stateTitle.text(currentState);\n            parentTag.classList.add(currentState.toLowerCase());\n        }\n    </script>\n    <div class='content'>\n        <div class='column'>\n            <div class='title-row'>\n                <div class='title'>${title}</div>\n                <div id=\"api-state\" class='state'></div>\n            </div>\n            <div class=\"bars-row\">\n                <div class=\"bar-column\" style=\"margin-right: 10px;\">\n                    <div class='bar-container'>\n                        <div class=\"unit\">${jsUnit}</div>\n                        <div class='bar'>\n                            <div class=\"bar-fill\" id=\"js-api-usage-bar\"></div>\n                        </div>    \n                        <div class='bar-labels'>\n                            <div id=\"js-api-usage-percent\"></div>\n                            <div style=\"flex: 1;\"></div>\n                            <div id=\"js-api-usage-value\"></div>\n                        </div>\n                    </div>\n                </div>\n                <div class=\"bar-column\" style=\"margin-left: 10px;\">\n                    <div class='bar-container'>\n                        <div class=\"unit\">${tbelUnit}</div>\n                        <div class='bar'>\n                            <div class=\"bar-fill\" id=\"tbel-api-usage-bar\"></div>\n                        </div>    \n                        <div class='bar-labels'>\n                            <div id=\"tbel-api-usage-percent\"></div>\n                            <div style=\"flex: 1;\"></div>\n                            <div id=\"tbel-api-usage-value\"></div>\n                        </div>\n                    </div>\n                </div>\n            </div>\n        </div>\n    </div>\n    <div role=\"separator\" class=\"mat-divider mat-divider-horizontal\" aria-orientation=\"horizontal\"></div>\n    <div class='action-row'>\n        <button id=\"script_functions_details\" class=\"mdc-button mat-mdc-button mat-primary mat-mdc-button-base\">\n   <span class=\"mat-mdc-button-persistent-ripple mdc-button__ripple\"></span>\n         <span class=\"mdc-button__label\">{i18n:api-usage.view-details}</span>\n            <span class=\"mat-ripple mat-mdc-button-ripple\"></span>\n       <span class=\"mat-mdc-button-touch-target\"></span>\n     <span class=\"mat-mdc-focus-indicator\"></span>\n        </button>\n    </div> \n</div>",
-            "cardCss": ".card {\n   width: 100%;\n   height: 100%;\n   box-sizing: border-box;\n   display: flex;\n   flex-direction: column;\n}\n\n.card > img {\n    height: 0;\n}\n\n.card .content {\n   flex: 1;    \n   padding: 13px 13px 0;\n   display: flex;\n   box-sizing: border-box;\n}\n\n.card .content .column {\n   display: flex;\n   flex-direction: column;    \n   justify-content: space-around;\n   flex: 1;\n}\n\n.card .content .title-row {\n    display: flex;\n    flex-direction: row;\n    padding-bottom: 10px;\n}\n\n.card .title {\n    flex: 1;\n    font-size: 20px;\n    font-weight: 400;\n    color: #666666;\n}\n\n.card .state {\n    text-transform: uppercase;\n    font-size: 20px;\n    font-weight: bold;\n}\n\n.card.enabled .state {\n    color: #00B260;\n}\n\n.card.warning .state {\n    color: #FFAD6F;\n}\n\n.card.disabled .state {\n    color: #F73243;\n}\n\n.card .bars-row {\n    flex: 1;\n    display: flex;\n    flex-direction: row;\n}\n\n.card .bar-column {\n    flex: 1;\n    display: flex;\n    flex-direction: column;\n}\n\n.card .bar-container {\n    flex: 1;\n    display: flex;\n    flex-direction: column;\n    justify-content: center;\n}\n\n.card .bar {\n    flex: 1;\n    max-height: 30px;\n    margin-top: 3.5px;\n    margin-bottom: 4px;\n    background-color: #F0F0F0;\n    border: 1px solid #DADCDB;\n    border-radius: 2px;\n    box-shadow: inset 0 1px 3px rgba(0, 0, 0, .2);\n}\n\n.card.enabled .bar {\n    border-color: #00B260;\n    background-color: #F0FBF7;\n}\n\n.card.warning .bar {\n    border-color: #FFAD6F;\n    background-color: #FFFAF6;\n}\n\n.card.disabled .bar {\n    border-color: #F73243;\n    background-color: #FFF0F0;\n}\n\n.card .bar .bar-fill {\n    background-color: #F0F0F0;\n    border-radius: 2px;\n    height: 100%;\n    width: 0%;\n}\n\n.card.enabled .bar-fill {\n    background-color: #00C46C;\n}\n\n.card.warning .bar-fill {\n    background-color: #FFD099;\n}\n\n.card.disabled .bar-fill {\n    background-color: #FF9494;\n}\n\n.card .bar-labels {\n    height: 20px;\n    font-size: 16px;\n    color: #666;\n    display: flex;\n    flex-direction: row;\n}\n\n.card .mat-mdc-button-base {\n    text-transform: uppercase;\n    white-space: nowrap;\n    overflow: hidden;\n    text-overflow: ellipsis;\n}\n\n.card .mdc-button__label {\n    pointer-events: none;\n}\n\n.card .action-row {\n    display: flex;\n    flex-direction: row;\n    justify-content: flex-end;\n    padding: 8px 0;\n}\n\n\n@media screen and (min-width: 960px) and (max-width: 1279px) {\n  .card .title {\n      font-size: 12px;\n  }\n  .card .state {\n      font-size: 12px;\n  }\n  .card .unit {\n      font-size: 8px;\n  }\n  .card .bar-labels {\n      font-size: 6px;\n  }\n  .card .mat-mdc-button-base {\n      font-size: 8px;\n  }\n  .card .action-row {\n      padding: 0;\n  }\n}\n\n@media screen and (min-width: 1280px) and (max-width: 1599px) {\n  .card .title {\n      font-size: 14px;\n  }\n  .card .state {\n      font-size: 14px;\n  }\n  .card .unit {\n      font-size: 10px;\n  }\n  .card .bar-labels {\n      font-size: 8px;\n  }\n  .card .mat-mdc-button-base {\n      font-size: 10px;\n  }\n  .card .action-row {\n      padding: 0;\n  }\n}\n\n@media screen and (min-width: 1600px) and (max-width: 1919px) {\n  .card .title {\n      font-size: 16px;\n  }\n  .card .state {\n      font-size: 16px;\n  }\n  .card .unit {\n      font-size: 12px;\n  }\n  .card .bar-labels {\n      font-size: 12px;\n  }\n  .card .mat-mdc-button-base {\n      font-size: 12px;\n  }\n  .card .action-row {\n      padding: 0;\n  }\n}    "
-          },
-          "title": "JavaScript functions",
-          "dropShadow": true,
-          "enableFullscreen": false,
-          "widgetStyle": {
-            "cursor": "default"
-          },
-          "titleStyle": {
-            "fontSize": "20px",
-            "fontWeight": 400
-          },
-          "useDashboardTimewindow": true,
-          "showLegend": false,
-          "actions": {
-            "elementClick": [
-              {
-                "name": "script_functions_details",
-                "icon": "insert_chart",
-                "useShowWidgetActionFunction": null,
-                "showWidgetActionFunction": "return true;",
-                "type": "openDashboardState",
-                "targetDashboardStateId": "script_functions",
-                "setEntityId": false,
-                "stateEntityParamName": null,
-                "openRightLayout": false,
-                "openInSeparateDialog": false,
-                "openInPopover": false,
-                "id": "d4961bea-84de-e1af-e50f-666b98d34cd5"
-              }
-            ]
-          },
-          "showTitleIcon": false,
-          "iconColor": "rgba(0, 0, 0, 0.87)",
-          "iconSize": "24px",
-          "titleTooltip": "",
-          "displayTimewindow": true
-        },
-        "row": 0,
-        "col": 0,
-        "id": "fd6df872-2ddf-0921-3929-2e7f55062fad",
-        "typeFullFqn": "system.cards.html_value_card"
-      },
-      "7e235874-461b-e7c2-2fdd-d8762a020773": {
-        "type": "latest",
-        "sizeX": 7.5,
-        "sizeY": 3,
-        "config": {
-          "datasources": [
-            {
-              "type": "entity",
-              "name": null,
-              "entityAliasId": "40193437-33ac-3172-eefd-0b08eb849062",
-              "filterId": null,
-              "dataKeys": [
-                {
-                  "name": "dbApiState",
-                  "type": "timeseries",
-                  "label": "apiState",
-                  "color": "#2196f3",
-                  "settings": {},
-                  "_hash": 0.8830669138660703,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": true,
-                  "postFuncBody": "return value ? value : 'ENABLED';"
-                },
-                {
-                  "name": "storageDataPointsLimit",
-                  "type": "timeseries",
-                  "label": "limit",
-                  "color": "#4caf50",
-                  "settings": {},
-                  "_hash": 0.5463603803546802,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": null,
-                  "postFuncBody": null
-                },
-                {
-                  "name": "storageDataPointsCount",
-                  "type": "timeseries",
-                  "label": "count",
-                  "color": "#f44336",
-                  "settings": {},
-                  "_hash": 0.5564241862015964,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": null,
-                  "postFuncBody": null
-                },
-                {
-                  "name": "dbApiState",
-                  "type": "timeseries",
-                  "label": "apiStateClass",
-                  "color": "#ffc107",
-                  "settings": {},
-                  "_hash": 0.8737107059960671,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": true,
-                  "postFuncBody": "return value ? value.toLowerCase() : 'enabled';"
-                },
-                {
-                  "name": "dbApiState",
-                  "type": "timeseries",
-                  "label": "cardId",
-                  "color": "#607d8b",
-                  "settings": {},
-                  "_hash": 0.051659774305067296,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": true,
-                  "postFuncBody": "return (Math.random()*100000).toFixed(0);"
-                },
-                {
-                  "name": "dbApiState",
-                  "type": "timeseries",
-                  "label": "title",
-                  "color": "#9c27b0",
-                  "settings": {},
-                  "_hash": 0.6301889725474652,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": true,
-                  "postFuncBody": "return \"{i18n:api-usage.telemetry}\";"
+            "63f99d90-23ab-f8c2-3290-1e693ded5a2e": {
+                "typeFullFqn": "system.time_series_chart",
+                "type": "timeseries",
+                "sizeX": 8,
+                "sizeY": 5,
+                "config": {
+                    "datasources": [
+                        {
+                            "type": "entity",
+                            "name": null,
+                            "entityAliasId": "40193437-33ac-3172-eefd-0b08eb849062",
+                            "filterId": null,
+                            "dataKeys": [
+                                {
+                                    "name": "transportMsgCountHourly",
+                                    "type": "timeseries",
+                                    "label": "{i18n:api-usage.transport-messages}",
+                                    "color": "#2196f3",
+                                    "settings": {
+                                        "excludeFromStacking": false,
+                                        "hideDataByDefault": false,
+                                        "disableDataHiding": false,
+                                        "removeFromLegend": false,
+                                        "showLines": false,
+                                        "fillLines": false,
+                                        "showPoints": false,
+                                        "showPointShape": "circle",
+                                        "pointShapeFormatter": "",
+                                        "showPointsLineWidth": 5,
+                                        "showPointsRadius": 3,
+                                        "showSeparateAxis": false,
+                                        "axisPosition": "left",
+                                        "thresholds": [
+                                            {
+                                                "thresholdValueSource": "predefinedValue"
+                                            }
+                                        ],
+                                        "comparisonSettings": {
+                                            "showValuesForComparison": true
+                                        },
+                                        "type": "bar"
+                                    },
+                                    "_hash": 0.0661644137210089,
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": false,
+                                    "postFuncBody": null,
+                                    "aggregationType": null
+                                },
+                                {
+                                    "name": "transportDataPointsCountHourly",
+                                    "type": "timeseries",
+                                    "label": "{i18n:api-usage.transport-data-points}",
+                                    "color": "#4caf50",
+                                    "settings": {
+                                        "excludeFromStacking": false,
+                                        "hideDataByDefault": false,
+                                        "disableDataHiding": false,
+                                        "removeFromLegend": false,
+                                        "showLines": false,
+                                        "fillLines": false,
+                                        "showPoints": false,
+                                        "showPointShape": "circle",
+                                        "pointShapeFormatter": "",
+                                        "showPointsLineWidth": 5,
+                                        "showPointsRadius": 3,
+                                        "showSeparateAxis": false,
+                                        "axisPosition": "left",
+                                        "thresholds": [
+                                            {
+                                                "thresholdValueSource": "predefinedValue"
+                                            }
+                                        ],
+                                        "comparisonSettings": {
+                                            "showValuesForComparison": true
+                                        },
+                                        "type": "bar"
+                                    },
+                                    "_hash": 0.46849996721308895,
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": null,
+                                    "postFuncBody": null
+                                }
+                            ],
+                            "alarmFilterConfig": {
+                                "statusList": [
+                                    "ACTIVE"
+                                ]
+                            }
+                        }
+                    ],
+                    "timewindow": {
+                        "hideInterval": false,
+                        "hideLastInterval": false,
+                        "hideQuickInterval": false,
+                        "hideAggregation": false,
+                        "hideAggInterval": false,
+                        "hideTimezone": false,
+                        "selectedTab": 0,
+                        "realtime": {
+                            "realtimeType": 0,
+                            "timewindowMs": 86400000,
+                            "quickInterval": "CURRENT_DAY",
+                            "interval": 300000
+                        },
+                        "aggregation": {
+                            "type": "NONE",
+                            "limit": 50000
+                        },
+                        "timezone": null
+                    },
+                    "showTitle": true,
+                    "backgroundColor": "#FFFFFF",
+                    "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": "var rounder = Math.pow(10, 1);\nvar powers = [\n  {key: 'Q', value: Math.pow(10, 15)},\n  {key: 'T', value: Math.pow(10, 12)},\n  {key: 'B', value: Math.pow(10, 9)},\n  {key: 'M', value: Math.pow(10, 6)},\n  {key: 'K', value: 1000}\n];\n\nvar key = '';\n\nfor (var i = 0; i < powers.length; i++) {\n    var reduced = value / powers[i].value;\n    reduced = Math.round(reduced * rounder) / rounder;\n    if (reduced >= 1) {\n        value = reduced;\n        key = powers[i].key;\n        break;\n    }\n}\nreturn value + key;",
+                                "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,
+                                "min": null,
+                                "max": null
+                            }
+                        },
+                        "thresholds": [],
+                        "dataZoom": false,
+                        "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": null,
+                            "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": false,
+                                "relativeWidth": 2,
+                                "absoluteWidth": 3600000
+                            },
+                            "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": "bottom",
+                            "sortDataKeys": false,
+                            "showMin": false,
+                            "showMax": false,
+                            "showAvg": false,
+                            "showTotal": true,
+                            "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)",
+                        "tooltipShowDate": true,
+                        "tooltipDateFormat": {
+                            "format": "yyyy-MM-dd HH:mm:ss",
+                            "lastUpdateAgo": false,
+                            "custom": false
+                        },
+                        "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": 1000,
+                            "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
+                            }
+                        }
+                    },
+                    "title": "{i18n:api-usage.transport-hourly-activity}",
+                    "dropShadow": true,
+                    "enableFullscreen": true,
+                    "titleStyle": null,
+                    "configMode": "basic",
+                    "actions": {
+                        "headerButton": [
+                            {
+                                "name": "{i18n:api-usage.view-details}",
+                                "icon": "insert_chart",
+                                "type": "openDashboardState",
+                                "targetDashboardStateId": "transport",
+                                "setEntityId": false,
+                                "stateEntityParamName": null,
+                                "openRightLayout": false,
+                                "id": "6ef12f6a-0266-25cf-6ca5-5dcb772252c6"
+                            }
+                        ]
+                    },
+                    "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"
                 },
-                {
-                  "name": "dbApiState",
-                  "type": "timeseries",
-                  "label": "unit",
-                  "color": "#8bc34a",
-                  "settings": {},
-                  "_hash": 0.0027742924142306613,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": true,
-                  "postFuncBody": "return \"{i18n:api-usage.data-points-storage-days}\";"
-                }
-              ]
-            }
-          ],
-          "timewindow": {
-            "displayValue": "",
-            "selectedTab": 0,
-            "realtime": {
-              "realtimeType": 1,
-              "interval": 1000,
-              "timewindowMs": 60000,
-              "quickInterval": "CURRENT_DAY"
-            },
-            "history": {
-              "historyType": 0,
-              "interval": 1000,
-              "timewindowMs": 60000,
-              "fixedTimewindow": {
-                "startTimeMs": 1694083375826,
-                "endTimeMs": 1694169775826
-              },
-              "quickInterval": "CURRENT_DAY"
+                "row": 0,
+                "col": 0,
+                "id": "63f99d90-23ab-f8c2-3290-1e693ded5a2e"
             },
-            "aggregation": {
-              "type": "AVG",
-              "limit": 25000
-            }
-          },
-          "showTitle": false,
-          "backgroundColor": "#fff",
-          "color": "#666666",
-          "padding": "0",
-          "settings": {
-            "cardHtml": "<div class='card ${apiStateClass}'>\n    <img src=\"data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7\" onload=\"initializeCard_${cardId:0}(event);\">\n    <script type=\"text/javascript\">\n        function initializeCard_${cardId:0}(e) {\n            \n            function toShortNumber(number) {\n                var rounder = Math.pow(10, 1);\n                var powers = [\n                  {key: 'Q', value: Math.pow(10, 15)},\n                  {key: 'T', value: Math.pow(10, 12)},\n                  {key: 'B', value: Math.pow(10, 9)},\n                  {key: 'M', value: Math.pow(10, 6)},\n                  {key: 'K', value: 1000}\n                ];\n                \n                var key = '';\n                \n                for (var i = 0; i < powers.length; i++) {\n                    var reduced = number / powers[i].value;\n                    reduced = Math.round(reduced * rounder) / rounder;\n                    if (reduced >= 1) {\n                        number = reduced;\n                        key = powers[i].key;\n                        break;\n                    }\n                }\n                return number + key;\n            }\n            \n            var imgTag = e.target;\n            var parentTag = imgTag.parentNode;\n            var count = \"${count:0}\";\n            var limit = \"${limit:0}\";\n            count = count.length > 0 ? parseInt(count, 10) : 0;\n            limit = limit.length > 0 ? parseInt(limit, 10) : 0;\n            var percentElement = $('#api-usage-percent', parentTag);\n            var valueElement = $('#api-usage-value', parentTag);\n            var barElement = $('#api-usage-bar', parentTag);\n            if (Number.isFinite(limit) && limit > 0) {\n                var percent = Math.min(100, ((count / limit) * 100));\n                barElement.width(percent + '%');\n                percent = percent.toFixed(2);\n                percentElement.text(percent + '%');\n                valueElement.text(toShortNumber(count) + ' / ' + toShortNumber(limit));\n            } else {\n                barElement.width('0%');\n                percentElement.text('');\n                valueElement.text(toShortNumber(count) + ' / ∞');\n            }\n        }\n    </script>\n    <div class='content'>\n        <div class='column'>\n            <div class='title-row'>\n                <div class='title'>${title}</div>\n                <div class='state'>${apiState}</div>\n            </div>    \n            <div class='bar-container'>\n                <div class=\"unit\">${unit}</div>\n                <div class='bar'>\n                    <div class=\"bar-fill\" id=\"api-usage-bar\"></div>\n                </div>    \n                <div class='bar-labels'>\n                    <div id=\"api-usage-percent\"></div>\n                    <div style=\"flex: 1;\"></div>\n                    <div id=\"api-usage-value\"></div>\n                </div>\n            </div>    \n        </div>\n    </div>\n    <div role=\"separator\" class=\"mat-divider mat-divider-horizontal\" aria-orientation=\"horizontal\"></div>\n    <div class='action-row'>\n        <button id=\"telemetry_persistence_details\" class=\"mdc-button mat-mdc-button mat-primary mat-mdc-button-base\">\n    <span class=\"mat-mdc-button-persistent-ripple mdc-button__ripple\"></span>\n         <span class=\"mdc-button__label\">{i18n:api-usage.view-details}</span>\n            <span class=\"mat-ripple mat-mdc-button-ripple\"></span>\n      <span class=\"mat-mdc-button-touch-target\"></span>\n       <span class=\"mat-mdc-focus-indicator\"></span>\n        </button>\n    </div> \n</div>",
-            "cardCss": ".card {\n   width: 100%;\n   height: 100%;\n   box-sizing: border-box;\n   display: flex;\n   flex-direction: column;\n}\n\n.card > img {\n    height: 0;\n}\n\n.card .content {\n   flex: 1;    \n   padding: 13px 13px 0;\n   display: flex;\n   box-sizing: border-box;\n}\n\n.card .content .column {\n   display: flex;\n   flex-direction: column;    \n   justify-content: space-around;\n   flex: 1;\n}\n\n.card .content .title-row {\n    display: flex;\n    flex-direction: row;\n    padding-bottom: 10px;\n}\n\n.card .title {\n    flex: 1;\n    font-size: 20px;\n    font-weight: 400;\n    color: #666666;\n}\n\n.card .state {\n    text-transform: uppercase;\n    font-size: 20px;\n    font-weight: bold;\n}\n\n.card.enabled .state {\n    color: #00B260;\n}\n\n.card.warning .state {\n    color: #FFAD6F;\n}\n\n.card.disabled .state {\n    color: #F73243;\n}\n\n.card .bar-container {\n    flex: 1;\n    display: flex;\n    flex-direction: column;\n    justify-content: center;\n}\n\n.card .bar {\n    flex: 1;\n    max-height: 30px;\n    margin-top: 3.5px;\n    margin-bottom: 4px;\n    background-color: #F0F0F0;\n    border: 1px solid #DADCDB;\n    border-radius: 2px;\n    box-shadow: inset 0 1px 3px rgba(0, 0, 0, .2);\n}\n\n.card.enabled .bar {\n    border-color: #00B260;\n    background-color: #F0FBF7;\n}\n\n.card.warning .bar {\n    border-color: #FFAD6F;\n    background-color: #FFFAF6;\n}\n\n.card.disabled .bar {\n    border-color: #F73243;\n    background-color: #FFF0F0;\n}\n\n.card .bar .bar-fill {\n    background-color: #F0F0F0;\n    border-radius: 2px;\n    height: 100%;\n    width: 0%;\n}\n\n.card.enabled .bar-fill {\n    background-color: #00C46C;\n}\n\n.card.warning .bar-fill {\n    background-color: #FFD099;\n}\n\n.card.disabled .bar-fill {\n    background-color: #FF9494;\n}\n\n.card .bar-labels {\n    height: 20px;\n    font-size: 16px;\n    color: #666;\n    display: flex;\n    flex-direction: row;\n}\n\n\n.card .mat-mdc-button-base {\n    text-transform: uppercase;\n    white-space: nowrap;\n    overflow: hidden;\n    text-overflow: ellipsis;\n}\n\n.card .mdc-button__label {\n    pointer-events: none;\n}\n\n.card .action-row {\n    display: flex;\n    flex-direction: row;\n    justify-content: flex-end;\n    padding: 8px 0;\n}\n\n@media screen and (min-width: 960px) and (max-width: 1279px) {\n  .card .title {\n      font-size: 12px;\n  }\n  .card .state {\n      font-size: 12px;\n  }\n  .card .unit {\n      font-size: 8px;\n  }\n  .card .bar-labels {\n      font-size: 8px;\n  }\n  .card .mat-mdc-button-base {\n      font-size: 8px;\n  }\n  .card .action-row {\n      padding: 0;\n  }\n}\n\n@media screen and (min-width: 1280px) and (max-width: 1599px) {\n  .card .title {\n      font-size: 14px;\n  }\n  .card .state {\n      font-size: 14px;\n  }\n  .card .unit {\n      font-size: 10px;\n  }\n  .card .bar-labels {\n      font-size: 10px;\n  }\n  .card .mat-mdc-button-base {\n      font-size: 10px;\n  }\n  .card .action-row {\n      padding: 0;\n  }\n}\n\n@media screen and (min-width: 1600px) and (max-width: 1919px) {\n  .card .title {\n      font-size: 16px;\n  }\n  .card .state {\n      font-size: 16px;\n  }\n  .card .unit {\n      font-size: 12px;\n  }\n  .card .bar-labels {\n      font-size: 12px;\n  }\n  .card .mat-mdc-button-base {\n      font-size: 12px;\n  }\n  .card .action-row {\n      padding: 0;\n  }\n}    \n\n\n"
-          },
-          "title": "Telemetry persistence",
-          "dropShadow": true,
-          "enableFullscreen": false,
-          "widgetStyle": {
-            "cursor": "default"
-          },
-          "titleStyle": {
-            "fontSize": "20px",
-            "fontWeight": 400
-          },
-          "useDashboardTimewindow": true,
-          "showLegend": false,
-          "actions": {
-            "elementClick": [
-              {
-                "name": "telemetry_persistence_details",
-                "icon": "insert_chart",
-                "type": "openDashboardState",
-                "targetDashboardStateId": "telemetry_persistence",
-                "setEntityId": false,
-                "stateEntityParamName": null,
-                "openRightLayout": false,
-                "id": "6248831c-5b3f-8879-8548-afcf43f10610"
-              }
-            ]
-          },
-          "showTitleIcon": false,
-          "iconColor": "rgba(0, 0, 0, 0.87)",
-          "iconSize": "24px",
-          "titleTooltip": ""
-        },
-        "row": 0,
-        "col": 0,
-        "id": "7e235874-461b-e7c2-2fdd-d8762a020773",
-        "typeFullFqn": "system.cards.html_value_card"
-      },
-      "08545554-a0e8-05c7-66df-6000cfeff8a4": {
-        "type": "latest",
-        "sizeX": 7.5,
-        "sizeY": 3,
-        "config": {
-          "datasources": [
-            {
-              "type": "entity",
-              "name": null,
-              "entityAliasId": "40193437-33ac-3172-eefd-0b08eb849062",
-              "filterId": null,
-              "dataKeys": [
-                {
-                  "name": "ruleEngineApiState",
-                  "type": "timeseries",
-                  "label": "apiState",
-                  "color": "#2196f3",
-                  "settings": {},
-                  "_hash": 0.8830669138660703,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": true,
-                  "postFuncBody": "return value ? value : 'ENABLED';"
-                },
-                {
-                  "name": "ruleEngineExecutionLimit",
-                  "type": "timeseries",
-                  "label": "limit",
-                  "color": "#4caf50",
-                  "settings": {},
-                  "_hash": 0.5463603803546802,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": null,
-                  "postFuncBody": null
-                },
-                {
-                  "name": "ruleEngineExecutionCount",
-                  "type": "timeseries",
-                  "label": "count",
-                  "color": "#f44336",
-                  "settings": {},
-                  "_hash": 0.5564241862015964,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": null,
-                  "postFuncBody": null
+            "a2b7e906-2d8a-41a8-99a6-409531bfa743": {
+                "typeFullFqn": "system.time_series_chart",
+                "type": "timeseries",
+                "sizeX": 8,
+                "sizeY": 5,
+                "config": {
+                    "datasources": [
+                        {
+                            "type": "entity",
+                            "name": null,
+                            "entityAliasId": "40193437-33ac-3172-eefd-0b08eb849062",
+                            "filterId": null,
+                            "dataKeys": [
+                                {
+                                    "name": "ruleEngineExecutionCountHourly",
+                                    "type": "timeseries",
+                                    "label": "{i18n:api-usage.rule-engine-executions}",
+                                    "color": "#ab00ff",
+                                    "settings": {
+                                        "showInLegend": true,
+                                        "dataHiddenByDefault": false,
+                                        "type": "bar",
+                                        "lineSettings": {
+                                            "showLine": true,
+                                            "step": false,
+                                            "stepType": "start",
+                                            "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)",
+                                            "pointShape": "emptyCircle",
+                                            "pointSize": 4,
+                                            "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)",
+                                            "backgroundSettings": {
+                                                "type": "none",
+                                                "opacity": 0.4,
+                                                "gradient": {
+                                                    "start": 100,
+                                                    "end": 0
+                                                }
+                                            }
+                                        }
+                                    },
+                                    "_hash": 0.0661644137210089,
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": null,
+                                    "postFuncBody": null,
+                                    "aggregationType": null
+                                }
+                            ],
+                            "alarmFilterConfig": {
+                                "statusList": [
+                                    "ACTIVE"
+                                ]
+                            }
+                        }
+                    ],
+                    "timewindow": {
+                        "hideInterval": false,
+                        "hideLastInterval": false,
+                        "hideQuickInterval": false,
+                        "hideAggregation": false,
+                        "hideAggInterval": false,
+                        "hideTimezone": false,
+                        "selectedTab": 0,
+                        "realtime": {
+                            "realtimeType": 0,
+                            "timewindowMs": 86400000,
+                            "quickInterval": "CURRENT_YEAR",
+                            "interval": 7200000
+                        },
+                        "aggregation": {
+                            "type": "NONE",
+                            "limit": 50000
+                        },
+                        "timezone": null
+                    },
+                    "showTitle": true,
+                    "backgroundColor": "#FFFFFF",
+                    "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": "var rounder = Math.pow(10, 1);\nvar powers = [\n  {key: 'Q', value: Math.pow(10, 15)},\n  {key: 'T', value: Math.pow(10, 12)},\n  {key: 'B', value: Math.pow(10, 9)},\n  {key: 'M', value: Math.pow(10, 6)},\n  {key: 'K', value: 1000}\n];\n\nvar key = '';\n\nfor (var i = 0; i < powers.length; i++) {\n    var reduced = value / powers[i].value;\n    reduced = Math.round(reduced * rounder) / rounder;\n    if (reduced >= 1) {\n        value = reduced;\n        key = powers[i].key;\n        break;\n    }\n}\nreturn value + key;",
+                                "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,
+                                "min": null,
+                                "max": null
+                            }
+                        },
+                        "thresholds": [],
+                        "dataZoom": false,
+                        "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)",
+                            "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": false,
+                                "relativeWidth": 2,
+                                "absoluteWidth": 3600000
+                            },
+                            "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": "bottom",
+                            "sortDataKeys": false,
+                            "showMin": false,
+                            "showMax": false,
+                            "showAvg": false,
+                            "showTotal": true,
+                            "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)",
+                        "tooltipShowDate": true,
+                        "tooltipDateFormat": {
+                            "format": "yyyy-MM-dd HH:mm:ss",
+                            "lastUpdateAgo": false,
+                            "custom": false
+                        },
+                        "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": 1000,
+                            "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
+                            }
+                        }
+                    },
+                    "title": "{i18n:api-usage.rule-engine-hourly-activity}",
+                    "dropShadow": true,
+                    "enableFullscreen": true,
+                    "titleStyle": null,
+                    "configMode": "basic",
+                    "actions": {
+                        "headerButton": [
+                            {
+                                "name": "{i18n:api-usage.view-statistics}",
+                                "icon": "show_chart",
+                                "type": "openDashboardState",
+                                "targetDashboardStateId": "rule_engine_statistics",
+                                "setEntityId": false,
+                                "stateEntityParamName": null,
+                                "openRightLayout": false,
+                                "id": "f9f08190-9ed9-d802-5b7a-c57ff84b5648"
+                            },
+                            {
+                                "name": "{i18n:api-usage.view-details}",
+                                "icon": "insert_chart",
+                                "type": "openDashboardState",
+                                "targetDashboardStateId": "rule_engine_execution",
+                                "setEntityId": false,
+                                "stateEntityParamName": null,
+                                "openRightLayout": false,
+                                "id": "1aec196b-44ba-ddf4-c4dc-c3f60c1eb6fc"
+                            }
+                        ]
+                    },
+                    "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"
                 },
-                {
-                  "name": "ruleEngineApiState",
-                  "type": "timeseries",
-                  "label": "apiStateClass",
-                  "color": "#ffc107",
-                  "settings": {},
-                  "_hash": 0.8737107059960671,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": true,
-                  "postFuncBody": "return value ? value.toLowerCase() : 'enabled';"
+                "row": 0,
+                "col": 0,
+                "id": "a2b7e906-2d8a-41a8-99a6-409531bfa743"
+            },
+            "ca996b66-ab7e-f977-152c-98e4ebf2a901": {
+                "typeFullFqn": "system.time_series_chart",
+                "type": "timeseries",
+                "sizeX": 8,
+                "sizeY": 5,
+                "config": {
+                    "datasources": [
+                        {
+                            "type": "entity",
+                            "name": null,
+                            "entityAliasId": "40193437-33ac-3172-eefd-0b08eb849062",
+                            "filterId": null,
+                            "dataKeys": [
+                                {
+                                    "name": "jsExecutionCountHourly",
+                                    "type": "timeseries",
+                                    "label": "{i18n:api-usage.javascript-executions}",
+                                    "color": "#ff9900",
+                                    "settings": {
+                                        "showInLegend": true,
+                                        "dataHiddenByDefault": false,
+                                        "type": "bar",
+                                        "lineSettings": {
+                                            "showLine": true,
+                                            "step": false,
+                                            "stepType": "start",
+                                            "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)",
+                                            "pointShape": "emptyCircle",
+                                            "pointSize": 4,
+                                            "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)",
+                                            "backgroundSettings": {
+                                                "type": "none",
+                                                "opacity": 0.4,
+                                                "gradient": {
+                                                    "start": 100,
+                                                    "end": 0
+                                                }
+                                            }
+                                        }
+                                    },
+                                    "_hash": 0.0661644137210089,
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": null,
+                                    "postFuncBody": null,
+                                    "aggregationType": null
+                                },
+                                {
+                                    "name": "tbelExecutionCountHourly",
+                                    "type": "timeseries",
+                                    "label": "{i18n:api-usage.tbel-executions}",
+                                    "color": "#4caf50",
+                                    "settings": {
+                                        "showInLegend": true,
+                                        "dataHiddenByDefault": false,
+                                        "type": "bar",
+                                        "lineSettings": {
+                                            "showLine": true,
+                                            "step": false,
+                                            "stepType": "start",
+                                            "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)",
+                                            "pointShape": "emptyCircle",
+                                            "pointSize": 4,
+                                            "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)",
+                                            "backgroundSettings": {
+                                                "type": "none",
+                                                "opacity": 0.4,
+                                                "gradient": {
+                                                    "start": 100,
+                                                    "end": 0
+                                                }
+                                            }
+                                        }
+                                    },
+                                    "_hash": 0.6818645685001823,
+                                    "aggregationType": null,
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": null,
+                                    "postFuncBody": null
+                                }
+                            ],
+                            "alarmFilterConfig": {
+                                "statusList": [
+                                    "ACTIVE"
+                                ]
+                            }
+                        }
+                    ],
+                    "timewindow": {
+                        "hideInterval": false,
+                        "hideLastInterval": false,
+                        "hideQuickInterval": false,
+                        "hideAggregation": false,
+                        "hideAggInterval": false,
+                        "hideTimezone": false,
+                        "selectedTab": 0,
+                        "realtime": {
+                            "realtimeType": 0,
+                            "timewindowMs": 86400000,
+                            "quickInterval": "CURRENT_DAY",
+                            "interval": 3600000
+                        },
+                        "aggregation": {
+                            "type": "NONE",
+                            "limit": 50000
+                        },
+                        "timezone": null
+                    },
+                    "showTitle": true,
+                    "backgroundColor": "#FFFFFF",
+                    "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": "var rounder = Math.pow(10, 1);\nvar powers = [\n  {key: 'Q', value: Math.pow(10, 15)},\n  {key: 'T', value: Math.pow(10, 12)},\n  {key: 'B', value: Math.pow(10, 9)},\n  {key: 'M', value: Math.pow(10, 6)},\n  {key: 'K', value: 1000}\n];\n\nvar key = '';\n\nfor (var i = 0; i < powers.length; i++) {\n    var reduced = value / powers[i].value;\n    reduced = Math.round(reduced * rounder) / rounder;\n    if (reduced >= 1) {\n        value = reduced;\n        key = powers[i].key;\n        break;\n    }\n}\nreturn value + key;",
+                                "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,
+                                "min": null,
+                                "max": null
+                            }
+                        },
+                        "thresholds": [],
+                        "dataZoom": false,
+                        "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)",
+                            "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": false,
+                                "relativeWidth": 2,
+                                "absoluteWidth": 3600000
+                            },
+                            "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": "bottom",
+                            "sortDataKeys": false,
+                            "showMin": false,
+                            "showMax": false,
+                            "showAvg": false,
+                            "showTotal": true,
+                            "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)",
+                        "tooltipShowDate": true,
+                        "tooltipDateFormat": {
+                            "format": "yyyy-MM-dd HH:mm:ss",
+                            "lastUpdateAgo": false,
+                            "custom": false
+                        },
+                        "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": 1000,
+                            "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
+                            }
+                        }
+                    },
+                    "title": "{i18n:api-usage.scripts-hourly-activity}",
+                    "dropShadow": true,
+                    "enableFullscreen": true,
+                    "titleStyle": null,
+                    "configMode": "basic",
+                    "actions": {
+                        "headerButton": [
+                            {
+                                "name": "{i18n:api-usage.view-details}",
+                                "icon": "insert_chart",
+                                "useShowWidgetActionFunction": null,
+                                "showWidgetActionFunction": "return true;",
+                                "type": "openDashboardState",
+                                "targetDashboardStateId": "script_functions",
+                                "setEntityId": false,
+                                "stateEntityParamName": null,
+                                "openRightLayout": false,
+                                "openInSeparateDialog": false,
+                                "openInPopover": false,
+                                "id": "4687d3f6-8800-a3b6-26e5-0d33f3b828a9"
+                            }
+                        ]
+                    },
+                    "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"
                 },
-                {
-                  "name": "ruleEngineApiState",
-                  "type": "timeseries",
-                  "label": "cardId",
-                  "color": "#607d8b",
-                  "settings": {},
-                  "_hash": 0.051659774305067296,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": true,
-                  "postFuncBody": "return (Math.random()*100000).toFixed(0);"
+                "row": 0,
+                "col": 0,
+                "id": "ca996b66-ab7e-f977-152c-98e4ebf2a901"
+            },
+            "a3c2f1bb-7d3a-f11c-7b3d-28cd84fdfe34": {
+                "typeFullFqn": "system.time_series_chart",
+                "type": "timeseries",
+                "sizeX": 8,
+                "sizeY": 5,
+                "config": {
+                    "datasources": [
+                        {
+                            "type": "entity",
+                            "name": null,
+                            "entityAliasId": "40193437-33ac-3172-eefd-0b08eb849062",
+                            "filterId": null,
+                            "dataKeys": [
+                                {
+                                    "name": "storageDataPointsCountHourly",
+                                    "type": "timeseries",
+                                    "label": "{i18n:api-usage.data-points-storage-days}",
+                                    "color": "#1039ee",
+                                    "settings": {
+                                        "showInLegend": true,
+                                        "dataHiddenByDefault": false,
+                                        "type": "bar",
+                                        "lineSettings": {
+                                            "showLine": true,
+                                            "step": false,
+                                            "stepType": "start",
+                                            "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)",
+                                            "pointShape": "emptyCircle",
+                                            "pointSize": 4,
+                                            "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)",
+                                            "backgroundSettings": {
+                                                "type": "none",
+                                                "opacity": 0.4,
+                                                "gradient": {
+                                                    "start": 100,
+                                                    "end": 0
+                                                }
+                                            }
+                                        }
+                                    },
+                                    "_hash": 0.0661644137210089,
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": null,
+                                    "postFuncBody": null,
+                                    "aggregationType": null
+                                }
+                            ],
+                            "alarmFilterConfig": {
+                                "statusList": [
+                                    "ACTIVE"
+                                ]
+                            }
+                        }
+                    ],
+                    "timewindow": {
+                        "hideInterval": false,
+                        "hideLastInterval": false,
+                        "hideQuickInterval": false,
+                        "hideAggregation": false,
+                        "hideAggInterval": false,
+                        "hideTimezone": false,
+                        "selectedTab": 0,
+                        "realtime": {
+                            "realtimeType": 0,
+                            "timewindowMs": 86400000,
+                            "quickInterval": "CURRENT_DAY",
+                            "interval": 300000
+                        },
+                        "aggregation": {
+                            "type": "NONE",
+                            "limit": 50000
+                        },
+                        "timezone": null
+                    },
+                    "showTitle": true,
+                    "backgroundColor": "#FFFFFF",
+                    "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": "var rounder = Math.pow(10, 1);\nvar powers = [\n  {key: 'Q', value: Math.pow(10, 15)},\n  {key: 'T', value: Math.pow(10, 12)},\n  {key: 'B', value: Math.pow(10, 9)},\n  {key: 'M', value: Math.pow(10, 6)},\n  {key: 'K', value: 1000}\n];\n\nvar key = '';\n\nfor (var i = 0; i < powers.length; i++) {\n    var reduced = value / powers[i].value;\n    reduced = Math.round(reduced * rounder) / rounder;\n    if (reduced >= 1) {\n        value = reduced;\n        key = powers[i].key;\n        break;\n    }\n}\nreturn value + key;",
+                                "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,
+                                "min": null,
+                                "max": null
+                            }
+                        },
+                        "thresholds": [],
+                        "dataZoom": false,
+                        "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)",
+                            "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": false,
+                                "relativeWidth": 2,
+                                "absoluteWidth": 3600000
+                            },
+                            "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": "bottom",
+                            "sortDataKeys": false,
+                            "showMin": false,
+                            "showMax": false,
+                            "showAvg": false,
+                            "showTotal": true,
+                            "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)",
+                        "tooltipShowDate": true,
+                        "tooltipDateFormat": {
+                            "format": "yyyy-MM-dd HH:mm:ss",
+                            "lastUpdateAgo": false,
+                            "custom": false
+                        },
+                        "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": 1000,
+                            "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
+                            }
+                        }
+                    },
+                    "title": "{i18n:api-usage.telemetry-persistence-hourly-activity}",
+                    "dropShadow": true,
+                    "enableFullscreen": true,
+                    "titleStyle": null,
+                    "configMode": "basic",
+                    "actions": {
+                        "headerButton": [
+                            {
+                                "name": "{i18n:api-usage.view-details}",
+                                "icon": "insert_chart",
+                                "type": "openDashboardState",
+                                "targetDashboardStateId": "telemetry_persistence",
+                                "setEntityId": false,
+                                "stateEntityParamName": null,
+                                "openRightLayout": false,
+                                "id": "16707efb-e572-bd02-c219-55fc1b0f672a"
+                            }
+                        ]
+                    },
+                    "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"
                 },
-                {
-                  "name": "ruleEngineApiState",
-                  "type": "timeseries",
-                  "label": "title",
-                  "color": "#9c27b0",
-                  "settings": {},
-                  "_hash": 0.3551317421302518,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": true,
-                  "postFuncBody": "return \"{i18n:api-usage.rule-engine}\";"
+                "row": 0,
+                "col": 0,
+                "id": "a3c2f1bb-7d3a-f11c-7b3d-28cd84fdfe34"
+            },
+            "5cebd4f1-ff6e-62f9-025c-8e7583c3d66a": {
+                "typeFullFqn": "system.time_series_chart",
+                "type": "timeseries",
+                "sizeX": 8,
+                "sizeY": 5,
+                "config": {
+                    "datasources": [
+                        {
+                            "type": "entity",
+                            "name": null,
+                            "entityAliasId": "40193437-33ac-3172-eefd-0b08eb849062",
+                            "filterId": null,
+                            "dataKeys": [
+                                {
+                                    "name": "createdAlarmsCountHourly",
+                                    "type": "timeseries",
+                                    "label": "{i18n:api-usage.alarms-created}",
+                                    "color": "#d35a00",
+                                    "settings": {
+                                        "showInLegend": true,
+                                        "dataHiddenByDefault": false,
+                                        "type": "bar",
+                                        "lineSettings": {
+                                            "showLine": true,
+                                            "step": false,
+                                            "stepType": "start",
+                                            "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)",
+                                            "pointShape": "emptyCircle",
+                                            "pointSize": 4,
+                                            "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)",
+                                            "backgroundSettings": {
+                                                "type": "none",
+                                                "opacity": 0.4,
+                                                "gradient": {
+                                                    "start": 100,
+                                                    "end": 0
+                                                }
+                                            }
+                                        }
+                                    },
+                                    "_hash": 0.0661644137210089,
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": null,
+                                    "postFuncBody": null,
+                                    "aggregationType": null
+                                }
+                            ],
+                            "alarmFilterConfig": {
+                                "statusList": [
+                                    "ACTIVE"
+                                ]
+                            }
+                        }
+                    ],
+                    "timewindow": {
+                        "hideInterval": false,
+                        "hideLastInterval": false,
+                        "hideQuickInterval": false,
+                        "hideAggregation": false,
+                        "hideAggInterval": false,
+                        "hideTimezone": false,
+                        "selectedTab": 0,
+                        "realtime": {
+                            "realtimeType": 0,
+                            "timewindowMs": 86400000,
+                            "quickInterval": "CURRENT_DAY",
+                            "interval": 300000
+                        },
+                        "aggregation": {
+                            "type": "NONE",
+                            "limit": 50000
+                        },
+                        "timezone": null
+                    },
+                    "showTitle": true,
+                    "backgroundColor": "#FFFFFF",
+                    "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": "var rounder = Math.pow(10, 1);\nvar powers = [\n  {key: 'Q', value: Math.pow(10, 15)},\n  {key: 'T', value: Math.pow(10, 12)},\n  {key: 'B', value: Math.pow(10, 9)},\n  {key: 'M', value: Math.pow(10, 6)},\n  {key: 'K', value: 1000}\n];\n\nvar key = '';\n\nfor (var i = 0; i < powers.length; i++) {\n    var reduced = value / powers[i].value;\n    reduced = Math.round(reduced * rounder) / rounder;\n    if (reduced >= 1) {\n        value = reduced;\n        key = powers[i].key;\n        break;\n    }\n}\nreturn value + key;",
+                                "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,
+                                "min": null,
+                                "max": null
+                            }
+                        },
+                        "thresholds": [],
+                        "dataZoom": false,
+                        "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)",
+                            "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": false,
+                                "relativeWidth": 2,
+                                "absoluteWidth": 3600000
+                            },
+                            "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": "bottom",
+                            "sortDataKeys": false,
+                            "showMin": false,
+                            "showMax": false,
+                            "showAvg": false,
+                            "showTotal": true,
+                            "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)",
+                        "tooltipShowDate": true,
+                        "tooltipDateFormat": {
+                            "format": "yyyy-MM-dd HH:mm:ss",
+                            "lastUpdateAgo": false,
+                            "custom": false
+                        },
+                        "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": 1000,
+                            "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
+                            }
+                        }
+                    },
+                    "title": "{i18n:api-usage.alarms-created-hourly-activity}",
+                    "dropShadow": true,
+                    "enableFullscreen": true,
+                    "titleStyle": null,
+                    "configMode": "basic",
+                    "actions": {
+                        "headerButton": [
+                            {
+                                "name": "{i18n:api-usage.view-details}",
+                                "icon": "insert_chart",
+                                "type": "openDashboardState",
+                                "targetDashboardStateId": "alarms_created",
+                                "setEntityId": false,
+                                "stateEntityParamName": null,
+                                "openInSeparateDialog": null,
+                                "dialogTitle": null,
+                                "dialogHideDashboardToolbar": true,
+                                "dialogWidth": null,
+                                "dialogHeight": null,
+                                "openRightLayout": false,
+                                "id": "371882f9-ea23-3abc-fca8-9449c5dfdd6b"
+                            }
+                        ]
+                    },
+                    "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"
                 },
-                {
-                  "name": "ruleEngineApiState",
-                  "type": "timeseries",
-                  "label": "unit",
-                  "color": "#8bc34a",
-                  "settings": {},
-                  "_hash": 0.5100381746798048,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": true,
-                  "postFuncBody": "return \"{i18n:api-usage.executions}\";"
-                }
-              ]
-            }
-          ],
-          "timewindow": {
-            "displayValue": "",
-            "selectedTab": 0,
-            "realtime": {
-              "realtimeType": 1,
-              "interval": 1000,
-              "timewindowMs": 60000,
-              "quickInterval": "CURRENT_DAY"
+                "row": 0,
+                "col": 0,
+                "id": "5cebd4f1-ff6e-62f9-025c-8e7583c3d66a"
             },
-            "history": {
-              "historyType": 0,
-              "interval": 1000,
-              "timewindowMs": 60000,
-              "fixedTimewindow": {
-                "startTimeMs": 1694083375826,
-                "endTimeMs": 1694169775826
-              },
-              "quickInterval": "CURRENT_DAY"
+            "bc0c8840-a9b5-5583-de7b-9e9450f5d8fe": {
+                "typeFullFqn": "system.time_series_chart",
+                "type": "timeseries",
+                "sizeX": 8,
+                "sizeY": 5,
+                "config": {
+                    "datasources": [
+                        {
+                            "type": "entity",
+                            "name": null,
+                            "entityAliasId": "40193437-33ac-3172-eefd-0b08eb849062",
+                            "filterId": null,
+                            "dataKeys": [
+                                {
+                                    "name": "emailCountHourly",
+                                    "type": "timeseries",
+                                    "label": "{i18n:api-usage.email-messages}",
+                                    "color": "#4caf50",
+                                    "settings": {
+                                        "showInLegend": true,
+                                        "dataHiddenByDefault": false,
+                                        "type": "bar",
+                                        "lineSettings": {
+                                            "showLine": true,
+                                            "step": false,
+                                            "stepType": "start",
+                                            "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)",
+                                            "pointShape": "emptyCircle",
+                                            "pointSize": 4,
+                                            "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)",
+                                            "backgroundSettings": {
+                                                "type": "none",
+                                                "opacity": 0.4,
+                                                "gradient": {
+                                                    "start": 100,
+                                                    "end": 0
+                                                }
+                                            }
+                                        }
+                                    },
+                                    "_hash": 0.1348755140779876,
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": null,
+                                    "postFuncBody": null,
+                                    "aggregationType": null
+                                },
+                                {
+                                    "name": "smsCountHourly",
+                                    "type": "timeseries",
+                                    "label": "{i18n:api-usage.sms-messages}",
+                                    "color": "#f36021",
+                                    "settings": {
+                                        "showInLegend": true,
+                                        "dataHiddenByDefault": false,
+                                        "type": "bar",
+                                        "lineSettings": {
+                                            "showLine": true,
+                                            "step": false,
+                                            "stepType": "start",
+                                            "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)",
+                                            "pointShape": "emptyCircle",
+                                            "pointSize": 4,
+                                            "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)",
+                                            "backgroundSettings": {
+                                                "type": "none",
+                                                "opacity": 0.4,
+                                                "gradient": {
+                                                    "start": 100,
+                                                    "end": 0
+                                                }
+                                            }
+                                        }
+                                    },
+                                    "_hash": 0.0661644137210089,
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": null,
+                                    "postFuncBody": null,
+                                    "aggregationType": null
+                                }
+                            ],
+                            "alarmFilterConfig": {
+                                "statusList": [
+                                    "ACTIVE"
+                                ]
+                            }
+                        }
+                    ],
+                    "timewindow": {
+                        "hideInterval": false,
+                        "hideLastInterval": false,
+                        "hideQuickInterval": false,
+                        "hideAggregation": false,
+                        "hideAggInterval": false,
+                        "hideTimezone": false,
+                        "selectedTab": 0,
+                        "realtime": {
+                            "realtimeType": 0,
+                            "timewindowMs": 86400000,
+                            "quickInterval": "CURRENT_DAY",
+                            "interval": 300000
+                        },
+                        "aggregation": {
+                            "type": "NONE",
+                            "limit": 50000
+                        },
+                        "timezone": null
+                    },
+                    "showTitle": true,
+                    "backgroundColor": "#FFFFFF",
+                    "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": "var rounder = Math.pow(10, 1);\nvar powers = [\n  {key: 'Q', value: Math.pow(10, 15)},\n  {key: 'T', value: Math.pow(10, 12)},\n  {key: 'B', value: Math.pow(10, 9)},\n  {key: 'M', value: Math.pow(10, 6)},\n  {key: 'K', value: 1000}\n];\n\nvar key = '';\n\nfor (var i = 0; i < powers.length; i++) {\n    var reduced = value / powers[i].value;\n    reduced = Math.round(reduced * rounder) / rounder;\n    if (reduced >= 1) {\n        value = reduced;\n        key = powers[i].key;\n        break;\n    }\n}\nreturn value + key;",
+                                "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,
+                                "min": null,
+                                "max": null
+                            }
+                        },
+                        "thresholds": [],
+                        "dataZoom": false,
+                        "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)",
+                            "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": false,
+                                "relativeWidth": 2,
+                                "absoluteWidth": 3600000
+                            },
+                            "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": "bottom",
+                            "sortDataKeys": false,
+                            "showMin": false,
+                            "showMax": false,
+                            "showAvg": false,
+                            "showTotal": true,
+                            "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)",
+                        "tooltipShowDate": true,
+                        "tooltipDateFormat": {
+                            "format": "yyyy-MM-dd HH:mm:ss",
+                            "lastUpdateAgo": false,
+                            "custom": false
+                        },
+                        "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": 1000,
+                            "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
+                            }
+                        }
+                    },
+                    "title": "{i18n:api-usage.notifications-hourly-activity}",
+                    "dropShadow": true,
+                    "enableFullscreen": true,
+                    "titleStyle": null,
+                    "configMode": "basic",
+                    "actions": {
+                        "headerButton": [
+                            {
+                                "name": "{i18n:api-usage.view-details}",
+                                "icon": "insert_chart",
+                                "type": "openDashboardState",
+                                "targetDashboardStateId": "notifications",
+                                "setEntityId": false,
+                                "stateEntityParamName": null,
+                                "openInSeparateDialog": null,
+                                "dialogTitle": null,
+                                "dialogHideDashboardToolbar": true,
+                                "dialogWidth": null,
+                                "dialogHeight": null,
+                                "openRightLayout": false,
+                                "id": "49aefac0-ec5e-d6f3-f39c-8744759f4b19"
+                            }
+                        ]
+                    },
+                    "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"
+                },
+                "row": 0,
+                "col": 0,
+                "id": "bc0c8840-a9b5-5583-de7b-9e9450f5d8fe"
             },
-            "aggregation": {
-              "type": "AVG",
-              "limit": 25000
-            }
-          },
-          "showTitle": false,
-          "backgroundColor": "#fff",
-          "color": "#666666",
-          "padding": "0",
-          "settings": {
-            "cardCss": ".card {\n   width: 100%;\n   height: 100%;\n   box-sizing: border-box;\n   display: flex;\n   flex-direction: column;\n}\n\n.card > img {\n    height: 0;\n}\n\n.card .content {\n   flex: 1;    \n   padding: 13px 13px 0;\n   display: flex;\n   box-sizing: border-box;\n}\n\n.card .content .column {\n   display: flex;\n   flex-direction: column;    \n   justify-content: space-around;\n   flex: 1;\n}\n\n.card .content .title-row {\n    display: flex;\n    flex-direction: row;\n    padding-bottom: 10px;\n}\n\n.card .title {\n    flex: 1;\n    font-size: 20px;\n    font-weight: 400;\n    color: #666666;\n}\n\n.card .state {\n    text-transform: uppercase;\n    font-size: 20px;\n    font-weight: bold;\n}\n\n.card.enabled .state {\n    color: #00B260;\n}\n\n.card.warning .state {\n    color: #FFAD6F;\n}\n\n.card.disabled .state {\n    color: #F73243;\n}\n\n.card .bar-container {\n    flex: 1;\n    display: flex;\n    flex-direction: column;\n    justify-content: center;\n}\n\n.card .bar {\n    flex: 1;\n    max-height: 30px;\n    margin-top: 3.5px;\n    margin-bottom: 4px;\n    background-color: #F0F0F0;\n    border: 1px solid #DADCDB;\n    border-radius: 2px;\n    box-shadow: inset 0 1px 3px rgba(0, 0, 0, .2);\n}\n\n.card.enabled .bar {\n    border-color: #00B260;\n    background-color: #F0FBF7;\n}\n\n.card.warning .bar {\n    border-color: #FFAD6F;\n    background-color: #FFFAF6;\n}\n\n.card.disabled .bar {\n    border-color: #F73243;\n    background-color: #FFF0F0;\n}\n\n.card .bar .bar-fill {\n    background-color: #F0F0F0;\n    border-radius: 2px;\n    height: 100%;\n    width: 0%;\n}\n\n.card.enabled .bar-fill {\n    background-color: #00C46C;\n}\n\n.card.warning .bar-fill {\n    background-color: #FFD099;\n}\n\n.card.disabled .bar-fill {\n    background-color: #FF9494;\n}\n\n.card .bar-labels {\n    height: 20px;\n    font-size: 16px;\n    color: #666;\n    display: flex;\n    flex-direction: row;\n}\n\n\n.card .mat-mdc-button-base {\n    text-transform: uppercase;\n    white-space: nowrap;\n    overflow: hidden;\n    text-overflow: ellipsis;\n}\n\n.card .mdc-button__label {\n    pointer-events: none;\n}\n\n.card .action-row {\n    display: flex;\n    flex-direction: row;\n    justify-content: flex-end;\n    padding: 8px 0;\n}\n\n@media screen and (min-width: 960px) and (max-width: 1279px) {\n  .card .title {\n      font-size: 12px;\n  }\n  .card .state {\n      font-size: 12px;\n  }\n  .card .unit {\n      font-size: 8px;\n  }\n  .card .bar-labels {\n      font-size: 8px;\n  }\n  .card .mat-mdc-button-base {\n      font-size: 8px;\n  }\n  .card .action-row {\n      padding: 0;\n  }\n}\n\n@media screen and (min-width: 1280px) and (max-width: 1599px) {\n  .card .title {\n      font-size: 14px;\n  }\n  .card .state {\n      font-size: 14px;\n  }\n  .card .unit {\n      font-size: 10px;\n  }\n  .card .bar-labels {\n      font-size: 10px;\n  }\n  .card .mat-mdc-button-base {\n      font-size: 10px;\n  }\n  .card .action-row {\n      padding: 0;\n  }\n}\n\n@media screen and (min-width: 1600px) and (max-width: 1919px) {\n  .card .title {\n      font-size: 16px;\n  }\n  .card .state {\n      font-size: 16px;\n  }\n  .card .unit {\n      font-size: 12px;\n  }\n  .card .bar-labels {\n      font-size: 12px;\n  }\n  .card .mat-mdc-button-base {\n      font-size: 12px;\n  }\n  .card .action-row {\n      padding: 0;\n  }\n}    \n\n\n",
-            "cardHtml": "<div class='card ${apiStateClass}'>\n    <img src=\"data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7\" onload=\"initializeCard_${cardId:0}(event);\">\n    <script type=\"text/javascript\">\n        function initializeCard_${cardId:0}(e) {\n            \n            function toShortNumber(number) {\n                var rounder = Math.pow(10, 1);\n                var powers = [\n                  {key: 'Q', value: Math.pow(10, 15)},\n                  {key: 'T', value: Math.pow(10, 12)},\n                  {key: 'B', value: Math.pow(10, 9)},\n                  {key: 'M', value: Math.pow(10, 6)},\n                  {key: 'K', value: 1000}\n                ];\n                \n                var key = '';\n                \n                for (var i = 0; i < powers.length; i++) {\n                    var reduced = number / powers[i].value;\n                    reduced = Math.round(reduced * rounder) / rounder;\n                    if (reduced >= 1) {\n                        number = reduced;\n                        key = powers[i].key;\n                        break;\n                    }\n                }\n                return number + key;\n            }\n            \n            var imgTag = e.target;\n            var parentTag = imgTag.parentNode;\n            var count = \"${count:0}\";\n            var limit = \"${limit:0}\";\n            count = count.length > 0 ? parseInt(count, 10) : 0;\n            limit = limit.length > 0 ? parseInt(limit, 10) : 0;\n            var percentElement = $('#api-usage-percent', parentTag);\n            var valueElement = $('#api-usage-value', parentTag);\n            var barElement = $('#api-usage-bar', parentTag);\n            if (Number.isFinite(limit) && limit > 0) {\n                var percent = Math.min(100, ((count / limit) * 100));\n                barElement.width(percent + '%');\n                percent = percent.toFixed(2);\n                percentElement.text(percent + '%');\n                valueElement.text(toShortNumber(count) + ' / ' + toShortNumber(limit));\n            } else {\n                barElement.width('0%');\n                percentElement.text('');\n                valueElement.text(toShortNumber(count) + ' / ∞');\n            }\n        }\n    </script>\n    <div class='content'>\n        <div class='column'>\n            <div class='title-row'>\n                <div class='title'>${title}</div>\n                <div class='state'>${apiState}</div>\n            </div>    \n            <div class='bar-container'>\n                <div class=\"unit\">${unit}</div>\n                <div class='bar'>\n                    <div class=\"bar-fill\" id=\"api-usage-bar\"></div>\n                </div>    \n                <div class='bar-labels'>\n                    <div id=\"api-usage-percent\"></div>\n                    <div style=\"flex: 1;\"></div>\n                    <div id=\"api-usage-value\"></div>\n                </div>\n            </div>    \n        </div>\n    </div>\n    <div role=\"separator\" class=\"mat-divider mat-divider-horizontal\" aria-orientation=\"horizontal\"></div>\n    <div class='action-row'>\n        <button id=\"rule_engine_statistics_details\" class=\"mdc-button mat-mdc-button mat-primary mat-mdc-button-base\">\n    <span class=\"mat-mdc-button-persistent-ripple mdc-button__ripple\"></span>\n         <span class=\"mdc-button__label\">{i18n:api-usage.view-statistics}</span>\n            <span class=\"mat-ripple mat-mdc-button-ripple\"></span>\n      <span class=\"mat-mdc-button-touch-target\"></span>\n       <span class=\"mat-mdc-focus-indicator\"></span>\n        </button>\n        <button id=\"rule_engine_execution_details\" class=\"mdc-button mat-mdc-button mat-primary mat-mdc-button-base\">\n   <span class=\"mat-mdc-button-persistent-ripple mdc-button__ripple\"></span>\n          <span class=\"mdc-button__label\">{i18n:api-usage.view-details}</span>\n            <span class=\"mat-ripple mat-mdc-button-ripple\"></span>\n     <span class=\"mat-mdc-button-touch-target\"></span>\n        <span class=\"mat-mdc-focus-indicator\"></span>\n        </button>\n    </div> \n</div>"
-          },
-          "title": "Rule Engine execution",
-          "dropShadow": true,
-          "enableFullscreen": false,
-          "widgetStyle": {
-            "cursor": "default"
-          },
-          "titleStyle": {
-            "fontSize": "20px",
-            "fontWeight": 400
-          },
-          "useDashboardTimewindow": true,
-          "showLegend": false,
-          "actions": {
-            "elementClick": [
-              {
-                "name": "rule_engine_execution_details",
-                "icon": "insert_chart",
-                "type": "openDashboardState",
-                "targetDashboardStateId": "rule_engine_execution",
-                "setEntityId": false,
-                "stateEntityParamName": null,
-                "openRightLayout": false,
-                "id": "3c30248f-0cd8-fb97-a917-bc1e09984a79"
-              },
-              {
-                "name": "rule_engine_statistics_details",
-                "icon": "show_chart",
-                "type": "openDashboardState",
-                "targetDashboardStateId": "rule_engine_statistics",
-                "setEntityId": false,
-                "stateEntityParamName": null,
-                "openRightLayout": false,
-                "id": "04e4565a-9e24-23df-f376-f2ec70a8165f"
-              }
-            ]
-          },
-          "showTitleIcon": false,
-          "iconColor": "rgba(0, 0, 0, 0.87)",
-          "iconSize": "24px",
-          "titleTooltip": ""
-        },
-        "row": 0,
-        "col": 0,
-        "id": "08545554-a0e8-05c7-66df-6000cfeff8a4",
-        "typeFullFqn": "system.cards.html_value_card"
-      },
-      "a245c67e-53ec-d299-fa89-69fe2062ccb2": {
-        "type": "latest",
-        "sizeX": 7.5,
-        "sizeY": 3,
-        "config": {
-          "datasources": [
-            {
-              "type": "entity",
-              "name": null,
-              "entityAliasId": "40193437-33ac-3172-eefd-0b08eb849062",
-              "filterId": null,
-              "dataKeys": [
-                {
-                  "name": "transportApiState",
-                  "type": "timeseries",
-                  "label": "apiState",
-                  "color": "#2196f3",
-                  "settings": {},
-                  "_hash": 0.8830669138660703,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": true,
-                  "postFuncBody": "return value ? value : 'ENABLED';"
+            "0b091dc3-eec3-847e-d0ad-fdf12d474e7a": {
+                "typeFullFqn": "system.time_series_chart",
+                "type": "timeseries",
+                "sizeX": 8,
+                "sizeY": 5,
+                "config": {
+                    "datasources": [
+                        {
+                            "type": "entity",
+                            "name": null,
+                            "entityAliasId": "40193437-33ac-3172-eefd-0b08eb849062",
+                            "filterId": null,
+                            "dataKeys": [
+                                {
+                                    "name": "transportMsgCountHourly",
+                                    "type": "timeseries",
+                                    "label": "{i18n:api-usage.transport-messages}",
+                                    "color": "#2196f3",
+                                    "settings": {
+                                        "excludeFromStacking": false,
+                                        "hideDataByDefault": false,
+                                        "disableDataHiding": false,
+                                        "removeFromLegend": false,
+                                        "showLines": false,
+                                        "fillLines": false,
+                                        "showPoints": false,
+                                        "showPointShape": "circle",
+                                        "pointShapeFormatter": "",
+                                        "showPointsLineWidth": 5,
+                                        "showPointsRadius": 3,
+                                        "showSeparateAxis": false,
+                                        "axisPosition": "left",
+                                        "thresholds": [
+                                            {
+                                                "thresholdValueSource": "predefinedValue"
+                                            }
+                                        ],
+                                        "comparisonSettings": {
+                                            "showValuesForComparison": true
+                                        },
+                                        "type": "bar"
+                                    },
+                                    "_hash": 0.0661644137210089,
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": null,
+                                    "postFuncBody": null
+                                },
+                                {
+                                    "name": "transportDataPointsCountHourly",
+                                    "type": "timeseries",
+                                    "label": "{i18n:api-usage.transport-data-points}",
+                                    "color": "#4caf50",
+                                    "settings": {
+                                        "excludeFromStacking": false,
+                                        "hideDataByDefault": false,
+                                        "disableDataHiding": false,
+                                        "removeFromLegend": false,
+                                        "showLines": false,
+                                        "fillLines": false,
+                                        "showPoints": false,
+                                        "showPointShape": "circle",
+                                        "pointShapeFormatter": "",
+                                        "showPointsLineWidth": 5,
+                                        "showPointsRadius": 3,
+                                        "showSeparateAxis": false,
+                                        "axisPosition": "left",
+                                        "thresholds": [
+                                            {
+                                                "thresholdValueSource": "predefinedValue"
+                                            }
+                                        ],
+                                        "comparisonSettings": {
+                                            "showValuesForComparison": true
+                                        },
+                                        "type": "bar"
+                                    },
+                                    "_hash": 0.46849996721308895,
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": null,
+                                    "postFuncBody": null
+                                }
+                            ]
+                        }
+                    ],
+                    "timewindow": {
+                        "hideInterval": false,
+                        "hideLastInterval": false,
+                        "hideQuickInterval": false,
+                        "hideAggregation": false,
+                        "hideAggInterval": false,
+                        "hideTimezone": false,
+                        "selectedTab": 1,
+                        "history": {
+                            "historyType": 0,
+                            "timewindowMs": 2592000000,
+                            "interval": 86400000,
+                            "fixedTimewindow": {
+                                "startTimeMs": 1709729389667,
+                                "endTimeMs": 1709815789667
+                            },
+                            "quickInterval": "CURRENT_DAY"
+                        },
+                        "aggregation": {
+                            "type": "SUM",
+                            "limit": 25000
+                        },
+                        "timezone": null
+                    },
+                    "showTitle": true,
+                    "backgroundColor": "#FFFFFF",
+                    "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": "var rounder = Math.pow(10, 1);\nvar powers = [\n  {key: 'Q', value: Math.pow(10, 15)},\n  {key: 'T', value: Math.pow(10, 12)},\n  {key: 'B', value: Math.pow(10, 9)},\n  {key: 'M', value: Math.pow(10, 6)},\n  {key: 'K', value: 1000}\n];\n\nvar key = '';\n\nfor (var i = 0; i < powers.length; i++) {\n    var reduced = value / powers[i].value;\n    reduced = Math.round(reduced * rounder) / rounder;\n    if (reduced >= 1) {\n        value = reduced;\n        key = powers[i].key;\n        break;\n    }\n}\nreturn value + key;",
+                                "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,
+                                "min": null,
+                                "max": null
+                            }
+                        },
+                        "thresholds": [],
+                        "dataZoom": false,
+                        "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)",
+                            "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": false,
+                                "relativeWidth": 2,
+                                "absoluteWidth": 1800000
+                            },
+                            "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": "bottom",
+                            "sortDataKeys": false,
+                            "showMin": false,
+                            "showMax": false,
+                            "showAvg": false,
+                            "showTotal": true,
+                            "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)",
+                        "tooltipShowDate": true,
+                        "tooltipDateFormat": {
+                            "format": "yyyy-MM-dd HH:mm:ss",
+                            "lastUpdateAgo": false,
+                            "custom": false
+                        },
+                        "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": 1000,
+                            "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
+                            }
+                        }
+                    },
+                    "title": "{i18n:api-usage.transport-daily-activity}",
+                    "dropShadow": true,
+                    "enableFullscreen": true,
+                    "titleStyle": 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"
                 },
-                {
-                  "name": "transportMsgLimit",
-                  "type": "timeseries",
-                  "label": "limit",
-                  "color": "#4caf50",
-                  "settings": {},
-                  "_hash": 0.5463603803546802,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": null,
-                  "postFuncBody": null
+                "row": 0,
+                "col": 0,
+                "id": "0b091dc3-eec3-847e-d0ad-fdf12d474e7a"
+            },
+            "536d7104-49f8-fde6-5827-61b8419f15ec": {
+                "typeFullFqn": "system.time_series_chart",
+                "type": "timeseries",
+                "sizeX": 8,
+                "sizeY": 5,
+                "config": {
+                    "datasources": [
+                        {
+                            "type": "entity",
+                            "name": null,
+                            "entityAliasId": "40193437-33ac-3172-eefd-0b08eb849062",
+                            "filterId": null,
+                            "dataKeys": [
+                                {
+                                    "name": "transportMsgCount",
+                                    "type": "timeseries",
+                                    "label": "{i18n:api-usage.transport-messages}",
+                                    "color": "#2196f3",
+                                    "settings": {
+                                        "excludeFromStacking": false,
+                                        "hideDataByDefault": false,
+                                        "disableDataHiding": false,
+                                        "removeFromLegend": false,
+                                        "showLines": false,
+                                        "fillLines": false,
+                                        "showPoints": false,
+                                        "showPointShape": "circle",
+                                        "pointShapeFormatter": "",
+                                        "showPointsLineWidth": 5,
+                                        "showPointsRadius": 3,
+                                        "showSeparateAxis": false,
+                                        "axisPosition": "left",
+                                        "thresholds": [
+                                            {
+                                                "thresholdValueSource": "predefinedValue"
+                                            }
+                                        ],
+                                        "comparisonSettings": {
+                                            "showValuesForComparison": true
+                                        },
+                                        "type": "bar"
+                                    },
+                                    "_hash": 0.0661644137210089,
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": null,
+                                    "postFuncBody": null,
+                                    "aggregationType": null
+                                },
+                                {
+                                    "name": "transportDataPointsCount",
+                                    "type": "timeseries",
+                                    "label": "{i18n:api-usage.transport-data-points}",
+                                    "color": "#4caf50",
+                                    "settings": {
+                                        "excludeFromStacking": false,
+                                        "hideDataByDefault": false,
+                                        "disableDataHiding": false,
+                                        "removeFromLegend": false,
+                                        "showLines": false,
+                                        "fillLines": false,
+                                        "showPoints": false,
+                                        "showPointShape": "circle",
+                                        "pointShapeFormatter": "",
+                                        "showPointsLineWidth": 5,
+                                        "showPointsRadius": 3,
+                                        "showSeparateAxis": false,
+                                        "axisPosition": "left",
+                                        "thresholds": [
+                                            {
+                                                "thresholdValueSource": "predefinedValue"
+                                            }
+                                        ],
+                                        "comparisonSettings": {
+                                            "showValuesForComparison": true
+                                        },
+                                        "type": "bar"
+                                    },
+                                    "_hash": 0.46849996721308895,
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": null,
+                                    "postFuncBody": null,
+                                    "aggregationType": null
+                                }
+                            ],
+                            "alarmFilterConfig": {
+                                "statusList": [
+                                    "ACTIVE"
+                                ]
+                            }
+                        }
+                    ],
+                    "timewindow": {
+                        "hideInterval": false,
+                        "hideLastInterval": false,
+                        "hideQuickInterval": false,
+                        "hideAggregation": false,
+                        "hideAggInterval": false,
+                        "hideTimezone": false,
+                        "selectedTab": 1,
+                        "history": {
+                            "historyType": 0,
+                            "timewindowMs": 31536000000,
+                            "interval": 86400000,
+                            "fixedTimewindow": {
+                                "startTimeMs": 1709729389667,
+                                "endTimeMs": 1709815789667
+                            },
+                            "quickInterval": "CURRENT_DAY"
+                        },
+                        "aggregation": {
+                            "type": "NONE",
+                            "limit": 1000
+                        },
+                        "timezone": null
+                    },
+                    "showTitle": true,
+                    "backgroundColor": "#FFFFFF",
+                    "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": "var rounder = Math.pow(10, 1);\nvar powers = [\n  {key: 'Q', value: Math.pow(10, 15)},\n  {key: 'T', value: Math.pow(10, 12)},\n  {key: 'B', value: Math.pow(10, 9)},\n  {key: 'M', value: Math.pow(10, 6)},\n  {key: 'K', value: 1000}\n];\n\nvar key = '';\n\nfor (var i = 0; i < powers.length; i++) {\n    var reduced = value / powers[i].value;\n    reduced = Math.round(reduced * rounder) / rounder;\n    if (reduced >= 1) {\n        value = reduced;\n        key = powers[i].key;\n        break;\n    }\n}\nreturn value + key;",
+                                "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,
+                                "min": null,
+                                "max": null
+                            }
+                        },
+                        "thresholds": [],
+                        "dataZoom": false,
+                        "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)",
+                            "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": 6,
+                                "absoluteWidth": 900000000
+                            },
+                            "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": "bottom",
+                            "sortDataKeys": false,
+                            "showMin": false,
+                            "showMax": false,
+                            "showAvg": false,
+                            "showTotal": true,
+                            "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)",
+                        "tooltipShowDate": true,
+                        "tooltipDateFormat": {
+                            "format": "yyyy-MM-dd HH:mm:ss",
+                            "lastUpdateAgo": false,
+                            "custom": false
+                        },
+                        "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": 1000,
+                            "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
+                            }
+                        }
+                    },
+                    "title": "{i18n:api-usage.transport-daily-activity}",
+                    "dropShadow": true,
+                    "enableFullscreen": true,
+                    "titleStyle": 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"
                 },
-                {
-                  "name": "transportMsgCount",
-                  "type": "timeseries",
-                  "label": "count",
-                  "color": "#f44336",
-                  "settings": {},
-                  "_hash": 0.5564241862015964,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": null,
-                  "postFuncBody": null
+                "row": 0,
+                "col": 0,
+                "id": "536d7104-49f8-fde6-5827-61b8419f15ec"
+            },
+            "c77e417c-ad9d-8e23-3ea1-c75edd653bc0": {
+                "typeFullFqn": "system.time_series_chart",
+                "type": "timeseries",
+                "sizeX": 8,
+                "sizeY": 5,
+                "config": {
+                    "datasources": [
+                        {
+                            "type": "entity",
+                            "name": null,
+                            "entityAliasId": "40193437-33ac-3172-eefd-0b08eb849062",
+                            "filterId": null,
+                            "dataKeys": [
+                                {
+                                    "name": "ruleEngineExecutionCountHourly",
+                                    "type": "timeseries",
+                                    "label": "{i18n:api-usage.rule-engine-executions}",
+                                    "color": "#ab00ff",
+                                    "settings": {
+                                        "excludeFromStacking": false,
+                                        "hideDataByDefault": false,
+                                        "disableDataHiding": false,
+                                        "removeFromLegend": false,
+                                        "showLines": false,
+                                        "fillLines": false,
+                                        "showPoints": false,
+                                        "showPointShape": "circle",
+                                        "pointShapeFormatter": "",
+                                        "showPointsLineWidth": 5,
+                                        "showPointsRadius": 3,
+                                        "showSeparateAxis": false,
+                                        "axisPosition": "left",
+                                        "thresholds": [
+                                            {
+                                                "thresholdValueSource": "predefinedValue"
+                                            }
+                                        ],
+                                        "comparisonSettings": {
+                                            "showValuesForComparison": true
+                                        },
+                                        "type": "bar"
+                                    },
+                                    "_hash": 0.0661644137210089,
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": null,
+                                    "postFuncBody": null
+                                }
+                            ]
+                        }
+                    ],
+                    "timewindow": {
+                        "hideInterval": false,
+                        "hideLastInterval": false,
+                        "hideQuickInterval": false,
+                        "hideAggregation": false,
+                        "hideAggInterval": false,
+                        "hideTimezone": false,
+                        "selectedTab": 1,
+                        "history": {
+                            "historyType": 0,
+                            "timewindowMs": 2592000000,
+                            "interval": 86400000,
+                            "fixedTimewindow": {
+                                "startTimeMs": 1709729900300,
+                                "endTimeMs": 1709816300300
+                            },
+                            "quickInterval": "CURRENT_DAY"
+                        },
+                        "aggregation": {
+                            "type": "SUM",
+                            "limit": 25000
+                        },
+                        "timezone": null
+                    },
+                    "showTitle": true,
+                    "backgroundColor": "#FFFFFF",
+                    "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": "var rounder = Math.pow(10, 1);\nvar powers = [\n  {key: 'Q', value: Math.pow(10, 15)},\n  {key: 'T', value: Math.pow(10, 12)},\n  {key: 'B', value: Math.pow(10, 9)},\n  {key: 'M', value: Math.pow(10, 6)},\n  {key: 'K', value: 1000}\n];\n\nvar key = '';\n\nfor (var i = 0; i < powers.length; i++) {\n    var reduced = value / powers[i].value;\n    reduced = Math.round(reduced * rounder) / rounder;\n    if (reduced >= 1) {\n        value = reduced;\n        key = powers[i].key;\n        break;\n    }\n}\nreturn value + key;",
+                                "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,
+                                "min": null,
+                                "max": null
+                            }
+                        },
+                        "thresholds": [],
+                        "dataZoom": false,
+                        "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)",
+                            "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": false,
+                                "relativeWidth": 2,
+                                "absoluteWidth": 1800000
+                            },
+                            "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": "bottom",
+                            "sortDataKeys": false,
+                            "showMin": false,
+                            "showMax": false,
+                            "showAvg": false,
+                            "showTotal": true,
+                            "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)",
+                        "tooltipShowDate": true,
+                        "tooltipDateFormat": {
+                            "format": "yyyy-MM-dd HH:mm:ss",
+                            "lastUpdateAgo": false,
+                            "custom": false
+                        },
+                        "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": 1000,
+                            "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
+                            }
+                        }
+                    },
+                    "title": "{i18n:api-usage.rule-engine-daily-activity}",
+                    "dropShadow": true,
+                    "enableFullscreen": true,
+                    "titleStyle": 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"
                 },
-                {
-                  "name": "transportApiState",
-                  "type": "timeseries",
-                  "label": "apiStateClass",
-                  "color": "#ffc107",
-                  "settings": {},
-                  "_hash": 0.8737107059960671,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": true,
-                  "postFuncBody": "return value ? value.toLowerCase() : 'enabled';"
+                "row": 0,
+                "col": 0,
+                "id": "c77e417c-ad9d-8e23-3ea1-c75edd653bc0"
+            },
+            "870904d2-d2e1-a1b9-ce56-b03fd47259b5": {
+                "typeFullFqn": "system.time_series_chart",
+                "type": "timeseries",
+                "sizeX": 8,
+                "sizeY": 5,
+                "config": {
+                    "datasources": [
+                        {
+                            "type": "entity",
+                            "name": null,
+                            "entityAliasId": "40193437-33ac-3172-eefd-0b08eb849062",
+                            "filterId": null,
+                            "dataKeys": [
+                                {
+                                    "name": "ruleEngineExecutionCount",
+                                    "type": "timeseries",
+                                    "label": "{i18n:api-usage.rule-engine-executions}",
+                                    "color": "#ab00ff",
+                                    "settings": {
+                                        "excludeFromStacking": false,
+                                        "hideDataByDefault": false,
+                                        "disableDataHiding": false,
+                                        "removeFromLegend": false,
+                                        "showLines": false,
+                                        "fillLines": false,
+                                        "showPoints": false,
+                                        "showPointShape": "circle",
+                                        "pointShapeFormatter": "",
+                                        "showPointsLineWidth": 5,
+                                        "showPointsRadius": 3,
+                                        "showSeparateAxis": false,
+                                        "axisPosition": "left",
+                                        "thresholds": [
+                                            {
+                                                "thresholdValueSource": "predefinedValue"
+                                            }
+                                        ],
+                                        "comparisonSettings": {
+                                            "showValuesForComparison": true
+                                        },
+                                        "type": "bar"
+                                    },
+                                    "_hash": 0.0661644137210089,
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": null,
+                                    "postFuncBody": null
+                                }
+                            ]
+                        }
+                    ],
+                    "timewindow": {
+                        "hideInterval": false,
+                        "hideAggregation": false,
+                        "hideAggInterval": false,
+                        "selectedTab": 1,
+                        "history": {
+                            "historyType": 0,
+                            "timewindowMs": 31536000000,
+                            "interval": 1000
+                        },
+                        "aggregation": {
+                            "type": "NONE",
+                            "limit": 1000
+                        }
+                    },
+                    "showTitle": true,
+                    "backgroundColor": "#FFFFFF",
+                    "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": "var rounder = Math.pow(10, 1);\nvar powers = [\n  {key: 'Q', value: Math.pow(10, 15)},\n  {key: 'T', value: Math.pow(10, 12)},\n  {key: 'B', value: Math.pow(10, 9)},\n  {key: 'M', value: Math.pow(10, 6)},\n  {key: 'K', value: 1000}\n];\n\nvar key = '';\n\nfor (var i = 0; i < powers.length; i++) {\n    var reduced = value / powers[i].value;\n    reduced = Math.round(reduced * rounder) / rounder;\n    if (reduced >= 1) {\n        value = reduced;\n        key = powers[i].key;\n        break;\n    }\n}\nreturn value + key;",
+                                "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,
+                                "min": null,
+                                "max": null
+                            }
+                        },
+                        "thresholds": [],
+                        "dataZoom": false,
+                        "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)",
+                            "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": 6,
+                                "absoluteWidth": 900000000
+                            },
+                            "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": "bottom",
+                            "sortDataKeys": false,
+                            "showMin": false,
+                            "showMax": false,
+                            "showAvg": false,
+                            "showTotal": true,
+                            "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)",
+                        "tooltipShowDate": true,
+                        "tooltipDateFormat": {
+                            "format": "yyyy-MM-dd HH:mm:ss",
+                            "lastUpdateAgo": false,
+                            "custom": false
+                        },
+                        "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": 1000,
+                            "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
+                            }
+                        }
+                    },
+                    "title": "{i18n:api-usage.rule-engine-monthly-activity}",
+                    "dropShadow": true,
+                    "enableFullscreen": true,
+                    "titleStyle": 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"
                 },
-                {
-                  "name": "transportApiState",
-                  "type": "timeseries",
-                  "label": "cardId",
-                  "color": "#607d8b",
-                  "settings": {},
-                  "_hash": 0.051659774305067296,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": true,
-                  "postFuncBody": "return (Math.random()*100000).toFixed(0);"
+                "row": 0,
+                "col": 0,
+                "id": "870904d2-d2e1-a1b9-ce56-b03fd47259b5"
+            },
+            "c66e5060-57fd-11e7-6616-65b82c294ac2": {
+                "typeFullFqn": "system.time_series_chart",
+                "type": "timeseries",
+                "sizeX": 8,
+                "sizeY": 5,
+                "config": {
+                    "datasources": [
+                        {
+                            "type": "entity",
+                            "name": null,
+                            "entityAliasId": "40193437-33ac-3172-eefd-0b08eb849062",
+                            "filterId": null,
+                            "dataKeys": [
+                                {
+                                    "name": "jsExecutionCountHourly",
+                                    "type": "timeseries",
+                                    "label": "{i18n:api-usage.javascript-executions}",
+                                    "color": "#ff9900",
+                                    "settings": {
+                                        "excludeFromStacking": false,
+                                        "hideDataByDefault": false,
+                                        "disableDataHiding": false,
+                                        "removeFromLegend": false,
+                                        "showLines": false,
+                                        "fillLines": false,
+                                        "showPoints": false,
+                                        "showPointShape": "circle",
+                                        "pointShapeFormatter": "",
+                                        "showPointsLineWidth": 5,
+                                        "showPointsRadius": 3,
+                                        "showSeparateAxis": false,
+                                        "axisPosition": "left",
+                                        "thresholds": [
+                                            {
+                                                "thresholdValueSource": "predefinedValue"
+                                            }
+                                        ],
+                                        "comparisonSettings": {
+                                            "showValuesForComparison": true
+                                        },
+                                        "type": "bar"
+                                    },
+                                    "_hash": 0.0661644137210089,
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": null,
+                                    "postFuncBody": null
+                                },
+                                {
+                                    "name": "tbelExecutionCountHourly",
+                                    "type": "timeseries",
+                                    "label": "{i18n:api-usage.tbel-executions}",
+                                    "color": "#4caf50",
+                                    "settings": {
+                                        "type": "bar"
+                                    },
+                                    "_hash": 0.5212969314724616,
+                                    "aggregationType": null,
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": null,
+                                    "postFuncBody": null
+                                }
+                            ]
+                        }
+                    ],
+                    "timewindow": {
+                        "hideInterval": false,
+                        "hideAggregation": false,
+                        "hideAggInterval": false,
+                        "selectedTab": 1,
+                        "history": {
+                            "historyType": 0,
+                            "timewindowMs": 2592000000,
+                            "interval": 86400000
+                        },
+                        "aggregation": {
+                            "type": "SUM",
+                            "limit": 1000
+                        }
+                    },
+                    "showTitle": true,
+                    "backgroundColor": "#FFFFFF",
+                    "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": "var rounder = Math.pow(10, 1);\nvar powers = [\n  {key: 'Q', value: Math.pow(10, 15)},\n  {key: 'T', value: Math.pow(10, 12)},\n  {key: 'B', value: Math.pow(10, 9)},\n  {key: 'M', value: Math.pow(10, 6)},\n  {key: 'K', value: 1000}\n];\n\nvar key = '';\n\nfor (var i = 0; i < powers.length; i++) {\n    var reduced = value / powers[i].value;\n    reduced = Math.round(reduced * rounder) / rounder;\n    if (reduced >= 1) {\n        value = reduced;\n        key = powers[i].key;\n        break;\n    }\n}\nreturn value + key;",
+                                "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,
+                                "min": null,
+                                "max": null
+                            }
+                        },
+                        "thresholds": [],
+                        "dataZoom": false,
+                        "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)",
+                            "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": false,
+                                "relativeWidth": 2,
+                                "absoluteWidth": 1800000
+                            },
+                            "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": "bottom",
+                            "sortDataKeys": false,
+                            "showMin": false,
+                            "showMax": false,
+                            "showAvg": false,
+                            "showTotal": true,
+                            "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)",
+                        "tooltipShowDate": true,
+                        "tooltipDateFormat": {
+                            "format": "yyyy-MM-dd HH:mm:ss",
+                            "lastUpdateAgo": false,
+                            "custom": false
+                        },
+                        "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": 1000,
+                            "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
+                            }
+                        }
+                    },
+                    "title": "{i18n:api-usage.scripts-daily-activity}",
+                    "dropShadow": true,
+                    "enableFullscreen": true,
+                    "titleStyle": 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"
                 },
-                {
-                  "name": "transportDataPointsLimit",
-                  "type": "timeseries",
-                  "label": "pointsLimit",
-                  "color": "#9c27b0",
-                  "settings": {},
-                  "_hash": 0.22082255831864894,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": null,
-                  "postFuncBody": null
+                "row": 0,
+                "col": 0,
+                "id": "c66e5060-57fd-11e7-6616-65b82c294ac2"
+            },
+            "d0e8603e-5d2e-9287-e2c6-8ccbe9c66806": {
+                "typeFullFqn": "system.time_series_chart",
+                "type": "timeseries",
+                "sizeX": 8,
+                "sizeY": 5,
+                "config": {
+                    "datasources": [
+                        {
+                            "type": "entity",
+                            "name": null,
+                            "entityAliasId": "40193437-33ac-3172-eefd-0b08eb849062",
+                            "filterId": null,
+                            "dataKeys": [
+                                {
+                                    "name": "jsExecutionCount",
+                                    "type": "timeseries",
+                                    "label": "{i18n:api-usage.javascript-executions}",
+                                    "color": "#ff9900",
+                                    "settings": {
+                                        "excludeFromStacking": false,
+                                        "hideDataByDefault": false,
+                                        "disableDataHiding": false,
+                                        "removeFromLegend": false,
+                                        "showLines": false,
+                                        "fillLines": false,
+                                        "showPoints": false,
+                                        "showPointShape": "circle",
+                                        "pointShapeFormatter": "",
+                                        "showPointsLineWidth": 5,
+                                        "showPointsRadius": 3,
+                                        "showSeparateAxis": false,
+                                        "axisPosition": "left",
+                                        "thresholds": [
+                                            {
+                                                "thresholdValueSource": "predefinedValue"
+                                            }
+                                        ],
+                                        "comparisonSettings": {
+                                            "showValuesForComparison": true
+                                        },
+                                        "type": "bar"
+                                    },
+                                    "_hash": 0.0661644137210089,
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": null,
+                                    "postFuncBody": null
+                                },
+                                {
+                                    "name": "tbelExecutionCount",
+                                    "type": "timeseries",
+                                    "label": "{i18n:api-usage.tbel-executions}",
+                                    "color": "#4caf50",
+                                    "settings": {
+                                        "type": "bar"
+                                    },
+                                    "_hash": 0.49748239768082403,
+                                    "aggregationType": null,
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": null,
+                                    "postFuncBody": null
+                                }
+                            ]
+                        }
+                    ],
+                    "timewindow": {
+                        "hideInterval": false,
+                        "hideAggregation": false,
+                        "hideAggInterval": false,
+                        "selectedTab": 1,
+                        "history": {
+                            "historyType": 0,
+                            "timewindowMs": 31536000000,
+                            "interval": 1000
+                        },
+                        "aggregation": {
+                            "type": "NONE",
+                            "limit": 1000
+                        }
+                    },
+                    "showTitle": true,
+                    "backgroundColor": "#FFFFFF",
+                    "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": "var rounder = Math.pow(10, 1);\nvar powers = [\n  {key: 'Q', value: Math.pow(10, 15)},\n  {key: 'T', value: Math.pow(10, 12)},\n  {key: 'B', value: Math.pow(10, 9)},\n  {key: 'M', value: Math.pow(10, 6)},\n  {key: 'K', value: 1000}\n];\n\nvar key = '';\n\nfor (var i = 0; i < powers.length; i++) {\n    var reduced = value / powers[i].value;\n    reduced = Math.round(reduced * rounder) / rounder;\n    if (reduced >= 1) {\n        value = reduced;\n        key = powers[i].key;\n        break;\n    }\n}\nreturn value + key;",
+                                "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,
+                                "min": null,
+                                "max": null
+                            }
+                        },
+                        "thresholds": [],
+                        "dataZoom": false,
+                        "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)",
+                            "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": 6,
+                                "absoluteWidth": 900000000
+                            },
+                            "barWidth": {
+                                "relative": false,
+                                "relativeWidth": 2,
+                                "absoluteWidth": 900000000
+                            }
+                        },
+                        "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": "bottom",
+                            "sortDataKeys": false,
+                            "showMin": false,
+                            "showMax": false,
+                            "showAvg": false,
+                            "showTotal": true,
+                            "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)",
+                        "tooltipShowDate": true,
+                        "tooltipDateFormat": {
+                            "format": "yyyy-MM-dd HH:mm:ss",
+                            "lastUpdateAgo": false,
+                            "custom": false
+                        },
+                        "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": 1000,
+                            "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
+                            }
+                        }
+                    },
+                    "title": "{i18n:api-usage.scripts-monthly-activity}",
+                    "dropShadow": true,
+                    "enableFullscreen": true,
+                    "titleStyle": 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"
                 },
-                {
-                  "name": "transportDataPointsCount",
-                  "type": "timeseries",
-                  "label": "pointsCount",
-                  "color": "#8bc34a",
-                  "settings": {},
-                  "_hash": 0.6340356364819146,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": null,
-                  "postFuncBody": null
+                "row": 0,
+                "col": 0,
+                "id": "d0e8603e-5d2e-9287-e2c6-8ccbe9c66806"
+            },
+            "7f4100d2-41be-4954-d353-1d45000dbbbb": {
+                "typeFullFqn": "system.time_series_chart",
+                "type": "timeseries",
+                "sizeX": 8,
+                "sizeY": 5,
+                "config": {
+                    "datasources": [
+                        {
+                            "type": "entity",
+                            "name": null,
+                            "entityAliasId": "40193437-33ac-3172-eefd-0b08eb849062",
+                            "filterId": null,
+                            "dataKeys": [
+                                {
+                                    "name": "storageDataPointsCountHourly",
+                                    "type": "timeseries",
+                                    "label": "{i18n:api-usage.data-points-storage-days}",
+                                    "color": "#1039ee",
+                                    "settings": {
+                                        "excludeFromStacking": false,
+                                        "hideDataByDefault": false,
+                                        "disableDataHiding": false,
+                                        "removeFromLegend": false,
+                                        "showLines": false,
+                                        "fillLines": false,
+                                        "showPoints": false,
+                                        "showPointShape": "circle",
+                                        "pointShapeFormatter": "",
+                                        "showPointsLineWidth": 5,
+                                        "showPointsRadius": 3,
+                                        "showSeparateAxis": false,
+                                        "axisPosition": "left",
+                                        "thresholds": [
+                                            {
+                                                "thresholdValueSource": "predefinedValue"
+                                            }
+                                        ],
+                                        "comparisonSettings": {
+                                            "showValuesForComparison": true
+                                        },
+                                        "type": "bar"
+                                    },
+                                    "_hash": 0.0661644137210089,
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": null,
+                                    "postFuncBody": null
+                                }
+                            ]
+                        }
+                    ],
+                    "timewindow": {
+                        "hideInterval": false,
+                        "hideAggregation": false,
+                        "hideAggInterval": false,
+                        "selectedTab": 1,
+                        "history": {
+                            "historyType": 0,
+                            "timewindowMs": 2592000000,
+                            "interval": 86400000
+                        },
+                        "aggregation": {
+                            "type": "SUM",
+                            "limit": 1000
+                        }
+                    },
+                    "showTitle": true,
+                    "backgroundColor": "#FFFFFF",
+                    "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": "var rounder = Math.pow(10, 1);\nvar powers = [\n  {key: 'Q', value: Math.pow(10, 15)},\n  {key: 'T', value: Math.pow(10, 12)},\n  {key: 'B', value: Math.pow(10, 9)},\n  {key: 'M', value: Math.pow(10, 6)},\n  {key: 'K', value: 1000}\n];\n\nvar key = '';\n\nfor (var i = 0; i < powers.length; i++) {\n    var reduced = value / powers[i].value;\n    reduced = Math.round(reduced * rounder) / rounder;\n    if (reduced >= 1) {\n        value = reduced;\n        key = powers[i].key;\n        break;\n    }\n}\nreturn value + key;",
+                                "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,
+                                "min": null,
+                                "max": null
+                            }
+                        },
+                        "thresholds": [],
+                        "dataZoom": false,
+                        "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)",
+                            "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": false,
+                                "relativeWidth": 2,
+                                "absoluteWidth": 1800000
+                            },
+                            "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": "bottom",
+                            "sortDataKeys": false,
+                            "showMin": false,
+                            "showMax": false,
+                            "showAvg": false,
+                            "showTotal": true,
+                            "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)",
+                        "tooltipShowDate": true,
+                        "tooltipDateFormat": {
+                            "format": "yyyy-MM-dd HH:mm:ss",
+                            "lastUpdateAgo": false,
+                            "custom": false
+                        },
+                        "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": 1000,
+                            "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
+                            }
+                        }
+                    },
+                    "title": "{i18n:api-usage.telemetry-persistence-daily-activity}",
+                    "dropShadow": true,
+                    "enableFullscreen": true,
+                    "titleStyle": 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"
                 },
-                {
-                  "name": "transportApiState",
-                  "type": "timeseries",
-                  "label": "title",
-                  "color": "#3f51b5",
-                  "settings": {},
-                  "_hash": 0.6894070537030252,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": true,
-                  "postFuncBody": "return \"{i18n:api-usage.transport}\";"
-                }
-              ]
-            }
-          ],
-          "timewindow": {
-            "displayValue": "",
-            "selectedTab": 0,
-            "realtime": {
-              "realtimeType": 1,
-              "interval": 1000,
-              "timewindowMs": 60000,
-              "quickInterval": "CURRENT_DAY"
+                "row": 0,
+                "col": 0,
+                "id": "7f4100d2-41be-4954-d353-1d45000dbbbb"
             },
-            "history": {
-              "historyType": 0,
-              "interval": 1000,
-              "timewindowMs": 60000,
-              "fixedTimewindow": {
-                "startTimeMs": 1694083375826,
-                "endTimeMs": 1694169775826
-              },
-              "quickInterval": "CURRENT_DAY"
+            "226ef8c9-8488-3664-21ac-0b6217336202": {
+                "typeFullFqn": "system.time_series_chart",
+                "type": "timeseries",
+                "sizeX": 8,
+                "sizeY": 5,
+                "config": {
+                    "datasources": [
+                        {
+                            "type": "entity",
+                            "name": null,
+                            "entityAliasId": "40193437-33ac-3172-eefd-0b08eb849062",
+                            "filterId": null,
+                            "dataKeys": [
+                                {
+                                    "name": "storageDataPointsCount",
+                                    "type": "timeseries",
+                                    "label": "{i18n:api-usage.data-points-storage-days}",
+                                    "color": "#1039ee",
+                                    "settings": {
+                                        "excludeFromStacking": false,
+                                        "hideDataByDefault": false,
+                                        "disableDataHiding": false,
+                                        "removeFromLegend": false,
+                                        "showLines": false,
+                                        "fillLines": false,
+                                        "showPoints": false,
+                                        "showPointShape": "circle",
+                                        "pointShapeFormatter": "",
+                                        "showPointsLineWidth": 5,
+                                        "showPointsRadius": 3,
+                                        "showSeparateAxis": false,
+                                        "axisPosition": "left",
+                                        "thresholds": [
+                                            {
+                                                "thresholdValueSource": "predefinedValue"
+                                            }
+                                        ],
+                                        "comparisonSettings": {
+                                            "showValuesForComparison": true
+                                        },
+                                        "type": "bar"
+                                    },
+                                    "_hash": 0.0661644137210089,
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": null,
+                                    "postFuncBody": null
+                                }
+                            ]
+                        }
+                    ],
+                    "timewindow": {
+                        "hideInterval": false,
+                        "hideAggregation": false,
+                        "hideAggInterval": false,
+                        "selectedTab": 1,
+                        "history": {
+                            "historyType": 0,
+                            "timewindowMs": 31536000000,
+                            "interval": 1000
+                        },
+                        "aggregation": {
+                            "type": "NONE",
+                            "limit": 1000
+                        }
+                    },
+                    "showTitle": true,
+                    "backgroundColor": "#FFFFFF",
+                    "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": "var rounder = Math.pow(10, 1);\nvar powers = [\n  {key: 'Q', value: Math.pow(10, 15)},\n  {key: 'T', value: Math.pow(10, 12)},\n  {key: 'B', value: Math.pow(10, 9)},\n  {key: 'M', value: Math.pow(10, 6)},\n  {key: 'K', value: 1000}\n];\n\nvar key = '';\n\nfor (var i = 0; i < powers.length; i++) {\n    var reduced = value / powers[i].value;\n    reduced = Math.round(reduced * rounder) / rounder;\n    if (reduced >= 1) {\n        value = reduced;\n        key = powers[i].key;\n        break;\n    }\n}\nreturn value + key;",
+                                "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,
+                                "min": null,
+                                "max": null
+                            }
+                        },
+                        "thresholds": [],
+                        "dataZoom": false,
+                        "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)",
+                            "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": 6,
+                                "absoluteWidth": 900000000
+                            },
+                            "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": "bottom",
+                            "sortDataKeys": false,
+                            "showMin": false,
+                            "showMax": false,
+                            "showAvg": false,
+                            "showTotal": true,
+                            "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)",
+                        "tooltipShowDate": true,
+                        "tooltipDateFormat": {
+                            "format": "yyyy-MM-dd HH:mm:ss",
+                            "lastUpdateAgo": false,
+                            "custom": false
+                        },
+                        "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": 1000,
+                            "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
+                            }
+                        }
+                    },
+                    "title": "{i18n:api-usage.telemetry-persistence-monthly-activity}",
+                    "dropShadow": true,
+                    "enableFullscreen": true,
+                    "titleStyle": 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"
+                },
+                "row": 0,
+                "col": 0,
+                "id": "226ef8c9-8488-3664-21ac-0b6217336202"
             },
-            "aggregation": {
-              "type": "AVG",
-              "limit": 25000
-            }
-          },
-          "showTitle": false,
-          "backgroundColor": "#fff",
-          "color": "#666666",
-          "padding": "0",
-          "settings": {
-            "cardHtml": "<div class='card ${apiStateClass}'>\n    <img src=\"data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7\" onload=\"initializeCard_${cardId:0}(event);\">\n    <script type=\"text/javascript\">\n        function initializeCard_${cardId:0}(e) {\n            \n            function toShortNumber(number) {\n                var rounder = Math.pow(10, 1);\n                var powers = [\n                  {key: 'Q', value: Math.pow(10, 15)},\n                  {key: 'T', value: Math.pow(10, 12)},\n                  {key: 'B', value: Math.pow(10, 9)},\n                  {key: 'M', value: Math.pow(10, 6)},\n                  {key: 'K', value: 1000}\n                ];\n                \n                var key = '';\n                \n                for (var i = 0; i < powers.length; i++) {\n                    var reduced = number / powers[i].value;\n                    reduced = Math.round(reduced * rounder) / rounder;\n                    if (reduced >= 1) {\n                        number = reduced;\n                        key = powers[i].key;\n                        break;\n                    }\n                }\n                return number + key;\n            }\n            \n            var imgTag = e.target;\n            var parentTag = imgTag.parentNode;\n            var count = \"${count:0}\";\n            var limit = \"${limit:0}\";\n            count = count.length > 0 ? parseInt(count, 10) : 0;\n            limit = limit.length > 0 ? parseInt(limit, 10) : 0;\n            var percentElement = $('#api-usage-percent', parentTag);\n            var valueElement = $('#api-usage-value', parentTag);\n            var barElement = $('#api-usage-bar', parentTag);\n            if (Number.isFinite(limit) && limit > 0) {\n                var percent = Math.min(100, ((count / limit) * 100));\n                barElement.width(percent + '%');\n                percent = percent.toFixed(2);\n                percentElement.text(percent + '%');\n                valueElement.text(toShortNumber(count) + ' / ' + toShortNumber(limit));\n            } else {\n                barElement.width('0%');\n                percentElement.text('');\n                valueElement.text(toShortNumber(count) + ' / ∞');\n            }\n            var pointsCount = \"${pointsCount:0}\";\n            var pointsLimit = \"${pointsLimit:0}\";\n            pointsCount = pointsCount.length > 0 ? parseInt(pointsCount, 10) : 0;\n            pointsLimit = pointsLimit.length > 0 ? parseInt(pointsLimit, 10) : 0;\n            var pointsPercentElement = $('#api-usage-percent2', parentTag);\n            var pointsValueElement = $('#api-usage-value2', parentTag);\n            var pointsBarElement = $('#api-usage-bar2', parentTag);\n            if (Number.isFinite(pointsLimit) && pointsLimit > 0) {\n                var percent = Math.min(100, ((pointsCount / pointsLimit) * 100));\n                pointsBarElement.width(percent + '%');\n                percent = percent.toFixed(2);\n                pointsPercentElement.text(percent + '%');\n                pointsValueElement.text(toShortNumber(pointsCount) + ' / ' + toShortNumber(pointsLimit));\n            } else {\n                pointsBarElement.width('0%');\n                pointsPercentElement.text('');\n                pointsValueElement.text(toShortNumber(pointsCount) + ' / ∞');\n            }\n        }\n    </script>\n    <div class='content'>\n        <div class='column'>\n            <div class='title-row'>\n                <div class='title'>\n                    <span>${title}</span>\n                </div>\n                <div class='state'>${apiState}</div>\n            </div>\n            <div class=\"bars-row\">\n                <div class=\"bar-column\" style=\"margin-right: 10px;\">\n                    <div class='bar-container'>\n                        <div class=\"unit\">{i18n:api-usage.messages}</div>\n                        <div class='bar'>\n                            <div class=\"bar-fill\" id=\"api-usage-bar\"></div>\n                        </div>\n                        <div class='bar-labels'>\n                            <div id=\"api-usage-percent\"></div>\n                            <div style=\"flex: 1;\"></div>\n                            <div id=\"api-usage-value\"></div>\n                        </div>\n                    </div>    \n                </div>\n                <div class=\"bar-column\" style=\"margin-left: 10px;\">\n                    <div class='bar-container'>\n                        <div class=\"unit\">{i18n:api-usage.data-points}</div>\n                        <div class='bar'>\n                            <div class=\"bar-fill\" id=\"api-usage-bar2\"></div>\n                        </div>    \n                        <div class='bar-labels'>\n                            <div id=\"api-usage-percent2\"></div>\n                            <div style=\"flex: 1;\"></div>\n                            <div id=\"api-usage-value2\"></div>\n                        </div>\n                    </div>    \n                </div>\n            </div>\n        </div>\n    </div>\n    <div role=\"separator\" class=\"mat-divider mat-divider-horizontal\" aria-orientation=\"horizontal\"></div>\n    <div class='action-row'>\n        <button id=\"transport_details\" class=\"mdc-button mat-mdc-button mat-primary mat-mdc-button-base\">\n     <span class=\"mat-mdc-button-persistent-ripple mdc-button__ripple\"></span>\n        <span class=\"mdc-button__label\">{i18n:api-usage.view-details}</span>\n            <span class=\"mat-ripple mat-mdc-button-ripple\"></span>\n     <span class=\"mat-mdc-button-touch-target\"></span>\n        <span class=\"mat-mdc-focus-indicator\"></span>\n        </button>\n    </div>    \n</div>",
-            "cardCss": ".card {\n   width: 100%;\n   height: 100%;\n   box-sizing: border-box;\n   display: flex;\n   flex-direction: column;\n}\n\n.card > img {\n    height: 0;\n}\n\n.card .content {\n   flex: 1;    \n   padding: 13px 13px 0;\n   display: flex;\n   box-sizing: border-box;\n}\n\n.card .content .column {\n   display: flex;\n   flex-direction: column;    \n   justify-content: space-around;\n   flex: 1;\n}\n\n.card .content .title-row {\n    display: flex;\n    flex-direction: row;\n    padding-bottom: 10px;\n}\n\n.card .title {\n    flex: 1;\n    font-size: 20px;\n    font-weight: 400;\n    color: #666666;\n}\n\n.card .state {\n    text-transform: uppercase;\n    font-size: 20px;\n    font-weight: bold;\n}\n\n.card.enabled .state {\n    color: #00B260;\n}\n\n.card.warning .state {\n    color: #FFAD6F;\n}\n\n.card.disabled .state {\n    color: #F73243;\n}\n\n.card .bars-row {\n    flex: 1;\n    display: flex;\n    flex-direction: row;\n}\n\n.card .bar-column {\n    flex: 1;\n    display: flex;\n    flex-direction: column;\n}\n\n.card .bar-container {\n    flex: 1;\n    display: flex;\n    flex-direction: column;\n    justify-content: center;\n}\n\n.card .bar {\n    flex: 1;\n    max-height: 30px;\n    margin-top: 3.5px;\n    margin-bottom: 4px;\n    background-color: #F0F0F0;\n    border: 1px solid #DADCDB;\n    border-radius: 2px;\n    box-shadow: inset 0 1px 3px rgba(0, 0, 0, .2);\n}\n\n.card.enabled .bar {\n    border-color: #00B260;\n    background-color: #F0FBF7;\n}\n\n.card.warning .bar {\n    border-color: #FFAD6F;\n    background-color: #FFFAF6;\n}\n\n.card.disabled .bar {\n    border-color: #F73243;\n    background-color: #FFF0F0;\n}\n\n.card .bar .bar-fill {\n    background-color: #F0F0F0;\n    border-radius: 2px;\n    height: 100%;\n    width: 0%;\n}\n\n.card.enabled .bar-fill {\n    background-color: #00C46C;\n}\n\n.card.warning .bar-fill {\n    background-color: #FFD099;\n}\n\n.card.disabled .bar-fill {\n    background-color: #FF9494;\n}\n\n.card .bar-labels {\n    height: 20px;\n    font-size: 16px;\n    color: #666;\n    display: flex;\n    flex-direction: row;\n}\n\n.card .mat-mdc-button-base {\n    text-transform: uppercase;\n    white-space: nowrap;\n    overflow: hidden;\n    text-overflow: ellipsis;\n}\n\n.card .mdc-button__label {\n    pointer-events: none;\n}\n\n.card .action-row {\n    display: flex;\n    flex-direction: row;\n    justify-content: flex-end;\n    padding: 8px 0;\n}\n\n\n@media screen and (min-width: 960px) and (max-width: 1279px) {\n  .card .title {\n      font-size: 12px;\n  }\n  .card .state {\n      font-size: 12px;\n  }\n  .card .unit {\n      font-size: 8px;\n  }\n  .card .bar-labels {\n      font-size: 6px;\n  }\n  .card .mat-mdc-button-base {\n      font-size: 8px;\n  }\n  .card .action-row {\n      padding: 0;\n  }\n}\n\n@media screen and (min-width: 1280px) and (max-width: 1599px) {\n  .card .title {\n      font-size: 14px;\n  }\n  .card .state {\n      font-size: 14px;\n  }\n  .card .unit {\n      font-size: 10px;\n  }\n  .card .bar-labels {\n      font-size: 8px;\n  }\n  .card .mat-mdc-button-base {\n      font-size: 10px;\n  }\n  .card .action-row {\n      padding: 0;\n  }\n}\n\n@media screen and (min-width: 1600px) and (max-width: 1919px) {\n  .card .title {\n      font-size: 16px;\n  }\n  .card .state {\n      font-size: 16px;\n  }\n  .card .unit {\n      font-size: 12px;\n  }\n  .card .bar-labels {\n      font-size: 12px;\n  }\n  .card .mat-mdc-button-base {\n      font-size: 12px;\n  }\n  .card .action-row {\n      padding: 0;\n  }\n}    \n\n"
-          },
-          "title": "Transport",
-          "dropShadow": true,
-          "enableFullscreen": false,
-          "widgetStyle": {
-            "cursor": "default"
-          },
-          "titleStyle": {
-            "fontSize": "20px",
-            "fontWeight": 400
-          },
-          "useDashboardTimewindow": true,
-          "showLegend": false,
-          "actions": {
-            "elementClick": [
-              {
-                "name": "transport_details",
-                "icon": "insert_chart",
-                "type": "openDashboardState",
-                "targetDashboardStateId": "transport",
-                "setEntityId": false,
-                "stateEntityParamName": null,
-                "openRightLayout": false,
-                "id": "46b7cefe-e1f2-67c1-4055-3a214520f869"
-              }
-            ]
-          },
-          "showTitleIcon": false,
-          "iconColor": "rgba(0, 0, 0, 0.87)",
-          "iconSize": "24px",
-          "titleTooltip": ""
-        },
-        "row": 0,
-        "col": 0,
-        "id": "a245c67e-53ec-d299-fa89-69fe2062ccb2",
-        "typeFullFqn": "system.cards.html_value_card"
-      },
-      "a151ae60-0326-6116-d818-9070dda8e9c7": {
-        "type": "latest",
-        "sizeX": 7.5,
-        "sizeY": 3,
-        "config": {
-          "datasources": [
-            {
-              "type": "entity",
-              "name": null,
-              "entityAliasId": "40193437-33ac-3172-eefd-0b08eb849062",
-              "filterId": null,
-              "dataKeys": [
-                {
-                  "name": "alarmApiState",
-                  "type": "timeseries",
-                  "label": "apiState",
-                  "color": "#2196f3",
-                  "settings": {},
-                  "_hash": 0.8830669138660703,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": true,
-                  "postFuncBody": "return value ? value : 'ENABLED';"
+            "bef6c27b-9fe7-ee92-40d9-9696c501a1f9": {
+                "typeFullFqn": "system.time_series_chart",
+                "type": "timeseries",
+                "sizeX": 8,
+                "sizeY": 5,
+                "config": {
+                    "datasources": [
+                        {
+                            "type": "entity",
+                            "name": null,
+                            "entityAliasId": "40193437-33ac-3172-eefd-0b08eb849062",
+                            "filterId": null,
+                            "dataKeys": [
+                                {
+                                    "name": "createdAlarmsCountHourly",
+                                    "type": "timeseries",
+                                    "label": "{i18n:api-usage.alarms-created}",
+                                    "color": "#d35a00",
+                                    "settings": {
+                                        "excludeFromStacking": false,
+                                        "hideDataByDefault": false,
+                                        "disableDataHiding": false,
+                                        "removeFromLegend": false,
+                                        "showLines": false,
+                                        "fillLines": false,
+                                        "showPoints": false,
+                                        "showPointShape": "circle",
+                                        "pointShapeFormatter": "var size = radius * Math.sqrt(Math.PI) / 2;\nctx.moveTo(x - size, y - size);\nctx.lineTo(x + size, y + size);\nctx.moveTo(x - size, y + size);\nctx.lineTo(x + size, y - size);",
+                                        "showPointsLineWidth": 5,
+                                        "showPointsRadius": 3,
+                                        "showSeparateAxis": false,
+                                        "axisPosition": "left",
+                                        "thresholds": [
+                                            {
+                                                "thresholdValueSource": "predefinedValue"
+                                            }
+                                        ],
+                                        "comparisonSettings": {
+                                            "showValuesForComparison": true
+                                        },
+                                        "type": "bar"
+                                    },
+                                    "_hash": 0.0661644137210089,
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": null,
+                                    "postFuncBody": null
+                                }
+                            ]
+                        }
+                    ],
+                    "timewindow": {
+                        "hideInterval": false,
+                        "hideAggregation": false,
+                        "hideAggInterval": false,
+                        "selectedTab": 1,
+                        "history": {
+                            "historyType": 0,
+                            "timewindowMs": 2592000000,
+                            "interval": 86400000
+                        },
+                        "aggregation": {
+                            "type": "SUM",
+                            "limit": 1000
+                        }
+                    },
+                    "showTitle": true,
+                    "backgroundColor": "#FFFFFF",
+                    "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": "var rounder = Math.pow(10, 1);\nvar powers = [\n  {key: 'Q', value: Math.pow(10, 15)},\n  {key: 'T', value: Math.pow(10, 12)},\n  {key: 'B', value: Math.pow(10, 9)},\n  {key: 'M', value: Math.pow(10, 6)},\n  {key: 'K', value: 1000}\n];\n\nvar key = '';\n\nfor (var i = 0; i < powers.length; i++) {\n    var reduced = value / powers[i].value;\n    reduced = Math.round(reduced * rounder) / rounder;\n    if (reduced >= 1) {\n        value = reduced;\n        key = powers[i].key;\n        break;\n    }\n}\nreturn value + key;",
+                                "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,
+                                "min": null,
+                                "max": null
+                            }
+                        },
+                        "thresholds": [],
+                        "dataZoom": false,
+                        "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)",
+                            "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": false,
+                                "relativeWidth": 2,
+                                "absoluteWidth": 1800000
+                            },
+                            "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": "bottom",
+                            "sortDataKeys": false,
+                            "showMin": false,
+                            "showMax": false,
+                            "showAvg": false,
+                            "showTotal": true,
+                            "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)",
+                        "tooltipShowDate": true,
+                        "tooltipDateFormat": {
+                            "format": "yyyy-MM-dd HH:mm:ss",
+                            "lastUpdateAgo": false,
+                            "custom": false
+                        },
+                        "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": 1000,
+                            "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
+                            }
+                        }
+                    },
+                    "title": "{i18n:api-usage.alarms-created-daily-activity}",
+                    "dropShadow": true,
+                    "enableFullscreen": true,
+                    "titleStyle": 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"
                 },
-                {
-                  "name": "createdAlarmsLimit",
-                  "type": "timeseries",
-                  "label": "limit",
-                  "color": "#4caf50",
-                  "settings": {},
-                  "_hash": 0.5463603803546802,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": null,
-                  "postFuncBody": null
+                "row": 0,
+                "col": 0,
+                "id": "bef6c27b-9fe7-ee92-40d9-9696c501a1f9"
+            },
+            "52305cf8-2258-5745-a0e7-41a171594bb3": {
+                "typeFullFqn": "system.time_series_chart",
+                "type": "timeseries",
+                "sizeX": 8,
+                "sizeY": 5,
+                "config": {
+                    "datasources": [
+                        {
+                            "type": "entity",
+                            "name": null,
+                            "entityAliasId": "40193437-33ac-3172-eefd-0b08eb849062",
+                            "filterId": null,
+                            "dataKeys": [
+                                {
+                                    "name": "createdAlarmsCount",
+                                    "type": "timeseries",
+                                    "label": "{i18n:api-usage.alarms-created}",
+                                    "color": "#d35a00",
+                                    "settings": {
+                                        "excludeFromStacking": false,
+                                        "hideDataByDefault": false,
+                                        "disableDataHiding": false,
+                                        "removeFromLegend": false,
+                                        "showLines": false,
+                                        "fillLines": false,
+                                        "showPoints": false,
+                                        "showPointShape": "circle",
+                                        "pointShapeFormatter": "var size = radius * Math.sqrt(Math.PI) / 2;\nctx.moveTo(x - size, y - size);\nctx.lineTo(x + size, y + size);\nctx.moveTo(x - size, y + size);\nctx.lineTo(x + size, y - size);",
+                                        "showPointsLineWidth": 5,
+                                        "showPointsRadius": 3,
+                                        "showSeparateAxis": false,
+                                        "axisPosition": "left",
+                                        "thresholds": [
+                                            {
+                                                "thresholdValueSource": "predefinedValue"
+                                            }
+                                        ],
+                                        "comparisonSettings": {
+                                            "showValuesForComparison": true
+                                        },
+                                        "type": "bar"
+                                    },
+                                    "_hash": 0.0661644137210089,
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": null,
+                                    "postFuncBody": null
+                                }
+                            ]
+                        }
+                    ],
+                    "timewindow": {
+                        "hideInterval": false,
+                        "hideAggregation": false,
+                        "hideAggInterval": false,
+                        "selectedTab": 1,
+                        "history": {
+                            "historyType": 0,
+                            "timewindowMs": 31536000000,
+                            "interval": 1000
+                        },
+                        "aggregation": {
+                            "type": "NONE",
+                            "limit": 1000
+                        }
+                    },
+                    "showTitle": true,
+                    "backgroundColor": "#FFFFFF",
+                    "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": "var rounder = Math.pow(10, 1);\nvar powers = [\n  {key: 'Q', value: Math.pow(10, 15)},\n  {key: 'T', value: Math.pow(10, 12)},\n  {key: 'B', value: Math.pow(10, 9)},\n  {key: 'M', value: Math.pow(10, 6)},\n  {key: 'K', value: 1000}\n];\n\nvar key = '';\n\nfor (var i = 0; i < powers.length; i++) {\n    var reduced = value / powers[i].value;\n    reduced = Math.round(reduced * rounder) / rounder;\n    if (reduced >= 1) {\n        value = reduced;\n        key = powers[i].key;\n        break;\n    }\n}\nreturn value + key;",
+                                "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,
+                                "min": null,
+                                "max": null
+                            }
+                        },
+                        "thresholds": [],
+                        "dataZoom": false,
+                        "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)",
+                            "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": 6,
+                                "absoluteWidth": 900000000
+                            },
+                            "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": "bottom",
+                            "sortDataKeys": false,
+                            "showMin": false,
+                            "showMax": false,
+                            "showAvg": false,
+                            "showTotal": true,
+                            "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)",
+                        "tooltipShowDate": true,
+                        "tooltipDateFormat": {
+                            "format": "yyyy-MM-dd HH:mm:ss",
+                            "lastUpdateAgo": false,
+                            "custom": false
+                        },
+                        "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": 1000,
+                            "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
+                            }
+                        }
+                    },
+                    "title": "{i18n:api-usage.alarms-created-monthly-activity}",
+                    "dropShadow": true,
+                    "enableFullscreen": true,
+                    "titleStyle": 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"
                 },
-                {
-                  "name": "createdAlarmsCount",
-                  "type": "timeseries",
-                  "label": "count",
-                  "color": "#f44336",
-                  "settings": {},
-                  "_hash": 0.5564241862015964,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": null,
-                  "postFuncBody": null
+                "row": 0,
+                "col": 0,
+                "id": "52305cf8-2258-5745-a0e7-41a171594bb3"
+            },
+            "36fdf999-ca22-9a4c-269d-3f004d792792": {
+                "typeFullFqn": "system.time_series_chart",
+                "type": "timeseries",
+                "sizeX": 8,
+                "sizeY": 5,
+                "config": {
+                    "datasources": [
+                        {
+                            "type": "entity",
+                            "name": null,
+                            "entityAliasId": "40193437-33ac-3172-eefd-0b08eb849062",
+                            "filterId": null,
+                            "dataKeys": [
+                                {
+                                    "name": "emailCountHourly",
+                                    "type": "timeseries",
+                                    "label": "{i18n:api-usage.email-messages}",
+                                    "color": "#d35a00",
+                                    "settings": {
+                                        "excludeFromStacking": false,
+                                        "hideDataByDefault": false,
+                                        "disableDataHiding": false,
+                                        "removeFromLegend": false,
+                                        "showLines": false,
+                                        "fillLines": false,
+                                        "showPoints": false,
+                                        "showPointShape": "circle",
+                                        "pointShapeFormatter": "",
+                                        "showPointsLineWidth": 5,
+                                        "showPointsRadius": 3,
+                                        "showSeparateAxis": false,
+                                        "axisPosition": "left",
+                                        "thresholds": [
+                                            {
+                                                "thresholdValueSource": "predefinedValue"
+                                            }
+                                        ],
+                                        "comparisonSettings": {
+                                            "showValuesForComparison": true
+                                        },
+                                        "type": "bar"
+                                    },
+                                    "_hash": 0.0661644137210089,
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": null,
+                                    "postFuncBody": null
+                                }
+                            ]
+                        }
+                    ],
+                    "timewindow": {
+                        "hideInterval": false,
+                        "hideAggregation": false,
+                        "hideAggInterval": false,
+                        "selectedTab": 1,
+                        "history": {
+                            "historyType": 0,
+                            "timewindowMs": 2592000000,
+                            "interval": 86400000
+                        },
+                        "aggregation": {
+                            "type": "SUM",
+                            "limit": 1000
+                        }
+                    },
+                    "showTitle": true,
+                    "backgroundColor": "#FFFFFF",
+                    "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": "var rounder = Math.pow(10, 1);\nvar powers = [\n  {key: 'Q', value: Math.pow(10, 15)},\n  {key: 'T', value: Math.pow(10, 12)},\n  {key: 'B', value: Math.pow(10, 9)},\n  {key: 'M', value: Math.pow(10, 6)},\n  {key: 'K', value: 1000}\n];\n\nvar key = '';\n\nfor (var i = 0; i < powers.length; i++) {\n    var reduced = value / powers[i].value;\n    reduced = Math.round(reduced * rounder) / rounder;\n    if (reduced >= 1) {\n        value = reduced;\n        key = powers[i].key;\n        break;\n    }\n}\nreturn value + key;",
+                                "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,
+                                "min": null,
+                                "max": null
+                            }
+                        },
+                        "thresholds": [],
+                        "dataZoom": false,
+                        "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)",
+                            "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": false,
+                                "relativeWidth": 2,
+                                "absoluteWidth": 1800000
+                            },
+                            "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": "bottom",
+                            "sortDataKeys": false,
+                            "showMin": false,
+                            "showMax": false,
+                            "showAvg": false,
+                            "showTotal": true,
+                            "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)",
+                        "tooltipShowDate": true,
+                        "tooltipDateFormat": {
+                            "format": "yyyy-MM-dd HH:mm:ss",
+                            "lastUpdateAgo": false,
+                            "custom": false
+                        },
+                        "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": 1000,
+                            "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
+                            }
+                        }
+                    },
+                    "title": "{i18n:api-usage.email-messages-daily-activity}",
+                    "dropShadow": true,
+                    "enableFullscreen": true,
+                    "titleStyle": 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"
                 },
-                {
-                  "name": "alarmApiState",
-                  "type": "timeseries",
-                  "label": "apiStateClass",
-                  "color": "#ffc107",
-                  "settings": {},
-                  "_hash": 0.8737107059960671,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": true,
-                  "postFuncBody": "return value ? value.toLowerCase() : 'enabled';"
+                "row": 0,
+                "col": 0,
+                "id": "36fdf999-ca22-9a4c-269d-3f004d792792"
+            },
+            "9a191755-499d-535e-86c5-061102729c02": {
+                "typeFullFqn": "system.time_series_chart",
+                "type": "timeseries",
+                "sizeX": 8,
+                "sizeY": 5,
+                "config": {
+                    "datasources": [
+                        {
+                            "type": "entity",
+                            "name": null,
+                            "entityAliasId": "40193437-33ac-3172-eefd-0b08eb849062",
+                            "filterId": null,
+                            "dataKeys": [
+                                {
+                                    "name": "smsCountHourly",
+                                    "type": "timeseries",
+                                    "label": "{i18n:api-usage.sms-messages}",
+                                    "color": "#f36021",
+                                    "settings": {
+                                        "excludeFromStacking": false,
+                                        "hideDataByDefault": false,
+                                        "disableDataHiding": false,
+                                        "removeFromLegend": false,
+                                        "showLines": false,
+                                        "fillLines": false,
+                                        "showPoints": false,
+                                        "showPointShape": "circle",
+                                        "pointShapeFormatter": "",
+                                        "showPointsLineWidth": 5,
+                                        "showPointsRadius": 3,
+                                        "showSeparateAxis": false,
+                                        "axisPosition": "left",
+                                        "thresholds": [
+                                            {
+                                                "thresholdValueSource": "predefinedValue"
+                                            }
+                                        ],
+                                        "comparisonSettings": {
+                                            "showValuesForComparison": true
+                                        },
+                                        "type": "bar"
+                                    },
+                                    "_hash": 0.0661644137210089,
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": null,
+                                    "postFuncBody": null
+                                }
+                            ]
+                        }
+                    ],
+                    "timewindow": {
+                        "hideInterval": false,
+                        "hideAggregation": false,
+                        "hideAggInterval": false,
+                        "selectedTab": 1,
+                        "history": {
+                            "historyType": 0,
+                            "timewindowMs": 2592000000,
+                            "interval": 86400000
+                        },
+                        "aggregation": {
+                            "type": "SUM",
+                            "limit": 1000
+                        }
+                    },
+                    "showTitle": true,
+                    "backgroundColor": "#FFFFFF",
+                    "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": "var rounder = Math.pow(10, 1);\nvar powers = [\n  {key: 'Q', value: Math.pow(10, 15)},\n  {key: 'T', value: Math.pow(10, 12)},\n  {key: 'B', value: Math.pow(10, 9)},\n  {key: 'M', value: Math.pow(10, 6)},\n  {key: 'K', value: 1000}\n];\n\nvar key = '';\n\nfor (var i = 0; i < powers.length; i++) {\n    var reduced = value / powers[i].value;\n    reduced = Math.round(reduced * rounder) / rounder;\n    if (reduced >= 1) {\n        value = reduced;\n        key = powers[i].key;\n        break;\n    }\n}\nreturn value + key;",
+                                "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,
+                                "min": null,
+                                "max": null
+                            }
+                        },
+                        "thresholds": [],
+                        "dataZoom": false,
+                        "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)",
+                            "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": false,
+                                "relativeWidth": 2,
+                                "absoluteWidth": 1800000
+                            },
+                            "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": "bottom",
+                            "sortDataKeys": false,
+                            "showMin": false,
+                            "showMax": false,
+                            "showAvg": false,
+                            "showTotal": true,
+                            "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)",
+                        "tooltipShowDate": true,
+                        "tooltipDateFormat": {
+                            "format": "yyyy-MM-dd HH:mm:ss",
+                            "lastUpdateAgo": false,
+                            "custom": false
+                        },
+                        "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": 1000,
+                            "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
+                            }
+                        }
+                    },
+                    "title": "{i18n:api-usage.sms-messages-daily-activity}",
+                    "dropShadow": true,
+                    "enableFullscreen": true,
+                    "titleStyle": 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"
                 },
-                {
-                  "name": "alarmApiState",
-                  "type": "timeseries",
-                  "label": "cardId",
-                  "color": "#607d8b",
-                  "settings": {},
-                  "_hash": 0.051659774305067296,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": true,
-                  "postFuncBody": "return (Math.random()*100000).toFixed(0);"
+                "row": 0,
+                "col": 0,
+                "id": "9a191755-499d-535e-86c5-061102729c02"
+            },
+            "4b266318-8357-33ef-ca5a-74cbf90e014f": {
+                "typeFullFqn": "system.time_series_chart",
+                "type": "timeseries",
+                "sizeX": 8,
+                "sizeY": 5,
+                "config": {
+                    "datasources": [
+                        {
+                            "type": "entity",
+                            "name": null,
+                            "entityAliasId": "40193437-33ac-3172-eefd-0b08eb849062",
+                            "filterId": null,
+                            "dataKeys": [
+                                {
+                                    "name": "emailCount",
+                                    "type": "timeseries",
+                                    "label": "{i18n:api-usage.email-messages}",
+                                    "color": "#d35a00",
+                                    "settings": {
+                                        "excludeFromStacking": false,
+                                        "hideDataByDefault": false,
+                                        "disableDataHiding": false,
+                                        "removeFromLegend": false,
+                                        "showLines": false,
+                                        "fillLines": false,
+                                        "showPoints": false,
+                                        "showPointShape": "circle",
+                                        "pointShapeFormatter": "",
+                                        "showPointsLineWidth": 5,
+                                        "showPointsRadius": 3,
+                                        "showSeparateAxis": false,
+                                        "axisPosition": "left",
+                                        "thresholds": [
+                                            {
+                                                "thresholdValueSource": "predefinedValue"
+                                            }
+                                        ],
+                                        "comparisonSettings": {
+                                            "showValuesForComparison": true
+                                        },
+                                        "type": "bar"
+                                    },
+                                    "_hash": 0.0661644137210089,
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": null,
+                                    "postFuncBody": null
+                                }
+                            ]
+                        }
+                    ],
+                    "timewindow": {
+                        "hideInterval": false,
+                        "hideAggregation": false,
+                        "hideAggInterval": false,
+                        "selectedTab": 1,
+                        "history": {
+                            "historyType": 0,
+                            "timewindowMs": 31536000000,
+                            "interval": 1000
+                        },
+                        "aggregation": {
+                            "type": "NONE",
+                            "limit": 1000
+                        }
+                    },
+                    "showTitle": true,
+                    "backgroundColor": "#FFFFFF",
+                    "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": "var rounder = Math.pow(10, 1);\nvar powers = [\n  {key: 'Q', value: Math.pow(10, 15)},\n  {key: 'T', value: Math.pow(10, 12)},\n  {key: 'B', value: Math.pow(10, 9)},\n  {key: 'M', value: Math.pow(10, 6)},\n  {key: 'K', value: 1000}\n];\n\nvar key = '';\n\nfor (var i = 0; i < powers.length; i++) {\n    var reduced = value / powers[i].value;\n    reduced = Math.round(reduced * rounder) / rounder;\n    if (reduced >= 1) {\n        value = reduced;\n        key = powers[i].key;\n        break;\n    }\n}\nreturn value + key;",
+                                "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,
+                                "min": null,
+                                "max": null
+                            }
+                        },
+                        "thresholds": [],
+                        "dataZoom": false,
+                        "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)",
+                            "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": 6,
+                                "absoluteWidth": 900000000
+                            },
+                            "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": "bottom",
+                            "sortDataKeys": false,
+                            "showMin": false,
+                            "showMax": false,
+                            "showAvg": false,
+                            "showTotal": true,
+                            "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)",
+                        "tooltipShowDate": true,
+                        "tooltipDateFormat": {
+                            "format": "yyyy-MM-dd HH:mm:ss",
+                            "lastUpdateAgo": false,
+                            "custom": false
+                        },
+                        "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": 1000,
+                            "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
+                            }
+                        }
+                    },
+                    "title": "{i18n:api-usage.email-messages-monthly-activity}",
+                    "dropShadow": true,
+                    "enableFullscreen": true,
+                    "titleStyle": 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"
                 },
-                {
-                  "name": "alarmApiState",
-                  "type": "timeseries",
-                  "label": "title",
-                  "color": "#9c27b0",
-                  "settings": {},
-                  "_hash": 0.43439375716502227,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": true,
-                  "postFuncBody": "return \"{i18n:api-usage.alarm}\";"
+                "row": 0,
+                "col": 0,
+                "id": "4b266318-8357-33ef-ca5a-74cbf90e014f"
+            },
+            "5aa33b0b-3bd5-7fe7-ee72-f564c2ca79d8": {
+                "typeFullFqn": "system.time_series_chart",
+                "type": "timeseries",
+                "sizeX": 8,
+                "sizeY": 5,
+                "config": {
+                    "datasources": [
+                        {
+                            "type": "entity",
+                            "name": null,
+                            "entityAliasId": "40193437-33ac-3172-eefd-0b08eb849062",
+                            "filterId": null,
+                            "dataKeys": [
+                                {
+                                    "name": "smsCount",
+                                    "type": "timeseries",
+                                    "label": "{i18n:api-usage.sms-messages}",
+                                    "color": "#f36021",
+                                    "settings": {
+                                        "excludeFromStacking": false,
+                                        "hideDataByDefault": false,
+                                        "disableDataHiding": false,
+                                        "removeFromLegend": false,
+                                        "showLines": false,
+                                        "fillLines": false,
+                                        "showPoints": false,
+                                        "showPointShape": "circle",
+                                        "pointShapeFormatter": "",
+                                        "showPointsLineWidth": 5,
+                                        "showPointsRadius": 3,
+                                        "showSeparateAxis": false,
+                                        "axisPosition": "left",
+                                        "thresholds": [
+                                            {
+                                                "thresholdValueSource": "predefinedValue"
+                                            }
+                                        ],
+                                        "comparisonSettings": {
+                                            "showValuesForComparison": true
+                                        },
+                                        "type": "bar"
+                                    },
+                                    "_hash": 0.0661644137210089,
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": null,
+                                    "postFuncBody": null
+                                }
+                            ]
+                        }
+                    ],
+                    "timewindow": {
+                        "hideInterval": false,
+                        "hideAggregation": false,
+                        "hideAggInterval": false,
+                        "selectedTab": 1,
+                        "history": {
+                            "historyType": 0,
+                            "timewindowMs": 31536000000,
+                            "interval": 1000
+                        },
+                        "aggregation": {
+                            "type": "NONE",
+                            "limit": 1000
+                        }
+                    },
+                    "showTitle": true,
+                    "backgroundColor": "#FFFFFF",
+                    "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": "var rounder = Math.pow(10, 1);\nvar powers = [\n  {key: 'Q', value: Math.pow(10, 15)},\n  {key: 'T', value: Math.pow(10, 12)},\n  {key: 'B', value: Math.pow(10, 9)},\n  {key: 'M', value: Math.pow(10, 6)},\n  {key: 'K', value: 1000}\n];\n\nvar key = '';\n\nfor (var i = 0; i < powers.length; i++) {\n    var reduced = value / powers[i].value;\n    reduced = Math.round(reduced * rounder) / rounder;\n    if (reduced >= 1) {\n        value = reduced;\n        key = powers[i].key;\n        break;\n    }\n}\nreturn value + key;",
+                                "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,
+                                "min": null,
+                                "max": null
+                            }
+                        },
+                        "thresholds": [],
+                        "dataZoom": false,
+                        "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)",
+                            "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": 6,
+                                "absoluteWidth": 900000000
+                            },
+                            "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": "bottom",
+                            "sortDataKeys": false,
+                            "showMin": false,
+                            "showMax": false,
+                            "showAvg": false,
+                            "showTotal": true,
+                            "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)",
+                        "tooltipShowDate": true,
+                        "tooltipDateFormat": {
+                            "format": "yyyy-MM-dd HH:mm:ss",
+                            "lastUpdateAgo": false,
+                            "custom": false
+                        },
+                        "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": 1000,
+                            "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
+                            }
+                        }
+                    },
+                    "title": "{i18n:api-usage.sms-messages-monthly-activity}",
+                    "dropShadow": true,
+                    "enableFullscreen": true,
+                    "titleStyle": 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"
                 },
-                {
-                  "name": "alarmApiState",
-                  "type": "timeseries",
-                  "label": "unit",
-                  "color": "#8bc34a",
-                  "settings": {},
-                  "_hash": 0.9964061963495883,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": true,
-                  "postFuncBody": "return \"{i18n:api-usage.alarms-created}\";"
-                }
-              ]
-            }
-          ],
-          "timewindow": {
-            "displayValue": "",
-            "selectedTab": 0,
-            "realtime": {
-              "realtimeType": 1,
-              "interval": 1000,
-              "timewindowMs": 60000,
-              "quickInterval": "CURRENT_DAY"
+                "row": 0,
+                "col": 0,
+                "id": "5aa33b0b-3bd5-7fe7-ee72-f564c2ca79d8"
             },
-            "history": {
-              "historyType": 0,
-              "interval": 1000,
-              "timewindowMs": 60000,
-              "fixedTimewindow": {
-                "startTimeMs": 1694083375826,
-                "endTimeMs": 1694169775826
-              },
-              "quickInterval": "CURRENT_DAY"
+            "fa938580-33db-f1b3-fafc-bc3e3784ad57": {
+                "typeFullFqn": "system.time_series_chart",
+                "type": "timeseries",
+                "sizeX": 8,
+                "sizeY": 5,
+                "config": {
+                    "datasources": [
+                        {
+                            "type": "entity",
+                            "entityAliasId": "2e4c97b0-257a-a1b9-690c-141d9bf2ec6f",
+                            "dataKeys": [
+                                {
+                                    "name": "successfulMsgs",
+                                    "type": "timeseries",
+                                    "label": "{i18n:api-usage.successful}",
+                                    "color": "#4caf50",
+                                    "settings": {
+                                        "yAxisId": "default",
+                                        "showInLegend": true,
+                                        "dataHiddenByDefault": false,
+                                        "type": "line",
+                                        "lineSettings": {
+                                            "showLine": true,
+                                            "step": false,
+                                            "stepType": "start",
+                                            "smooth": false,
+                                            "lineType": "solid",
+                                            "lineWidth": 2.5,
+                                            "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)",
+                                            "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)",
+                                            "backgroundSettings": {
+                                                "type": "none",
+                                                "opacity": 0.4,
+                                                "gradient": {
+                                                    "start": 100,
+                                                    "end": 0
+                                                }
+                                            }
+                                        }
+                                    },
+                                    "_hash": 0.15490750967648736,
+                                    "aggregationType": null,
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": null,
+                                    "postFuncBody": null
+                                },
+                                {
+                                    "name": "failedMsgs",
+                                    "type": "timeseries",
+                                    "label": "{i18n:api-usage.permanent-failures}",
+                                    "color": "#ef5350",
+                                    "settings": {
+                                        "yAxisId": "default",
+                                        "showInLegend": true,
+                                        "dataHiddenByDefault": false,
+                                        "type": "line",
+                                        "lineSettings": {
+                                            "showLine": true,
+                                            "step": false,
+                                            "stepType": "start",
+                                            "smooth": false,
+                                            "lineType": "solid",
+                                            "lineWidth": 2.5,
+                                            "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)",
+                                            "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)",
+                                            "backgroundSettings": {
+                                                "type": "none",
+                                                "opacity": 0.4,
+                                                "gradient": {
+                                                    "start": 100,
+                                                    "end": 0
+                                                }
+                                            }
+                                        }
+                                    },
+                                    "_hash": 0.4186621166514697,
+                                    "aggregationType": null,
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": null,
+                                    "postFuncBody": null
+                                },
+                                {
+                                    "name": "tmpFailed",
+                                    "type": "timeseries",
+                                    "label": "{i18n:api-usage.processing-failures}",
+                                    "color": "#ffc107",
+                                    "settings": {
+                                        "yAxisId": "default",
+                                        "showInLegend": true,
+                                        "dataHiddenByDefault": false,
+                                        "type": "line",
+                                        "lineSettings": {
+                                            "showLine": true,
+                                            "step": false,
+                                            "stepType": "start",
+                                            "smooth": false,
+                                            "lineType": "solid",
+                                            "lineWidth": 2.5,
+                                            "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)",
+                                            "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)",
+                                            "backgroundSettings": {
+                                                "type": "none",
+                                                "opacity": 0.4,
+                                                "gradient": {
+                                                    "start": 100,
+                                                    "end": 0
+                                                }
+                                            }
+                                        }
+                                    },
+                                    "_hash": 0.49891007198715376,
+                                    "aggregationType": null,
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": null,
+                                    "postFuncBody": null
+                                }
+                            ],
+                            "alarmFilterConfig": {
+                                "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": {
+                        "hideInterval": false,
+                        "hideAggregation": false,
+                        "hideAggInterval": false,
+                        "selectedTab": 0,
+                        "realtime": {
+                            "timewindowMs": 3600000,
+                            "interval": 1000
+                        },
+                        "aggregation": {
+                            "type": "NONE",
+                            "limit": 10000
+                        }
+                    },
+                    "showTitle": true,
+                    "backgroundColor": "#FFFFFF",
+                    "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": "var rounder = Math.pow(10, 1);\nvar powers = [\n  {key: 'Q', value: Math.pow(10, 15)},\n  {key: 'T', value: Math.pow(10, 12)},\n  {key: 'B', value: Math.pow(10, 9)},\n  {key: 'M', value: Math.pow(10, 6)},\n  {key: 'K', value: 1000}\n];\n\nvar key = '';\n\nfor (var i = 0; i < powers.length; i++) {\n    var reduced = value / powers[i].value;\n    reduced = Math.round(reduced * rounder) / rounder;\n    if (reduced >= 1) {\n        value = reduced;\n        key = powers[i].key;\n        break;\n    }\n}\nreturn value + key;",
+                                "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,
+                                "min": null,
+                                "max": null
+                            }
+                        },
+                        "thresholds": [],
+                        "dataZoom": false,
+                        "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)",
+                            "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": false,
+                                "relativeWidth": 2,
+                                "absoluteWidth": 1800000
+                            },
+                            "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": "bottom",
+                            "sortDataKeys": false,
+                            "showMin": true,
+                            "showMax": true,
+                            "showAvg": false,
+                            "showTotal": true,
+                            "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)",
+                        "tooltipShowDate": true,
+                        "tooltipDateFormat": {
+                            "format": "yyyy-MM-dd HH:mm:ss",
+                            "lastUpdateAgo": false,
+                            "custom": false
+                        },
+                        "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": 300,
+                            "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"
+                    },
+                    "title": "{i18n:api-usage.queue-stats}",
+                    "dropShadow": true,
+                    "enableFullscreen": true,
+                    "titleStyle": 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"
+                },
+                "row": 0,
+                "col": 0,
+                "id": "fa938580-33db-f1b3-fafc-bc3e3784ad57"
             },
-            "aggregation": {
-              "type": "AVG",
-              "limit": 25000
+            "2ee89893-4e38-5331-95b7-3fd4f310c5a7": {
+                "typeFullFqn": "system.time_series_chart",
+                "type": "timeseries",
+                "sizeX": 8,
+                "sizeY": 5,
+                "config": {
+                    "datasources": [
+                        {
+                            "type": "entity",
+                            "entityAliasId": "2e4c97b0-257a-a1b9-690c-141d9bf2ec6f",
+                            "dataKeys": [
+                                {
+                                    "name": "timeoutMsgs",
+                                    "type": "timeseries",
+                                    "label": "{i18n:api-usage.permanent-timeouts}",
+                                    "color": "#4caf50",
+                                    "settings": {
+                                        "yAxisId": "default",
+                                        "showInLegend": true,
+                                        "dataHiddenByDefault": false,
+                                        "type": "line",
+                                        "lineSettings": {
+                                            "showLine": true,
+                                            "step": false,
+                                            "stepType": "start",
+                                            "smooth": false,
+                                            "lineType": "solid",
+                                            "lineWidth": 2.5,
+                                            "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)",
+                                            "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)",
+                                            "backgroundSettings": {
+                                                "type": "none",
+                                                "opacity": 0.4,
+                                                "gradient": {
+                                                    "start": 100,
+                                                    "end": 0
+                                                }
+                                            }
+                                        }
+                                    },
+                                    "_hash": 0.565222981550328,
+                                    "aggregationType": null,
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": null,
+                                    "postFuncBody": null
+                                },
+                                {
+                                    "name": "tmpTimeout",
+                                    "type": "timeseries",
+                                    "label": "{i18n:api-usage.processing-timeouts}",
+                                    "color": "#9c27b0",
+                                    "settings": {
+                                        "yAxisId": "default",
+                                        "showInLegend": true,
+                                        "dataHiddenByDefault": false,
+                                        "type": "line",
+                                        "lineSettings": {
+                                            "showLine": true,
+                                            "step": false,
+                                            "stepType": "start",
+                                            "smooth": false,
+                                            "lineType": "solid",
+                                            "lineWidth": 2.5,
+                                            "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)",
+                                            "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)",
+                                            "backgroundSettings": {
+                                                "type": "none",
+                                                "opacity": 0.4,
+                                                "gradient": {
+                                                    "start": 100,
+                                                    "end": 0
+                                                }
+                                            }
+                                        }
+                                    },
+                                    "_hash": 0.2679547062508352,
+                                    "aggregationType": null,
+                                    "units": null,
+                                    "decimals": null,
+                                    "funcBody": null,
+                                    "usePostProcessing": null,
+                                    "postFuncBody": null
+                                }
+                            ],
+                            "alarmFilterConfig": {
+                                "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": {
+                        "hideInterval": false,
+                        "hideAggregation": false,
+                        "hideAggInterval": false,
+                        "selectedTab": 0,
+                        "realtime": {
+                            "timewindowMs": 3600000,
+                            "interval": 1000
+                        },
+                        "aggregation": {
+                            "type": "NONE",
+                            "limit": 10000
+                        }
+                    },
+                    "showTitle": true,
+                    "backgroundColor": "#FFFFFF",
+                    "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": "var rounder = Math.pow(10, 1);\nvar powers = [\n  {key: 'Q', value: Math.pow(10, 15)},\n  {key: 'T', value: Math.pow(10, 12)},\n  {key: 'B', value: Math.pow(10, 9)},\n  {key: 'M', value: Math.pow(10, 6)},\n  {key: 'K', value: 1000}\n];\n\nvar key = '';\n\nfor (var i = 0; i < powers.length; i++) {\n    var reduced = value / powers[i].value;\n    reduced = Math.round(reduced * rounder) / rounder;\n    if (reduced >= 1) {\n        value = reduced;\n        key = powers[i].key;\n        break;\n    }\n}\nreturn value + key;",
+                                "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,
+                                "min": null,
+                                "max": null
+                            }
+                        },
+                        "thresholds": [],
+                        "dataZoom": false,
+                        "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)",
+                            "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": false,
+                                "relativeWidth": 2,
+                                "absoluteWidth": 1800000
+                            },
+                            "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": "bottom",
+                            "sortDataKeys": false,
+                            "showMin": true,
+                            "showMax": true,
+                            "showAvg": false,
+                            "showTotal": true,
+                            "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)",
+                        "tooltipShowDate": true,
+                        "tooltipDateFormat": {
+                            "format": "yyyy-MM-dd HH:mm:ss",
+                            "lastUpdateAgo": false,
+                            "custom": false
+                        },
+                        "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": 300,
+                            "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"
+                    },
+                    "title": "{i18n:api-usage.processing-failures-and-timeouts}",
+                    "dropShadow": true,
+                    "enableFullscreen": true,
+                    "titleStyle": 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"
+                },
+                "row": 0,
+                "col": 0,
+                "id": "2ee89893-4e38-5331-95b7-3fd4f310c5a7"
             }
-          },
-          "showTitle": false,
-          "backgroundColor": "#fff",
-          "color": "#666666",
-          "padding": "0",
-          "settings": {
-            "cardHtml": "<div class='card ${apiStateClass}'>\n    <img src=\"data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7\" onload=\"initializeCard_${cardId:0}(event);\">\n    <script type=\"text/javascript\">\n        function initializeCard_${cardId:0}(e) {\n            \n            function toShortNumber(number) {\n                var rounder = Math.pow(10, 1);\n                var powers = [\n                  {key: 'Q', value: Math.pow(10, 15)},\n                  {key: 'T', value: Math.pow(10, 12)},\n                  {key: 'B', value: Math.pow(10, 9)},\n                  {key: 'M', value: Math.pow(10, 6)},\n                  {key: 'K', value: 1000}\n                ];\n                \n                var key = '';\n                \n                for (var i = 0; i < powers.length; i++) {\n                    var reduced = number / powers[i].value;\n                    reduced = Math.round(reduced * rounder) / rounder;\n                    if (reduced >= 1) {\n                        number = reduced;\n                        key = powers[i].key;\n                        break;\n                    }\n                }\n                return number + key;\n            }\n            \n            var imgTag = e.target;\n            var parentTag = imgTag.parentNode;\n            var count = \"${count:0}\";\n            var limit = \"${limit:0}\";\n            count = count.length > 0 ? parseInt(count, 10) : 0;\n            limit = limit.length > 0 ? parseInt(limit, 10) : 0;\n            var percentElement = $('#api-usage-percent', parentTag);\n            var valueElement = $('#api-usage-value', parentTag);\n            var barElement = $('#api-usage-bar', parentTag);\n            if (Number.isFinite(limit) && limit > 0) {\n                var percent = Math.min(100, ((count / limit) * 100));\n                barElement.width(percent + '%');\n                percent = percent.toFixed(2);\n                percentElement.text(percent + '%');\n                valueElement.text(toShortNumber(count) + ' / ' + toShortNumber(limit));\n            } else {\n                barElement.width('0%');\n                percentElement.text('');\n                valueElement.text(toShortNumber(count) + ' / ∞');\n            }\n        }\n    </script>\n    <div class='content'>\n        <div class='column'>\n            <div class='title-row'>\n                <div class='title'>${title}</div>\n                <div class='state'>${apiState}</div>\n            </div>    \n            <div class='bar-container'>\n                <div class=\"unit\">${unit}</div>\n                <div class='bar'>\n                    <div class=\"bar-fill\" id=\"api-usage-bar\"></div>\n                </div>    \n                <div class='bar-labels'>\n                    <div id=\"api-usage-percent\"></div>\n                    <div style=\"flex: 1;\"></div>\n                    <div id=\"api-usage-value\"></div>\n                </div>\n            </div>    \n        </div>\n    </div>\n    <div role=\"separator\" class=\"mat-divider mat-divider-horizontal\" aria-orientation=\"horizontal\"></div>\n    <div class='action-row'>\n        <button id=\"email_messages_details\" class=\"mdc-button mat-mdc-button mat-primary mat-mdc-button-base\">\n   <span class=\"mat-mdc-button-persistent-ripple mdc-button__ripple\"></span>\n          <span class=\"mdc-button__label\">{i18n:api-usage.view-details}</span>\n            <span class=\"mat-ripple mat-mdc-button-ripple\"></span>\n      <span class=\"mat-mdc-button-touch-target\"></span>\n       <span class=\"mat-mdc-focus-indicator\"></span>\n        </button>\n    </div> \n</div>",
-            "cardCss": ".card {\n   width: 100%;\n   height: 100%;\n   box-sizing: border-box;\n   display: flex;\n   flex-direction: column;\n}\n\n.card > img {\n    height: 0;\n}\n\n.card .content {\n   flex: 1;    \n   padding: 13px 13px 0;\n   display: flex;\n   box-sizing: border-box;\n}\n\n.card .content .column {\n   display: flex;\n   flex-direction: column;    \n   justify-content: space-around;\n   flex: 1;\n}\n\n.card .content .title-row {\n    display: flex;\n    flex-direction: row;\n    padding-bottom: 10px;\n}\n\n.card .title {\n    flex: 1;\n    font-size: 20px;\n    font-weight: 400;\n    color: #666666;\n}\n\n.card .state {\n    text-transform: uppercase;\n    font-size: 20px;\n    font-weight: bold;\n}\n\n.card.enabled .state {\n    color: #00B260;\n}\n\n.card.warning .state {\n    color: #FFAD6F;\n}\n\n.card.disabled .state {\n    color: #F73243;\n}\n\n.card .bar-container {\n    flex: 1;\n    display: flex;\n    flex-direction: column;\n    justify-content: center;\n}\n\n.card .bar {\n    flex: 1;\n    max-height: 30px;\n    margin-top: 3.5px;\n    margin-bottom: 4px;\n    background-color: #F0F0F0;\n    border: 1px solid #DADCDB;\n    border-radius: 2px;\n    box-shadow: inset 0 1px 3px rgba(0, 0, 0, .2);\n}\n\n.card.enabled .bar {\n    border-color: #00B260;\n    background-color: #F0FBF7;\n}\n\n.card.warning .bar {\n    border-color: #FFAD6F;\n    background-color: #FFFAF6;\n}\n\n.card.disabled .bar {\n    border-color: #F73243;\n    background-color: #FFF0F0;\n}\n\n.card .bar .bar-fill {\n    background-color: #F0F0F0;\n    border-radius: 2px;\n    height: 100%;\n    width: 0%;\n}\n\n.card.enabled .bar-fill {\n    background-color: #00C46C;\n}\n\n.card.warning .bar-fill {\n    background-color: #FFD099;\n}\n\n.card.disabled .bar-fill {\n    background-color: #FF9494;\n}\n\n.card .bar-labels {\n    height: 20px;\n    font-size: 16px;\n    color: #666;\n    display: flex;\n    flex-direction: row;\n}\n\n\n.card .mat-mdc-button-base {\n    text-transform: uppercase;\n    white-space: nowrap;\n    overflow: hidden;\n    text-overflow: ellipsis;\n}\n\n.card .mdc-button__label {\n    pointer-events: none;\n}\n\n.card .action-row {\n    display: flex;\n    flex-direction: row;\n    justify-content: flex-end;\n    padding: 8px 0;\n}\n\n@media screen and (min-width: 960px) and (max-width: 1279px) {\n  .card .title {\n      font-size: 12px;\n  }\n  .card .state {\n      font-size: 12px;\n  }\n  .card .unit {\n      font-size: 8px;\n  }\n  .card .bar-labels {\n      font-size: 8px;\n  }\n  .card .mat-mdc-button-base {\n      font-size: 8px;\n  }\n  .card .action-row {\n      padding: 0;\n  }\n}\n\n@media screen and (min-width: 1280px) and (max-width: 1599px) {\n  .card .title {\n      font-size: 14px;\n  }\n  .card .state {\n      font-size: 14px;\n  }\n  .card .unit {\n      font-size: 10px;\n  }\n  .card .bar-labels {\n      font-size: 10px;\n  }\n  .card .mat-mdc-button-base {\n      font-size: 10px;\n  }\n  .card .action-row {\n      padding: 0;\n  }\n}\n\n@media screen and (min-width: 1600px) and (max-width: 1919px) {\n  .card .title {\n      font-size: 16px;\n  }\n  .card .state {\n      font-size: 16px;\n  }\n  .card .unit {\n      font-size: 12px;\n  }\n  .card .bar-labels {\n      font-size: 12px;\n  }\n  .card .mat-mdc-button-base {\n      font-size: 12px;\n  }\n  .card .action-row {\n      padding: 0;\n  }\n}    \n\n\n"
-          },
-          "title": "Alarm created",
-          "dropShadow": true,
-          "enableFullscreen": false,
-          "widgetStyle": {
-            "cursor": "default"
-          },
-          "titleStyle": {
-            "fontSize": "20px",
-            "fontWeight": 400
-          },
-          "useDashboardTimewindow": true,
-          "showLegend": false,
-          "actions": {
-            "elementClick": [
-              {
-                "name": "email_messages_details",
-                "icon": "insert_chart",
-                "type": "openDashboardState",
-                "targetDashboardStateId": "alarms_created",
-                "setEntityId": false,
-                "stateEntityParamName": null,
-                "openInSeparateDialog": null,
-                "dialogTitle": null,
-                "dialogHideDashboardToolbar": true,
-                "dialogWidth": null,
-                "dialogHeight": null,
-                "openRightLayout": false,
-                "id": "946ba769-84ac-1507-6baa-94701de8967b"
-              }
-            ]
-          },
-          "showTitleIcon": false,
-          "iconColor": "rgba(0, 0, 0, 0.87)",
-          "iconSize": "24px",
-          "titleTooltip": ""
         },
-        "row": 0,
-        "col": 0,
-        "id": "a151ae60-0326-6116-d818-9070dda8e9c7",
-        "typeFullFqn": "system.cards.html_value_card"
-      },
-      "68e16e98-0420-f72c-4848-41dedffd3904": {
-        "type": "timeseries",
-        "sizeX": 8,
-        "sizeY": 5,
-        "config": {
-          "datasources": [
-            {
-              "type": "entity",
-              "name": null,
-              "entityAliasId": "40193437-33ac-3172-eefd-0b08eb849062",
-              "filterId": null,
-              "dataKeys": [
-                {
-                  "name": "ruleEngineExecutionCountHourly",
-                  "type": "timeseries",
-                  "label": "{i18n:api-usage.rule-engine-executions}",
-                  "color": "#ab00ff",
-                  "settings": {
-                    "excludeFromStacking": false,
-                    "hideDataByDefault": false,
-                    "disableDataHiding": false,
-                    "removeFromLegend": false,
-                    "showLines": false,
-                    "fillLines": false,
-                    "showPoints": false,
-                    "showPointShape": "circle",
-                    "pointShapeFormatter": "",
-                    "showPointsLineWidth": 5,
-                    "showPointsRadius": 3,
-                    "showSeparateAxis": false,
-                    "axisPosition": "left",
-                    "thresholds": [
-                      {
-                        "thresholdValueSource": "predefinedValue"
-                      }
-                    ],
-                    "comparisonSettings": {
-                      "showValuesForComparison": true
+        "states": {
+            "default": {
+                "name": "{i18n:api-usage.api-usage}",
+                "root": true,
+                "layouts": {
+                    "main": {
+                        "widgets": {
+                            "aab68ab5-8e40-8694-c55c-8eb1c89b88fb": {
+                                "sizeX": 4,
+                                "sizeY": 2,
+                                "row": 0,
+                                "col": 0
+                            },
+                            "a84fa70a-ddfa-3b24-9aa4-cf9ce91f919a": {
+                                "sizeX": 4,
+                                "sizeY": 2,
+                                "row": 0,
+                                "col": 4
+                            },
+                            "d70d26d4-e22d-4ca9-9ea7-f9c87c093321": {
+                                "sizeX": 4,
+                                "sizeY": 2,
+                                "row": 0,
+                                "col": 8
+                            },
+                            "4d3ea95c-3188-9872-1817-2f989c7729e0": {
+                                "sizeX": 4,
+                                "sizeY": 2,
+                                "row": 0,
+                                "col": 12
+                            },
+                            "2d0d6ff6-cd59-51d4-b916-38e22cdd0702": {
+                                "sizeX": 4,
+                                "sizeY": 2,
+                                "row": 0,
+                                "col": 16
+                            },
+                            "120573cc-e246-eb49-7d80-68e5d3b3c0cc": {
+                                "sizeX": 4,
+                                "sizeY": 2,
+                                "row": 0,
+                                "col": 20
+                            },
+                            "63f99d90-23ab-f8c2-3290-1e693ded5a2e": {
+                                "sizeX": 8,
+                                "sizeY": 4,
+                                "row": 2,
+                                "col": 0
+                            },
+                            "a2b7e906-2d8a-41a8-99a6-409531bfa743": {
+                                "sizeX": 8,
+                                "sizeY": 4,
+                                "row": 2,
+                                "col": 8
+                            },
+                            "ca996b66-ab7e-f977-152c-98e4ebf2a901": {
+                                "sizeX": 8,
+                                "sizeY": 4,
+                                "row": 2,
+                                "col": 16
+                            },
+                            "a3c2f1bb-7d3a-f11c-7b3d-28cd84fdfe34": {
+                                "sizeX": 8,
+                                "sizeY": 4,
+                                "row": 6,
+                                "col": 0
+                            },
+                            "5cebd4f1-ff6e-62f9-025c-8e7583c3d66a": {
+                                "sizeX": 8,
+                                "sizeY": 4,
+                                "row": 6,
+                                "col": 8
+                            },
+                            "bc0c8840-a9b5-5583-de7b-9e9450f5d8fe": {
+                                "sizeX": 8,
+                                "sizeY": 4,
+                                "row": 6,
+                                "col": 16
+                            }
+                        },
+                        "gridSettings": {
+                            "backgroundColor": "#eeeeee",
+                            "color": "rgba(0,0,0,0.870588)",
+                            "columns": 24,
+                            "margin": 5,
+                            "backgroundSizeMode": "100%",
+                            "autoFillHeight": true,
+                            "backgroundImageUrl": null,
+                            "mobileAutoFillHeight": false,
+                            "mobileRowHeight": 100,
+                            "outerMargin": true
+                        }
                     }
-                  },
-                  "_hash": 0.0661644137210089,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": null,
-                  "postFuncBody": null
                 }
-              ]
-            }
-          ],
-          "timewindow": {
-            "hideInterval": false,
-            "hideAggregation": false,
-            "hideAggInterval": false,
-            "selectedTab": 0,
-            "realtime": {
-              "timewindowMs": 86400000,
-              "interval": 3600000
-            },
-            "aggregation": {
-              "type": "NONE",
-              "limit": 1000
-            }
-          },
-          "showTitle": true,
-          "backgroundColor": "#fff",
-          "color": "rgba(0, 0, 0, 0.87)",
-          "padding": "8px",
-          "settings": {
-            "shadowSize": 4,
-            "fontColor": "#545454",
-            "fontSize": 10,
-            "xaxis": {
-              "showLabels": true,
-              "color": "#545454"
-            },
-            "yaxis": {
-              "showLabels": true,
-              "color": "#545454",
-              "ticksFormatter": "var rounder = Math.pow(10, 1);\nvar powers = [\n  {key: 'Q', value: Math.pow(10, 15)},\n  {key: 'T', value: Math.pow(10, 12)},\n  {key: 'B', value: Math.pow(10, 9)},\n  {key: 'M', value: Math.pow(10, 6)},\n  {key: 'K', value: 1000}\n];\n\nvar key = '';\n\nfor (var i = 0; i < powers.length; i++) {\n    var reduced = value / powers[i].value;\n    reduced = Math.round(reduced * rounder) / rounder;\n    if (reduced >= 1) {\n        value = reduced;\n        key = powers[i].key;\n        break;\n    }\n}\nreturn value + key;",
-              "min": 0,
-              "tickDecimals": 0
-            },
-            "grid": {
-              "color": "#545454",
-              "tickColor": "#DDDDDD",
-              "verticalLines": true,
-              "horizontalLines": true,
-              "outlineWidth": 1
-            },
-            "stack": false,
-            "tooltipIndividual": false,
-            "defaultBarWidth": 2400000,
-            "barAlignment": "left",
-            "timeForComparison": "months",
-            "xaxisSecond": {
-              "axisPosition": "top",
-              "showLabels": true
             },
-            "showLegend": true,
-            "legendConfig": {
-              "direction": "column",
-              "position": "bottom",
-              "sortDataKeys": false,
-              "showMin": false,
-              "showMax": false,
-              "showAvg": false,
-              "showTotal": true
-            }
-          },
-          "title": "{i18n:api-usage.rule-engine-hourly-activity}",
-          "dropShadow": true,
-          "enableFullscreen": true,
-          "titleStyle": {
-            "fontSize": "16px",
-            "fontWeight": 400
-          },
-          "widgetStyle": {},
-          "useDashboardTimewindow": false,
-          "actions": {
-            "headerButton": [
-              {
-                "name": "{i18n:api-usage.view-statistics}",
-                "icon": "show_chart",
-                "type": "openDashboardState",
-                "targetDashboardStateId": "rule_engine_statistics",
-                "setEntityId": false,
-                "stateEntityParamName": null,
-                "openRightLayout": false,
-                "id": "f9f08190-9ed9-d802-5b7a-c57ff84b5648"
-              },
-              {
-                "name": "{i18n:api-usage.view-details}",
-                "icon": "insert_chart",
-                "type": "openDashboardState",
-                "targetDashboardStateId": "rule_engine_execution",
-                "setEntityId": false,
-                "stateEntityParamName": null,
-                "openRightLayout": false,
-                "id": "1aec196b-44ba-ddf4-c4dc-c3f60c1eb6fc"
-              }
-            ]
-          },
-          "displayTimewindow": true,
-          "showTitleIcon": false,
-          "iconColor": "rgba(0, 0, 0, 0.87)",
-          "iconSize": "24px",
-          "titleTooltip": ""
-        },
-        "row": 0,
-        "col": 0,
-        "id": "68e16e98-0420-f72c-4848-41dedffd3904",
-        "typeFullFqn": "system.charts.timeseries_bars_flot"
-      },
-      "2aa6b499-6e27-b315-6833-89c4d58485ce": {
-        "type": "timeseries",
-        "sizeX": 8,
-        "sizeY": 5,
-        "config": {
-          "datasources": [
-            {
-              "type": "entity",
-              "name": null,
-              "entityAliasId": "40193437-33ac-3172-eefd-0b08eb849062",
-              "filterId": null,
-              "dataKeys": [
-                {
-                  "name": "transportMsgCountHourly",
-                  "type": "timeseries",
-                  "label": "{i18n:api-usage.transport-messages}",
-                  "color": "#2196f3",
-                  "settings": {
-                    "excludeFromStacking": false,
-                    "hideDataByDefault": false,
-                    "disableDataHiding": false,
-                    "removeFromLegend": false,
-                    "showLines": false,
-                    "fillLines": false,
-                    "showPoints": false,
-                    "showPointShape": "circle",
-                    "pointShapeFormatter": "",
-                    "showPointsLineWidth": 5,
-                    "showPointsRadius": 3,
-                    "showSeparateAxis": false,
-                    "axisPosition": "left",
-                    "thresholds": [
-                      {
-                        "thresholdValueSource": "predefinedValue"
-                      }
-                    ],
-                    "comparisonSettings": {
-                      "showValuesForComparison": true
-                    }
-                  },
-                  "_hash": 0.0661644137210089,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": null,
-                  "postFuncBody": null
-                },
-                {
-                  "name": "transportDataPointsCountHourly",
-                  "type": "timeseries",
-                  "label": "{i18n:api-usage.transport-data-points}",
-                  "color": "#4caf50",
-                  "settings": {
-                    "excludeFromStacking": false,
-                    "hideDataByDefault": false,
-                    "disableDataHiding": false,
-                    "removeFromLegend": false,
-                    "showLines": false,
-                    "fillLines": false,
-                    "showPoints": false,
-                    "showPointShape": "circle",
-                    "pointShapeFormatter": "",
-                    "showPointsLineWidth": 5,
-                    "showPointsRadius": 3,
-                    "showSeparateAxis": false,
-                    "axisPosition": "left",
-                    "thresholds": [
-                      {
-                        "thresholdValueSource": "predefinedValue"
-                      }
-                    ],
-                    "comparisonSettings": {
-                      "showValuesForComparison": true
+            "transport": {
+                "name": "{i18n:api-usage.transport}",
+                "root": false,
+                "layouts": {
+                    "main": {
+                        "widgets": {
+                            "0b091dc3-eec3-847e-d0ad-fdf12d474e7a": {
+                                "sizeX": 24,
+                                "sizeY": 6,
+                                "row": 0,
+                                "col": 0
+                            },
+                            "536d7104-49f8-fde6-5827-61b8419f15ec": {
+                                "sizeX": 24,
+                                "sizeY": 6,
+                                "row": 6,
+                                "col": 0
+                            }
+                        },
+                        "gridSettings": {
+                            "backgroundColor": "#eeeeee",
+                            "color": "rgba(0,0,0,0.870588)",
+                            "columns": 24,
+                            "margin": 5,
+                            "backgroundSizeMode": "100%",
+                            "autoFillHeight": true,
+                            "backgroundImageUrl": null,
+                            "mobileAutoFillHeight": false,
+                            "mobileRowHeight": 70,
+                            "outerMargin": true
+                        }
                     }
-                  },
-                  "_hash": 0.46849996721308895,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": null,
-                  "postFuncBody": null
                 }
-              ]
-            }
-          ],
-          "timewindow": {
-            "hideInterval": false,
-            "hideAggregation": false,
-            "hideAggInterval": false,
-            "selectedTab": 0,
-            "realtime": {
-              "timewindowMs": 86400000,
-              "interval": 3600000
             },
-            "aggregation": {
-              "type": "NONE",
-              "limit": 1000
-            }
-          },
-          "showTitle": true,
-          "backgroundColor": "#fff",
-          "color": "rgba(0, 0, 0, 0.87)",
-          "padding": "8px",
-          "settings": {
-            "shadowSize": 4,
-            "fontColor": "#545454",
-            "fontSize": 10,
-            "xaxis": {
-              "showLabels": true,
-              "color": "#545454"
+            "rule_engine_execution": {
+                "name": "{i18n:api-usage.rule-engine-executions}",
+                "root": false,
+                "layouts": {
+                    "main": {
+                        "widgets": {
+                            "c77e417c-ad9d-8e23-3ea1-c75edd653bc0": {
+                                "sizeX": 24,
+                                "sizeY": 6,
+                                "row": 0,
+                                "col": 0
+                            },
+                            "870904d2-d2e1-a1b9-ce56-b03fd47259b5": {
+                                "sizeX": 24,
+                                "sizeY": 6,
+                                "row": 6,
+                                "col": 0
+                            }
+                        },
+                        "gridSettings": {
+                            "backgroundColor": "#eeeeee",
+                            "color": "rgba(0,0,0,0.870588)",
+                            "columns": 24,
+                            "margin": 5,
+                            "backgroundSizeMode": "100%",
+                            "autoFillHeight": true,
+                            "backgroundImageUrl": null,
+                            "mobileAutoFillHeight": false,
+                            "mobileRowHeight": 70,
+                            "outerMargin": true
+                        }
+                    }
+                }
             },
-            "yaxis": {
-              "showLabels": true,
-              "color": "#545454",
-              "ticksFormatter": "var rounder = Math.pow(10, 1);\nvar powers = [\n  {key: 'Q', value: Math.pow(10, 15)},\n  {key: 'T', value: Math.pow(10, 12)},\n  {key: 'B', value: Math.pow(10, 9)},\n  {key: 'M', value: Math.pow(10, 6)},\n  {key: 'K', value: 1000}\n];\n\nvar key = '';\n\nfor (var i = 0; i < powers.length; i++) {\n    var reduced = value / powers[i].value;\n    reduced = Math.round(reduced * rounder) / rounder;\n    if (reduced >= 1) {\n        value = reduced;\n        key = powers[i].key;\n        break;\n    }\n}\nreturn value + key;",
-              "min": 0,
-              "tickDecimals": 0
+            "telemetry_persistence": {
+                "name": "{i18n:api-usage.telemetry-persistence}",
+                "root": false,
+                "layouts": {
+                    "main": {
+                        "widgets": {
+                            "7f4100d2-41be-4954-d353-1d45000dbbbb": {
+                                "sizeX": 24,
+                                "sizeY": 6,
+                                "row": 0,
+                                "col": 0
+                            },
+                            "226ef8c9-8488-3664-21ac-0b6217336202": {
+                                "sizeX": 24,
+                                "sizeY": 6,
+                                "row": 6,
+                                "col": 0
+                            }
+                        },
+                        "gridSettings": {
+                            "backgroundColor": "#eeeeee",
+                            "color": "rgba(0,0,0,0.870588)",
+                            "columns": 24,
+                            "margin": 5,
+                            "backgroundSizeMode": "100%",
+                            "autoFillHeight": true,
+                            "backgroundImageUrl": null,
+                            "mobileAutoFillHeight": false,
+                            "mobileRowHeight": 70,
+                            "outerMargin": true
+                        }
+                    }
+                }
             },
-            "grid": {
-              "color": "#545454",
-              "tickColor": "#DDDDDD",
-              "verticalLines": true,
-              "horizontalLines": true,
-              "outlineWidth": 1
+            "rule_engine_statistics": {
+                "name": "{i18n:api-usage.rule-engine-statistics}",
+                "root": false,
+                "layouts": {
+                    "main": {
+                        "widgets": {
+                            "a669cf86-e715-efa4-dd9a-b839abf499e9": {
+                                "sizeX": 24,
+                                "sizeY": 5,
+                                "row": 7,
+                                "col": 0
+                            },
+                            "fa938580-33db-f1b3-fafc-bc3e3784ad57": {
+                                "sizeX": 12,
+                                "sizeY": 7,
+                                "row": 0,
+                                "col": 0
+                            },
+                            "2ee89893-4e38-5331-95b7-3fd4f310c5a7": {
+                                "sizeX": 12,
+                                "sizeY": 7,
+                                "row": 0,
+                                "col": 12
+                            }
+                        },
+                        "gridSettings": {
+                            "backgroundColor": "#eeeeee",
+                            "color": "rgba(0,0,0,0.870588)",
+                            "columns": 24,
+                            "margin": 5,
+                            "backgroundSizeMode": "100%",
+                            "autoFillHeight": true,
+                            "backgroundImageUrl": null,
+                            "mobileAutoFillHeight": false,
+                            "mobileRowHeight": 70,
+                            "outerMargin": true
+                        }
+                    }
+                }
             },
-            "stack": true,
-            "tooltipIndividual": false,
-            "defaultBarWidth": 2400000,
-            "barAlignment": "left",
-            "timeForComparison": "months",
-            "xaxisSecond": {
-              "axisPosition": "top",
-              "showLabels": true
+            "notifications": {
+                "name": "{i18n:api-usage.notifications-email-sms}",
+                "root": false,
+                "layouts": {
+                    "main": {
+                        "widgets": {
+                            "36fdf999-ca22-9a4c-269d-3f004d792792": {
+                                "sizeX": 12,
+                                "sizeY": 6,
+                                "row": 0,
+                                "col": 0
+                            },
+                            "9a191755-499d-535e-86c5-061102729c02": {
+                                "sizeX": 12,
+                                "sizeY": 6,
+                                "row": 0,
+                                "col": 12
+                            },
+                            "4b266318-8357-33ef-ca5a-74cbf90e014f": {
+                                "sizeX": 12,
+                                "sizeY": 6,
+                                "row": 6,
+                                "col": 0
+                            },
+                            "5aa33b0b-3bd5-7fe7-ee72-f564c2ca79d8": {
+                                "sizeX": 12,
+                                "sizeY": 6,
+                                "row": 6,
+                                "col": 12
+                            }
+                        },
+                        "gridSettings": {
+                            "backgroundColor": "#eeeeee",
+                            "color": "rgba(0,0,0,0.870588)",
+                            "columns": 24,
+                            "margin": 5,
+                            "backgroundSizeMode": "100%",
+                            "autoFillHeight": true,
+                            "backgroundImageUrl": null,
+                            "mobileAutoFillHeight": false,
+                            "mobileRowHeight": 70,
+                            "outerMargin": true
+                        }
+                    }
+                }
             },
-            "tooltipCumulative": false,
-            "showLegend": true,
-            "legendConfig": {
-              "direction": "column",
-              "position": "bottom",
-              "sortDataKeys": false,
-              "showMin": false,
-              "showMax": false,
-              "showAvg": false,
-              "showTotal": true
-            }
-          },
-          "title": "{i18n:api-usage.transport-hourly-activity}",
-          "dropShadow": true,
-          "enableFullscreen": true,
-          "titleStyle": {
-            "fontSize": "16px",
-            "fontWeight": 400
-          },
-          "widgetStyle": {},
-          "useDashboardTimewindow": false,
-          "actions": {
-            "headerButton": [
-              {
-                "name": "{i18n:api-usage.view-details}",
-                "icon": "insert_chart",
-                "type": "openDashboardState",
-                "targetDashboardStateId": "transport",
-                "setEntityId": false,
-                "stateEntityParamName": null,
-                "openRightLayout": false,
-                "id": "6ef12f6a-0266-25cf-6ca5-5dcb772252c6"
-              }
-            ]
-          },
-          "displayTimewindow": true,
-          "showTitleIcon": false,
-          "iconColor": "rgba(0, 0, 0, 0.87)",
-          "iconSize": "24px",
-          "titleTooltip": ""
-        },
-        "row": 0,
-        "col": 0,
-        "id": "2aa6b499-6e27-b315-6833-89c4d58485ce",
-        "typeFullFqn": "system.charts.timeseries_bars_flot"
-      },
-      "d890cea3-fba0-6474-9a21-fa780230dc62": {
-        "type": "timeseries",
-        "sizeX": 8,
-        "sizeY": 5,
-        "config": {
-          "datasources": [
-            {
-              "type": "entity",
-              "name": null,
-              "entityAliasId": "40193437-33ac-3172-eefd-0b08eb849062",
-              "filterId": null,
-              "dataKeys": [
-                {
-                  "name": "jsExecutionCountHourly",
-                  "type": "timeseries",
-                  "label": "{i18n:api-usage.javascript-executions}",
-                  "color": "#ff9900",
-                  "settings": {
-                    "excludeFromStacking": false,
-                    "hideDataByDefault": false,
-                    "disableDataHiding": false,
-                    "removeFromLegend": false,
-                    "showLines": false,
-                    "fillLines": false,
-                    "showPoints": false,
-                    "showPointShape": "circle",
-                    "pointShapeFormatter": "",
-                    "showPointsLineWidth": 5,
-                    "showPointsRadius": 3,
-                    "showSeparateAxis": false,
-                    "axisPosition": "left",
-                    "thresholds": [
-                      {
-                        "thresholdValueSource": "predefinedValue"
-                      }
-                    ],
-                    "comparisonSettings": {
-                      "showValuesForComparison": true
+            "alarms_created": {
+                "name": "{i18n:api-usage.alarms-created}",
+                "root": false,
+                "layouts": {
+                    "main": {
+                        "widgets": {
+                            "bef6c27b-9fe7-ee92-40d9-9696c501a1f9": {
+                                "sizeX": 24,
+                                "sizeY": 6,
+                                "row": 0,
+                                "col": 0
+                            },
+                            "52305cf8-2258-5745-a0e7-41a171594bb3": {
+                                "sizeX": 24,
+                                "sizeY": 6,
+                                "row": 6,
+                                "col": 0
+                            }
+                        },
+                        "gridSettings": {
+                            "backgroundColor": "#eeeeee",
+                            "color": "rgba(0,0,0,0.870588)",
+                            "columns": 24,
+                            "margin": 5,
+                            "backgroundSizeMode": "100%",
+                            "autoFillHeight": true,
+                            "backgroundImageUrl": null,
+                            "mobileAutoFillHeight": false,
+                            "mobileRowHeight": 70,
+                            "outerMargin": true
+                        }
                     }
-                  },
-                  "_hash": 0.0661644137210089,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": null,
-                  "postFuncBody": null
-                },
-                {
-                  "name": "tbelExecutionCountHourly",
-                  "type": "timeseries",
-                  "label": "{i18n:api-usage.tbel-executions}",
-                  "color": "#4caf50",
-                  "settings": {},
-                  "_hash": 0.6818645685001823,
-                  "aggregationType": null,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": null,
-                  "postFuncBody": null
                 }
-              ]
-            }
-          ],
-          "timewindow": {
-            "hideInterval": false,
-            "hideAggregation": false,
-            "hideAggInterval": false,
-            "selectedTab": 0,
-            "realtime": {
-              "timewindowMs": 86400000,
-              "interval": 3600000
             },
-            "aggregation": {
-              "type": "NONE",
-              "limit": 1000
+            "script_functions": {
+                "name": "{i18n:api-usage.scripts}",
+                "root": false,
+                "layouts": {
+                    "main": {
+                        "widgets": {
+                            "c66e5060-57fd-11e7-6616-65b82c294ac2": {
+                                "sizeX": 24,
+                                "sizeY": 6,
+                                "row": 0,
+                                "col": 0
+                            },
+                            "d0e8603e-5d2e-9287-e2c6-8ccbe9c66806": {
+                                "sizeX": 24,
+                                "sizeY": 6,
+                                "row": 6,
+                                "col": 0
+                            }
+                        },
+                        "gridSettings": {
+                            "backgroundColor": "#eeeeee",
+                            "color": "rgba(0,0,0,0.870588)",
+                            "columns": 24,
+                            "margin": 5,
+                            "backgroundSizeMode": "100%",
+                            "autoFillHeight": true,
+                            "backgroundImageUrl": null,
+                            "mobileAutoFillHeight": false,
+                            "mobileRowHeight": 70,
+                            "outerMargin": true
+                        }
+                    }
+                }
             }
-          },
-          "showTitle": true,
-          "backgroundColor": "#fff",
-          "color": "rgba(0, 0, 0, 0.87)",
-          "padding": "8px",
-          "settings": {
-            "stack": false,
-            "enableSelection": true,
-            "fontSize": 10,
-            "fontColor": "#545454",
-            "showTooltip": true,
-            "tooltipIndividual": false,
-            "tooltipCumulative": false,
-            "hideZeros": false,
-            "grid": {
-              "verticalLines": true,
-              "horizontalLines": true,
-              "outlineWidth": 1,
-              "color": "#545454",
-              "backgroundColor": null,
-              "tickColor": "#DDDDDD"
-            },
-            "xaxis": {
-              "title": null,
-              "showLabels": true,
-              "color": "#545454"
-            },
-            "yaxis": {
-              "min": 0,
-              "max": null,
-              "title": null,
-              "showLabels": true,
-              "color": "#545454",
-              "tickSize": null,
-              "tickDecimals": 0,
-              "ticksFormatter": "var rounder = Math.pow(10, 1);\nvar powers = [\n  {key: 'Q', value: Math.pow(10, 15)},\n  {key: 'T', value: Math.pow(10, 12)},\n  {key: 'B', value: Math.pow(10, 9)},\n  {key: 'M', value: Math.pow(10, 6)},\n  {key: 'K', value: 1000}\n];\n\nvar key = '';\n\nfor (var i = 0; i < powers.length; i++) {\n    var reduced = value / powers[i].value;\n    reduced = Math.round(reduced * rounder) / rounder;\n    if (reduced >= 1) {\n        value = reduced;\n        key = powers[i].key;\n        break;\n    }\n}\nreturn value + key;"
-            },
-            "defaultBarWidth": 2400000,
-            "barAlignment": "left",
-            "comparisonEnabled": false,
-            "showLegend": true,
-            "legendConfig": {
-              "direction": "column",
-              "position": "bottom",
-              "sortDataKeys": false,
-              "showMin": false,
-              "showMax": false,
-              "showAvg": false,
-              "showTotal": true
-            },
-            "customLegendEnabled": false
-          },
-          "title": "{i18n:api-usage.scripts-hourly-activity}",
-          "dropShadow": true,
-          "enableFullscreen": true,
-          "titleStyle": {
-            "fontSize": "16px",
-            "fontWeight": 400
-          },
-          "widgetStyle": {},
-          "useDashboardTimewindow": false,
-          "actions": {
-            "headerButton": [
-              {
-                "name": "{i18n:api-usage.view-details}",
-                "icon": "insert_chart",
-                "useShowWidgetActionFunction": null,
-                "showWidgetActionFunction": "return true;",
-                "type": "openDashboardState",
-                "targetDashboardStateId": "script_functions",
-                "setEntityId": false,
-                "stateEntityParamName": null,
-                "openRightLayout": false,
-                "openInSeparateDialog": false,
-                "openInPopover": false,
-                "id": "4687d3f6-8800-a3b6-26e5-0d33f3b828a9"
-              }
-            ]
-          },
-          "displayTimewindow": true,
-          "showTitleIcon": false,
-          "iconColor": "rgba(0, 0, 0, 0.87)",
-          "iconSize": "24px",
-          "titleTooltip": "",
-          "widgetCss": "",
-          "pageSize": 1024,
-          "noDataDisplayMessage": "",
-          "configMode": "advanced"
         },
-        "row": 0,
-        "col": 0,
-        "id": "d890cea3-fba0-6474-9a21-fa780230dc62",
-        "typeFullFqn": "system.charts.timeseries_bars_flot"
-      },
-      "84b6cfa5-1449-e0f2-3560-f810d2dd7ead": {
-        "type": "timeseries",
-        "sizeX": 8,
-        "sizeY": 5,
-        "config": {
-          "datasources": [
-            {
-              "type": "entity",
-              "name": null,
-              "entityAliasId": "40193437-33ac-3172-eefd-0b08eb849062",
-              "filterId": null,
-              "dataKeys": [
-                {
-                  "name": "storageDataPointsCountHourly",
-                  "type": "timeseries",
-                  "label": "{i18n:api-usage.data-points-storage-days}",
-                  "color": "#1039ee",
-                  "settings": {
-                    "excludeFromStacking": false,
-                    "hideDataByDefault": false,
-                    "disableDataHiding": false,
-                    "removeFromLegend": false,
-                    "showLines": false,
-                    "fillLines": false,
-                    "showPoints": false,
-                    "showPointShape": "circle",
-                    "pointShapeFormatter": "",
-                    "showPointsLineWidth": 5,
-                    "showPointsRadius": 3,
-                    "showSeparateAxis": false,
-                    "axisPosition": "left",
-                    "thresholds": [
-                      {
-                        "thresholdValueSource": "predefinedValue"
-                      }
-                    ],
-                    "comparisonSettings": {
-                      "showValuesForComparison": true
-                    }
-                  },
-                  "_hash": 0.0661644137210089,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": null,
-                  "postFuncBody": null
+        "entityAliases": {
+            "40193437-33ac-3172-eefd-0b08eb849062": {
+                "id": "40193437-33ac-3172-eefd-0b08eb849062",
+                "alias": "Api usage state",
+                "filter": {
+                    "type": "apiUsageState",
+                    "resolveMultiple": false
+                }
+            },
+            "2e4c97b0-257a-a1b9-690c-141d9bf2ec6f": {
+                "id": "2e4c97b0-257a-a1b9-690c-141d9bf2ec6f",
+                "alias": "TbServiceQueues",
+                "filter": {
+                    "type": "entityType",
+                    "resolveMultiple": true,
+                    "entityType": "QUEUE_STATS"
                 }
-              ]
             }
-          ],
-          "timewindow": {
+        },
+        "filters": {},
+        "timewindow": {
             "hideInterval": false,
+            "hideLastInterval": false,
+            "hideQuickInterval": false,
             "hideAggregation": false,
             "hideAggInterval": false,
+            "hideTimezone": false,
             "selectedTab": 0,
             "realtime": {
-              "timewindowMs": 86400000,
-              "interval": 3600000
+                "realtimeType": 0,
+                "timewindowMs": 86400000,
+                "quickInterval": "CURRENT_DAY",
+                "interval": 3600000
             },
             "aggregation": {
-              "type": "NONE",
-              "limit": 1000
-            }
-          },
-          "showTitle": true,
-          "backgroundColor": "#fff",
-          "color": "rgba(0, 0, 0, 0.87)",
-          "padding": "8px",
-          "settings": {
-            "shadowSize": 4,
-            "fontColor": "#545454",
-            "fontSize": 10,
-            "xaxis": {
-              "showLabels": true,
-              "color": "#545454"
-            },
-            "yaxis": {
-              "showLabels": true,
-              "color": "#545454",
-              "ticksFormatter": "var rounder = Math.pow(10, 1);\nvar powers = [\n  {key: 'Q', value: Math.pow(10, 15)},\n  {key: 'T', value: Math.pow(10, 12)},\n  {key: 'B', value: Math.pow(10, 9)},\n  {key: 'M', value: Math.pow(10, 6)},\n  {key: 'K', value: 1000}\n];\n\nvar key = '';\n\nfor (var i = 0; i < powers.length; i++) {\n    var reduced = value / powers[i].value;\n    reduced = Math.round(reduced * rounder) / rounder;\n    if (reduced >= 1) {\n        value = reduced;\n        key = powers[i].key;\n        break;\n    }\n}\nreturn value + key;",
-              "min": 0,
-              "tickDecimals": 0
-            },
-            "grid": {
-              "color": "#545454",
-              "tickColor": "#DDDDDD",
-              "verticalLines": true,
-              "horizontalLines": true,
-              "outlineWidth": 1
-            },
-            "stack": false,
-            "tooltipIndividual": false,
-            "defaultBarWidth": 2400000,
-            "barAlignment": "left",
-            "timeForComparison": "months",
-            "xaxisSecond": {
-              "axisPosition": "top",
-              "showLabels": true
-            },
-            "showLegend": true,
-            "legendConfig": {
-              "direction": "column",
-              "position": "bottom",
-              "sortDataKeys": false,
-              "showMin": false,
-              "showMax": false,
-              "showAvg": false,
-              "showTotal": true
-            }
-          },
-          "title": "{i18n:api-usage.telemetry-persistence-hourly-activity}",
-          "dropShadow": true,
-          "enableFullscreen": true,
-          "titleStyle": {
-            "fontSize": "16px",
-            "fontWeight": 400
-          },
-          "widgetStyle": {},
-          "useDashboardTimewindow": false,
-          "actions": {
-            "headerButton": [
-              {
-                "name": "{i18n:api-usage.view-details}",
-                "icon": "insert_chart",
-                "type": "openDashboardState",
-                "targetDashboardStateId": "telemetry_persistence",
-                "setEntityId": false,
-                "stateEntityParamName": null,
-                "openRightLayout": false,
-                "id": "16707efb-e572-bd02-c219-55fc1b0f672a"
-              }
-            ]
-          },
-          "displayTimewindow": true,
-          "showTitleIcon": false,
-          "iconColor": "rgba(0, 0, 0, 0.87)",
-          "iconSize": "24px",
-          "titleTooltip": ""
-        },
-        "row": 0,
-        "col": 0,
-        "id": "84b6cfa5-1449-e0f2-3560-f810d2dd7ead",
-        "typeFullFqn": "system.charts.timeseries_bars_flot"
-      },
-      "d296b566-a000-7402-ae9d-c815381c5435": {
-        "type": "timeseries",
-        "sizeX": 8,
-        "sizeY": 5,
-        "config": {
-          "datasources": [
-            {
-              "type": "entity",
-              "name": null,
-              "entityAliasId": "40193437-33ac-3172-eefd-0b08eb849062",
-              "filterId": null,
-              "dataKeys": [
-                {
-                  "name": "createdAlarmsCountHourly",
-                  "type": "timeseries",
-                  "label": "{i18n:api-usage.alarms-created}",
-                  "color": "#d35a00",
-                  "settings": {
-                    "excludeFromStacking": false,
-                    "hideDataByDefault": false,
-                    "disableDataHiding": false,
-                    "removeFromLegend": false,
-                    "showLines": false,
-                    "fillLines": false,
-                    "showPoints": false,
-                    "showPointShape": "circle",
-                    "pointShapeFormatter": "var size = radius * Math.sqrt(Math.PI) / 2;\nctx.moveTo(x - size, y - size);\nctx.lineTo(x + size, y + size);\nctx.moveTo(x - size, y + size);\nctx.lineTo(x + size, y - size);",
-                    "showPointsLineWidth": 5,
-                    "showPointsRadius": 3,
-                    "showSeparateAxis": false,
-                    "axisPosition": "left",
-                    "thresholds": [
-                      {
-                        "thresholdValueSource": "predefinedValue"
-                      }
-                    ],
-                    "comparisonSettings": {
-                      "showValuesForComparison": true
-                    }
-                  },
-                  "_hash": 0.0661644137210089,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": null,
-                  "postFuncBody": null
-                }
-              ]
-            }
-          ],
-          "timewindow": {
-            "hideInterval": false,
-            "hideAggregation": false,
-            "hideAggInterval": false,
-            "selectedTab": 0,
-            "realtime": {
-              "timewindowMs": 86400000,
-              "interval": 3600000
-            },
-            "aggregation": {
-              "type": "NONE",
-              "limit": 1000
-            }
-          },
-          "showTitle": true,
-          "backgroundColor": "#fff",
-          "color": "rgba(0, 0, 0, 0.87)",
-          "padding": "8px",
-          "settings": {
-            "shadowSize": 4,
-            "fontColor": "#545454",
-            "fontSize": 10,
-            "xaxis": {
-              "showLabels": true,
-              "color": "#545454"
-            },
-            "yaxis": {
-              "showLabels": true,
-              "color": "#545454",
-              "ticksFormatter": "var rounder = Math.pow(10, 1);\nvar powers = [\n  {key: 'Q', value: Math.pow(10, 15)},\n  {key: 'T', value: Math.pow(10, 12)},\n  {key: 'B', value: Math.pow(10, 9)},\n  {key: 'M', value: Math.pow(10, 6)},\n  {key: 'K', value: 1000}\n];\n\nvar key = '';\n\nfor (var i = 0; i < powers.length; i++) {\n    var reduced = value / powers[i].value;\n    reduced = Math.round(reduced * rounder) / rounder;\n    if (reduced >= 1) {\n        value = reduced;\n        key = powers[i].key;\n        break;\n    }\n}\nreturn value + key;",
-              "min": 0,
-              "tickDecimals": 0
-            },
-            "grid": {
-              "color": "#545454",
-              "tickColor": "#DDDDDD",
-              "verticalLines": true,
-              "horizontalLines": true,
-              "outlineWidth": 1
-            },
-            "stack": false,
-            "tooltipIndividual": false,
-            "defaultBarWidth": 2400000,
-            "barAlignment": "left",
-            "timeForComparison": "months",
-            "xaxisSecond": {
-              "axisPosition": "top",
-              "showLabels": true
-            },
-            "showLegend": true,
-            "legendConfig": {
-              "direction": "column",
-              "position": "bottom",
-              "sortDataKeys": false,
-              "showMin": false,
-              "showMax": false,
-              "showAvg": false,
-              "showTotal": true
-            }
-          },
-          "title": "{i18n:api-usage.alarms-created-hourly-activity}",
-          "dropShadow": true,
-          "enableFullscreen": true,
-          "titleStyle": {
-            "fontSize": "16px",
-            "fontWeight": 400
-          },
-          "widgetStyle": {},
-          "useDashboardTimewindow": false,
-          "actions": {
-            "headerButton": [
-              {
-                "name": "{i18n:api-usage.view-details}",
-                "icon": "insert_chart",
-                "type": "openDashboardState",
-                "targetDashboardStateId": "alarms_created",
-                "setEntityId": false,
-                "stateEntityParamName": null,
-                "openInSeparateDialog": null,
-                "dialogTitle": null,
-                "dialogHideDashboardToolbar": true,
-                "dialogWidth": null,
-                "dialogHeight": null,
-                "openRightLayout": false,
-                "id": "371882f9-ea23-3abc-fca8-9449c5dfdd6b"
-              }
-            ]
-          },
-          "displayTimewindow": true,
-          "showTitleIcon": false,
-          "iconColor": "rgba(0, 0, 0, 0.87)",
-          "iconSize": "24px",
-          "titleTooltip": ""
-        },
-        "row": 0,
-        "col": 0,
-        "id": "d296b566-a000-7402-ae9d-c815381c5435",
-        "typeFullFqn": "system.charts.timeseries_bars_flot"
-      },
-      "00a02464-9509-911b-3b5e-21fb37629822": {
-        "type": "timeseries",
-        "sizeX": 8,
-        "sizeY": 5,
-        "config": {
-          "datasources": [
-            {
-              "type": "entity",
-              "name": null,
-              "entityAliasId": "40193437-33ac-3172-eefd-0b08eb849062",
-              "filterId": null,
-              "dataKeys": [
-                {
-                  "name": "emailCountHourly",
-                  "type": "timeseries",
-                  "label": "{i18n:api-usage.email-messages}",
-                  "color": "#4caf50",
-                  "settings": {
-                    "excludeFromStacking": false,
-                    "hideDataByDefault": false,
-                    "disableDataHiding": false,
-                    "removeFromLegend": false,
-                    "showLines": false,
-                    "fillLines": false,
-                    "showPoints": false,
-                    "showPointShape": "circle",
-                    "pointShapeFormatter": "var size = radius * Math.sqrt(Math.PI) / 2;\nctx.moveTo(x - size, y - size);\nctx.lineTo(x + size, y + size);\nctx.moveTo(x - size, y + size);\nctx.lineTo(x + size, y - size);",
-                    "showPointsLineWidth": 5,
-                    "showPointsRadius": 3,
-                    "showSeparateAxis": false,
-                    "axisPosition": "left",
-                    "thresholds": [
-                      {
-                        "thresholdValueSource": "predefinedValue"
-                      }
-                    ],
-                    "comparisonSettings": {
-                      "showValuesForComparison": true
-                    }
-                  },
-                  "_hash": 0.1348755140779876,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": null,
-                  "postFuncBody": null
-                },
-                {
-                  "name": "smsCountHourly",
-                  "type": "timeseries",
-                  "label": "{i18n:api-usage.sms-messages}",
-                  "color": "#f36021",
-                  "settings": {
-                    "excludeFromStacking": false,
-                    "hideDataByDefault": false,
-                    "disableDataHiding": false,
-                    "removeFromLegend": false,
-                    "showLines": false,
-                    "fillLines": false,
-                    "showPoints": false,
-                    "showPointShape": "circle",
-                    "pointShapeFormatter": "",
-                    "showPointsLineWidth": 5,
-                    "showPointsRadius": 3,
-                    "showSeparateAxis": false,
-                    "axisPosition": "left",
-                    "thresholds": [
-                      {
-                        "thresholdValueSource": "predefinedValue"
-                      }
-                    ],
-                    "comparisonSettings": {
-                      "showValuesForComparison": true
-                    }
-                  },
-                  "_hash": 0.0661644137210089,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": null,
-                  "postFuncBody": null
-                }
-              ]
-            }
-          ],
-          "timewindow": {
-            "hideInterval": false,
-            "hideAggregation": false,
-            "hideAggInterval": false,
-            "selectedTab": 0,
-            "realtime": {
-              "timewindowMs": 86400000,
-              "interval": 3600000
-            },
-            "aggregation": {
-              "type": "NONE",
-              "limit": 1000
-            }
-          },
-          "showTitle": true,
-          "backgroundColor": "#fff",
-          "color": "rgba(0, 0, 0, 0.87)",
-          "padding": "8px",
-          "settings": {
-            "shadowSize": 4,
-            "fontColor": "#545454",
-            "fontSize": 10,
-            "xaxis": {
-              "showLabels": true,
-              "color": "#545454"
-            },
-            "yaxis": {
-              "showLabels": true,
-              "color": "#545454",
-              "ticksFormatter": "var rounder = Math.pow(10, 1);\nvar powers = [\n  {key: 'Q', value: Math.pow(10, 15)},\n  {key: 'T', value: Math.pow(10, 12)},\n  {key: 'B', value: Math.pow(10, 9)},\n  {key: 'M', value: Math.pow(10, 6)},\n  {key: 'K', value: 1000}\n];\n\nvar key = '';\n\nfor (var i = 0; i < powers.length; i++) {\n    var reduced = value / powers[i].value;\n    reduced = Math.round(reduced * rounder) / rounder;\n    if (reduced >= 1) {\n        value = reduced;\n        key = powers[i].key;\n        break;\n    }\n}\nreturn value + key;",
-              "min": 0,
-              "tickDecimals": 0
-            },
-            "grid": {
-              "color": "#545454",
-              "tickColor": "#DDDDDD",
-              "verticalLines": true,
-              "horizontalLines": true,
-              "outlineWidth": 1
-            },
-            "stack": false,
-            "tooltipIndividual": false,
-            "defaultBarWidth": 2400000,
-            "barAlignment": "left",
-            "timeForComparison": "months",
-            "xaxisSecond": {
-              "axisPosition": "top",
-              "showLabels": true
-            },
-            "showLegend": true,
-            "legendConfig": {
-              "direction": "column",
-              "position": "bottom",
-              "sortDataKeys": false,
-              "showMin": false,
-              "showMax": false,
-              "showAvg": false,
-              "showTotal": true
-            }
-          },
-          "title": "{i18n:api-usage.notifications-hourly-activity}",
-          "dropShadow": true,
-          "enableFullscreen": true,
-          "titleStyle": {
-            "fontSize": "16px",
-            "fontWeight": 400
-          },
-          "widgetStyle": {},
-          "useDashboardTimewindow": false,
-          "actions": {
-            "headerButton": [
-              {
-                "name": "{i18n:api-usage.view-details}",
-                "icon": "insert_chart",
-                "type": "openDashboardState",
-                "targetDashboardStateId": "notifications",
-                "setEntityId": false,
-                "stateEntityParamName": null,
-                "openInSeparateDialog": null,
-                "dialogTitle": null,
-                "dialogHideDashboardToolbar": true,
-                "dialogWidth": null,
-                "dialogHeight": null,
-                "openRightLayout": false,
-                "id": "49aefac0-ec5e-d6f3-f39c-8744759f4b19"
-              }
-            ]
-          },
-          "displayTimewindow": true,
-          "showTitleIcon": false,
-          "iconColor": "rgba(0, 0, 0, 0.87)",
-          "iconSize": "24px",
-          "titleTooltip": ""
-        },
-        "row": 0,
-        "col": 0,
-        "id": "00a02464-9509-911b-3b5e-21fb37629822",
-        "typeFullFqn": "system.charts.timeseries_bars_flot"
-      },
-      "74199074-7873-6c6a-2a51-3fc614769f03": {
-        "type": "timeseries",
-        "sizeX": 8,
-        "sizeY": 5,
-        "config": {
-          "datasources": [
-            {
-              "type": "entity",
-              "name": null,
-              "entityAliasId": "40193437-33ac-3172-eefd-0b08eb849062",
-              "filterId": null,
-              "dataKeys": [
-                {
-                  "name": "ruleEngineExecutionCountHourly",
-                  "type": "timeseries",
-                  "label": "{i18n:api-usage.rule-engine-executions}",
-                  "color": "#ab00ff",
-                  "settings": {
-                    "excludeFromStacking": false,
-                    "hideDataByDefault": false,
-                    "disableDataHiding": false,
-                    "removeFromLegend": false,
-                    "showLines": false,
-                    "fillLines": false,
-                    "showPoints": false,
-                    "showPointShape": "circle",
-                    "pointShapeFormatter": "",
-                    "showPointsLineWidth": 5,
-                    "showPointsRadius": 3,
-                    "showSeparateAxis": false,
-                    "axisPosition": "left",
-                    "thresholds": [
-                      {
-                        "thresholdValueSource": "predefinedValue"
-                      }
-                    ],
-                    "comparisonSettings": {
-                      "showValuesForComparison": true
-                    }
-                  },
-                  "_hash": 0.0661644137210089,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": null,
-                  "postFuncBody": null
-                }
-              ]
-            }
-          ],
-          "timewindow": {
-            "hideInterval": false,
-            "hideAggregation": false,
-            "hideAggInterval": false,
-            "selectedTab": 1,
-            "history": {
-              "historyType": 0,
-              "timewindowMs": 2592000000,
-              "interval": 86400000
-            },
-            "aggregation": {
-              "type": "SUM",
-              "limit": 1000
-            }
-          },
-          "showTitle": true,
-          "backgroundColor": "#fff",
-          "color": "rgba(0, 0, 0, 0.87)",
-          "padding": "8px",
-          "settings": {
-            "shadowSize": 4,
-            "fontColor": "#545454",
-            "fontSize": 10,
-            "xaxis": {
-              "showLabels": true,
-              "color": "#545454"
-            },
-            "yaxis": {
-              "showLabels": true,
-              "color": "#545454",
-              "ticksFormatter": "var rounder = Math.pow(10, 1);\nvar powers = [\n  {key: 'Q', value: Math.pow(10, 15)},\n  {key: 'T', value: Math.pow(10, 12)},\n  {key: 'B', value: Math.pow(10, 9)},\n  {key: 'M', value: Math.pow(10, 6)},\n  {key: 'K', value: 1000}\n];\n\nvar key = '';\n\nfor (var i = 0; i < powers.length; i++) {\n    var reduced = value / powers[i].value;\n    reduced = Math.round(reduced * rounder) / rounder;\n    if (reduced >= 1) {\n        value = reduced;\n        key = powers[i].key;\n        break;\n    }\n}\nreturn value + key;",
-              "min": 0,
-              "tickDecimals": 0
-            },
-            "grid": {
-              "color": "#545454",
-              "tickColor": "#DDDDDD",
-              "verticalLines": true,
-              "horizontalLines": true,
-              "outlineWidth": 1
-            },
-            "stack": false,
-            "tooltipIndividual": false,
-            "defaultBarWidth": 1800000,
-            "barAlignment": "left",
-            "timeForComparison": "months",
-            "xaxisSecond": {
-              "axisPosition": "top",
-              "showLabels": true
-            },
-            "showLegend": true,
-            "legendConfig": {
-              "direction": "column",
-              "position": "bottom",
-              "sortDataKeys": false,
-              "showMin": false,
-              "showMax": false,
-              "showAvg": false,
-              "showTotal": true
-            }
-          },
-          "title": "{i18n:api-usage.rule-engine-daily-activity}",
-          "dropShadow": true,
-          "enableFullscreen": true,
-          "titleStyle": {
-            "fontSize": "16px",
-            "fontWeight": 400
-          },
-          "widgetStyle": {},
-          "useDashboardTimewindow": false,
-          "actions": {},
-          "displayTimewindow": true,
-          "showTitleIcon": false,
-          "iconColor": "rgba(0, 0, 0, 0.87)",
-          "iconSize": "24px",
-          "titleTooltip": ""
-        },
-        "row": 0,
-        "col": 0,
-        "id": "74199074-7873-6c6a-2a51-3fc614769f03",
-        "typeFullFqn": "system.charts.timeseries_bars_flot"
-      },
-      "00006bc3-8a8d-b55e-ed39-e318f1bcd090": {
-        "type": "timeseries",
-        "sizeX": 8,
-        "sizeY": 5,
-        "config": {
-          "datasources": [
-            {
-              "type": "entity",
-              "name": null,
-              "entityAliasId": "40193437-33ac-3172-eefd-0b08eb849062",
-              "filterId": null,
-              "dataKeys": [
-                {
-                  "name": "ruleEngineExecutionCount",
-                  "type": "timeseries",
-                  "label": "{i18n:api-usage.rule-engine-executions}",
-                  "color": "#ab00ff",
-                  "settings": {
-                    "excludeFromStacking": false,
-                    "hideDataByDefault": false,
-                    "disableDataHiding": false,
-                    "removeFromLegend": false,
-                    "showLines": false,
-                    "fillLines": false,
-                    "showPoints": false,
-                    "showPointShape": "circle",
-                    "pointShapeFormatter": "",
-                    "showPointsLineWidth": 5,
-                    "showPointsRadius": 3,
-                    "showSeparateAxis": false,
-                    "axisPosition": "left",
-                    "thresholds": [
-                      {
-                        "thresholdValueSource": "predefinedValue"
-                      }
-                    ],
-                    "comparisonSettings": {
-                      "showValuesForComparison": true
-                    }
-                  },
-                  "_hash": 0.0661644137210089,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": null,
-                  "postFuncBody": null
-                }
-              ]
-            }
-          ],
-          "timewindow": {
-            "hideInterval": false,
-            "hideAggregation": false,
-            "hideAggInterval": false,
-            "selectedTab": 1,
-            "history": {
-              "historyType": 0,
-              "timewindowMs": 31536000000,
-              "interval": 1000
-            },
-            "aggregation": {
-              "type": "NONE",
-              "limit": 1000
-            }
-          },
-          "showTitle": true,
-          "backgroundColor": "#fff",
-          "color": "rgba(0, 0, 0, 0.87)",
-          "padding": "8px",
-          "settings": {
-            "shadowSize": 4,
-            "fontColor": "#545454",
-            "fontSize": 10,
-            "xaxis": {
-              "showLabels": true,
-              "color": "#545454"
-            },
-            "yaxis": {
-              "showLabels": true,
-              "color": "#545454",
-              "ticksFormatter": "var rounder = Math.pow(10, 1);\nvar powers = [\n  {key: 'Q', value: Math.pow(10, 15)},\n  {key: 'T', value: Math.pow(10, 12)},\n  {key: 'B', value: Math.pow(10, 9)},\n  {key: 'M', value: Math.pow(10, 6)},\n  {key: 'K', value: 1000}\n];\n\nvar key = '';\n\nfor (var i = 0; i < powers.length; i++) {\n    var reduced = value / powers[i].value;\n    reduced = Math.round(reduced * rounder) / rounder;\n    if (reduced >= 1) {\n        value = reduced;\n        key = powers[i].key;\n        break;\n    }\n}\nreturn value + key;",
-              "min": 0,
-              "tickDecimals": 0
-            },
-            "grid": {
-              "color": "#545454",
-              "tickColor": "#DDDDDD",
-              "verticalLines": true,
-              "horizontalLines": true,
-              "outlineWidth": 1
-            },
-            "stack": false,
-            "tooltipIndividual": false,
-            "defaultBarWidth": 900000000,
-            "barAlignment": "left",
-            "timeForComparison": "months",
-            "xaxisSecond": {
-              "axisPosition": "top",
-              "showLabels": true
-            },
-            "showLegend": true,
-            "legendConfig": {
-              "direction": "column",
-              "position": "bottom",
-              "sortDataKeys": false,
-              "showMin": false,
-              "showMax": false,
-              "showAvg": false,
-              "showTotal": true
-            }
-          },
-          "title": "{i18n:api-usage.rule-engine-monthly-activity}",
-          "dropShadow": true,
-          "enableFullscreen": true,
-          "titleStyle": {
-            "fontSize": "16px",
-            "fontWeight": 400
-          },
-          "widgetStyle": {},
-          "useDashboardTimewindow": false,
-          "actions": {},
-          "displayTimewindow": true,
-          "showTitleIcon": false,
-          "iconColor": "rgba(0, 0, 0, 0.87)",
-          "iconSize": "24px",
-          "titleTooltip": ""
-        },
-        "row": 0,
-        "col": 0,
-        "id": "00006bc3-8a8d-b55e-ed39-e318f1bcd090",
-        "typeFullFqn": "system.charts.timeseries_bars_flot"
-      },
-      "5f5ca59c-e507-5301-5910-7ad8cd34df40": {
-        "type": "timeseries",
-        "sizeX": 8,
-        "sizeY": 5,
-        "config": {
-          "datasources": [
-            {
-              "type": "entity",
-              "name": null,
-              "entityAliasId": "40193437-33ac-3172-eefd-0b08eb849062",
-              "filterId": null,
-              "dataKeys": [
-                {
-                  "name": "jsExecutionCountHourly",
-                  "type": "timeseries",
-                  "label": "{i18n:api-usage.javascript-executions}",
-                  "color": "#ff9900",
-                  "settings": {
-                    "excludeFromStacking": false,
-                    "hideDataByDefault": false,
-                    "disableDataHiding": false,
-                    "removeFromLegend": false,
-                    "showLines": false,
-                    "fillLines": false,
-                    "showPoints": false,
-                    "showPointShape": "circle",
-                    "pointShapeFormatter": "",
-                    "showPointsLineWidth": 5,
-                    "showPointsRadius": 3,
-                    "showSeparateAxis": false,
-                    "axisPosition": "left",
-                    "thresholds": [
-                      {
-                        "thresholdValueSource": "predefinedValue"
-                      }
-                    ],
-                    "comparisonSettings": {
-                      "showValuesForComparison": true
-                    }
-                  },
-                  "_hash": 0.0661644137210089,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": null,
-                  "postFuncBody": null
-                },
-                {
-                  "name": "tbelExecutionCountHourly",
-                  "type": "timeseries",
-                  "label": "{i18n:api-usage.tbel-executions}",
-                  "color": "#4caf50",
-                  "settings": {},
-                  "_hash": 0.5212969314724616,
-                  "aggregationType": null,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": null,
-                  "postFuncBody": null
-                }
-              ]
-            }
-          ],
-          "timewindow": {
-            "hideInterval": false,
-            "hideAggregation": false,
-            "hideAggInterval": false,
-            "selectedTab": 1,
-            "history": {
-              "historyType": 0,
-              "timewindowMs": 2592000000,
-              "interval": 86400000
-            },
-            "aggregation": {
-              "type": "SUM",
-              "limit": 1000
-            }
-          },
-          "showTitle": true,
-          "backgroundColor": "#fff",
-          "color": "rgba(0, 0, 0, 0.87)",
-          "padding": "8px",
-          "settings": {
-            "shadowSize": 4,
-            "fontColor": "#545454",
-            "fontSize": 10,
-            "xaxis": {
-              "showLabels": true,
-              "color": "#545454"
-            },
-            "yaxis": {
-              "showLabels": true,
-              "color": "#545454",
-              "min": 0,
-              "tickDecimals": 0,
-              "ticksFormatter": "var rounder = Math.pow(10, 1);\nvar powers = [\n  {key: 'Q', value: Math.pow(10, 15)},\n  {key: 'T', value: Math.pow(10, 12)},\n  {key: 'B', value: Math.pow(10, 9)},\n  {key: 'M', value: Math.pow(10, 6)},\n  {key: 'K', value: 1000}\n];\n\nvar key = '';\n\nfor (var i = 0; i < powers.length; i++) {\n    var reduced = value / powers[i].value;\n    reduced = Math.round(reduced * rounder) / rounder;\n    if (reduced >= 1) {\n        value = reduced;\n        key = powers[i].key;\n        break;\n    }\n}\nreturn value + key;"
-            },
-            "grid": {
-              "color": "#545454",
-              "tickColor": "#DDDDDD",
-              "verticalLines": true,
-              "horizontalLines": true,
-              "outlineWidth": 1
-            },
-            "stack": false,
-            "tooltipIndividual": false,
-            "defaultBarWidth": 1800000,
-            "barAlignment": "left",
-            "timeForComparison": "months",
-            "xaxisSecond": {
-              "axisPosition": "top",
-              "showLabels": true
-            },
-            "showLegend": true,
-            "legendConfig": {
-              "direction": "column",
-              "position": "bottom",
-              "sortDataKeys": false,
-              "showMin": false,
-              "showMax": false,
-              "showAvg": false,
-              "showTotal": true
-            }
-          },
-          "title": "{i18n:api-usage.scripts-daily-activity}",
-          "dropShadow": true,
-          "enableFullscreen": true,
-          "titleStyle": {
-            "fontSize": "16px",
-            "fontWeight": 400
-          },
-          "widgetStyle": {},
-          "useDashboardTimewindow": false,
-          "actions": {},
-          "displayTimewindow": true,
-          "showTitleIcon": false,
-          "iconColor": "rgba(0, 0, 0, 0.87)",
-          "iconSize": "24px",
-          "titleTooltip": "",
-          "widgetCss": "",
-          "pageSize": 1024,
-          "noDataDisplayMessage": ""
-        },
-        "row": 0,
-        "col": 0,
-        "id": "5f5ca59c-e507-5301-5910-7ad8cd34df40",
-        "typeFullFqn": "system.charts.timeseries_bars_flot"
-      },
-      "ada32ee9-44ed-48d1-c368-fd0c94b7607f": {
-        "type": "timeseries",
-        "sizeX": 8,
-        "sizeY": 5,
-        "config": {
-          "datasources": [
-            {
-              "type": "entity",
-              "name": null,
-              "entityAliasId": "40193437-33ac-3172-eefd-0b08eb849062",
-              "filterId": null,
-              "dataKeys": [
-                {
-                  "name": "jsExecutionCount",
-                  "type": "timeseries",
-                  "label": "{i18n:api-usage.javascript-executions}",
-                  "color": "#ff9900",
-                  "settings": {
-                    "excludeFromStacking": false,
-                    "hideDataByDefault": false,
-                    "disableDataHiding": false,
-                    "removeFromLegend": false,
-                    "showLines": false,
-                    "fillLines": false,
-                    "showPoints": false,
-                    "showPointShape": "circle",
-                    "pointShapeFormatter": "",
-                    "showPointsLineWidth": 5,
-                    "showPointsRadius": 3,
-                    "showSeparateAxis": false,
-                    "axisPosition": "left",
-                    "thresholds": [
-                      {
-                        "thresholdValueSource": "predefinedValue"
-                      }
-                    ],
-                    "comparisonSettings": {
-                      "showValuesForComparison": true
-                    }
-                  },
-                  "_hash": 0.0661644137210089,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": null,
-                  "postFuncBody": null
-                },
-                {
-                  "name": "tbelExecutionCount",
-                  "type": "timeseries",
-                  "label": "{i18n:api-usage.tbel-executions}",
-                  "color": "#4caf50",
-                  "settings": {},
-                  "_hash": 0.49748239768082403,
-                  "aggregationType": null,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": null,
-                  "postFuncBody": null
-                }
-              ]
-            }
-          ],
-          "timewindow": {
-            "hideInterval": false,
-            "hideAggregation": false,
-            "hideAggInterval": false,
-            "selectedTab": 1,
-            "history": {
-              "historyType": 0,
-              "timewindowMs": 31536000000,
-              "interval": 1000
-            },
-            "aggregation": {
-              "type": "NONE",
-              "limit": 1000
-            }
-          },
-          "showTitle": true,
-          "backgroundColor": "#fff",
-          "color": "rgba(0, 0, 0, 0.87)",
-          "padding": "8px",
-          "settings": {
-            "shadowSize": 4,
-            "fontColor": "#545454",
-            "fontSize": 10,
-            "xaxis": {
-              "showLabels": true,
-              "color": "#545454"
-            },
-            "yaxis": {
-              "showLabels": true,
-              "color": "#545454",
-              "min": 0,
-              "tickDecimals": 0,
-              "ticksFormatter": "var rounder = Math.pow(10, 1);\nvar powers = [\n  {key: 'Q', value: Math.pow(10, 15)},\n  {key: 'T', value: Math.pow(10, 12)},\n  {key: 'B', value: Math.pow(10, 9)},\n  {key: 'M', value: Math.pow(10, 6)},\n  {key: 'K', value: 1000}\n];\n\nvar key = '';\n\nfor (var i = 0; i < powers.length; i++) {\n    var reduced = value / powers[i].value;\n    reduced = Math.round(reduced * rounder) / rounder;\n    if (reduced >= 1) {\n        value = reduced;\n        key = powers[i].key;\n        break;\n    }\n}\nreturn value + key;"
-            },
-            "grid": {
-              "color": "#545454",
-              "tickColor": "#DDDDDD",
-              "verticalLines": true,
-              "horizontalLines": true,
-              "outlineWidth": 1
-            },
-            "stack": false,
-            "tooltipIndividual": false,
-            "defaultBarWidth": 900000000,
-            "barAlignment": "left",
-            "timeForComparison": "months",
-            "xaxisSecond": {
-              "axisPosition": "top",
-              "showLabels": true
-            },
-            "showLegend": true,
-            "legendConfig": {
-              "direction": "column",
-              "position": "bottom",
-              "sortDataKeys": false,
-              "showMin": false,
-              "showMax": false,
-              "showAvg": false,
-              "showTotal": true
-            }
-          },
-          "title": "{i18n:api-usage.scripts-monthly-activity}",
-          "dropShadow": true,
-          "enableFullscreen": true,
-          "titleStyle": {
-            "fontSize": "16px",
-            "fontWeight": 400
-          },
-          "widgetStyle": {},
-          "useDashboardTimewindow": false,
-          "actions": {},
-          "displayTimewindow": true,
-          "showTitleIcon": false,
-          "iconColor": "rgba(0, 0, 0, 0.87)",
-          "iconSize": "24px",
-          "titleTooltip": "",
-          "widgetCss": "",
-          "pageSize": 1024,
-          "noDataDisplayMessage": ""
-        },
-        "row": 0,
-        "col": 0,
-        "id": "ada32ee9-44ed-48d1-c368-fd0c94b7607f",
-        "typeFullFqn": "system.charts.timeseries_bars_flot"
-      },
-      "98bae68b-0f35-72f2-a428-9b06889f1554": {
-        "type": "timeseries",
-        "sizeX": 8,
-        "sizeY": 5,
-        "config": {
-          "datasources": [
-            {
-              "type": "entity",
-              "name": null,
-              "entityAliasId": "40193437-33ac-3172-eefd-0b08eb849062",
-              "filterId": null,
-              "dataKeys": [
-                {
-                  "name": "transportMsgCountHourly",
-                  "type": "timeseries",
-                  "label": "{i18n:api-usage.transport-messages}",
-                  "color": "#2196f3",
-                  "settings": {
-                    "excludeFromStacking": false,
-                    "hideDataByDefault": false,
-                    "disableDataHiding": false,
-                    "removeFromLegend": false,
-                    "showLines": false,
-                    "fillLines": false,
-                    "showPoints": false,
-                    "showPointShape": "circle",
-                    "pointShapeFormatter": "",
-                    "showPointsLineWidth": 5,
-                    "showPointsRadius": 3,
-                    "showSeparateAxis": false,
-                    "axisPosition": "left",
-                    "thresholds": [
-                      {
-                        "thresholdValueSource": "predefinedValue"
-                      }
-                    ],
-                    "comparisonSettings": {
-                      "showValuesForComparison": true
-                    }
-                  },
-                  "_hash": 0.0661644137210089,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": null,
-                  "postFuncBody": null
-                },
-                {
-                  "name": "transportDataPointsCountHourly",
-                  "type": "timeseries",
-                  "label": "{i18n:api-usage.transport-data-points}",
-                  "color": "#4caf50",
-                  "settings": {
-                    "excludeFromStacking": false,
-                    "hideDataByDefault": false,
-                    "disableDataHiding": false,
-                    "removeFromLegend": false,
-                    "showLines": false,
-                    "fillLines": false,
-                    "showPoints": false,
-                    "showPointShape": "circle",
-                    "pointShapeFormatter": "",
-                    "showPointsLineWidth": 5,
-                    "showPointsRadius": 3,
-                    "showSeparateAxis": false,
-                    "axisPosition": "left",
-                    "thresholds": [
-                      {
-                        "thresholdValueSource": "predefinedValue"
-                      }
-                    ],
-                    "comparisonSettings": {
-                      "showValuesForComparison": true
-                    }
-                  },
-                  "_hash": 0.46849996721308895,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": null,
-                  "postFuncBody": null
-                }
-              ]
-            }
-          ],
-          "timewindow": {
-            "hideInterval": false,
-            "hideAggregation": false,
-            "hideAggInterval": false,
-            "selectedTab": 1,
-            "history": {
-              "historyType": 0,
-              "timewindowMs": 2592000000,
-              "interval": 86400000
-            },
-            "aggregation": {
-              "type": "SUM",
-              "limit": 1000
-            }
-          },
-          "showTitle": true,
-          "backgroundColor": "#fff",
-          "color": "rgba(0, 0, 0, 0.87)",
-          "padding": "8px",
-          "settings": {
-            "shadowSize": 4,
-            "fontColor": "#545454",
-            "fontSize": 10,
-            "xaxis": {
-              "showLabels": true,
-              "color": "#545454"
-            },
-            "yaxis": {
-              "showLabels": true,
-              "color": "#545454",
-              "ticksFormatter": "var rounder = Math.pow(10, 1);\nvar powers = [\n  {key: 'Q', value: Math.pow(10, 15)},\n  {key: 'T', value: Math.pow(10, 12)},\n  {key: 'B', value: Math.pow(10, 9)},\n  {key: 'M', value: Math.pow(10, 6)},\n  {key: 'K', value: 1000}\n];\n\nvar key = '';\n\nfor (var i = 0; i < powers.length; i++) {\n    var reduced = value / powers[i].value;\n    reduced = Math.round(reduced * rounder) / rounder;\n    if (reduced >= 1) {\n        value = reduced;\n        key = powers[i].key;\n        break;\n    }\n}\nreturn value + key;",
-              "min": 0,
-              "tickDecimals": 0
-            },
-            "grid": {
-              "color": "#545454",
-              "tickColor": "#DDDDDD",
-              "verticalLines": true,
-              "horizontalLines": true,
-              "outlineWidth": 1
-            },
-            "stack": true,
-            "tooltipIndividual": false,
-            "defaultBarWidth": 1800000,
-            "barAlignment": "left",
-            "timeForComparison": "months",
-            "xaxisSecond": {
-              "axisPosition": "top",
-              "showLabels": true
-            },
-            "tooltipCumulative": false,
-            "showLegend": true,
-            "legendConfig": {
-              "direction": "column",
-              "position": "bottom",
-              "sortDataKeys": false,
-              "showMin": false,
-              "showMax": false,
-              "showAvg": false,
-              "showTotal": true
-            }
-          },
-          "title": "{i18n:api-usage.transport-daily-activity}",
-          "dropShadow": true,
-          "enableFullscreen": true,
-          "titleStyle": {
-            "fontSize": "16px",
-            "fontWeight": 400
-          },
-          "widgetStyle": {},
-          "useDashboardTimewindow": false,
-          "actions": {},
-          "displayTimewindow": true,
-          "showTitleIcon": false,
-          "iconColor": "rgba(0, 0, 0, 0.87)",
-          "iconSize": "24px",
-          "titleTooltip": ""
-        },
-        "row": 0,
-        "col": 0,
-        "id": "98bae68b-0f35-72f2-a428-9b06889f1554",
-        "typeFullFqn": "system.charts.timeseries_bars_flot"
-      },
-      "e61e5477-5a09-cc25-966b-f613d81da833": {
-        "type": "timeseries",
-        "sizeX": 8,
-        "sizeY": 5,
-        "config": {
-          "datasources": [
-            {
-              "type": "entity",
-              "name": null,
-              "entityAliasId": "40193437-33ac-3172-eefd-0b08eb849062",
-              "filterId": null,
-              "dataKeys": [
-                {
-                  "name": "transportMsgCount",
-                  "type": "timeseries",
-                  "label": "{i18n:api-usage.transport-messages}",
-                  "color": "#2196f3",
-                  "settings": {
-                    "excludeFromStacking": false,
-                    "hideDataByDefault": false,
-                    "disableDataHiding": false,
-                    "removeFromLegend": false,
-                    "showLines": false,
-                    "fillLines": false,
-                    "showPoints": false,
-                    "showPointShape": "circle",
-                    "pointShapeFormatter": "",
-                    "showPointsLineWidth": 5,
-                    "showPointsRadius": 3,
-                    "showSeparateAxis": false,
-                    "axisPosition": "left",
-                    "thresholds": [
-                      {
-                        "thresholdValueSource": "predefinedValue"
-                      }
-                    ],
-                    "comparisonSettings": {
-                      "showValuesForComparison": true
-                    }
-                  },
-                  "_hash": 0.0661644137210089,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": null,
-                  "postFuncBody": null
-                },
-                {
-                  "name": "transportDataPointsCount",
-                  "type": "timeseries",
-                  "label": "{i18n:api-usage.transport-data-points}",
-                  "color": "#4caf50",
-                  "settings": {
-                    "excludeFromStacking": false,
-                    "hideDataByDefault": false,
-                    "disableDataHiding": false,
-                    "removeFromLegend": false,
-                    "showLines": false,
-                    "fillLines": false,
-                    "showPoints": false,
-                    "showPointShape": "circle",
-                    "pointShapeFormatter": "",
-                    "showPointsLineWidth": 5,
-                    "showPointsRadius": 3,
-                    "showSeparateAxis": false,
-                    "axisPosition": "left",
-                    "thresholds": [
-                      {
-                        "thresholdValueSource": "predefinedValue"
-                      }
-                    ],
-                    "comparisonSettings": {
-                      "showValuesForComparison": true
-                    }
-                  },
-                  "_hash": 0.46849996721308895,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": null,
-                  "postFuncBody": null
-                }
-              ]
-            }
-          ],
-          "timewindow": {
-            "hideInterval": false,
-            "hideAggregation": false,
-            "hideAggInterval": false,
-            "selectedTab": 1,
-            "history": {
-              "historyType": 0,
-              "timewindowMs": 31536000000,
-              "interval": 2592000000
-            },
-            "aggregation": {
-              "type": "NONE",
-              "limit": 1000
-            }
-          },
-          "showTitle": true,
-          "backgroundColor": "#fff",
-          "color": "rgba(0, 0, 0, 0.87)",
-          "padding": "8px",
-          "settings": {
-            "shadowSize": 4,
-            "fontColor": "#545454",
-            "fontSize": 10,
-            "xaxis": {
-              "showLabels": true,
-              "color": "#545454"
-            },
-            "yaxis": {
-              "showLabels": true,
-              "color": "#545454",
-              "ticksFormatter": "var rounder = Math.pow(10, 1);\nvar powers = [\n  {key: 'Q', value: Math.pow(10, 15)},\n  {key: 'T', value: Math.pow(10, 12)},\n  {key: 'B', value: Math.pow(10, 9)},\n  {key: 'M', value: Math.pow(10, 6)},\n  {key: 'K', value: 1000}\n];\n\nvar key = '';\n\nfor (var i = 0; i < powers.length; i++) {\n    var reduced = value / powers[i].value;\n    reduced = Math.round(reduced * rounder) / rounder;\n    if (reduced >= 1) {\n        value = reduced;\n        key = powers[i].key;\n        break;\n    }\n}\nreturn value + key;",
-              "min": 0,
-              "tickDecimals": 0
-            },
-            "grid": {
-              "color": "#545454",
-              "tickColor": "#DDDDDD",
-              "verticalLines": true,
-              "horizontalLines": true,
-              "outlineWidth": 1
-            },
-            "stack": true,
-            "tooltipIndividual": false,
-            "defaultBarWidth": 900000000,
-            "barAlignment": "left",
-            "timeForComparison": "months",
-            "xaxisSecond": {
-              "axisPosition": "top",
-              "showLabels": true
-            },
-            "tooltipCumulative": false,
-            "showLegend": true,
-            "legendConfig": {
-              "direction": "column",
-              "position": "bottom",
-              "sortDataKeys": false,
-              "showMin": false,
-              "showMax": false,
-              "showAvg": false,
-              "showTotal": true
-            }
-          },
-          "title": "{i18n:api-usage.transport-monthly-activity}",
-          "dropShadow": true,
-          "enableFullscreen": true,
-          "titleStyle": {
-            "fontSize": "16px",
-            "fontWeight": 400
-          },
-          "widgetStyle": {},
-          "useDashboardTimewindow": false,
-          "actions": {},
-          "displayTimewindow": true,
-          "showTitleIcon": false,
-          "iconColor": "rgba(0, 0, 0, 0.87)",
-          "iconSize": "24px",
-          "titleTooltip": ""
-        },
-        "row": 0,
-        "col": 0,
-        "id": "e61e5477-5a09-cc25-966b-f613d81da833",
-        "typeFullFqn": "system.charts.timeseries_bars_flot"
-      },
-      "85fe0738-5326-f069-ab3f-30594bde5fed": {
-        "type": "timeseries",
-        "sizeX": 8,
-        "sizeY": 5,
-        "config": {
-          "datasources": [
-            {
-              "type": "entity",
-              "name": null,
-              "entityAliasId": "40193437-33ac-3172-eefd-0b08eb849062",
-              "filterId": null,
-              "dataKeys": [
-                {
-                  "name": "storageDataPointsCountHourly",
-                  "type": "timeseries",
-                  "label": "{i18n:api-usage.data-points-storage-days}",
-                  "color": "#1039ee",
-                  "settings": {
-                    "excludeFromStacking": false,
-                    "hideDataByDefault": false,
-                    "disableDataHiding": false,
-                    "removeFromLegend": false,
-                    "showLines": false,
-                    "fillLines": false,
-                    "showPoints": false,
-                    "showPointShape": "circle",
-                    "pointShapeFormatter": "",
-                    "showPointsLineWidth": 5,
-                    "showPointsRadius": 3,
-                    "showSeparateAxis": false,
-                    "axisPosition": "left",
-                    "thresholds": [
-                      {
-                        "thresholdValueSource": "predefinedValue"
-                      }
-                    ],
-                    "comparisonSettings": {
-                      "showValuesForComparison": true
-                    }
-                  },
-                  "_hash": 0.0661644137210089,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": null,
-                  "postFuncBody": null
-                }
-              ]
-            }
-          ],
-          "timewindow": {
-            "hideInterval": false,
-            "hideAggregation": false,
-            "hideAggInterval": false,
-            "selectedTab": 1,
-            "history": {
-              "historyType": 0,
-              "timewindowMs": 2592000000,
-              "interval": 86400000
-            },
-            "aggregation": {
-              "type": "SUM",
-              "limit": 1000
-            }
-          },
-          "showTitle": true,
-          "backgroundColor": "#fff",
-          "color": "rgba(0, 0, 0, 0.87)",
-          "padding": "8px",
-          "settings": {
-            "shadowSize": 4,
-            "fontColor": "#545454",
-            "fontSize": 10,
-            "xaxis": {
-              "showLabels": true,
-              "color": "#545454"
-            },
-            "yaxis": {
-              "showLabels": true,
-              "color": "#545454",
-              "min": 0,
-              "tickDecimals": 0,
-              "ticksFormatter": "var rounder = Math.pow(10, 1);\nvar powers = [\n  {key: 'Q', value: Math.pow(10, 15)},\n  {key: 'T', value: Math.pow(10, 12)},\n  {key: 'B', value: Math.pow(10, 9)},\n  {key: 'M', value: Math.pow(10, 6)},\n  {key: 'K', value: 1000}\n];\n\nvar key = '';\n\nfor (var i = 0; i < powers.length; i++) {\n    var reduced = value / powers[i].value;\n    reduced = Math.round(reduced * rounder) / rounder;\n    if (reduced >= 1) {\n        value = reduced;\n        key = powers[i].key;\n        break;\n    }\n}\nreturn value + key;"
-            },
-            "grid": {
-              "color": "#545454",
-              "tickColor": "#DDDDDD",
-              "verticalLines": true,
-              "horizontalLines": true,
-              "outlineWidth": 1
-            },
-            "stack": false,
-            "tooltipIndividual": false,
-            "defaultBarWidth": 1800000,
-            "barAlignment": "left",
-            "timeForComparison": "months",
-            "xaxisSecond": {
-              "axisPosition": "top",
-              "showLabels": true
-            },
-            "showLegend": true,
-            "legendConfig": {
-              "direction": "column",
-              "position": "bottom",
-              "sortDataKeys": false,
-              "showMin": false,
-              "showMax": false,
-              "showAvg": false,
-              "showTotal": true
-            }
-          },
-          "title": "{i18n:api-usage.telemetry-persistence-daily-activity}",
-          "dropShadow": true,
-          "enableFullscreen": true,
-          "titleStyle": {
-            "fontSize": "16px",
-            "fontWeight": 400
-          },
-          "widgetStyle": {},
-          "useDashboardTimewindow": false,
-          "actions": {},
-          "displayTimewindow": true,
-          "showTitleIcon": false,
-          "iconColor": "rgba(0, 0, 0, 0.87)",
-          "iconSize": "24px",
-          "titleTooltip": ""
-        },
-        "row": 0,
-        "col": 0,
-        "id": "85fe0738-5326-f069-ab3f-30594bde5fed",
-        "typeFullFqn": "system.charts.timeseries_bars_flot"
-      },
-      "eaeb381a-437e-f6e9-60c9-6bc8826fdd44": {
-        "type": "timeseries",
-        "sizeX": 8,
-        "sizeY": 5,
-        "config": {
-          "datasources": [
-            {
-              "type": "entity",
-              "name": null,
-              "entityAliasId": "40193437-33ac-3172-eefd-0b08eb849062",
-              "filterId": null,
-              "dataKeys": [
-                {
-                  "name": "storageDataPointsCount",
-                  "type": "timeseries",
-                  "label": "{i18n:api-usage.data-points-storage-days}",
-                  "color": "#1039ee",
-                  "settings": {
-                    "excludeFromStacking": false,
-                    "hideDataByDefault": false,
-                    "disableDataHiding": false,
-                    "removeFromLegend": false,
-                    "showLines": false,
-                    "fillLines": false,
-                    "showPoints": false,
-                    "showPointShape": "circle",
-                    "pointShapeFormatter": "",
-                    "showPointsLineWidth": 5,
-                    "showPointsRadius": 3,
-                    "showSeparateAxis": false,
-                    "axisPosition": "left",
-                    "thresholds": [
-                      {
-                        "thresholdValueSource": "predefinedValue"
-                      }
-                    ],
-                    "comparisonSettings": {
-                      "showValuesForComparison": true
-                    }
-                  },
-                  "_hash": 0.0661644137210089,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": null,
-                  "postFuncBody": null
-                }
-              ]
-            }
-          ],
-          "timewindow": {
-            "hideInterval": false,
-            "hideAggregation": false,
-            "hideAggInterval": false,
-            "selectedTab": 1,
-            "history": {
-              "historyType": 0,
-              "timewindowMs": 31536000000,
-              "interval": 1000
-            },
-            "aggregation": {
-              "type": "NONE",
-              "limit": 1000
-            }
-          },
-          "showTitle": true,
-          "backgroundColor": "#fff",
-          "color": "rgba(0, 0, 0, 0.87)",
-          "padding": "8px",
-          "settings": {
-            "shadowSize": 4,
-            "fontColor": "#545454",
-            "fontSize": 10,
-            "xaxis": {
-              "showLabels": true,
-              "color": "#545454"
-            },
-            "yaxis": {
-              "showLabels": true,
-              "color": "#545454",
-              "min": 0,
-              "tickDecimals": 0,
-              "ticksFormatter": "var rounder = Math.pow(10, 1);\nvar powers = [\n  {key: 'Q', value: Math.pow(10, 15)},\n  {key: 'T', value: Math.pow(10, 12)},\n  {key: 'B', value: Math.pow(10, 9)},\n  {key: 'M', value: Math.pow(10, 6)},\n  {key: 'K', value: 1000}\n];\n\nvar key = '';\n\nfor (var i = 0; i < powers.length; i++) {\n    var reduced = value / powers[i].value;\n    reduced = Math.round(reduced * rounder) / rounder;\n    if (reduced >= 1) {\n        value = reduced;\n        key = powers[i].key;\n        break;\n    }\n}\nreturn value + key;"
-            },
-            "grid": {
-              "color": "#545454",
-              "tickColor": "#DDDDDD",
-              "verticalLines": true,
-              "horizontalLines": true,
-              "outlineWidth": 1
-            },
-            "stack": false,
-            "tooltipIndividual": false,
-            "defaultBarWidth": 900000000,
-            "barAlignment": "left",
-            "timeForComparison": "months",
-            "xaxisSecond": {
-              "axisPosition": "top",
-              "showLabels": true
-            },
-            "showLegend": true,
-            "legendConfig": {
-              "direction": "column",
-              "position": "bottom",
-              "sortDataKeys": false,
-              "showMin": false,
-              "showMax": false,
-              "showAvg": false,
-              "showTotal": true
-            }
-          },
-          "title": "{i18n:api-usage.telemetry-persistence-monthly-activity}",
-          "dropShadow": true,
-          "enableFullscreen": true,
-          "titleStyle": {
-            "fontSize": "16px",
-            "fontWeight": 400
-          },
-          "widgetStyle": {},
-          "useDashboardTimewindow": false,
-          "actions": {},
-          "displayTimewindow": true,
-          "showTitleIcon": false,
-          "iconColor": "rgba(0, 0, 0, 0.87)",
-          "iconSize": "24px",
-          "titleTooltip": ""
-        },
-        "row": 0,
-        "col": 0,
-        "id": "eaeb381a-437e-f6e9-60c9-6bc8826fdd44",
-        "typeFullFqn": "system.charts.timeseries_bars_flot"
-      },
-      "4b798823-b97d-9d6a-59dc-fcafd897fc23": {
-        "type": "timeseries",
-        "sizeX": 8,
-        "sizeY": 5,
-        "config": {
-          "datasources": [
-            {
-              "type": "entity",
-              "name": null,
-              "entityAliasId": "40193437-33ac-3172-eefd-0b08eb849062",
-              "filterId": null,
-              "dataKeys": [
-                {
-                  "name": "createdAlarmsCountHourly",
-                  "type": "timeseries",
-                  "label": "{i18n:api-usage.alarms-created}",
-                  "color": "#d35a00",
-                  "settings": {
-                    "excludeFromStacking": false,
-                    "hideDataByDefault": false,
-                    "disableDataHiding": false,
-                    "removeFromLegend": false,
-                    "showLines": false,
-                    "fillLines": false,
-                    "showPoints": false,
-                    "showPointShape": "circle",
-                    "pointShapeFormatter": "var size = radius * Math.sqrt(Math.PI) / 2;\nctx.moveTo(x - size, y - size);\nctx.lineTo(x + size, y + size);\nctx.moveTo(x - size, y + size);\nctx.lineTo(x + size, y - size);",
-                    "showPointsLineWidth": 5,
-                    "showPointsRadius": 3,
-                    "showSeparateAxis": false,
-                    "axisPosition": "left",
-                    "thresholds": [
-                      {
-                        "thresholdValueSource": "predefinedValue"
-                      }
-                    ],
-                    "comparisonSettings": {
-                      "showValuesForComparison": true
-                    }
-                  },
-                  "_hash": 0.0661644137210089,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": null,
-                  "postFuncBody": null
-                }
-              ]
-            }
-          ],
-          "timewindow": {
-            "hideInterval": false,
-            "hideAggregation": false,
-            "hideAggInterval": false,
-            "selectedTab": 1,
-            "history": {
-              "historyType": 0,
-              "timewindowMs": 2592000000,
-              "interval": 86400000
-            },
-            "aggregation": {
-              "type": "SUM",
-              "limit": 1000
-            }
-          },
-          "showTitle": true,
-          "backgroundColor": "#fff",
-          "color": "rgba(0, 0, 0, 0.87)",
-          "padding": "8px",
-          "settings": {
-            "shadowSize": 4,
-            "fontColor": "#545454",
-            "fontSize": 10,
-            "xaxis": {
-              "showLabels": true,
-              "color": "#545454"
-            },
-            "yaxis": {
-              "showLabels": true,
-              "color": "#545454",
-              "min": 0,
-              "tickDecimals": 0,
-              "ticksFormatter": "var rounder = Math.pow(10, 1);\nvar powers = [\n  {key: 'Q', value: Math.pow(10, 15)},\n  {key: 'T', value: Math.pow(10, 12)},\n  {key: 'B', value: Math.pow(10, 9)},\n  {key: 'M', value: Math.pow(10, 6)},\n  {key: 'K', value: 1000}\n];\n\nvar key = '';\n\nfor (var i = 0; i < powers.length; i++) {\n    var reduced = value / powers[i].value;\n    reduced = Math.round(reduced * rounder) / rounder;\n    if (reduced >= 1) {\n        value = reduced;\n        key = powers[i].key;\n        break;\n    }\n}\nreturn value + key;"
-            },
-            "grid": {
-              "color": "#545454",
-              "tickColor": "#DDDDDD",
-              "verticalLines": true,
-              "horizontalLines": true,
-              "outlineWidth": 1
-            },
-            "stack": false,
-            "tooltipIndividual": false,
-            "defaultBarWidth": 1800000,
-            "barAlignment": "left",
-            "timeForComparison": "months",
-            "xaxisSecond": {
-              "axisPosition": "top",
-              "showLabels": true
-            },
-            "showLegend": true,
-            "legendConfig": {
-              "direction": "column",
-              "position": "bottom",
-              "sortDataKeys": false,
-              "showMin": false,
-              "showMax": false,
-              "showAvg": false,
-              "showTotal": true
-            }
-          },
-          "title": "{i18n:api-usage.alarms-created-daily-activity}",
-          "dropShadow": true,
-          "enableFullscreen": true,
-          "titleStyle": {
-            "fontSize": "16px",
-            "fontWeight": 400
-          },
-          "widgetStyle": {},
-          "useDashboardTimewindow": false,
-          "actions": {},
-          "displayTimewindow": true,
-          "showTitleIcon": false,
-          "iconColor": "rgba(0, 0, 0, 0.87)",
-          "iconSize": "24px",
-          "titleTooltip": ""
-        },
-        "row": 0,
-        "col": 0,
-        "id": "4b798823-b97d-9d6a-59dc-fcafd897fc23",
-        "typeFullFqn": "system.charts.timeseries_bars_flot"
-      },
-      "6a981580-7490-19dd-f937-b64cbf67a982": {
-        "type": "timeseries",
-        "sizeX": 8,
-        "sizeY": 5,
-        "config": {
-          "datasources": [
-            {
-              "type": "entity",
-              "name": null,
-              "entityAliasId": "40193437-33ac-3172-eefd-0b08eb849062",
-              "filterId": null,
-              "dataKeys": [
-                {
-                  "name": "createdAlarmsCount",
-                  "type": "timeseries",
-                  "label": "{i18n:api-usage.alarms-created}",
-                  "color": "#d35a00",
-                  "settings": {
-                    "excludeFromStacking": false,
-                    "hideDataByDefault": false,
-                    "disableDataHiding": false,
-                    "removeFromLegend": false,
-                    "showLines": false,
-                    "fillLines": false,
-                    "showPoints": false,
-                    "showPointShape": "circle",
-                    "pointShapeFormatter": "var size = radius * Math.sqrt(Math.PI) / 2;\nctx.moveTo(x - size, y - size);\nctx.lineTo(x + size, y + size);\nctx.moveTo(x - size, y + size);\nctx.lineTo(x + size, y - size);",
-                    "showPointsLineWidth": 5,
-                    "showPointsRadius": 3,
-                    "showSeparateAxis": false,
-                    "axisPosition": "left",
-                    "thresholds": [
-                      {
-                        "thresholdValueSource": "predefinedValue"
-                      }
-                    ],
-                    "comparisonSettings": {
-                      "showValuesForComparison": true
-                    }
-                  },
-                  "_hash": 0.0661644137210089,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": null,
-                  "postFuncBody": null
-                }
-              ]
-            }
-          ],
-          "timewindow": {
-            "hideInterval": false,
-            "hideAggregation": false,
-            "hideAggInterval": false,
-            "selectedTab": 1,
-            "history": {
-              "historyType": 0,
-              "timewindowMs": 31536000000,
-              "interval": 1000
-            },
-            "aggregation": {
-              "type": "NONE",
-              "limit": 1000
-            }
-          },
-          "showTitle": true,
-          "backgroundColor": "#fff",
-          "color": "rgba(0, 0, 0, 0.87)",
-          "padding": "8px",
-          "settings": {
-            "shadowSize": 4,
-            "fontColor": "#545454",
-            "fontSize": 10,
-            "xaxis": {
-              "showLabels": true,
-              "color": "#545454"
-            },
-            "yaxis": {
-              "showLabels": true,
-              "color": "#545454",
-              "min": 0,
-              "tickDecimals": 0,
-              "ticksFormatter": "var rounder = Math.pow(10, 1);\nvar powers = [\n  {key: 'Q', value: Math.pow(10, 15)},\n  {key: 'T', value: Math.pow(10, 12)},\n  {key: 'B', value: Math.pow(10, 9)},\n  {key: 'M', value: Math.pow(10, 6)},\n  {key: 'K', value: 1000}\n];\n\nvar key = '';\n\nfor (var i = 0; i < powers.length; i++) {\n    var reduced = value / powers[i].value;\n    reduced = Math.round(reduced * rounder) / rounder;\n    if (reduced >= 1) {\n        value = reduced;\n        key = powers[i].key;\n        break;\n    }\n}\nreturn value + key;"
-            },
-            "grid": {
-              "color": "#545454",
-              "tickColor": "#DDDDDD",
-              "verticalLines": true,
-              "horizontalLines": true,
-              "outlineWidth": 1
-            },
-            "stack": false,
-            "tooltipIndividual": false,
-            "defaultBarWidth": 900000000,
-            "barAlignment": "left",
-            "timeForComparison": "months",
-            "xaxisSecond": {
-              "axisPosition": "top",
-              "showLabels": true
-            },
-            "showLegend": true,
-            "legendConfig": {
-              "direction": "column",
-              "position": "bottom",
-              "sortDataKeys": false,
-              "showMin": false,
-              "showMax": false,
-              "showAvg": false,
-              "showTotal": true
-            }
-          },
-          "title": "{i18n:api-usage.alarms-created-monthly-activity}",
-          "dropShadow": true,
-          "enableFullscreen": true,
-          "titleStyle": {
-            "fontSize": "16px",
-            "fontWeight": 400
-          },
-          "widgetStyle": {},
-          "useDashboardTimewindow": false,
-          "actions": {},
-          "displayTimewindow": true,
-          "showTitleIcon": false,
-          "iconColor": "rgba(0, 0, 0, 0.87)",
-          "iconSize": "24px",
-          "titleTooltip": ""
-        },
-        "row": 0,
-        "col": 0,
-        "id": "6a981580-7490-19dd-f937-b64cbf67a982",
-        "typeFullFqn": "system.charts.timeseries_bars_flot"
-      },
-      "7302df65-1b0c-579e-bbdb-145126ae3392": {
-        "type": "timeseries",
-        "sizeX": 8,
-        "sizeY": 5,
-        "config": {
-          "datasources": [
-            {
-              "type": "entity",
-              "name": null,
-              "entityAliasId": "40193437-33ac-3172-eefd-0b08eb849062",
-              "filterId": null,
-              "dataKeys": [
-                {
-                  "name": "smsCountHourly",
-                  "type": "timeseries",
-                  "label": "{i18n:api-usage.sms-messages}",
-                  "color": "#f36021",
-                  "settings": {
-                    "excludeFromStacking": false,
-                    "hideDataByDefault": false,
-                    "disableDataHiding": false,
-                    "removeFromLegend": false,
-                    "showLines": false,
-                    "fillLines": false,
-                    "showPoints": false,
-                    "showPointShape": "circle",
-                    "pointShapeFormatter": "",
-                    "showPointsLineWidth": 5,
-                    "showPointsRadius": 3,
-                    "showSeparateAxis": false,
-                    "axisPosition": "left",
-                    "thresholds": [
-                      {
-                        "thresholdValueSource": "predefinedValue"
-                      }
-                    ],
-                    "comparisonSettings": {
-                      "showValuesForComparison": true
-                    }
-                  },
-                  "_hash": 0.0661644137210089,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": null,
-                  "postFuncBody": null
-                }
-              ]
-            }
-          ],
-          "timewindow": {
-            "hideInterval": false,
-            "hideAggregation": false,
-            "hideAggInterval": false,
-            "selectedTab": 1,
-            "history": {
-              "historyType": 0,
-              "timewindowMs": 2592000000,
-              "interval": 86400000
-            },
-            "aggregation": {
-              "type": "SUM",
-              "limit": 1000
-            }
-          },
-          "showTitle": true,
-          "backgroundColor": "#fff",
-          "color": "rgba(0, 0, 0, 0.87)",
-          "padding": "8px",
-          "settings": {
-            "shadowSize": 4,
-            "fontColor": "#545454",
-            "fontSize": 10,
-            "xaxis": {
-              "showLabels": true,
-              "color": "#545454"
-            },
-            "yaxis": {
-              "showLabels": true,
-              "color": "#545454",
-              "min": 0,
-              "tickDecimals": 0,
-              "ticksFormatter": "var rounder = Math.pow(10, 1);\nvar powers = [\n  {key: 'Q', value: Math.pow(10, 15)},\n  {key: 'T', value: Math.pow(10, 12)},\n  {key: 'B', value: Math.pow(10, 9)},\n  {key: 'M', value: Math.pow(10, 6)},\n  {key: 'K', value: 1000}\n];\n\nvar key = '';\n\nfor (var i = 0; i < powers.length; i++) {\n    var reduced = value / powers[i].value;\n    reduced = Math.round(reduced * rounder) / rounder;\n    if (reduced >= 1) {\n        value = reduced;\n        key = powers[i].key;\n        break;\n    }\n}\nreturn value + key;"
-            },
-            "grid": {
-              "color": "#545454",
-              "tickColor": "#DDDDDD",
-              "verticalLines": true,
-              "horizontalLines": true,
-              "outlineWidth": 1
-            },
-            "stack": false,
-            "tooltipIndividual": false,
-            "defaultBarWidth": 1800000,
-            "barAlignment": "left",
-            "timeForComparison": "months",
-            "xaxisSecond": {
-              "axisPosition": "top",
-              "showLabels": true
-            },
-            "showLegend": true,
-            "legendConfig": {
-              "direction": "column",
-              "position": "bottom",
-              "sortDataKeys": false,
-              "showMin": false,
-              "showMax": false,
-              "showAvg": false,
-              "showTotal": true
-            }
-          },
-          "title": "{i18n:api-usage.sms-messages-daily-activity}",
-          "dropShadow": true,
-          "enableFullscreen": true,
-          "titleStyle": {
-            "fontSize": "16px",
-            "fontWeight": 400
-          },
-          "widgetStyle": {},
-          "useDashboardTimewindow": false,
-          "actions": {},
-          "displayTimewindow": true,
-          "showTitleIcon": false,
-          "iconColor": "rgba(0, 0, 0, 0.87)",
-          "iconSize": "24px",
-          "titleTooltip": ""
-        },
-        "row": 0,
-        "col": 0,
-        "id": "7302df65-1b0c-579e-bbdb-145126ae3392",
-        "typeFullFqn": "system.charts.timeseries_bars_flot"
-      },
-      "fdb385e7-14fe-fc9f-ebdc-b400f26fc66b": {
-        "type": "timeseries",
-        "sizeX": 8,
-        "sizeY": 5,
-        "config": {
-          "datasources": [
-            {
-              "type": "entity",
-              "name": null,
-              "entityAliasId": "40193437-33ac-3172-eefd-0b08eb849062",
-              "filterId": null,
-              "dataKeys": [
-                {
-                  "name": "smsCount",
-                  "type": "timeseries",
-                  "label": "{i18n:api-usage.sms-messages}",
-                  "color": "#f36021",
-                  "settings": {
-                    "excludeFromStacking": false,
-                    "hideDataByDefault": false,
-                    "disableDataHiding": false,
-                    "removeFromLegend": false,
-                    "showLines": false,
-                    "fillLines": false,
-                    "showPoints": false,
-                    "showPointShape": "circle",
-                    "pointShapeFormatter": "",
-                    "showPointsLineWidth": 5,
-                    "showPointsRadius": 3,
-                    "showSeparateAxis": false,
-                    "axisPosition": "left",
-                    "thresholds": [
-                      {
-                        "thresholdValueSource": "predefinedValue"
-                      }
-                    ],
-                    "comparisonSettings": {
-                      "showValuesForComparison": true
-                    }
-                  },
-                  "_hash": 0.0661644137210089,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": null,
-                  "postFuncBody": null
-                }
-              ]
-            }
-          ],
-          "timewindow": {
-            "hideInterval": false,
-            "hideAggregation": false,
-            "hideAggInterval": false,
-            "selectedTab": 1,
-            "history": {
-              "historyType": 0,
-              "timewindowMs": 31536000000,
-              "interval": 1000
-            },
-            "aggregation": {
-              "type": "NONE",
-              "limit": 1000
-            }
-          },
-          "showTitle": true,
-          "backgroundColor": "#fff",
-          "color": "rgba(0, 0, 0, 0.87)",
-          "padding": "8px",
-          "settings": {
-            "shadowSize": 4,
-            "fontColor": "#545454",
-            "fontSize": 10,
-            "xaxis": {
-              "showLabels": true,
-              "color": "#545454"
-            },
-            "yaxis": {
-              "showLabels": true,
-              "color": "#545454",
-              "min": 0,
-              "tickDecimals": 0,
-              "ticksFormatter": "var rounder = Math.pow(10, 1);\nvar powers = [\n  {key: 'Q', value: Math.pow(10, 15)},\n  {key: 'T', value: Math.pow(10, 12)},\n  {key: 'B', value: Math.pow(10, 9)},\n  {key: 'M', value: Math.pow(10, 6)},\n  {key: 'K', value: 1000}\n];\n\nvar key = '';\n\nfor (var i = 0; i < powers.length; i++) {\n    var reduced = value / powers[i].value;\n    reduced = Math.round(reduced * rounder) / rounder;\n    if (reduced >= 1) {\n        value = reduced;\n        key = powers[i].key;\n        break;\n    }\n}\nreturn value + key;"
-            },
-            "grid": {
-              "color": "#545454",
-              "tickColor": "#DDDDDD",
-              "verticalLines": true,
-              "horizontalLines": true,
-              "outlineWidth": 1
-            },
-            "stack": false,
-            "tooltipIndividual": false,
-            "defaultBarWidth": 900000000,
-            "barAlignment": "left",
-            "timeForComparison": "months",
-            "xaxisSecond": {
-              "axisPosition": "top",
-              "showLabels": true
-            },
-            "showLegend": true,
-            "legendConfig": {
-              "direction": "column",
-              "position": "bottom",
-              "sortDataKeys": false,
-              "showMin": false,
-              "showMax": false,
-              "showAvg": false,
-              "showTotal": true
-            }
-          },
-          "title": "{i18n:api-usage.sms-messages-monthly-activity}",
-          "dropShadow": true,
-          "enableFullscreen": true,
-          "titleStyle": {
-            "fontSize": "16px",
-            "fontWeight": 400
-          },
-          "widgetStyle": {},
-          "useDashboardTimewindow": false,
-          "actions": {},
-          "displayTimewindow": true,
-          "showTitleIcon": false,
-          "iconColor": "rgba(0, 0, 0, 0.87)",
-          "iconSize": "24px",
-          "titleTooltip": ""
-        },
-        "row": 0,
-        "col": 0,
-        "id": "fdb385e7-14fe-fc9f-ebdc-b400f26fc66b",
-        "typeFullFqn": "system.charts.timeseries_bars_flot"
-      },
-      "2408ad30-163e-8221-08e1-a82b638be564": {
-        "type": "timeseries",
-        "sizeX": 12,
-        "sizeY": 7,
-        "config": {
-          "datasources": [
-            {
-              "type": "entity",
-              "dataKeys": [
-                {
-                  "name": "successfulMsgs",
-                  "type": "timeseries",
-                  "label": "{i18n:api-usage.successful}",
-                  "color": "#4caf50",
-                  "settings": {
-                    "excludeFromStacking": false,
-                    "hideDataByDefault": false,
-                    "disableDataHiding": false,
-                    "removeFromLegend": false,
-                    "showLines": true,
-                    "fillLines": false,
-                    "showPoints": false,
-                    "showPointShape": "circle",
-                    "pointShapeFormatter": "",
-                    "showPointsLineWidth": 5,
-                    "showPointsRadius": 3,
-                    "showSeparateAxis": false,
-                    "axisPosition": "left",
-                    "thresholds": [
-                      {
-                        "thresholdValueSource": "predefinedValue"
-                      }
-                    ],
-                    "comparisonSettings": {
-                      "showValuesForComparison": true
-                    }
-                  },
-                  "_hash": 0.15490750967648736
-                },
-                {
-                  "name": "failedMsgs",
-                  "type": "timeseries",
-                  "label": "{i18n:api-usage.permanent-failures}",
-                  "color": "#ef5350",
-                  "settings": {
-                    "excludeFromStacking": false,
-                    "hideDataByDefault": false,
-                    "disableDataHiding": false,
-                    "removeFromLegend": false,
-                    "showLines": true,
-                    "fillLines": false,
-                    "showPoints": false,
-                    "showPointShape": "circle",
-                    "pointShapeFormatter": "",
-                    "showPointsLineWidth": 5,
-                    "showPointsRadius": 3,
-                    "showSeparateAxis": false,
-                    "axisPosition": "left",
-                    "thresholds": [
-                      {
-                        "thresholdValueSource": "predefinedValue"
-                      }
-                    ],
-                    "comparisonSettings": {
-                      "showValuesForComparison": true
-                    }
-                  },
-                  "_hash": 0.4186621166514697
-                },
-                {
-                  "name": "tmpFailed",
-                  "type": "timeseries",
-                  "label": "{i18n:api-usage.processing-failures}",
-                  "color": "#ffc107",
-                  "settings": {
-                    "excludeFromStacking": false,
-                    "hideDataByDefault": false,
-                    "disableDataHiding": false,
-                    "removeFromLegend": false,
-                    "showLines": true,
-                    "fillLines": false,
-                    "showPoints": false,
-                    "showPointShape": "circle",
-                    "pointShapeFormatter": "",
-                    "showPointsLineWidth": 5,
-                    "showPointsRadius": 3,
-                    "showSeparateAxis": false,
-                    "axisPosition": "left",
-                    "thresholds": [
-                      {
-                        "thresholdValueSource": "predefinedValue"
-                      }
-                    ],
-                    "comparisonSettings": {
-                      "showValuesForComparison": true
-                    }
-                  },
-                  "_hash": 0.49891007198715376
-                }
-              ],
-              "entityAliasId": "2e4c97b0-257a-a1b9-690c-141d9bf2ec6f"
-            }
-          ],
-          "timewindow": {
-            "hideInterval": false,
-            "hideAggregation": false,
-            "hideAggInterval": false,
-            "selectedTab": 0,
-            "realtime": {
-              "timewindowMs": 3600000,
-              "interval": 1000
-            },
-            "aggregation": {
-              "type": "NONE",
-              "limit": 10000
-            }
-          },
-          "showTitle": true,
-          "backgroundColor": "#fff",
-          "color": "rgba(0, 0, 0, 0.87)",
-          "padding": "8px",
-          "settings": {
-            "shadowSize": 4,
-            "fontColor": "#545454",
-            "fontSize": 10,
-            "xaxis": {
-              "showLabels": true,
-              "color": "#545454"
-            },
-            "yaxis": {
-              "showLabels": true,
-              "color": "#545454",
-              "min": 0,
-              "tickDecimals": 0,
-              "ticksFormatter": "var rounder = Math.pow(10, 1);\nvar powers = [\n  {key: 'Q', value: Math.pow(10, 15)},\n  {key: 'T', value: Math.pow(10, 12)},\n  {key: 'B', value: Math.pow(10, 9)},\n  {key: 'M', value: Math.pow(10, 6)},\n  {key: 'K', value: 1000}\n];\n\nvar key = '';\n\nfor (var i = 0; i < powers.length; i++) {\n    var reduced = value / powers[i].value;\n    reduced = Math.round(reduced * rounder) / rounder;\n    if (reduced >= 1) {\n        value = reduced;\n        key = powers[i].key;\n        break;\n    }\n}\nreturn value + key;"
-            },
-            "grid": {
-              "color": "#545454",
-              "tickColor": "#DDDDDD",
-              "verticalLines": true,
-              "horizontalLines": true,
-              "outlineWidth": 1
-            },
-            "stack": false,
-            "tooltipIndividual": false,
-            "timeForComparison": "months",
-            "xaxisSecond": {
-              "axisPosition": "top",
-              "showLabels": true
-            },
-            "showLegend": true,
-            "legendConfig": {
-              "direction": "column",
-              "position": "bottom",
-              "showMin": true,
-              "showMax": true,
-              "showAvg": false,
-              "showTotal": true
-            }
-          },
-          "title": "Queue Stats",
-          "dropShadow": true,
-          "enableFullscreen": true,
-          "titleStyle": {
-            "fontSize": "16px",
-            "fontWeight": 400
-          },
-          "mobileHeight": null,
-          "showTitleIcon": false,
-          "titleIcon": null,
-          "iconColor": "rgba(0, 0, 0, 0.87)",
-          "iconSize": "24px",
-          "titleTooltip": "",
-          "widgetStyle": {},
-          "useDashboardTimewindow": false,
-          "displayTimewindow": true,
-          "actions": {}
-        },
-        "id": "2408ad30-163e-8221-08e1-a82b638be564",
-        "typeFullFqn": "system.charts.basic_timeseries"
-      },
-      "e43dcfe1-b970-6a11-ce0e-5769f3eb5e88": {
-        "type": "timeseries",
-        "sizeX": 12,
-        "sizeY": 7,
-        "config": {
-          "datasources": [
-            {
-              "type": "entity",
-              "dataKeys": [
-                {
-                  "name": "timeoutMsgs",
-                  "type": "timeseries",
-                  "label": "{i18n:api-usage.permanent-timeouts}",
-                  "color": "#4caf50",
-                  "settings": {
-                    "excludeFromStacking": false,
-                    "hideDataByDefault": false,
-                    "disableDataHiding": false,
-                    "removeFromLegend": false,
-                    "showLines": true,
-                    "fillLines": false,
-                    "showPoints": false,
-                    "showPointShape": "circle",
-                    "pointShapeFormatter": "",
-                    "showPointsLineWidth": 5,
-                    "showPointsRadius": 3,
-                    "showSeparateAxis": false,
-                    "axisPosition": "left",
-                    "thresholds": [
-                      {
-                        "thresholdValueSource": "predefinedValue"
-                      }
-                    ],
-                    "comparisonSettings": {
-                      "showValuesForComparison": true
-                    }
-                  },
-                  "_hash": 0.565222981550328
-                },
-                {
-                  "name": "tmpTimeout",
-                  "type": "timeseries",
-                  "label": "{i18n:api-usage.processing-timeouts}",
-                  "color": "#9c27b0",
-                  "settings": {
-                    "excludeFromStacking": false,
-                    "hideDataByDefault": false,
-                    "disableDataHiding": false,
-                    "removeFromLegend": false,
-                    "showLines": true,
-                    "fillLines": false,
-                    "showPoints": false,
-                    "showPointShape": "circle",
-                    "pointShapeFormatter": "",
-                    "showPointsLineWidth": 5,
-                    "showPointsRadius": 3,
-                    "showSeparateAxis": false,
-                    "axisPosition": "left",
-                    "thresholds": [
-                      {
-                        "thresholdValueSource": "predefinedValue"
-                      }
-                    ],
-                    "comparisonSettings": {
-                      "showValuesForComparison": true
-                    }
-                  },
-                  "_hash": 0.2679547062508352
-                }
-              ],
-              "entityAliasId": "2e4c97b0-257a-a1b9-690c-141d9bf2ec6f"
-            }
-          ],
-          "timewindow": {
-            "hideInterval": false,
-            "hideAggregation": false,
-            "hideAggInterval": false,
-            "selectedTab": 0,
-            "realtime": {
-              "timewindowMs": 3600000,
-              "interval": 1000
-            },
-            "aggregation": {
-              "type": "NONE",
-              "limit": 10000
-            }
-          },
-          "showTitle": true,
-          "backgroundColor": "#fff",
-          "color": "rgba(0, 0, 0, 0.87)",
-          "padding": "8px",
-          "settings": {
-            "shadowSize": 4,
-            "fontColor": "#545454",
-            "fontSize": 10,
-            "xaxis": {
-              "showLabels": true,
-              "color": "#545454"
-            },
-            "yaxis": {
-              "showLabels": true,
-              "color": "#545454",
-              "min": 0,
-              "tickDecimals": 0,
-              "ticksFormatter": "var rounder = Math.pow(10, 1);\nvar powers = [\n  {key: 'Q', value: Math.pow(10, 15)},\n  {key: 'T', value: Math.pow(10, 12)},\n  {key: 'B', value: Math.pow(10, 9)},\n  {key: 'M', value: Math.pow(10, 6)},\n  {key: 'K', value: 1000}\n];\n\nvar key = '';\n\nfor (var i = 0; i < powers.length; i++) {\n    var reduced = value / powers[i].value;\n    reduced = Math.round(reduced * rounder) / rounder;\n    if (reduced >= 1) {\n        value = reduced;\n        key = powers[i].key;\n        break;\n    }\n}\nreturn value + key;"
-            },
-            "grid": {
-              "color": "#545454",
-              "tickColor": "#DDDDDD",
-              "verticalLines": true,
-              "horizontalLines": true,
-              "outlineWidth": 1
-            },
-            "stack": false,
-            "tooltipIndividual": false,
-            "timeForComparison": "months",
-            "xaxisSecond": {
-              "axisPosition": "top",
-              "showLabels": true
-            },
-            "showLegend": true,
-            "legendConfig": {
-              "direction": "column",
-              "position": "bottom",
-              "showMin": true,
-              "showMax": true,
-              "showAvg": false,
-              "showTotal": true
-            }
-          },
-          "title": "Processing Failures and Timeouts",
-          "dropShadow": true,
-          "enableFullscreen": true,
-          "titleStyle": {
-            "fontSize": "16px",
-            "fontWeight": 400
-          },
-          "mobileHeight": null,
-          "showTitleIcon": false,
-          "titleIcon": null,
-          "iconColor": "rgba(0, 0, 0, 0.87)",
-          "iconSize": "24px",
-          "titleTooltip": "",
-          "widgetStyle": {},
-          "useDashboardTimewindow": false,
-          "displayTimewindow": true,
-          "actions": {}
-        },
-        "id": "e43dcfe1-b970-6a11-ce0e-5769f3eb5e88",
-        "typeFullFqn": "system.charts.basic_timeseries"
-      },
-      "a669cf86-e715-efa4-dd9a-b839abf499e9": {
-        "type": "timeseries",
-        "sizeX": 24,
-        "sizeY": 5,
-        "config": {
-          "datasources": [
-            {
-              "type": "entity",
-              "dataKeys": [
-                {
-                  "name": "ruleEngineException",
-                  "type": "timeseries",
-                  "label": "Rule Chain",
-                  "color": "#2196f3",
-                  "settings": {
-                    "useCellStyleFunction": false,
-                    "useCellContentFunction": true,
-                    "cellContentFunction": "return JSON.parse(value).ruleChainName;"
-                  },
-                  "_hash": 0.9954481282345906
-                },
-                {
-                  "name": "ruleEngineException",
-                  "type": "timeseries",
-                  "label": "Rule Node",
-                  "color": "#4caf50",
-                  "settings": {
-                    "useCellStyleFunction": false,
-                    "useCellContentFunction": true,
-                    "cellContentFunction": "return JSON.parse(value).ruleNodeName;"
-                  },
-                  "_hash": 0.18580357036589978
-                },
-                {
-                  "name": "ruleEngineException",
-                  "type": "timeseries",
-                  "label": "Latest Error",
-                  "color": "#f44336",
-                  "settings": {
-                    "useCellStyleFunction": false,
-                    "useCellContentFunction": true,
-                    "cellContentFunction": "return JSON.parse(value).message;"
-                  },
-                  "_hash": 0.7255162989552142
-                }
-              ],
-              "entityAliasId": "2e4c97b0-257a-a1b9-690c-141d9bf2ec6f"
-            }
-          ],
-          "timewindow": {
-            "hideInterval": false,
-            "hideAggregation": false,
-            "hideAggInterval": false,
-            "selectedTab": 0,
-            "realtime": {
-              "timewindowMs": 2592000000,
-              "interval": 1000
-            },
-            "aggregation": {
-              "type": "NONE",
-              "limit": 1000
-            }
-          },
-          "showTitle": true,
-          "backgroundColor": "rgb(255, 255, 255)",
-          "color": "rgba(0, 0, 0, 0.87)",
-          "padding": "8px",
-          "settings": {
-            "showTimestamp": true,
-            "displayPagination": true,
-            "defaultPageSize": 10
-          },
-          "title": "Exceptions",
-          "dropShadow": true,
-          "enableFullscreen": true,
-          "titleStyle": {
-            "fontSize": "16px",
-            "fontWeight": 400
-          },
-          "useDashboardTimewindow": false,
-          "showLegend": false,
-          "widgetStyle": {},
-          "actions": {},
-          "showTitleIcon": false,
-          "titleIcon": null,
-          "iconColor": "rgba(0, 0, 0, 0.87)",
-          "iconSize": "24px",
-          "titleTooltip": "",
-          "displayTimewindow": true
-        },
-        "id": "a669cf86-e715-efa4-dd9a-b839abf499e9",
-        "typeFullFqn": "system.cards.timeseries_table"
-      },
-      "292eaded-4775-36f7-c896-98d57bdda936": {
-        "type": "latest",
-        "sizeX": 7.5,
-        "sizeY": 3,
-        "config": {
-          "datasources": [
-            {
-              "type": "entity",
-              "name": null,
-              "entityAliasId": "40193437-33ac-3172-eefd-0b08eb849062",
-              "filterId": null,
-              "dataKeys": [
-                {
-                  "name": "emailApiState",
-                  "type": "timeseries",
-                  "label": "apiState",
-                  "color": "#2196f3",
-                  "settings": {},
-                  "_hash": 0.8830669138660703,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": null,
-                  "postFuncBody": null
-                },
-                {
-                  "name": "emailLimit",
-                  "type": "timeseries",
-                  "label": "limit",
-                  "color": "#4caf50",
-                  "settings": {},
-                  "_hash": 0.5463603803546802,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": null,
-                  "postFuncBody": null
-                },
-                {
-                  "name": "emailCount",
-                  "type": "timeseries",
-                  "label": "count",
-                  "color": "#f44336",
-                  "settings": {},
-                  "_hash": 0.5564241862015964,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": null,
-                  "postFuncBody": null
-                },
-                {
-                  "name": "transportApiState",
-                  "type": "timeseries",
-                  "label": "cardId",
-                  "color": "#607d8b",
-                  "settings": {},
-                  "_hash": 0.051659774305067296,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": true,
-                  "postFuncBody": "return (Math.random()*100000).toFixed(0);"
-                },
-                {
-                  "name": "smsApiState",
-                  "type": "timeseries",
-                  "label": "apiStatePoint",
-                  "color": "#e91e63",
-                  "settings": {},
-                  "_hash": 0.2969682764607864,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": null,
-                  "postFuncBody": null
-                },
-                {
-                  "name": "smsLimit",
-                  "type": "timeseries",
-                  "label": "pointsLimit",
-                  "color": "#9c27b0",
-                  "settings": {},
-                  "_hash": 0.22082255831864894,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": null,
-                  "postFuncBody": null
-                },
-                {
-                  "name": "smsCount",
-                  "type": "timeseries",
-                  "label": "pointsCount",
-                  "color": "#8bc34a",
-                  "settings": {},
-                  "_hash": 0.6340356364819146,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": null,
-                  "postFuncBody": null
-                },
-                {
-                  "name": "transportApiState",
-                  "type": "timeseries",
-                  "label": "title",
-                  "color": "#3f51b5",
-                  "settings": {},
-                  "_hash": 0.6894070537030252,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": true,
-                  "postFuncBody": "return \"{i18n:api-usage.notifications}\";"
-                }
-              ]
-            }
-          ],
-          "timewindow": {
-            "displayValue": "",
-            "selectedTab": 0,
-            "realtime": {
-              "realtimeType": 1,
-              "interval": 1000,
-              "timewindowMs": 60000,
-              "quickInterval": "CURRENT_DAY"
-            },
-            "history": {
-              "historyType": 0,
-              "interval": 1000,
-              "timewindowMs": 60000,
-              "fixedTimewindow": {
-                "startTimeMs": 1694083375827,
-                "endTimeMs": 1694169775827
-              },
-              "quickInterval": "CURRENT_DAY"
-            },
-            "aggregation": {
-              "type": "AVG",
-              "limit": 25000
-            }
-          },
-          "showTitle": false,
-          "backgroundColor": "#fff",
-          "color": "#666666",
-          "padding": "0",
-          "settings": {
-            "cardCss": ".card {\n   width: 100%;\n   height: 100%;\n   box-sizing: border-box;\n   display: flex;\n   flex-direction: column;\n}\n\n.card > img {\n    height: 0;\n}\n\n.card .content {\n   flex: 1;    \n   padding: 13px 13px 0;\n   display: flex;\n   box-sizing: border-box;\n}\n\n.card .content .column {\n   display: flex;\n   flex-direction: column;    \n   justify-content: space-around;\n   flex: 1;\n}\n\n.card .content .title-row {\n    display: flex;\n    flex-direction: row;\n    padding-bottom: 10px;\n}\n\n.card .title {\n    flex: 1;\n    font-size: 20px;\n    font-weight: 400;\n    color: #666666;\n}\n\n.card .state {\n    text-transform: uppercase;\n    font-size: 20px;\n    font-weight: bold;\n}\n\n.card.enabled .state {\n    color: #00B260;\n}\n\n.card.warning .state {\n    color: #FFAD6F;\n}\n\n.card.disabled .state {\n    color: #F73243;\n}\n\n.card .bars-row {\n    flex: 1;\n    display: flex;\n    flex-direction: row;\n}\n\n.card .bar-column {\n    flex: 1;\n    display: flex;\n    flex-direction: column;\n}\n\n.card .bar-container {\n    flex: 1;\n    display: flex;\n    flex-direction: column;\n    justify-content: center;\n}\n\n.card .bar {\n    flex: 1;\n    max-height: 30px;\n    margin-top: 3.5px;\n    margin-bottom: 4px;\n    background-color: #F0F0F0;\n    border: 1px solid #DADCDB;\n    border-radius: 2px;\n    box-shadow: inset 0 1px 3px rgba(0, 0, 0, .2);\n}\n\n.card.enabled .bar {\n    border-color: #00B260;\n    background-color: #F0FBF7;\n}\n\n.card.warning .bar {\n    border-color: #FFAD6F;\n    background-color: #FFFAF6;\n}\n\n.card.disabled .bar {\n    border-color: #F73243;\n    background-color: #FFF0F0;\n}\n\n.card .bar .bar-fill {\n    background-color: #F0F0F0;\n    border-radius: 2px;\n    height: 100%;\n    width: 0%;\n}\n\n.card.enabled .bar-fill {\n    background-color: #00C46C;\n}\n\n.card.warning .bar-fill {\n    background-color: #FFD099;\n}\n\n.card.disabled .bar-fill {\n    background-color: #FF9494;\n}\n\n.card .bar-labels {\n    height: 20px;\n    font-size: 16px;\n    color: #666;\n    display: flex;\n    flex-direction: row;\n}\n\n.card .mat-mdc-button-base {\n    text-transform: uppercase;\n    white-space: nowrap;\n    overflow: hidden;\n    text-overflow: ellipsis;\n}\n.card .mdc-button__label {\n    pointer-events: none;\n}\n\n.card .action-row {\n    display: flex;\n    flex-direction: row;\n    justify-content: flex-end;\n    padding: 8px 0;\n}\n\n\n@media screen and (min-width: 960px) and (max-width: 1279px) {\n  .card .title {\n      font-size: 12px;\n  }\n  .card .state {\n      font-size: 12px;\n  }\n  .card .unit {\n      font-size: 8px;\n  }\n  .card .bar-labels {\n      font-size: 6px;\n  }\n  .card .mat-mdc-button-base {\n      font-size: 8px;\n  }\n  .card .action-row {\n      padding: 0;\n  }\n}\n\n@media screen and (min-width: 1280px) and (max-width: 1599px) {\n  .card .title {\n      font-size: 14px;\n  }\n  .card .state {\n      font-size: 14px;\n  }\n  .card .unit {\n      font-size: 10px;\n  }\n  .card .bar-labels {\n      font-size: 8px;\n  }\n  .card .mat-mdc-button-base {\n      font-size: 10px;\n  }\n  .card .action-row {\n      padding: 0;\n  }\n}\n\n@media screen and (min-width: 1600px) and (max-width: 1919px) {\n  .card .title {\n      font-size: 16px;\n  }\n  .card .state {\n      font-size: 16px;\n  }\n  .card .unit {\n      font-size: 12px;\n  }\n  .card .bar-labels {\n      font-size: 12px;\n  }\n  .card .mat-mdc-button-base {\n      font-size: 12px;\n  }\n  .card .action-row {\n      padding: 0;\n  }\n}    \n\n",
-            "cardHtml": "<div class='card'>\n    <img src=\"data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7\" onload=\"initializeCard_${cardId:0}(event);\">\n    <script type=\"text/javascript\">\n        function initializeCard_${cardId:0}(e) {\n\n            function toShortNumber(number) {\n                var rounder = Math.pow(10, 1);\n                var powers = [\n                    {key: 'Q', value: Math.pow(10, 15)},\n                    {key: 'T', value: Math.pow(10, 12)},\n                    {key: 'B', value: Math.pow(10, 9)},\n                    {key: 'M', value: Math.pow(10, 6)},\n                    {key: 'K', value: 1000}\n                ];\n\n                var key = '';\n\n                for (var i = 0; i < powers.length; i++) {\n                    var reduced = number / powers[i].value;\n                    reduced = Math.round(reduced * rounder) / rounder;\n                    if (reduced >= 1) {\n                        number = reduced;\n                        key = powers[i].key;\n                        break;\n                    }\n                }\n                return number + key;\n            }\n\n            var imgTag = e.target;\n            var parentTag = imgTag.parentNode;\n            var count = \"${count:0}\";\n            var limit = \"${limit:0}\";\n            count = count.length > 0 ? parseInt(count, 10) : 0;\n            limit = limit.length > 0 ? parseInt(limit, 10) : 0;\n            var percentElement = $('#api-usage-percent', parentTag);\n            var valueElement = $('#api-usage-value', parentTag);\n            var barElement = $('#api-usage-bar', parentTag);\n            if (Number.isFinite(limit) && limit > 0) {\n                var percent = Math.min(100, ((count / limit) * 100));\n                barElement.width(percent + '%');\n                percent = percent.toFixed(2);\n                percentElement.text(percent + '%');\n                valueElement.text(toShortNumber(count) + ' / ' + toShortNumber(limit));\n            } else {\n                barElement.width('0%');\n                percentElement.text('');\n                valueElement.text(toShortNumber(count) + ' / ∞');\n            }\n            var pointsCount = \"${pointsCount:0}\";\n            var pointsLimit = \"${pointsLimit:0}\";\n            pointsCount = pointsCount.length > 0 ? parseInt(pointsCount, 10) : 0;\n            pointsLimit = pointsLimit.length > 0 ? parseInt(pointsLimit, 10) : 0;\n            var pointsPercentElement = $('#api-usage-percent2', parentTag);\n            var pointsValueElement = $('#api-usage-value2', parentTag);\n            var pointsBarElement = $('#api-usage-bar2', parentTag);\n            if (Number.isFinite(pointsLimit) && pointsLimit > 0) {\n                var percent = Math.min(100, ((pointsCount / pointsLimit) * 100));\n                pointsBarElement.width(percent + '%');\n                percent = percent.toFixed(2);\n                pointsPercentElement.text(percent + '%');\n                pointsValueElement.text(toShortNumber(pointsCount) + ' / ' + toShortNumber(pointsLimit));\n            } else {\n                pointsBarElement.width('0%');\n                pointsPercentElement.text('');\n                pointsValueElement.text(toShortNumber(pointsCount) + ' / ∞');\n            }\n            var apiState = \"${apiState}\";\n            var apiStatePoint = \"${apiStatePoint}\";\n            var currentState;\n            if (apiState === 'DISABLED' || apiStatePoint === 'DISABLED') {\n                currentState = 'DISABLED';\n            } else if (apiState === 'WARNING' || apiStatePoint === 'WARNING') {\n                currentState = 'WARNING';\n            } else {\n                currentState = 'ENABLED';\n            }\n            var stateTitle = $('#api-state', parentTag);\n            stateTitle.text(currentState);\n            parentTag.classList.add(currentState.toLowerCase());\n        }\n    </script>\n    <div class='content'>\n        <div class='column'>\n            <div class='title-row'>\n                <div class='title'>\n                    <span>${title}</span>\n                </div>\n                <div id=\"api-state\" class='state'></div>\n            </div>\n            <div class=\"bars-row\">\n                <div class=\"bar-column\" style=\"margin-right: 10px;\">\n                    <div class='bar-container'>\n                        <div class=\"unit\">{i18n:api-usage.email}</div>\n                        <div class='bar'>\n                            <div class=\"bar-fill\" id=\"api-usage-bar\"></div>\n                        </div>\n                        <div class='bar-labels'>\n                            <div id=\"api-usage-percent\"></div>\n                            <div style=\"flex: 1;\"></div>\n                            <div id=\"api-usage-value\"></div>\n                        </div>\n                    </div>\n                </div>\n                <div class=\"bar-column\" style=\"margin-left: 10px;\">\n                    <div class='bar-container'>\n                        <div class=\"unit\">{i18n:api-usage.sms}</div>\n                        <div class='bar'>\n                            <div class=\"bar-fill\" id=\"api-usage-bar2\"></div>\n                        </div>\n                        <div class='bar-labels'>\n                            <div id=\"api-usage-percent2\"></div>\n                            <div style=\"flex: 1;\"></div>\n                            <div id=\"api-usage-value2\"></div>\n                        </div>\n                    </div>\n                </div>\n            </div>\n        </div>\n    </div>\n    <div role=\"separator\" class=\"mat-divider mat-divider-horizontal\" aria-orientation=\"horizontal\"></div>\n    <div class='action-row'>\n        <button id=\"transport_details\" class=\"mdc-button mat-mdc-button mat-primary mat-mdc-button-base\">\n     <span class=\"mat-mdc-button-persistent-ripple mdc-button__ripple\"></span>\n        <span class=\"mdc-button__label\">{i18n:api-usage.view-details}</span>\n            <span class=\"mat-ripple mat-mdc-button-ripple\"></span>\n     <span class=\"mat-mdc-button-touch-target\"></span>\n        <span class=\"mat-mdc-focus-indicator\"></span>\n        </button>\n    </div>\n</div>"
-          },
-          "title": "Notifications (Email/SMS)",
-          "dropShadow": true,
-          "enableFullscreen": false,
-          "widgetStyle": {
-            "cursor": "default"
-          },
-          "titleStyle": {
-            "fontSize": "20px",
-            "fontWeight": 400
-          },
-          "useDashboardTimewindow": true,
-          "showLegend": false,
-          "actions": {
-            "elementClick": [
-              {
-                "name": "transport_details",
-                "icon": "insert_chart",
-                "type": "openDashboardState",
-                "targetDashboardStateId": "notifications",
-                "setEntityId": false,
-                "stateEntityParamName": null,
-                "openInSeparateDialog": null,
-                "dialogTitle": null,
-                "dialogHideDashboardToolbar": true,
-                "dialogWidth": null,
-                "dialogHeight": null,
-                "openRightLayout": false,
-                "id": "46b7cefe-e1f2-67c1-4055-3a214520f869"
-              }
-            ]
-          },
-          "showTitleIcon": false,
-          "iconColor": "rgba(0, 0, 0, 0.87)",
-          "iconSize": "24px",
-          "titleTooltip": ""
-        },
-        "row": 0,
-        "col": 0,
-        "id": "292eaded-4775-36f7-c896-98d57bdda936",
-        "typeFullFqn": "system.cards.html_value_card"
-      },
-      "b3571a36-2106-1122-7d58-0d38bbb0e9c8": {
-        "type": "timeseries",
-        "sizeX": 8,
-        "sizeY": 5,
-        "config": {
-          "datasources": [
-            {
-              "type": "entity",
-              "name": null,
-              "entityAliasId": "40193437-33ac-3172-eefd-0b08eb849062",
-              "filterId": null,
-              "dataKeys": [
-                {
-                  "name": "emailCountHourly",
-                  "type": "timeseries",
-                  "label": "{i18n:api-usage.email-messages}",
-                  "color": "#d35a00",
-                  "settings": {
-                    "excludeFromStacking": false,
-                    "hideDataByDefault": false,
-                    "disableDataHiding": false,
-                    "removeFromLegend": false,
-                    "showLines": false,
-                    "fillLines": false,
-                    "showPoints": false,
-                    "showPointShape": "circle",
-                    "pointShapeFormatter": "",
-                    "showPointsLineWidth": 5,
-                    "showPointsRadius": 3,
-                    "showSeparateAxis": false,
-                    "axisPosition": "left",
-                    "thresholds": [
-                      {
-                        "thresholdValueSource": "predefinedValue"
-                      }
-                    ],
-                    "comparisonSettings": {
-                      "showValuesForComparison": true
-                    }
-                  },
-                  "_hash": 0.0661644137210089,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": null,
-                  "postFuncBody": null
-                }
-              ]
-            }
-          ],
-          "timewindow": {
-            "hideInterval": false,
-            "hideAggregation": false,
-            "hideAggInterval": false,
-            "selectedTab": 1,
-            "history": {
-              "historyType": 0,
-              "timewindowMs": 2592000000,
-              "interval": 86400000
-            },
-            "aggregation": {
-              "type": "SUM",
-              "limit": 1000
-            }
-          },
-          "showTitle": true,
-          "backgroundColor": "#fff",
-          "color": "rgba(0, 0, 0, 0.87)",
-          "padding": "8px",
-          "settings": {
-            "shadowSize": 4,
-            "fontColor": "#545454",
-            "fontSize": 10,
-            "xaxis": {
-              "showLabels": true,
-              "color": "#545454"
-            },
-            "yaxis": {
-              "showLabels": true,
-              "color": "#545454",
-              "min": 0,
-              "tickDecimals": 0,
-              "ticksFormatter": "var rounder = Math.pow(10, 1);\nvar powers = [\n  {key: 'Q', value: Math.pow(10, 15)},\n  {key: 'T', value: Math.pow(10, 12)},\n  {key: 'B', value: Math.pow(10, 9)},\n  {key: 'M', value: Math.pow(10, 6)},\n  {key: 'K', value: 1000}\n];\n\nvar key = '';\n\nfor (var i = 0; i < powers.length; i++) {\n    var reduced = value / powers[i].value;\n    reduced = Math.round(reduced * rounder) / rounder;\n    if (reduced >= 1) {\n        value = reduced;\n        key = powers[i].key;\n        break;\n    }\n}\nreturn value + key;"
-            },
-            "grid": {
-              "color": "#545454",
-              "tickColor": "#DDDDDD",
-              "verticalLines": true,
-              "horizontalLines": true,
-              "outlineWidth": 1
-            },
-            "stack": false,
-            "tooltipIndividual": false,
-            "defaultBarWidth": 1800000,
-            "barAlignment": "left",
-            "timeForComparison": "months",
-            "xaxisSecond": {
-              "axisPosition": "top",
-              "showLabels": true
-            },
-            "showLegend": true,
-            "legendConfig": {
-              "direction": "column",
-              "position": "bottom",
-              "sortDataKeys": false,
-              "showMin": false,
-              "showMax": false,
-              "showAvg": false,
-              "showTotal": true
-            }
-          },
-          "title": "{i18n:api-usage.email-messages-daily-activity}",
-          "dropShadow": true,
-          "enableFullscreen": true,
-          "titleStyle": {
-            "fontSize": "16px",
-            "fontWeight": 400
-          },
-          "widgetStyle": {},
-          "useDashboardTimewindow": false,
-          "actions": {},
-          "displayTimewindow": true,
-          "showTitleIcon": false,
-          "iconColor": "rgba(0, 0, 0, 0.87)",
-          "iconSize": "24px",
-          "titleTooltip": ""
-        },
-        "row": 0,
-        "col": 0,
-        "id": "b3571a36-2106-1122-7d58-0d38bbb0e9c8",
-        "typeFullFqn": "system.charts.timeseries_bars_flot"
-      },
-      "aa875b7f-e7c8-7529-1ae7-f456211b59cc": {
-        "type": "timeseries",
-        "sizeX": 8,
-        "sizeY": 5,
-        "config": {
-          "datasources": [
-            {
-              "type": "entity",
-              "name": null,
-              "entityAliasId": "40193437-33ac-3172-eefd-0b08eb849062",
-              "filterId": null,
-              "dataKeys": [
-                {
-                  "name": "emailCount",
-                  "type": "timeseries",
-                  "label": "{i18n:api-usage.email-messages}",
-                  "color": "#d35a00",
-                  "settings": {
-                    "excludeFromStacking": false,
-                    "hideDataByDefault": false,
-                    "disableDataHiding": false,
-                    "removeFromLegend": false,
-                    "showLines": false,
-                    "fillLines": false,
-                    "showPoints": false,
-                    "showPointShape": "circle",
-                    "pointShapeFormatter": "",
-                    "showPointsLineWidth": 5,
-                    "showPointsRadius": 3,
-                    "showSeparateAxis": false,
-                    "axisPosition": "left",
-                    "thresholds": [
-                      {
-                        "thresholdValueSource": "predefinedValue"
-                      }
-                    ],
-                    "comparisonSettings": {
-                      "showValuesForComparison": true
-                    }
-                  },
-                  "_hash": 0.0661644137210089,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": null,
-                  "postFuncBody": null
-                }
-              ]
-            }
-          ],
-          "timewindow": {
-            "hideInterval": false,
-            "hideAggregation": false,
-            "hideAggInterval": false,
-            "selectedTab": 1,
-            "history": {
-              "historyType": 0,
-              "timewindowMs": 31536000000,
-              "interval": 1000
-            },
-            "aggregation": {
-              "type": "NONE",
-              "limit": 1000
-            }
-          },
-          "showTitle": true,
-          "backgroundColor": "#fff",
-          "color": "rgba(0, 0, 0, 0.87)",
-          "padding": "8px",
-          "settings": {
-            "shadowSize": 4,
-            "fontColor": "#545454",
-            "fontSize": 10,
-            "xaxis": {
-              "showLabels": true,
-              "color": "#545454"
-            },
-            "yaxis": {
-              "showLabels": true,
-              "color": "#545454",
-              "min": 0,
-              "tickDecimals": 0,
-              "ticksFormatter": "var rounder = Math.pow(10, 1);\nvar powers = [\n  {key: 'Q', value: Math.pow(10, 15)},\n  {key: 'T', value: Math.pow(10, 12)},\n  {key: 'B', value: Math.pow(10, 9)},\n  {key: 'M', value: Math.pow(10, 6)},\n  {key: 'K', value: 1000}\n];\n\nvar key = '';\n\nfor (var i = 0; i < powers.length; i++) {\n    var reduced = value / powers[i].value;\n    reduced = Math.round(reduced * rounder) / rounder;\n    if (reduced >= 1) {\n        value = reduced;\n        key = powers[i].key;\n        break;\n    }\n}\nreturn value + key;"
-            },
-            "grid": {
-              "color": "#545454",
-              "tickColor": "#DDDDDD",
-              "verticalLines": true,
-              "horizontalLines": true,
-              "outlineWidth": 1
+                "type": "NONE",
+                "limit": 50000
             },
-            "stack": false,
-            "tooltipIndividual": false,
-            "defaultBarWidth": 900000000,
-            "barAlignment": "left",
-            "timeForComparison": "months",
-            "xaxisSecond": {
-              "axisPosition": "top",
-              "showLabels": true
-            },
-            "showLegend": true,
-            "legendConfig": {
-              "direction": "column",
-              "position": "bottom",
-              "sortDataKeys": false,
-              "showMin": false,
-              "showMax": false,
-              "showAvg": false,
-              "showTotal": true
-            }
-          },
-          "title": "{i18n:api-usage.email-messages-monthly-activity}",
-          "dropShadow": true,
-          "enableFullscreen": true,
-          "titleStyle": {
-            "fontSize": "16px",
-            "fontWeight": 400
-          },
-          "widgetStyle": {},
-          "useDashboardTimewindow": false,
-          "actions": {},
-          "displayTimewindow": true,
-          "showTitleIcon": false,
-          "iconColor": "rgba(0, 0, 0, 0.87)",
-          "iconSize": "24px",
-          "titleTooltip": ""
+            "timezone": null
         },
-        "row": 0,
-        "col": 0,
-        "id": "aa875b7f-e7c8-7529-1ae7-f456211b59cc",
-        "typeFullFqn": "system.charts.timeseries_bars_flot"
-      }
-    },
-    "states": {
-      "default": {
-        "name": "{i18n:api-usage.api-usage}",
-        "root": true,
-        "layouts": {
-          "main": {
-            "widgets": {
-              "fd6df872-2ddf-0921-3929-2e7f55062fad": {
-                "sizeX": 4,
-                "sizeY": 2,
-                "row": 0,
-                "col": 8,
-                "mobileHeight": 3
-              },
-              "7e235874-461b-e7c2-2fdd-d8762a020773": {
-                "sizeX": 4,
-                "sizeY": 2,
-                "row": 0,
-                "col": 12,
-                "mobileHeight": 3
-              },
-              "08545554-a0e8-05c7-66df-6000cfeff8a4": {
-                "sizeX": 4,
-                "sizeY": 2,
-                "row": 0,
-                "col": 4,
-                "mobileHeight": 3
-              },
-              "a245c67e-53ec-d299-fa89-69fe2062ccb2": {
-                "sizeX": 4,
-                "sizeY": 2,
-                "row": 0,
-                "col": 0,
-                "mobileHeight": 3
-              },
-              "a151ae60-0326-6116-d818-9070dda8e9c7": {
-                "sizeX": 4,
-                "sizeY": 2,
-                "row": 0,
-                "col": 16,
-                "mobileHeight": 3
-              },
-              "292eaded-4775-36f7-c896-98d57bdda936": {
-                "sizeX": 4,
-                "sizeY": 2,
-                "row": 0,
-                "col": 20,
-                "mobileHeight": 3
-              },
-              "68e16e98-0420-f72c-4848-41dedffd3904": {
-                "sizeX": 8,
-                "sizeY": 4,
-                "row": 2,
-                "col": 8
-              },
-              "2aa6b499-6e27-b315-6833-89c4d58485ce": {
-                "sizeX": 8,
-                "sizeY": 4,
-                "row": 2,
-                "col": 0
-              },
-              "d890cea3-fba0-6474-9a21-fa780230dc62": {
-                "sizeX": 8,
-                "sizeY": 4,
-                "row": 2,
-                "col": 16
-              },
-              "84b6cfa5-1449-e0f2-3560-f810d2dd7ead": {
-                "sizeX": 8,
-                "sizeY": 4,
-                "row": 6,
-                "col": 0
-              },
-              "d296b566-a000-7402-ae9d-c815381c5435": {
-                "sizeX": 8,
-                "sizeY": 4,
-                "row": 6,
-                "col": 8
-              },
-              "00a02464-9509-911b-3b5e-21fb37629822": {
-                "sizeX": 8,
-                "sizeY": 4,
-                "row": 6,
-                "col": 16
-              }
-            },
-            "gridSettings": {
-              "backgroundColor": "#eeeeee",
-              "color": "rgba(0,0,0,0.870588)",
-              "columns": 24,
-              "margin": 5,
-              "backgroundSizeMode": "100%",
-              "autoFillHeight": true,
-              "backgroundImageUrl": null,
-              "mobileAutoFillHeight": false,
-              "mobileRowHeight": 70,
-              "outerMargin": true
-            }
-          }
-        }
-      },
-      "transport": {
-        "name": "{i18n:api-usage.transport}",
-        "root": false,
-        "layouts": {
-          "main": {
-            "widgets": {
-              "98bae68b-0f35-72f2-a428-9b06889f1554": {
-                "sizeX": 24,
-                "sizeY": 6,
-                "row": 0,
-                "col": 0
-              },
-              "e61e5477-5a09-cc25-966b-f613d81da833": {
-                "sizeX": 24,
-                "sizeY": 6,
-                "row": 6,
-                "col": 0
-              }
-            },
-            "gridSettings": {
-              "backgroundColor": "#eeeeee",
-              "color": "rgba(0,0,0,0.870588)",
-              "columns": 24,
-              "margin": 10,
-              "backgroundSizeMode": "100%",
-              "autoFillHeight": true,
-              "backgroundImageUrl": null,
-              "mobileAutoFillHeight": false,
-              "mobileRowHeight": 70,
-              "outerMargin": true
-            }
-          }
-        }
-      },
-      "rule_engine_execution": {
-        "name": "{i18n:api-usage.rule-engine-executions}",
-        "root": false,
-        "layouts": {
-          "main": {
-            "widgets": {
-              "74199074-7873-6c6a-2a51-3fc614769f03": {
-                "sizeX": 24,
-                "sizeY": 6,
-                "row": 0,
-                "col": 0
-              },
-              "00006bc3-8a8d-b55e-ed39-e318f1bcd090": {
-                "sizeX": 24,
-                "sizeY": 6,
-                "row": 6,
-                "col": 0
-              }
-            },
-            "gridSettings": {
-              "backgroundColor": "#eeeeee",
-              "color": "rgba(0,0,0,0.870588)",
-              "columns": 24,
-              "margin": 10,
-              "backgroundSizeMode": "100%",
-              "autoFillHeight": true,
-              "backgroundImageUrl": null,
-              "mobileAutoFillHeight": false,
-              "mobileRowHeight": 70,
-              "outerMargin": true
-            }
-          }
+        "settings": {
+            "stateControllerId": "entity",
+            "showTitle": false,
+            "showDashboardsSelect": false,
+            "showEntitiesSelect": false,
+            "showDashboardTimewindow": false,
+            "showDashboardExport": false,
+            "toolbarAlwaysOpen": true,
+            "titleColor": "rgba(0,0,0,0.870588)",
+            "showFilters": false,
+            "showDashboardLogo": false,
+            "dashboardLogoUrl": null,
+            "hideToolbar": false,
+            "showUpdateDashboardImage": false,
+            "dashboardCss": ".card .bars-row {\n    flex: 1;\n    display: flex;\n    flex-direction: row;\n}\n\n.card .bar-column {\n    flex: 1;\n    display: flex;\n    flex-direction: column;\n}\n\n\n.card {\n   width: 100%;\n   height: 100%;\n   box-sizing: border-box;\n   display: flex;\n   flex-direction: column;\n}\n\n.card > img {\n    height: 0;\n}\n\n.card .content {\n   flex: 1;    \n   padding: 12px 12px 0;\n   display: flex;\n   box-sizing: border-box;\n}\n\n.card .content .column {\n   display: flex;\n   flex-direction: column;    \n   justify-content: space-around;\n   flex: 1;\n}\n\n.card .content .title-row {\n    display: flex;\n    flex-direction: row;\n    padding-bottom: 10px;\n}\n\n.card .title {\n    flex: 1;\n    font-size: 20px;\n    font-weight: 400;\n    color: #666666;\n}\n\n.card .state {\n    text-transform: uppercase;\n    font-size: 20px;\n    font-weight: bold;\n}\n\n.card.enabled .state {\n    color: #00B260;\n}\n\n.card.warning .state {\n    color: #FFAD6F;\n}\n\n.card.disabled .state {\n    color: #F73243;\n}\n\n.card .bar-container {\n    flex: 1;\n    display: flex;\n    flex-direction: column;\n    justify-content: center;\n}\n\n.card .bar {\n    flex: 1;\n    max-height: 30px;\n    margin-top: 3.5px;\n    margin-bottom: 4px;\n    background-color: #F0F0F0;\n    border: 1px solid #DADCDB;\n    border-radius: 2px;\n    box-shadow: inset 0 1px 3px rgba(0, 0, 0, .2);\n}\n\n.card.enabled .bar {\n    border-color: #00B260;\n    background-color: #F0FBF7;\n}\n\n.card.warning .bar {\n    border-color: #FFAD6F;\n    background-color: #FFFAF6;\n}\n\n.card.disabled .bar {\n    border-color: #F73243;\n    background-color: #FFF0F0;\n}\n\n.card .bar .bar-fill {\n    background-color: #F0F0F0;\n    border-radius: 2px;\n    height: 100%;\n    width: 0%;\n}\n\n.card.enabled .bar-fill {\n    background-color: #00C46C;\n}\n\n.card.warning .bar-fill {\n    background-color: #FFD099;\n}\n\n.card.disabled .bar-fill {\n    background-color: #FF9494;\n}\n\n.card .bar-labels {\n    height: 20px;\n    font-size: 16px;\n    color: #666;\n    display: flex;\n    flex-direction: row;\n}\n\n\n.card .mat-mdc-button-base {\n    text-transform: uppercase;\n    white-space: nowrap;\n    overflow: hidden;\n    text-overflow: ellipsis;\n}\n\n.card .mdc-button__label {\n    pointer-events: none;\n}\n\n.action-row {\n    display: flex;\n    flex-direction: row;\n    justify-content: flex-end;\n    padding: 8px 0;\n}\n\n.card .unit {\n     color: #666666;\n}\n\n@media screen and (min-width: 960px) and (max-width: 1279px) {\n  .card .title {\n      font-size: 12px;\n  }\n  .card .state {\n      font-size: 12px;\n  }\n  .card .unit {\n      font-size: 8px;\n  }\n  .card .bar-labels {\n      font-size: 8px;\n  }\n  .card .mat-mdc-button-base {\n      font-size: 8px;\n  }\n  .card .action-row {\n      padding: 0;\n  }\n}\n\n@media screen and (min-width: 1280px) and (max-width: 1599px) {\n  .card .title {\n      font-size: 14px;\n  }\n  .card .state {\n      font-size: 14px;\n  }\n  .card .unit {\n      font-size: 10px;\n  }\n  .card .bar-labels {\n      font-size: 10px;\n  }\n  .card .mat-mdc-button-base {\n      font-size: 10px;\n  }\n  .card .action-row {\n      padding: 0;\n  }\n}\n\n@media screen and (min-width: 1600px) and (max-width: 1919px) {\n  .card .title {\n      font-size: 16px;\n  }\n  .card .state {\n      font-size: 16px;\n  }\n  .card .unit {\n      font-size: 12px;\n  }\n  .card .bar-labels {\n      font-size: 12px;\n  }\n  .card .mat-mdc-button-base {\n      font-size: 12px;\n  }\n  .card .action-row {\n      padding: 0;\n  }\n}    "
         }
-      },
-      "telemetry_persistence": {
-        "name": "{i18n:api-usage.telemetry-persistence}",
-        "root": false,
-        "layouts": {
-          "main": {
-            "widgets": {
-              "85fe0738-5326-f069-ab3f-30594bde5fed": {
-                "sizeX": 24,
-                "sizeY": 6,
-                "row": 0,
-                "col": 0
-              },
-              "eaeb381a-437e-f6e9-60c9-6bc8826fdd44": {
-                "sizeX": 24,
-                "sizeY": 6,
-                "row": 6,
-                "col": 0
-              }
-            },
-            "gridSettings": {
-              "backgroundColor": "#eeeeee",
-              "color": "rgba(0,0,0,0.870588)",
-              "columns": 24,
-              "margin": 10,
-              "backgroundSizeMode": "100%",
-              "autoFillHeight": true,
-              "backgroundImageUrl": null,
-              "mobileAutoFillHeight": false,
-              "mobileRowHeight": 70,
-              "outerMargin": true
-            }
-          }
-        }
-      },
-      "rule_engine_statistics": {
-        "name": "{i18n:api-usage.rule-engine-statistics}",
-        "root": false,
-        "layouts": {
-          "main": {
-            "widgets": {
-              "2408ad30-163e-8221-08e1-a82b638be564": {
-                "sizeX": 12,
-                "sizeY": 7,
-                "mobileHeight": null,
-                "row": 0,
-                "col": 0
-              },
-              "e43dcfe1-b970-6a11-ce0e-5769f3eb5e88": {
-                "sizeX": 12,
-                "sizeY": 7,
-                "mobileHeight": null,
-                "row": 0,
-                "col": 12
-              },
-              "a669cf86-e715-efa4-dd9a-b839abf499e9": {
-                "sizeX": 24,
-                "sizeY": 5,
-                "row": 7,
-                "col": 0
-              }
-            },
-            "gridSettings": {
-              "backgroundColor": "#eeeeee",
-              "color": "rgba(0,0,0,0.870588)",
-              "columns": 24,
-              "margin": 10,
-              "backgroundSizeMode": "100%",
-              "autoFillHeight": true,
-              "backgroundImageUrl": null,
-              "mobileAutoFillHeight": false,
-              "mobileRowHeight": 70,
-              "outerMargin": true
-            }
-          }
-        }
-      },
-      "notifications": {
-        "name": "{i18n:api-usage.notifications-email-sms}",
-        "root": false,
-        "layouts": {
-          "main": {
-            "widgets": {
-              "7302df65-1b0c-579e-bbdb-145126ae3392": {
-                "sizeX": 12,
-                "sizeY": 6,
-                "row": 0,
-                "col": 12
-              },
-              "fdb385e7-14fe-fc9f-ebdc-b400f26fc66b": {
-                "sizeX": 12,
-                "sizeY": 6,
-                "row": 6,
-                "col": 12
-              },
-              "b3571a36-2106-1122-7d58-0d38bbb0e9c8": {
-                "sizeX": 12,
-                "sizeY": 6,
-                "row": 0,
-                "col": 0
-              },
-              "aa875b7f-e7c8-7529-1ae7-f456211b59cc": {
-                "sizeX": 12,
-                "sizeY": 6,
-                "row": 6,
-                "col": 0
-              }
-            },
-            "gridSettings": {
-              "backgroundColor": "#eeeeee",
-              "color": "rgba(0,0,0,0.870588)",
-              "columns": 24,
-              "margin": 10,
-              "backgroundSizeMode": "100%",
-              "autoFillHeight": true,
-              "backgroundImageUrl": null,
-              "mobileAutoFillHeight": false,
-              "mobileRowHeight": 70,
-              "outerMargin": true
-            }
-          }
-        }
-      },
-      "alarms_created": {
-        "name": "{i18n:api-usage.alarms-created}",
-        "root": false,
-        "layouts": {
-          "main": {
-            "widgets": {
-              "4b798823-b97d-9d6a-59dc-fcafd897fc23": {
-                "sizeX": 24,
-                "sizeY": 6,
-                "row": 0,
-                "col": 0
-              },
-              "6a981580-7490-19dd-f937-b64cbf67a982": {
-                "sizeX": 24,
-                "sizeY": 6,
-                "row": 6,
-                "col": 0
-              }
-            },
-            "gridSettings": {
-              "backgroundColor": "#eeeeee",
-              "color": "rgba(0,0,0,0.870588)",
-              "columns": 24,
-              "margin": 10,
-              "backgroundSizeMode": "100%",
-              "autoFillHeight": true,
-              "backgroundImageUrl": null,
-              "mobileAutoFillHeight": false,
-              "mobileRowHeight": 70,
-              "outerMargin": true
-            }
-          }
-        }
-      },
-      "script_functions": {
-        "name": "{i18n:api-usage.scripts}",
-        "root": false,
-        "layouts": {
-          "main": {
-            "widgets": {
-              "5f5ca59c-e507-5301-5910-7ad8cd34df40": {
-                "sizeX": 24,
-                "sizeY": 6,
-                "row": 0,
-                "col": 0
-              },
-              "ada32ee9-44ed-48d1-c368-fd0c94b7607f": {
-                "sizeX": 24,
-                "sizeY": 6,
-                "row": 6,
-                "col": 0
-              }
-            },
-            "gridSettings": {
-              "backgroundColor": "#eeeeee",
-              "color": "rgba(0,0,0,0.870588)",
-              "columns": 24,
-              "margin": 10,
-              "backgroundSizeMode": "100%",
-              "autoFillHeight": true,
-              "backgroundImageUrl": null,
-              "mobileAutoFillHeight": false,
-              "mobileRowHeight": 70,
-              "outerMargin": true
-            }
-          }
-        }
-      }
-    },
-    "entityAliases": {
-      "40193437-33ac-3172-eefd-0b08eb849062": {
-        "id": "40193437-33ac-3172-eefd-0b08eb849062",
-        "alias": "Api usage state",
-        "filter": {
-          "type": "apiUsageState",
-          "resolveMultiple": false
-        }
-      },
-      "2e4c97b0-257a-a1b9-690c-141d9bf2ec6f": {
-        "id": "2e4c97b0-257a-a1b9-690c-141d9bf2ec6f",
-        "alias": "TbServiceQueues",
-        "filter": {
-          "type": "assetType",
-          "resolveMultiple": true,
-          "assetNameFilter": "",
-          "assetTypes": [
-            "TbServiceQueue"
-          ]
-        }
-      }
-    },
-    "filters": {},
-    "timewindow": {
-      "hideInterval": false,
-      "hideAggregation": false,
-      "hideAggInterval": false,
-      "selectedTab": 0,
-      "realtime": {
-        "timewindowMs": 86400000,
-        "interval": 3600000
-      },
-      "aggregation": {
-        "type": "NONE",
-        "limit": 50000
-      }
     },
-    "settings": {
-      "stateControllerId": "entity",
-      "showTitle": false,
-      "showDashboardsSelect": false,
-      "showEntitiesSelect": false,
-      "showDashboardTimewindow": false,
-      "showDashboardExport": false,
-      "toolbarAlwaysOpen": true,
-      "titleColor": "rgba(0,0,0,0.870588)",
-      "showFilters": false,
-      "showDashboardLogo": false
-    }
-  },
-  "externalId": null,
-  "name": "Api Usage"
+    "name": "Api Usage"
 }
diff --git a/ui-ngx/src/assets/dashboard/sys_admin_home_page.json b/ui-ngx/src/assets/dashboard/sys_admin_home_page.json
index f93de01596..a47103059e 100644
--- a/ui-ngx/src/assets/dashboard/sys_admin_home_page.json
+++ b/ui-ngx/src/assets/dashboard/sys_admin_home_page.json
@@ -69,142 +69,6 @@
         "id": "d70cc256-4c7b-ee06-9905-b8c5e546605f",
         "typeFullFqn": "system.cards.markdown_card"
       },
-      "8ee72d43-678c-4e25-e9a8-7d4cfd7a5f8e": {
-        "type": "timeseries",
-        "sizeX": 8,
-        "sizeY": 5,
-        "config": {
-          "datasources": [
-            {
-              "type": "entity",
-              "name": null,
-              "entityAliasId": "d9229b29-3f46-de8d-7fe8-eb0c43c75079",
-              "filterId": null,
-              "dataKeys": [
-                {
-                  "name": "transportMsgCountHourly",
-                  "type": "timeseries",
-                  "label": "{i18n:widgets.transport-messages.title}",
-                  "color": "#305680",
-                  "settings": {},
-                  "_hash": 0.2880464219129071,
-                  "aggregationType": null,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": null,
-                  "postFuncBody": null
-                }
-              ],
-              "latestDataKeys": []
-            }
-          ],
-          "timewindow": {
-            "hideInterval": false,
-            "hideLastInterval": false,
-            "hideQuickInterval": false,
-            "hideAggregation": true,
-            "hideAggInterval": false,
-            "hideTimezone": false,
-            "selectedTab": 1,
-            "history": {
-              "historyType": 0,
-              "timewindowMs": 2592000000,
-              "interval": 86400000,
-              "fixedTimewindow": {
-                "startTimeMs": 1680443065451,
-                "endTimeMs": 1680529465451
-              },
-              "quickInterval": "CURRENT_DAY"
-            },
-            "aggregation": {
-              "type": "SUM",
-              "limit": 50000
-            }
-          },
-          "showTitle": false,
-          "backgroundColor": "#fff",
-          "color": "rgba(0, 0, 0, 0.87)",
-          "padding": "0px",
-          "settings": {
-            "stack": true,
-            "fontSize": 10,
-            "fontColor": "#545454",
-            "showTooltip": true,
-            "tooltipIndividual": false,
-            "tooltipCumulative": false,
-            "hideZeros": false,
-            "grid": {
-              "verticalLines": false,
-              "horizontalLines": false,
-              "outlineWidth": 0,
-              "color": "#545454",
-              "backgroundColor": null,
-              "tickColor": "#DDDDDD"
-            },
-            "xaxis": {
-              "title": null,
-              "showLabels": true,
-              "color": "#545454"
-            },
-            "yaxis": {
-              "min": 0,
-              "max": null,
-              "title": null,
-              "showLabels": true,
-              "color": "#545454",
-              "tickSize": null,
-              "tickDecimals": 0,
-              "ticksFormatter": "return value % 1000 === 0 ? ((value / 1000) + 'k') : '';"
-            },
-            "defaultBarWidth": 1800000,
-            "barAlignment": "left",
-            "comparisonEnabled": false,
-            "timeForComparison": "previousInterval",
-            "comparisonCustomIntervalValue": 7200000,
-            "xaxisSecond": {
-              "axisPosition": "top",
-              "title": null,
-              "showLabels": true
-            },
-            "customLegendEnabled": false,
-            "dataKeysListForLabels": [],
-            "showLegend": false,
-            "legendConfig": {
-              "direction": "column",
-              "position": "bottom",
-              "sortDataKeys": false,
-              "showMin": false,
-              "showMax": false,
-              "showAvg": true,
-              "showTotal": false,
-              "showLatest": false
-            }
-          },
-          "title": "Transport messages",
-          "dropShadow": false,
-          "enableFullscreen": false,
-          "titleStyle": {
-            "fontSize": "16px",
-            "fontWeight": 400
-          },
-          "widgetStyle": {
-            "padding": "0"
-          },
-          "useDashboardTimewindow": false,
-          "actions": {},
-          "displayTimewindow": true,
-          "showTitleIcon": false,
-          "titleTooltip": "",
-          "widgetCss": ".tb-widget-container > .tb-widget {\n    border: none !important;\n    border-radius: 0 !important;\n    box-shadow: none !important;\n}\n\n.tb-widget-container > .tb-widget .flot-base {\n    opacity: 0.48;\n}\n",
-          "pageSize": 1024,
-          "noDataDisplayMessage": ""
-        },
-        "row": 0,
-        "col": 0,
-        "id": "8ee72d43-678c-4e25-e9a8-7d4cfd7a5f8e",
-        "typeFullFqn": "system.charts.timeseries_bars_flot"
-      },
       "4b5e47ed-c197-a937-d727-041ba8decec2": {
         "type": "latest",
         "sizeX": 5,
@@ -294,227 +158,6 @@
         "id": "4b5e47ed-c197-a937-d727-041ba8decec2",
         "typeFullFqn": "system.cards.markdown_card"
       },
-      "eace9148-b02a-48fe-1a95-acd9928aa8c5": {
-        "type": "timeseries",
-        "sizeX": 8,
-        "sizeY": 5,
-        "config": {
-          "datasources": [
-            {
-              "type": "entity",
-              "name": null,
-              "entityAliasId": "d9229b29-3f46-de8d-7fe8-eb0c43c75079",
-              "filterId": null,
-              "dataKeys": [
-                {
-                  "name": "cpuUsage",
-                  "type": "timeseries",
-                  "label": "{i18n:widgets.system-info.cpu}",
-                  "color": "#305680",
-                  "settings": {
-                    "hideDataByDefault": false,
-                    "disableDataHiding": false,
-                    "removeFromLegend": false,
-                    "excludeFromStacking": false,
-                    "showLines": true,
-                    "lineWidth": 3,
-                    "fillLines": false,
-                    "showPoints": false,
-                    "showPointsLineWidth": 5,
-                    "showPointsRadius": 3,
-                    "showPointShape": "circle",
-                    "pointShapeFormatter": "var size = radius * Math.sqrt(Math.PI) / 2;\nctx.moveTo(x - size, y - size);\nctx.lineTo(x + size, y + size);\nctx.moveTo(x - size, y + size);\nctx.lineTo(x + size, y - size);",
-                    "showSeparateAxis": false,
-                    "axisPosition": "left",
-                    "comparisonSettings": {
-                      "showValuesForComparison": true,
-                      "comparisonValuesLabel": "",
-                      "color": ""
-                    },
-                    "thresholds": []
-                  },
-                  "_hash": 0.9347575372081658,
-                  "aggregationType": null,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": null,
-                  "postFuncBody": null
-                },
-                {
-                  "name": "memoryUsage",
-                  "type": "timeseries",
-                  "label": "{i18n:widgets.system-info.ram}",
-                  "color": "#ac3bc9",
-                  "settings": {
-                    "hideDataByDefault": false,
-                    "disableDataHiding": false,
-                    "removeFromLegend": false,
-                    "excludeFromStacking": false,
-                    "showLines": true,
-                    "lineWidth": 3,
-                    "fillLines": false,
-                    "showPoints": false,
-                    "showPointsLineWidth": 5,
-                    "showPointsRadius": 3,
-                    "showPointShape": "circle",
-                    "pointShapeFormatter": "var size = radius * Math.sqrt(Math.PI) / 2;\nctx.moveTo(x - size, y - size);\nctx.lineTo(x + size, y + size);\nctx.moveTo(x - size, y + size);\nctx.lineTo(x + size, y - size);",
-                    "showSeparateAxis": false,
-                    "axisPosition": "left",
-                    "comparisonSettings": {
-                      "showValuesForComparison": true,
-                      "comparisonValuesLabel": "",
-                      "color": ""
-                    },
-                    "thresholds": []
-                  },
-                  "_hash": 0.31887216598848855,
-                  "aggregationType": null,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": null,
-                  "postFuncBody": null
-                },
-                {
-                  "name": "discUsage",
-                  "type": "timeseries",
-                  "label": "{i18n:widgets.system-info.disk}",
-                  "color": "#40d0ae",
-                  "settings": {
-                    "hideDataByDefault": false,
-                    "disableDataHiding": false,
-                    "removeFromLegend": false,
-                    "excludeFromStacking": false,
-                    "showLines": true,
-                    "lineWidth": 3,
-                    "fillLines": false,
-                    "showPoints": false,
-                    "showPointsLineWidth": 5,
-                    "showPointsRadius": 3,
-                    "showPointShape": "circle",
-                    "pointShapeFormatter": "var size = radius * Math.sqrt(Math.PI) / 2;\nctx.moveTo(x - size, y - size);\nctx.lineTo(x + size, y + size);\nctx.moveTo(x - size, y + size);\nctx.lineTo(x + size, y - size);",
-                    "showSeparateAxis": false,
-                    "axisPosition": "left",
-                    "comparisonSettings": {
-                      "showValuesForComparison": true,
-                      "comparisonValuesLabel": "",
-                      "color": ""
-                    },
-                    "thresholds": []
-                  },
-                  "_hash": 0.26499182606431004,
-                  "aggregationType": null,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": null,
-                  "postFuncBody": null
-                }
-              ],
-              "latestDataKeys": null
-            }
-          ],
-          "timewindow": {
-            "hideInterval": false,
-            "hideLastInterval": false,
-            "hideQuickInterval": false,
-            "hideAggregation": false,
-            "hideAggInterval": false,
-            "hideTimezone": false,
-            "selectedTab": 0,
-            "realtime": {
-              "realtimeType": 0,
-              "timewindowMs": 3600000,
-              "quickInterval": "CURRENT_DAY",
-              "interval": 10000
-            },
-            "aggregation": {
-              "type": "AVG",
-              "limit": 25000
-            }
-          },
-          "showTitle": false,
-          "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,
-            "grid": {
-              "verticalLines": false,
-              "horizontalLines": false,
-              "outlineWidth": 0,
-              "color": "#545454",
-              "backgroundColor": null,
-              "tickColor": "#DDDDDD"
-            },
-            "xaxis": {
-              "title": null,
-              "showLabels": true,
-              "color": "#545454"
-            },
-            "yaxis": {
-              "min": 0,
-              "max": 100,
-              "title": null,
-              "showLabels": true,
-              "color": "#545454",
-              "tickSize": null,
-              "tickDecimals": 0,
-              "ticksFormatter": ""
-            },
-            "shadowSize": 0,
-            "smoothLines": true,
-            "comparisonEnabled": false,
-            "timeForComparison": "previousInterval",
-            "comparisonCustomIntervalValue": 7200000,
-            "xaxisSecond": {
-              "axisPosition": "top",
-              "title": null,
-              "showLabels": true
-            },
-            "customLegendEnabled": false,
-            "dataKeysListForLabels": [],
-            "showLegend": true,
-            "legendConfig": {
-              "direction": "row",
-              "position": "top",
-              "sortDataKeys": false,
-              "showMin": false,
-              "showMax": false,
-              "showAvg": false,
-              "showTotal": false,
-              "showLatest": false
-            }
-          },
-          "title": "System Info Chart",
-          "dropShadow": false,
-          "enableFullscreen": false,
-          "titleStyle": {
-            "fontSize": "16px",
-            "fontWeight": 400
-          },
-          "useDashboardTimewindow": false,
-          "showTitleIcon": false,
-          "titleTooltip": "",
-          "widgetStyle": {},
-          "widgetCss": "\n.tb-legend-keys td .tb-legend-line {\n    height: 5px !important;\n    vertical-align: middle;\n}\n",
-          "pageSize": 1024,
-          "units": "%",
-          "noDataDisplayMessage": "",
-          "displayTimewindow": true
-        },
-        "row": 0,
-        "col": 0,
-        "id": "eace9148-b02a-48fe-1a95-acd9928aa8c5",
-        "typeFullFqn": "system.charts.basic_timeseries"
-      },
       "8acbf5df-f9fc-114d-216f-86f081aa4779": {
         "type": "latest",
         "sizeX": 5,
@@ -2197,6 +1840,806 @@
         "col": 0,
         "id": "163025d8-3ca4-dd1e-c17b-e40d8e03e8a8",
         "typeFullFqn": "system.cards.markdown_card"
+      },
+      "98bce47d-76df-5fc1-f8b9-8584d73a2439": {
+        "typeFullFqn": "system.time_series_chart",
+        "type": "timeseries",
+        "sizeX": 8,
+        "sizeY": 5,
+        "config": {
+          "datasources": [
+            {
+              "type": "entity",
+              "name": "",
+              "entityAliasId": "d9229b29-3f46-de8d-7fe8-eb0c43c75079",
+              "dataKeys": [
+                {
+                  "name": "transportMsgCountHourly",
+                  "type": "timeseries",
+                  "label": "{i18n:widgets.transport-messages.title}",
+                  "color": "#305680",
+                  "settings": {
+                    "showInLegend": true,
+                    "dataHiddenByDefault": false,
+                    "type": "bar",
+                    "lineSettings": {
+                      "showLine": true,
+                      "step": false,
+                      "stepType": "start",
+                      "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)",
+                      "pointShape": "emptyCircle",
+                      "pointSize": 4,
+                      "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)",
+                      "backgroundSettings": {
+                        "type": "none",
+                        "opacity": 0.4,
+                        "gradient": {
+                          "start": 100,
+                          "end": 0
+                        }
+                      }
+                    }
+                  },
+                  "_hash": 0.39181957822569946,
+                  "decimals": 0
+                }
+              ],
+              "alarmFilterConfig": {
+                "statusList": [
+                  "ACTIVE"
+                ]
+              },
+              "latestDataKeys": []
+            }
+          ],
+          "timewindow": {
+            "hideInterval": false,
+            "hideLastInterval": false,
+            "hideQuickInterval": false,
+            "hideAggregation": true,
+            "hideAggInterval": false,
+            "hideTimezone": false,
+            "selectedTab": 1,
+            "history": {
+              "historyType": 0,
+              "timewindowMs": 2592000000,
+              "interval": 86400000,
+              "fixedTimewindow": {
+                "startTimeMs": 1709807941444,
+                "endTimeMs": 1709894341444
+              },
+              "quickInterval": "CURRENT_DAY"
+            },
+            "aggregation": {
+              "type": "SUM",
+              "limit": 25000
+            },
+            "timezone": null
+          },
+          "showTitle": false,
+          "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": "return value === 0 ? value : ((value / 1000) + 'k');",
+                "showTicks": false,
+                "ticksColor": "rgba(0, 0, 0, 0.54)",
+                "showLine": false,
+                "lineColor": "rgba(0, 0, 0, 0.54)",
+                "showSplitLines": false,
+                "splitLinesColor": "rgba(0, 0, 0, 0.12)",
+                "id": "default",
+                "order": 0,
+                "min": 0,
+                "max": null
+              }
+            },
+            "thresholds": [],
+            "dataZoom": false,
+            "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": false,
+              "ticksColor": "rgba(0, 0, 0, 0.54)",
+              "showLine": false,
+              "lineColor": "rgba(0, 0, 0, 0.54)",
+              "showSplitLines": false,
+              "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": false,
+            "legendLabelFont": {
+              "family": "Roboto",
+              "size": 12,
+              "sizeUnit": "px",
+              "style": "normal",
+              "weight": "400",
+              "lineHeight": "16px"
+            },
+            "legendLabelColor": "rgba(0, 0, 0, 0.76)",
+            "legendConfig": {
+              "direction": "column",
+              "position": "top",
+              "sortDataKeys": false,
+              "showMin": false,
+              "showMax": false,
+              "showAvg": true,
+              "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)",
+            "tooltipShowDate": true,
+            "tooltipDateFormat": {
+              "format": null,
+              "lastUpdateAgo": false,
+              "custom": false,
+              "auto": true,
+              "autoDateFormatSettings": {}
+            },
+            "tooltipDateFont": {
+              "family": "Roboto",
+              "size": 11,
+              "sizeUnit": "px",
+              "style": "normal",
+              "weight": "400",
+              "lineHeight": "16px"
+            },
+            "tooltipDateColor": "rgba(0, 0, 0, 0.76)",
+            "tooltipDateInterval": false,
+            "tooltipBackgroundColor": "rgba(255, 255, 255, 0.76)",
+            "tooltipBackgroundBlur": 4,
+            "animation": {
+              "animation": true,
+              "animationThreshold": 2000,
+              "animationDuration": 1000,
+              "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": "0"
+          },
+          "title": "Time series chart",
+          "dropShadow": false,
+          "enableFullscreen": false,
+          "titleStyle": 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": ".tb-widget-container > .tb-widget {\n    border: none !important;\n    border-radius: 0 !important;\n    box-shadow: none !important;\n}\n\n.tb-time-series-chart-panel div.tb-widget-title {\n    padding-top: 5px;\n    padding-left: 5px;\n}",
+          "pageSize": 1024,
+          "units": "",
+          "decimals": null,
+          "noDataDisplayMessage": "",
+          "timewindowStyle": {
+            "showIcon": true,
+            "iconSize": "24px",
+            "icon": "query_builder",
+            "iconPosition": "left",
+            "font": {
+              "size": 14,
+              "sizeUnit": "px",
+              "family": "Roboto",
+              "weight": "400",
+              "style": "normal",
+              "lineHeight": "16px"
+            },
+            "color": "rgba(0, 0, 0, 0.54)",
+            "displayTypePrefix": true
+          },
+          "margin": "0px",
+          "borderRadius": "0px",
+          "iconSize": "0px"
+        },
+        "row": 0,
+        "col": 0,
+        "id": "98bce47d-76df-5fc1-f8b9-8584d73a2439"
+      },
+      "b9174a99-2a00-3dbe-0eae-927fd8506345": {
+        "typeFullFqn": "system.time_series_chart",
+        "type": "timeseries",
+        "sizeX": 8,
+        "sizeY": 5,
+        "config": {
+          "datasources": [
+            {
+              "type": "entity",
+              "name": "",
+              "entityAliasId": "d9229b29-3f46-de8d-7fe8-eb0c43c75079",
+              "dataKeys": [
+                {
+                  "name": "cpuUsage",
+                  "type": "timeseries",
+                  "label": "{i18n:widgets.system-info.cpu}",
+                  "color": "#305680",
+                  "settings": {
+                    "yAxisId": "default",
+                    "showInLegend": true,
+                    "dataHiddenByDefault": false,
+                    "type": "line",
+                    "lineSettings": {
+                      "showLine": true,
+                      "step": false,
+                      "stepType": "start",
+                      "smooth": true,
+                      "lineType": "solid",
+                      "lineWidth": 3,
+                      "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)",
+                      "pointShape": "circle",
+                      "pointSize": 14,
+                      "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)",
+                      "backgroundSettings": {
+                        "type": "none",
+                        "opacity": 0.4,
+                        "gradient": {
+                          "start": 100,
+                          "end": 0
+                        }
+                      }
+                    }
+                  },
+                  "_hash": 0.39181957822569946,
+                  "decimals": null,
+                  "aggregationType": null,
+                  "units": null,
+                  "funcBody": null,
+                  "usePostProcessing": null,
+                  "postFuncBody": null
+                },
+                {
+                  "name": "memoryUsage",
+                  "type": "timeseries",
+                  "label": "{i18n:widgets.system-info.ram}",
+                  "color": "#AC3BC9",
+                  "settings": {
+                    "yAxisId": "default",
+                    "showInLegend": true,
+                    "dataHiddenByDefault": false,
+                    "type": "line",
+                    "lineSettings": {
+                      "showLine": true,
+                      "step": false,
+                      "stepType": "start",
+                      "smooth": true,
+                      "lineType": "solid",
+                      "lineWidth": 3,
+                      "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)",
+                      "pointShape": "circle",
+                      "pointSize": 14,
+                      "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)",
+                      "backgroundSettings": {
+                        "type": "none",
+                        "opacity": 0.4,
+                        "gradient": {
+                          "start": 100,
+                          "end": 0
+                        }
+                      }
+                    }
+                  },
+                  "_hash": 0.9392996197028385,
+                  "aggregationType": null,
+                  "units": null,
+                  "decimals": null,
+                  "funcBody": null,
+                  "usePostProcessing": null,
+                  "postFuncBody": null
+                },
+                {
+                  "name": "discUsage",
+                  "type": "timeseries",
+                  "label": "{i18n:widgets.system-info.disk}",
+                  "color": "#40D0AE",
+                  "settings": {
+                    "yAxisId": "default",
+                    "showInLegend": true,
+                    "dataHiddenByDefault": false,
+                    "type": "line",
+                    "lineSettings": {
+                      "showLine": true,
+                      "step": false,
+                      "stepType": "start",
+                      "smooth": true,
+                      "lineType": "solid",
+                      "lineWidth": 3,
+                      "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)",
+                      "pointShape": "circle",
+                      "pointSize": 14,
+                      "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)",
+                      "backgroundSettings": {
+                        "type": "none",
+                        "opacity": 0.4,
+                        "gradient": {
+                          "start": 100,
+                          "end": 0
+                        }
+                      }
+                    }
+                  },
+                  "_hash": 0.027335636460212864,
+                  "aggregationType": null,
+                  "units": null,
+                  "decimals": null,
+                  "funcBody": null,
+                  "usePostProcessing": null,
+                  "postFuncBody": null
+                }
+              ],
+              "alarmFilterConfig": {
+                "statusList": [
+                  "ACTIVE"
+                ]
+              },
+              "latestDataKeys": []
+            }
+          ],
+          "timewindow": {
+            "hideInterval": false,
+            "hideLastInterval": false,
+            "hideQuickInterval": false,
+            "hideAggregation": false,
+            "hideAggInterval": false,
+            "hideTimezone": false,
+            "selectedTab": 0,
+            "realtime": {
+              "realtimeType": 0,
+              "timewindowMs": 3600000,
+              "quickInterval": "CURRENT_DAY",
+              "interval": 10000
+            },
+            "aggregation": {
+              "type": "AVG",
+              "limit": 25000
+            },
+            "timezone": null
+          },
+          "showTitle": false,
+          "backgroundColor": "rgb(255, 255, 255)",
+          "color": "rgba(0, 0, 0, 0.87)",
+          "padding": "8px",
+          "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": false,
+                "ticksColor": "rgba(0, 0, 0, 0.54)",
+                "showLine": false,
+                "lineColor": "rgba(0, 0, 0, 0.54)",
+                "showSplitLines": false,
+                "splitLinesColor": "rgba(0, 0, 0, 0.12)",
+                "id": "default",
+                "order": 0,
+                "min": 0,
+                "max": 100
+              }
+            },
+            "thresholds": [],
+            "dataZoom": false,
+            "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": false,
+              "ticksColor": "rgba(0, 0, 0, 0.54)",
+              "showLine": false,
+              "lineColor": "rgba(0, 0, 0, 0.54)",
+              "showSplitLines": false,
+              "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": "top",
+              "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)",
+            "tooltipShowDate": true,
+            "tooltipDateFormat": {
+              "format": null,
+              "lastUpdateAgo": false,
+              "custom": false,
+              "auto": true,
+              "autoDateFormatSettings": {}
+            },
+            "tooltipDateFont": {
+              "family": "Roboto",
+              "size": 11,
+              "sizeUnit": "px",
+              "style": "normal",
+              "weight": "400",
+              "lineHeight": "16px"
+            },
+            "tooltipDateColor": "rgba(0, 0, 0, 0.76)",
+            "tooltipDateInterval": false,
+            "tooltipBackgroundColor": "rgba(255, 255, 255, 0.76)",
+            "tooltipBackgroundBlur": 4,
+            "animation": {
+              "animation": true,
+              "animationThreshold": 2000,
+              "animationDuration": 300,
+              "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": "0"
+          },
+          "title": "Time series chart",
+          "dropShadow": false,
+          "enableFullscreen": false,
+          "titleStyle": 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": ".tb-time-series-chart-panel div.tb-widget-title {\n    padding-top: 5px;\n    padding-left: 5px;\n}",
+          "pageSize": 1024,
+          "units": "%",
+          "decimals": null,
+          "noDataDisplayMessage": "",
+          "timewindowStyle": {
+            "showIcon": true,
+            "iconSize": "24px",
+            "icon": "query_builder",
+            "iconPosition": "left",
+            "font": {
+              "size": 14,
+              "sizeUnit": "px",
+              "family": "Roboto",
+              "weight": "400",
+              "style": "normal",
+              "lineHeight": "16px"
+            },
+            "color": "rgba(0, 0, 0, 0.54)",
+            "displayTypePrefix": true
+          },
+          "margin": "0px",
+          "borderRadius": "",
+          "iconSize": "0px"
+        },
+        "row": 0,
+        "col": 0,
+        "id": "b9174a99-2a00-3dbe-0eae-927fd8506345"
       }
     },
     "states": {
@@ -2288,7 +2731,7 @@
         "layouts": {
           "main": {
             "widgets": {
-              "8ee72d43-678c-4e25-e9a8-7d4cfd7a5f8e": {
+              "98bce47d-76df-5fc1-f8b9-8584d73a2439": {
                 "sizeX": 24,
                 "sizeY": 11,
                 "row": 0,
@@ -2315,14 +2758,6 @@
         "layouts": {
           "main": {
             "widgets": {
-              "eace9148-b02a-48fe-1a95-acd9928aa8c5": {
-                "sizeX": 48,
-                "sizeY": 20,
-                "row": 8,
-                "col": 0,
-                "mobileOrder": 1,
-                "mobileHeight": 10
-              },
               "f0479b00-ed47-0a30-0c36-bde7847aae00": {
                 "sizeX": 48,
                 "sizeY": 8,
@@ -2330,6 +2765,12 @@
                 "mobileHeight": 4,
                 "row": 0,
                 "col": 0
+              },
+              "b9174a99-2a00-3dbe-0eae-927fd8506345": {
+                "sizeX": 48,
+                "sizeY": 20,
+                "row": 8,
+                "col": 0
               }
             },
             "gridSettings": {
@@ -2609,6 +3050,5 @@
       "dashboardCss": ".tb-widget-container > .tb-widget {\n    border: 1px solid rgba(0, 0, 0, 0.05);\n    box-shadow: 0px 5px 16px rgba(0, 0, 0, 0.04);\n    border-radius: 12px;\n}\n\n.tb-widget-container > .tb-widget:not([style*=\"padding: 0\"]) {\n    padding: 16px !important;\n}\n\n.tb-card-title {\n    display: grid;\n}\n\n.tb-home-widget-title {\n    font-style: normal;\n    font-weight: 500;\n    font-size: 14px;\n    line-height: 20px;\n    letter-spacing: 0.25px;\n    color: rgba(0, 0, 0, 0.54);\n    white-space: nowrap;\n    overflow: hidden;\n    text-overflow: ellipsis;\n}\n\n.tb-home-widget-link {\n    position: relative;\n    border-bottom: none;\n}\n\n.tb-home-widget-link:hover {\n    border-bottom: none;\n}\n\n.tb-home-widget-link:focus {\n    border-bottom: none;\n}\n\n.tb-home-widget-link::after {\n    content: 'arrow_forward';\n    display: inline-block;\n    transform: rotate(315deg);\n    font-family: 'Material Icons';\n    font-weight: normal;\n    font-style: normal;\n    font-size: 18px;\n    color: rgba(0, 0, 0, 0.12);\n    vertical-align: bottom;\n    margin-left: 6px;    \n}\n\n.tb-home-widget-link:hover::after {\n    color: inherit;\n}\n\n.tb-home-widget-info-icon {\n    color: rgba(0, 0, 0, 0.12);\n    font-size: 16px;\n    width: 16px;\n    height: 16px;\n    line-height: 15px;\n    vertical-align: middle;\n}\n\n.tb-widget-container > .tb-widget .tb-timewindow {\n    font-size: 14px;\n    line-height: 20px;\n    letter-spacing: 0.25px;\n    color: rgba(0, 0, 0, 0.54);\n    padding: 0;\n}\n\n.tb-widget-container > .tb-widget .tb-legend-keys .tb-legend-label {\n    cursor: pointer;\n    user-select: none;\n    font-weight: 400;\n    font-size: 14px;\n    line-height: 20px;\n    letter-spacing: 0.2px;\n    color: rgba(0, 0, 0, 0.54);\n}\n\n@media screen and (min-width: 960px) and (max-width: 1279px) {\n    .tb-widget-container > .tb-widget {\n        border-radius: 4px;\n    }\n    .tb-widget-container > .tb-widget:not([style*=\"padding: 0\"]) {\n        padding: 2px !important;\n    }\n    .tb-hide-md {\n        display: none;\n    }\n}\n\n@media screen and (min-width: 1280px) and (max-width: 1819px) {\n    .tb-widget-container > .tb-widget:not([style*=\"padding: 0\"]) {\n        padding: 8px !important;\n    }\n    .tb-hide-lg {\n        display: none;\n    }\n}\n\n@media screen and (min-width: 960px) and (max-width: 1819px) {\n    .tb-hide-md-lg {\n        display: none;\n    }\n\n    .tb-home-widget-title {\n        font-size: 12px;\n        line-height: 16px;\n    }\n    \n    .tb-widget-container > .tb-widget .tb-widget-title {\n        padding: 0;\n    }\n\n    .tb-widget-container > .tb-widget .tb-timewindow {\n        font-size: 12px;\n        line-height: 16px;\n        min-height: 24px;\n        padding: 0;\n    }\n\n    .tb-widget-container > .tb-widget .tb-timewindow .mat-mdc-icon-button.tb-mat-32 {\n        width: 24px;\n        height: 24px;\n        line-height: 24px;\n    }\n\n    .tb-widget-container > .tb-widget .tb-timewindow .mat-mdc-icon-button.tb-mat-32 .mat-icon {\n        width: 18px;\n        height: 18px;\n        font-size: 18px;\n    }\n    \n    .tb-widget-container > .tb-widget tb-legend {\n        padding-bottom: 0 !important;\n    }\n    \n    .tb-widget-container > .tb-widget .tb-legend-keys .tb-legend-label {\n        font-size: 11px;\n        line-height: 16px;\n        letter-spacing: 0.25px;\n    }\n}\n\n@media screen and (max-width: 959px), screen and (min-width: 1820px) {\n    .tb-hide-not-md-lg {\n        display: none;\n    }\n}\n"
     }
   },
-  "externalId": null,
   "name": "System Administrator Home Page"
 }
\ No newline at end of file
diff --git a/ui-ngx/src/assets/dashboard/tenant_admin_home_page.json b/ui-ngx/src/assets/dashboard/tenant_admin_home_page.json
index 37e8d82e45..85669b8bf4 100644
--- a/ui-ngx/src/assets/dashboard/tenant_admin_home_page.json
+++ b/ui-ngx/src/assets/dashboard/tenant_admin_home_page.json
@@ -69,142 +69,6 @@
         "id": "d70cc256-4c7b-ee06-9905-b8c5e546605f",
         "typeFullFqn": "system.cards.markdown_card"
       },
-      "8ee72d43-678c-4e25-e9a8-7d4cfd7a5f8e": {
-        "type": "timeseries",
-        "sizeX": 8,
-        "sizeY": 5,
-        "config": {
-          "datasources": [
-            {
-              "type": "entity",
-              "name": null,
-              "entityAliasId": "d9229b29-3f46-de8d-7fe8-eb0c43c75079",
-              "filterId": null,
-              "dataKeys": [
-                {
-                  "name": "transportMsgCountHourly",
-                  "type": "timeseries",
-                  "label": "{i18n:widgets.transport-messages.title}",
-                  "color": "#305680",
-                  "settings": {},
-                  "_hash": 0.2880464219129071,
-                  "aggregationType": null,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": null,
-                  "postFuncBody": null
-                }
-              ],
-              "latestDataKeys": []
-            }
-          ],
-          "timewindow": {
-            "hideInterval": false,
-            "hideLastInterval": false,
-            "hideQuickInterval": false,
-            "hideAggregation": true,
-            "hideAggInterval": false,
-            "hideTimezone": false,
-            "selectedTab": 1,
-            "history": {
-              "historyType": 0,
-              "timewindowMs": 2592000000,
-              "interval": 86400000,
-              "fixedTimewindow": {
-                "startTimeMs": 1680443065451,
-                "endTimeMs": 1680529465451
-              },
-              "quickInterval": "CURRENT_DAY"
-            },
-            "aggregation": {
-              "type": "SUM",
-              "limit": 50000
-            }
-          },
-          "showTitle": false,
-          "backgroundColor": "#fff",
-          "color": "rgba(0, 0, 0, 0.87)",
-          "padding": "0px",
-          "settings": {
-            "stack": true,
-            "fontSize": 10,
-            "fontColor": "#545454",
-            "showTooltip": true,
-            "tooltipIndividual": false,
-            "tooltipCumulative": false,
-            "hideZeros": false,
-            "grid": {
-              "verticalLines": false,
-              "horizontalLines": false,
-              "outlineWidth": 0,
-              "color": "#545454",
-              "backgroundColor": null,
-              "tickColor": "#DDDDDD"
-            },
-            "xaxis": {
-              "title": null,
-              "showLabels": true,
-              "color": "#545454"
-            },
-            "yaxis": {
-              "min": 0,
-              "max": null,
-              "title": null,
-              "showLabels": true,
-              "color": "#545454",
-              "tickSize": null,
-              "tickDecimals": 0,
-              "ticksFormatter": "return value % 1000 === 0 ? ((value / 1000) + 'k') : '';"
-            },
-            "defaultBarWidth": 1800000,
-            "barAlignment": "left",
-            "comparisonEnabled": false,
-            "timeForComparison": "previousInterval",
-            "comparisonCustomIntervalValue": 7200000,
-            "xaxisSecond": {
-              "axisPosition": "top",
-              "title": null,
-              "showLabels": true
-            },
-            "customLegendEnabled": false,
-            "dataKeysListForLabels": [],
-            "showLegend": false,
-            "legendConfig": {
-              "direction": "column",
-              "position": "bottom",
-              "sortDataKeys": false,
-              "showMin": false,
-              "showMax": false,
-              "showAvg": true,
-              "showTotal": false,
-              "showLatest": false
-            }
-          },
-          "title": "Transport messages",
-          "dropShadow": false,
-          "enableFullscreen": false,
-          "titleStyle": {
-            "fontSize": "16px",
-            "fontWeight": 400
-          },
-          "widgetStyle": {
-            "padding": "0"
-          },
-          "useDashboardTimewindow": false,
-          "actions": {},
-          "displayTimewindow": true,
-          "showTitleIcon": false,
-          "titleTooltip": "",
-          "widgetCss": ".tb-widget-container > .tb-widget {\n    border: none !important;\n    border-radius: 0 !important;\n    box-shadow: none !important;\n}\n\n.tb-widget-container > .tb-widget .flot-base {\n    opacity: 0.48;\n}\n",
-          "pageSize": 1024,
-          "noDataDisplayMessage": ""
-        },
-        "row": 0,
-        "col": 0,
-        "id": "8ee72d43-678c-4e25-e9a8-7d4cfd7a5f8e",
-        "typeFullFqn": "system.charts.timeseries_bars_flot"
-      },
       "867f82cf-ecf2-2d5c-35cb-08c6f2edc3a4": {
         "type": "static",
         "sizeX": 7.5,
@@ -269,159 +133,6 @@
         "id": "a23185ad-dc46-806c-0e50-5b21fb080ace",
         "typeFullFqn": "system.home_page_widgets.getting_started"
       },
-      "d26e5cd7-75ef-d475-00c7-1a2d1114efe8": {
-        "type": "timeseries",
-        "sizeX": 8,
-        "sizeY": 5,
-        "config": {
-          "datasources": [
-            {
-              "type": "entity",
-              "name": null,
-              "entityAliasId": "d9229b29-3f46-de8d-7fe8-eb0c43c75079",
-              "filterId": null,
-              "dataKeys": [
-                {
-                  "name": "activeDevicesCountHourly",
-                  "type": "timeseries",
-                  "label": "{i18n:device.devices}",
-                  "color": "#305680",
-                  "settings": {
-                    "hideDataByDefault": false,
-                    "disableDataHiding": false,
-                    "removeFromLegend": false,
-                    "excludeFromStacking": false,
-                    "showLines": true,
-                    "lineWidth": 3,
-                    "fillLines": true,
-                    "fillLinesOpacity": 0.04,
-                    "showPoints": false,
-                    "showSeparateAxis": false,
-                    "axisPosition": "left",
-                    "comparisonSettings": {
-                      "showValuesForComparison": true,
-                      "comparisonValuesLabel": "",
-                      "color": ""
-                    },
-                    "thresholds": []
-                  },
-                  "_hash": 0.9688095820365725,
-                  "aggregationType": null,
-                  "units": null,
-                  "decimals": null,
-                  "funcBody": null,
-                  "usePostProcessing": null,
-                  "postFuncBody": null
-                }
-              ],
-              "latestDataKeys": []
-            }
-          ],
-          "timewindow": {
-            "hideInterval": false,
-            "hideLastInterval": false,
-            "hideQuickInterval": false,
-            "hideAggregation": true,
-            "hideAggInterval": true,
-            "hideTimezone": false,
-            "selectedTab": 1,
-            "history": {
-              "historyType": 0,
-              "timewindowMs": 2592000000,
-              "interval": 7200000,
-              "fixedTimewindow": {
-                "startTimeMs": 1681400576338,
-                "endTimeMs": 1681486976338
-              },
-              "quickInterval": "CURRENT_DAY"
-            },
-            "aggregation": {
-              "type": "NONE",
-              "limit": 25000
-            }
-          },
-          "showTitle": false,
-          "backgroundColor": "#fff",
-          "color": "rgba(0, 0, 0, 0.87)",
-          "padding": "0px",
-          "settings": {
-            "stack": false,
-            "fontSize": 10,
-            "fontColor": "#545454",
-            "showTooltip": true,
-            "tooltipIndividual": false,
-            "tooltipCumulative": false,
-            "hideZeros": false,
-            "grid": {
-              "verticalLines": false,
-              "horizontalLines": false,
-              "outlineWidth": 0,
-              "color": "#545454",
-              "backgroundColor": null,
-              "tickColor": "#DDDDDD"
-            },
-            "xaxis": {
-              "title": null,
-              "showLabels": true,
-              "color": "#545454"
-            },
-            "yaxis": {
-              "min": null,
-              "max": null,
-              "title": null,
-              "showLabels": true,
-              "color": "#545454",
-              "tickSize": null,
-              "tickDecimals": 0,
-              "ticksFormatter": ""
-            },
-            "shadowSize": 0,
-            "smoothLines": true,
-            "comparisonEnabled": false,
-            "timeForComparison": "previousInterval",
-            "comparisonCustomIntervalValue": 7200000,
-            "xaxisSecond": {
-              "axisPosition": "top",
-              "title": null,
-              "showLabels": true
-            },
-            "customLegendEnabled": false,
-            "dataKeysListForLabels": [],
-            "showLegend": false,
-            "legendConfig": {
-              "direction": "column",
-              "position": "bottom",
-              "sortDataKeys": false,
-              "showMin": false,
-              "showMax": false,
-              "showAvg": true,
-              "showTotal": false,
-              "showLatest": false
-            }
-          },
-          "title": "Devices activity",
-          "dropShadow": false,
-          "enableFullscreen": false,
-          "titleStyle": {
-            "fontSize": "16px",
-            "fontWeight": 400
-          },
-          "useDashboardTimewindow": false,
-          "displayTimewindow": true,
-          "showTitleIcon": false,
-          "titleTooltip": "",
-          "widgetStyle": {
-            "padding": "0"
-          },
-          "widgetCss": ".tb-widget-container > .tb-widget {\n    border: none !important;\n    border-radius: 0 !important;\n    box-shadow: none !important;\n}\n",
-          "pageSize": 1024,
-          "noDataDisplayMessage": ""
-        },
-        "row": 0,
-        "col": 0,
-        "id": "d26e5cd7-75ef-d475-00c7-1a2d1114efe8",
-        "typeFullFqn": "system.charts.basic_timeseries"
-      },
       "ebbd0a6e-8a47-e770-5086-7f4974250f2d": {
         "type": "static",
         "sizeX": 7.5,
@@ -777,6 +488,661 @@
         "col": 0,
         "id": "7ac20b6a-dc40-b18e-9f5f-bca20bc693bb",
         "typeFullFqn": "system.cards.markdown_card"
+      },
+      "bf7f6efa-7614-3bc0-c4d0-6665d67510a8": {
+        "typeFullFqn": "system.time_series_chart",
+        "type": "timeseries",
+        "sizeX": 8,
+        "sizeY": 5,
+        "config": {
+          "datasources": [
+            {
+              "type": "entity",
+              "name": "",
+              "entityAliasId": "d9229b29-3f46-de8d-7fe8-eb0c43c75079",
+              "dataKeys": [
+                {
+                  "name": "transportMsgCountHourly",
+                  "type": "timeseries",
+                  "label": "{i18n:widgets.transport-messages.title}",
+                  "color": "#305680",
+                  "settings": {
+                    "showInLegend": true,
+                    "dataHiddenByDefault": false,
+                    "type": "bar",
+                    "lineSettings": {
+                      "showLine": true,
+                      "step": false,
+                      "stepType": "start",
+                      "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)",
+                      "pointShape": "emptyCircle",
+                      "pointSize": 4,
+                      "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)",
+                      "backgroundSettings": {
+                        "type": "none",
+                        "opacity": 0.4,
+                        "gradient": {
+                          "start": 100,
+                          "end": 0
+                        }
+                      }
+                    }
+                  },
+                  "_hash": 0.39181957822569946,
+                  "decimals": 0
+                }
+              ],
+              "alarmFilterConfig": {
+                "statusList": [
+                  "ACTIVE"
+                ]
+              },
+              "latestDataKeys": []
+            }
+          ],
+          "timewindow": {
+            "hideInterval": false,
+            "hideLastInterval": false,
+            "hideQuickInterval": false,
+            "hideAggregation": true,
+            "hideAggInterval": false,
+            "hideTimezone": false,
+            "selectedTab": 1,
+            "history": {
+              "historyType": 0,
+              "timewindowMs": 2592000000,
+              "interval": 86400000,
+              "fixedTimewindow": {
+                "startTimeMs": 1709807941444,
+                "endTimeMs": 1709894341444
+              },
+              "quickInterval": "CURRENT_DAY"
+            },
+            "aggregation": {
+              "type": "SUM",
+              "limit": 25000
+            },
+            "timezone": null
+          },
+          "showTitle": false,
+          "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": "return value === 0 ? value : ((value / 1000) + 'k');",
+                "showTicks": false,
+                "ticksColor": "rgba(0, 0, 0, 0.54)",
+                "showLine": false,
+                "lineColor": "rgba(0, 0, 0, 0.54)",
+                "showSplitLines": false,
+                "splitLinesColor": "rgba(0, 0, 0, 0.12)",
+                "id": "default",
+                "order": 0,
+                "min": 0,
+                "max": null
+              }
+            },
+            "thresholds": [],
+            "dataZoom": false,
+            "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": false,
+              "ticksColor": "rgba(0, 0, 0, 0.54)",
+              "showLine": false,
+              "lineColor": "rgba(0, 0, 0, 0.54)",
+              "showSplitLines": false,
+              "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": false,
+            "legendLabelFont": {
+              "family": "Roboto",
+              "size": 12,
+              "sizeUnit": "px",
+              "style": "normal",
+              "weight": "400",
+              "lineHeight": "16px"
+            },
+            "legendLabelColor": "rgba(0, 0, 0, 0.76)",
+            "legendConfig": {
+              "direction": "column",
+              "position": "top",
+              "sortDataKeys": false,
+              "showMin": false,
+              "showMax": false,
+              "showAvg": true,
+              "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)",
+            "tooltipShowDate": true,
+            "tooltipDateFormat": {
+              "format": null,
+              "lastUpdateAgo": false,
+              "custom": false,
+              "auto": true,
+              "autoDateFormatSettings": {}
+            },
+            "tooltipDateFont": {
+              "family": "Roboto",
+              "size": 11,
+              "sizeUnit": "px",
+              "style": "normal",
+              "weight": "400",
+              "lineHeight": "16px"
+            },
+            "tooltipDateColor": "rgba(0, 0, 0, 0.76)",
+            "tooltipDateInterval": false,
+            "tooltipBackgroundColor": "rgba(255, 255, 255, 0.76)",
+            "tooltipBackgroundBlur": 4,
+            "animation": {
+              "animation": true,
+              "animationThreshold": 2000,
+              "animationDuration": 1000,
+              "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": "0"
+          },
+          "title": "Time series chart",
+          "dropShadow": false,
+          "enableFullscreen": false,
+          "titleStyle": 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": ".tb-widget-container > .tb-widget {\n    border: none !important;\n    border-radius: 0 !important;\n    box-shadow: none !important;\n}\n\n.tb-time-series-chart-panel div.tb-widget-title {\n    padding-top: 5px;\n    padding-left: 5px;\n}",
+          "pageSize": 1024,
+          "units": "",
+          "decimals": null,
+          "noDataDisplayMessage": "",
+          "timewindowStyle": {
+            "showIcon": true,
+            "iconSize": "24px",
+            "icon": "query_builder",
+            "iconPosition": "left",
+            "font": {
+              "size": 14,
+              "sizeUnit": "px",
+              "family": "Roboto",
+              "weight": "400",
+              "style": "normal",
+              "lineHeight": "16px"
+            },
+            "color": "rgba(0, 0, 0, 0.54)",
+            "displayTypePrefix": true
+          },
+          "margin": "0px",
+          "borderRadius": "0px",
+          "iconSize": "0px"
+        },
+        "row": 0,
+        "col": 0,
+        "id": "bf7f6efa-7614-3bc0-c4d0-6665d67510a8"
+      },
+      "8e71a398-caf5-540d-cec5-6e5dc264343e": {
+        "typeFullFqn": "system.time_series_chart",
+        "type": "timeseries",
+        "sizeX": 8,
+        "sizeY": 5,
+        "config": {
+          "datasources": [
+            {
+              "type": "entity",
+              "name": "",
+              "entityAliasId": "d9229b29-3f46-de8d-7fe8-eb0c43c75079",
+              "dataKeys": [
+                {
+                  "name": "activeDevicesCountHourly",
+                  "type": "timeseries",
+                  "label": "{i18n:device.devices}",
+                  "color": "#305680",
+                  "settings": {
+                    "showInLegend": true,
+                    "dataHiddenByDefault": false,
+                    "type": "line",
+                    "lineSettings": {
+                      "showLine": true,
+                      "step": false,
+                      "stepType": "start",
+                      "smooth": true,
+                      "lineType": "solid",
+                      "lineWidth": 3,
+                      "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)",
+                      "pointShape": "circle",
+                      "pointSize": 14,
+                      "fillAreaSettings": {
+                        "type": "opacity",
+                        "opacity": 0.04,
+                        "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)",
+                      "backgroundSettings": {
+                        "type": "none",
+                        "opacity": 0.4,
+                        "gradient": {
+                          "start": 100,
+                          "end": 0
+                        }
+                      }
+                    }
+                  },
+                  "_hash": 0.39181957822569946,
+                  "decimals": 0,
+                  "aggregationType": null,
+                  "funcBody": null,
+                  "usePostProcessing": null,
+                  "postFuncBody": null
+                }
+              ],
+              "alarmFilterConfig": {
+                "statusList": [
+                  "ACTIVE"
+                ]
+              },
+              "latestDataKeys": []
+            }
+          ],
+          "timewindow": {
+            "hideInterval": false,
+            "hideLastInterval": false,
+            "hideQuickInterval": false,
+            "hideAggregation": true,
+            "hideAggInterval": true,
+            "hideTimezone": false,
+            "selectedTab": 1,
+            "history": {
+              "historyType": 0,
+              "timewindowMs": 2592000000,
+              "interval": 86400000,
+              "fixedTimewindow": {
+                "startTimeMs": 1709807941444,
+                "endTimeMs": 1709894341444
+              },
+              "quickInterval": "CURRENT_DAY"
+            },
+            "aggregation": {
+              "type": "NONE",
+              "limit": 25000
+            },
+            "timezone": null
+          },
+          "showTitle": false,
+          "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": null,
+                "showTicks": false,
+                "ticksColor": "rgba(0, 0, 0, 0.54)",
+                "showLine": false,
+                "lineColor": "rgba(0, 0, 0, 0.54)",
+                "showSplitLines": false,
+                "splitLinesColor": "rgba(0, 0, 0, 0.12)",
+                "id": "default",
+                "order": 0,
+                "min": 0
+              }
+            },
+            "thresholds": [],
+            "dataZoom": false,
+            "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": false,
+              "ticksColor": "rgba(0, 0, 0, 0.54)",
+              "showLine": false,
+              "lineColor": "rgba(0, 0, 0, 0.54)",
+              "showSplitLines": false,
+              "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": false,
+            "legendLabelFont": {
+              "family": "Roboto",
+              "size": 12,
+              "sizeUnit": "px",
+              "style": "normal",
+              "weight": "400",
+              "lineHeight": "16px"
+            },
+            "legendLabelColor": "rgba(0, 0, 0, 0.76)",
+            "legendConfig": {
+              "direction": "column",
+              "position": "top",
+              "sortDataKeys": false,
+              "showMin": false,
+              "showMax": false,
+              "showAvg": true,
+              "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)",
+            "tooltipShowDate": true,
+            "tooltipDateFormat": {
+              "format": null,
+              "lastUpdateAgo": false,
+              "custom": false,
+              "auto": true,
+              "autoDateFormatSettings": {}
+            },
+            "tooltipDateFont": {
+              "family": "Roboto",
+              "size": 11,
+              "sizeUnit": "px",
+              "style": "normal",
+              "weight": "400",
+              "lineHeight": "16px"
+            },
+            "tooltipDateColor": "rgba(0, 0, 0, 0.76)",
+            "tooltipDateInterval": false,
+            "tooltipBackgroundColor": "rgba(255, 255, 255, 0.76)",
+            "tooltipBackgroundBlur": 4,
+            "animation": {
+              "animation": true,
+              "animationThreshold": 2000,
+              "animationDuration": 200,
+              "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": "0"
+          },
+          "title": "Time series chart",
+          "dropShadow": false,
+          "enableFullscreen": false,
+          "titleStyle": 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": ".tb-widget-container > .tb-widget {\n    border: none !important;\n    border-radius: 0 !important;\n    box-shadow: none !important;\n}\n\n.tb-time-series-chart-panel div.tb-widget-title {\n    padding-top: 5px;\n    padding-left: 5px;\n}",
+          "pageSize": 1024,
+          "units": "",
+          "decimals": null,
+          "noDataDisplayMessage": "",
+          "timewindowStyle": {
+            "showIcon": true,
+            "iconSize": "24px",
+            "icon": "query_builder",
+            "iconPosition": "left",
+            "font": {
+              "size": 14,
+              "sizeUnit": "px",
+              "family": "Roboto",
+              "weight": "400",
+              "style": "normal",
+              "lineHeight": "16px"
+            },
+            "color": "rgba(0, 0, 0, 0.54)",
+            "displayTypePrefix": true
+          },
+          "margin": "0px",
+          "borderRadius": "0px",
+          "iconSize": "0px"
+        },
+        "row": 0,
+        "col": 0,
+        "id": "8e71a398-caf5-540d-cec5-6e5dc264343e"
       }
     },
     "states": {
@@ -868,7 +1234,7 @@
         "layouts": {
           "main": {
             "widgets": {
-              "8ee72d43-678c-4e25-e9a8-7d4cfd7a5f8e": {
+              "bf7f6efa-7614-3bc0-c4d0-6665d67510a8": {
                 "sizeX": 24,
                 "sizeY": 11,
                 "row": 0,
@@ -895,7 +1261,7 @@
         "layouts": {
           "main": {
             "widgets": {
-              "d26e5cd7-75ef-d475-00c7-1a2d1114efe8": {
+              "8e71a398-caf5-540d-cec5-6e5dc264343e": {
                 "sizeX": 24,
                 "sizeY": 11,
                 "row": 0,
@@ -1049,6 +1415,5 @@
       "dashboardCss": ".tb-widget-container > .tb-widget {\n    border: 1px solid rgba(0, 0, 0, 0.05);\n    box-shadow: 0px 5px 16px rgba(0, 0, 0, 0.04);\n    border-radius: 12px;\n}\n\n.tb-widget-container > .tb-widget:not([style*=\"padding: 0\"]) {\n    padding: 16px !important;\n}\n\n.tb-card-title {\n    display: grid;\n}\n\n.tb-home-widget-title {\n    font-style: normal;\n    font-weight: 500;\n    font-size: 14px;\n    line-height: 20px;\n    letter-spacing: 0.25px;\n    color: rgba(0, 0, 0, 0.54);\n    white-space: nowrap;\n    overflow: hidden;\n    text-overflow: ellipsis;\n}\n\n.tb-home-widget-link {\n    position: relative;\n    border-bottom: none;\n}\n\n.tb-home-widget-link:hover {\n    border-bottom: none;\n}\n\n.tb-home-widget-link:focus {\n    border-bottom: none;\n}\n\n.tb-home-widget-link::after {\n    content: 'arrow_forward';\n    display: inline-block;\n    transform: rotate(315deg);\n    font-family: 'Material Icons';\n    font-weight: normal;\n    font-style: normal;\n    font-size: 18px;\n    color: rgba(0, 0, 0, 0.12);\n    vertical-align: bottom;\n    margin-left: 6px;    \n}\n\n.tb-home-widget-link:hover::after {\n    color: inherit;\n}\n\n.tb-home-widget-info-icon {\n    color: rgba(0, 0, 0, 0.12);\n    font-size: 16px;\n    width: 16px;\n    height: 16px;\n    line-height: 15px;\n    vertical-align: middle;\n}\n\n.tb-widget-container > .tb-widget .tb-timewindow {\n    font-size: 14px;\n    line-height: 20px;\n    letter-spacing: 0.25px;\n    color: rgba(0, 0, 0, 0.54);\n    padding: 0;\n}\n\n.tb-widget-container > .tb-widget .tb-legend-keys .tb-legend-label {\n    cursor: pointer;\n    user-select: none;\n    font-weight: 400;\n    font-size: 14px;\n    line-height: 20px;\n    letter-spacing: 0.2px;\n    color: rgba(0, 0, 0, 0.54);\n}\n\n@media screen and (min-width: 960px) and (max-width: 1279px) {\n    .tb-widget-container > .tb-widget {\n        border-radius: 4px;\n    }\n    .tb-widget-container > .tb-widget:not([style*=\"padding: 0\"]) {\n        padding: 2px !important;\n    }\n    .tb-hide-md {\n        display: none;\n    }\n}\n\n@media screen and (min-width: 1280px) and (max-width: 1819px) {\n    .tb-widget-container > .tb-widget:not([style*=\"padding: 0\"]) {\n        padding: 8px !important;\n    }\n    .tb-hide-lg {\n        display: none;\n    }\n}\n\n@media screen and (min-width: 960px) and (max-width: 1819px) {\n    .tb-hide-md-lg {\n        display: none;\n    }\n\n    .tb-home-widget-title {\n        font-size: 12px;\n        line-height: 16px;\n    }\n    \n    .tb-widget-container > .tb-widget .tb-widget-title {\n        padding: 0;\n    }\n\n    .tb-widget-container > .tb-widget .tb-timewindow {\n        font-size: 12px;\n        line-height: 16px;\n        min-height: 24px;\n        padding: 0;\n    }\n\n    .tb-widget-container > .tb-widget .tb-timewindow .mat-mdc-icon-button.tb-mat-32 {\n        width: 24px;\n        height: 24px;\n        line-height: 24px;\n    }\n\n    .tb-widget-container > .tb-widget .tb-timewindow .mat-mdc-icon-button.tb-mat-32 .mat-icon {\n        width: 18px;\n        height: 18px;\n        font-size: 18px;\n    }\n    \n    .tb-widget-container > .tb-widget tb-legend {\n        padding-bottom: 0 !important;\n    }\n    \n    .tb-widget-container > .tb-widget .tb-legend-keys .tb-legend-label {\n        font-size: 11px;\n        line-height: 16px;\n        letter-spacing: 0.25px;\n    }\n}\n\n@media screen and (max-width: 959px), screen and (min-width: 1820px) {\n    .tb-hide-not-md-lg {\n        display: none;\n    }\n}\n"
     }
   },
-  "externalId": null,
   "name": "Tenant Administrator Home Page"
-}
+}
\ No newline at end of file
diff --git a/ui-ngx/src/assets/help/en_US/notification/rate_limits.md b/ui-ngx/src/assets/help/en_US/notification/rate_limits.md
index d314e681c2..c17610f39a 100644
--- a/ui-ngx/src/assets/help/en_US/notification/rate_limits.md
+++ b/ui-ngx/src/assets/help/en_US/notification/rate_limits.md
@@ -11,7 +11,7 @@ Available template parameters:
 
 * `api` - rate-limited API label; one of: 'REST API requests', 'REST API requests per customer', 'transport messages', 
   'transport messages per device', 'Cassandra queries', 'WS updates per session', 'notification requests', 'notification requests per rule',
-  'entity version creation', 'entity version load', 'Edge events', 'Edge events per edge';
+  'entity version creation', 'entity version load', 'Edge events', 'Edge events per edge', 'Edge uplink messages', 'Edge uplink messages per edge';
 * `limitLevelEntityType` - entity type of the limit level entity, e.g. 'Tenant', 'Device', 'Notification rule', 'Customer', etc.;
 * `limitLevelEntityId` - id of the limit level entity;
 * `limitLevelEntityName` - name of the limit level entity;
diff --git a/ui-ngx/src/assets/help/en_US/notification/task_processing_failure.md b/ui-ngx/src/assets/help/en_US/notification/task_processing_failure.md
new file mode 100644
index 0000000000..0bcf107298
--- /dev/null
+++ b/ui-ngx/src/assets/help/en_US/notification/task_processing_failure.md
@@ -0,0 +1,46 @@
+#### Task processing failure notification templatization
+
+<div class="divider"></div>
+<br/>
+
+Notification subject and message fields support templatization.
+The list of available templatization parameters depends on the template type.
+See the available types and parameters below:
+
+Available template parameters:
+
+* `taskType` - the task type, e.g. 'telemetry deletion';
+* `taskDescription` - the task description, e.g. 'telemetry deletion for device c4d93dc0-63a1-11ee-aa6d-f7cbc0a71325';
+* `error` - the error stacktrace
+* `tenantId` - the tenant id;
+* `entityType` - the type of the entity to which the task is related;
+* `entityId` - the id of the entity to which the task is related;
+* `attempt` - the number of attempts processing the task
+
+Parameter names must be wrapped using `${...}`. For example: `${entityType}`.
+You may also modify the value of the parameter with one of the suffixes:
+
+* `upperCase`, for example - `${entityType:upperCase}`
+* `lowerCase`, for example - `${entityType:lowerCase}`
+* `capitalize`, for example - `${entityType:capitalize}`
+
+<div class="divider"></div>
+
+##### Examples
+
+Let's assume that telemetry deletion failed for some device.
+The following template:
+
+```text
+Failed to process ${taskType} for ${entityType:lowerCase} ${entityId}
+{:copy-code}
+```
+
+will be transformed to:
+
+```text
+Failed to process telemetry deletion for device c4d93dc0-63a1-11ee-aa6d-f7cbc0a71325
+```
+
+<br>
+<br>
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_AE.json b/ui-ngx/src/assets/locale/locale.constant-ar_AE.json
new file mode 100644
index 0000000000..104eb18abd
--- /dev/null
+++ b/ui-ngx/src/assets/locale/locale.constant-ar_AE.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 b95efbb496..02a03cd8df 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",
@@ -791,6 +792,9 @@
         "api-usage": "API usage",
         "alarm": "Alarm",
         "alarms-created": "Alarms created",
+        "queue-stats": "Queue Stats",
+        "processing-failures-and-timeouts": "Processing Failures and Timeouts",
+        "exceptions": "Exceptions",
         "alarms-created-daily-activity": "Alarms created daily activity",
         "alarms-created-hourly-activity": "Alarms created hourly activity",
         "alarms-created-monthly-activity": "Alarms created monthly activity",
@@ -801,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",
@@ -819,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",
@@ -861,7 +862,9 @@
         "transport-messages-per-device": "Transport messages per device",
         "ws-updates-per-session": "WS updates per session",
         "edge-events": "Edge events",
-        "edge-events-per-edge": "Edge events per edge"
+        "edge-events-per-edge": "Edge events per edge",
+        "edge-uplink-messages": "Edge uplink messages",
+        "edge-uplink-messages-per-edge": "Edge uplink messages per edge"
     },
     "audit-log": {
         "audit": "Audit",
@@ -1020,7 +1023,16 @@
         "last-update-n-ago-text": "Last update {{ agoText }}",
         "custom-date": "Custom date",
         "format": "Format",
-        "preview": "Preview"
+        "preview": "Preview",
+        "auto": "Auto",
+        "time-granularity-formats": "Time granularity formats",
+        "unit-year": "Years",
+        "unit-month": "Months",
+        "unit-day": "Days",
+        "unit-hour": "Hours",
+        "unit-minute": "Minutes",
+        "unit-second": "Seconds",
+        "unit-millisecond": "Milliseconds"
     },
     "datetime": {
         "date-from": "Date from",
@@ -2230,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",
@@ -2257,7 +2271,11 @@
         "address2": "Address 2",
         "zip": "Zip",
         "phone": "Phone",
-        "label": "Label"
+        "label": "Label",
+        "queue-name": "Queue name",
+        "service-id": "Service Id",
+        "owner-name": "Owner name",
+        "owner-type": "Owner type"
     },
     "entity-view": {
         "entity-view": "Entity view",
@@ -2713,11 +2731,12 @@
         "connectors-table-class": "Class",
         "connector-created": "Connector created.",
         "connector-updated": "Connector updated.",
+        "rpc-command-save-template": "Save Template",
         "rpc-command-send": "Send",
         "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",
@@ -2809,6 +2828,96 @@
         "remove-entry": "Remove configuration",
         "remote-shell": "Remote shell",
         "remote-configuration": "Remote Configuration",
+        "rpc": {
+            "title": "{{type}} Connector RPC parameters",
+            "templates-title": "Connector RPC Templates",
+            "methodFilter": "Method filter",
+            "requestTopicExpression": "Request topic expression",
+            "responseTopicExpression": "Response topic expression",
+            "responseTimeout": "Response Time",
+            "valueExpression": "Value Expression",
+            "tag": "Tag",
+            "type": "Type",
+            "functionCode": "Function Code",
+            "objectsCount": "Objects Count",
+            "address": "Address",
+            "method": "Method",
+            "requestType": "Request Type",
+            "requestTimeout": "Request Timeout",
+            "objectType": "Object type",
+            "identifier": "Identifier",
+            "propertyId": "Property ID",
+            "methodRPC": "Method RPC name",
+            "withResponse": "With Response",
+            "characteristicUUID": "Characteristic UUID",
+            "methodProcessing": "Method Processing",
+            "nodeID": "Node ID",
+            "isExtendedID": "Is Extended ID",
+            "isFD": "Is FD",
+            "bitrateSwitch": "Bitrate Switch",
+            "dataInHEX": "Data In HEX",
+            "dataLength": "Data Length",
+            "dataByteorder": "Data Byte Order",
+            "dataBefore": "Data Before",
+            "dataAfter": "Data After",
+            "dataExpression": "Data Expression",
+            "encoding": "Encoding",
+            "oid": "OID",
+            "add-oid": "Add OID",
+            "add-header": "Add header",
+            "add-security": "Add security",
+            "remove": "Remove",
+            "requestFilter": "Request Filter",
+            "requestUrlExpression": "Request URL Expression",
+            "httpMethod": "HTTP Method",
+            "timeout": "Timeout",
+            "tries": "Tries",
+            "httpHeaders": "HTTP Headers",
+            "header-name": "Header name",
+            "security-name": "Security name",
+            "value": "Value",
+            "security": "Security",
+            "responseValueExpression": "Response Value Expression",
+            "requestValueExpression": "Request Value Expression",
+            "arguments": "Arguments",
+            "add-argument": "Add argument",
+            "write-property": "Write property",
+            "read-property": "Read property",
+            "analog-output": "Analog output",
+            "analog-input": "Analog input",
+            "binary-output": "Binary output",
+            "binary-input": "Binary input",
+            "binary-value": "Binary value",
+            "analog-value": "Analog value",
+            "write": "Write",
+            "read": "Read",
+            "scan": "Scan",
+            "oids": "OIDS",
+            "set": "Set",
+            "multiset": "Multiset",
+            "get": "Get",
+            "bulk-walk": "Bulk walk",
+            "table": "Table",
+            "multi-get": "Multiget",
+            "get-next": "Get next",
+            "bulk-get": "Bulk get",
+            "walk": "Walk",
+            "save-template": "Save template",
+            "template-name": "Template name",
+            "template-name-required": "Template name is required.",
+            "template-name-duplicate": "Template with such name already exists, it will be updated.",
+            "command": "Command",
+            "params": "Params",
+            "read-coils": "01: Read Coils",
+            "read-discrete-inputs": "02: Read Discrete Inputs",
+            "read-multiple-holding-registers": "03: Read Multiple Holding Registers",
+            "read-input-registers": "04: Read Input Registers",
+            "write-single-coil": "05: Write Single Coil",
+            "write-single-holding-register": "06: Write Single Holding Register",
+            "write-multiple-coils": "15: Write Multiple Coils",
+            "write-multiple-holding-registers": "16: Write Multiple Holding Registers",
+            "json-value-invalid": "JSON value has an invalid format"
+        },
         "other": "Other",
         "save-tip": "Save configuration file",
         "security-type": "Security type",
@@ -3171,6 +3280,11 @@
         "avg": "avg",
         "total": "total",
         "latest": "latest",
+        "Min": "Min",
+        "Max": "Max",
+        "Avg": "Avg",
+        "Total": "Total",
+        "Latest": "Latest",
         "comparison-time-ago": {
             "previousInterval": "(previous interval)",
             "customInterval": "(custom interval)",
@@ -3179,6 +3293,7 @@
             "months": "(month ago)",
             "years": "(year ago)"
         },
+        "column-title": "Column title",
         "label": "Label",
         "value": "Value"
     },
@@ -3200,6 +3315,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",
@@ -3243,6 +3359,7 @@
         "api-usage-trigger-settings": "API usage trigger settings",
         "new-platform-version-trigger-settings": "New platform version trigger settings",
         "rate-limits-trigger-settings": "Exceeded rate limits trigger settings",
+        "task-processing-failure-trigger-settings": "Task processing failure trigger settings",
         "at-least-one-should-be-selected": "At least one should be selected",
         "basic-settings": "Basic settings",
         "button-text": "Button text",
@@ -3351,6 +3468,7 @@
         "notification": "Notification",
         "notification-center": "Notification center",
         "notification-tap-action": "Notification tap action",
+        "notification-tap-action-hint": "If not enabled, the default alarm dashboard will be used",
         "notify": "notify",
         "notify-again": "Notify again",
         "notify-alarm-action": {
@@ -3452,7 +3570,8 @@
             "new-platform-version": "New platform version",
             "rate-limits": "Exceeded rate limits",
             "edge-communication-failure": "Edge communication failure",
-            "edge-connection": "Edge connection"
+            "edge-connection": "Edge connection",
+            "task-processing-failure": "Task processing failure"
         },
         "templates": "Templates",
         "notification-templates": "Notifications / Templates",
@@ -3475,6 +3594,7 @@
             "rate-limits": "Exceeded rate limits",
             "edge-connection": "Edge connection",
             "edge-communication-failure": "Edge communication failure",
+            "task-processing-failure": "Task processing failure",
             "trigger": "Trigger",
             "trigger-required": "Trigger is required"
         },
@@ -4211,6 +4331,10 @@
             "edit-edge-events-per-edge-rate-limit": "Edit edge events per edge rate limits",
             "edge-events-rate-limit": "Edge events",
             "edge-events-per-edge-rate-limit": "Edge events per edge",
+            "edit-edge-uplink-messages-rate-limit": "Edit edge uplink messages rate limits",
+            "edit-edge-uplink-messages-per-edge-rate-limit": "Edit edge uplink messages per edge rate limits",
+            "edge-uplink-messages-rate-limit": "Edge uplink messages",
+            "edge-uplink-messages-per-edge-rate-limit": "Edge uplink messages per edge",
             "messages-per": "messages per",
             "not-set": "Not set",
             "number-of-messages": "Number of messages",
@@ -4331,8 +4455,14 @@
         "preview": "Preview"
     },
     "tooltip": {
+        "trigger": "Trigger",
+        "trigger-point": "Point",
+        "trigger-axis": "Axis",
+        "label": "Label",
         "value": "Value",
         "date": "Date",
+        "show-date-time-interval": "Show date time interval",
+        "show-date-time-interval-hint": "Show date time interval according to the data aggregation.",
         "background-color": "Background color",
         "background-blur": "Background blur"
     },
@@ -4897,7 +5027,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",
@@ -5198,6 +5330,7 @@
         "card-buttons": "Card buttons",
         "show-card-buttons": "Show card buttons",
         "card-border-radius": "Card border radius",
+        "card-padding": "Card padding",
         "card-appearance": "Card appearance",
         "color": "Color",
         "tooltip": "Tooltip",
@@ -5303,7 +5436,13 @@
             "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",
+            "bar-axis": "Bar axis"
+        },
+        "polar-area-chart": {
+            "polar-axis": "Polar axis",
+            "start-angle": "Start angle",
+            "polar-area-chart-style": "Polar area chart style"
         },
         "battery-level": {
             "layout": "Layout",
@@ -5333,6 +5472,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",
@@ -5464,7 +5622,59 @@
             "axis": "Axis",
             "vertical-axis": "Vertical axis",
             "ticks": "Ticks",
-            "horizontal-axis": "Horizontal axis"
+            "horizontal-axis": "Horizontal axis",
+            "shape-empty-circle": "Empty circle",
+            "shape-circle": "Circle",
+            "shape-rect": "Rectangle",
+            "shape-round-rect": "Rounded rectangle",
+            "shape-triangle": "Triangle",
+            "shape-diamond": "Diamond",
+            "shape-pin": "Pin",
+            "shape-arrow": "Arrow",
+            "shape-none": "None",
+            "line-type-solid": "Solid",
+            "line-type-dashed": "Dashed",
+            "line-type-dotted": "Dotted",
+            "label-position-top": "Top",
+            "label-position-bottom": "Bottom",
+            "label-position-outside": "Outside",
+            "label-position-inside": "Inside",
+            "fill": "Fill",
+            "fill-type-none": "None",
+            "fill-type-solid": "Solid",
+            "fill-type-opacity": "Opacity",
+            "fill-type-gradient": "Gradient",
+            "background": "Background",
+            "opacity": "Opacity",
+            "gradient-stops": "Gradient stops",
+            "gradient-start": "start",
+            "gradient-end": "end",
+            "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"
+            },
+            "chart-axis": {
+              "scale": "Scale",
+              "scale-min": "min",
+              "scale-max": "max",
+              "scale-auto": "Auto"
+            },
+            "bar": {
+              "show-border": "Show border",
+              "border-width": "Border width",
+              "border-radius": "Border radius",
+              "bar-width": "Bar width",
+              "label": "Label",
+              "label-hint": "Display label over the bar.",
+              "series-label-hint": "Display label with value over the bar.",
+              "label-background": "Label background"
+            }
         },
         "color": {
             "color-settings": "Color settings",
@@ -5565,16 +5775,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": {
@@ -6053,10 +6257,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",
@@ -6587,6 +6795,177 @@
             "table-tabs": "Table tabs",
             "show-cell-actions-menu-mobile": "Show cell actions dropdown menu in mobile mode"
         },
+        "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",
+            "border": "Border",
+            "radius": "Radius",
+            "pie-chart-card-style": "Pie chart card style"
+        },
+        "radar-chart": {
+            "radar-appearance": "Radar appearance",
+            "shape": "Shape",
+            "shape-polygon": "Polygon",
+            "shape-circle": "Circle",
+            "color": "Color",
+            "line": "Line",
+            "points": "Points",
+            "points-label": "Points label",
+            "radar-axis": "Radar axis",
+            "axis-label": "Axis label",
+            "ticks-label": "Ticks label",
+            "radar-chart-style": "Radar chart style"
+        },
+        "time-series-chart": {
+            "chart": "Chart",
+            "chart-style": "Chart style",
+            "data-zoom": "Data zoom",
+            "stack-mode": "Stack mode",
+            "stack-mode-hint": "Stacks series on the chart. The series with the same unit would be put on top of each other.",
+            "axes": "Axes",
+            "y-axes": "Y axes",
+            "line-type": "Line type",
+            "line-width": "Line width",
+            "type-line": "Line",
+            "type-bar": "Bar",
+            "type-point": "Point",
+            "no-aggregation-bar-width-strategy": "Bar width strategy for non-aggregated data",
+            "no-aggregation-bar-width-strategy-group": "Group",
+            "no-aggregation-bar-width-strategy-separate": "Separate",
+            "bar-group-width": "Bar group width",
+            "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",
+              "key-value": "Key / Value",
+              "no-thresholds": "No thresholds configured",
+              "add-threshold": "Add threshold",
+              "type-constant": "Constant",
+              "type-latest-key": "Key",
+              "type-entity": "Entity",
+              "threshold-settings": "Threshold settings",
+              "remove-threshold": "Remove threshold",
+              "threshold-value-required": "Threshold value is required.",
+              "key-required": "Key is required.",
+              "entity-key-required": "Entity key is required.",
+              "line-appearance": "Line appearance",
+              "line-color": "Line color",
+              "start-symbol": "Start symbol",
+              "end-symbol": "End symbol",
+              "symbol-size": "size",
+              "label": "Label",
+              "label-position-start": "Start",
+              "label-position-middle": "Middle",
+              "label-position-end": "End",
+              "label-position-inside-start": "Inside start",
+              "label-position-inside-start-top": "Inside start top",
+              "label-position-inside-start-bottom": "Inside start bottom",
+              "label-position-inside-middle": "Inside middle",
+              "label-position-inside-middle-top": "Inside middle top",
+              "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-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",
+              "position": "Position",
+              "position-left": "Left",
+              "position-right": "Right",
+              "position-top": "Top",
+              "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",
+              "show-split-lines-x-axis-hint": "If enabled, the vertical lines on the chart will be shown.",
+              "show-split-lines-y-axis-hint": "If enabled, the horizontal lines on the chart will be shown.",
+              "ticks-interval": "Ticks interval",
+              "ticks-interval-hint": "Compulsively set segmentation interval for axis.",
+              "split-number": "Split number",
+              "split-number-hint": "Number of segments that the axis is split into.",
+              "min": "Min",
+              "max": "Max",
+              "show": "Show",
+              "add-y-axis": "Add Y axis"
+            },
+            "series": {
+              "legend-settings": "Legend settings",
+              "show-in-legend": "Show in legend",
+              "show-in-legend-hint": "Show series name and data in legend.",
+              "hidden-by-default": "Hidden by default",
+              "hidden-by-default-hint": "Make series hidden in legend by default.",
+              "series-type": "Series type",
+              "type": "Type",
+              "type-line": "Line",
+              "type-bar": "Bar",
+              "line": {
+                "line": "Line",
+                "show-line": "Show line",
+                "step-line": "Step line",
+                "step-type-start": "Start",
+                "step-type-middle": "Middle",
+                "step-type-end": "End",
+                "smooth-line": "Smooth line"
+              },
+              "point": {
+                "points": "Points",
+                "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"
+              }
+            }
+        },
         "wind-speed-direction": {
             "layout": "Layout",
             "layout-default": "Default",
@@ -6941,6 +7320,7 @@
     "language": {
         "language": "Language",
         "locales": {
+            "ar_AE": "اَلْعَرَبِيَّةُ",
             "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 014666017c..58d4a0168f 100644
--- a/ui-ngx/src/assets/locale/locale.constant-pl_PL.json
+++ b/ui-ngx/src/assets/locale/locale.constant-pl_PL.json
@@ -5172,7 +5172,7 @@
             "bar-appearance":"Wygląd słupka",
             "label-on-bar":"Etykieta na słupku",
             "value-on-bar":"Wartość na słupku",
-            "bar-chart-card-style":"Styl karty wykresu słupkowego"
+            "bar-chart-style":"Styl wykresu słupkowego"
         },
         "battery-level":{
             "layout":"Układ",
@@ -5924,7 +5924,7 @@
             "range-colors":"Kolory zakresu",
             "out-of-range-color":"Kolor poza zakresem",
             "fill-area":"Wypełnij obszar",
-            "range-chart-card-style":"Styl karty wykresu zakresu"
+            "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 524a4e86ac..1f9ca93c88 100644
--- a/ui-ngx/src/form.scss
+++ b/ui-ngx/src/form.scss
@@ -29,9 +29,11 @@
   @media #{$breakpoint} {
     @include form-row-column;
     .mat-mdc-form-field, tb-unit-input {
-      width: auto;
-      &.medium-width {
+      &:not(.fixed-width) {
         width: auto;
+        &.medium-width {
+          width: auto;
+        }
       }
     }
   }
@@ -55,6 +57,9 @@
     &.no-padding-bottom {
       padding-bottom: 0;
     }
+    &.no-padding-top {
+      padding-top: 0;
+    }
     &.no-padding {
       padding: 0;
     }
@@ -211,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;
@@ -467,6 +484,17 @@
         }
       }
     }
+    &.fixed-height {
+      .mat-mdc-form-field-infix {
+        max-height: 40px;
+        .mat-mdc-select {
+          max-height: 24px;
+          .mat-mdc-select-trigger {
+            max-height: 24px;
+          }
+        }
+      }
+    }
   }
 
   .tb-form-table {
@@ -572,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;
     }
   }
 
@@ -670,4 +702,14 @@
       }
     }
   }
+
+  .mat-mdc-option {
+    &.flex {
+      .mdc-list-item__primary-text {
+        display: flex;
+        align-items: center;
+        justify-content: flex-start;
+      }
+    }
+  }
 }
diff --git a/ui-ngx/yarn.lock b/ui-ngx/yarn.lock
index d78a9a52d6..68e9ea2523 100644
--- a/ui-ngx/yarn.lock
+++ b/ui-ngx/yarn.lock
@@ -2,7 +2,12 @@
 # yarn lockfile v1
 
 
-"@ampproject/remapping@2.2.0", "@ampproject/remapping@^2.1.0", "@ampproject/remapping@^2.2.0":
+"@aashutoshrathi/word-wrap@^1.2.3":
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf"
+  integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==
+
+"@ampproject/remapping@2.2.0":
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.0.tgz#56c133824780de3174aed5ab6834f3026790154d"
   integrity sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==
@@ -10,6 +15,14 @@
     "@jridgewell/gen-mapping" "^0.1.0"
     "@jridgewell/trace-mapping" "^0.3.9"
 
+"@ampproject/remapping@^2.1.0", "@ampproject/remapping@^2.2.0":
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.3.0.tgz#ed441b6fa600072520ce18b43d2c8cc8caecc7f4"
+  integrity sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==
+  dependencies:
+    "@jridgewell/gen-mapping" "^0.3.5"
+    "@jridgewell/trace-mapping" "^0.3.24"
+
 "@angular-builders/custom-webpack@~15.0.0":
   version "15.0.0"
   resolved "https://registry.yarnpkg.com/@angular-builders/custom-webpack/-/custom-webpack-15.0.0.tgz#bc05c5fdc1153ae2f48417f6529034282398940d"
@@ -23,99 +36,23 @@
     tsconfig-paths "^4.1.0"
     webpack-merge "^5.7.3"
 
-"@angular-devkit/architect@0.1502.1", "@angular-devkit/architect@>=0.1500.0 < 0.1600.0":
-  version "0.1502.1"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1502.1.tgz#0ab9919638f61eaa962b1863d99581c52ccfa2a9"
-  integrity sha512-/rtR0U4TJCplpnIfenoTOIn4omPUDDL8iAl6le0qelL2CXdEl6UjMBYF1ILS8OVMLfpEGUXfMLeZgRn0yb7DjA==
-  dependencies:
-    "@angular-devkit/core" "15.2.1"
-    rxjs "6.6.7"
-
-"@angular-devkit/architect@0.1502.8":
-  version "0.1502.8"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1502.8.tgz#9fd3fd27b3a7fc5f8eb65c92500b4d9d15b879e8"
-  integrity sha512-rTltw2ABHrcKc8EGimALvXmrDTP5hlNbEy6nYolJoXEI9EwHgriWrVLVPs3OEF+/ed47dbJi9EGOXUOgzgpB5A==
-  dependencies:
-    "@angular-devkit/core" "15.2.8"
-    rxjs "6.6.7"
-
-"@angular-devkit/build-angular@^15.0.0":
-  version "15.2.1"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-15.2.1.tgz#11dacec9f651e4491bb5d914e8b84dc2e245c955"
-  integrity sha512-EgJqlrig9iuMvqySb4h8h2AAd8OwhBqY2JMMvs+hIASZvJi3n+Qd12BdlqLuAzykRyIAdy3OeLSAaXZrmeSk0A==
+"@angular-devkit/architect@0.1502.10", "@angular-devkit/architect@>=0.1500.0 < 0.1600.0":
+  version "0.1502.10"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1502.10.tgz#4c25ba881635937d922b18e7959b38a476badc82"
+  integrity sha512-S8lN73WYCfpEpw1Q41ZcUinw7JfDeSM8LyGs797OVshnW75QcOkOecWj/3CKR23G44IgFrHN6sqtzWxKmMxLig==
   dependencies:
-    "@ampproject/remapping" "2.2.0"
-    "@angular-devkit/architect" "0.1502.1"
-    "@angular-devkit/build-webpack" "0.1502.1"
-    "@angular-devkit/core" "15.2.1"
-    "@babel/core" "7.20.12"
-    "@babel/generator" "7.20.14"
-    "@babel/helper-annotate-as-pure" "7.18.6"
-    "@babel/helper-split-export-declaration" "7.18.6"
-    "@babel/plugin-proposal-async-generator-functions" "7.20.7"
-    "@babel/plugin-transform-async-to-generator" "7.20.7"
-    "@babel/plugin-transform-runtime" "7.19.6"
-    "@babel/preset-env" "7.20.2"
-    "@babel/runtime" "7.20.13"
-    "@babel/template" "7.20.7"
-    "@discoveryjs/json-ext" "0.5.7"
-    "@ngtools/webpack" "15.2.1"
-    ansi-colors "4.1.3"
-    autoprefixer "10.4.13"
-    babel-loader "9.1.2"
-    babel-plugin-istanbul "6.1.1"
-    browserslist "4.21.5"
-    cacache "17.0.4"
-    chokidar "3.5.3"
-    copy-webpack-plugin "11.0.0"
-    critters "0.0.16"
-    css-loader "6.7.3"
-    esbuild-wasm "0.17.8"
-    glob "8.1.0"
-    https-proxy-agent "5.0.1"
-    inquirer "8.2.4"
-    jsonc-parser "3.2.0"
-    karma-source-map-support "1.4.0"
-    less "4.1.3"
-    less-loader "11.1.0"
-    license-webpack-plugin "4.0.2"
-    loader-utils "3.2.1"
-    magic-string "0.29.0"
-    mini-css-extract-plugin "2.7.2"
-    open "8.4.1"
-    ora "5.4.1"
-    parse5-html-rewriting-stream "7.0.0"
-    piscina "3.2.0"
-    postcss "8.4.21"
-    postcss-loader "7.0.2"
-    resolve-url-loader "5.0.0"
+    "@angular-devkit/core" "15.2.10"
     rxjs "6.6.7"
-    sass "1.58.1"
-    sass-loader "13.2.0"
-    semver "7.3.8"
-    source-map-loader "4.0.1"
-    source-map-support "0.5.21"
-    terser "5.16.3"
-    text-table "0.2.0"
-    tree-kill "1.2.2"
-    tslib "2.5.0"
-    webpack "5.75.0"
-    webpack-dev-middleware "6.0.1"
-    webpack-dev-server "4.11.1"
-    webpack-merge "5.8.0"
-    webpack-subresource-integrity "5.1.0"
-  optionalDependencies:
-    esbuild "0.17.8"
 
-"@angular-devkit/build-angular@^15.2.8":
-  version "15.2.8"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-15.2.8.tgz#5412125b810fee084eb8afc20b9911606ad66170"
-  integrity sha512-TGDnXhhOG6h6TOrWWzfnkha7wYBOXi7iJc1o1w1VKCayE3T6TZZdF847aK66vL9KG7AKYVdGhWEGw2WBHUBUpg==
+"@angular-devkit/build-angular@^15.0.0", "@angular-devkit/build-angular@^15.2.10":
+  version "15.2.10"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-15.2.10.tgz#af4080a4811461bd1cab4f3b1b10edef53f31da8"
+  integrity sha512-3pCPVEJilVwHIJC6Su1/PIEqvFfU1Lxew9yItxX4s6dud8HY+fuKrsDnao4NNMFNqCLqL4el5QbSBKnnpWH1sg==
   dependencies:
     "@ampproject/remapping" "2.2.0"
-    "@angular-devkit/architect" "0.1502.8"
-    "@angular-devkit/build-webpack" "0.1502.8"
-    "@angular-devkit/core" "15.2.8"
+    "@angular-devkit/architect" "0.1502.10"
+    "@angular-devkit/build-webpack" "0.1502.10"
+    "@angular-devkit/core" "15.2.10"
     "@babel/core" "7.20.12"
     "@babel/generator" "7.20.14"
     "@babel/helper-annotate-as-pure" "7.18.6"
@@ -127,7 +64,7 @@
     "@babel/runtime" "7.20.13"
     "@babel/template" "7.20.7"
     "@discoveryjs/json-ext" "0.5.7"
-    "@ngtools/webpack" "15.2.8"
+    "@ngtools/webpack" "15.2.10"
     ansi-colors "4.1.3"
     autoprefixer "10.4.13"
     babel-loader "9.1.2"
@@ -154,13 +91,13 @@
     ora "5.4.1"
     parse5-html-rewriting-stream "7.0.0"
     piscina "3.2.0"
-    postcss "8.4.21"
+    postcss "8.4.31"
     postcss-loader "7.0.2"
     resolve-url-loader "5.0.0"
     rxjs "6.6.7"
     sass "1.58.1"
     sass-loader "13.2.0"
-    semver "7.3.8"
+    semver "7.5.3"
     source-map-loader "4.0.1"
     source-map-support "0.5.21"
     terser "5.16.3"
@@ -175,37 +112,18 @@
   optionalDependencies:
     esbuild "0.17.8"
 
-"@angular-devkit/build-webpack@0.1502.1":
-  version "0.1502.1"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.1502.1.tgz#d0332b620a24a37ce132ef3fb771af3f991c6413"
-  integrity sha512-mQ9dbuoy0U2+caQCRMhUx88fA/WmBt+JkYt8nvtTUyhVTXm5XIVckTlIfqdVk0BCA1lT8AM4yFKmy97bFXuZeQ==
-  dependencies:
-    "@angular-devkit/architect" "0.1502.1"
-    rxjs "6.6.7"
-
-"@angular-devkit/build-webpack@0.1502.8":
-  version "0.1502.8"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.1502.8.tgz#1b375480deef1b0920e1a63d952795bd33bbfb38"
-  integrity sha512-jWtNv+S03FFLDe/C8SPCcRvkz3bSb2R+919IT086Q9axIPQ1VowOEwzt2k3qXPSSrC7GSYuASM+X92dB47NTQQ==
-  dependencies:
-    "@angular-devkit/architect" "0.1502.8"
-    rxjs "6.6.7"
-
-"@angular-devkit/core@15.2.1", "@angular-devkit/core@^15.0.0":
-  version "15.2.1"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-15.2.1.tgz#78b03a134d354df6646a29c718bef6721ac9365e"
-  integrity sha512-m6lj5vvA/L21rUVm4PokK2SXZQE1Hjsw8AMNEaj+RlyVW36ISLm2TeeCdb441siBpLJkW+yA47bC2FUJ8HgsQQ==
+"@angular-devkit/build-webpack@0.1502.10":
+  version "0.1502.10"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.1502.10.tgz#665dfa76a0c6548821fa372356e2c9b55e8eebac"
+  integrity sha512-55b9WZIGU4DNgiIV2lkkN6iQxJrgWY5CDaNu0kJC/qazotJgBbcN/8jgBx2DD8HNE1V3iXxWk66pt1h946Po+Q==
   dependencies:
-    ajv "8.12.0"
-    ajv-formats "2.1.1"
-    jsonc-parser "3.2.0"
+    "@angular-devkit/architect" "0.1502.10"
     rxjs "6.6.7"
-    source-map "0.7.4"
 
-"@angular-devkit/core@15.2.8":
-  version "15.2.8"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-15.2.8.tgz#ff494ae7af137b0f0109deb8ee34f1550ed5cc1d"
-  integrity sha512-Lo4XrbDMtXarKnMrFgWLmQdSX+3QPNAg4otG8cmp/U4jJyjV4dAYKEAsb1sCNGUSM4h4v09EQU/5ugVjDU29lQ==
+"@angular-devkit/core@15.2.10", "@angular-devkit/core@^15.0.0":
+  version "15.2.10"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-15.2.10.tgz#e2c1fadaaa87ae62b3f3c752fa6fafc31197151b"
+  integrity sha512-bFPm7wjvfBds9km2rCJxUhzkqe4h3h/199yJtzC1bNvwRr2LMHvtyoQAzftda+gs7Ulqac5wzUEZX/cVV3WrsA==
   dependencies:
     ajv "8.12.0"
     ajv-formats "2.1.1"
@@ -213,12 +131,12 @@
     rxjs "6.6.7"
     source-map "0.7.4"
 
-"@angular-devkit/schematics@15.2.8":
-  version "15.2.8"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-15.2.8.tgz#c7dfc692e3f54e43085a8845d8c9f390a2519aa3"
-  integrity sha512-w6EUGC96kVsH9f8sEzajzbONMawezyVBiSo+JYp5r25rQArAz/a+KZntbuETWHQ0rQOEsKmUNKxwmr11BaptSQ==
+"@angular-devkit/schematics@15.2.10":
+  version "15.2.10"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-15.2.10.tgz#72ea6ac84082995221781bcb72df3143b4ffddc3"
+  integrity sha512-EeoDs4oKFpLZNa21G/8dqBdclEc4U2piI9EeXCVTaN6z5DYXIZ0G1WtCXU8nhD+GckS47rmfZ4/3lMaXAvED+g==
   dependencies:
-    "@angular-devkit/core" "15.2.8"
+    "@angular-devkit/core" "15.2.10"
     jsonc-parser "3.2.0"
     magic-string "0.29.0"
     ora "5.4.1"
@@ -281,10 +199,10 @@
     "@angular-eslint/bundled-angular-compiler" "15.2.1"
     "@typescript-eslint/utils" "5.48.2"
 
-"@angular/animations@^15.2.9":
-  version "15.2.9"
-  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-15.2.9.tgz#f0773d2071a5a17c03478d5838029b03bbab9a03"
-  integrity sha512-GQujLhI0cQFcl4Q8y0oSYKSRnW23GIeSL+Arl4eFufziJ9hGAAQNuesaNs/7i+9UlTHDMkPH3kd5ScXuYYz6wg==
+"@angular/animations@^15.2.10":
+  version "15.2.10"
+  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-15.2.10.tgz#c9194ba9a2b9b4e466e9c76e18591cde096a28e8"
+  integrity sha512-yxfN8qQpMaukRU5LjFkJBmy85rqrOp86tYVCsf+hmPEFRiXBMUj6xYLeCMcpk3Mt1JtnWGBR34ivGx+7bNeAow==
   dependencies:
     tslib "^2.3.0"
 
@@ -297,15 +215,15 @@
   optionalDependencies:
     parse5 "^7.1.2"
 
-"@angular/cli@^15.2.8":
-  version "15.2.8"
-  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-15.2.8.tgz#612ffd69591aea0109db0a6dd8faec8044a4b80d"
-  integrity sha512-3VlTfm6DUZfFHBY43vQSAaqmFTxy3VtRd/iDBCHcEPhHwYLWBvNwReJuJfNja8O105QQ6DBiYVBExEBtPmjQ4w==
+"@angular/cli@^15.2.10":
+  version "15.2.10"
+  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-15.2.10.tgz#4035a64510e11894be2ff695e48ee0ef6badb494"
+  integrity sha512-/TSnm/ZQML6A4lvunyN2tjTB5utuvk3d1Pnfyehp/FXtV6YfZm6+EZrOpKkKPCxTuAgW6c9KK4yQtt3RuNVpwQ==
   dependencies:
-    "@angular-devkit/architect" "0.1502.8"
-    "@angular-devkit/core" "15.2.8"
-    "@angular-devkit/schematics" "15.2.8"
-    "@schematics/angular" "15.2.8"
+    "@angular-devkit/architect" "0.1502.10"
+    "@angular-devkit/core" "15.2.10"
+    "@angular-devkit/schematics" "15.2.10"
+    "@schematics/angular" "15.2.10"
     "@yarnpkg/lockfile" "1.1.0"
     ansi-colors "4.1.3"
     ini "3.0.1"
@@ -317,21 +235,21 @@
     ora "5.4.1"
     pacote "15.1.0"
     resolve "1.22.1"
-    semver "7.3.8"
+    semver "7.5.3"
     symbol-observable "4.0.0"
     yargs "17.6.2"
 
-"@angular/common@^15.2.9":
-  version "15.2.9"
-  resolved "https://registry.yarnpkg.com/@angular/common/-/common-15.2.9.tgz#5e1d47ce831935bcf545b172f88307aedacf1535"
-  integrity sha512-LM9/UHG2dRrOzlu2KovrFwWIziFMjRxHzSP3Igw6Symw/wIl0kXGq8Fn6RpFP78zmLqnv+IQOoRiby9MCXsI4g==
+"@angular/common@^15.2.10":
+  version "15.2.10"
+  resolved "https://registry.yarnpkg.com/@angular/common/-/common-15.2.10.tgz#897923023c8ca4a361ce218bdee9a3f09060df75"
+  integrity sha512-jdBn3fctkqoNrJn9VLsUHpcCEhCxWSczdsR+BBbD6T0oLl6vMrAVNjPwfBejnlgfWN1KoRU9kgOYsMxa5apIWQ==
   dependencies:
     tslib "^2.3.0"
 
-"@angular/compiler-cli@^15.2.9":
-  version "15.2.9"
-  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-15.2.9.tgz#d9e6013d6a8658e4a210aca7997e70d06f6976a8"
-  integrity sha512-zsbI8G2xHOeYWI0hjFzrI//ZhZV9il/uQW5dAimfwJp06KZDeXZ3PdwY9JQslf6F+saLwOObxy6QMrIVvfjy9w==
+"@angular/compiler-cli@^15.2.10":
+  version "15.2.10"
+  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-15.2.10.tgz#e51013aa0f3da303fc74f8e1948c550d8e74ead5"
+  integrity sha512-mCFIxrs60XicKfA2o42hA7LrQvhybi9BQveWuZn/2iIEOXx7R62Iemz8E21pLWftAZHGxEW3NECfBrY1d3gVmA==
   dependencies:
     "@babel/core" "7.19.3"
     "@jridgewell/sourcemap-codec" "^1.4.14"
@@ -344,17 +262,17 @@
     tslib "^2.3.0"
     yargs "^17.2.1"
 
-"@angular/compiler@^15.2.9":
-  version "15.2.9"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-15.2.9.tgz#3f55e206b0e380c28336d2a233b7132f21d72644"
-  integrity sha512-MoKugbjk+E0wRBj12uvIyDLELlVLonnqjA2+XiF+7FxALIeyds3/qQeEoMmYIqAbN3NnTT5pV92RxWwG4tHFwA==
+"@angular/compiler@^15.2.10":
+  version "15.2.10"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-15.2.10.tgz#bd78f327d12eb5978f9dd05440aa23d4b5b925a9"
+  integrity sha512-M0XkeU0O73UlJZwDvOyp8/apetz9UKj78eTFDseMYJDLcxe6MpkbkxqpsGZnKYDj7LIep8PmCAKEkhtenE82zw==
   dependencies:
     tslib "^2.3.0"
 
-"@angular/core@^15.2.9":
-  version "15.2.9"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-15.2.9.tgz#7cb12cc83fcc92f23196ceac82e07b67b2e02203"
-  integrity sha512-w46Z1yUXCQfKV7XfnamOoLA2VD0MVUUYVrUjO73mHSskDXSXxfZAEHO9kfUS71Cj35PvhP3mbkqWscpea2WeYg==
+"@angular/core@^15.2.10":
+  version "15.2.10"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-15.2.10.tgz#93c1e0d460d21711654c578d2709a402e1822023"
+  integrity sha512-meGGidnitQJGDxYd9/LrqYiVlId+vGaLoiLgJdKBz+o2ZO6OmXQGuNw2VBqf17/Cc0/UjzrOY7+kILNFKkk/WQ==
   dependencies:
     tslib "^2.3.0"
 
@@ -365,17 +283,17 @@
   dependencies:
     tslib "^2.3.0"
 
-"@angular/forms@^15.2.9":
-  version "15.2.9"
-  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-15.2.9.tgz#c3b4b0108f4eb4966ddc5a7ec9913c2ca2c94f00"
-  integrity sha512-sk0pC2EFi2Ohg5J0q0NYptbT+2WOkoiERSMYA39ncDvlSZBWsNlxpkbGUSck7NIxjK2QfcVN1ldGbHlZTFvtqg==
+"@angular/forms@^15.2.10":
+  version "15.2.10"
+  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-15.2.10.tgz#09308e887df2fa4d349300c9d1f05cadfb3872b3"
+  integrity sha512-NIntGsNcN6o8L1txsbWXOf6f3K/CUBizdKsxsYVYGJIXEW5qU6UnWmfAZffNNXsT/XvbgUCjgDwT0cAwcqZPuQ==
   dependencies:
     tslib "^2.3.0"
 
-"@angular/language-service@^15.2.9":
-  version "15.2.9"
-  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-15.2.9.tgz#7a94e3394093a425c757f7b385b4a94edb09178a"
-  integrity sha512-B7lP4q/eHge2lZezOXS96EYzVf4stMCWfOnz7+pUUi0HbF+A5QCV65SWQddS/M+NM2jj8N2L/j+6UCH8lJjTQA==
+"@angular/language-service@^15.2.10":
+  version "15.2.10"
+  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-15.2.10.tgz#829a802aaf40bfab21d71463023a3b517500ffa9"
+  integrity sha512-G0g0teF4pBqLTgfyLcoBl55g91sCZvBK+V4VgTD/hXGpXyMNlNpOsgECSMliGQoJlsRLEugFsSlBNqy7CRoBtw==
 
 "@angular/material@^15.2.9":
   version "15.2.9"
@@ -431,24 +349,24 @@
     "@material/typography" "15.0.0-canary.684e33d25.0"
     tslib "^2.3.0"
 
-"@angular/platform-browser-dynamic@^15.2.9":
-  version "15.2.9"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-15.2.9.tgz#aa31ba63d535ee49fdf3a60fe771503565b4e3c9"
-  integrity sha512-ZIYDM6MShblb8OyV1m4+18lJJ2LCeICmeg2uSbpFYptYBSOClrTiYOOFVDJvn7HLvNzljLs16XPrgyaYVqNpcw==
+"@angular/platform-browser-dynamic@^15.2.10":
+  version "15.2.10"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-15.2.10.tgz#cc9ad3dcded6cb945ee8c4eef14db081dc6c3dfd"
+  integrity sha512-JHP6W+FX715Qv7DhqvfZLuBZXSDJrboiQsR06gUAgDSjAUyhbqmpVg/2YOtgeWpPkzNDtXdPU2PhcRdIv5J3Yg==
   dependencies:
     tslib "^2.3.0"
 
-"@angular/platform-browser@^15.2.9":
-  version "15.2.9"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-15.2.9.tgz#9150645843cc18b084fb5bf7025e6e320c2abe1e"
-  integrity sha512-ufCHeSX+U6d43YOMkn3igwfqtlozoCXADcbyfUEG8m2y9XASobqmCKvdSk/zfl62oyiA8msntWBJVBE2l4xKXg==
+"@angular/platform-browser@^15.2.10":
+  version "15.2.10"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-15.2.10.tgz#ca5a904b4da9e0cf719414db89514ee4221cb93d"
+  integrity sha512-9tbgVGSJqwfrOzT8aA/kWBLNhJSQ9gUg0CJxwFBSJm8VkBUJrszoBlDsnSvlxx8/W2ejNULKHFTXeUzq0O/+RQ==
   dependencies:
     tslib "^2.3.0"
 
-"@angular/router@^15.2.9":
-  version "15.2.9"
-  resolved "https://registry.yarnpkg.com/@angular/router/-/router-15.2.9.tgz#c3879be22bda236eacf97a18a1e8619b51a53d47"
-  integrity sha512-UCbh5DLSDhybv0xKYT7kGQMfOVdyhHIHOZz5EYVebbhste6S+W1LE57vTHq7QtxJsyKBa/WSkaUkCLXD6ntCAg==
+"@angular/router@^15.2.10":
+  version "15.2.10"
+  resolved "https://registry.yarnpkg.com/@angular/router/-/router-15.2.10.tgz#a5d32d769b930e905582ed6c7aa8122e63655738"
+  integrity sha512-LmuqEg0iIXSw7bli6HKJ19cbxP91v37GtRwbGKswyLihqzTgvjBYpvcfMnB5FRQ5LWkTwq5JclkX03dZw290Yg==
   dependencies:
     tslib "^2.3.0"
 
@@ -458,23 +376,24 @@
   integrity sha512-H71nDOOL8Y7kWRLqf6Sums+01Q5msqBW2KhDUTemh1tvY04eSkSXrK0uj/4mmY0Xr16/3zyZmsrxN7CKuRbNRg==
 
 "@auth0/angular-jwt@^5.1.2":
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/@auth0/angular-jwt/-/angular-jwt-5.1.2.tgz#e89ece98b0f6ef6407f35b8b64bcb77c53b0d8e5"
-  integrity sha512-8ulz24cPpEkZb9/AdAaWfYIkomQDbZqvB9LproF/48Klnr30EJx09AYF9sbKTN4qLSgIZSlCb/Y7XQJZ51vSzA==
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/@auth0/angular-jwt/-/angular-jwt-5.2.0.tgz#3a734be51f7f4b1bb85ac2535e987b7e6e706481"
+  integrity sha512-9FS2L0QwGNlxA/zgeehCcsR9CZscouyXkoIj1fODM36A8BLfdzg9k9DWAXUQ2Drjk0AypGAFzeNZR4vsLMhdeQ==
   dependencies:
     tslib "^2.0.0"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a"
-  integrity sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.18.6", "@babel/code-frame@^7.23.5":
+  version "7.23.5"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.23.5.tgz#9009b69a8c602293476ad598ff53e4562e15c244"
+  integrity sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==
   dependencies:
-    "@babel/highlight" "^7.18.6"
+    "@babel/highlight" "^7.23.4"
+    chalk "^2.4.2"
 
-"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.20.1", "@babel/compat-data@^7.20.5":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.21.0.tgz#c241dc454e5b5917e40d37e525e2f4530c399298"
-  integrity sha512-gMuZsmsgxk/ENC3O/fRw5QY8A9/uxQbbCEypnLIiYYc/qVJtEV7ouxC3EllIIwNzMqAQee5tanFabWsUOutS7g==
+"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.20.1", "@babel/compat-data@^7.20.5", "@babel/compat-data@^7.23.5":
+  version "7.23.5"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.23.5.tgz#ffb878728bb6bdcb6f4510aa51b1be9afb8cfd98"
+  integrity sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==
 
 "@babel/core@7.19.3":
   version "7.19.3"
@@ -519,25 +438,25 @@
     semver "^6.3.0"
 
 "@babel/core@^7.12.3":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.21.0.tgz#1341aefdcc14ccc7553fcc688dd8986a2daffc13"
-  integrity sha512-PuxUbxcW6ZYe656yL3EAhpy7qXKq0DmYsrJLpbB8XrsCP9Nm+XCg9XFMb5vIDliPD7+U/+M+QJlH17XOcB7eXA==
+  version "7.24.0"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.24.0.tgz#56cbda6b185ae9d9bed369816a8f4423c5f2ff1b"
+  integrity sha512-fQfkg0Gjkza3nf0c7/w6Xf34BW4YvzNfACRLmmb7XRLa6XHdR+K9AlJlxneFfWYf6uhOzuzZVTjF/8KfndZANw==
   dependencies:
     "@ampproject/remapping" "^2.2.0"
-    "@babel/code-frame" "^7.18.6"
-    "@babel/generator" "^7.21.0"
-    "@babel/helper-compilation-targets" "^7.20.7"
-    "@babel/helper-module-transforms" "^7.21.0"
-    "@babel/helpers" "^7.21.0"
-    "@babel/parser" "^7.21.0"
-    "@babel/template" "^7.20.7"
-    "@babel/traverse" "^7.21.0"
-    "@babel/types" "^7.21.0"
-    convert-source-map "^1.7.0"
+    "@babel/code-frame" "^7.23.5"
+    "@babel/generator" "^7.23.6"
+    "@babel/helper-compilation-targets" "^7.23.6"
+    "@babel/helper-module-transforms" "^7.23.3"
+    "@babel/helpers" "^7.24.0"
+    "@babel/parser" "^7.24.0"
+    "@babel/template" "^7.24.0"
+    "@babel/traverse" "^7.24.0"
+    "@babel/types" "^7.24.0"
+    convert-source-map "^2.0.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
-    json5 "^2.2.2"
-    semver "^6.3.0"
+    json5 "^2.2.3"
+    semver "^6.3.1"
 
 "@babel/generator@7.20.14":
   version "7.20.14"
@@ -548,63 +467,71 @@
     "@jridgewell/gen-mapping" "^0.3.2"
     jsesc "^2.5.1"
 
-"@babel/generator@^7.19.3", "@babel/generator@^7.20.7", "@babel/generator@^7.21.0", "@babel/generator@^7.21.1":
-  version "7.21.1"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.21.1.tgz#951cc626057bc0af2c35cd23e9c64d384dea83dd"
-  integrity sha512-1lT45bAYlQhFn/BHivJs43AiW2rg3/UbLyShGfF3C0KmHvO5fSghWd5kBJy30kpRRucGzXStvnnCFniCR2kXAA==
+"@babel/generator@^7.19.3", "@babel/generator@^7.20.7", "@babel/generator@^7.23.6":
+  version "7.23.6"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.6.tgz#9e1fca4811c77a10580d17d26b57b036133f3c2e"
+  integrity sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==
   dependencies:
-    "@babel/types" "^7.21.0"
+    "@babel/types" "^7.23.6"
     "@jridgewell/gen-mapping" "^0.3.2"
     "@jridgewell/trace-mapping" "^0.3.17"
     jsesc "^2.5.1"
 
-"@babel/helper-annotate-as-pure@7.18.6", "@babel/helper-annotate-as-pure@^7.18.6":
+"@babel/helper-annotate-as-pure@7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz#eaa49f6f80d5a33f9a5dd2276e6d6e451be0a6bb"
   integrity sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==
   dependencies:
     "@babel/types" "^7.18.6"
 
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.18.6":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz#acd4edfd7a566d1d51ea975dff38fd52906981bb"
-  integrity sha512-yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw==
+"@babel/helper-annotate-as-pure@^7.18.6", "@babel/helper-annotate-as-pure@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz#e7f06737b197d580a01edf75d97e2c8be99d3882"
+  integrity sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==
   dependencies:
-    "@babel/helper-explode-assignable-expression" "^7.18.6"
-    "@babel/types" "^7.18.9"
+    "@babel/types" "^7.22.5"
 
-"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9", "@babel/helper-compilation-targets@^7.19.3", "@babel/helper-compilation-targets@^7.20.0", "@babel/helper-compilation-targets@^7.20.7":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz#a6cd33e93629f5eb473b021aac05df62c4cd09bb"
-  integrity sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ==
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.22.15":
+  version "7.22.15"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.15.tgz#5426b109cf3ad47b91120f8328d8ab1be8b0b956"
+  integrity sha512-QkBXwGgaoC2GtGZRoma6kv7Szfv06khvhFav67ZExau2RaXzy8MpHSMO2PNoP2XtmQphJQRHFfg77Bq731Yizw==
   dependencies:
-    "@babel/compat-data" "^7.20.5"
-    "@babel/helper-validator-option" "^7.18.6"
-    browserslist "^4.21.3"
-    lru-cache "^5.1.1"
-    semver "^6.3.0"
+    "@babel/types" "^7.22.15"
 
-"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.21.0":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.21.0.tgz#64f49ecb0020532f19b1d014b03bccaa1ab85fb9"
-  integrity sha512-Q8wNiMIdwsv5la5SPxNYzzkPnjgC0Sy0i7jLkVOCdllu/xcVNkr3TeZzbHBJrj+XXRqzX5uCyCoV9eu6xUG7KQ==
+"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.19.3", "@babel/helper-compilation-targets@^7.20.0", "@babel/helper-compilation-targets@^7.20.7", "@babel/helper-compilation-targets@^7.22.15", "@babel/helper-compilation-targets@^7.23.6":
+  version "7.23.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz#4d79069b16cbcf1461289eccfbbd81501ae39991"
+  integrity sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.18.6"
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-function-name" "^7.21.0"
-    "@babel/helper-member-expression-to-functions" "^7.21.0"
-    "@babel/helper-optimise-call-expression" "^7.18.6"
-    "@babel/helper-replace-supers" "^7.20.7"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0"
-    "@babel/helper-split-export-declaration" "^7.18.6"
+    "@babel/compat-data" "^7.23.5"
+    "@babel/helper-validator-option" "^7.23.5"
+    browserslist "^4.22.2"
+    lru-cache "^5.1.1"
+    semver "^6.3.1"
 
-"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.20.5":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.21.0.tgz#53ff78472e5ce10a52664272a239787107603ebb"
-  integrity sha512-N+LaFW/auRSWdx7SHD/HiARwXQju1vXTW4fKr4u5SgBUTm51OKEjKgj+cs00ggW3kEvNqwErnlwuq7Y3xBe4eg==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.18.6"
+"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.21.0":
+  version "7.24.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.0.tgz#fc7554141bdbfa2d17f7b4b80153b9b090e5d158"
+  integrity sha512-QAH+vfvts51BCsNZ2PhY6HAggnlS6omLLFTsIpeqZk/MmJ6cW7tgz5yRv0fMJThcr6FmbMrENh1RgrWPTYA76g==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-function-name" "^7.23.0"
+    "@babel/helper-member-expression-to-functions" "^7.23.0"
+    "@babel/helper-optimise-call-expression" "^7.22.5"
+    "@babel/helper-replace-supers" "^7.22.20"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.6"
+    semver "^6.3.1"
+
+"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.22.15", "@babel/helper-create-regexp-features-plugin@^7.22.5":
+  version "7.22.15"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.15.tgz#5ee90093914ea09639b01c711db0d6775e558be1"
+  integrity sha512-29FkPLFjn4TPEa3RE7GpW+qbE8tlsu3jntNYNfcGsc49LphF1PQIiD+vMZ1z1xVOKt+93khA9tc2JBs3kBjA7w==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.22.5"
     regexpu-core "^5.3.1"
+    semver "^6.3.1"
 
 "@babel/helper-define-polyfill-provider@^0.3.3":
   version "0.3.3"
@@ -618,179 +545,171 @@
     resolve "^1.14.2"
     semver "^6.1.2"
 
-"@babel/helper-environment-visitor@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz#0c0cee9b35d2ca190478756865bb3528422f51be"
-  integrity sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==
-
-"@babel/helper-explode-assignable-expression@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz#41f8228ef0a6f1a036b8dfdfec7ce94f9a6bc096"
-  integrity sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg==
-  dependencies:
-    "@babel/types" "^7.18.6"
+"@babel/helper-environment-visitor@^7.18.9", "@babel/helper-environment-visitor@^7.22.20":
+  version "7.22.20"
+  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz#96159db61d34a29dba454c959f5ae4a649ba9167"
+  integrity sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==
 
-"@babel/helper-function-name@^7.18.9", "@babel/helper-function-name@^7.19.0", "@babel/helper-function-name@^7.21.0":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz#d552829b10ea9f120969304023cd0645fa00b1b4"
-  integrity sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==
+"@babel/helper-function-name@^7.22.5", "@babel/helper-function-name@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz#1f9a3cdbd5b2698a670c30d2735f9af95ed52759"
+  integrity sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==
   dependencies:
-    "@babel/template" "^7.20.7"
-    "@babel/types" "^7.21.0"
+    "@babel/template" "^7.22.15"
+    "@babel/types" "^7.23.0"
 
-"@babel/helper-hoist-variables@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz#d4d2c8fb4baeaa5c68b99cc8245c56554f926678"
-  integrity sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==
+"@babel/helper-hoist-variables@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz#c01a007dac05c085914e8fb652b339db50d823bb"
+  integrity sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==
   dependencies:
-    "@babel/types" "^7.18.6"
+    "@babel/types" "^7.22.5"
 
-"@babel/helper-member-expression-to-functions@^7.20.7", "@babel/helper-member-expression-to-functions@^7.21.0":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.21.0.tgz#319c6a940431a133897148515877d2f3269c3ba5"
-  integrity sha512-Muu8cdZwNN6mRRNG6lAYErJ5X3bRevgYR2O8wN0yn7jJSnGDu6eG59RfT29JHxGUovyfrh6Pj0XzmR7drNVL3Q==
+"@babel/helper-member-expression-to-functions@^7.22.15", "@babel/helper-member-expression-to-functions@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.23.0.tgz#9263e88cc5e41d39ec18c9a3e0eced59a3e7d366"
+  integrity sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA==
   dependencies:
-    "@babel/types" "^7.21.0"
+    "@babel/types" "^7.23.0"
 
-"@babel/helper-module-imports@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz#1e3ebdbbd08aad1437b428c50204db13c5a3ca6e"
-  integrity sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==
+"@babel/helper-module-imports@^7.18.6", "@babel/helper-module-imports@^7.22.15":
+  version "7.22.15"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz#16146307acdc40cc00c3b2c647713076464bdbf0"
+  integrity sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==
   dependencies:
-    "@babel/types" "^7.18.6"
+    "@babel/types" "^7.22.15"
 
-"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.19.0", "@babel/helper-module-transforms@^7.20.11", "@babel/helper-module-transforms@^7.21.0", "@babel/helper-module-transforms@^7.21.2":
-  version "7.21.2"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.21.2.tgz#160caafa4978ac8c00ac66636cb0fa37b024e2d2"
-  integrity sha512-79yj2AR4U/Oqq/WOV7Lx6hUjau1Zfo4cI+JLAVYeMV5XIlbOhmjEk5ulbTc9fMpmlojzZHkUUxAiK+UKn+hNQQ==
+"@babel/helper-module-transforms@^7.19.0", "@babel/helper-module-transforms@^7.20.11", "@babel/helper-module-transforms@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz#d7d12c3c5d30af5b3c0fcab2a6d5217773e2d0f1"
+  integrity sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==
   dependencies:
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-module-imports" "^7.18.6"
-    "@babel/helper-simple-access" "^7.20.2"
-    "@babel/helper-split-export-declaration" "^7.18.6"
-    "@babel/helper-validator-identifier" "^7.19.1"
-    "@babel/template" "^7.20.7"
-    "@babel/traverse" "^7.21.2"
-    "@babel/types" "^7.21.2"
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-module-imports" "^7.22.15"
+    "@babel/helper-simple-access" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.6"
+    "@babel/helper-validator-identifier" "^7.22.20"
 
-"@babel/helper-optimise-call-expression@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz#9369aa943ee7da47edab2cb4e838acf09d290ffe"
-  integrity sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==
+"@babel/helper-optimise-call-expression@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz#f21531a9ccbff644fdd156b4077c16ff0c3f609e"
+  integrity sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==
   dependencies:
-    "@babel/types" "^7.18.6"
+    "@babel/types" "^7.22.5"
 
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.19.0", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
-  version "7.20.2"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz#d1b9000752b18d0877cff85a5c376ce5c3121629"
-  integrity sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.19.0", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
+  version "7.24.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.0.tgz#945681931a52f15ce879fd5b86ce2dae6d3d7f2a"
+  integrity sha512-9cUznXMG0+FxRuJfvL82QlTqIzhVW9sL0KjMPHhAOOvpQGL8QtdxnBKILjBqxlHyliz0yCa1G903ZXI/FuHy2w==
 
-"@babel/helper-remap-async-to-generator@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz#997458a0e3357080e54e1d79ec347f8a8cd28519"
-  integrity sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA==
+"@babel/helper-remap-async-to-generator@^7.18.9", "@babel/helper-remap-async-to-generator@^7.22.20":
+  version "7.22.20"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.20.tgz#7b68e1cb4fa964d2996fd063723fb48eca8498e0"
+  integrity sha512-pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.18.6"
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-wrap-function" "^7.18.9"
-    "@babel/types" "^7.18.9"
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-wrap-function" "^7.22.20"
 
-"@babel/helper-replace-supers@^7.18.6", "@babel/helper-replace-supers@^7.20.7":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.20.7.tgz#243ecd2724d2071532b2c8ad2f0f9f083bcae331"
-  integrity sha512-vujDMtB6LVfNW13jhlCrp48QNslK6JXi7lQG736HVbHz/mbf4Dc7tIRh1Xf5C0rF7BP8iiSxGMCmY6Ci1ven3A==
+"@babel/helper-replace-supers@^7.22.20":
+  version "7.22.20"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.22.20.tgz#e37d367123ca98fe455a9887734ed2e16eb7a793"
+  integrity sha512-qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw==
   dependencies:
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-member-expression-to-functions" "^7.20.7"
-    "@babel/helper-optimise-call-expression" "^7.18.6"
-    "@babel/template" "^7.20.7"
-    "@babel/traverse" "^7.20.7"
-    "@babel/types" "^7.20.7"
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-member-expression-to-functions" "^7.22.15"
+    "@babel/helper-optimise-call-expression" "^7.22.5"
 
-"@babel/helper-simple-access@^7.20.2":
-  version "7.20.2"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz#0ab452687fe0c2cfb1e2b9e0015de07fc2d62dd9"
-  integrity sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==
+"@babel/helper-simple-access@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz#4938357dc7d782b80ed6dbb03a0fba3d22b1d5de"
+  integrity sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==
   dependencies:
-    "@babel/types" "^7.20.2"
+    "@babel/types" "^7.22.5"
 
-"@babel/helper-skip-transparent-expression-wrappers@^7.20.0":
-  version "7.20.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz#fbe4c52f60518cab8140d77101f0e63a8a230684"
-  integrity sha512-5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg==
+"@babel/helper-skip-transparent-expression-wrappers@^7.20.0", "@babel/helper-skip-transparent-expression-wrappers@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz#007f15240b5751c537c40e77abb4e89eeaaa8847"
+  integrity sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==
   dependencies:
-    "@babel/types" "^7.20.0"
+    "@babel/types" "^7.22.5"
 
-"@babel/helper-split-export-declaration@7.18.6", "@babel/helper-split-export-declaration@^7.18.6":
+"@babel/helper-split-export-declaration@7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz#7367949bc75b20c6d5a5d4a97bba2824ae8ef075"
   integrity sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==
   dependencies:
     "@babel/types" "^7.18.6"
 
-"@babel/helper-string-parser@^7.19.4":
-  version "7.19.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz#38d3acb654b4701a9b77fb0615a96f775c3a9e63"
-  integrity sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==
+"@babel/helper-split-export-declaration@^7.22.6":
+  version "7.22.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c"
+  integrity sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==
+  dependencies:
+    "@babel/types" "^7.22.5"
 
-"@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.19.1":
-  version "7.19.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2"
-  integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==
+"@babel/helper-string-parser@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz#9478c707febcbbe1ddb38a3d91a2e054ae622d83"
+  integrity sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==
 
-"@babel/helper-validator-option@^7.18.6":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz#8224c7e13ace4bafdc4004da2cf064ef42673180"
-  integrity sha512-rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ==
+"@babel/helper-validator-identifier@^7.22.20":
+  version "7.22.20"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0"
+  integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==
+
+"@babel/helper-validator-option@^7.18.6", "@babel/helper-validator-option@^7.23.5":
+  version "7.23.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz#907a3fbd4523426285365d1206c423c4c5520307"
+  integrity sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==
 
-"@babel/helper-wrap-function@^7.18.9":
-  version "7.20.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.20.5.tgz#75e2d84d499a0ab3b31c33bcfe59d6b8a45f62e3"
-  integrity sha512-bYMxIWK5mh+TgXGVqAtnu5Yn1un+v8DDZtqyzKRLUzrh70Eal2O3aZ7aPYiMADO4uKlkzOiRiZ6GX5q3qxvW9Q==
+"@babel/helper-wrap-function@^7.22.20":
+  version "7.22.20"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.22.20.tgz#15352b0b9bfb10fc9c76f79f6342c00e3411a569"
+  integrity sha512-pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw==
   dependencies:
-    "@babel/helper-function-name" "^7.19.0"
-    "@babel/template" "^7.18.10"
-    "@babel/traverse" "^7.20.5"
-    "@babel/types" "^7.20.5"
+    "@babel/helper-function-name" "^7.22.5"
+    "@babel/template" "^7.22.15"
+    "@babel/types" "^7.22.19"
 
-"@babel/helpers@^7.19.0", "@babel/helpers@^7.20.7", "@babel/helpers@^7.21.0":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.21.0.tgz#9dd184fb5599862037917cdc9eecb84577dc4e7e"
-  integrity sha512-XXve0CBtOW0pd7MRzzmoyuSj0e3SEzj8pgyFxnTT1NJZL38BD1MK7yYrm8yefRPIDvNNe14xR4FdbHwpInD4rA==
+"@babel/helpers@^7.19.0", "@babel/helpers@^7.20.7", "@babel/helpers@^7.24.0":
+  version "7.24.0"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.24.0.tgz#a3dd462b41769c95db8091e49cfe019389a9409b"
+  integrity sha512-ulDZdc0Aj5uLc5nETsa7EPx2L7rM0YJM8r7ck7U73AXi7qOV44IHHRAYZHY6iU1rr3C5N4NtTmMRUJP6kwCWeA==
   dependencies:
-    "@babel/template" "^7.20.7"
-    "@babel/traverse" "^7.21.0"
-    "@babel/types" "^7.21.0"
+    "@babel/template" "^7.24.0"
+    "@babel/traverse" "^7.24.0"
+    "@babel/types" "^7.24.0"
 
-"@babel/highlight@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf"
-  integrity sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==
+"@babel/highlight@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.23.4.tgz#edaadf4d8232e1a961432db785091207ead0621b"
+  integrity sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.18.6"
-    chalk "^2.0.0"
+    "@babel/helper-validator-identifier" "^7.22.20"
+    chalk "^2.4.2"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.14.7", "@babel/parser@^7.19.3", "@babel/parser@^7.20.7", "@babel/parser@^7.21.0", "@babel/parser@^7.21.2":
-  version "7.21.2"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.21.2.tgz#dacafadfc6d7654c3051a66d6fe55b6cb2f2a0b3"
-  integrity sha512-URpaIJQwEkEC2T9Kn+Ai6Xe/02iNaVCuT/PtoRz3GPVJVDpPd7mLo+VddTbhCRU9TXqW5mSrQfXZyi8kDKOVpQ==
+"@babel/parser@^7.14.7", "@babel/parser@^7.19.3", "@babel/parser@^7.20.7", "@babel/parser@^7.24.0":
+  version "7.24.0"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.24.0.tgz#26a3d1ff49031c53a97d03b604375f028746a9ac"
+  integrity sha512-QuP/FxEAzMSjXygs8v4N9dvdXzEHN4W1oF3PxuWAtPo08UdM17u89RDMgjLn/mlc56iM0HlLmVkO/wgR+rDgHg==
 
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz#da5b8f9a580acdfbe53494dba45ea389fb09a4d2"
-  integrity sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ==
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.23.3.tgz#5cd1c87ba9380d0afb78469292c954fee5d2411a"
+  integrity sha512-iRkKcCqb7iGnq9+3G6rZ+Ciz5VywC4XNRHe57lKM+jOeYAoR0lVqdeeDRfh0tQcTfw/+vBhHn926FmQhLtlFLQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.18.9":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.20.7.tgz#d9c85589258539a22a901033853101a6198d4ef1"
-  integrity sha512-sbr9+wNE5aXMBBFBICk01tt7sBf2Oc9ikRFEcem/ZORup9IMUdNhW7/wVLEbbtlWOsEubJet46mHAL2C8+2jKQ==
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.23.3.tgz#f6652bb16b94f8f9c20c50941e16e9756898dc5d"
+  integrity sha512-WwlxbfMNdVEpQjZmK5mhm7oSwD3dS6eU+Iwsi4Knl9wAletWem7kaRsGOG+8UEbRyqxY4SS5zvtfXwX+jMxUwQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0"
-    "@babel/plugin-proposal-optional-chaining" "^7.20.7"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
+    "@babel/plugin-transform-optional-chaining" "^7.23.3"
 
 "@babel/plugin-proposal-async-generator-functions@7.20.7", "@babel/plugin-proposal-async-generator-functions@^7.20.1":
   version "7.20.7"
@@ -886,7 +805,7 @@
     "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
 
-"@babel/plugin-proposal-optional-chaining@^7.18.9", "@babel/plugin-proposal-optional-chaining@^7.20.7":
+"@babel/plugin-proposal-optional-chaining@^7.18.9":
   version "7.21.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz#886f5c8978deb7d30f678b2e24346b287234d3ea"
   integrity sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA==
@@ -904,9 +823,9 @@
     "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/plugin-proposal-private-property-in-object@^7.18.6":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0.tgz#19496bd9883dd83c23c7d7fc45dcd9ad02dfa1dc"
-  integrity sha512-ha4zfehbJjc5MmXBlHec1igel5TJXXLDDRbuJ4+XT2TJcyD9/V1919BA8gMvsdHcNMBy4WBUBiRb3nw/EQUtBw==
+  version "7.21.11"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.11.tgz#69d597086b6760c4126525cfa154f34631ff272c"
+  integrity sha512-0QZ8qP/3RLDVBwBFoWAwCtgcDZJVwA5LUJRZU8x2YFfKNuFq161wK3cuGrALu5yiPu+vzwTAg/sMWVNeWeNyaw==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.18.6"
     "@babel/helper-create-class-features-plugin" "^7.21.0"
@@ -957,11 +876,11 @@
     "@babel/helper-plugin-utils" "^7.8.3"
 
 "@babel/plugin-syntax-import-assertions@^7.20.0":
-  version "7.20.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.20.0.tgz#bb50e0d4bea0957235390641209394e87bdb9cc4"
-  integrity sha512-IUh1vakzNoWalR8ch/areW7qFopR2AEw03JlG7BbrDqmQ4X3q9uuipQwSGrUn7oGiemKjtSLDhNtQHzMHr1JdQ==
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.23.3.tgz#9c05a7f592982aff1a2768260ad84bcd3f0c77fc"
+  integrity sha512-lPgDSU+SJLK3xmFDTV2ZRQAiM7UuUjGidwBywFavObCiZc1BeAAcMtHJKUya92hPHO+at63JJPLygilZard8jw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.19.0"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/plugin-syntax-json-strings@^7.8.3":
   version "7.8.3"
@@ -1027,13 +946,13 @@
     "@babel/helper-plugin-utils" "^7.14.5"
 
 "@babel/plugin-transform-arrow-functions@^7.18.6":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.20.7.tgz#bea332b0e8b2dab3dafe55a163d8227531ab0551"
-  integrity sha512-3poA5E7dzDomxj9WXWwuD6A5F3kc7VXwIJO+E+J8qtDtS+pXPAhrgEyh+9GBwBgPq1Z+bB+/JD60lp5jsN7JPQ==
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.23.3.tgz#94c6dcfd731af90f27a79509f9ab7fb2120fc38b"
+  integrity sha512-NzQcQrzaQPkaEwoTm4Mhyl8jI1huEL/WWIEvudjTCMJ9aBZNpsJbMASx7EQECtQQPS/DcnFpo0FIh3LvEO9cxQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-async-to-generator@7.20.7", "@babel/plugin-transform-async-to-generator@^7.18.6":
+"@babel/plugin-transform-async-to-generator@7.20.7":
   version "7.20.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.20.7.tgz#dfee18623c8cb31deb796aa3ca84dda9cea94354"
   integrity sha512-Uo5gwHPT9vgnSXQxqGtpdufUiWp96gk7yiP4Mp5bm1QMkEmLXBO7PAGYbKoJ6DhAwiNkcHFBol/x5zZZkL/t0Q==
@@ -1042,189 +961,207 @@
     "@babel/helper-plugin-utils" "^7.20.2"
     "@babel/helper-remap-async-to-generator" "^7.18.9"
 
+"@babel/plugin-transform-async-to-generator@^7.18.6":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.23.3.tgz#d1f513c7a8a506d43f47df2bf25f9254b0b051fa"
+  integrity sha512-A7LFsKi4U4fomjqXJlZg/u0ft/n8/7n7lpffUP/ZULx/DtV9SGlNKZolHH6PE8Xl1ngCc0M11OaeZptXVkfKSw==
+  dependencies:
+    "@babel/helper-module-imports" "^7.22.15"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-remap-async-to-generator" "^7.22.20"
+
 "@babel/plugin-transform-block-scoped-functions@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz#9187bf4ba302635b9d70d986ad70f038726216a8"
-  integrity sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.23.3.tgz#fe1177d715fb569663095e04f3598525d98e8c77"
+  integrity sha512-vI+0sIaPIO6CNuM9Kk5VmXcMVRiOpDh7w2zZt9GXzmE/9KD70CUEVhvPR/etAeNK/FAEkhxQtXOzVF3EuRL41A==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/plugin-transform-block-scoping@^7.20.2":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.21.0.tgz#e737b91037e5186ee16b76e7ae093358a5634f02"
-  integrity sha512-Mdrbunoh9SxwFZapeHVrwFmri16+oYotcZysSzhNIVDwIAb1UV+kvnxULSYq9J3/q5MDG+4X6w8QVgD1zhBXNQ==
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.4.tgz#b2d38589531c6c80fbe25e6b58e763622d2d3cf5"
+  integrity sha512-0QqbP6B6HOh7/8iNR4CQU2Th/bbRtBp4KS9vcaZd1fZ0wSh5Fyssg0UCIHwxh+ka+pNDREbVLQnHCMHKZfPwfw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/plugin-transform-classes@^7.20.2":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.21.0.tgz#f469d0b07a4c5a7dbb21afad9e27e57b47031665"
-  integrity sha512-RZhbYTCEUAe6ntPehC4hlslPWosNHDox+vAs4On/mCLRLfoDVHf6hVEd7kuxr1RnHwJmxFfUM3cZiZRmPxJPXQ==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.18.6"
-    "@babel/helper-compilation-targets" "^7.20.7"
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-function-name" "^7.21.0"
-    "@babel/helper-optimise-call-expression" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-replace-supers" "^7.20.7"
-    "@babel/helper-split-export-declaration" "^7.18.6"
+  version "7.23.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.23.8.tgz#d08ae096c240347badd68cdf1b6d1624a6435d92"
+  integrity sha512-yAYslGsY1bX6Knmg46RjiCiNSwJKv2IUC8qOdYKqMMr0491SXFhcHqOdRDeCRohOOIzwN/90C6mQ9qAKgrP7dg==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    "@babel/helper-compilation-targets" "^7.23.6"
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-function-name" "^7.23.0"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-replace-supers" "^7.22.20"
+    "@babel/helper-split-export-declaration" "^7.22.6"
     globals "^11.1.0"
 
 "@babel/plugin-transform-computed-properties@^7.18.9":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.20.7.tgz#704cc2fd155d1c996551db8276d55b9d46e4d0aa"
-  integrity sha512-Lz7MvBK6DTjElHAmfu6bfANzKcxpyNPeYBGEafyA6E5HtRpjpZwU+u7Qrgz/2OR0z+5TvKYbPdphfSaAcZBrYQ==
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.23.3.tgz#652e69561fcc9d2b50ba4f7ac7f60dcf65e86474"
+  integrity sha512-dTj83UVTLw/+nbiHqQSFdwO9CbTtwq1DsDqm3CUEtDrZNET5rT5E6bIdTlOftDTDLMYxvxHNEYO4B9SLl8SLZw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/template" "^7.20.7"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/template" "^7.22.15"
 
 "@babel/plugin-transform-destructuring@^7.20.2":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.20.7.tgz#8bda578f71620c7de7c93af590154ba331415454"
-  integrity sha512-Xwg403sRrZb81IVB79ZPqNQME23yhugYVqgTxAhT99h485F4f+GMELFhhOsscDUB7HCswepKeCKLn/GZvUKoBA==
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.3.tgz#8c9ee68228b12ae3dff986e56ed1ba4f3c446311"
+  integrity sha512-n225npDqjDIr967cMScVKHXJs7rout1q+tt50inyBCPkyZ8KxeI6d+GIbSBTT/w/9WdlWDOej3V9HE5Lgk57gw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/plugin-transform-dotall-regex@^7.18.6", "@babel/plugin-transform-dotall-regex@^7.4.4":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz#b286b3e7aae6c7b861e45bed0a2fafd6b1a4fef8"
-  integrity sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg==
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.23.3.tgz#3f7af6054882ede89c378d0cf889b854a993da50"
+  integrity sha512-vgnFYDHAKzFaTVp+mneDsIEbnJ2Np/9ng9iviHw3P/KVcgONxpNULEW/51Z/BaFojG2GI2GwwXck5uV1+1NOYQ==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-create-regexp-features-plugin" "^7.22.15"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/plugin-transform-duplicate-keys@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz#687f15ee3cdad6d85191eb2a372c4528eaa0ae0e"
-  integrity sha512-d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw==
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.23.3.tgz#664706ca0a5dfe8d066537f99032fc1dc8b720ce"
+  integrity sha512-RrqQ+BQmU3Oyav3J+7/myfvRCq7Tbz+kKLLshUmMwNlDHExbGL7ARhajvoBJEvc+fCguPPu887N+3RRXBVKZUA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/plugin-transform-exponentiation-operator@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz#421c705f4521888c65e91fdd1af951bfefd4dacd"
-  integrity sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw==
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.23.3.tgz#ea0d978f6b9232ba4722f3dbecdd18f450babd18"
+  integrity sha512-5fhCsl1odX96u7ILKHBj4/Y8vipoqwsJMh4csSA8qFfxrZDEA4Ssku2DyNvMJSmZNOEBT750LfFPbtrnTP90BQ==
   dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.22.15"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/plugin-transform-for-of@^7.18.8":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.21.0.tgz#964108c9988de1a60b4be2354a7d7e245f36e86e"
-  integrity sha512-LlUYlydgDkKpIY7mcBWvyPPmMcOphEyYA27Ef4xpbh1IiDNLr0kZsos2nf92vz3IccvJI25QUwp86Eo5s6HmBQ==
+  version "7.23.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.23.6.tgz#81c37e24171b37b370ba6aaffa7ac86bcb46f94e"
+  integrity sha512-aYH4ytZ0qSuBbpfhuofbg/e96oQ7U2w1Aw/UQmKT+1l39uEhUPoFS3fHevDc1G0OvewyDudfMKY1OulczHzWIw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
 
 "@babel/plugin-transform-function-name@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz#cc354f8234e62968946c61a46d6365440fc764e0"
-  integrity sha512-WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ==
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.23.3.tgz#8f424fcd862bf84cb9a1a6b42bc2f47ed630f8dc"
+  integrity sha512-I1QXp1LxIvt8yLaib49dRW5Okt7Q4oaxao6tFVKS/anCdEOMtYwWVKoiOA1p34GOWIZjUK0E+zCp7+l1pfQyiw==
   dependencies:
-    "@babel/helper-compilation-targets" "^7.18.9"
-    "@babel/helper-function-name" "^7.18.9"
-    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-compilation-targets" "^7.22.15"
+    "@babel/helper-function-name" "^7.23.0"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/plugin-transform-literals@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz#72796fdbef80e56fba3c6a699d54f0de557444bc"
-  integrity sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg==
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.23.3.tgz#8214665f00506ead73de157eba233e7381f3beb4"
+  integrity sha512-wZ0PIXRxnwZvl9AYpqNUxpZ5BiTGrYt7kueGQ+N5FiQ7RCOD4cm8iShd6S6ggfVIWaJf2EMk8eRzAh52RfP4rQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/plugin-transform-member-expression-literals@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz#ac9fdc1a118620ac49b7e7a5d2dc177a1bfee88e"
-  integrity sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA==
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.23.3.tgz#e37b3f0502289f477ac0e776b05a833d853cabcc"
+  integrity sha512-sC3LdDBDi5x96LA+Ytekz2ZPk8i/Ck+DEuDbRAll5rknJ5XRTSaPKEYwomLcs1AA8wg9b3KjIQRsnApj+q51Ag==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/plugin-transform-modules-amd@^7.19.6":
-  version "7.20.11"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.20.11.tgz#3daccca8e4cc309f03c3a0c4b41dc4b26f55214a"
-  integrity sha512-NuzCt5IIYOW0O30UvqktzHYR2ud5bOWbY0yaxWZ6G+aFzOMJvrs5YHNikrbdaT15+KNO31nPOy5Fim3ku6Zb5g==
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.23.3.tgz#e19b55436a1416829df0a1afc495deedfae17f7d"
+  integrity sha512-vJYQGxeKM4t8hYCKVBlZX/gtIY2I7mRGFNcm85sgXGMTBcoV3QdVtdpbcWEbzbfUIUZKwvgFT82mRvaQIebZzw==
   dependencies:
-    "@babel/helper-module-transforms" "^7.20.11"
-    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-module-transforms" "^7.23.3"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/plugin-transform-modules-commonjs@^7.19.6":
-  version "7.21.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.21.2.tgz#6ff5070e71e3192ef2b7e39820a06fb78e3058e7"
-  integrity sha512-Cln+Yy04Gxua7iPdj6nOV96smLGjpElir5YwzF0LBPKoPlLDNJePNlrGGaybAJkd0zKRnOVXOgizSqPYMNYkzA==
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.3.tgz#661ae831b9577e52be57dd8356b734f9700b53b4"
+  integrity sha512-aVS0F65LKsdNOtcz6FRCpE4OgsP2OFnW46qNxNIX9h3wuzaNcSQsJysuMwqSibC98HPrf2vCgtxKNwS0DAlgcA==
   dependencies:
-    "@babel/helper-module-transforms" "^7.21.2"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-simple-access" "^7.20.2"
+    "@babel/helper-module-transforms" "^7.23.3"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-simple-access" "^7.22.5"
 
 "@babel/plugin-transform-modules-systemjs@^7.19.6":
-  version "7.20.11"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.20.11.tgz#467ec6bba6b6a50634eea61c9c232654d8a4696e"
-  integrity sha512-vVu5g9BPQKSFEmvt2TA4Da5N+QVS66EX21d8uoOihC+OCpUoGvzVsXeqFdtAEfVa5BILAeFt+U7yVmLbQnAJmw==
+  version "7.23.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.9.tgz#105d3ed46e4a21d257f83a2f9e2ee4203ceda6be"
+  integrity sha512-KDlPRM6sLo4o1FkiSlXoAa8edLXFsKKIda779fbLrvmeuc3itnjCtaO6RrtoaANsIJANj+Vk1zqbZIMhkCAHVw==
   dependencies:
-    "@babel/helper-hoist-variables" "^7.18.6"
-    "@babel/helper-module-transforms" "^7.20.11"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-validator-identifier" "^7.19.1"
+    "@babel/helper-hoist-variables" "^7.22.5"
+    "@babel/helper-module-transforms" "^7.23.3"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-validator-identifier" "^7.22.20"
 
 "@babel/plugin-transform-modules-umd@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz#81d3832d6034b75b54e62821ba58f28ed0aab4b9"
-  integrity sha512-dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ==
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.23.3.tgz#5d4395fccd071dfefe6585a4411aa7d6b7d769e9"
+  integrity sha512-zHsy9iXX2nIsCBFPud3jKn1IRPWg3Ing1qOZgeKV39m1ZgIdpJqvlWVeiHBZC6ITRG0MfskhYe9cLgntfSFPIg==
   dependencies:
-    "@babel/helper-module-transforms" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-module-transforms" "^7.23.3"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/plugin-transform-named-capturing-groups-regex@^7.19.1":
-  version "7.20.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.20.5.tgz#626298dd62ea51d452c3be58b285d23195ba69a8"
-  integrity sha512-mOW4tTzi5iTLnw+78iEq3gr8Aoq4WNRGpmSlrogqaiCBoR1HFhpU4JkpQFOHfeYx3ReVIFWOQJS4aZBRvuZ6mA==
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.5.tgz#67fe18ee8ce02d57c855185e27e3dc959b2e991f"
+  integrity sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.20.5"
-    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-create-regexp-features-plugin" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/plugin-transform-new-target@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz#d128f376ae200477f37c4ddfcc722a8a1b3246a8"
-  integrity sha512-DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw==
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.23.3.tgz#5491bb78ed6ac87e990957cea367eab781c4d980"
+  integrity sha512-YJ3xKqtJMAT5/TIZnpAR3I+K+WaDowYbN3xyxI8zxx/Gsypwf9B9h0VB+1Nh6ACAAPRS5NSRje0uVv5i79HYGQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/plugin-transform-object-super@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz#fb3c6ccdd15939b6ff7939944b51971ddc35912c"
-  integrity sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA==
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.23.3.tgz#81fdb636dcb306dd2e4e8fd80db5b2362ed2ebcd"
+  integrity sha512-BwQ8q0x2JG+3lxCVFohg+KbQM7plfpBwThdW9A6TMtWwLsbDA01Ek2Zb/AgDN39BiZsExm4qrXxjk+P1/fzGrA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-    "@babel/helper-replace-supers" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-replace-supers" "^7.22.20"
+
+"@babel/plugin-transform-optional-chaining@^7.23.3":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.4.tgz#6acf61203bdfc4de9d4e52e64490aeb3e52bd017"
+  integrity sha512-ZU8y5zWOfjM5vZ+asjgAPwDaBjJzgufjES89Rs4Lpq63O300R/kOz30WCLo6BxxX6QVEilwSlpClnG5cZaikTA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
 
 "@babel/plugin-transform-parameters@^7.20.1", "@babel/plugin-transform-parameters@^7.20.7":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.20.7.tgz#0ee349e9d1bc96e78e3b37a7af423a4078a7083f"
-  integrity sha512-WiWBIkeHKVOSYPO0pWkxGPfKeWrCJyD3NJ53+Lrp/QMSZbsVPovrVl2aWZ19D/LTVnaDv5Ap7GJ/B2CTOZdrfA==
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.23.3.tgz#83ef5d1baf4b1072fa6e54b2b0999a7b2527e2af"
+  integrity sha512-09lMt6UsUb3/34BbECKVbVwrT9bO6lILWln237z7sLaWnMsTi7Yc9fhX5DLpkJzAGfaReXI22wP41SZmnAA3Vw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/plugin-transform-property-literals@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz#e22498903a483448e94e032e9bbb9c5ccbfc93a3"
-  integrity sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg==
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.23.3.tgz#54518f14ac4755d22b92162e4a852d308a560875"
+  integrity sha512-jR3Jn3y7cZp4oEWPFAlRsSWjxKe4PZILGBSd4nis1TsC5qeSpb+nrtihJuDhNI7QHiVbUaiXa0X2RZY3/TI6Nw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/plugin-transform-regenerator@^7.18.6":
-  version "7.20.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.20.5.tgz#57cda588c7ffb7f4f8483cc83bdcea02a907f04d"
-  integrity sha512-kW/oO7HPBtntbsahzQ0qSE3tFvkFwnbozz3NWFhLGqH75vLEg+sCGngLlhVkePlCs3Jv0dBBHDzCHxNiFAQKCQ==
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.23.3.tgz#141afd4a2057298602069fce7f2dc5173e6c561c"
+  integrity sha512-KP+75h0KghBMcVpuKisx3XTu9Ncut8Q8TuvGO4IhY+9D5DFEckQefOuIsB/gQ2tG71lCke4NMrtIPS8pOj18BQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
-    regenerator-transform "^0.15.1"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    regenerator-transform "^0.15.2"
 
 "@babel/plugin-transform-reserved-words@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz#b1abd8ebf8edaa5f7fe6bbb8d2133d23b6a6f76a"
-  integrity sha512-oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA==
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.23.3.tgz#4130dcee12bd3dd5705c587947eb715da12efac8"
+  integrity sha512-QnNTazY54YqgGxwIexMZva9gqbPa15t/x9VS+0fsEFWplwVpXYZivtgl43Z1vMpc1bdPP2PP8siFeVcnFvA3Cg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/plugin-transform-runtime@7.19.6":
   version "7.19.6"
@@ -1239,55 +1176,55 @@
     semver "^6.3.0"
 
 "@babel/plugin-transform-shorthand-properties@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz#6d6df7983d67b195289be24909e3f12a8f664dc9"
-  integrity sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.23.3.tgz#97d82a39b0e0c24f8a981568a8ed851745f59210"
+  integrity sha512-ED2fgqZLmexWiN+YNFX26fx4gh5qHDhn1O2gvEhreLW2iI63Sqm4llRLCXALKrCnbN4Jy0VcMQZl/SAzqug/jg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/plugin-transform-spread@^7.19.0":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.20.7.tgz#c2d83e0b99d3bf83e07b11995ee24bf7ca09401e"
-  integrity sha512-ewBbHQ+1U/VnH1fxltbJqDeWBU1oNLG8Dj11uIv3xVf7nrQu0bPGe5Rf716r7K5Qz+SqtAOVswoVunoiBtGhxw==
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.23.3.tgz#41d17aacb12bde55168403c6f2d6bdca563d362c"
+  integrity sha512-VvfVYlrlBVu+77xVTOAoxQ6mZbnIq5FM0aGBSFEcIh03qHf+zNqA4DC/3XMUozTg7bZV3e3mZQ0i13VB6v5yUg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
 
 "@babel/plugin-transform-sticky-regex@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz#c6706eb2b1524028e317720339583ad0f444adcc"
-  integrity sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q==
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.23.3.tgz#dec45588ab4a723cb579c609b294a3d1bd22ff04"
+  integrity sha512-HZOyN9g+rtvnOU3Yh7kSxXrKbzgrm5X4GncPY1QOquu7epga5MxKHVpYu2hvQnry/H+JjckSYRb93iNfsioAGg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/plugin-transform-template-literals@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz#04ec6f10acdaa81846689d63fae117dd9c243a5e"
-  integrity sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA==
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.23.3.tgz#5f0f028eb14e50b5d0f76be57f90045757539d07"
+  integrity sha512-Flok06AYNp7GV2oJPZZcP9vZdszev6vPBkHLwxwSpaIqx75wn6mUd3UFWsSsA0l8nXAKkyCmL/sR02m8RYGeHg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/plugin-transform-typeof-symbol@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz#c8cea68263e45addcd6afc9091429f80925762c0"
-  integrity sha512-SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw==
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.23.3.tgz#9dfab97acc87495c0c449014eb9c547d8966bca4"
+  integrity sha512-4t15ViVnaFdrPC74be1gXBSMzXk3B4Us9lP7uLRQHTFpV5Dvt33pn+2MyyNxmN3VTTm3oTrZVMUmuw3oBnQ2oQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/plugin-transform-unicode-escapes@^7.18.10":
-  version "7.18.10"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz#1ecfb0eda83d09bbcb77c09970c2dd55832aa246"
-  integrity sha512-kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ==
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.23.3.tgz#1f66d16cab01fab98d784867d24f70c1ca65b925"
+  integrity sha512-OMCUx/bU6ChE3r4+ZdylEqAjaQgHAgipgW8nsCfu5pGqDcFytVd91AwRvUJSBZDz0exPGgnjoqhgRYLRjFZc9Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/plugin-transform-unicode-regex@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz#194317225d8c201bbae103364ffe9e2cea36cdca"
-  integrity sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA==
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.23.3.tgz#26897708d8f42654ca4ce1b73e96140fbad879dc"
+  integrity sha512-wMHpNA4x2cIA32b/ci3AfwNgheiva2W0WUKWTK7vBHBhDKfPsc5cFGNWm69WBqpwd86u1qwZ9PWevKqm1A3yAw==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-create-regexp-features-plugin" "^7.22.15"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/preset-env@7.20.2":
   version "7.20.2"
@@ -1371,9 +1308,9 @@
     semver "^6.3.0"
 
 "@babel/preset-modules@^0.1.5":
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.5.tgz#ef939d6e7f268827e1841638dc6ff95515e115d9"
-  integrity sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.6.tgz#31bcdd8f19538437339d17af00d177d854d9d458"
+  integrity sha512-ID2yj6K/4lKfhuU3+EX4UvNbIt7eACFbHmNUjzA+ep+B5971CknnA/9DEWKbRokfbbtblxxxXFJJrH47UEAMVg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-proposal-unicode-property-regex" "^7.4.4"
@@ -1394,13 +1331,13 @@
     regenerator-runtime "^0.13.11"
 
 "@babel/runtime@^7.10.1", "@babel/runtime@^7.11.1", "@babel/runtime@^7.18.3", "@babel/runtime@^7.20.0", "@babel/runtime@^7.20.7", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.0", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.21.0.tgz#5b55c9d394e5fcf304909a8b00c07dc217b56673"
-  integrity sha512-xwII0//EObnq89Ji5AKYQaRYiW/nZ3llSv29d49IuxPhKbtJoLP+9QUUZ4nVragQVtaVGeZrpB+ZtG/Pdy/POw==
+  version "7.24.0"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.0.tgz#584c450063ffda59697021430cb47101b085951e"
+  integrity sha512-Chk32uHMg6TnQdvw2e9IlqPpFX/6NLuK0Ys2PqLb7/gL5uFn9mXvK715FGLlOLQrcO4qIkNHkvPGktzzXexsFw==
   dependencies:
-    regenerator-runtime "^0.13.11"
+    regenerator-runtime "^0.14.0"
 
-"@babel/template@7.20.7", "@babel/template@^7.18.10", "@babel/template@^7.20.7":
+"@babel/template@7.20.7":
   version "7.20.7"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz#a15090c2839a83b02aa996c0b4994005841fd5a8"
   integrity sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==
@@ -1409,35 +1346,44 @@
     "@babel/parser" "^7.20.7"
     "@babel/types" "^7.20.7"
 
-"@babel/traverse@^7.19.3", "@babel/traverse@^7.20.12", "@babel/traverse@^7.20.5", "@babel/traverse@^7.20.7", "@babel/traverse@^7.21.0", "@babel/traverse@^7.21.2":
-  version "7.21.2"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.21.2.tgz#ac7e1f27658750892e815e60ae90f382a46d8e75"
-  integrity sha512-ts5FFU/dSUPS13tv8XiEObDu9K+iagEKME9kAbaP7r0Y9KtZJZ+NGndDvWoRAYNpeWafbpFeki3q9QoMD6gxyw==
-  dependencies:
-    "@babel/code-frame" "^7.18.6"
-    "@babel/generator" "^7.21.1"
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-function-name" "^7.21.0"
-    "@babel/helper-hoist-variables" "^7.18.6"
-    "@babel/helper-split-export-declaration" "^7.18.6"
-    "@babel/parser" "^7.21.2"
-    "@babel/types" "^7.21.2"
-    debug "^4.1.0"
+"@babel/template@^7.18.10", "@babel/template@^7.20.7", "@babel/template@^7.22.15", "@babel/template@^7.24.0":
+  version "7.24.0"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.24.0.tgz#c6a524aa93a4a05d66aaf31654258fae69d87d50"
+  integrity sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==
+  dependencies:
+    "@babel/code-frame" "^7.23.5"
+    "@babel/parser" "^7.24.0"
+    "@babel/types" "^7.24.0"
+
+"@babel/traverse@^7.19.3", "@babel/traverse@^7.20.12", "@babel/traverse@^7.24.0":
+  version "7.24.0"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.24.0.tgz#4a408fbf364ff73135c714a2ab46a5eab2831b1e"
+  integrity sha512-HfuJlI8qq3dEDmNU5ChzzpZRWq+oxCZQyMzIMEqLho+AQnhMnKQUzH6ydo3RBl/YjPCuk68Y6s0Gx0AeyULiWw==
+  dependencies:
+    "@babel/code-frame" "^7.23.5"
+    "@babel/generator" "^7.23.6"
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-function-name" "^7.23.0"
+    "@babel/helper-hoist-variables" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.6"
+    "@babel/parser" "^7.24.0"
+    "@babel/types" "^7.24.0"
+    debug "^4.3.1"
     globals "^11.1.0"
 
-"@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.3", "@babel/types@^7.20.0", "@babel/types@^7.20.2", "@babel/types@^7.20.5", "@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.21.2", "@babel/types@^7.4.4":
-  version "7.21.2"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.21.2.tgz#92246f6e00f91755893c2876ad653db70c8310d1"
-  integrity sha512-3wRZSs7jiFaB8AjxiiD+VqN5DTG2iRvJGQ+qYFrs/654lg6kGTQWIOFjlBo5RaXuAZjBmP3+OQH4dmhqiiyYxw==
+"@babel/types@^7.18.6", "@babel/types@^7.19.3", "@babel/types@^7.20.2", "@babel/types@^7.20.7", "@babel/types@^7.22.15", "@babel/types@^7.22.19", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.23.6", "@babel/types@^7.24.0", "@babel/types@^7.4.4":
+  version "7.24.0"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.24.0.tgz#3b951f435a92e7333eba05b7566fd297960ea1bf"
+  integrity sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==
   dependencies:
-    "@babel/helper-string-parser" "^7.19.4"
-    "@babel/helper-validator-identifier" "^7.19.1"
+    "@babel/helper-string-parser" "^7.23.4"
+    "@babel/helper-validator-identifier" "^7.22.20"
     to-fast-properties "^2.0.0"
 
 "@braintree/sanitize-url@^6.0.0":
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/@braintree/sanitize-url/-/sanitize-url-6.0.2.tgz#6110f918d273fe2af8ea1c4398a88774bb9fc12f"
-  integrity sha512-Tbsj02wXCbqGmzdnXNk0SOF19ChhRU70BsroIi4Pm6Ehp56in6vch94mfbdQ17DozxkL3BAVjbZ4Qc1a0HFRAg==
+  version "6.0.4"
+  resolved "https://registry.yarnpkg.com/@braintree/sanitize-url/-/sanitize-url-6.0.4.tgz#923ca57e173c6b232bbbb07347b1be982f03e783"
+  integrity sha512-s3jaWicZd0pkP0jf5ysyHUI/RE7MHos6qlToFcGWXVp+ykHOy77OUMrfbgJ9it2C5bow7OIQwYYaHjk9XlBQ2A==
 
 "@colors/colors@1.5.0":
   version "1.5.0"
@@ -1473,14 +1419,14 @@
   resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.8.0.tgz#bbbff68978fefdbe68ccb533bc8cbe1d1afb5413"
   integrity sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==
 
-"@es-joy/jsdoccomment@~0.36.1":
-  version "0.36.1"
-  resolved "https://registry.yarnpkg.com/@es-joy/jsdoccomment/-/jsdoccomment-0.36.1.tgz#c37db40da36e4b848da5fd427a74bae3b004a30f"
-  integrity sha512-922xqFsTpHs6D0BUiG4toiyPOMc8/jafnWKxz1KWgS4XzKPy2qXf1Pe6UFuNSCQqt6tOuhAWXBNuuyUhJmw9Vg==
+"@es-joy/jsdoccomment@~0.42.0":
+  version "0.42.0"
+  resolved "https://registry.yarnpkg.com/@es-joy/jsdoccomment/-/jsdoccomment-0.42.0.tgz#59e878708336aaee88c2b34c894f73dbf77ae2b0"
+  integrity sha512-R1w57YlVA6+YE01wch3GPYn6bCsrOV3YW/5oGGE2tmX6JcL9Nr+b5IikrjMPF+v9CV3ay+obImEdsDhovhJrzw==
   dependencies:
-    comment-parser "1.3.1"
-    esquery "^1.4.0"
-    jsdoc-type-pratt-parser "~3.1.0"
+    comment-parser "1.4.1"
+    esquery "^1.5.0"
+    jsdoc-type-pratt-parser "~4.0.0"
 
 "@esbuild/android-arm64@0.17.8":
   version "0.17.8"
@@ -1599,19 +1545,19 @@
   dependencies:
     eslint-visitor-keys "^3.3.0"
 
-"@eslint-community/regexpp@^4.4.0":
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.5.0.tgz#f6f729b02feee2c749f57e334b7a1b5f40a81724"
-  integrity sha512-vITaYzIcNmjn5tF5uxcZ/ft7/RXGrMUIS9HalWckEOF6ESiwXKoMzAQf2UW0aVd6rnOeExTJVd5hmWXucBKGXQ==
+"@eslint-community/regexpp@^4.4.0", "@eslint-community/regexpp@^4.6.1":
+  version "4.10.0"
+  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.10.0.tgz#548f6de556857c8bb73bbee70c35dc82a2e74d63"
+  integrity sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==
 
-"@eslint/eslintrc@^2.0.2":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.0.2.tgz#01575e38707add677cf73ca1589abba8da899a02"
-  integrity sha512-3W4f5tDUra+pA+FzgugqL2pRimUTDJWKr7BINqOpkZrC0uYI0NIc0/JFgBROCU07HR6GieA5m3/rsPIhDmCXTQ==
+"@eslint/eslintrc@^2.1.4":
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.4.tgz#388a269f0f25c1b6adc317b5a2c55714894c70ad"
+  integrity sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==
   dependencies:
     ajv "^6.12.4"
     debug "^4.3.2"
-    espree "^9.5.1"
+    espree "^9.6.0"
     globals "^13.19.0"
     ignore "^5.2.0"
     import-fresh "^3.2.1"
@@ -1619,10 +1565,10 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
-"@eslint/js@8.37.0":
-  version "8.37.0"
-  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.37.0.tgz#cf1b5fa24217fe007f6487a26d765274925efa7d"
-  integrity sha512-x5vzdtOOGgFVDCUs81QRB2+liax8rFg3+7hqM+QhBG0/G3F1ZsoYl97UrqgHgQ9KKT7G6c4V+aTUCgu/n22v1A==
+"@eslint/js@8.57.0":
+  version "8.57.0"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.0.tgz#a5417ae8427873f1dd08b70b3574b453e67b5f7f"
+  integrity sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==
 
 "@flowjs/flow.js@^2.14.1":
   version "2.14.1"
@@ -1636,12 +1582,7 @@
   dependencies:
     tslib "^2.2.0"
 
-"@gar/promisify@^1.1.3":
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
-  integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
-
-"@geoman-io/leaflet-geoman-free@^2.13.0":
+"@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==
@@ -1653,13 +1594,13 @@
     lodash "4.17.21"
     polygon-clipping "0.15.3"
 
-"@humanwhocodes/config-array@^0.11.8":
-  version "0.11.8"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.8.tgz#03595ac2075a4dc0f191cc2131de14fbd7d410b9"
-  integrity sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==
+"@humanwhocodes/config-array@^0.11.14":
+  version "0.11.14"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.14.tgz#d78e481a039f7566ecc9660b4ea7fe6b1fec442b"
+  integrity sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==
   dependencies:
-    "@humanwhocodes/object-schema" "^1.2.1"
-    debug "^4.1.1"
+    "@humanwhocodes/object-schema" "^2.0.2"
+    debug "^4.3.1"
     minimatch "^3.0.5"
 
 "@humanwhocodes/module-importer@^1.0.1":
@@ -1667,15 +1608,15 @@
   resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
   integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
 
-"@humanwhocodes/object-schema@^1.2.1":
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
-  integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
+"@humanwhocodes/object-schema@^2.0.2":
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.2.tgz#d9fae00a2d5cb40f92cfe64b47ad749fbc38f917"
+  integrity sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==
 
 "@iplab/ngx-color-picker@^15.0.2":
-  version "15.0.2"
-  resolved "https://registry.yarnpkg.com/@iplab/ngx-color-picker/-/ngx-color-picker-15.0.2.tgz#856bf2571378e792e5e42b566ac1aa79a9262763"
-  integrity sha512-wum0Hg4Ky/6mhvzolEpFpjGckOjN8L2nkXvy3mWUVclFHP9MZqqgpJaxghtax7/tMdEWQnwQI3PYsNyKfF15ug==
+  version "15.1.0"
+  resolved "https://registry.yarnpkg.com/@iplab/ngx-color-picker/-/ngx-color-picker-15.1.0.tgz#7520cb4c58f06ec68006b103214f9a649d14b15f"
+  integrity sha512-pL/GxDcMQpOe5CVoRa2iNgpnYS4N+S6Gr/7RkCnOJsWEm+OOcf4K4X2BxhKZK+uF6jBFata+u8pwJv9VgCitnQ==
   dependencies:
     tslib "^2.3.0"
 
@@ -1708,37 +1649,37 @@
     "@jridgewell/set-array" "^1.0.0"
     "@jridgewell/sourcemap-codec" "^1.4.10"
 
-"@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2":
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9"
-  integrity sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==
+"@jridgewell/gen-mapping@^0.3.2", "@jridgewell/gen-mapping@^0.3.5":
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz#dcce6aff74bdf6dad1a95802b69b04a2fcb1fb36"
+  integrity sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==
   dependencies:
-    "@jridgewell/set-array" "^1.0.1"
+    "@jridgewell/set-array" "^1.2.1"
     "@jridgewell/sourcemap-codec" "^1.4.10"
-    "@jridgewell/trace-mapping" "^0.3.9"
+    "@jridgewell/trace-mapping" "^0.3.24"
 
-"@jridgewell/resolve-uri@3.1.0", "@jridgewell/resolve-uri@^3.0.3":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78"
-  integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==
+"@jridgewell/resolve-uri@^3.0.3", "@jridgewell/resolve-uri@^3.1.0":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz#7a0ee601f60f99a20c7c7c5ff0c80388c1189bd6"
+  integrity sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==
 
-"@jridgewell/set-array@^1.0.0", "@jridgewell/set-array@^1.0.1":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72"
-  integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==
+"@jridgewell/set-array@^1.0.0", "@jridgewell/set-array@^1.2.1":
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.2.1.tgz#558fb6472ed16a4c850b889530e6b36438c49280"
+  integrity sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==
 
-"@jridgewell/source-map@^0.3.2":
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.2.tgz#f45351aaed4527a298512ec72f81040c998580fb"
-  integrity sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==
+"@jridgewell/source-map@^0.3.2", "@jridgewell/source-map@^0.3.3":
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.6.tgz#9d71ca886e32502eb9362c9a74a46787c36df81a"
+  integrity sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==
   dependencies:
-    "@jridgewell/gen-mapping" "^0.3.0"
-    "@jridgewell/trace-mapping" "^0.3.9"
+    "@jridgewell/gen-mapping" "^0.3.5"
+    "@jridgewell/trace-mapping" "^0.3.25"
 
-"@jridgewell/sourcemap-codec@1.4.14", "@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.13", "@jridgewell/sourcemap-codec@^1.4.14":
-  version "1.4.14"
-  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24"
-  integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==
+"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.13", "@jridgewell/sourcemap-codec@^1.4.14":
+  version "1.4.15"
+  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32"
+  integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==
 
 "@jridgewell/trace-mapping@0.3.9":
   version "0.3.9"
@@ -1748,13 +1689,13 @@
     "@jridgewell/resolve-uri" "^3.0.3"
     "@jridgewell/sourcemap-codec" "^1.4.10"
 
-"@jridgewell/trace-mapping@^0.3.14", "@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.9":
-  version "0.3.17"
-  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz#793041277af9073b0951a7fe0f0d8c4c98c36985"
-  integrity sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==
+"@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.20", "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25", "@jridgewell/trace-mapping@^0.3.9":
+  version "0.3.25"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz#15f190e98895f3fc23276ee14bc76b675c2e50f0"
+  integrity sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==
   dependencies:
-    "@jridgewell/resolve-uri" "3.1.0"
-    "@jridgewell/sourcemap-codec" "1.4.14"
+    "@jridgewell/resolve-uri" "^3.1.0"
+    "@jridgewell/sourcemap-codec" "^1.4.14"
 
 "@juggle/resize-observer@^3.4.0":
   version "3.4.0"
@@ -2558,18 +2499,18 @@
     tslib "^2.1.0"
 
 "@mdi/svg@^7.2.96":
-  version "7.2.96"
-  resolved "https://registry.yarnpkg.com/@mdi/svg/-/svg-7.2.96.tgz#6c182628ed722a85055c3795e7d4ca6d4f2f139c"
-  integrity sha512-rxzuSL2RSt/pWWnFnUFQi5GJArm2tHMhx20Gee3Ydn+xT2bqbR4syfgdPrq2b+j+n5LjC7C8Fb1QDM6LKeF0cA==
+  version "7.4.47"
+  resolved "https://registry.yarnpkg.com/@mdi/svg/-/svg-7.4.47.tgz#f8e5516aae129764a76d1bb2f27e55bee03e6e90"
+  integrity sha512-WQ2gDll12T9WD34fdRFgQVgO8bag3gavrAgJ0frN4phlwdJARpE6gO1YvLEMJR0KKgoc+/Ea/A0Pp11I00xBvw==
 
 "@messageformat/core@^3.1.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@messageformat/core/-/core-3.1.0.tgz#d4d2f5c3555228a6b5980b122a02b53dfc6458bd"
-  integrity sha512-UxAnjecnRG4u2iaggwIyylYPHmk5BTErJcKmWyAKTXqYgSW1bFLp4D7fIzuh6bk17Qfcmf3qtufdrstCB23nBA==
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/@messageformat/core/-/core-3.3.0.tgz#31edd52a5f7d017adad85c929809f07741dcfd3f"
+  integrity sha512-YcXd3remTDdeMxAlbvW6oV9d/01/DZ8DHUFwSttO3LMzIZj3iO0NRw+u1xlsNNORFI+u0EQzD52ZX3+Udi0T3g==
   dependencies:
     "@messageformat/date-skeleton" "^1.0.0"
     "@messageformat/number-skeleton" "^1.0.0"
-    "@messageformat/parser" "^5.0.0"
+    "@messageformat/parser" "^5.1.0"
     "@messageformat/runtime" "^3.0.1"
     make-plural "^7.0.0"
     safe-identifier "^0.4.1"
@@ -2580,14 +2521,14 @@
   integrity sha512-jPXy8fg+WMPIgmGjxSlnGJn68h/2InfT0TNSkVx0IGXgp4ynnvYkbZ51dGWmGySEK+pBiYUttbQdu5XEqX5CRg==
 
 "@messageformat/number-skeleton@^1.0.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@messageformat/number-skeleton/-/number-skeleton-1.1.0.tgz#eb636738da8abbd35ccbeb84f7d84d63302aeb61"
-  integrity sha512-F0Io+GOSvFFxvp9Ze3L5kAoZ2NnOAT0Mr/jpGNd3fqo8A0t4NxNIAcCdggtl2B/gN2ErkIKSBVPrF7xcW1IGvA==
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@messageformat/number-skeleton/-/number-skeleton-1.2.0.tgz#e7c245c41a1b2722bc59dad68f4d454f761bc9b4"
+  integrity sha512-xsgwcL7J7WhlHJ3RNbaVgssaIwcEyFkBqxHdcdaiJzwTZAWEOD8BuUFxnxV9k5S0qHN3v/KzUpq0IUpjH1seRg==
 
-"@messageformat/parser@^5.0.0":
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/@messageformat/parser/-/parser-5.0.0.tgz#5737e69d7d4a469998b527710f1891174fc1b262"
-  integrity sha512-WiDKhi8F0zQaFU8cXgqq69eYFarCnTVxKcvhAONufKf0oUxbqLMW6JX6rV4Hqh+BEQWGyKKKHY4g1XA6bCLylA==
+"@messageformat/parser@^5.1.0":
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/@messageformat/parser/-/parser-5.1.0.tgz#05e4851c782d633ad735791dd0a68ee65d2a7201"
+  integrity sha512-jKlkls3Gewgw6qMjKZ9SFfHUpdzEVdovKFtW1qRhJ3WI4FW5R/NnGDqr8SDGz+krWDO3ki94boMmQvGke1HwUQ==
   dependencies:
     moo "^0.5.1"
 
@@ -2619,15 +2560,10 @@
   dependencies:
     tslib "^2.0.0"
 
-"@ngtools/webpack@15.2.1":
-  version "15.2.1"
-  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-15.2.1.tgz#439ac075b2dcb9f304f0b7009182cc5049c7988a"
-  integrity sha512-YtA8rWAglPuf4CSStrFAxaprTSYE+DREGrJFc3WvZLcF5XrwVK+H4CC4Pmz07iYsG1TXShR4bWp1fbGw1cmBKw==
-
-"@ngtools/webpack@15.2.8":
-  version "15.2.8"
-  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-15.2.8.tgz#df8fb9300ccf94cab8f8ad69fb16fd31181e6c82"
-  integrity sha512-BJexeT4FxMtToVBGa3wdl6rrkYXgilP0kkSH4Qzu4MPlLPbeBSr4XQalQriewlpC2uzG0r2SJfrAe2eDhtSykA==
+"@ngtools/webpack@15.2.10":
+  version "15.2.10"
+  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-15.2.10.tgz#8118450206ae9398d81ca2eebe1b369321ac5583"
+  integrity sha512-ZExB4rKh/Saad31O/Ofd2XvRuILuCNTYs0+qJL697Be2pzeewvzBhE4Xe1Mm7Jg13aWSPeuIdzSGOqCdwxxxFQ==
 
 "@ngx-translate/core@^14.0.0":
   version "14.0.0"
@@ -2636,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"
@@ -2664,14 +2593,6 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
-"@npmcli/fs@^2.1.0":
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-2.1.2.tgz#a9e2541a4a2fec2e69c29b35e6060973da79b865"
-  integrity sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ==
-  dependencies:
-    "@gar/promisify" "^1.1.3"
-    semver "^7.3.5"
-
 "@npmcli/fs@^3.1.0":
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-3.1.0.tgz#233d43a25a91d68c3a863ba0da6a3f00924a173e"
@@ -2680,13 +2601,12 @@
     semver "^7.3.5"
 
 "@npmcli/git@^4.0.0":
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/@npmcli/git/-/git-4.0.3.tgz#354db5fe1f29696303638e191d8538ee9b01b4bb"
-  integrity sha512-8cXNkDIbnXPVbhXMmQ7/bklCAjtmPaXfI9aEM4iH+xSuEHINLMHhlfESvVwdqmHJRJkR48vNJTSUvoF6GRPSFA==
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/git/-/git-4.1.0.tgz#ab0ad3fd82bc4d8c1351b6c62f0fa56e8fe6afa6"
+  integrity sha512-9hwoB3gStVfa0N31ymBmrX+GuDGdVA/QWShZVqE0HK2Af+7QGGrCTbZia/SW0ImUTjTne7SP91qxDmtXvDHRPQ==
   dependencies:
     "@npmcli/promise-spawn" "^6.0.0"
     lru-cache "^7.4.4"
-    mkdirp "^1.0.4"
     npm-pick-manifest "^8.0.0"
     proc-log "^3.0.0"
     promise-inflight "^1.0.1"
@@ -2702,14 +2622,6 @@
     npm-bundled "^3.0.0"
     npm-normalize-package-bin "^3.0.0"
 
-"@npmcli/move-file@^2.0.0":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-2.0.1.tgz#26f6bdc379d87f75e55739bab89db525b06100e4"
-  integrity sha512-mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ==
-  dependencies:
-    mkdirp "^1.0.4"
-    rimraf "^3.0.2"
-
 "@npmcli/node-gyp@^3.0.0":
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/@npmcli/node-gyp/-/node-gyp-3.0.0.tgz#101b2d0490ef1aa20ed460e4c0813f0db560545a"
@@ -2723,9 +2635,9 @@
     which "^3.0.0"
 
 "@npmcli/run-script@^6.0.0":
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/@npmcli/run-script/-/run-script-6.0.0.tgz#f89e322c729e26ae29db6cc8cc76559074aac208"
-  integrity sha512-ql+AbRur1TeOdl1FY+RAwGW9fcr4ZwiVKabdvm93mujGREVuVLbdkXRJDrkTXSdCjaxYydr1wlA2v67jxWG5BQ==
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/@npmcli/run-script/-/run-script-6.0.2.tgz#a25452d45ee7f7fb8c16dfaf9624423c0c0eb885"
+  integrity sha512-NCcr1uQo1k5U+SYlnIrbAh3cxy+OQT1VtqiAbxdymSlptbzBb62AjH2xXgjNCoP073hoa1CfCAcwoZ8k96C4nA==
   dependencies:
     "@npmcli/node-gyp" "^3.0.0"
     "@npmcli/promise-spawn" "^6.0.0"
@@ -2733,15 +2645,44 @@
     read-package-json-fast "^3.0.0"
     which "^3.0.0"
 
-"@schematics/angular@15.2.8":
-  version "15.2.8"
-  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-15.2.8.tgz#d845903f1cc477d299f968eb5bc40a9855cfd911"
-  integrity sha512-F49IEzCFxQlpaMIgTO/wF1l/CLQKif7VaiDdyiTKOeT22IMmyd61FUmWDyZYfCBqMlvBmvDGx64HaHWes1HYCg==
+"@schematics/angular@15.2.10":
+  version "15.2.10"
+  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-15.2.10.tgz#fa6c05f37ba82422abd6b3f13a2fc78ec7a4eb3d"
+  integrity sha512-eLdyP+T1TueNQ8FCP7sP+tt8z+YQ1BINsJsyAyoJT/XZjcCV7LUxgDIU94/kuvIotmJ2xTuFWHFPfAY+CN3duQ==
   dependencies:
-    "@angular-devkit/core" "15.2.8"
-    "@angular-devkit/schematics" "15.2.8"
+    "@angular-devkit/core" "15.2.10"
+    "@angular-devkit/schematics" "15.2.10"
     jsonc-parser "3.2.0"
 
+"@sigstore/bundle@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@sigstore/bundle/-/bundle-1.1.0.tgz#17f8d813b09348b16eeed66a8cf1c3d6bd3d04f1"
+  integrity sha512-PFutXEy0SmQxYI4texPw3dd2KewuNqv7OuK1ZFtY2fM754yhvG2KdgwIhRnoEE2uHdtdGNQ8s0lb94dW9sELog==
+  dependencies:
+    "@sigstore/protobuf-specs" "^0.2.0"
+
+"@sigstore/protobuf-specs@^0.2.0":
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/@sigstore/protobuf-specs/-/protobuf-specs-0.2.1.tgz#be9ef4f3c38052c43bd399d3f792c97ff9e2277b"
+  integrity sha512-XTWVxnWJu+c1oCshMLwnKvz8ZQJJDVOlciMfgpJBQbThVjKTCG8dwyhgLngBD2KN0ap9F/gOV8rFDEx8uh7R2A==
+
+"@sigstore/sign@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@sigstore/sign/-/sign-1.0.0.tgz#6b08ebc2f6c92aa5acb07a49784cb6738796f7b4"
+  integrity sha512-INxFVNQteLtcfGmcoldzV6Je0sbbfh9I16DM4yJPw3j5+TFP8X6uIiA18mvpEa9yyeycAKgPmOA3X9hVdVTPUA==
+  dependencies:
+    "@sigstore/bundle" "^1.1.0"
+    "@sigstore/protobuf-specs" "^0.2.0"
+    make-fetch-happen "^11.0.1"
+
+"@sigstore/tuf@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@sigstore/tuf/-/tuf-1.0.3.tgz#2a65986772ede996485728f027b0514c0b70b160"
+  integrity sha512-2bRovzs0nJZFlCN3rXirE4gwxCn97JNjMmwpecqlbgV9WcxX7WRuIrgzx/X7Ib7MYRbyUTpBYE0s2x6AmZXnlg==
+  dependencies:
+    "@sigstore/protobuf-specs" "^0.2.0"
+    tuf-js "^1.1.7"
+
 "@socket.io/component-emitter@~3.1.0":
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz#96116f2a912e0c02817345b3c10751069920d553"
@@ -2788,16 +2729,22 @@
   integrity sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==
 
 "@tsconfig/node16@^1.0.2":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.3.tgz#472eaab5f15c1ffdd7f8628bd4c4f753995ec79e"
-  integrity sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.4.tgz#0b92dcc0cc1c81f6f306a381f28e31b1a56536e9"
+  integrity sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==
 
-"@tufjs/models@1.0.0":
+"@tufjs/canonical-json@1.0.0":
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@tufjs/models/-/models-1.0.0.tgz#5a5784e8770b7d014b5f87bff35af1f71fdebf1f"
-  integrity sha512-RRMu4uMxWnZlxaIBxahSb2IssFZiu188sndesZflWOe1cA/qUqtemSIoBWbuVKPvvdktapImWNnKpBcc+VrCQw==
+  resolved "https://registry.yarnpkg.com/@tufjs/canonical-json/-/canonical-json-1.0.0.tgz#eade9fd1f537993bc1f0949f3aea276ecc4fab31"
+  integrity sha512-QTnf++uxunWvG2z3UFNzAoQPHxnSXOwtaI3iJ+AohhV+5vONuArPjJE7aPXPVXfXJsqrVbZBu9b81AJoSd09IQ==
+
+"@tufjs/models@1.0.4":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@tufjs/models/-/models-1.0.4.tgz#5a689630f6b9dbda338d4b208019336562f176ef"
+  integrity sha512-qaGV9ltJP0EO25YfFUPhxRVK0evXFIAGicsVXuRim4Ed9cjPxYhNnNJ49SFmbeLgtxpslIkX317IgpfcHPVj/A==
   dependencies:
-    minimatch "^6.1.0"
+    "@tufjs/canonical-json" "1.0.0"
+    minimatch "^9.0.0"
 
 "@turf/bbox@*", "@turf/bbox@^6.5.0":
   version "6.5.0"
@@ -2950,42 +2897,42 @@
     "@turf/meta" "^6.5.0"
 
 "@types/ace-diff@^2.1.1":
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/@types/ace-diff/-/ace-diff-2.1.1.tgz#1c08919aae8f9c429fcb139dc564c89dd093cbee"
-  integrity sha512-O27fCo2Y0njNslOFSewyRhTyXfLhVhleEU5aTI6ZqFTKENJ8L/LA+Y+ZfcHsHTtwrTWjBXqORmqEHH6Qytqw1w==
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/@types/ace-diff/-/ace-diff-2.1.4.tgz#0bf9952c9b23fb3cb6f5cf96f1e8bbed8f603fcd"
+  integrity sha512-Jd9J35hi9PdsQzAAXWzPlXTuxRxnxuaNBMzBNts3EUDoQ8yuWp4Y36GjPASke8D6yVwKrapOnAaVp3km/CxPRw==
 
 "@types/body-parser@*":
-  version "1.19.2"
-  resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.2.tgz#aea2059e28b7658639081347ac4fab3de166e6f0"
-  integrity sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==
+  version "1.19.5"
+  resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.5.tgz#04ce9a3b677dc8bd681a17da1ab9835dc9d3ede4"
+  integrity sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==
   dependencies:
     "@types/connect" "*"
     "@types/node" "*"
 
 "@types/bonjour@^3.5.9":
-  version "3.5.10"
-  resolved "https://registry.yarnpkg.com/@types/bonjour/-/bonjour-3.5.10.tgz#0f6aadfe00ea414edc86f5d106357cda9701e275"
-  integrity sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw==
+  version "3.5.13"
+  resolved "https://registry.yarnpkg.com/@types/bonjour/-/bonjour-3.5.13.tgz#adf90ce1a105e81dd1f9c61fdc5afda1bfb92956"
+  integrity sha512-z9fJ5Im06zvUL548KvYNecEVlA7cVDkGUi6kZusb04mpyEFKCIZJvloCcmpmLaIahDpOQGHaHmG6imtPMmPXGQ==
   dependencies:
     "@types/node" "*"
 
 "@types/canvas-gauges@^2.1.4":
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/@types/canvas-gauges/-/canvas-gauges-2.1.4.tgz#063881264597d098e78cf5ad921e8ed20ae2ad16"
-  integrity sha512-JTvqQWrqcrgzCp/9+uzwUvPef2qAEnBJvm+bL9kvulzhXapDeNaGQXCIAZp+hOryusjOyndvP1za2HZooUV0XA==
+  version "2.1.8"
+  resolved "https://registry.yarnpkg.com/@types/canvas-gauges/-/canvas-gauges-2.1.8.tgz#5bdd199c598fd45f8618127bec2e2f4e49d7477f"
+  integrity sha512-sbxlEPEPnEYfvzC/yPIJZNkxKfAJaI45dxnQrkg3g2l3+1lWX6lwduRo8+hrsDw7VdJ5ijuRi1sQ7XBFu1R2qg==
 
 "@types/connect-history-api-fallback@^1.3.5":
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz#d1f7a8a09d0ed5a57aee5ae9c18ab9b803205dae"
-  integrity sha512-h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw==
+  version "1.5.4"
+  resolved "https://registry.yarnpkg.com/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.4.tgz#7de71645a103056b48ac3ce07b3520b819c1d5b3"
+  integrity sha512-n6Cr2xS1h4uAulPRdlw6Jl6s1oG8KrVilPN2yUITEs+K48EzMJJ3W1xy8K5eWuFvjp3R74AOIGSmp2UfBJ8HFw==
   dependencies:
     "@types/express-serve-static-core" "*"
     "@types/node" "*"
 
 "@types/connect@*":
-  version "3.4.35"
-  resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz#5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1"
-  integrity sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==
+  version "3.4.38"
+  resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.38.tgz#5ba7f3bc4fbbdeaff8dded952e5ff2cc53f8d858"
+  integrity sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==
   dependencies:
     "@types/node" "*"
 
@@ -2995,32 +2942,32 @@
   integrity sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==
 
 "@types/cors@^2.8.12":
-  version "2.8.13"
-  resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.13.tgz#b8ade22ba455a1b8cb3b5d3f35910fd204f84f94"
-  integrity sha512-RG8AStHlUiV5ysZQKq97copd2UmVYw3/pRMLefISZ3S1hK104Cwm7iLQ3fTKx+lsUH2CE8FlLaYeEA2LSeqYUA==
+  version "2.8.17"
+  resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.17.tgz#5d718a5e494a8166f569d986794e49c48b216b2b"
+  integrity sha512-8CGDvrBj1zgo2qE+oS3pOCyYNqCPryMWY2bGfwA0dcfopWGgxs+78df0Rs3rc9THP4JkOhLsAa+15VdpAqkcUA==
   dependencies:
     "@types/node" "*"
 
 "@types/eslint-scope@^3.7.3":
-  version "3.7.4"
-  resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.4.tgz#37fc1223f0786c39627068a12e94d6e6fc61de16"
-  integrity sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==
+  version "3.7.7"
+  resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.7.tgz#3108bd5f18b0cdb277c867b3dd449c9ed7079ac5"
+  integrity sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==
   dependencies:
     "@types/eslint" "*"
     "@types/estree" "*"
 
 "@types/eslint@*":
-  version "8.21.1"
-  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.21.1.tgz#110b441a210d53ab47795124dbc3e9bb993d1e7c"
-  integrity sha512-rc9K8ZpVjNcLs8Fp0dkozd5Pt2Apk1glO4Vgz8ix1u6yFByxfqo5Yavpy65o+93TAe24jr7v+eSBtFLvOQtCRQ==
+  version "8.56.5"
+  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.56.5.tgz#94b88cab77588fcecdd0771a6d576fa1c0af9d02"
+  integrity sha512-u5/YPJHo1tvkSF2CE0USEkxon82Z5DBy2xR+qfyYNszpX9qcs4sT6uq2kBbj4BXY1+DBGDPnrhMZV3pKWGNukw==
   dependencies:
     "@types/estree" "*"
     "@types/json-schema" "*"
 
 "@types/estree@*":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.0.tgz#5fb2e536c1ae9bf35366eed879e827fa59ca41c2"
-  integrity sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4"
+  integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==
 
 "@types/estree@^0.0.51":
   version "0.0.51"
@@ -3028,18 +2975,19 @@
   integrity sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==
 
 "@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.33":
-  version "4.17.33"
-  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.33.tgz#de35d30a9d637dc1450ad18dd583d75d5733d543"
-  integrity sha512-TPBqmR/HRYI3eC2E5hmiivIzv+bidAfXofM+sbonAGvyDhySGw9/PQZFt2BLOrjUUR++4eJVpx6KnLQK1Fk9tA==
+  version "4.17.43"
+  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.43.tgz#10d8444be560cb789c4735aea5eac6e5af45df54"
+  integrity sha512-oaYtiBirUOPQGSWNGPWnzyAFJ0BP3cwvN4oWZQY+zUBwpVIGsKUkpBpSztp74drYcjavs7SKFZ4DX1V2QeN8rg==
   dependencies:
     "@types/node" "*"
     "@types/qs" "*"
     "@types/range-parser" "*"
+    "@types/send" "*"
 
 "@types/express@*", "@types/express@^4.17.13":
-  version "4.17.17"
-  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.17.tgz#01d5437f6ef9cfa8668e616e13c2f2ac9a491ae4"
-  integrity sha512-Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q==
+  version "4.17.21"
+  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.21.tgz#c26d4a151e60efe0084b23dc3369ebc631ed192d"
+  integrity sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==
   dependencies:
     "@types/body-parser" "*"
     "@types/express-serve-static-core" "^4.17.33"
@@ -3054,14 +3002,14 @@
     "@types/jquery" "*"
 
 "@types/flowjs@^2.13.9":
-  version "2.13.9"
-  resolved "https://registry.yarnpkg.com/@types/flowjs/-/flowjs-2.13.9.tgz#b280e977a7b9d8e26d4a09ceab43e23ad2f148e5"
-  integrity sha512-iItTP2tOL9NalAR3C9o+psuvoBLwmEFPf1xr9BlDojyynizLBTtLw2aqrlaiZJW4z/QUwz7ryXFm4FjxjWatTQ==
+  version "2.13.13"
+  resolved "https://registry.yarnpkg.com/@types/flowjs/-/flowjs-2.13.13.tgz#91bb164ad4d63be6b9ad569171122c761526dc4b"
+  integrity sha512-wDAWxKbtsCXzlIqKMyy+lN3co9PIhJyQBRvx0tUefG0FDRAdFd4hvL8RFyLj8NxvBNoORWZ2exzNH5Gg+QpaAQ==
 
 "@types/geojson@*":
-  version "7946.0.10"
-  resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.10.tgz#6dfbf5ea17142f7f9a043809f1cd4c448cb68249"
-  integrity sha512-Nmh0K3iWQJzniTuPRcJn5hxXkfB1T1pgB89SBig5PlJQU5yocazeu4jATJlaA0GYFKWMqDdvYemoSnF2pXgLVA==
+  version "7946.0.14"
+  resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.14.tgz#319b63ad6df705ee2a65a73ef042c8271e696613"
+  integrity sha512-WCfD5Ht3ZesJUsONdhvm84dmzWOiOzOAqOncN0++w0lBw1o8OuDNJF2McvvCef/yBqb/HYRahp1BYtODFQ8bRg==
 
 "@types/geojson@7946.0.8":
   version "7946.0.8"
@@ -3069,137 +3017,156 @@
   integrity sha512-1rkryxURpr6aWP7R786/UQOkJ3PcpQiWkAXBmdWc7ryFWqN6a4xfK7BtjXvFBKO9LjQ+MWQSWxYeZX1OApnArA==
 
 "@types/hammerjs@^2.0.40":
-  version "2.0.41"
-  resolved "https://registry.yarnpkg.com/@types/hammerjs/-/hammerjs-2.0.41.tgz#f6ecf57d1b12d2befcce00e928a6a097c22980aa"
-  integrity sha512-ewXv/ceBaJprikMcxCmWU1FKyMAQ2X7a9Gtmzw8fcg2kIePI1crERDM818W+XYrxqdBBOdlf2rm137bU+BltCA==
+  version "2.0.45"
+  resolved "https://registry.yarnpkg.com/@types/hammerjs/-/hammerjs-2.0.45.tgz#ffa764bb68a66c08db6efb9c816eb7be850577b1"
+  integrity sha512-qkcUlZmX6c4J8q45taBKTL3p+LbITgyx7qhlPYOdOHZB7B31K0mXbP5YA7i7SgDeEGuI9MnumiKPEMrxg8j3KQ==
+
+"@types/http-errors@*":
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@types/http-errors/-/http-errors-2.0.4.tgz#7eb47726c391b7345a6ec35ad7f4de469cf5ba4f"
+  integrity sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==
 
 "@types/http-proxy@^1.17.8":
-  version "1.17.10"
-  resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.10.tgz#e576c8e4a0cc5c6a138819025a88e167ebb38d6c"
-  integrity sha512-Qs5aULi+zV1bwKAg5z1PWnDXWmsn+LxIvUGv6E2+OOMYhclZMO+OXd9pYVf2gLykf2I7IV2u7oTHwChPNsvJ7g==
+  version "1.17.14"
+  resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.14.tgz#57f8ccaa1c1c3780644f8a94f9c6b5000b5e2eec"
+  integrity sha512-SSrD0c1OQzlFX7pGu1eXxSEjemej64aaNPRhhVYUGqXh0BtldAAx37MG8btcumvpgKyZp1F5Gn3JkktdxiFv6w==
   dependencies:
     "@types/node" "*"
 
 "@types/jasmine@*":
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-4.3.1.tgz#2d8ab5601c2fe7d9673dcb157e03f128ab5c5fff"
-  integrity sha512-Vu8l+UGcshYmV1VWwULgnV/2RDbBaO6i2Ptx7nd//oJPIZGhoI1YLST4VKagD2Pq/Bc2/7zvtvhM7F3p4SN7kQ==
+  version "5.1.4"
+  resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-5.1.4.tgz#0de3f6ca753e10d1600ce1864ae42cfd47cf9924"
+  integrity sha512-px7OMFO/ncXxixDe1zR13V1iycqWae0MxTaw62RpFlksUi5QuNWgQJFkTQjIOvrmutJbI7Fp2Y2N1F6D2R4G6w==
 
 "@types/jasmine@~3.10.2":
-  version "3.10.7"
-  resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-3.10.7.tgz#57b8c6892fa2f4696fbb56851cd99649c781376c"
-  integrity sha512-brLuHhITMz4YV2IxLstAJtyRJgtWfLqFKiqiJFvFWMSmydpAmn42CE4wfw7ywkSk02UrufhtzipTcehk8FctoQ==
+  version "3.10.18"
+  resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-3.10.18.tgz#d442369fd2d06d5b2c607fae51c257b2f9caa94e"
+  integrity sha512-jOk52a1Kz+1oU5fNWwAcNe64/GsE7r/Q6ronwDox0D3ETo/cr4ICMQyeXrj7G6FPW1n8YjRoAZA2F0XBr6GicQ==
 
 "@types/jasminewd2@^2.0.10":
-  version "2.0.10"
-  resolved "https://registry.yarnpkg.com/@types/jasminewd2/-/jasminewd2-2.0.10.tgz#ae31c237aa6421bde30f1058b1d20f4577e54443"
-  integrity sha512-J7mDz7ovjwjc+Y9rR9rY53hFWKATcIkrr9DwQWmOas4/pnIPJTXawnzjwpHm3RSxz/e3ZVUvQ7cRbd5UQLo10g==
+  version "2.0.13"
+  resolved "https://registry.yarnpkg.com/@types/jasminewd2/-/jasminewd2-2.0.13.tgz#0b60c1fcd06277ea97efbbad5a02e0c1a4a8996a"
+  integrity sha512-aJ3wj8tXMpBrzQ5ghIaqMisD8C3FIrcO6sDKHqFbuqAsI7yOxj0fA7MrRCPLZHIVUjERIwsMmGn/vB0UQ9u0Hg==
   dependencies:
     "@types/jasmine" "*"
 
-"@types/jquery@*", "@types/jquery@^3.5.14", "@types/jquery@^3.5.16":
-  version "3.5.16"
-  resolved "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.5.16.tgz#632131baf30951915b0317d48c98e9890bdf051d"
-  integrity sha512-bsI7y4ZgeMkmpG9OM710RRzDFp+w4P1RGiIt30C1mSBT+ExCleeh4HObwgArnDFELmRrOpXgSYN9VF1hj+f1lw==
+"@types/jquery@*", "@types/jquery@^3.5.16", "@types/jquery@^3.5.29":
+  version "3.5.29"
+  resolved "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.5.29.tgz#3c06a1f519cd5fc3a7a108971436c00685b5dcea"
+  integrity sha512-oXQQC9X9MOPRrMhPHHOsXqeQDnWeCDT3PelUIg/Oy8FAbzSZtFHRjc7IpbfFVmpLtJ+UOoywpRsuO5Jxjybyeg==
   dependencies:
     "@types/sizzle" "*"
 
 "@types/js-beautify@^1.13.3":
-  version "1.13.3"
-  resolved "https://registry.yarnpkg.com/@types/js-beautify/-/js-beautify-1.13.3.tgz#53839bb5b766d0fb45e87386100bb3bcbb7dca9d"
-  integrity sha512-ucIPw5gmNyvRKi6mpeojlqp+T+6ZBJeU+kqMDnIEDlijEU4QhLTon90sZ3cz9HZr+QTwXILjNsMZImzA7+zuJA==
+  version "1.14.3"
+  resolved "https://registry.yarnpkg.com/@types/js-beautify/-/js-beautify-1.14.3.tgz#6ced76f79935e37e0d613110dea369881d93c1ff"
+  integrity sha512-FMbQHz+qd9DoGvgLHxeqqVPaNRffpIu5ZjozwV8hf9JAGpIOzuAf4wGbRSo8LNITHqGjmmVjaMggTT5P4v4IHg==
 
 "@types/json-schema@*", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
-  version "7.0.11"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3"
-  integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==
+  version "7.0.15"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
+  integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
 
 "@types/json5@^0.0.29":
   version "0.0.29"
   resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
   integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==
 
-"@types/leaflet-polylinedecorator@^1.6.1":
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/@types/leaflet-polylinedecorator/-/leaflet-polylinedecorator-1.6.1.tgz#b6522f9dae52146bf73da249e4bedfbab200c6e4"
-  integrity sha512-9etweJ2U4SWqcV/AR3i0NdWJByeMn6+zMUNlO6jVbpL8UI6qrMKybu8v9/s6UR4oXvsV4lZT6vzAsNAAMq5Ssg==
+"@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":
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@types/leaflet-providers/-/leaflet-providers-1.2.1.tgz#620669b828959740a2d8572e0c0288a2382d3564"
-  integrity sha512-uNyuXiNV2q3fmgNjQji2P6RjQISmL40bbOL91/3OAwiE3XhkLKPmSAtAcfe11MAIz45iEjdFZJWppq9QyfnPIw==
+"@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":
-  version "0.4.6"
-  resolved "https://registry.yarnpkg.com/@types/leaflet.gridlayer.googlemutant/-/leaflet.gridlayer.googlemutant-0.4.6.tgz#86d3ba9d432dec29b4796e37d815c233680e7fcb"
-  integrity sha512-L0J7NadcZp5bcKQrv4DVlsEbQ90xLsOKScckAMnxoghh/wogk0GVkauYOYHBKeKDkx9qkMRzTf8oO+fKeYD7oQ==
+"@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":
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/@types/leaflet.markercluster/-/leaflet.markercluster-1.5.1.tgz#d039ada408a30bda733b19a24cba89b81f0ace4b"
-  integrity sha512-gzJzP10qO6Zkts5QNVmSAEDLYicQHTEBLT9HZpFrJiSww9eDAs5OWHvIskldf41MvDv1gbMukuEBQEawHn+wtA==
+"@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==
   dependencies:
     "@types/leaflet" "*"
 
 "@types/leaflet@*":
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/@types/leaflet/-/leaflet-1.9.1.tgz#a220706b02c6024951d7fc2959d530c6941c4224"
-  integrity sha512-lYawM3I3lLO6rmBASaqdGgY6zUL4YHr3H79/axx7FNYyPXuj0P1DZHbkNo8Itbv0i7Y9EryLWtDXXROMygXhRA==
+  version "1.9.8"
+  resolved "https://registry.yarnpkg.com/@types/leaflet/-/leaflet-1.9.8.tgz#32162a8eaf305c63267e99470b9603b5883e63e8"
+  integrity sha512-EXdsL4EhoUtGm2GC2ZYtXn+Fzc6pluVgagvo2VC1RHWToLGlTRwVYoDpqS/7QXa01rmDyBjJk3Catpf60VMkwg==
   dependencies:
     "@types/geojson" "*"
 
-"@types/leaflet@^1.8.0":
-  version "1.9.3"
-  resolved "https://registry.yarnpkg.com/@types/leaflet/-/leaflet-1.9.3.tgz#7aac302189eb3aa283f444316167995df42a5467"
-  integrity sha512-Caa1lYOgKVqDkDZVWkto2Z5JtVo09spEaUt2S69LiugbBpoqQu92HYFMGUbYezZbnBkyOxMNPXHSgRrRY5UyIA==
+"@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==
   dependencies:
     "@types/geojson" "*"
 
 "@types/lodash@^4.14.192":
-  version "4.14.192"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.192.tgz#5790406361a2852d332d41635d927f1600811285"
-  integrity sha512-km+Vyn3BYm5ytMO13k9KTp27O75rbQ0NFw+U//g+PX7VZyjCioXaRFisqSIJRECljcTv73G3i6BpglNGHgUQ5A==
+  version "4.17.0"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.17.0.tgz#d774355e41f372d5350a4d0714abb48194a489c3"
+  integrity sha512-t7dhREVv6dbNj0q17X12j7yDG4bD/DHYX7o5/DbDxobP0HnGPgpRz2Ej77aL7TZT3DSw13fqUTj8J4mMnqa7WA==
 
 "@types/marked@^4.0.8":
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/@types/marked/-/marked-4.0.8.tgz#b316887ab3499d0a8f4c70b7bd8508f92d477955"
-  integrity sha512-HVNzMT5QlWCOdeuBsgXP8EZzKUf0+AXzN+sLmjvaB3ZlLqO+e4u0uXrdw9ub69wBKFs+c6/pA4r9sy6cCDvImw==
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/@types/marked/-/marked-4.3.2.tgz#e2e0ad02ebf5626bd215c5bae2aff6aff0ce9eac"
+  integrity sha512-a79Yc3TOk6dGdituy8hmTTJXjOkZ7zsFYV10L337ttq/rec8lRMDBpV7fL3uLx6TgbFCa5DU/h8FmIBQPSbU0w==
 
 "@types/mime@*":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@types/mime/-/mime-3.0.1.tgz#5f8f2bca0a5863cb69bc0b0acd88c96cb1d4ae10"
-  integrity sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA==
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/@types/mime/-/mime-3.0.4.tgz#2198ac274de6017b44d941e00261d5bc6a0e0a45"
+  integrity sha512-iJt33IQnVRkqeqC7PzBHPTC6fDlRNRW8vjrgqtScAhrmMwe8c4Eo7+fUGTa+XdWrpEgpyKWMYmi2dIwMAYRzPw==
+
+"@types/mime@^1":
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.5.tgz#1ef302e01cf7d2b5a0fa526790c9123bf1d06690"
+  integrity sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==
 
 "@types/mousetrap@^1.6.9":
-  version "1.6.11"
-  resolved "https://registry.yarnpkg.com/@types/mousetrap/-/mousetrap-1.6.11.tgz#ef9620160fdcefcb85bccda8aaa3e84d7429376d"
-  integrity sha512-F0oAily9Q9QQpv9JKxKn0zMKfOo36KHCW7myYsmUyf2t0g+sBTbG3UleTPoguHdE1z3GLFr3p7/wiOio52QFjQ==
+  version "1.6.15"
+  resolved "https://registry.yarnpkg.com/@types/mousetrap/-/mousetrap-1.6.15.tgz#f144a0c539a4cef553a631824651d48267e53c86"
+  integrity sha512-qL0hyIMNPow317QWW/63RvL1x5MVMV+Ru3NaY9f/CuEpCqrmb7WeuK2071ZY5hczOnm38qExWM2i2WtkXLSqFw==
+
+"@types/node-forge@^1.3.0":
+  version "1.3.11"
+  resolved "https://registry.yarnpkg.com/@types/node-forge/-/node-forge-1.3.11.tgz#0972ea538ddb0f4d9c2fa0ec5db5724773a604da"
+  integrity sha512-FQx220y22OKNTqaByeBGqHWYz4cl94tpcxeFdvBo3wjG6XPBuZ0BNgNZRV5J5TFmmcsJ4IzsLkmGRiQbnYsBEQ==
+  dependencies:
+    "@types/node" "*"
 
 "@types/node@*", "@types/node@>=10.0.0":
-  version "18.14.5"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.14.5.tgz#4a13a6445862159303fc38586598a9396fc408b3"
-  integrity sha512-CRT4tMK/DHYhw1fcCEBwME9CSaZNclxfzVMe7GsO6ULSwsttbj70wSiX6rZdIjGblu93sTJxLdhNIT85KKI7Qw==
+  version "20.11.28"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.28.tgz#4fd5b2daff2e580c12316e457473d68f15ee6f66"
+  integrity sha512-M/GPWVS2wLkSkNHVeLkrF2fD5Lx5UC4PxA0uZcKc6QqbIQUJyW1jVjueJYi1z8n0I5PxYrtpnPnWglE+y9A0KA==
+  dependencies:
+    undici-types "~5.26.4"
 
 "@types/node@~18.15.11":
-  version "18.15.11"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.15.11.tgz#b3b790f09cb1696cffcec605de025b088fa4225f"
-  integrity sha512-E5Kwq2n4SbMzQOn6wnmBjuK9ouqlURrcZDVfbo9ftDDTFt3nk7ZKK4GMOzoYgnpQJKcxwQw+lGaBvvlMo0qN/Q==
+  version "18.15.13"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.15.13.tgz#f64277c341150c979e42b00e4ac289290c9df469"
+  integrity sha512-N+0kuo9KgrUQ1Sn/ifDXsvg0TTleP7rIy4zOBGECxAljqvqfqpTfzx0Q1NUedOixRMBfe2Whhb056a42cWs26Q==
 
 "@types/parse-json@^4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
-  integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.2.tgz#5950e50960793055845e956c427fc2b0d70c5239"
+  integrity sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==
 
 "@types/prop-types@*":
-  version "15.7.5"
-  resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.5.tgz#5f19d2b85a98e9558036f6a3cacc8819420f05cf"
-  integrity sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==
+  version "15.7.11"
+  resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.11.tgz#2596fb352ee96a1379c657734d4b913a613ad563"
+  integrity sha512-ga8y9v9uyeiLdpKddhxYQkxNDrfvuPrlFb0N1qnZZByvcElJaXthF1UhvCh9TLWJBEHeNtdnbysW7Y6Uq8CVng==
 
 "@types/q@^0.0.32":
   version "0.0.32"
@@ -3207,19 +3174,19 @@
   integrity sha512-qYi3YV9inU/REEfxwVcGZzbS3KG/Xs90lv0Pr+lDtuVjBPGd1A+eciXzVSaRvLify132BfcvhvEjeVahrUl0Ug==
 
 "@types/qs@*":
-  version "6.9.7"
-  resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb"
-  integrity sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==
+  version "6.9.12"
+  resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.12.tgz#afa96b383a3a6fdc859453a1892d41b607fc7756"
+  integrity sha512-bZcOkJ6uWrL0Qb2NAWKa7TBU+mJHPzhx9jjLL1KHF+XpzEcR7EXHvjbHlGtR/IsP1vyPrehuS6XqkmaePy//mg==
 
 "@types/range-parser@*":
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc"
-  integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.7.tgz#50ae4353eaaddc04044279812f52c8c65857dbcb"
+  integrity sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==
 
 "@types/raphael@^2.3.2":
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/@types/raphael/-/raphael-2.3.3.tgz#d264b148bc100ef401a5e13159fd97861cd69e17"
-  integrity sha512-Rhvq0q6wzyvipejki/9w87/pgapyE+s3gO66tdl1oD3qDrow+ek+4vVYAbRkeL58HCCK9EOZKwyjqYJ/TFkmtQ==
+  version "2.3.9"
+  resolved "https://registry.yarnpkg.com/@types/raphael/-/raphael-2.3.9.tgz#d53bb8930431524f42987a8a19815c0d42a61eb5"
+  integrity sha512-K1dZwoLNvEN+mvleFU/t2swG9Z4SE5Vub7dA5wDYojH0bVTQ8ZAP+lNsl91t1njdu/B+roSEL4QXC67I7Hpiag==
 
 "@types/react-dom@17.0.11":
   version "17.0.11"
@@ -3229,9 +3196,9 @@
     "@types/react" "*"
 
 "@types/react-transition-group@^4.2.0":
-  version "4.4.5"
-  resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.5.tgz#aae20dcf773c5aa275d5b9f7cdbca638abc5e416"
-  integrity sha512-juKD/eiSM3/xZYzjuzH6ZwpP+/lejltmiS3QEzV/vmb/Q8+HfDmxu+Baga8UEMGBqV88Nbg4l2hY/K2DkyaLLA==
+  version "4.4.10"
+  resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.10.tgz#6ee71127bdab1f18f11ad8fb3322c6da27c327ac"
+  integrity sha512-hT/+s0VQs2ojCX823m60m5f0sL5idt9SO6Tj6Dg+rdphGPIeJbJ6CxvBYkgkGKrYeDjvIpKTR38UzmtHJOGW3Q==
   dependencies:
     "@types/react" "*"
 
@@ -3250,44 +3217,53 @@
   integrity sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==
 
 "@types/scheduler@*":
-  version "0.16.2"
-  resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39"
-  integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==
+  version "0.16.8"
+  resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.8.tgz#ce5ace04cfeabe7ef87c0091e50752e36707deff"
+  integrity sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A==
 
 "@types/selenium-webdriver@^3.0.0":
-  version "3.0.20"
-  resolved "https://registry.yarnpkg.com/@types/selenium-webdriver/-/selenium-webdriver-3.0.20.tgz#448771a0608ebf1c86cb5885914da6311e323c3a"
-  integrity sha512-6d8Q5fqS9DWOXEhMDiF6/2FjyHdmP/jSTAUyeQR7QwrFeNmYyzmvGxD5aLIHL445HjWgibs0eAig+KPnbaesXA==
+  version "3.0.26"
+  resolved "https://registry.yarnpkg.com/@types/selenium-webdriver/-/selenium-webdriver-3.0.26.tgz#fc7d87d580affa2e52685b2e881bc201819a5836"
+  integrity sha512-dyIGFKXfUFiwkMfNGn1+F6b80ZjR3uSYv1j6xVJSDlft5waZ2cwkHW4e7zNzvq7hiEackcgvBpmnXZrI1GltPg==
 
 "@types/semver@^7.3.12":
-  version "7.3.13"
-  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.13.tgz#da4bfd73f49bd541d28920ab0e2bf0ee80f71c91"
-  integrity sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==
+  version "7.5.8"
+  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.8.tgz#8268a8c57a3e4abd25c165ecd36237db7948a55e"
+  integrity sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==
+
+"@types/send@*":
+  version "0.17.4"
+  resolved "https://registry.yarnpkg.com/@types/send/-/send-0.17.4.tgz#6619cd24e7270793702e4e6a4b958a9010cfc57a"
+  integrity sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==
+  dependencies:
+    "@types/mime" "^1"
+    "@types/node" "*"
 
 "@types/serve-index@^1.9.1":
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/@types/serve-index/-/serve-index-1.9.1.tgz#1b5e85370a192c01ec6cec4735cf2917337a6278"
-  integrity sha512-d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg==
+  version "1.9.4"
+  resolved "https://registry.yarnpkg.com/@types/serve-index/-/serve-index-1.9.4.tgz#e6ae13d5053cb06ed36392110b4f9a49ac4ec898"
+  integrity sha512-qLpGZ/c2fhSs5gnYsQxtDEq3Oy8SXPClIXkW5ghvAvsNuVSA8k+gCONcUCS/UjLEYvYps+e8uBtfgXgvhwfNug==
   dependencies:
     "@types/express" "*"
 
 "@types/serve-static@*", "@types/serve-static@^1.13.10":
-  version "1.15.1"
-  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.1.tgz#86b1753f0be4f9a1bee68d459fcda5be4ea52b5d"
-  integrity sha512-NUo5XNiAdULrJENtJXZZ3fHtfMolzZwczzBbnAeBbqBwG+LaG6YaJtuwzwGSQZ2wsCrxjEhNNjAkKigy3n8teQ==
+  version "1.15.5"
+  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.5.tgz#15e67500ec40789a1e8c9defc2d32a896f05b033"
+  integrity sha512-PDRk21MnK70hja/YF8AHfC7yIsiQHn1rcXx7ijCFBX/k+XQJhQT/gw3xekXKJvx+5SXaMMS8oqQy09Mzvz2TuQ==
   dependencies:
+    "@types/http-errors" "*"
     "@types/mime" "*"
     "@types/node" "*"
 
 "@types/sizzle@*":
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/@types/sizzle/-/sizzle-2.3.3.tgz#ff5e2f1902969d305225a047c8a0fd5c915cebef"
-  integrity sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==
+  version "2.3.8"
+  resolved "https://registry.yarnpkg.com/@types/sizzle/-/sizzle-2.3.8.tgz#518609aefb797da19bf222feb199e8f653ff7627"
+  integrity sha512-0vWLNK2D5MT9dg0iOo8GlKguPAU02QjmZitPEsXRuJXU/OGIOt9vT9Fc26wtYuavLxtO45v9PGleoL9Z0k1LHg==
 
 "@types/sockjs@^0.3.33":
-  version "0.3.33"
-  resolved "https://registry.yarnpkg.com/@types/sockjs/-/sockjs-0.3.33.tgz#570d3a0b99ac995360e3136fd6045113b1bd236f"
-  integrity sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw==
+  version "0.3.36"
+  resolved "https://registry.yarnpkg.com/@types/sockjs/-/sockjs-0.3.36.tgz#ce322cf07bcc119d4cbf7f88954f3a3bd0f67535"
+  integrity sha512-MK9V6NzAS1+Ud7JV9lJLFqW85VbC9dq3LmwZCuBe4wBDgKC0Kj/jd8Xl+nSviU+Qc3+m7umHHyHg//2KSa0a0Q==
   dependencies:
     "@types/node" "*"
 
@@ -3304,9 +3280,9 @@
   integrity sha512-Jxo2/uif1WpkabfyvWpFmPWFPDdwKUmyL7xWzjtxNALEu2pgce+eISjbf0Vr+SsK/D9savO5kTRcf+COLK5eiQ==
 
 "@types/tinycolor2@^1.4.3":
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/@types/tinycolor2/-/tinycolor2-1.4.3.tgz#ed4a0901f954b126e6a914b4839c77462d56e706"
-  integrity sha512-Kf1w9NE5HEgGxCRyIcRXR/ZYtDv0V8FVPtYHwLxl0O+maGX0erE77pQlD0gpP+/KByMZ87mOA79SjifhSB3PjQ==
+  version "1.4.6"
+  resolved "https://registry.yarnpkg.com/@types/tinycolor2/-/tinycolor2-1.4.6.tgz#670cbc0caf4e58dd61d1e3a6f26386e473087f06"
+  integrity sha512-iEN8J0BoMnsWBqjVbWH/c0G0Hh7O21lpR2/+PrvAVgWdzL7eexIFm4JN/Wn10PTcmNdtS6U67r499mlWMXOxNw==
 
 "@types/tooltipster@^0.0.31":
   version "0.0.31"
@@ -3316,9 +3292,9 @@
     "@types/jquery" "*"
 
 "@types/ws@^8.5.1":
-  version "8.5.4"
-  resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.4.tgz#bb10e36116d6e570dd943735f86c933c1587b8a5"
-  integrity sha512-zdQDHKUgcX/zBc4GrwsE/7dVdAD8JR4EuiAXiiUhhfyIJXXb2+PrGshFyeXWQPMmmZ2XxgaqclgpIC7eTXc1mg==
+  version "8.5.10"
+  resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.10.tgz#4acfb517970853fa6574a3a6886791d04a396787"
+  integrity sha512-vmQSUcfalpIq0R9q7uTo2lXs6eGIpt9wtnLdMv9LVpIjCA/+ufZRozlVoVelIYixx1ugCBKDhn89vnsEGOCx9A==
   dependencies:
     "@types/node" "*"
 
@@ -3464,6 +3440,11 @@
     "@typescript-eslint/types" "5.57.0"
     eslint-visitor-keys "^3.3.0"
 
+"@ungap/structured-clone@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406"
+  integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==
+
 "@webassemblyjs/ast@1.11.1":
   version "1.11.1"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7"
@@ -3631,9 +3612,9 @@ ace-diff@^3.0.3:
     diff-match-patch "^1.0.5"
 
 acorn-import-assertions@^1.7.6:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9"
-  integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz#507276249d684797c84e0734ef84860334cfb1ac"
+  integrity sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==
 
 acorn-jsx@^5.3.2:
   version "5.3.2"
@@ -3641,14 +3622,14 @@ acorn-jsx@^5.3.2:
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
 acorn-walk@^8.1.1:
-  version "8.2.0"
-  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
-  integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
+  version "8.3.2"
+  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.3.2.tgz#7703af9415f1b6db9315d6895503862e231d34aa"
+  integrity sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==
 
-acorn@^8.4.1, acorn@^8.5.0, acorn@^8.7.1, acorn@^8.8.0:
-  version "8.8.2"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.2.tgz#1b2f25db02af965399b9776b0c2c391276d37c4a"
-  integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==
+acorn@^8.4.1, acorn@^8.5.0, acorn@^8.7.1, acorn@^8.8.2, acorn@^8.9.0:
+  version "8.11.3"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.3.tgz#71e0b14e13a4ec160724b38fb7b0f233b1b81d7a"
+  integrity sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==
 
 adjust-sourcemap-loader@^4.0.0:
   version "4.0.0"
@@ -3659,9 +3640,9 @@ adjust-sourcemap-loader@^4.0.0:
     regex-parser "^2.2.11"
 
 adm-zip@^0.5.2:
-  version "0.5.10"
-  resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.5.10.tgz#4a51d5ab544b1f5ce51e1b9043139b639afff45b"
-  integrity sha512-x0HvcHqVJNTPk/Bw8JbLWlWoo6Wwnsug0fnYYro1HBrjxZ3G7/AZk7Ahv8JwDe1uIcz8eBqvu86FuF1POiG7vQ==
+  version "0.5.12"
+  resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.5.12.tgz#87786328e91d54b37358d8a50f954c4cd73ba60b"
+  integrity sha512-6TVU49mK6KZb4qG6xWaaM4C7sA/sgUMLy/JYMOzkcp3BvVLpW0fXDFQiIzAuxFCt/2+xD7fNIiPFAoLZPhVNLQ==
 
 agent-base@6, agent-base@^6.0.2:
   version "6.0.2"
@@ -3678,12 +3659,10 @@ agent-base@^4.3.0:
     es6-promisify "^5.0.0"
 
 agentkeepalive@^4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.2.1.tgz#a7975cbb9f83b367f06c90cc51ff28fe7d499717"
-  integrity sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA==
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.5.0.tgz#2673ad1389b3c418c5a20c5d7364f93ca04be923"
+  integrity sha512-5GG/5IbQQpC9FpkRGsSvZI5QYeSCzlJHdpBQntCsuTOxhKD8lqKhrleg2Yi7yvMIf82Ycmmqln9U8V9qwEiJew==
   dependencies:
-    debug "^4.1.0"
-    depd "^1.1.2"
     humanize-ms "^1.2.1"
 
 aggregate-error@^3.0.0:
@@ -3706,14 +3685,14 @@ ajv-keywords@^3.5.2:
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
   integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
 
-ajv-keywords@^5.0.0:
+ajv-keywords@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-5.1.0.tgz#69d4d385a4733cdbeab44964a1170a88f87f0e16"
   integrity sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==
   dependencies:
     fast-deep-equal "^3.1.3"
 
-ajv@8.12.0, ajv@^8.0.0, ajv@^8.8.0:
+ajv@8.12.0, ajv@^8.0.0, ajv@^8.9.0:
   version "8.12.0"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1"
   integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==
@@ -3723,7 +3702,7 @@ ajv@8.12.0, ajv@^8.0.0, ajv@^8.8.0:
     require-from-string "^2.0.2"
     uri-js "^4.2.2"
 
-ajv@^6.10.0, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5:
+ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5:
   version "6.12.6"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -3741,9 +3720,9 @@ angular-gridster2@~15.0.4:
     tslib "^2.4.0"
 
 angular2-hotkeys@^13.1.0:
-  version "13.1.0"
-  resolved "https://registry.yarnpkg.com/angular2-hotkeys/-/angular2-hotkeys-13.1.0.tgz#fdbb30b72dc512379e3dea5d44d98593cdfb18a9"
-  integrity sha512-irsQLLiHCHqz73ocDV8N5K7Zel7mJyLQHwLrRePOwUumQfyBc2TTuO+ccdQAAM7/RK+IdT6P5YoiP0FEbA19Uw==
+  version "13.4.0"
+  resolved "https://registry.yarnpkg.com/angular2-hotkeys/-/angular2-hotkeys-13.4.0.tgz#a96676466936556655cd64f92e1f5cd3aeac8e10"
+  integrity sha512-WvkouvdXtTYw3tpuaoEVF+ue41pvI2XSa8m4tVRPLzAblT/f7PG0uQO4npyjVw3oDIc7qnFkQR+oqGl1KM1eow==
   dependencies:
     "@types/mousetrap" "^1.6.9"
     mousetrap "^1.6.5"
@@ -3813,6 +3792,11 @@ anymatch@~3.1.2:
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc"
   integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==
 
+are-docs-informative@^0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/are-docs-informative/-/are-docs-informative-0.0.2.tgz#387f0e93f5d45280373d387a59d34c96db321963"
+  integrity sha512-ixiS0nLNNG5jNQzgZJNoUpBKdo9yTYZMGJ+QgT2jmjR7G7+QHRCc4v6LQ3NgE7EBJq+o0ams3waJwkrlBom8Ig==
+
 are-we-there-yet@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz#679df222b278c64f2cdba1175cdc00b0d96164bd"
@@ -3855,25 +3839,28 @@ array-back@^4.0.1, array-back@^4.0.2:
   resolved "https://registry.yarnpkg.com/array-back/-/array-back-4.0.2.tgz#8004e999a6274586beeb27342168652fdb89fa1e"
   integrity sha512-NbdMezxqf94cnNfWLL7V/im0Ub+Anbb0IoZhvzie8+4HJ4nMQuzHuy49FkGYCJK2yAloZ3meiB6AVMClbrI1vg==
 
+array-buffer-byte-length@^1.0.0, array-buffer-byte-length@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz#1e5583ec16763540a27ae52eed99ff899223568f"
+  integrity sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==
+  dependencies:
+    call-bind "^1.0.5"
+    is-array-buffer "^3.0.4"
+
 array-flatten@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
   integrity sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==
 
-array-flatten@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099"
-  integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==
-
-array-includes@^3.1.6:
-  version "3.1.6"
-  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.6.tgz#9e9e720e194f198266ba9e18c29e6a9b0e4b225f"
-  integrity sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==
+array-includes@^3.1.7:
+  version "3.1.7"
+  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.7.tgz#8cd2e01b26f7a3086cbc87271593fe921c62abda"
+  integrity sha512-dlcsNBIiWhPkHdOEEKnehA+RNUWDc4UqFtnIXU4uuYDPtA4LDkr7qip2p0VvFAEXNDr0yWZ9PJyIRiGjRLQzwQ==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
-    get-intrinsic "^1.1.3"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+    get-intrinsic "^1.2.1"
     is-string "^1.0.7"
 
 array-union@^1.0.1:
@@ -3893,26 +3880,62 @@ array-uniq@^1.0.1:
   resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
   integrity sha512-MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q==
 
-array.prototype.flat@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz#ffc6576a7ca3efc2f46a143b9d1dda9b4b3cf5e2"
-  integrity sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==
+array.prototype.filter@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/array.prototype.filter/-/array.prototype.filter-1.0.3.tgz#423771edeb417ff5914111fff4277ea0624c0d0e"
+  integrity sha512-VizNcj/RGJiUyQBgzwxzE5oHdeuXY5hSbbmKMlphj1cy1Vl7Pn2asCGbSrru6hSQjmCzqTBPVWAF/whmEOVHbw==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+    es-array-method-boxes-properly "^1.0.0"
+    is-string "^1.0.7"
+
+array.prototype.findlastindex@^1.2.3:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.4.tgz#d1c50f0b3a9da191981ff8942a0aedd82794404f"
+  integrity sha512-hzvSHUshSpCflDR1QMUBLHGHP1VIEBegT4pix9H/Z92Xw3ySoy6c2qh7lJWTJnRJ8JCZ9bJNCgTyYaJGcJu6xQ==
+  dependencies:
+    call-bind "^1.0.5"
+    define-properties "^1.2.1"
+    es-abstract "^1.22.3"
+    es-errors "^1.3.0"
+    es-shim-unscopables "^1.0.2"
+
+array.prototype.flat@^1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz#1476217df8cff17d72ee8f3ba06738db5b387d18"
+  integrity sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
     es-shim-unscopables "^1.0.0"
 
-array.prototype.flatmap@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz#1aae7903c2100433cb8261cd4ed310aab5c4a183"
-  integrity sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==
+array.prototype.flatmap@^1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz#c9a7c6831db8e719d6ce639190146c24bbd3e527"
+  integrity sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
     es-shim-unscopables "^1.0.0"
 
+arraybuffer.prototype.slice@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz#097972f4255e41bc3425e37dc3f6421cf9aefde6"
+  integrity sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==
+  dependencies:
+    array-buffer-byte-length "^1.0.1"
+    call-bind "^1.0.5"
+    define-properties "^1.2.1"
+    es-abstract "^1.22.3"
+    es-errors "^1.2.1"
+    get-intrinsic "^1.2.3"
+    is-array-buffer "^3.0.4"
+    is-shared-array-buffer "^1.0.2"
+
 arrify@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
@@ -3964,10 +3987,12 @@ autoprefixer@10.4.13:
     picocolors "^1.0.0"
     postcss-value-parser "^4.2.0"
 
-available-typed-arrays@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7"
-  integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==
+available-typed-arrays@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz#a5cc375d6a03c2efc87a553f3e0b1522def14846"
+  integrity sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==
+  dependencies:
+    possible-typed-array-names "^1.0.0"
 
 aws-sign2@~0.7.0:
   version "0.7.0"
@@ -4067,9 +4092,9 @@ big.js@^5.2.2:
   integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
 
 binary-extensions@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
-  integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.3.0.tgz#f6e14a97858d327252200242d4ccfe522c445522"
+  integrity sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==
 
 bl@^4.1.0:
   version "4.1.0"
@@ -4085,27 +4110,9 @@ blocking-proxy@^1.0.0:
   resolved "https://registry.yarnpkg.com/blocking-proxy/-/blocking-proxy-1.0.1.tgz#81d6fd1fe13a4c0d6957df7f91b75e98dac40cb2"
   integrity sha512-KE8NFMZr3mN2E0HcvCgRtX7DjhiIQrwle+nSVJVC/yqFb9+xznHl2ZcoBp2L9qzkI4t4cBFJ1efXF8Dwi132RA==
   dependencies:
-    minimist "^1.2.0"
-
-body-parser@1.20.1:
-  version "1.20.1"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.1.tgz#b1812a8912c195cd371a3ee5e66faa2338a5c668"
-  integrity sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==
-  dependencies:
-    bytes "3.1.2"
-    content-type "~1.0.4"
-    debug "2.6.9"
-    depd "2.0.0"
-    destroy "1.2.0"
-    http-errors "2.0.0"
-    iconv-lite "0.4.24"
-    on-finished "2.4.1"
-    qs "6.11.0"
-    raw-body "2.5.1"
-    type-is "~1.6.18"
-    unpipe "1.0.0"
+    minimist "^1.2.0"
 
-body-parser@^1.19.0:
+body-parser@1.20.2, body-parser@^1.19.0:
   version "1.20.2"
   resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.2.tgz#6feb0e21c4724d06de7ff38da36dad4f57a747fd"
   integrity sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==
@@ -4124,12 +4131,10 @@ body-parser@^1.19.0:
     unpipe "1.0.0"
 
 bonjour-service@^1.0.11:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/bonjour-service/-/bonjour-service-1.1.0.tgz#424170268d68af26ff83a5c640b95def01803a13"
-  integrity sha512-LVRinRB3k1/K0XzZ2p58COnWvkQknIY6sf0zF2rpErvcJXpMBttEPQSxK+HEXSS9VmpZlDoDnQWv8ftJT20B0Q==
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/bonjour-service/-/bonjour-service-1.2.1.tgz#eb41b3085183df3321da1264719fbada12478d02"
+  integrity sha512-oSzCS2zV14bh2kji6vNe7vrpJYCHGvcZnlffFQ1MEoX/WOeQ/teD8SYWKR942OI3INjq8OMNJlbPK5LLLUxFDw==
   dependencies:
-    array-flatten "^2.1.2"
-    dns-equal "^1.0.0"
     fast-deep-equal "^3.1.3"
     multicast-dns "^7.2.5"
 
@@ -4160,7 +4165,7 @@ braces@^3.0.2, braces@~3.0.2:
   dependencies:
     fill-range "^7.0.1"
 
-browserslist@4.21.5, browserslist@^4.14.5, browserslist@^4.21.3, browserslist@^4.21.4, browserslist@^4.21.5:
+browserslist@4.21.5:
   version "4.21.5"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.5.tgz#75c5dae60063ee641f977e00edd3cfb2fb7af6a7"
   integrity sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w==
@@ -4170,6 +4175,16 @@ browserslist@4.21.5, browserslist@^4.14.5, browserslist@^4.21.3, browserslist@^4
     node-releases "^2.0.8"
     update-browserslist-db "^1.0.10"
 
+browserslist@^4.14.5, browserslist@^4.21.4, browserslist@^4.22.2, browserslist@^4.22.3:
+  version "4.23.0"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.23.0.tgz#8f3acc2bbe73af7213399430890f86c63a5674ab"
+  integrity sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==
+  dependencies:
+    caniuse-lite "^1.0.30001587"
+    electron-to-chromium "^1.4.668"
+    node-releases "^2.0.14"
+    update-browserslist-db "^1.0.13"
+
 browserstack@^1.5.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/browserstack/-/browserstack-1.6.1.tgz#e051f9733ec3b507659f395c7a4765a1b1e358b3"
@@ -4190,6 +4205,11 @@ buffer@^5.5.0:
     base64-js "^1.3.1"
     ieee754 "^1.1.13"
 
+builtin-modules@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.3.0.tgz#cae62812b89801e9656336e46223e030386be7b6"
+  integrity sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==
+
 builtins@^5.0.0:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/builtins/-/builtins-5.0.1.tgz#87f6db9ab0458be728564fa81d876d8d74552fa9"
@@ -4207,7 +4227,7 @@ bytes@3.1.2:
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5"
   integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==
 
-cacache@17.0.4, cacache@^17.0.0:
+cacache@17.0.4, cacache@^16.1.0, cacache@^17.0.0:
   version "17.0.4"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-17.0.4.tgz#5023ed892ba8843e3b7361c26d0ada37e146290c"
   integrity sha512-Z/nL3gU+zTUjz5pCA5vVjYM8pmaw2kxM7JEiE0fv3w77Wj+sFbi70CrBruUWH0uNcEdvLDixFpgA2JM4F4DBjA==
@@ -4226,37 +4246,16 @@ cacache@17.0.4, cacache@^17.0.0:
     tar "^6.1.11"
     unique-filename "^3.0.0"
 
-cacache@^16.1.0:
-  version "16.1.3"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-16.1.3.tgz#a02b9f34ecfaf9a78c9f4bc16fceb94d5d67a38e"
-  integrity sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ==
-  dependencies:
-    "@npmcli/fs" "^2.1.0"
-    "@npmcli/move-file" "^2.0.0"
-    chownr "^2.0.0"
-    fs-minipass "^2.1.0"
-    glob "^8.0.1"
-    infer-owner "^1.0.4"
-    lru-cache "^7.7.1"
-    minipass "^3.1.6"
-    minipass-collect "^1.0.2"
-    minipass-flush "^1.0.5"
-    minipass-pipeline "^1.2.4"
-    mkdirp "^1.0.4"
-    p-map "^4.0.0"
-    promise-inflight "^1.0.1"
-    rimraf "^3.0.2"
-    ssri "^9.0.0"
-    tar "^6.1.11"
-    unique-filename "^2.0.0"
-
-call-bind@^1.0.0, call-bind@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
-  integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==
+call-bind@^1.0.2, call-bind@^1.0.5, call-bind@^1.0.6, call-bind@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.7.tgz#06016599c40c56498c18769d2730be242b6fa3b9"
+  integrity sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==
   dependencies:
-    function-bind "^1.1.1"
-    get-intrinsic "^1.0.2"
+    es-define-property "^1.0.0"
+    es-errors "^1.3.0"
+    function-bind "^1.1.2"
+    get-intrinsic "^1.2.4"
+    set-function-length "^1.2.1"
 
 callsites@^3.0.0:
   version "3.1.0"
@@ -4268,10 +4267,10 @@ camelcase@^5.0.0, camelcase@^5.3.1:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-caniuse-lite@^1.0.30001426, caniuse-lite@^1.0.30001449:
-  version "1.0.30001460"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001460.tgz#31d2e26f0a2309860ed3eff154e03890d9d851a7"
-  integrity sha512-Bud7abqjvEjipUkpLs4D7gR0l8hBYBHoa+tGtKJHvT2AYzLp1z7EmVkUT4ERpVUfca8S2HGIVs883D8pUH1ZzQ==
+caniuse-lite@^1.0.30001426, caniuse-lite@^1.0.30001449, caniuse-lite@^1.0.30001587:
+  version "1.0.30001599"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001599.tgz#571cf4f3f1506df9bf41fcbb6d10d5d017817bce"
+  integrity sha512-LRAQHZ4yT1+f9LemSMeqdMpMxZcc4RMWdj4tiFe3G8tNkWK+E58g+/tzotb5cU6TbcVJLr4fySiAW7XmxQvZQA==
 
 canvas-gauges@^2.1.7:
   version "2.1.7"
@@ -4294,7 +4293,7 @@ chalk@^1.1.1, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.0.0, chalk@^2.4.2:
+chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -4316,7 +4315,7 @@ chardet@^0.7.0:
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
   integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
 
-chokidar@3.5.3, "chokidar@>=3.0.0 <4.0.0", chokidar@^3.0.0, chokidar@^3.5.1, chokidar@^3.5.3:
+chokidar@3.5.3:
   version "3.5.3"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
   integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
@@ -4331,6 +4330,21 @@ chokidar@3.5.3, "chokidar@>=3.0.0 <4.0.0", chokidar@^3.0.0, chokidar@^3.5.1, cho
   optionalDependencies:
     fsevents "~2.3.2"
 
+"chokidar@>=3.0.0 <4.0.0", chokidar@^3.0.0, chokidar@^3.5.1, chokidar@^3.5.3:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.6.0.tgz#197c6cc669ef2a8dc5e7b4d97ee4e092c3eb0d5b"
+  integrity sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==
+  dependencies:
+    anymatch "~3.1.2"
+    braces "~3.0.2"
+    glob-parent "~5.1.2"
+    is-binary-path "~2.1.0"
+    is-glob "~4.0.1"
+    normalize-path "~3.0.0"
+    readdirp "~3.6.0"
+  optionalDependencies:
+    fsevents "~2.3.2"
+
 chownr@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
@@ -4347,9 +4361,9 @@ ci-info@^2.0.0:
   integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==
 
 classnames@2.x, classnames@^2.2.1, classnames@^2.2.6:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.2.tgz#351d813bf0137fcc6a76a16b88208d2560a0d924"
-  integrity sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw==
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.5.1.tgz#ba774c614be0f016da105c858e7159eae8e7687b"
+  integrity sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==
 
 clean-stack@^2.0.0:
   version "2.2.0"
@@ -4364,9 +4378,9 @@ cli-cursor@^3.1.0:
     restore-cursor "^3.1.0"
 
 cli-spinners@^2.5.0:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.7.0.tgz#f815fd30b5f9eaac02db604c7a231ed7cb2f797a"
-  integrity sha512-qu3pN8Y3qHNgE2AFweciB1IfMnmZ/fsNTEE+NOFjmGB2F/7rLhnhzppvpCnN4FovtP26k8lHyy9ptEbNwWFLzw==
+  version "2.9.2"
+  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.9.2.tgz#1773a8f4b9c4d6ac31563df53b3fc1d79462fe41"
+  integrity sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==
 
 cli-width@^3.0.0:
   version "3.0.0"
@@ -4458,16 +4472,16 @@ color-support@^1.1.3:
   integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
 
 colorette@^2.0.10:
-  version "2.0.19"
-  resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.19.tgz#cdf044f47ad41a0f4b56b3a0d5b4e6e1a2d5a798"
-  integrity sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==
+  version "2.0.20"
+  resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.20.tgz#9eb793e6833067f7235902fcd3b09917a000a95a"
+  integrity sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==
 
 colors@1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
   integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
 
-combined-stream@^1.0.6, combined-stream@~1.0.6:
+combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
   integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
@@ -4504,15 +4518,15 @@ commander@^2.19.0, commander@^2.20.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
 
-commander@^8.0.0:
+commander@^8.3.0:
   version "8.3.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66"
   integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==
 
-comment-parser@1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/comment-parser/-/comment-parser-1.3.1.tgz#3d7ea3adaf9345594aedee6563f422348f165c1b"
-  integrity sha512-B52sN2VNghyq5ofvUsqZjmk6YkihBX5vMSChmSK9v4ShjKf3Vk5Xcmgpw4o+iIgtrnM/u5FiMpz9VKb8lpBveA==
+comment-parser@1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/comment-parser/-/comment-parser-1.4.1.tgz#bdafead37961ac079be11eb7ec65c4d021eaf9cc"
+  integrity sha512-buhp5kePrmda3vhc5B9t7pUQXAb2Tnd0qgpkIhPhkHXxJpiPJ11H0ZEU0oBpJ2QztSbzG/ZxMj/CHsYJqRHmyg==
 
 commondir@^1.0.1:
   version "1.0.1"
@@ -4597,6 +4611,11 @@ convert-source-map@^1.5.1, convert-source-map@^1.7.0:
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f"
   integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==
 
+convert-source-map@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a"
+  integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==
+
 cookie-signature@1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
@@ -4632,16 +4651,16 @@ copy-webpack-plugin@11.0.0:
     serialize-javascript "^6.0.0"
 
 core-js-compat@^3.25.1:
-  version "3.29.0"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.29.0.tgz#1b8d9eb4191ab112022e7f6364b99b65ea52f528"
-  integrity sha512-ScMn3uZNAFhK2DGoEfErguoiAHhV2Ju+oJo/jK08p7B3f3UhocUrCCkTvnZaiS+edl5nlIoiBXKcwMc6elv4KQ==
+  version "3.36.0"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.36.0.tgz#087679119bc2fdbdefad0d45d8e5d307d45ba190"
+  integrity sha512-iV9Pd/PsgjNWBXeq8XRtWVSgz2tKAfhfvBs7qxYty+RlRd+OCksaWmOnc4JKrTc1cToXL1N0s3l/vwlxPtdElw==
   dependencies:
-    browserslist "^4.21.5"
+    browserslist "^4.22.3"
 
 core-js@^3.29.1:
-  version "3.29.1"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.29.1.tgz#40ff3b41588b091aaed19ca1aa5cb111803fa9a6"
-  integrity sha512-+jwgnhg6cQxKYIIjGtAHq2nwUOolo9eoFZ4sHfUH09BLXBgxnH4gA0zEd+t+BO2cNB8idaBtZFcFTRjQJRJmAw==
+  version "3.36.0"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.36.0.tgz#e752fa0b0b462a0787d56e9d73f80b0f7c0dde68"
+  integrity sha512-mt7+TUBbTFg5+GngsAxeKBTl5/VS0guFeJacYge9OmHb+m058UwwIm41SE9T4Den7ClatV57B6TYTuJ0CX1MAw==
 
 core-util-is@1.0.2:
   version "1.0.2"
@@ -4686,6 +4705,17 @@ cosmiconfig@^7.0.0:
     path-type "^4.0.0"
     yaml "^1.10.0"
 
+coveralls-next@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/coveralls-next/-/coveralls-next-4.2.0.tgz#821fb802f98284a3c11c96577b7fd0eaf4d4473e"
+  integrity sha512-zg41a/4QDSASPtlV6gp+6owoU43U5CguxuPZR3nPZ26M5ZYdEK3MdUe7HwE+AnCZPkucudfhqqJZehCNkz2rYg==
+  dependencies:
+    form-data "4.0.0"
+    js-yaml "4.1.0"
+    lcov-parse "1.0.0"
+    log-driver "1.2.7"
+    minimist "1.2.7"
+
 create-require@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
@@ -4779,9 +4809,9 @@ csstype@^2.5.2:
   integrity sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w==
 
 csstype@^3.0.2:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.1.tgz#841b532c45c758ee546a11d5bd7b7b473c8c30b9"
-  integrity sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.3.tgz#d80ff294d114fb0e6ac500fbf85b60137d7eff81"
+  integrity sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==
 
 custom-event@~1.0.0:
   version "1.0.1"
@@ -4803,17 +4833,17 @@ cytoscape-fcose@^2.1.0:
     cose-base "^2.2.0"
 
 cytoscape@^3.23.0:
-  version "3.23.0"
-  resolved "https://registry.yarnpkg.com/cytoscape/-/cytoscape-3.23.0.tgz#054ee05a6d0aa3b4f139382bbf2f4e5226df3c6d"
-  integrity sha512-gRZqJj/1kiAVPkrVFvz/GccxsXhF3Qwpptl32gKKypO4IlqnKBjTOu+HbXtEggSGzC5KCaHp3/F7GgENrtsFkA==
+  version "3.28.1"
+  resolved "https://registry.yarnpkg.com/cytoscape/-/cytoscape-3.28.1.tgz#f32c3e009bdf32d47845a16a4cd2be2bbc01baf7"
+  integrity sha512-xyItz4O/4zp9/239wCcH8ZcFuuZooEeF8KHRmzjDfGdXsj3OG9MFSMA0pJE0uX3uCN/ygof6hHf4L7lst+JaDg==
   dependencies:
     heap "^0.2.6"
     lodash "^4.17.21"
 
 "d3-array@2 - 3", "d3-array@2.10.0 - 3", "d3-array@2.5.0 - 3", d3-array@3, d3-array@^3.2.0:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-3.2.2.tgz#f8ac4705c5b06914a7e0025bbf8d5f1513f6a86e"
-  integrity sha512-yEEyEAbDrF8C6Ob2myOBLjwBLck1Z89jMGFee0oPsn95GqjerpaOA4ch+vc2l0FNFFwMD5N7OCSEN5eAlsUbgQ==
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-3.2.4.tgz#15fec33b237f97ac5d7c986dc77da273a8ed0bb5"
+  integrity sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==
   dependencies:
     internmap "1 - 2"
 
@@ -4853,9 +4883,9 @@ d3-contour@4:
     d3-array "^3.2.0"
 
 d3-delaunay@6:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/d3-delaunay/-/d3-delaunay-6.0.2.tgz#7fd3717ad0eade2fc9939f4260acfb503f984e92"
-  integrity sha512-IMLNldruDQScrcfT+MWnazhHbDJhcRJyOEBAJfwQnHle1RPh6WDuLvxNArUju2VSMSUuKlY5BGHRJ2cYyoFLQQ==
+  version "6.0.4"
+  resolved "https://registry.yarnpkg.com/d3-delaunay/-/d3-delaunay-6.0.4.tgz#98169038733a0a5babbeda55054f795bb9e4a58b"
+  integrity sha512-mdjtIZ1XLAM8bm/hx3WwjfHt6Sggek7qH043O8KEjDXN40xi3vx/6pYSVTwLjEgiXQTbvaouWKynLBiUZ6SK6A==
   dependencies:
     delaunator "5"
 
@@ -4908,9 +4938,9 @@ d3-force@3:
   integrity sha512-YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA==
 
 d3-geo@3:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/d3-geo/-/d3-geo-3.1.0.tgz#74fd54e1f4cebd5185ac2039217a98d39b0a4c0e"
-  integrity sha512-JEo5HxXDdDYXCaWdwLRt79y7giK8SbhZJbFWXqbRTolCHFI5jRqteLzCsq51NKbUoX0PjBVSohxrx+NoOUujYA==
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/d3-geo/-/d3-geo-3.1.1.tgz#6027cf51246f9b2ebd64f99e01dc7c3364033a4d"
+  integrity sha512-637ln3gXKXOwhalDzinUgY83KzNWZRKbYubaG+fGVuc/dxO64RRljtCTnf5ecMyE1RIdtqpkVcq0IbtU2S8j2Q==
   dependencies:
     d3-array "2.5.0 - 3"
 
@@ -4947,9 +4977,9 @@ d3-random@3:
   integrity sha512-FXMe9GfxTxqd5D6jFsQ+DJ8BJS4E/fT5mqqdjovykEB2oFbTMDVdg1MGFxfQW+FBOGoB++k8swBrgwSHT1cUXQ==
 
 d3-scale-chromatic@3:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/d3-scale-chromatic/-/d3-scale-chromatic-3.0.0.tgz#15b4ceb8ca2bb0dcb6d1a641ee03d59c3b62376a"
-  integrity sha512-Lx9thtxAKrO2Pq6OO2Ua474opeziKr279P/TKZsMAhYyNDD3EnCffdbgeSYN5O7m2ByQsxtuP2CSDczNUIZ22g==
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/d3-scale-chromatic/-/d3-scale-chromatic-3.1.0.tgz#34c39da298b23c20e02f1a4b239bd0f22e7f1314"
+  integrity sha512-A3s5PWiZ9YCXFye1o246KoscMWqf8BsD9eRiJ3He7C9OBaxKhAd5TFCdEx/7VbKtxxTsu//1mMJFrEt572cEyQ==
   dependencies:
     d3-color "1 - 3"
     d3-interpolate "1 - 3"
@@ -5018,10 +5048,10 @@ d3-zoom@3:
     d3-selection "2 - 3"
     d3-transition "2 - 3"
 
-d3@^7.0.0, d3@^7.8.2:
-  version "7.8.2"
-  resolved "https://registry.yarnpkg.com/d3/-/d3-7.8.2.tgz#2bdb3c178d095ae03b107a18837ae049838e372d"
-  integrity sha512-WXty7qOGSHb7HR7CfOzwN1Gw04MUOzN8qh9ZUsvwycIMb4DYMpY9xczZ6jUorGtO6bR9BPMPaueIKwiDxu9uiQ==
+d3@^7.4.0, d3@^7.8.2:
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/d3/-/d3-7.9.0.tgz#579e7acb3d749caf8860bd1741ae8d371070cd5d"
+  integrity sha512-e1U46jVP+w7Iut8Jt8ri1YsPOvFpg46k+K8TpCb0P+zjCkjkPnV7WzfDJzMHy1LnA+wj5pLT1wjO901gLXeEhA==
   dependencies:
     d3-array "3"
     d3-axis "3"
@@ -5054,10 +5084,10 @@ d3@^7.0.0, d3@^7.8.2:
     d3-transition "3"
     d3-zoom "3"
 
-dagre-d3-es@7.0.8:
-  version "7.0.8"
-  resolved "https://registry.yarnpkg.com/dagre-d3-es/-/dagre-d3-es-7.0.8.tgz#14c309c3c08ba8329a7cf51000bd56a369c513d1"
-  integrity sha512-eykdoYQ4FwCJinEYS0gPL2f2w+BPbSLvnQSJ3Ye1vAoPjdkq6xIMKBv+UkICd3qZE26wBKIn3p+6n0QC7R1LyA==
+dagre-d3-es@7.0.9:
+  version "7.0.9"
+  resolved "https://registry.yarnpkg.com/dagre-d3-es/-/dagre-d3-es-7.0.9.tgz#aca12fccd9d09955a4430029ba72ee6934542a8d"
+  integrity sha512-rYR4QfVmy+sR44IBDvVtcAmOReGBvRCWDpO2QjYwqgh9yijw6eSHBqaPG/LIOEy7aBsniLvtMW6pg19qJhq60w==
   dependencies:
     d3 "^7.8.2"
     lodash-es "^4.17.21"
@@ -5069,6 +5099,33 @@ dashdash@^1.12.0:
   dependencies:
     assert-plus "^1.0.0"
 
+data-view-buffer@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/data-view-buffer/-/data-view-buffer-1.0.1.tgz#8ea6326efec17a2e42620696e671d7d5a8bc66b2"
+  integrity sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==
+  dependencies:
+    call-bind "^1.0.6"
+    es-errors "^1.3.0"
+    is-data-view "^1.0.1"
+
+data-view-byte-length@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz#90721ca95ff280677eb793749fce1011347669e2"
+  integrity sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==
+  dependencies:
+    call-bind "^1.0.7"
+    es-errors "^1.3.0"
+    is-data-view "^1.0.1"
+
+data-view-byte-offset@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz#5e0bbfb4828ed2d1b9b400cd8a7d119bca0ff18a"
+  integrity sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==
+  dependencies:
+    call-bind "^1.0.6"
+    es-errors "^1.3.0"
+    is-data-view "^1.0.1"
+
 date-fns@2.0.0-alpha.27:
   version "2.0.0-alpha.27"
   resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.0.0-alpha.27.tgz#5ecd4204ef0e7064264039570f6e8afbc014481c"
@@ -5084,10 +5141,10 @@ dayjs@1.11.4:
   resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.4.tgz#3b3c10ca378140d8917e06ebc13a4922af4f433e"
   integrity sha512-Zj/lPM5hOvQ1Bf7uAvewDaUcsJoI6JmNqmHhHl3nyumwe0XHwt8sWdOVAPACJzCebL8gQCi+K49w7iKWnGwX9g==
 
-dayjs@^1.11.5:
-  version "1.11.7"
-  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.7.tgz#4b296922642f70999544d1144a2c25730fce63e2"
-  integrity sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ==
+dayjs@^1.11.5, dayjs@^1.11.7:
+  version "1.11.10"
+  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.10.tgz#68acea85317a6e164457d6d6947564029a6a16a0"
+  integrity sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ==
 
 debug@2.6.9:
   version "2.6.9"
@@ -5096,14 +5153,14 @@ debug@2.6.9:
   dependencies:
     ms "2.0.0"
 
-debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4, debug@~4.3.1, debug@~4.3.2:
+debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4, debug@~4.3.1, debug@~4.3.2, 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"
 
-debug@^3.1.0, debug@^3.2.6, debug@^3.2.7:
+debug@^3.1.0, debug@^3.2.7:
   version "3.2.7"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
   integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
@@ -5116,15 +5173,16 @@ decamelize@^1.2.0:
   integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==
 
 deep-equal@^2.0.5:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-2.2.0.tgz#5caeace9c781028b9ff459f33b779346637c43e6"
-  integrity sha512-RdpzE0Hv4lhowpIUKKMJfeH6C1pXdtT1/it80ubgWqwI3qpuxUBpC1S4hnHg+zjnuOoDkzUtUCEEkG+XG5l3Mw==
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-2.2.3.tgz#af89dafb23a396c7da3e862abc0be27cf51d56e1"
+  integrity sha512-ZIwpnevOurS8bpT4192sqAowWM76JDKSHYzMLty3BZGSswgq6pBaH3DhCSW5xVAZICZyKdOBPjwww5wfgT/6PA==
   dependencies:
-    call-bind "^1.0.2"
-    es-get-iterator "^1.1.2"
-    get-intrinsic "^1.1.3"
+    array-buffer-byte-length "^1.0.0"
+    call-bind "^1.0.5"
+    es-get-iterator "^1.1.3"
+    get-intrinsic "^1.2.2"
     is-arguments "^1.1.1"
-    is-array-buffer "^3.0.1"
+    is-array-buffer "^3.0.2"
     is-date-object "^1.0.5"
     is-regex "^1.1.4"
     is-shared-array-buffer "^1.0.2"
@@ -5132,11 +5190,11 @@ deep-equal@^2.0.5:
     object-is "^1.1.5"
     object-keys "^1.1.1"
     object.assign "^4.1.4"
-    regexp.prototype.flags "^1.4.3"
+    regexp.prototype.flags "^1.5.1"
     side-channel "^1.0.4"
     which-boxed-primitive "^1.0.2"
     which-collection "^1.0.1"
-    which-typed-array "^1.1.9"
+    which-typed-array "^1.1.13"
 
 deep-extend@~0.6.0:
   version "0.6.0"
@@ -5167,16 +5225,26 @@ defaults@^1.0.3:
   dependencies:
     clone "^1.0.2"
 
+define-data-property@^1.0.1, define-data-property@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.4.tgz#894dc141bb7d3060ae4366f6a0107e68fbe48c5e"
+  integrity sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==
+  dependencies:
+    es-define-property "^1.0.0"
+    es-errors "^1.3.0"
+    gopd "^1.0.1"
+
 define-lazy-prop@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f"
   integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==
 
-define-properties@^1.1.3, define-properties@^1.1.4:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.0.tgz#52988570670c9eacedd8064f4a990f2405849bd5"
-  integrity sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==
+define-properties@^1.1.3, define-properties@^1.2.0, define-properties@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.1.tgz#10781cc616eb951a80a034bafcaa7377f6af2b6c"
+  integrity sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==
   dependencies:
+    define-data-property "^1.0.1"
     has-property-descriptors "^1.0.0"
     object-keys "^1.1.1"
 
@@ -5194,11 +5262,11 @@ del@^2.2.0:
     rimraf "^2.2.8"
 
 delaunator@5:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/delaunator/-/delaunator-5.0.0.tgz#60f052b28bd91c9b4566850ebf7756efe821d81b"
-  integrity sha512-AyLvtyJdbv/U1GkiS6gUUzclRoAY4Gs75qkMygJJhU75LW4DNuSF2RMzpxs9jw9Oz1BobHjTdkG3zdP55VxAqw==
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/delaunator/-/delaunator-5.0.1.tgz#39032b08053923e924d6094fe2cde1a99cc51278"
+  integrity sha512-8nvh+XBe96aCESrGOqMp/84b13H9cdKbG5P2ejQCh4d4sK9RL4371qou9drQjMhvnPmhWl5hnmqbEE0fXr9Xnw==
   dependencies:
-    robust-predicates "^3.0.0"
+    robust-predicates "^3.0.2"
 
 delayed-stream@~1.0.0:
   version "1.0.0"
@@ -5220,7 +5288,7 @@ depd@2.0.0:
   resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
   integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
 
-depd@^1.1.2, depd@~1.1.2:
+depd@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
   integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==
@@ -5256,9 +5324,9 @@ diff@^4.0.1:
   integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
 
 dijkstrajs@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/dijkstrajs/-/dijkstrajs-1.0.2.tgz#2e48c0d3b825462afe75ab4ad5e829c8ece36257"
-  integrity sha512-QV6PMaHTCNmKSeP6QoXhVTw9snc9VD8MulTT0Bd99Pacp4SS1cjcrYPgBPmibqKVtMJJfqC6XvOXgPMEEPH/fg==
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/dijkstrajs/-/dijkstrajs-1.0.3.tgz#4c8dbdea1f0f6478bff94d9c49c784d623e4fc23"
+  integrity sha512-qiSlmBq9+BCdCA/L46dw8Uy93mloxsPSbwnm5yrKn2vMPiy8KyAskTF6zuV/j5BMsmOGZDPs7KjU+mjb670kfA==
 
 dir-glob@^3.0.1:
   version "3.0.1"
@@ -5275,15 +5343,10 @@ directory-tree@^3.5.1:
     command-line-args "^5.2.0"
     command-line-usage "^6.1.1"
 
-dns-equal@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d"
-  integrity sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg==
-
 dns-packet@^5.2.2:
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-5.4.0.tgz#1f88477cf9f27e78a213fb6d118ae38e759a879b"
-  integrity sha512-EgqGeaBB8hLiHLZtp/IbaDQTL8pZ0+IvwzSHA6d7VyMDM+B9hgddEMa9xjK5oYnw0ci0JQ6g2XCD7/f6cafU6g==
+  version "5.6.1"
+  resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-5.6.1.tgz#ae888ad425a9d1478a0674256ab866de1012cf2f"
+  integrity sha512-l4gcSouhcgIKRvyy99RNVOgxXiicE+2jZoNmaNmZ6JXiGajBOJAesk1OBlJuM5k2c+eudGdLxDqXuPCKIj6kpw==
   dependencies:
     "@leichtgewicht/ip-codec" "^2.0.1"
 
@@ -5367,13 +5430,12 @@ ecc-jsbn@~0.1.1:
     jsbn "~0.1.0"
     safer-buffer "^2.1.0"
 
-echarts@^5.4.3:
-  version "5.4.3"
-  resolved "https://registry.yarnpkg.com/echarts/-/echarts-5.4.3.tgz#f5522ef24419164903eedcfd2b506c6fc91fb20c"
-  integrity sha512-mYKxLxhzy6zyTi/FaEbJMOZU1ULGEQHaeIeuMR5L+JnJTpz+YR03mnnpBhbR4+UYJAgiXgpyTVLffPAjOTLkZA==
+"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.4.4"
+    zrender "5.5.0"
 
 editorconfig@^0.15.3:
   version "0.15.3"
@@ -5390,10 +5452,10 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
 
-electron-to-chromium@^1.4.284:
-  version "1.4.317"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.317.tgz#9a3d38a1a37f26a417d3d95dafe198ff11ed072b"
-  integrity sha512-JhCRm9v30FMNzQSsjl4kXaygU+qHBD0Yh7mKxyjmF0V8VwYVB6qpBRX28GyAucrM9wDCpSUctT6FpMUQxbyKuA==
+electron-to-chromium@^1.4.284, electron-to-chromium@^1.4.668:
+  version "1.4.708"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.708.tgz#d54d3b47cb44ae6b190067439c42135456907893"
+  integrity sha512-iWgEEvREL4GTXXHKohhh33+6Y8XkPI5eHihDmm8zUk5Zo7HICEW+wI/j5kJ2tbuNUCXJ/sNXa03ajW635DiJXA==
 
 elkjs@^0.8.2:
   version "0.8.2"
@@ -5432,15 +5494,15 @@ encoding@^0.1.13:
   dependencies:
     iconv-lite "^0.6.2"
 
-engine.io-parser@~5.0.3:
-  version "5.0.6"
-  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.0.6.tgz#7811244af173e157295dec9b2718dfe42a64ef45"
-  integrity sha512-tjuoZDMAdEhVnSFleYPCtdL2GXwVTGtNjoeJd9IhIG3C1xs9uwxqRNEu5WpnDZCaozwVlK/nuQhpodhXSIMaxw==
+engine.io-parser@~5.2.1:
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.2.2.tgz#37b48e2d23116919a3453738c5720455e64e1c49"
+  integrity sha512-RcyUFKA93/CXH20l4SoVvzZfrSDMOTUS3bWVpTt2FuFP+XYrL8i8oonHP7WInRyVHXh0n/ORtoeiE1os+8qkSw==
 
-engine.io@~6.4.1:
-  version "6.4.1"
-  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-6.4.1.tgz#8056b4526a88e779f9c280d820422d4e3eeaaae5"
-  integrity sha512-JFYQurD/nbsA5BSPmbaOSLa3tSVj8L6o4srSwXXY3NqE+gGUNmmPTbhn8tjzcCtSqhFgIeqef81ngny8JM25hw==
+engine.io@~6.5.2:
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-6.5.4.tgz#6822debf324e781add2254e912f8568508850cdc"
+  integrity sha512-KdVSDKhVKyOi+r5uEabrDLZw2qXStVvCsEB/LN3mw4WFi6Gx50jTyuxYVCwAAC0U46FdnzP/ScKRBTXb/NiEOg==
   dependencies:
     "@types/cookie" "^0.4.1"
     "@types/cors" "^2.8.12"
@@ -5450,13 +5512,13 @@ engine.io@~6.4.1:
     cookie "~0.4.1"
     cors "~2.8.5"
     debug "~4.3.1"
-    engine.io-parser "~5.0.3"
+    engine.io-parser "~5.2.1"
     ws "~8.11.0"
 
 enhanced-resolve@^5.10.0:
-  version "5.12.0"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz#300e1c90228f5b570c4d35babf263f6da7155634"
-  integrity sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==
+  version "5.16.0"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.16.0.tgz#65ec88778083056cb32487faa9aef82ed0864787"
+  integrity sha512-O+QWCviPNSSLAD9Ucn8Awv+poAkqn3T1XY5/N7kR7rQO9yfSGWkYZDwpJ+iKF7B8rxaQKWngSqACpgzeapSyoA==
   dependencies:
     graceful-fs "^4.2.4"
     tapable "^2.2.0"
@@ -5472,9 +5534,9 @@ entities@^2.0.0:
   integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==
 
 entities@^4.3.0, entities@^4.4.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-4.4.0.tgz#97bdaba170339446495e653cfd2db78962900174"
-  integrity sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA==
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48"
+  integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==
 
 env-paths@^2.2.0:
   version "2.2.1"
@@ -5500,46 +5562,123 @@ error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
-es-abstract@^1.19.0, es-abstract@^1.20.4:
-  version "1.21.1"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.21.1.tgz#e6105a099967c08377830a0c9cb589d570dd86c6"
-  integrity sha512-QudMsPOz86xYz/1dG1OuGBKOELjCh99IIWHLzy5znUB6j8xG2yMA7bfTV86VSqKF+Y/H08vQPR+9jyXpuC6hfg==
-  dependencies:
-    available-typed-arrays "^1.0.5"
-    call-bind "^1.0.2"
-    es-set-tostringtag "^2.0.1"
+es-abstract@^1.22.1, es-abstract@^1.22.3:
+  version "1.22.5"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.22.5.tgz#1417df4e97cc55f09bf7e58d1e614bc61cb8df46"
+  integrity sha512-oW69R+4q2wG+Hc3KZePPZxOiisRIqfKBVo/HLx94QcJeWGU/8sZhCvc829rd1kS366vlJbzBfXf9yWwf0+Ko7w==
+  dependencies:
+    array-buffer-byte-length "^1.0.1"
+    arraybuffer.prototype.slice "^1.0.3"
+    available-typed-arrays "^1.0.7"
+    call-bind "^1.0.7"
+    es-define-property "^1.0.0"
+    es-errors "^1.3.0"
+    es-set-tostringtag "^2.0.3"
     es-to-primitive "^1.2.1"
-    function-bind "^1.1.1"
-    function.prototype.name "^1.1.5"
-    get-intrinsic "^1.1.3"
-    get-symbol-description "^1.0.0"
+    function.prototype.name "^1.1.6"
+    get-intrinsic "^1.2.4"
+    get-symbol-description "^1.0.2"
     globalthis "^1.0.3"
     gopd "^1.0.1"
-    has "^1.0.3"
-    has-property-descriptors "^1.0.0"
-    has-proto "^1.0.1"
+    has-property-descriptors "^1.0.2"
+    has-proto "^1.0.3"
     has-symbols "^1.0.3"
-    internal-slot "^1.0.4"
-    is-array-buffer "^3.0.1"
+    hasown "^2.0.1"
+    internal-slot "^1.0.7"
+    is-array-buffer "^3.0.4"
     is-callable "^1.2.7"
-    is-negative-zero "^2.0.2"
+    is-negative-zero "^2.0.3"
     is-regex "^1.1.4"
-    is-shared-array-buffer "^1.0.2"
+    is-shared-array-buffer "^1.0.3"
     is-string "^1.0.7"
-    is-typed-array "^1.1.10"
+    is-typed-array "^1.1.13"
     is-weakref "^1.0.2"
-    object-inspect "^1.12.2"
+    object-inspect "^1.13.1"
     object-keys "^1.1.1"
-    object.assign "^4.1.4"
-    regexp.prototype.flags "^1.4.3"
-    safe-regex-test "^1.0.0"
-    string.prototype.trimend "^1.0.6"
-    string.prototype.trimstart "^1.0.6"
-    typed-array-length "^1.0.4"
+    object.assign "^4.1.5"
+    regexp.prototype.flags "^1.5.2"
+    safe-array-concat "^1.1.0"
+    safe-regex-test "^1.0.3"
+    string.prototype.trim "^1.2.8"
+    string.prototype.trimend "^1.0.7"
+    string.prototype.trimstart "^1.0.7"
+    typed-array-buffer "^1.0.2"
+    typed-array-byte-length "^1.0.1"
+    typed-array-byte-offset "^1.0.2"
+    typed-array-length "^1.0.5"
+    unbox-primitive "^1.0.2"
+    which-typed-array "^1.1.14"
+
+es-abstract@^1.23.0:
+  version "1.23.2"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.23.2.tgz#693312f3940f967b8dd3eebacb590b01712622e0"
+  integrity sha512-60s3Xv2T2p1ICykc7c+DNDPLDMm9t4QxCOUU0K9JxiLjM3C1zB9YVdN7tjxrFd4+AkZ8CdX1ovUga4P2+1e+/w==
+  dependencies:
+    array-buffer-byte-length "^1.0.1"
+    arraybuffer.prototype.slice "^1.0.3"
+    available-typed-arrays "^1.0.7"
+    call-bind "^1.0.7"
+    data-view-buffer "^1.0.1"
+    data-view-byte-length "^1.0.1"
+    data-view-byte-offset "^1.0.0"
+    es-define-property "^1.0.0"
+    es-errors "^1.3.0"
+    es-object-atoms "^1.0.0"
+    es-set-tostringtag "^2.0.3"
+    es-to-primitive "^1.2.1"
+    function.prototype.name "^1.1.6"
+    get-intrinsic "^1.2.4"
+    get-symbol-description "^1.0.2"
+    globalthis "^1.0.3"
+    gopd "^1.0.1"
+    has-property-descriptors "^1.0.2"
+    has-proto "^1.0.3"
+    has-symbols "^1.0.3"
+    hasown "^2.0.2"
+    internal-slot "^1.0.7"
+    is-array-buffer "^3.0.4"
+    is-callable "^1.2.7"
+    is-data-view "^1.0.1"
+    is-negative-zero "^2.0.3"
+    is-regex "^1.1.4"
+    is-shared-array-buffer "^1.0.3"
+    is-string "^1.0.7"
+    is-typed-array "^1.1.13"
+    is-weakref "^1.0.2"
+    object-inspect "^1.13.1"
+    object-keys "^1.1.1"
+    object.assign "^4.1.5"
+    regexp.prototype.flags "^1.5.2"
+    safe-array-concat "^1.1.2"
+    safe-regex-test "^1.0.3"
+    string.prototype.trim "^1.2.9"
+    string.prototype.trimend "^1.0.8"
+    string.prototype.trimstart "^1.0.7"
+    typed-array-buffer "^1.0.2"
+    typed-array-byte-length "^1.0.1"
+    typed-array-byte-offset "^1.0.2"
+    typed-array-length "^1.0.5"
     unbox-primitive "^1.0.2"
-    which-typed-array "^1.1.9"
+    which-typed-array "^1.1.15"
+
+es-array-method-boxes-properly@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz#873f3e84418de4ee19c5be752990b2e44718d09e"
+  integrity sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==
+
+es-define-property@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.0.tgz#c7faefbdff8b2696cf5f46921edfb77cc4ba3845"
+  integrity sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==
+  dependencies:
+    get-intrinsic "^1.2.4"
+
+es-errors@^1.0.0, es-errors@^1.2.1, es-errors@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f"
+  integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==
 
-es-get-iterator@^1.1.2:
+es-get-iterator@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/es-get-iterator/-/es-get-iterator-1.1.3.tgz#3ef87523c5d464d41084b2c3c9c214f1199763d6"
   integrity sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==
@@ -5559,21 +5698,28 @@ es-module-lexer@^0.9.0:
   resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19"
   integrity sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==
 
-es-set-tostringtag@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz#338d502f6f674301d710b80c8592de8a15f09cd8"
-  integrity sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==
+es-object-atoms@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/es-object-atoms/-/es-object-atoms-1.0.0.tgz#ddb55cd47ac2e240701260bc2a8e31ecb643d941"
+  integrity sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==
   dependencies:
-    get-intrinsic "^1.1.3"
-    has "^1.0.3"
-    has-tostringtag "^1.0.0"
+    es-errors "^1.3.0"
 
-es-shim-unscopables@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz#702e632193201e3edf8713635d083d378e510241"
-  integrity sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==
+es-set-tostringtag@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz#8bb60f0a440c2e4281962428438d58545af39777"
+  integrity sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==
+  dependencies:
+    get-intrinsic "^1.2.4"
+    has-tostringtag "^1.0.2"
+    hasown "^2.0.1"
+
+es-shim-unscopables@^1.0.0, es-shim-unscopables@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz#1f6942e71ecc7835ed1c8a83006d8771a63a3763"
+  integrity sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==
   dependencies:
-    has "^1.0.3"
+    hasown "^2.0.0"
 
 es-to-primitive@^1.2.1:
   version "1.2.1"
@@ -5630,9 +5776,9 @@ esbuild@0.17.8:
     "@esbuild/win32-x64" "0.17.8"
 
 escalade@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
-  integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.2.tgz#54076e9ab29ea5bf3d8f1ed62acffbb88272df27"
+  integrity sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==
 
 escape-html@~1.0.3:
   version "1.0.3"
@@ -5649,55 +5795,59 @@ escape-string-regexp@^4.0.0:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
-eslint-import-resolver-node@^0.3.7:
-  version "0.3.7"
-  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz#83b375187d412324a1963d84fa664377a23eb4d7"
-  integrity sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==
+eslint-import-resolver-node@^0.3.9:
+  version "0.3.9"
+  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz#d4eaac52b8a2e7c3cd1903eb00f7e053356118ac"
+  integrity sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==
   dependencies:
     debug "^3.2.7"
-    is-core-module "^2.11.0"
-    resolve "^1.22.1"
+    is-core-module "^2.13.0"
+    resolve "^1.22.4"
 
-eslint-module-utils@^2.7.4:
-  version "2.7.4"
-  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz#4f3e41116aaf13a20792261e61d3a2e7e0583974"
-  integrity sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==
+eslint-module-utils@^2.8.0:
+  version "2.8.1"
+  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.8.1.tgz#52f2404300c3bd33deece9d7372fb337cc1d7c34"
+  integrity sha512-rXDXR3h7cs7dy9RNpUlQf80nX31XWJEyGq1tRMo+6GsO5VmTe4UTwtmonAD4ZkAsrfMVDA2wlGJ3790Ys+D49Q==
   dependencies:
     debug "^3.2.7"
 
 eslint-plugin-import@latest:
-  version "2.27.5"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz#876a6d03f52608a3e5bb439c2550588e51dd6c65"
-  integrity sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==
-  dependencies:
-    array-includes "^3.1.6"
-    array.prototype.flat "^1.3.1"
-    array.prototype.flatmap "^1.3.1"
+  version "2.29.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.29.1.tgz#d45b37b5ef5901d639c15270d74d46d161150643"
+  integrity sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==
+  dependencies:
+    array-includes "^3.1.7"
+    array.prototype.findlastindex "^1.2.3"
+    array.prototype.flat "^1.3.2"
+    array.prototype.flatmap "^1.3.2"
     debug "^3.2.7"
     doctrine "^2.1.0"
-    eslint-import-resolver-node "^0.3.7"
-    eslint-module-utils "^2.7.4"
-    has "^1.0.3"
-    is-core-module "^2.11.0"
+    eslint-import-resolver-node "^0.3.9"
+    eslint-module-utils "^2.8.0"
+    hasown "^2.0.0"
+    is-core-module "^2.13.1"
     is-glob "^4.0.3"
     minimatch "^3.1.2"
-    object.values "^1.1.6"
-    resolve "^1.22.1"
-    semver "^6.3.0"
-    tsconfig-paths "^3.14.1"
+    object.fromentries "^2.0.7"
+    object.groupby "^1.0.1"
+    object.values "^1.1.7"
+    semver "^6.3.1"
+    tsconfig-paths "^3.15.0"
 
 eslint-plugin-jsdoc@latest:
-  version "40.0.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-40.0.1.tgz#5f028b4928d5c77f54bfd3c42c00acb61d27bb9f"
-  integrity sha512-KkiRInury7YrjjV5aCHDxwsPy6XFt5p2b2CnpDMITnWs8patNPf5kj24+VXIWw45kP6z/B0GOKfrYczB56OjQQ==
+  version "48.2.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-48.2.1.tgz#9334a05555a95fdc192980627142177963b668b4"
+  integrity sha512-iUvbcyDZSO/9xSuRv2HQBw++8VkV/pt3UWtX9cpPH0l7GKPq78QC/6+PmyQHHvNZaTjAce6QVciEbnc6J/zH5g==
   dependencies:
-    "@es-joy/jsdoccomment" "~0.36.1"
-    comment-parser "1.3.1"
+    "@es-joy/jsdoccomment" "~0.42.0"
+    are-docs-informative "^0.0.2"
+    comment-parser "1.4.1"
     debug "^4.3.4"
     escape-string-regexp "^4.0.0"
-    esquery "^1.4.0"
-    semver "^7.3.8"
-    spdx-expression-parse "^3.0.1"
+    esquery "^1.5.0"
+    is-builtin-module "^3.2.1"
+    semver "^7.6.0"
+    spdx-expression-parse "^4.0.0"
 
 eslint-plugin-prefer-arrow@latest:
   version "1.2.3"
@@ -5712,10 +5862,10 @@ eslint-scope@5.1.1, eslint-scope@^5.1.1:
     esrecurse "^4.3.0"
     estraverse "^4.1.1"
 
-eslint-scope@^7.0.0, eslint-scope@^7.1.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.1.1.tgz#fff34894c2f65e5226d3041ac480b4513a163642"
-  integrity sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==
+eslint-scope@^7.0.0, eslint-scope@^7.2.2:
+  version "7.2.2"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.2.tgz#deb4f92563390f32006894af62a22dba1c46423f"
+  integrity sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==
   dependencies:
     esrecurse "^4.3.0"
     estraverse "^5.2.0"
@@ -5732,37 +5882,33 @@ eslint-visitor-keys@^2.0.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
   integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
 
-eslint-visitor-keys@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826"
-  integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
-
-eslint-visitor-keys@^3.4.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.0.tgz#c7f0f956124ce677047ddbc192a68f999454dedc"
-  integrity sha512-HPpKPUBQcAsZOsHAFwTtIKcYlCje62XB7SEAcxjtmW6TD1WVpkS6i6/hOVtTZIl4zGj/mBqpFVGvaDneik+VoQ==
+eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.3:
+  version "3.4.3"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800"
+  integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==
 
 eslint@^8.37.0:
-  version "8.37.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.37.0.tgz#1f660ef2ce49a0bfdec0b0d698e0b8b627287412"
-  integrity sha512-NU3Ps9nI05GUoVMxcZx1J8CNR6xOvUT4jAUMH5+z8lpp3aEdPVCImKw6PWG4PY+Vfkpr+jvMpxs/qoE7wq0sPw==
+  version "8.57.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.57.0.tgz#c786a6fd0e0b68941aaf624596fb987089195668"
+  integrity sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==
   dependencies:
     "@eslint-community/eslint-utils" "^4.2.0"
-    "@eslint-community/regexpp" "^4.4.0"
-    "@eslint/eslintrc" "^2.0.2"
-    "@eslint/js" "8.37.0"
-    "@humanwhocodes/config-array" "^0.11.8"
+    "@eslint-community/regexpp" "^4.6.1"
+    "@eslint/eslintrc" "^2.1.4"
+    "@eslint/js" "8.57.0"
+    "@humanwhocodes/config-array" "^0.11.14"
     "@humanwhocodes/module-importer" "^1.0.1"
     "@nodelib/fs.walk" "^1.2.8"
-    ajv "^6.10.0"
+    "@ungap/structured-clone" "^1.2.0"
+    ajv "^6.12.4"
     chalk "^4.0.0"
     cross-spawn "^7.0.2"
     debug "^4.3.2"
     doctrine "^3.0.0"
     escape-string-regexp "^4.0.0"
-    eslint-scope "^7.1.1"
-    eslint-visitor-keys "^3.4.0"
-    espree "^9.5.1"
+    eslint-scope "^7.2.2"
+    eslint-visitor-keys "^3.4.3"
+    espree "^9.6.1"
     esquery "^1.4.2"
     esutils "^2.0.2"
     fast-deep-equal "^3.1.3"
@@ -5770,39 +5916,36 @@ eslint@^8.37.0:
     find-up "^5.0.0"
     glob-parent "^6.0.2"
     globals "^13.19.0"
-    grapheme-splitter "^1.0.4"
+    graphemer "^1.4.0"
     ignore "^5.2.0"
-    import-fresh "^3.0.0"
     imurmurhash "^0.1.4"
     is-glob "^4.0.0"
     is-path-inside "^3.0.3"
-    js-sdsl "^4.1.4"
     js-yaml "^4.1.0"
     json-stable-stringify-without-jsonify "^1.0.1"
     levn "^0.4.1"
     lodash.merge "^4.6.2"
     minimatch "^3.1.2"
     natural-compare "^1.4.0"
-    optionator "^0.9.1"
+    optionator "^0.9.3"
     strip-ansi "^6.0.1"
-    strip-json-comments "^3.1.0"
     text-table "^0.2.0"
 
-espree@^9.5.1:
-  version "9.5.1"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-9.5.1.tgz#4f26a4d5f18905bf4f2e0bd99002aab807e96dd4"
-  integrity sha512-5yxtHSZXRSW5pvv3hAlXM5+/Oswi1AUFqBmbibKb5s6bp3rGIDkyXU6xCoyuuLhijr4SFwPrXRoZjz0AZDN9tg==
+espree@^9.6.0, espree@^9.6.1:
+  version "9.6.1"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f"
+  integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==
   dependencies:
-    acorn "^8.8.0"
+    acorn "^8.9.0"
     acorn-jsx "^5.3.2"
-    eslint-visitor-keys "^3.4.0"
+    eslint-visitor-keys "^3.4.1"
 
 esprima@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
-esquery@^1.4.0, esquery@^1.4.2:
+esquery@^1.4.2, esquery@^1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.5.0.tgz#6ce17738de8577694edd7361c57182ac8cb0db0b"
   integrity sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==
@@ -5876,14 +6019,19 @@ exit@^0.1.2:
   resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
   integrity sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==
 
+exponential-backoff@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/exponential-backoff/-/exponential-backoff-3.1.1.tgz#64ac7526fe341ab18a39016cd22c787d01e00bf6"
+  integrity sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==
+
 express@^4.17.3:
-  version "4.18.2"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.18.2.tgz#3fabe08296e930c796c19e3c516979386ba9fd59"
-  integrity sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==
+  version "4.18.3"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.18.3.tgz#6870746f3ff904dee1819b82e4b51509afffb0d4"
+  integrity sha512-6VyCijWQ+9O7WuVMTRBTl+cjNNIzD5cY5mQ1WM8r/LEkI2u8EYpOotESNwzNlyCn3g+dmjKYI6BmNneSr/FSRw==
   dependencies:
     accepts "~1.3.8"
     array-flatten "1.1.1"
-    body-parser "1.20.1"
+    body-parser "1.20.2"
     content-disposition "0.5.4"
     content-type "~1.0.4"
     cookie "0.5.0"
@@ -5942,10 +6090,10 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
-fast-glob@^3.2.11, fast-glob@^3.2.9:
-  version "3.2.12"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80"
-  integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==
+fast-glob@^3.2.11, fast-glob@^3.2.9, fast-glob@^3.3.0:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.2.tgz#a904501e57cfdd2ffcded45e99a54fef55e46129"
+  integrity sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==
   dependencies:
     "@nodelib/fs.stat" "^2.0.2"
     "@nodelib/fs.walk" "^1.2.3"
@@ -5964,9 +6112,9 @@ fast-levenshtein@^2.0.6:
   integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
 
 fastq@^1.6.0:
-  version "1.15.0"
-  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.15.0.tgz#d04d07c6a2a68fe4599fea8d2e103a937fae6b3a"
-  integrity sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==
+  version "1.17.1"
+  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.17.1.tgz#2a523f07a4e7b1e81a42b91b8bf2254107753b47"
+  integrity sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==
   dependencies:
     reusify "^1.0.4"
 
@@ -6071,17 +6219,23 @@ find-yarn-workspace-root@^2.0.0:
     micromatch "^4.0.2"
 
 flat-cache@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11"
-  integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.2.0.tgz#2c0c2d5040c99b1632771a9d105725c0115363ee"
+  integrity sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==
   dependencies:
-    flatted "^3.1.0"
+    flatted "^3.2.9"
+    keyv "^4.5.3"
     rimraf "^3.0.2"
 
-flatted@^3.1.0, flatted@^3.2.7:
-  version "3.2.7"
-  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.7.tgz#609f39207cb614b89d0765b477cb2d437fbf9787"
-  integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==
+flat@^5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241"
+  integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==
+
+flatted@^3.2.7, flatted@^3.2.9:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.3.1.tgz#21db470729a6734d4997002f439cb308987f567a"
+  integrity sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==
 
 "flot.curvedlines@https://github.com/MichaelZinsmaier/CurvedLines.git#master":
   version "1.1.1"
@@ -6092,9 +6246,9 @@ flatted@^3.1.0, flatted@^3.2.7:
   resolved "https://github.com/thingsboard/flot.git#c2734540477d8b261d04ee18d4d38af3b0ecb81b"
 
 follow-redirects@^1.0.0:
-  version "1.15.2"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13"
-  integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==
+  version "1.15.6"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b"
+  integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==
 
 font-awesome@^4.7.0:
   version "4.7.0"
@@ -6113,6 +6267,15 @@ forever-agent@~0.6.1:
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
   integrity sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==
 
+form-data@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
+  integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.8"
+    mime-types "^2.1.12"
+
 form-data@~2.3.2:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
@@ -6128,9 +6291,9 @@ forwarded@0.2.0:
   integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==
 
 fraction.js@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.2.0.tgz#448e5109a313a3527f5a3ab2119ec4cf0e0e2950"
-  integrity sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==
+  version "4.3.7"
+  resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.3.7.tgz#06ca0085157e42fda7f9e726e79fefc4068840f7"
+  integrity sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==
 
 fresh@0.5.2:
   version "0.5.2"
@@ -6156,7 +6319,7 @@ fs-extra@^9.0.0:
     jsonfile "^6.0.1"
     universalify "^2.0.0"
 
-fs-minipass@^2.0.0, fs-minipass@^2.1.0:
+fs-minipass@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
   integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==
@@ -6164,16 +6327,16 @@ fs-minipass@^2.0.0, fs-minipass@^2.1.0:
     minipass "^3.0.0"
 
 fs-minipass@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-3.0.1.tgz#853809af15b6d03e27638d1ab6432e6b378b085d"
-  integrity sha512-MhaJDcFRTuLidHrIttu0RDGyyXs/IYHVmlcxfLAEFIWjc1vdLAkdwT7Ace2u7DbitWC0toKMl5eJZRYNVreIMw==
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-3.0.3.tgz#79a85981c4dc120065e96f62086bf6f9dc26cc54"
+  integrity sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==
   dependencies:
-    minipass "^4.0.0"
+    minipass "^7.0.3"
 
-fs-monkey@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.3.tgz#ae3ac92d53bb328efe0e9a1d9541f6ad8d48e2d3"
-  integrity sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q==
+fs-monkey@^1.0.4:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.5.tgz#fe450175f0db0d7ea758102e1d84096acb925788"
+  integrity sha512-8uMbBjrhzW76TYgEV27Y5E//W2f/lTFmx78P2w19FZSxarhI/798APGQyuGCwmkNxgwGRhrLfvWyLBvNtuOmew==
 
 fs.realpath@^1.0.0:
   version "1.0.0"
@@ -6181,26 +6344,26 @@ fs.realpath@^1.0.0:
   integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
 
 fsevents@^2.3.2, fsevents@~2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
-  integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
+  integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
 
-function-bind@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
-  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
+function-bind@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
+  integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
 
-function.prototype.name@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.5.tgz#cce0505fe1ffb80503e6f9e46cc64e46a12a9621"
-  integrity sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==
+function.prototype.name@^1.1.6:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.6.tgz#cdf315b7d90ee77a4c6ee216c3c3362da07533fd"
+  integrity sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.0"
-    functions-have-names "^1.2.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+    functions-have-names "^1.2.3"
 
-functions-have-names@^1.2.2:
+functions-have-names@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
   integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
@@ -6240,14 +6403,16 @@ get-caller-file@^2.0.1, get-caller-file@^2.0.5:
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
-get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.0.tgz#7ad1dc0535f3a2904bba075772763e5051f6d05f"
-  integrity sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==
+get-intrinsic@^1.1.3, get-intrinsic@^1.2.1, get-intrinsic@^1.2.2, get-intrinsic@^1.2.3, get-intrinsic@^1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.4.tgz#e385f5a4b5227d449c3eabbad05494ef0abbeadd"
+  integrity sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==
   dependencies:
-    function-bind "^1.1.1"
-    has "^1.0.3"
+    es-errors "^1.3.0"
+    function-bind "^1.1.2"
+    has-proto "^1.0.1"
     has-symbols "^1.0.3"
+    hasown "^2.0.0"
 
 get-package-type@^0.1.0:
   version "0.1.0"
@@ -6259,13 +6424,14 @@ get-stream@^6.0.0:
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
   integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==
 
-get-symbol-description@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6"
-  integrity sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==
+get-symbol-description@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.2.tgz#533744d5aa20aca4e079c8e5daf7fd44202821f5"
+  integrity sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==
   dependencies:
-    call-bind "^1.0.2"
-    get-intrinsic "^1.1.1"
+    call-bind "^1.0.5"
+    es-errors "^1.3.0"
+    get-intrinsic "^1.2.4"
 
 getpass@^0.1.1:
   version "0.1.7"
@@ -6322,9 +6488,9 @@ globals@^11.1.0:
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
 globals@^13.19.0:
-  version "13.20.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-13.20.0.tgz#ea276a1e508ffd4f1612888f9d1bad1e2717bf82"
-  integrity sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==
+  version "13.24.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-13.24.0.tgz#8432a19d78ce0c1e833949c36adb345400bb1171"
+  integrity sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==
   dependencies:
     type-fest "^0.20.2"
 
@@ -6348,13 +6514,13 @@ globby@^11.1.0:
     slash "^3.0.0"
 
 globby@^13.1.1:
-  version "13.1.3"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-13.1.3.tgz#f62baf5720bcb2c1330c8d4ef222ee12318563ff"
-  integrity sha512-8krCNHXvlCgHDpegPzleMq07yMYTO2sXKASmZmquEYWEmCx6J5UTRbp5RwMJkTJGtcQ44YpiUYUiN0b9mzy8Bw==
+  version "13.2.2"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-13.2.2.tgz#63b90b1bf68619c2135475cbd4e71e66aa090592"
+  integrity sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w==
   dependencies:
     dir-glob "^3.0.1"
-    fast-glob "^3.2.11"
-    ignore "^5.2.0"
+    fast-glob "^3.3.0"
+    ignore "^5.2.4"
     merge2 "^1.4.1"
     slash "^4.0.0"
 
@@ -6385,15 +6551,20 @@ gopd@^1.0.1:
     get-intrinsic "^1.1.3"
 
 graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
-  version "4.2.10"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
-  integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
+  version "4.2.11"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
+  integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
 
 grapheme-splitter@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e"
   integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==
 
+graphemer@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6"
+  integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==
+
 hammerjs@^2.0.8:
   version "2.0.8"
   resolved "https://registry.yarnpkg.com/hammerjs/-/hammerjs-2.0.8.tgz#04ef77862cff2bb79d30f7692095930222bf60f1"
@@ -6439,41 +6610,41 @@ has-flag@^4.0.0:
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
-has-property-descriptors@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz#610708600606d36961ed04c196193b6a607fa861"
-  integrity sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==
+has-property-descriptors@^1.0.0, has-property-descriptors@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz#963ed7d071dc7bf5f084c5bfbe0d1b6222586854"
+  integrity sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==
   dependencies:
-    get-intrinsic "^1.1.1"
+    es-define-property "^1.0.0"
 
-has-proto@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.1.tgz#1885c1305538958aff469fef37937c22795408e0"
-  integrity sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==
+has-proto@^1.0.1, has-proto@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.3.tgz#b31ddfe9b0e6e9914536a6ab286426d0214f77fd"
+  integrity sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==
 
 has-symbols@^1.0.2, has-symbols@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
   integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==
 
-has-tostringtag@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25"
-  integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==
+has-tostringtag@^1.0.0, has-tostringtag@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.2.tgz#2cdc42d40bef2e5b4eeab7c01a73c54ce7ab5abc"
+  integrity sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==
   dependencies:
-    has-symbols "^1.0.2"
+    has-symbols "^1.0.3"
 
 has-unicode@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
   integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==
 
-has@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
-  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
+hasown@^2.0.0, hasown@^2.0.1, hasown@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003"
+  integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==
   dependencies:
-    function-bind "^1.1.1"
+    function-bind "^1.1.2"
 
 hdr-histogram-js@^2.0.1:
   version "2.0.3"
@@ -6519,9 +6690,9 @@ hpack.js@^2.1.6:
     wbuf "^1.1.0"
 
 html-entities@^2.3.2:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.3.3.tgz#117d7626bece327fc8baace8868fa6f5ef856e46"
-  integrity sha512-DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA==
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.5.2.tgz#201a3cf95d3a15be7099521620d19dfb4f65359f"
+  integrity sha512-K//PSRMQk4FZ78Kyau+mZurHn3FH0Vwr+H36eE0rPbeYkRRi9YxceYPhuN60UwWorxyKHhqoAJl2OFKa4BVtaA==
 
 html-escaper@^2.0.0:
   version "2.0.2"
@@ -6668,17 +6839,22 @@ ieee754@^1.1.13:
   integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
 
 ignore-walk@^6.0.0:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-6.0.1.tgz#f05e232992ebf25fef13613668fea99857e7e8cf"
-  integrity sha512-/c8MxUAqpRccq+LyDOecwF+9KqajueJHh8fz7g3YqjMZt+NSfJzx05zrKiXwa2sKwFCzaiZ5qUVfRj0pmxixEA==
+  version "6.0.4"
+  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-6.0.4.tgz#89950be94b4f522225eb63a13c56badb639190e9"
+  integrity sha512-t7sv42WkwFkyKbivUCglsQW5YWMskWtbEf4MNKX5u/CCWHKSPzN4FtBQGsQZgCLbxOzpVlcbWVK5KB3auIOjSw==
   dependencies:
-    minimatch "^6.1.6"
+    minimatch "^9.0.0"
 
-ignore@5.2.4, ignore@^5.2.0:
+ignore@5.2.4:
   version "5.2.4"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324"
   integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==
 
+ignore@^5.2.0, ignore@^5.2.4:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.1.tgz#5073e554cd42c5b33b394375f538b8593e34d4ef"
+  integrity sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==
+
 image-size@~0.5.0:
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c"
@@ -6690,11 +6866,11 @@ immediate@~3.0.5:
   integrity sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==
 
 immutable@^4.0.0:
-  version "4.2.4"
-  resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.2.4.tgz#83260d50889526b4b531a5e293709a77f7c55a2a"
-  integrity sha512-WDxL3Hheb1JkRN3sQkyujNlL/xRjAo3rJtaU5xeufUauG66JdMr32bLj4gF+vWl84DIA3Zxw7tiAjneYzRRw+w==
+  version "4.3.5"
+  resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.3.5.tgz#f8b436e66d59f99760dc577f5c99a4fd2a5cc5a0"
+  integrity sha512-8eabxkth9gZatlwl5TBuJnCsoTADlL6ftEr7A4qgdaTsPyreilDSnUk57SO+jfKcNtxPa22U5KK6DSeAYhpBJw==
 
-import-fresh@^3.0.0, import-fresh@^3.2.1:
+import-fresh@^3.2.1:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
   integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
@@ -6712,11 +6888,6 @@ indent-string@^4.0.0:
   resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
   integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
 
-infer-owner@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"
-  integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==
-
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
@@ -6766,13 +6937,13 @@ inquirer@8.2.4:
     through "^2.3.6"
     wrap-ansi "^7.0.0"
 
-internal-slot@^1.0.4:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.5.tgz#f2a2ee21f668f8627a4667f309dc0f4fb6674986"
-  integrity sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==
+internal-slot@^1.0.4, internal-slot@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.7.tgz#c06dcca3ed874249881007b0a5523b172a190802"
+  integrity sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==
   dependencies:
-    get-intrinsic "^1.2.0"
-    has "^1.0.3"
+    es-errors "^1.3.0"
+    hasown "^2.0.0"
     side-channel "^1.0.4"
 
 "internmap@1 - 2":
@@ -6780,10 +6951,13 @@ internal-slot@^1.0.4:
   resolved "https://registry.yarnpkg.com/internmap/-/internmap-2.0.3.tgz#6685f23755e43c524e251d29cbc97248e3061009"
   integrity sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==
 
-ip@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da"
-  integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==
+ip-address@^9.0.5:
+  version "9.0.5"
+  resolved "https://registry.yarnpkg.com/ip-address/-/ip-address-9.0.5.tgz#117a960819b08780c3bd1f14ef3c1cc1d3f3ea5a"
+  integrity sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==
+  dependencies:
+    jsbn "1.1.0"
+    sprintf-js "^1.1.3"
 
 ipaddr.js@1.9.1:
   version "1.9.1"
@@ -6791,9 +6965,9 @@ ipaddr.js@1.9.1:
   integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==
 
 ipaddr.js@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.0.1.tgz#eca256a7a877e917aeb368b0a7497ddf42ef81c0"
-  integrity sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.1.0.tgz#2119bc447ff8c257753b196fc5f1ce08a4cdf39f"
+  integrity sha512-LlbxQ7xKzfBusov6UMi4MFpEg0m+mAm9xyNGEduwXMEDuf4WfzB/RZwMVYEd7IKGvh4IUkEXYxtAVu9T3OelJQ==
 
 is-arguments@^1.1.1:
   version "1.1.1"
@@ -6803,14 +6977,13 @@ is-arguments@^1.1.1:
     call-bind "^1.0.2"
     has-tostringtag "^1.0.0"
 
-is-array-buffer@^3.0.1:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.2.tgz#f2653ced8412081638ecb0ebbd0c41c6e0aecbbe"
-  integrity sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==
+is-array-buffer@^3.0.2, is-array-buffer@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.4.tgz#7a1f92b3d61edd2bc65d24f130530ea93d7fae98"
+  integrity sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==
   dependencies:
     call-bind "^1.0.2"
-    get-intrinsic "^1.2.0"
-    is-typed-array "^1.1.10"
+    get-intrinsic "^1.2.1"
 
 is-arrayish@^0.2.1:
   version "0.2.1"
@@ -6839,6 +7012,13 @@ is-boolean-object@^1.1.0:
     call-bind "^1.0.2"
     has-tostringtag "^1.0.0"
 
+is-builtin-module@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-3.2.1.tgz#f03271717d8654cfcaf07ab0463faa3571581169"
+  integrity sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==
+  dependencies:
+    builtin-modules "^3.3.0"
+
 is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.7:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"
@@ -6851,12 +7031,19 @@ is-ci@^2.0.0:
   dependencies:
     ci-info "^2.0.0"
 
-is-core-module@^2.11.0, is-core-module@^2.8.1, is-core-module@^2.9.0:
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.11.0.tgz#ad4cb3e3863e814523c96f3f58d26cc570ff0144"
-  integrity sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==
+is-core-module@^2.13.0, is-core-module@^2.13.1, is-core-module@^2.8.1, is-core-module@^2.9.0:
+  version "2.13.1"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.1.tgz#ad0d7532c6fea9da1ebdc82742d74525c6273384"
+  integrity sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==
+  dependencies:
+    hasown "^2.0.0"
+
+is-data-view@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-data-view/-/is-data-view-1.0.1.tgz#4b4d3a511b70f3dc26d42c03ca9ca515d847759f"
+  integrity sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==
   dependencies:
-    has "^1.0.3"
+    is-typed-array "^1.1.13"
 
 is-date-object@^1.0.1, is-date-object@^1.0.5:
   version "1.0.5"
@@ -6902,15 +7089,15 @@ is-lambda@^1.0.1:
   resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5"
   integrity sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==
 
-is-map@^2.0.1, is-map@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.2.tgz#00922db8c9bf73e81b7a335827bc2a43f2b91127"
-  integrity sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==
+is-map@^2.0.2, is-map@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.3.tgz#ede96b7fe1e270b3c4465e3a465658764926d62e"
+  integrity sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==
 
-is-negative-zero@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150"
-  integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==
+is-negative-zero@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.3.tgz#ced903a027aca6381b777a5743069d7376a49747"
+  integrity sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==
 
 is-number-object@^1.0.4:
   version "1.0.7"
@@ -6968,17 +7155,17 @@ is-regex@^1.1.4:
     call-bind "^1.0.2"
     has-tostringtag "^1.0.0"
 
-is-set@^2.0.1, is-set@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.2.tgz#90755fa4c2562dc1c5d4024760d6119b94ca18ec"
-  integrity sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==
+is-set@^2.0.2, is-set@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.3.tgz#8ab209ea424608141372ded6e0cb200ef1d9d01d"
+  integrity sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==
 
-is-shared-array-buffer@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79"
-  integrity sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==
+is-shared-array-buffer@^1.0.2, is-shared-array-buffer@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz#1237f1cba059cdb62431d378dcc37d9680181688"
+  integrity sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==
   dependencies:
-    call-bind "^1.0.2"
+    call-bind "^1.0.7"
 
 is-stream@^2.0.0:
   version "2.0.1"
@@ -6999,16 +7186,12 @@ is-symbol@^1.0.2, is-symbol@^1.0.3:
   dependencies:
     has-symbols "^1.0.2"
 
-is-typed-array@^1.1.10, is-typed-array@^1.1.9:
-  version "1.1.10"
-  resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.10.tgz#36a5b5cb4189b575d1a3e4b08536bfb485801e3f"
-  integrity sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==
+is-typed-array@^1.1.13:
+  version "1.1.13"
+  resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.13.tgz#d6c5ca56df62334959322d7d7dd1cca50debe229"
+  integrity sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==
   dependencies:
-    available-typed-arrays "^1.0.5"
-    call-bind "^1.0.2"
-    for-each "^0.3.3"
-    gopd "^1.0.1"
-    has-tostringtag "^1.0.0"
+    which-typed-array "^1.1.14"
 
 is-typedarray@~1.0.0:
   version "1.0.0"
@@ -7020,10 +7203,10 @@ is-unicode-supported@^0.1.0:
   resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7"
   integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==
 
-is-weakmap@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.1.tgz#5008b59bdc43b698201d18f62b37b2ca243e8cf2"
-  integrity sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==
+is-weakmap@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.2.tgz#bf72615d649dfe5f699079c54b83e47d1ae19cfd"
+  integrity sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==
 
 is-weakref@^1.0.2:
   version "1.0.2"
@@ -7032,13 +7215,13 @@ is-weakref@^1.0.2:
   dependencies:
     call-bind "^1.0.2"
 
-is-weakset@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/is-weakset/-/is-weakset-2.0.2.tgz#4569d67a747a1ce5a994dfd4ef6dcea76e7c0a1d"
-  integrity sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==
+is-weakset@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/is-weakset/-/is-weakset-2.0.3.tgz#e801519df8c0c43e12ff2834eead84ec9e624007"
+  integrity sha512-LvIm3/KWzS9oRFHugab7d+M/GcBXuXX5xZkzPmN+NxihdQlZUQ4dWuSV1xR/sq6upL1TJEDrfBgRepHFdBtSNQ==
   dependencies:
-    call-bind "^1.0.2"
-    get-intrinsic "^1.1.1"
+    call-bind "^1.0.7"
+    get-intrinsic "^1.2.4"
 
 is-what@^3.14.1:
   version "3.14.1"
@@ -7088,9 +7271,9 @@ istanbul-lib-coverage@^2.0.5:
   integrity sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA==
 
 istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz#189e7909d0a39fa5a3dfad5b03f71947770191d3"
-  integrity sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz#2d166c4b0644d43a39f04bf6c2edd1e585f31756"
+  integrity sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==
 
 istanbul-lib-instrument@^5.0.4:
   version "5.2.1"
@@ -7104,12 +7287,12 @@ istanbul-lib-instrument@^5.0.4:
     semver "^6.3.0"
 
 istanbul-lib-report@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#7518fe52ea44de372f460a76b5ecda9ffb73d8a6"
-  integrity sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz#908305bac9a5bd175ac6a74489eafd0fc2445a7d"
+  integrity sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==
   dependencies:
     istanbul-lib-coverage "^3.0.0"
-    make-dir "^3.0.0"
+    make-dir "^4.0.0"
     supports-color "^7.1.0"
 
 istanbul-lib-source-maps@^3.0.6:
@@ -7124,9 +7307,9 @@ istanbul-lib-source-maps@^3.0.6:
     source-map "^0.6.1"
 
 istanbul-reports@^3.0.2:
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.5.tgz#cc9a6ab25cb25659810e4785ed9d9fb742578bae"
-  integrity sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==
+  version "3.1.7"
+  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.7.tgz#daed12b9e1dca518e15c056e1e537e741280fa0b"
+  integrity sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==
   dependencies:
     html-escaper "^2.0.0"
     istanbul-lib-report "^3.0.0"
@@ -7177,31 +7360,27 @@ jest-worker@^27.4.5:
     supports-color "^8.0.0"
 
 jquery.terminal@^2.35.3:
-  version "2.35.3"
-  resolved "https://registry.yarnpkg.com/jquery.terminal/-/jquery.terminal-2.35.3.tgz#64c9291c9fdfa845083a5a66c6052c96f5cb5f81"
-  integrity sha512-McYaOivaUB2Gubn8IBhQY7zxjGWXg4ENSofL11rt7HACWUDjqncXxakShuqq7Ma0y+BwCcYdltPl1e+WpDJkeg==
+  version "2.39.0"
+  resolved "https://registry.yarnpkg.com/jquery.terminal/-/jquery.terminal-2.39.0.tgz#defc2062dadebc41f0b97eebbfd0e5b4cd165616"
+  integrity sha512-5uOeJY8dxVJPdeGlaUuRFAcPlw3GzSxLLTmCSaqP9vJhSAu3Amgkr7e7LZxBvup8oQDYF8jRjQSvtIrkn1XsWw==
   dependencies:
     "@jcubic/lily" "^0.3.0"
-    "@types/jquery" "^3.5.14"
+    "@types/jquery" "^3.5.29"
     ansidec "^0.3.4"
+    coveralls-next "^4.2.0"
     iconv-lite "^0.6.3"
-    jquery "^3.6.0"
+    jquery "^3.7.1"
     prismjs "^1.27.0"
     wcwidth "^1.0.1"
   optionalDependencies:
     fsevents "^2.3.2"
 
-jquery@>=1.9.1, jquery@^3.5.0, jquery@^3.6.0:
-  version "3.6.3"
-  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.3.tgz#23ed2ffed8a19e048814f13391a19afcdba160e6"
-  integrity sha512-bZ5Sy3YzKo9Fyc8wH2iIQK4JImJ6R0GWI9kL1/k7Z91ZBNgkRXE6U0JfHIizZbort8ZunhSI3jw9I6253ahKfg==
-
-jquery@^3.6.3:
-  version "3.6.4"
-  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.4.tgz#ba065c188142100be4833699852bf7c24dc0252f"
-  integrity sha512-v28EW9DWDFpzcD9O5iyJXg3R3+q+mET5JhnjJzQUZMHOv67bpSIHq81GEYpPNZHG+XXHsfSme3nxp/hndKEcsQ==
+jquery@>=1.9.1, jquery@^3.5.0, jquery@^3.6.3, jquery@^3.7.1:
+  version "3.7.1"
+  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.7.1.tgz#083ef98927c9a6a74d05a6af02806566d16274de"
+  integrity sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==
 
-js-beautify@^1.14.7:
+js-beautify@1.14.7:
   version "1.14.7"
   resolved "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.14.7.tgz#9206296de33f86dc106d3e50a35b7cf8729703b2"
   integrity sha512-5SOX1KXPFKx+5f6ZrPsIPEY7NwKeQz47n3jm2i+XeHx9MoRsfQenlOP13FQhWvg8JRS0+XLO6XYUQ2GX+q+T9A==
@@ -7211,16 +7390,18 @@ js-beautify@^1.14.7:
     glob "^8.0.3"
     nopt "^6.0.0"
 
-js-sdsl@^4.1.4:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.3.0.tgz#aeefe32a451f7af88425b11fdb5f58c90ae1d711"
-  integrity sha512-mifzlm2+5nZ+lEcLJMoBK0/IH/bDg8XnJfd/Wq6IP+xoCjLZsTOnV2QpxlVbX9bMnkl5PdEjNtBJ9Cj1NjifhQ==
-
 "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
+js-yaml@4.1.0, js-yaml@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
+  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
+  dependencies:
+    argparse "^2.0.1"
+
 js-yaml@^3.13.1:
   version "3.14.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
@@ -7229,22 +7410,20 @@ js-yaml@^3.13.1:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
-js-yaml@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
-  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
-  dependencies:
-    argparse "^2.0.1"
+jsbn@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-1.1.0.tgz#b01307cb29b618a1ed26ec79e911f803c4da0040"
+  integrity sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==
 
 jsbn@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
   integrity sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==
 
-jsdoc-type-pratt-parser@~3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-3.1.0.tgz#a4a56bdc6e82e5865ffd9febc5b1a227ff28e67e"
-  integrity sha512-MgtD0ZiCDk9B+eI73BextfRrVQl0oyzRG8B2BjORts6jbunj4ScKPcyXGTbB6eXL4y9TzxCm6hyeLq/2ASzNdw==
+jsdoc-type-pratt-parser@~4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-4.0.0.tgz#136f0571a99c184d84ec84662c45c29ceff71114"
+  integrity sha512-YtOli5Cmzy3q4dP26GraSOeAhqecewG04hoO8DY56CH4KJ9Fvv5qKWUCCo3HZob7esJQHCv6/+bnTy72xZZaVQ==
 
 jsesc@^2.5.1:
   version "2.5.2"
@@ -7256,15 +7435,20 @@ jsesc@~0.5.0:
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
   integrity sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==
 
+json-buffer@3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13"
+  integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==
+
 json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
   integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
 
 json-parse-even-better-errors@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.0.tgz#2cb2ee33069a78870a0c7e3da560026b89669cf7"
-  integrity sha512-iZbGHafX/59r39gPwVPRBGw0QQKnA7tte5pSMrhWOW7swGsVvVTjmfyAV9pNqk8YGT7tRCdxRu8uzcgZwoDooA==
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.1.tgz#02bb29fb5da90b5444581749c22cedd3597c6cb0"
+  integrity sha512-aatBvbL26wVUCLmbWdCpeu9iF5wOyWpagiKkInA+kfws3sWdBrTnsvN2CKcyCYyUrc7rebNBlK6+kteg7ksecg==
 
 json-schema-defaults@^0.4.0:
   version "0.4.0"
@@ -7305,7 +7489,7 @@ json5@^1.0.2:
   dependencies:
     minimist "^1.2.0"
 
-json5@^2.1.2, json5@^2.2.1, json5@^2.2.2:
+json5@^2.1.2, json5@^2.2.1, json5@^2.2.2, json5@^2.2.3:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
   integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
@@ -7424,9 +7608,9 @@ jstree-bootstrap-theme@^1.0.1:
     jquery ">=1.9.1"
 
 jstree@^3.3.15:
-  version "3.3.15"
-  resolved "https://registry.yarnpkg.com/jstree/-/jstree-3.3.15.tgz#364bfa0fc4c0b1b7b5bc122cda44a0f09e59eba4"
-  integrity sha512-fNK2EBgGjaJQ3cJuINX/80vDeAufYWtM0csudgYl3eJG+eRAH/1r1IJVUOvAlJIa+uSgg+Fi8uGrt+Xbs92eKg==
+  version "3.3.16"
+  resolved "https://registry.yarnpkg.com/jstree/-/jstree-3.3.16.tgz#43e3a8a1ee270ddff514317250d5e85b95d63c52"
+  integrity sha512-yeeIJffi2WAqyMeHufXj/Ozy7GqgKdDkxfN8L8lwbG0h1cw/TgDafWmyhroH4AKgDSk9yW1W6jiJZu4zXAqzXw==
   dependencies:
     jquery "^3.5.0"
 
@@ -7508,16 +7692,23 @@ karma@~6.3.9:
     yargs "^16.1.1"
 
 katex@^0.16.0:
-  version "0.16.4"
-  resolved "https://registry.yarnpkg.com/katex/-/katex-0.16.4.tgz#87021bc3bbd80586ef715aeb476794cba6a49ad4"
-  integrity sha512-WudRKUj8yyBeVDI4aYMNxhx5Vhh2PjpzQw1GRu/LVGqL4m1AxwD1GcUp0IMbdJaf5zsjtj8ghP0DOQRYhroNkw==
+  version "0.16.9"
+  resolved "https://registry.yarnpkg.com/katex/-/katex-0.16.9.tgz#bc62d8f7abfea6e181250f85a56e4ef292dcb1fa"
+  integrity sha512-fsSYjWS0EEOwvy81j3vRA8TEAhQhKiqO+FQaKWp0m39qwOzHVBgAUBIXWj1pB+O2W3fIpNa6Y9KSKCVbfPhyAQ==
+  dependencies:
+    commander "^8.3.0"
+
+keyv@^4.5.3:
+  version "4.5.4"
+  resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93"
+  integrity sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==
   dependencies:
-    commander "^8.0.0"
+    json-buffer "3.0.1"
 
 khroma@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/khroma/-/khroma-2.0.0.tgz#7577de98aed9f36c7a474c4d453d94c0d6c6588b"
-  integrity sha512-2J8rDNlQWbtiNYThZRvmMv5yt44ZakX+Tz5ZIp/mN1pt4snn+m030Va5Z4v8xA0cQFDXBwO/8i42xL4QPsVk3g==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/khroma/-/khroma-2.1.0.tgz#45f2ce94ce231a437cf5b63c2e886e6eb42bbbb1"
+  integrity sha512-Ls993zuzfayK269Svk9hzpeGUKob/sIgZzyHYdjQoAdQetRKpOLj+k/QQQ/6Qi0Yz65mlROrfd+Ev+1+7dz9Kw==
 
 kind-of@^6.0.2:
   version "6.0.3"
@@ -7546,14 +7737,19 @@ layout-base@^2.0.0:
   resolved "https://registry.yarnpkg.com/layout-base/-/layout-base-2.0.1.tgz#d0337913586c90f9c2c075292069f5c2da5dd285"
   integrity sha512-dp3s92+uNI1hWIpPGH3jK2kxE2lMjdXdr+DH8ynZHpd6PUlH6x6cbuXnoMmiNumznqaNO31xu9e79F0uuZ0JFg==
 
-leaflet-polylinedecorator@^1.6.0:
+lcov-parse@1.0.0:
+  version "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:
   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==
@@ -7563,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==
@@ -7611,9 +7807,9 @@ levn@^0.4.1:
     type-check "~0.4.0"
 
 libphonenumber-js@^1.10.4:
-  version "1.10.21"
-  resolved "https://registry.yarnpkg.com/libphonenumber-js/-/libphonenumber-js-1.10.21.tgz#860312cbec1389e36e28389161025c7817a3ae32"
-  integrity sha512-/udZhx49av2r2gZR/+xXSrwcR8smX/sDNrVpOFrvW+CA26TfYTVZfwb3MIDvmwAYMLs7pXuJjZX0VxxGpqPhsA==
+  version "1.10.58"
+  resolved "https://registry.yarnpkg.com/libphonenumber-js/-/libphonenumber-js-1.10.58.tgz#2015877bd47fd3d32d9fbfcedd75df35be230c9a"
+  integrity sha512-53A0IpJFL9LdHbpeatwizf8KSwPICrqn9H0g3Y7WQ+Jgeu9cQ4Ew3WrRtrLBu/CX2lXd5+rgT01/tGlkbkzOjw==
 
 license-webpack-plugin@4.0.2:
   version "4.0.2"
@@ -7702,6 +7898,11 @@ lodash@4.17.21, lodash@^4.0.1, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.21
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
+log-driver@1.2.7:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/log-driver/-/log-driver-1.2.7.tgz#63b95021f0702fedfa2c9bb0a24e7797d71871d8"
+  integrity sha512-U7KCmLdqsGHBLeWqYlFA0V0Sl6P08EE1ZrmA9cxjUE0WVqT9qnyVDPz1kzpFEP0jdJuFnasWIfSd7fsaNXkpbg==
+
 log-symbols@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503"
@@ -7711,9 +7912,9 @@ log-symbols@^4.1.0:
     is-unicode-supported "^0.1.0"
 
 log4js@^6.4.1:
-  version "6.8.0"
-  resolved "https://registry.yarnpkg.com/log4js/-/log4js-6.8.0.tgz#f0fe9b2b82725aaf97f20692e23381a5c5722448"
-  integrity sha512-g+V8gZyurIexrOvWQ+AcZsIvuK/lBnx2argejZxL4gVZ4Hq02kUYH6WZOnqxgBml+zzQZYdaEoTN84B6Hzm8Fg==
+  version "6.9.1"
+  resolved "https://registry.yarnpkg.com/log4js/-/log4js-6.9.1.tgz#aba5a3ff4e7872ae34f8b4c533706753709e38b6"
+  integrity sha512-1somDdy9sChrr9/f4UlzhdaGfDR2c/SaD2a4T7qEkG4jTS57/B3qmnjLYePwQ8cqWnUHZI0iAKxMBpCZICiZ2g==
   dependencies:
     date-format "^4.0.14"
     debug "^4.3.4"
@@ -7751,9 +7952,9 @@ lru-cache@^6.0.0:
     yallist "^4.0.0"
 
 lru-cache@^7.4.4, lru-cache@^7.5.1, lru-cache@^7.7.1:
-  version "7.18.1"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.18.1.tgz#4716408dec51d5d0104732647f584d1f6738b109"
-  integrity sha512-8/HcIENyQnfUTCDizRu9rrDyG6XG/21M4X7/YEGZeD76ZJilFPAUVb/2zysFf7VVO1LEjCDFyHp8pMMvozIrvg==
+  version "7.18.3"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.18.3.tgz#f793896e0fd0e954a59dfdd82f0773808df6aa89"
+  integrity sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==
 
 magic-string@0.29.0:
   version "0.29.0"
@@ -7777,13 +7978,20 @@ make-dir@^2.1.0:
     pify "^4.0.1"
     semver "^5.6.0"
 
-make-dir@^3.0.0, make-dir@^3.0.2:
+make-dir@^3.0.2:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
   integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
   dependencies:
     semver "^6.0.0"
 
+make-dir@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-4.0.0.tgz#c3c2307a771277cd9638305f915c29ae741b614e"
+  integrity sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==
+  dependencies:
+    semver "^7.5.3"
+
 make-error@^1.1.1:
   version "1.3.6"
   resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
@@ -7811,10 +8019,10 @@ make-fetch-happen@^10.0.3:
     socks-proxy-agent "^7.0.0"
     ssri "^9.0.0"
 
-make-fetch-happen@^11.0.0, make-fetch-happen@^11.0.1:
-  version "11.0.3"
-  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-11.0.3.tgz#ed83dd3685b97f75607156d2721848f6eca561b9"
-  integrity sha512-oPLh5m10lRNNZDjJ2kP8UpboUx2uFXVaVweVe/lWut4iHWcQEmfqSVJt2ihZsFI8HbpwyyocaXbCAWf0g1ukIA==
+make-fetch-happen@^11.0.0, make-fetch-happen@^11.0.1, make-fetch-happen@^11.1.1:
+  version "11.1.1"
+  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz#85ceb98079584a9523d4bf71d32996e7e208549f"
+  integrity sha512-rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w==
   dependencies:
     agentkeepalive "^4.2.1"
     cacache "^17.0.0"
@@ -7823,7 +8031,7 @@ make-fetch-happen@^11.0.0, make-fetch-happen@^11.0.1:
     https-proxy-agent "^5.0.0"
     is-lambda "^1.0.1"
     lru-cache "^7.7.1"
-    minipass "^4.0.0"
+    minipass "^5.0.0"
     minipass-fetch "^3.0.0"
     minipass-flush "^1.0.5"
     minipass-pipeline "^1.2.4"
@@ -7833,14 +8041,14 @@ make-fetch-happen@^11.0.0, make-fetch-happen@^11.0.1:
     ssri "^10.0.0"
 
 make-plural@^7.0.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/make-plural/-/make-plural-7.2.0.tgz#93174b1419672a48a2340db6c1d3fb217530c684"
-  integrity sha512-WkdI+iaWaBCFM2wUXwos8Z7spg5Dt64Xe/VI6NpRaly21cDtD76N6S97K//UtzV0dHOiXX+E90TnszdXHG0aMg==
+  version "7.3.0"
+  resolved "https://registry.yarnpkg.com/make-plural/-/make-plural-7.3.0.tgz#2889dbafca2fb097037c47967d3e3afa7e48a52c"
+  integrity sha512-/K3BC0KIsO+WK2i94LkMPv3wslMrazrQhfi5We9fMbLlLjzoOSJWr7TAdupLlDWaJcWxwoNosBkhFDejiu5VDw==
 
 marked@^4.0.17:
-  version "4.2.12"
-  resolved "https://registry.yarnpkg.com/marked/-/marked-4.2.12.tgz#d69a64e21d71b06250da995dcd065c11083bebb5"
-  integrity sha512-yr8hSKa3Fv4D3jdZmtMMPghgVt6TWbk86WQaWhDloQjRSQhMMYCAro7jP7VDJrjjdV8pxVxMssXS8B8Y5DZ5aw==
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-4.3.0.tgz#796362821b019f734054582038b116481b456cf3"
+  integrity sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A==
 
 media-typer@0.3.0:
   version "0.3.0"
@@ -7848,11 +8056,11 @@ media-typer@0.3.0:
   integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==
 
 memfs@^3.4.12, memfs@^3.4.3:
-  version "3.4.13"
-  resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.4.13.tgz#248a8bd239b3c240175cd5ec548de5227fc4f345"
-  integrity sha512-omTM41g3Skpvx5dSYeZIbXKcXoAVc/AoMNwn9TKx++L/gaen/+4TTttmu8ZSch5vfVJ8uJvGbroTsIlslRg6lg==
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.6.0.tgz#d7a2110f86f79dd950a8b6df6d57bc984aa185f6"
+  integrity sha512-EGowvkkgbMcIChjMTMkESFDbZeSh8xZ7kNSF0hAiAN4Jh6jgHCRS0Ga/+C8y6Au+oqpezRHCfPsmJ2+DwAgiwQ==
   dependencies:
-    fs-monkey "^1.0.3"
+    fs-monkey "^1.0.4"
 
 merge-descriptors@1.0.1:
   version "1.0.1"
@@ -7870,25 +8078,26 @@ merge2@^1.3.0, merge2@^1.4.1:
   integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
 
 mermaid@^9.1.2:
-  version "9.4.0"
-  resolved "https://registry.yarnpkg.com/mermaid/-/mermaid-9.4.0.tgz#ff9afcac9f565a358fa8fc39135dec2c842c3b8f"
-  integrity sha512-4PWbOND7CNRbjHrdG3WUUGBreKAFVnMhdlPjttuUkeHbCQmAHkwzSh5dGwbrKmXGRaR4uTvfFVYzUcg++h0DkA==
+  version "9.4.3"
+  resolved "https://registry.yarnpkg.com/mermaid/-/mermaid-9.4.3.tgz#62cf210c246b74972ea98c19837519b6f03427f2"
+  integrity sha512-TLkQEtqhRSuEHSE34lh5bCa94KATCyluAXmFnNI2PRZwOpXFeqiJWwZl+d2CcemE1RS6QbbueSSq9QIg8Uxcyw==
   dependencies:
     "@braintree/sanitize-url" "^6.0.0"
     cytoscape "^3.23.0"
     cytoscape-cose-bilkent "^4.1.0"
     cytoscape-fcose "^2.1.0"
-    d3 "^7.0.0"
-    dagre-d3-es "7.0.8"
+    d3 "^7.4.0"
+    dagre-d3-es "7.0.9"
+    dayjs "^1.11.7"
     dompurify "2.4.3"
     elkjs "^0.8.2"
     khroma "^2.0.0"
     lodash-es "^4.17.21"
-    moment "^2.29.4"
     non-layered-tidy-tree-layout "^2.0.2"
     stylis "^4.1.2"
     ts-dedent "^2.2.0"
     uuid "^9.0.0"
+    web-worker "^1.2.0"
 
 methods@~1.1.2:
   version "1.1.2"
@@ -7956,13 +8165,18 @@ minimatch@^5.0.1:
   dependencies:
     brace-expansion "^2.0.1"
 
-minimatch@^6.1.0, minimatch@^6.1.6:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-6.2.0.tgz#2b70fd13294178c69c04dfc05aebdb97a4e79e42"
-  integrity sha512-sauLxniAmvnhhRjFwPNnJKaPFYyddAgbYdeUpHULtCT/GhzdCx/MDNy+Y40lBxTQUrMzDE8e0S43Z5uqfO0REg==
+minimatch@^9.0.0:
+  version "9.0.3"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.3.tgz#a6e00c3de44c3a542bfaae70abfc22420a6da825"
+  integrity sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==
   dependencies:
     brace-expansion "^2.0.1"
 
+minimist@1.2.7:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18"
+  integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==
+
 minimist@^1.2.0, minimist@^1.2.6:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
@@ -7987,11 +8201,11 @@ minipass-fetch@^2.0.3:
     encoding "^0.1.13"
 
 minipass-fetch@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-3.0.1.tgz#bae3789f668d82ffae3ea47edc6b78b8283b3656"
-  integrity sha512-t9/wowtf7DYkwz8cfMSt0rMwiyNIBXf5CKZ3S5ZMqRqMYT0oLTp0x1WorMI9WTwvaPg21r1JbFxJMum8JrLGfw==
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-3.0.4.tgz#4d4d9b9f34053af6c6e597a64be8e66e42bf45b7"
+  integrity sha512-jHAqnA728uUpIaFm7NWsCnqKT6UqZz7GcI/bDpPATuwYyKwJwW0remxSCxUlKiEty+eopHGa3oc8WxgQ1FFJqg==
   dependencies:
-    minipass "^4.0.0"
+    minipass "^7.0.3"
     minipass-sized "^1.0.3"
     minizlib "^2.1.2"
   optionalDependencies:
@@ -8034,9 +8248,19 @@ minipass@^3.0.0, minipass@^3.1.1, minipass@^3.1.6:
     yallist "^4.0.0"
 
 minipass@^4.0.0:
-  version "4.2.4"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-4.2.4.tgz#7d0d97434b6a19f59c5c3221698b48bbf3b2cd06"
-  integrity sha512-lwycX3cBMTvcejsHITUgYj6Gy6A7Nh4Q6h9NP4sTHY1ccJlC7yKzDmiShEHsJ16Jf1nKGDEaiHxiltsJEvk0nQ==
+  version "4.2.8"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-4.2.8.tgz#f0010f64393ecfc1d1ccb5f582bcaf45f48e1a3a"
+  integrity sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ==
+
+minipass@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d"
+  integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==
+
+minipass@^7.0.3:
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.0.4.tgz#dbce03740f50a4786ba994c1fb908844d27b038c"
+  integrity sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==
 
 minizlib@^2.1.1, minizlib@^2.1.2:
   version "2.1.2"
@@ -8053,22 +8277,22 @@ mkdirp@^0.5.5:
   dependencies:
     minimist "^1.2.6"
 
-mkdirp@^1.0.3, mkdirp@^1.0.4:
+mkdirp@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
 
 moment-timezone@^0.5.42:
-  version "0.5.42"
-  resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.42.tgz#c59f2aa00442d0dcd1d258d2182873d637b4e17b"
-  integrity sha512-tjI9goqwzkflKSTxJo+jC/W8riTFwEjjunssmFvAWlvNVApjbkJM7UHggyKO0q1Fd/kZVKY77H7C9A0XKhhAFw==
+  version "0.5.45"
+  resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.45.tgz#cb685acd56bac10e69d93c536366eb65aa6bcf5c"
+  integrity sha512-HIWmqA86KcmCAhnMAN0wuDOARV/525R2+lOLotuGFzn4HO+FH+/645z2wx0Dt3iDv6/p61SIvKnDstISainhLQ==
   dependencies:
     moment "^2.29.4"
 
 moment@^2.29.4:
-  version "2.29.4"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108"
-  integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==
+  version "2.30.1"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.30.1.tgz#f8c91c07b7a786e30c59926df530b4eac96974ae"
+  integrity sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==
 
 moo@^0.5.1:
   version "0.5.2"
@@ -8108,10 +8332,10 @@ mute-stream@0.0.8:
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
   integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
 
-nanoid@^3.3.4:
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab"
-  integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==
+nanoid@^3.3.6, nanoid@^3.3.7:
+  version "3.3.7"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8"
+  integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==
 
 natural-compare-lite@^1.4.0:
   version "1.4.0"
@@ -8124,11 +8348,10 @@ natural-compare@^1.4.0:
   integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
 
 needle@^3.1.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/needle/-/needle-3.2.0.tgz#07d240ebcabfd65c76c03afae7f6defe6469df44"
-  integrity sha512-oUvzXnyLiVyVGoianLijF9O/RecZUf7TkBfimjGrLM4eQhXyeJwM6GeAWccwfQ9aa4gMCZKqhAOuLaMIcQxajQ==
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/needle/-/needle-3.3.1.tgz#63f75aec580c2e77e209f3f324e2cdf3d29bd049"
+  integrity sha512-6k0YULvhpw+RoLNiQCRKOl09Rv1dPLr8hHnVjHqdolKwDrdNyk+Hmrthi4lIGPPz3r39dLx0hsF5s40sZ3Us4Q==
   dependencies:
-    debug "^3.2.6"
     iconv-lite "^0.6.3"
     sax "^1.2.4"
 
@@ -8166,9 +8389,9 @@ ngx-daterangepicker-material@^6.0.4:
     tslib "^2.0.0"
 
 ngx-drag-drop@^15.0.1:
-  version "15.0.1"
-  resolved "https://registry.yarnpkg.com/ngx-drag-drop/-/ngx-drag-drop-15.0.1.tgz#e751fa0f11a4c86456fbb241bc8c2c530149cee0"
-  integrity sha512-x0YgsVCk95x3YSNZT/EmJvo1sRjra+BtQuZMbRYKc88E0GHIOlmWNp/1Z7w5UdznEp0240KDwYp3crR4FuDGew==
+  version "15.1.0"
+  resolved "https://registry.yarnpkg.com/ngx-drag-drop/-/ngx-drag-drop-15.1.0.tgz#ddc208202ea6576e27c5362b87e87e9a4b081877"
+  integrity sha512-ZTAMrKMv7Fqdybvt+2sEtbT0LlOwsaFCNwFQ/CnKXrXEBkbs5K1jx2rN8HXx9BMlVAfa4ovOmtkJXtx/9XYqrA==
   dependencies:
     tslib "^2.3.0"
 
@@ -8208,16 +8431,16 @@ ngx-sharebuttons@^12.0.0:
     tslib "^2.0.0"
 
 ngx-translate-messageformat-compiler@^6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/ngx-translate-messageformat-compiler/-/ngx-translate-messageformat-compiler-6.2.0.tgz#54cd3dc151e29d035d483ad3ac8951fb1e074a25"
-  integrity sha512-niGhub53gMw8GbmP3u3OB7SVJn7z5JZodQxQxDb6ZE0A9c0WeVBzz30WbekQshBF7ijzLYE/qcM+lzTCpWkRmg==
+  version "6.5.1"
+  resolved "https://registry.yarnpkg.com/ngx-translate-messageformat-compiler/-/ngx-translate-messageformat-compiler-6.5.1.tgz#dfb51a83df5ec41bb6c3fff3b2e3f640ecb4a324"
+  integrity sha512-jJHlEYfE6myYQsILhXHNp2QIOgP3B19BE+NFN9H2a9sgqWgV/CoHBzhEvnt0suf1og/drgHFSkugp5N0Im0xHg==
   dependencies:
-    tslib "^2.4.1"
+    tslib "^2.5.0"
 
 ngx-window-token@>=6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/ngx-window-token/-/ngx-window-token-6.0.0.tgz#8b4704242df93a302422a23163359c09d6bb34a0"
-  integrity sha512-IeLKO1jzfzSvZ6vlAt4QSY/B5XcHEhdOwTjqvWEPt6/esWV9T3mA2ln10kj6SCc9pUSx4NybxE10gcyyYroImg==
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/ngx-window-token/-/ngx-window-token-7.0.0.tgz#2e1bc76846411a388188b802154e4841d3e27856"
+  integrity sha512-5+XfRVSY7Dciu8xyCNMkOlH2UfwR9W2P1Pirz7caaZgOZDjFbL8aEO2stjfJJm2FFf1D6dlVHNzhLWGk9HGkqA==
   dependencies:
     tslib "^2.0.0"
 
@@ -8245,16 +8468,17 @@ node-forge@^1:
   integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==
 
 node-gyp-build@^4.2.2:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.6.0.tgz#0c52e4cbf54bbd28b709820ef7b6a3c2d6209055"
-  integrity sha512-NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ==
+  version "4.8.0"
+  resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.8.0.tgz#3fee9c1731df4581a3f9ead74664369ff00d26dd"
+  integrity sha512-u6fs2AEUljNho3EYTJNBfImO5QTo/J/1Etd+NVdCj7qWKUSN/bSLkZwhDv7I+w/MSC6qJ4cknepkAYykDdK8og==
 
 node-gyp@^9.0.0:
-  version "9.3.1"
-  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.3.1.tgz#1e19f5f290afcc9c46973d68700cbd21a96192e4"
-  integrity sha512-4Q16ZCqq3g8awk6UplT7AuxQ35XN4R/yf/+wSAwcBUAjg7l58RTactWaP8fIDTi0FzI7YcVLujwExakZlfWkXg==
+  version "9.4.1"
+  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.4.1.tgz#8a1023e0d6766ecb52764cc3a734b36ff275e185"
+  integrity sha512-OQkWKbjQKbGkMf/xqI1jjy3oCTgMKJac58G2+bjZb3fza6gW2YrCSdMQYaoTb70crvE//Gngr4f0AgVHmqHvBQ==
   dependencies:
     env-paths "^2.2.0"
+    exponential-backoff "^3.1.1"
     glob "^7.1.4"
     graceful-fs "^4.2.6"
     make-fetch-happen "^10.0.3"
@@ -8265,10 +8489,10 @@ node-gyp@^9.0.0:
     tar "^6.1.2"
     which "^2.0.2"
 
-node-releases@^2.0.8:
-  version "2.0.10"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.10.tgz#c311ebae3b6a148c89b1813fd7c4d3c024ef537f"
-  integrity sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w==
+node-releases@^2.0.14, node-releases@^2.0.8:
+  version "2.0.14"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.14.tgz#2ffb053bceb8b2be8495ece1ab6ce600c4461b0b"
+  integrity sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==
 
 non-layered-tidy-tree-layout@^2.0.2:
   version "2.0.2"
@@ -8310,16 +8534,16 @@ npm-bundled@^3.0.0:
     npm-normalize-package-bin "^3.0.0"
 
 npm-install-checks@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/npm-install-checks/-/npm-install-checks-6.0.0.tgz#9a021d8e8b3956d61fd265c2eda4735bcd3d9b83"
-  integrity sha512-SBU9oFglRVZnfElwAtF14NivyulDqF1VKqqwNsFW9HDcbHMAPHpRSsVFgKuwFGq/hVvWZExz62Th0kvxn/XE7Q==
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/npm-install-checks/-/npm-install-checks-6.3.0.tgz#046552d8920e801fa9f919cad569545d60e826fe"
+  integrity sha512-W29RiK/xtpCGqn6f3ixfRYGk+zRyr+Ew9F2E20BfXxT5/euLdA/Nm7fO7OeTGuAmTs30cpgInyJ0cYe708YTZw==
   dependencies:
     semver "^7.1.1"
 
 npm-normalize-package-bin@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.0.tgz#6097436adb4ef09e2628b59a7882576fe53ce485"
-  integrity sha512-g+DPQSkusnk7HYXr75NtzkIP4+N81i3RPsGFidF3DzHd9MT9wWngmqoeg/fnHFz5MNdtG4w03s+QnhewSLTT2Q==
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.1.tgz#25447e32a9a7de1f51362c61a559233b89947832"
+  integrity sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ==
 
 npm-package-arg@10.1.0, npm-package-arg@^10.0.0:
   version "10.1.0"
@@ -8338,7 +8562,7 @@ npm-packlist@^7.0.0:
   dependencies:
     ignore-walk "^6.0.0"
 
-npm-pick-manifest@8.0.1, npm-pick-manifest@^8.0.0:
+npm-pick-manifest@8.0.1:
   version "8.0.1"
   resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-8.0.1.tgz#c6acd97d1ad4c5dbb80eac7b386b03ffeb289e5f"
   integrity sha512-mRtvlBjTsJvfCCdmPtiu2bdlx8d/KXtF7yNXNWe7G0Z36qWA9Ny5zXsI2PfBZEv7SXgoxTmNaTzGSbbzDZChoA==
@@ -8348,13 +8572,23 @@ npm-pick-manifest@8.0.1, npm-pick-manifest@^8.0.0:
     npm-package-arg "^10.0.0"
     semver "^7.3.5"
 
+npm-pick-manifest@^8.0.0:
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-8.0.2.tgz#2159778d9c7360420c925c1a2287b5a884c713aa"
+  integrity sha512-1dKY+86/AIiq1tkKVD3l0WI+Gd3vkknVGAggsFeBkTvbhMQ1OND/LKkYv4JtXPKUJ8bOTCyLiqEg2P6QNdK+Gg==
+  dependencies:
+    npm-install-checks "^6.0.0"
+    npm-normalize-package-bin "^3.0.0"
+    npm-package-arg "^10.0.0"
+    semver "^7.3.5"
+
 npm-registry-fetch@^14.0.0:
-  version "14.0.3"
-  resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-14.0.3.tgz#8545e321c2b36d2c6fe6e009e77e9f0e527f547b"
-  integrity sha512-YaeRbVNpnWvsGOjX2wk5s85XJ7l1qQBGAp724h8e2CZFFhMSuw9enom7K1mWVUtvXO1uUSFIAPofQK0pPN0ZcA==
+  version "14.0.5"
+  resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-14.0.5.tgz#fe7169957ba4986a4853a650278ee02e568d115d"
+  integrity sha512-kIDMIo4aBm6xg7jOttupWZamsZRkAqMqwqqbVXnUqstY5+tapvv6bkH/qMR76jdgV+YljEUCyWx3hRYMrJiAgA==
   dependencies:
     make-fetch-happen "^11.0.0"
-    minipass "^4.0.0"
+    minipass "^5.0.0"
     minipass-fetch "^3.0.0"
     minipass-json-stream "^1.0.1"
     minizlib "^2.1.2"
@@ -8395,42 +8629,62 @@ object-assign@^4, object-assign@^4.0.1, object-assign@^4.1.1:
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
 
-object-inspect@^1.12.2, object-inspect@^1.9.0:
-  version "1.12.3"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.3.tgz#ba62dffd67ee256c8c086dfae69e016cd1f198b9"
-  integrity sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==
+object-inspect@^1.13.1:
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.1.tgz#b96c6109324ccfef6b12216a956ca4dc2ff94bc2"
+  integrity sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==
 
 object-is@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac"
-  integrity sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.6.tgz#1a6a53aed2dd8f7e6775ff870bea58545956ab07"
+  integrity sha512-F8cZ+KfGlSGi09lJT7/Nd6KJZ9ygtvYC0/UYYLI9nmQKLMnydpB9yvbv9K1uSkEu7FU9vYPmVwLg328tX+ot3Q==
   dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
 
 object-keys@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
 
-object.assign@^4.1.4:
-  version "4.1.4"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f"
-  integrity sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==
+object.assign@^4.1.4, object.assign@^4.1.5:
+  version "4.1.5"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.5.tgz#3a833f9ab7fdb80fc9e8d2300c803d216d8fdbb0"
+  integrity sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==
   dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
+    call-bind "^1.0.5"
+    define-properties "^1.2.1"
     has-symbols "^1.0.3"
     object-keys "^1.1.1"
 
-object.values@^1.1.6:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.6.tgz#4abbaa71eba47d63589d402856f908243eea9b1d"
-  integrity sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==
+object.fromentries@^2.0.7:
+  version "2.0.7"
+  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.7.tgz#71e95f441e9a0ea6baf682ecaaf37fa2a8d7e616"
+  integrity sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+
+object.groupby@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/object.groupby/-/object.groupby-1.0.2.tgz#494800ff5bab78fd0eff2835ec859066e00192ec"
+  integrity sha512-bzBq58S+x+uo0VjurFT0UktpKHOZmv4/xePiOA1nbB9pMqpGK7rUPNgf+1YC+7mE+0HzhTMqNUuCqvKhj6FnBw==
+  dependencies:
+    array.prototype.filter "^1.0.3"
+    call-bind "^1.0.5"
+    define-properties "^1.2.1"
+    es-abstract "^1.22.3"
+    es-errors "^1.0.0"
+
+object.values@^1.1.7:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.7.tgz#617ed13272e7e1071b43973aa1655d9291b8442a"
+  integrity sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
 
 objectpath@^2.0.0:
   version "2.0.0"
@@ -8501,17 +8755,17 @@ open@^8.0.9:
     is-docker "^2.1.1"
     is-wsl "^2.2.0"
 
-optionator@^0.9.1:
-  version "0.9.1"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499"
-  integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==
+optionator@^0.9.3:
+  version "0.9.3"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.3.tgz#007397d44ed1872fdc6ed31360190f81814e2c64"
+  integrity sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==
   dependencies:
+    "@aashutoshrathi/word-wrap" "^1.2.3"
     deep-is "^0.1.3"
     fast-levenshtein "^2.0.6"
     levn "^0.4.1"
     prelude-ls "^1.2.1"
     type-check "^0.4.0"
-    word-wrap "^1.2.3"
 
 ora@5.4.1, ora@^5.4.1:
   version "5.4.1"
@@ -8804,6 +9058,11 @@ popper.js@1.16.1-lts:
   resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1-lts.tgz#cf6847b807da3799d80ee3d6d2f90df8a3f50b05"
   integrity sha512-Kjw8nKRl1m+VrSFCoVGPph93W/qrSO7ZkqPpTf7F4bk/sqcfWK019dWBUpE/fBOsOQY1dks/Bmcbfn1heM/IsA==
 
+possible-typed-array-names@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz#89bb63c6fada2c3e90adc4a647beeeb39cc7bf8f"
+  integrity sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==
+
 postcss-loader@7.0.2:
   version "7.0.2"
   resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-7.0.2.tgz#b53ff44a26fba3688eee92a048c7f2d4802e23bb"
@@ -8819,18 +9078,18 @@ postcss-modules-extract-imports@^3.0.0:
   integrity sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==
 
 postcss-modules-local-by-default@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz#ebbb54fae1598eecfdf691a02b3ff3b390a5a51c"
-  integrity sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.4.tgz#7cbed92abd312b94aaea85b68226d3dec39a14e6"
+  integrity sha512-L4QzMnOdVwRm1Qb8m4x8jsZzKAaPAgrUF1r/hjDR2Xj7R+8Zsf97jAlSQzWtKx5YNiNGN8QxmPFIc/sh+RQl+Q==
   dependencies:
     icss-utils "^5.0.0"
     postcss-selector-parser "^6.0.2"
     postcss-value-parser "^4.1.0"
 
 postcss-modules-scope@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz#9ef3151456d3bbfa120ca44898dfca6f2fa01f06"
-  integrity sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.1.1.tgz#32cfab55e84887c079a19bbb215e721d683ef134"
+  integrity sha512-uZgqzdTleelWjzJY+Fhti6F3C9iF1JR/dODLs/JDefozYcKTBCdD8BIl6nNPbTbcLnGrk56hzwZC2DaGNvYjzA==
   dependencies:
     postcss-selector-parser "^6.0.4"
 
@@ -8842,9 +9101,9 @@ postcss-modules-values@^4.0.0:
     icss-utils "^5.0.0"
 
 postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4:
-  version "6.0.11"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz#2e41dc39b7ad74046e1615185185cd0b17d0c8dc"
-  integrity sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g==
+  version "6.0.16"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.16.tgz#3b88b9f5c5abd989ef4e2fc9ec8eedd34b20fb04"
+  integrity sha512-A0RVJrX+IUkVZbW3ClroRWurercFhieevHB38sr2+l9eUClMqome3LmEmnhlNy+5Mr2EYN6B2Kaw9wYdd+VHiw==
   dependencies:
     cssesc "^3.0.0"
     util-deprecate "^1.0.2"
@@ -8854,15 +9113,24 @@ postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0:
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514"
   integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
 
-postcss@8.4.21, postcss@^8.2.14, postcss@^8.3.7, postcss@^8.4.19:
-  version "8.4.21"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.21.tgz#c639b719a57efc3187b13a1d765675485f4134f4"
-  integrity sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==
+postcss@8.4.31:
+  version "8.4.31"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.31.tgz#92b451050a9f914da6755af352bdc0192508656d"
+  integrity sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==
   dependencies:
-    nanoid "^3.3.4"
+    nanoid "^3.3.6"
     picocolors "^1.0.0"
     source-map-js "^1.0.2"
 
+postcss@^8.2.14, postcss@^8.3.7, postcss@^8.4.19:
+  version "8.4.36"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.36.tgz#dba513c3c3733c44e0288a712894f8910bbaabc6"
+  integrity sha512-/n7eumA6ZjFHAsbX30yhHup/IMkOmlmvtEi7P+6RMYf+bGJSUHc3geH4a0NSZxAz/RJfiS9tooCTs9LAVYUZKw==
+  dependencies:
+    nanoid "^3.3.7"
+    picocolors "^1.0.0"
+    source-map-js "^1.1.0"
+
 postinstall-prepare@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/postinstall-prepare/-/postinstall-prepare-2.0.0.tgz#2a6867c1a13a05502aa115d0495efbbd778769cb"
@@ -8874,9 +9142,9 @@ prelude-ls@^1.2.1:
   integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
 
 prettier@^2.8.3:
-  version "2.8.4"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.4.tgz#34dd2595629bfbb79d344ac4a91ff948694463c3"
-  integrity sha512-vIS4Rlc2FNh0BySk3Wkd6xmwxB0FpOndW5fisM5H8hsZSxU2VWVB5CWIkIjWvrHjIhxk2g3bfMKM87zNTrZddw==
+  version "2.8.8"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da"
+  integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==
 
 pretty-bytes@^5.3.0:
   version "5.6.0"
@@ -8970,9 +9238,9 @@ psl@^1.1.28:
   integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==
 
 punycode@^2.1.0, punycode@^2.1.1:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f"
-  integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5"
+  integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==
 
 q@1.4.1:
   version "1.4.1"
@@ -8990,9 +9258,9 @@ qjobs@^1.2.0:
   integrity sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==
 
 qrcode@^1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/qrcode/-/qrcode-1.5.1.tgz#0103f97317409f7bc91772ef30793a54cd59f0cb"
-  integrity sha512-nS8NJ1Z3md8uTjKtP+SGGhfqmTCs5flU/xR623oI0JX+Wepz9R8UrRVCTBTJm3qGw3rH6jJ6MUHjkDx15cxSSg==
+  version "1.5.3"
+  resolved "https://registry.yarnpkg.com/qrcode/-/qrcode-1.5.3.tgz#03afa80912c0dccf12bc93f615a535aad1066170"
+  integrity sha512-puyri6ApkEHYiVl4CFzo1tDkAZ+ATcnbJrJ6RiBM1Fhctdn/ix9MTE3hRph33omisEbC/2fcfemsseiKgBPKZg==
   dependencies:
     dijkstrajs "^1.0.1"
     encode-utf8 "^1.0.3"
@@ -9040,16 +9308,6 @@ raphael@^2.3.0:
   dependencies:
     eve-raphael "0.5.0"
 
-raw-body@2.5.1:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.1.tgz#fe1b1628b181b700215e5fd42389f98b71392857"
-  integrity sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==
-  dependencies:
-    bytes "3.1.2"
-    http-errors "2.0.0"
-    iconv-lite "0.4.24"
-    unpipe "1.0.0"
-
 raw-body@2.5.2:
   version "2.5.2"
   resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.2.tgz#99febd83b90e08975087e8f1f9419a149366b68a"
@@ -9087,32 +9345,32 @@ rc-align@^4.0.0:
     resize-observer-polyfill "^1.5.1"
 
 rc-motion@^2.0.0, rc-motion@^2.0.1:
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/rc-motion/-/rc-motion-2.6.3.tgz#e6d8ca06591c2c1bcd3391a8e7a822ebc4d94e9c"
-  integrity sha512-xFLkes3/7VL/J+ah9jJruEW/Akbx5F6jVa2wG5o/ApGKQKSOd5FR3rseHLL9+xtJg4PmCwo6/1tqhDO/T+jFHA==
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/rc-motion/-/rc-motion-2.9.0.tgz#9e18a1b8d61e528a97369cf9a7601e9b29205710"
+  integrity sha512-XIU2+xLkdIr1/h6ohPZXyPBMvOmuyFZQ/T0xnawz+Rh+gh4FINcnZmMT5UTIj6hgI0VLDjTaPeRd+smJeSPqiQ==
   dependencies:
     "@babel/runtime" "^7.11.1"
     classnames "^2.2.1"
     rc-util "^5.21.0"
 
 rc-overflow@^1.0.0:
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/rc-overflow/-/rc-overflow-1.2.8.tgz#40f140fabc244118543e627cdd1ef750d9481a88"
-  integrity sha512-QJ0UItckWPQ37ZL1dMEBAdY1dhfTXFL9k6oTTcyydVwoUNMnMqCGqnRNA98axSr/OeDKqR6DVFyi8eA5RQI/uQ==
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/rc-overflow/-/rc-overflow-1.3.2.tgz#72ee49e85a1308d8d4e3bd53285dc1f3e0bcce2c"
+  integrity sha512-nsUm78jkYAoPygDAcGZeC2VwIg/IBGSodtOY3pMof4W3M9qRJgqaDYm03ZayHlde3I6ipliAxbN0RUcGf5KOzw==
   dependencies:
     "@babel/runtime" "^7.11.1"
     classnames "^2.2.1"
     rc-resize-observer "^1.0.0"
-    rc-util "^5.19.2"
+    rc-util "^5.37.0"
 
 rc-resize-observer@^1.0.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/rc-resize-observer/-/rc-resize-observer-1.3.1.tgz#b61b9f27048001243617b81f95e53d7d7d7a6a3d"
-  integrity sha512-iFUdt3NNhflbY3mwySv5CA1TC06zdJ+pfo0oc27xpf4PIOvfZwZGtD9Kz41wGYqC4SLio93RVAirSSpYlV/uYg==
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/rc-resize-observer/-/rc-resize-observer-1.4.0.tgz#7bba61e6b3c604834980647cce6451914750d0cc"
+  integrity sha512-PnMVyRid9JLxFavTjeDXEXo65HCRqbmLBw9xX9gfC4BZiSzbLXKzW3jPz+J0P71pLbD5tBMTT+mkstV5gD0c9Q==
   dependencies:
     "@babel/runtime" "^7.20.7"
     classnames "^2.2.1"
-    rc-util "^5.27.0"
+    rc-util "^5.38.0"
     resize-observer-polyfill "^1.5.1"
 
 rc-select@13.2.1:
@@ -9139,15 +9397,15 @@ rc-trigger@^5.0.4:
     rc-motion "^2.0.0"
     rc-util "^5.19.2"
 
-rc-util@^5.15.0, rc-util@^5.19.2, rc-util@^5.21.0, rc-util@^5.26.0, rc-util@^5.27.0, rc-util@^5.9.8:
-  version "5.28.0"
-  resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-5.28.0.tgz#9e5e441d5875b8bf0ba56c2f295042a28dcff580"
-  integrity sha512-KYDjhGodswVj29v0TRciKTqRPgumIFvFDndbCD227pitQ+0Cei196rxk+OXb/blu6V8zdTRK5RjCJn+WmHLvBA==
+rc-util@^5.15.0, rc-util@^5.19.2, rc-util@^5.21.0, rc-util@^5.26.0, rc-util@^5.37.0, rc-util@^5.38.0, rc-util@^5.9.8:
+  version "5.39.1"
+  resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-5.39.1.tgz#7bca4fb55e20add0eef5c23166cd9f9e5f51a8a1"
+  integrity sha512-OW/ERynNDgNr4y0oiFmtes3rbEamXw7GHGbkbNd9iRr7kgT03T6fT0b9WpJ3mbxKhyOcAHnGcIoh5u/cjrC2OQ==
   dependencies:
     "@babel/runtime" "^7.18.3"
-    react-is "^16.12.0"
+    react-is "^18.2.0"
 
-rc-virtual-list@^3.2.0:
+rc-virtual-list@3.4.13, rc-virtual-list@^3.2.0:
   version "3.4.13"
   resolved "https://registry.yarnpkg.com/rc-virtual-list/-/rc-virtual-list-3.4.13.tgz#20acc934b263abcf7b7c161f50ef82281b2f7e8d"
   integrity sha512-cPOVDmcNM7rH6ANotanMDilW/55XnFPw0Jh/GQYtrzZSy3AmWvCnqVNyNC/pgg3lfVmX2994dlzAhuUrd4jG7w==
@@ -9186,7 +9444,7 @@ react-dropzone@^11.4.2:
     file-selector "^0.4.0"
     prop-types "^15.8.1"
 
-react-is@^16.12.0, react-is@^16.13.1, react-is@^16.7.0:
+react-is@^16.13.1, react-is@^16.7.0:
   version "16.13.1"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
   integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
@@ -9196,6 +9454,11 @@ react-is@^16.12.0, react-is@^16.13.1, react-is@^16.7.0:
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0"
   integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==
 
+react-is@^18.2.0:
+  version "18.2.0"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b"
+  integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==
+
 react-transition-group@^4.0.0, react-transition-group@^4.4.0:
   version "4.4.5"
   resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.5.tgz#e53d4e3f3344da8521489fbef8f2581d42becdd1"
@@ -9229,7 +9492,7 @@ read-package-json-fast@^3.0.0:
     json-parse-even-better-errors "^3.0.0"
     npm-normalize-package-bin "^3.0.0"
 
-read-package-json@^6.0.0:
+read-package-json@6.0.0, read-package-json@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-6.0.0.tgz#6a741841ad72a40e77a82b9c3c8c10e865bbc519"
   integrity sha512-b/9jxWJ8EwogJPpv99ma+QwtqB7FSl3+V6UXS7Aaay8/5VwMY50oIFooY1UKXMWpfNCM6T/PoGqa5GD1g9xf9w==
@@ -9253,9 +9516,9 @@ readable-stream@^2.0.1, readable-stream@~2.3.6:
     util-deprecate "~1.0.1"
 
 readable-stream@^3.0.6, readable-stream@^3.4.0, readable-stream@^3.6.0:
-  version "3.6.1"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.1.tgz#f9f9b5f536920253b3d26e7660e7da4ccff9bb62"
-  integrity sha512-+rQmrWMYGA90yenhTYsLWAsLsqVC8osOw6PKE1HDYiO0gdPeKe/xDHNzIAIn4C91YQ6oenEhfYqqc1883qHbjQ==
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967"
+  integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==
   dependencies:
     inherits "^2.0.3"
     string_decoder "^1.1.1"
@@ -9274,14 +9537,14 @@ reduce-flatten@^2.0.0:
   integrity sha512-EJ4UNY/U1t2P/2k6oqotuX2Cc3T6nxJwsM0N0asT7dhrtH1ltUxDn4NalSYmPE2rCkVpcf/X6R0wDwcFpzhd4w==
 
 reflect-metadata@^0.1.2:
-  version "0.1.13"
-  resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.13.tgz#67ae3ca57c972a2aa1642b10fe363fe32d49dc08"
-  integrity sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==
+  version "0.1.14"
+  resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.14.tgz#24cf721fe60677146bb77eeb0e1f9dece3d65859"
+  integrity sha512-ZhYeb6nRaXCfhnndflDK8qI6ZQ/YcWZCISRAWICW9XYqMUwjZM9Z0DveWX/ABN01oxSHwVxKQmxeYZSsm0jh5A==
 
 regenerate-unicode-properties@^10.1.0:
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz#7c3192cab6dd24e21cb4461e5ddd7dd24fa8374c"
-  integrity sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==
+  version "10.1.1"
+  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.1.tgz#6b0e05489d9076b04c436f318d9b067bba459480"
+  integrity sha512-X007RyZLsCJVVrjgEFVpLUTZwyOZk3oiL75ZcuYjlIWd6rNJtOjkBwQc5AsRrpbKVkxN6sklw/k/9m2jJYOf8Q==
   dependencies:
     regenerate "^1.4.2"
 
@@ -9295,31 +9558,37 @@ regenerator-runtime@^0.13.11:
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9"
   integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==
 
-regenerator-transform@^0.15.1:
-  version "0.15.1"
-  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.1.tgz#f6c4e99fc1b4591f780db2586328e4d9a9d8dc56"
-  integrity sha512-knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg==
+regenerator-runtime@^0.14.0:
+  version "0.14.1"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz#356ade10263f685dda125100cd862c1db895327f"
+  integrity sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==
+
+regenerator-transform@^0.15.2:
+  version "0.15.2"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.2.tgz#5bbae58b522098ebdf09bca2f83838929001c7a4"
+  integrity sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==
   dependencies:
     "@babel/runtime" "^7.8.4"
 
 regex-parser@^2.2.11:
-  version "2.2.11"
-  resolved "https://registry.yarnpkg.com/regex-parser/-/regex-parser-2.2.11.tgz#3b37ec9049e19479806e878cabe7c1ca83ccfe58"
-  integrity sha512-jbD/FT0+9MBU2XAZluI7w2OBs1RBi6p9M83nkoZayQXXU9e8Robt69FcZc7wU4eJD/YFTjn1JdCk3rbMJajz8Q==
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/regex-parser/-/regex-parser-2.3.0.tgz#4bb61461b1a19b8b913f3960364bb57887f920ee"
+  integrity sha512-TVILVSz2jY5D47F4mA4MppkBrafEaiUWJO/TcZHEIuI13AqoZMkK1WMA4Om1YkYbTx+9Ki1/tSUXbceyr9saRg==
 
-regexp.prototype.flags@^1.4.3:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz#87cab30f80f66660181a3bb7bf5981a872b367ac"
-  integrity sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==
+regexp.prototype.flags@^1.5.1, regexp.prototype.flags@^1.5.2:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz#138f644a3350f981a858c44f6bb1a61ff59be334"
+  integrity sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==
   dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    functions-have-names "^1.2.2"
+    call-bind "^1.0.6"
+    define-properties "^1.2.1"
+    es-errors "^1.3.0"
+    set-function-name "^2.0.1"
 
 regexpu-core@^5.3.1:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.3.1.tgz#66900860f88def39a5cb79ebd9490e84f17bcdfb"
-  integrity sha512-nCOzW2V/X15XpLsK2rlgdwrysrBq+AauCn+omItIz4R1pIcmeot5zvjdmOBRLzEH/CkC6IxMJVmxDe3QcMuNVQ==
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.3.2.tgz#11a2b06884f3527aec3e93dbbf4a3b958a95546b"
+  integrity sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==
   dependencies:
     "@babel/regjsgen" "^0.8.0"
     regenerate "^1.4.2"
@@ -9407,7 +9676,7 @@ resolve-url-loader@5.0.0:
     postcss "^8.2.14"
     source-map "0.6.1"
 
-resolve@1.22.1, resolve@^1.14.2, resolve@^1.22.1:
+resolve@1.22.1:
   version "1.22.1"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177"
   integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==
@@ -9416,6 +9685,15 @@ resolve@1.22.1, resolve@^1.14.2, resolve@^1.22.1:
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
+resolve@^1.14.2, resolve@^1.22.4:
+  version "1.22.8"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d"
+  integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==
+  dependencies:
+    is-core-module "^2.13.0"
+    path-parse "^1.0.7"
+    supports-preserve-symlinks-flag "^1.0.0"
+
 restore-cursor@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
@@ -9440,9 +9718,9 @@ reusify@^1.0.4:
   integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
 
 rfdc@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.0.tgz#d0b7c441ab2720d05dc4cf26e01c89631d9da08b"
-  integrity sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.1.tgz#2b6d4df52dffe8bb346992a10ea9451f24373a8f"
+  integrity sha512-r5a3l5HzYlIC68TpmYKlxWjmOP6wiPJ1vWv2HeLhNsRZMrCkxeqxiHlQ21oXmQ4F3SiryXBHhAD7JZqvOJjFmg==
 
 rifm@^0.7.0:
   version "0.7.0"
@@ -9465,10 +9743,10 @@ rimraf@^3.0.0, rimraf@^3.0.2:
   dependencies:
     glob "^7.1.3"
 
-robust-predicates@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/robust-predicates/-/robust-predicates-3.0.1.tgz#ecde075044f7f30118682bd9fb3f123109577f9a"
-  integrity sha512-ndEIpszUHiG4HtDsQLeIuMvRsDnn8c8rYStabochtUeCvfuvNptb5TUbVD68LRAILPX7p9nqQGh4xJgn3EHS/g==
+robust-predicates@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/robust-predicates/-/robust-predicates-3.0.2.tgz#d5b28528c4824d20fc48df1928d41d9efa1ad771"
+  integrity sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg==
 
 run-async@^2.4.0:
   version "2.4.1"
@@ -9495,12 +9773,22 @@ rxjs@6.6.7:
     tslib "^1.9.0"
 
 rxjs@^7.5.5, rxjs@~7.8.0:
-  version "7.8.0"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.0.tgz#90a938862a82888ff4c7359811a595e14e1e09a4"
-  integrity sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg==
+  version "7.8.1"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.1.tgz#6f6f3d99ea8044291efd92e7c7fcf562c4057543"
+  integrity sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==
   dependencies:
     tslib "^2.1.0"
 
+safe-array-concat@^1.1.0, safe-array-concat@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.1.2.tgz#81d77ee0c4e8b863635227c721278dd524c20edb"
+  integrity sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==
+  dependencies:
+    call-bind "^1.0.7"
+    get-intrinsic "^1.2.4"
+    has-symbols "^1.0.3"
+    isarray "^2.0.5"
+
 safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
@@ -9516,13 +9804,13 @@ safe-identifier@^0.4.1:
   resolved "https://registry.yarnpkg.com/safe-identifier/-/safe-identifier-0.4.2.tgz#cf6bfca31c2897c588092d1750d30ef501d59fcb"
   integrity sha512-6pNbSMW6OhAi9j+N8V+U715yBQsaWJ7eyEUaOrawX+isg5ZxhUlV1NipNtgaKHmFGiABwt+ZF04Ii+3Xjkg+8w==
 
-safe-regex-test@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.0.tgz#793b874d524eb3640d1873aad03596db2d4f2295"
-  integrity sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==
+safe-regex-test@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.3.tgz#a5b4c0f06e0ab50ea2c395c14d8371232924c377"
+  integrity sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==
   dependencies:
-    call-bind "^1.0.2"
-    get-intrinsic "^1.1.3"
+    call-bind "^1.0.6"
+    es-errors "^1.3.0"
     is-regex "^1.1.4"
 
 "safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
@@ -9560,9 +9848,9 @@ saucelabs@^1.5.0:
     https-proxy-agent "^2.2.1"
 
 sax@>=0.6.0, sax@^1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
-  integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-1.3.0.tgz#a5dbe77db3be05c9d1ee7785dbd3ea9de51593d0"
+  integrity sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA==
 
 scheduler@^0.20.2:
   version "0.20.2"
@@ -9573,30 +9861,30 @@ scheduler@^0.20.2:
     object-assign "^4.1.1"
 
 schema-inspector@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/schema-inspector/-/schema-inspector-2.0.2.tgz#3b902e9095f4636428a890203d469b0d404ada5b"
-  integrity sha512-phq0/I55VGzl4kmq3Tp1jlY75Xtc1o7wfGmOEFTgGyucI6zIdEsiM7MJu9jjQf2SfMreqSbTi/ktUsEMs6pV7A==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/schema-inspector/-/schema-inspector-2.1.0.tgz#85096fbc78162a420262ed41b82e60ac927767b2"
+  integrity sha512-3bmQVhbA01/EW8cZin4vIpqlpNU2SIy4BhKCfCgogJ3T/L76dLx3QAE+++4o+dNT33sa+SN9vOJL7iHiHFjiNg==
   dependencies:
     async "~2.6.3"
 
 schema-utils@^3.0.0, schema-utils@^3.1.0, schema-utils@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281"
-  integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.3.0.tgz#f50a88877c3c01652a15b622ae9e9795df7a60fe"
+  integrity sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==
   dependencies:
     "@types/json-schema" "^7.0.8"
     ajv "^6.12.5"
     ajv-keywords "^3.5.2"
 
 schema-utils@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.0.0.tgz#60331e9e3ae78ec5d16353c467c34b3a0a1d3df7"
-  integrity sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.2.0.tgz#70d7c93e153a273a805801882ebd3bff20d89c8b"
+  integrity sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==
   dependencies:
     "@types/json-schema" "^7.0.9"
-    ajv "^8.8.0"
+    ajv "^8.9.0"
     ajv-formats "^2.1.1"
-    ajv-keywords "^5.0.0"
+    ajv-keywords "^5.1.0"
 
 screenfull@^6.0.2:
   version "6.0.2"
@@ -9624,28 +9912,36 @@ selenium-webdriver@3.6.0, selenium-webdriver@^3.0.1:
     xml2js "^0.4.17"
 
 selfsigned@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-2.1.1.tgz#18a7613d714c0cd3385c48af0075abf3f266af61"
-  integrity sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ==
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-2.4.1.tgz#560d90565442a3ed35b674034cec4e95dceb4ae0"
+  integrity sha512-th5B4L2U+eGLq1TVh7zNRGBapioSORUeymIydxgFpwww9d2qyKvtuPU2jJuHvYAwwqi2Y596QBL3eEqcPEYL8Q==
   dependencies:
+    "@types/node-forge" "^1.3.0"
     node-forge "^1"
 
-semver@7.3.8, semver@^7.0.0, semver@^7.1.1, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8:
-  version "7.3.8"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798"
-  integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==
+semver@7.5.3:
+  version "7.5.3"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.3.tgz#161ce8c2c6b4b3bdca6caadc9fa3317a4c4fe88e"
+  integrity sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==
   dependencies:
     lru-cache "^6.0.0"
 
 semver@^5.3.0, semver@^5.5.0, semver@^5.6.0:
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
-  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
+  version "5.7.2"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
+  integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
 
-semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
-  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
+semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0, semver@^6.3.1:
+  version "6.3.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
+  integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
+
+semver@^7.0.0, semver@^7.1.1, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.3, semver@^7.6.0:
+  version "7.6.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.0.tgz#1a46a4db4bffcccd97b743b5005c8325f23d4e2d"
+  integrity sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==
+  dependencies:
+    lru-cache "^6.0.0"
 
 send@0.18.0:
   version "0.18.0"
@@ -9666,10 +9962,10 @@ send@0.18.0:
     range-parser "~1.2.1"
     statuses "2.0.1"
 
-serialize-javascript@^6.0.0:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.1.tgz#b206efb27c3da0b0ab6b52f48d170b7996458e5c"
-  integrity sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==
+serialize-javascript@^6.0.0, serialize-javascript@^6.0.1:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.2.tgz#defa1e055c83bf6d59ea805d8da862254eb6a6c2"
+  integrity sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==
   dependencies:
     randombytes "^2.1.0"
 
@@ -9701,6 +9997,28 @@ set-blocking@^2.0.0:
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==
 
+set-function-length@^1.2.1:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.2.tgz#aac72314198eaed975cf77b2c3b6b880695e5449"
+  integrity sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==
+  dependencies:
+    define-data-property "^1.1.4"
+    es-errors "^1.3.0"
+    function-bind "^1.1.2"
+    get-intrinsic "^1.2.4"
+    gopd "^1.0.1"
+    has-property-descriptors "^1.0.2"
+
+set-function-name@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/set-function-name/-/set-function-name-2.0.2.tgz#16a705c5a0dc2f5e638ca96d8a8cd4e1c2b90985"
+  integrity sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==
+  dependencies:
+    define-data-property "^1.1.4"
+    es-errors "^1.3.0"
+    functions-have-names "^1.2.3"
+    has-property-descriptors "^1.0.2"
+
 setimmediate@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
@@ -9748,13 +10066,14 @@ shebang-regex@^3.0.0:
   integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
 side-channel@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
-  integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.6.tgz#abd25fb7cd24baf45466406b1096b7831c9215f2"
+  integrity sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==
   dependencies:
-    call-bind "^1.0.0"
-    get-intrinsic "^1.0.2"
-    object-inspect "^1.9.0"
+    call-bind "^1.0.7"
+    es-errors "^1.3.0"
+    get-intrinsic "^1.2.4"
+    object-inspect "^1.13.1"
 
 sigmund@^1.0.1:
   version "1.0.1"
@@ -9767,12 +10086,15 @@ signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7:
   integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
 
 sigstore@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/sigstore/-/sigstore-1.0.0.tgz#3c7a8bbacf99d0f978276bd29bd94911006b72c7"
-  integrity sha512-e+qfbn/zf1+rCza/BhIA//Awmf0v1pa5HQS8Xk8iXrn9bgytytVLqYD0P7NSqZ6IELTgq+tcDvLPkQjNHyWLNg==
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/sigstore/-/sigstore-1.9.0.tgz#1e7ad8933aa99b75c6898ddd0eeebc3eb0d59875"
+  integrity sha512-0Zjz0oe37d08VeOtBIuB6cRriqXse2e8w+7yIy2XSXjshRKxbc2KkhXjL229jXSxEm7UbcjS76wcJDGQddVI9A==
   dependencies:
+    "@sigstore/bundle" "^1.1.0"
+    "@sigstore/protobuf-specs" "^0.2.0"
+    "@sigstore/sign" "^1.0.0"
+    "@sigstore/tuf" "^1.0.3"
     make-fetch-happen "^11.0.1"
-    tuf-js "^1.0.0"
 
 slash@^2.0.0:
   version "2.0.0"
@@ -9795,31 +10117,33 @@ smart-buffer@^4.2.0:
   integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==
 
 socket.io-adapter@~2.5.2:
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-2.5.2.tgz#5de9477c9182fdc171cd8c8364b9a8894ec75d12"
-  integrity sha512-87C3LO/NOMc+eMcpcxUBebGjkpMDkNBS9tf7KJqcDsmL936EChtVva71Dw2q4tQcuVC+hAUy4an2NO/sYXmwRA==
+  version "2.5.4"
+  resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-2.5.4.tgz#4fdb1358667f6d68f25343353bd99bd11ee41006"
+  integrity sha512-wDNHGXGewWAjQPt3pyeYBtpWSq9cLE5UW1ZUPL/2eGK9jtse/FpXib7epSTsz0Q0m+6sg6Y4KtcFTlah1bdOVg==
   dependencies:
+    debug "~4.3.4"
     ws "~8.11.0"
 
-socket.io-parser@~4.2.1:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.2.2.tgz#1dd384019e25b7a3d374877f492ab34f2ad0d206"
-  integrity sha512-DJtziuKypFkMMHCm2uIshOYC7QaylbtzQwiMYDuCKy3OPkjLzu4B2vAhTlqipRHHzrI0NJeBAizTK7X+6m1jVw==
+socket.io-parser@~4.2.4:
+  version "4.2.4"
+  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.2.4.tgz#c806966cf7270601e47469ddeec30fbdfda44c83"
+  integrity sha512-/GbIKmo8ioc+NIWIhwdecY0ge+qVBSMdgxGygevmdHj24bsfgtCmcUUcQ5ZzcylGFHsN3k4HB4Cgkl96KVnuew==
   dependencies:
     "@socket.io/component-emitter" "~3.1.0"
     debug "~4.3.1"
 
 socket.io@^4.4.1:
-  version "4.6.1"
-  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-4.6.1.tgz#62ec117e5fce0692fa50498da9347cfb52c3bc70"
-  integrity sha512-KMcaAi4l/8+xEjkRICl6ak8ySoxsYG+gG6/XfRCPJPQ/haCRIJBTL4wIl8YCsmtaBovcAXGLOShyVWQ/FG8GZA==
+  version "4.7.5"
+  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-4.7.5.tgz#56eb2d976aef9d1445f373a62d781a41c7add8f8"
+  integrity sha512-DmeAkF6cwM9jSfmp6Dr/5/mfMwb5Z5qRrSXLpo3Fq5SqyU8CMF15jIN4ZhfSwu35ksM1qmHZDQ/DK5XTccSTvA==
   dependencies:
     accepts "~1.3.4"
     base64id "~2.0.0"
+    cors "~2.8.5"
     debug "~4.3.2"
-    engine.io "~6.4.1"
+    engine.io "~6.5.2"
     socket.io-adapter "~2.5.2"
-    socket.io-parser "~4.2.1"
+    socket.io-parser "~4.2.4"
 
 sockjs@^0.3.24:
   version "0.3.24"
@@ -9840,11 +10164,11 @@ socks-proxy-agent@^7.0.0:
     socks "^2.6.2"
 
 socks@^2.6.2:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/socks/-/socks-2.7.1.tgz#d8e651247178fde79c0663043e07240196857d55"
-  integrity sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==
+  version "2.8.1"
+  resolved "https://registry.yarnpkg.com/socks/-/socks-2.8.1.tgz#22c7d9dd7882649043cba0eafb49ae144e3457af"
+  integrity sha512-B6w7tkwNid7ToxjZ08rQMT8M9BJAf8DKx8Ft4NivzH0zBUfd6jldGcisJn/RLgxcX3FPNDdNQCUEMMT79b+oCQ==
   dependencies:
-    ip "^2.0.0"
+    ip-address "^9.0.5"
     smart-buffer "^4.2.0"
 
 sorted-btree@^1.8.1:
@@ -9852,10 +10176,10 @@ sorted-btree@^1.8.1:
   resolved "https://registry.yarnpkg.com/sorted-btree/-/sorted-btree-1.8.1.tgz#6e6275f7955e5892bb8737149cbe495be10f426f"
   integrity sha512-395+XIP+wqNn3USkFSrNz7G3Ss/MXlZEqesxvzCRFwL14h6e8LukDHdLBePn5pwbm5OQ9vGu8mDyz2lLDIqamQ==
 
-"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
-  integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
+"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.2, source-map-js@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.1.0.tgz#9e7d5cb46f0689fb6691b30f226937558d0fa94b"
+  integrity sha512-9vC2SfsJzlej6MAaMPLu8HiBSHGdRAJ9hVFYN1ibZoNkeanmDmLUcIrj6G9DGL7XMJ54AKg/G75akXl1/izTOw==
 
 source-map-loader@4.0.1:
   version "4.0.1"
@@ -9897,19 +10221,19 @@ source-map@^0.5.6:
   integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==
 
 spdx-correct@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"
-  integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.2.0.tgz#4f5ab0668f0059e34f9c00dce331784a12de4e9c"
+  integrity sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==
   dependencies:
     spdx-expression-parse "^3.0.0"
     spdx-license-ids "^3.0.0"
 
 spdx-exceptions@^2.1.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d"
-  integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz#5d607d27fc806f66d7b64a766650fa890f04ed66"
+  integrity sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==
 
-spdx-expression-parse@^3.0.0, spdx-expression-parse@^3.0.1:
+spdx-expression-parse@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679"
   integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==
@@ -9917,10 +10241,18 @@ spdx-expression-parse@^3.0.0, spdx-expression-parse@^3.0.1:
     spdx-exceptions "^2.1.0"
     spdx-license-ids "^3.0.0"
 
+spdx-expression-parse@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-4.0.0.tgz#a23af9f3132115465dac215c099303e4ceac5794"
+  integrity sha512-Clya5JIij/7C6bRR22+tnGXbc4VKlibKSVj2iHvVeX5iMW7s1SIQlqu699JkODJJIhh/pUu8L0/VLh8xflD+LQ==
+  dependencies:
+    spdx-exceptions "^2.1.0"
+    spdx-license-ids "^3.0.0"
+
 spdx-license-ids@^3.0.0:
-  version "3.0.12"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.12.tgz#69077835abe2710b65f03969898b6637b505a779"
-  integrity sha512-rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA==
+  version "3.0.17"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.17.tgz#887da8aa73218e51a1d917502d79863161a93f9c"
+  integrity sha512-sh8PWc/ftMqAAdFiBu6Fy6JUOYjqDJBJvIhpfDMyHrr0Rbp5liZqd4TjtQ/RgfLjKFZb+LMx5hpml5qOWy0qvg==
 
 spdy-transport@^3.0.0:
   version "3.0.0"
@@ -9946,24 +10278,29 @@ spdy@^4.0.2:
     spdy-transport "^3.0.0"
 
 splaytree@^3.1.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/splaytree/-/splaytree-3.1.1.tgz#e1bc8e68e64ef5a9d5f09d36e6d9f3621795a438"
-  integrity sha512-9FaQ18FF0+sZc/ieEeXHt+Jw2eSpUgUtTLDYB/HXKWvhYVyOc7h1hzkn5MMO3GPib9MmXG1go8+OsBBzs/NMww==
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/splaytree/-/splaytree-3.1.2.tgz#d1db2691665a3c69d630de98d55145a6546dc166"
+  integrity sha512-4OM2BJgC5UzrhVnnJA4BkHKGtjXNzzUfpQjCO8I05xYPsfS/VuQDwjCGGMi8rYQilHEV4j8NBqTFbls/PZEE7A==
 
 split.js@^1.6.5:
   version "1.6.5"
   resolved "https://registry.yarnpkg.com/split.js/-/split.js-1.6.5.tgz#f7f61da1044c9984cb42947df4de4fadb5a3f300"
   integrity sha512-mPTnGCiS/RiuTNsVhCm9De9cCAUsrNFFviRbADdKiiV+Kk8HKp/0fWu7Kr8pi3/yBmsqLFHuXGT9UUZ+CNLwFw==
 
+sprintf-js@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.3.tgz#4914b903a2f8b685d17fdf78a70e917e872e444a"
+  integrity sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==
+
 sprintf-js@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
   integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==
 
 sshpk@^1.7.0:
-  version "1.17.0"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.17.0.tgz#578082d92d4fe612b13007496e543fa0fbcbe4c5"
-  integrity sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==
+  version "1.18.0"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.18.0.tgz#1663e55cddf4d688b86a46b77f0d5fe363aba028"
+  integrity sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==
   dependencies:
     asn1 "~0.2.3"
     assert-plus "^1.0.0"
@@ -9976,11 +10313,11 @@ sshpk@^1.7.0:
     tweetnacl "~0.14.0"
 
 ssri@^10.0.0:
-  version "10.0.1"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-10.0.1.tgz#c61f85894bbc6929fc3746f05e31cf5b44c030d5"
-  integrity sha512-WVy6di9DlPOeBWEjMScpNipeSX2jIZBGEn5Uuo8Q7aIuFEuDX0pw8RxcOjlD1TWP4obi24ki7m/13+nFpcbXrw==
+  version "10.0.5"
+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-10.0.5.tgz#e49efcd6e36385196cb515d3a2ad6c3f0265ef8c"
+  integrity sha512-bSf16tAFkGeRlUNDjXu8FzaMQt6g2HZJrun7mtMbIPOddxt3GLMSz5VWUWcqTJUPfLEaDIepGxv+bYQW49596A==
   dependencies:
-    minipass "^4.0.0"
+    minipass "^7.0.3"
 
 ssri@^9.0.0:
   version "9.0.1"
@@ -10024,23 +10361,33 @@ streamroller@^3.1.5:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.1"
 
-string.prototype.trimend@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz#c4a27fa026d979d79c04f17397f250a462944533"
-  integrity sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==
+string.prototype.trim@^1.2.8, string.prototype.trim@^1.2.9:
+  version "1.2.9"
+  resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz#b6fa326d72d2c78b6df02f7759c73f8f6274faa4"
+  integrity sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==
   dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+    es-abstract "^1.23.0"
+    es-object-atoms "^1.0.0"
 
-string.prototype.trimstart@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz#e90ab66aa8e4007d92ef591bbf3cd422c56bdcf4"
-  integrity sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==
+string.prototype.trimend@^1.0.7, string.prototype.trimend@^1.0.8:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.8.tgz#3651b8513719e8a9f48de7f2f77640b26652b229"
+  integrity sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==
+  dependencies:
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+    es-object-atoms "^1.0.0"
+
+string.prototype.trimstart@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz#d4cdb44b83a4737ffbac2d406e405d43d0184298"
+  integrity sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
 
 string_decoder@^1.1.1:
   version "1.3.0"
@@ -10080,15 +10427,15 @@ strip-final-newline@^2.0.0:
   resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
   integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
 
-strip-json-comments@3.1.1, strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
+strip-json-comments@3.1.1, strip-json-comments@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
 
 stylis@^4.1.2:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.1.3.tgz#fd2fbe79f5fed17c55269e16ed8da14c84d069f7"
-  integrity sha512-GP6WDNWf+o403jrEp9c5jibKavrtLW+/qYGhFxFrG8maXhwTBI7gLLhiBb0o7uFccWN+EOS9aMO6cGHWAO07OA==
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.3.1.tgz#ed8a9ebf9f76fe1e12d462f5cc3c4c980b23a7eb"
+  integrity sha512-EQepAV+wMsIaGVGX1RECzgrcqRRU/0sYOHkeLsZ3fzHaHXZy4DaOOX0vOlGQdlsjkh3mFHAIlVimpwAs4dslyQ==
 
 supports-color@^2.0.0:
   version "2.0.0"
@@ -10147,27 +10494,27 @@ tapable@^2.1.1, tapable@^2.2.0:
   integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==
 
 tar@^6.1.11, tar@^6.1.2:
-  version "6.1.13"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.13.tgz#46e22529000f612180601a6fe0680e7da508847b"
-  integrity sha512-jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw==
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.0.tgz#b14ce49a79cb1cd23bc9b016302dea5474493f73"
+  integrity sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==
   dependencies:
     chownr "^2.0.0"
     fs-minipass "^2.0.0"
-    minipass "^4.0.0"
+    minipass "^5.0.0"
     minizlib "^2.1.1"
     mkdirp "^1.0.3"
     yallist "^4.0.0"
 
 terser-webpack-plugin@^5.1.3:
-  version "5.3.6"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.6.tgz#5590aec31aa3c6f771ce1b1acca60639eab3195c"
-  integrity sha512-kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ==
+  version "5.3.10"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz#904f4c9193c6fd2a03f693a2150c62a92f40d199"
+  integrity sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==
   dependencies:
-    "@jridgewell/trace-mapping" "^0.3.14"
+    "@jridgewell/trace-mapping" "^0.3.20"
     jest-worker "^27.4.5"
     schema-utils "^3.1.1"
-    serialize-javascript "^6.0.0"
-    terser "^5.14.1"
+    serialize-javascript "^6.0.1"
+    terser "^5.26.0"
 
 terser@5.16.3:
   version "5.16.3"
@@ -10179,13 +10526,13 @@ terser@5.16.3:
     commander "^2.20.0"
     source-map-support "~0.5.20"
 
-terser@^5.14.1:
-  version "5.16.5"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.16.5.tgz#1c285ca0655f467f92af1bbab46ab72d1cb08e5a"
-  integrity sha512-qcwfg4+RZa3YvlFh0qjifnzBHjKGNbtDo9yivMqMFDy9Q6FSaQWSB/j1xKhsoUFJIqDOM3TsN6D5xbrMrFcHbg==
+terser@^5.26.0:
+  version "5.29.2"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.29.2.tgz#c17d573ce1da1b30f21a877bffd5655dd86fdb35"
+  integrity sha512-ZiGkhUBIM+7LwkNjXYJq8svgkd+QK3UUr0wJqY4MieaezBSAIPgbSPZyIx0idM6XWK5CMzSWa8MJIzmRcB8Caw==
   dependencies:
-    "@jridgewell/source-map" "^0.3.2"
-    acorn "^8.5.0"
+    "@jridgewell/source-map" "^0.3.3"
+    acorn "^8.8.2"
     commander "^2.20.0"
     source-map-support "~0.5.20"
 
@@ -10236,14 +10583,14 @@ tinycolor2@^1.6.0:
   integrity sha512-XPaBkWQJdsf3pLKJV9p4qN/S+fm2Oj8AIPo1BTUhg5oxkvm9+SVEGFdhyOz7tTdUTfvxMiAs4sp6/eZO2Ew+pw==
 
 "tinymce@^6.0.0 || ^5.5.0":
-  version "6.3.1"
-  resolved "https://registry.yarnpkg.com/tinymce/-/tinymce-6.3.1.tgz#cc5cf2b9f702d429cf5d1d21ed62245d768bfc4f"
-  integrity sha512-+oCwXuTxAdJXVJ0130OxQz0JDNsqg3deuzgeUo8X5Vb27EzCJgXwO5eWvCxvkxpQo4oiHMVlM4tUIpTUHufHGQ==
+  version "6.8.3"
+  resolved "https://registry.yarnpkg.com/tinymce/-/tinymce-6.8.3.tgz#0025a4aaa4c24dc2a3e32e83dfda705d196fd802"
+  integrity sha512-3fCHKAeqT+xNwBVESf6iDbDV0VNwZNmfrkx9c/6Gz5iB8piMfaO6s7FvoiTrj1hf1gVbfyLTnz1DooI6DhgINQ==
 
 tinymce@~5.10.7:
-  version "5.10.7"
-  resolved "https://registry.yarnpkg.com/tinymce/-/tinymce-5.10.7.tgz#d89d446f1962f2a1df6b2b70018ce475ec7ffb80"
-  integrity sha512-9UUjaO0R7FxcFo0oxnd1lMs7H+D0Eh+dDVo5hKbVe1a+VB0nit97vOqlinj+YwgoBDt6/DSCUoWqAYlLI8BLYA==
+  version "5.10.9"
+  resolved "https://registry.yarnpkg.com/tinymce/-/tinymce-5.10.9.tgz#1dfacb3231c71a688d90ff44a0b3f2e91b3b9edf"
+  integrity sha512-5bkrors87X9LhYX2xq8GgPHrIgJYHl87YNs+kBcjQ5I3CiUgzo/vFcGvT3MZQ9QHsEeYMhYO6a5CLGGffR8hMg==
 
 tmp@0.0.30:
   version "0.0.30"
@@ -10252,7 +10599,7 @@ tmp@0.0.30:
   dependencies:
     os-tmpdir "~1.0.1"
 
-tmp@0.2.1, tmp@^0.2.1:
+tmp@0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14"
   integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==
@@ -10266,6 +10613,11 @@ tmp@^0.0.33:
   dependencies:
     os-tmpdir "~1.0.2"
 
+tmp@^0.2.1:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.3.tgz#eb783cc22bc1e8bebd0671476d46ea4eb32a79ae"
+  integrity sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==
+
 to-fast-properties@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
@@ -10307,9 +10659,9 @@ ts-dedent@^2.2.0:
   integrity sha512-q5W7tVM71e2xjHZTlgfTDoPF/SmqKG5hddq9SzR49CH2hayqRKJtQ4mtRlSxKaJlR/+9rEM+mnBHf7I2/BQcpQ==
 
 ts-node@^10.0.0, ts-node@^10.9.1:
-  version "10.9.1"
-  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.1.tgz#e73de9102958af9e1f0b168a6ff320e25adcff4b"
-  integrity sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==
+  version "10.9.2"
+  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.2.tgz#70f021c9e185bccdca820e26dc413805c101c71f"
+  integrity sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==
   dependencies:
     "@cspotcode/source-map-support" "^0.8.0"
     "@tsconfig/node10" "^1.0.7"
@@ -10330,10 +10682,10 @@ ts-transformer-keys@^0.4.4:
   resolved "https://registry.yarnpkg.com/ts-transformer-keys/-/ts-transformer-keys-0.4.4.tgz#c185508b3ae9b79236aac58f788c85ca3ac807d7"
   integrity sha512-LrqgvaFvar01/5mbunRyeLTSIkqoC2xfcpL/90aDY6vR07DGyH+UaYGdIEsUudnlAw2Sr0pxFgdZvE0QIyI4qA==
 
-tsconfig-paths@^3.14.1:
-  version "3.14.2"
-  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz#6e32f1f79412decd261f92d633a9dc1cfa99f088"
-  integrity sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==
+tsconfig-paths@^3.15.0:
+  version "3.15.0"
+  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz#5299ec605e55b1abb23ec939ef15edaf483070d4"
+  integrity sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==
   dependencies:
     "@types/json5" "^0.0.29"
     json5 "^1.0.2"
@@ -10341,9 +10693,9 @@ tsconfig-paths@^3.14.1:
     strip-bom "^3.0.0"
 
 tsconfig-paths@^4.1.0:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-4.1.2.tgz#4819f861eef82e6da52fb4af1e8c930a39ed979a"
-  integrity sha512-uhxiMgnXQp1IR622dUXI+9Ehnws7i/y6xvpZB9IbUVOPy0muvdvgXeZOn88UcGPiT98Vp3rJPTa8bFoalZ3Qhw==
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz#ef78e19039133446d244beac0fd6a1632e2d107c"
+  integrity sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==
   dependencies:
     json5 "^2.2.2"
     minimist "^1.2.6"
@@ -10354,7 +10706,7 @@ tslib@2.3.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e"
   integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==
 
-tslib@2.5.0, tslib@^2.0.0, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.2.0, tslib@^2.3.0, tslib@^2.3.1, tslib@^2.4.0, tslib@^2.4.1, tslib@^2.5.0:
+tslib@2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf"
   integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==
@@ -10364,6 +10716,11 @@ tslib@^1.8.1, tslib@^1.9.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
+tslib@^2.0.0, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.2.0, tslib@^2.3.0, tslib@^2.3.1, tslib@^2.4.0, tslib@^2.5.0:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
+  integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==
+
 tsutils@^3.21.0:
   version "3.21.0"
   resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623"
@@ -10371,13 +10728,14 @@ tsutils@^3.21.0:
   dependencies:
     tslib "^1.8.1"
 
-tuf-js@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/tuf-js/-/tuf-js-1.1.0.tgz#25dd680bce9e3819e1fe4640d85186f862efb827"
-  integrity sha512-Tsqlm419OAlrkCE6rsf1WuPvww44vfK1ZHz+Uq9Mpq5JiV5qnJ9LLItvsbM9OipIIeSG3rydVBS4BmD40ts2uA==
+tuf-js@^1.1.7:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/tuf-js/-/tuf-js-1.1.7.tgz#21b7ae92a9373015be77dfe0cb282a80ec3bbe43"
+  integrity sha512-i3P9Kgw3ytjELUfpuKVDNBJvk4u5bXL6gskv572mcevPbSKCV3zt3djhmlEQ65yERjIbOSncy7U4cQJaB1CBCg==
   dependencies:
-    "@tufjs/models" "1.0.0"
-    make-fetch-happen "^11.0.1"
+    "@tufjs/models" "1.0.4"
+    debug "^4.3.4"
+    make-fetch-happen "^11.1.1"
 
 tunnel-agent@^0.6.0:
   version "0.6.0"
@@ -10421,14 +10779,49 @@ type-is@~1.6.18:
     media-typer "0.3.0"
     mime-types "~2.1.24"
 
-typed-array-length@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.4.tgz#89d83785e5c4098bec72e08b319651f0eac9c1bb"
-  integrity sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==
+typed-array-buffer@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz#1867c5d83b20fcb5ccf32649e5e2fc7424474ff3"
+  integrity sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==
   dependencies:
-    call-bind "^1.0.2"
+    call-bind "^1.0.7"
+    es-errors "^1.3.0"
+    is-typed-array "^1.1.13"
+
+typed-array-byte-length@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz#d92972d3cff99a3fa2e765a28fcdc0f1d89dec67"
+  integrity sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==
+  dependencies:
+    call-bind "^1.0.7"
+    for-each "^0.3.3"
+    gopd "^1.0.1"
+    has-proto "^1.0.3"
+    is-typed-array "^1.1.13"
+
+typed-array-byte-offset@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz#f9ec1acb9259f395093e4567eb3c28a580d02063"
+  integrity sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==
+  dependencies:
+    available-typed-arrays "^1.0.7"
+    call-bind "^1.0.7"
     for-each "^0.3.3"
-    is-typed-array "^1.1.9"
+    gopd "^1.0.1"
+    has-proto "^1.0.3"
+    is-typed-array "^1.1.13"
+
+typed-array-length@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.5.tgz#57d44da160296d8663fd63180a1802ebf25905d5"
+  integrity sha512-yMi0PlwuznKHxKmcpoOdeLwxBoVPkqZxd7q2FgMkmD3bNwvF5VW0+UlUQ1k1vmktTu4Yu13Q0RIxEP8+B+wloA==
+  dependencies:
+    call-bind "^1.0.7"
+    for-each "^0.3.3"
+    gopd "^1.0.1"
+    has-proto "^1.0.3"
+    is-typed-array "^1.1.13"
+    possible-typed-array-names "^1.0.0"
 
 typed-assert@^1.0.8:
   version "1.0.9"
@@ -10456,9 +10849,9 @@ typical@^5.2.0:
   integrity sha512-dvdQgNDNJo+8B2uBQoqdb11eUCE1JQXhvjC/CZtgvZseVd5TYMXnq0+vuUemXbd/Se29cTaUuPX3YIc2xgbvIg==
 
 ua-parser-js@^0.7.30:
-  version "0.7.33"
-  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.33.tgz#1d04acb4ccef9293df6f70f2c3d22f3030d8b532"
-  integrity sha512-s8ax/CeZdK9R/56Sui0WM6y9OFREJarMRHqLB2EwkovemBxNQ+Bqu8GAsUnVcXKgphb++ghr/B2BZx4mahujPw==
+  version "0.7.37"
+  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.37.tgz#e464e66dac2d33a7a1251d7d7a99d6157ec27832"
+  integrity sha512-xV8kqRKM+jhMvcHWUKthV9fNebIzrNy//2O9ZwWcfiBFR5f25XVZPLlEajk/sf3Ra15V92isyQqnIEXRDaZWEA==
 
 unbox-primitive@^1.0.2:
   version "1.0.2"
@@ -10470,6 +10863,11 @@ unbox-primitive@^1.0.2:
     has-symbols "^1.0.3"
     which-boxed-primitive "^1.0.2"
 
+undici-types@~5.26.4:
+  version "5.26.5"
+  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
+  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
+
 unicode-canonical-property-names-ecmascript@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc"
@@ -10493,13 +10891,6 @@ unicode-property-aliases-ecmascript@^2.0.0:
   resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz#43d41e3be698bd493ef911077c9b131f827e8ccd"
   integrity sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==
 
-unique-filename@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-2.0.1.tgz#e785f8675a9a7589e0ac77e0b5c34d2eaeac6da2"
-  integrity sha512-ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A==
-  dependencies:
-    unique-slug "^3.0.0"
-
 unique-filename@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-3.0.0.tgz#48ba7a5a16849f5080d26c760c86cf5cf05770ea"
@@ -10507,13 +10898,6 @@ unique-filename@^3.0.0:
   dependencies:
     unique-slug "^4.0.0"
 
-unique-slug@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-3.0.0.tgz#6d347cf57c8a7a7a6044aabd0e2d74e4d76dc7c9"
-  integrity sha512-8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w==
-  dependencies:
-    imurmurhash "^0.1.4"
-
 unique-slug@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-4.0.0.tgz#6bae6bb16be91351badd24cdce741f892a6532e3"
@@ -10527,19 +10911,19 @@ universalify@^0.1.0:
   integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
 
 universalify@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
-  integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.1.tgz#168efc2180964e6386d061e094df61afe239b18d"
+  integrity sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==
 
 unpipe@1.0.0, unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
   integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==
 
-update-browserslist-db@^1.0.10:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz#0f54b876545726f17d00cd9a2561e6dade943ff3"
-  integrity sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==
+update-browserslist-db@^1.0.10, update-browserslist-db@^1.0.13:
+  version "1.0.13"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz#3c5e4f5c083661bd38ef64b6328c26ed6c8248c4"
+  integrity sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==
   dependencies:
     escalade "^3.1.1"
     picocolors "^1.0.0"
@@ -10579,9 +10963,9 @@ uuid@^8.3.2:
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
 uuid@^9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.0.tgz#592f550650024a38ceb0c562f2f6aa435761efb5"
-  integrity sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==
+  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"
@@ -10623,9 +11007,9 @@ void-elements@^2.0.0:
   integrity sha512-qZKX4RnBzH2ugr8Lxa7x+0V6XD9Sb/ouARtiasEQCHB1EVU4NXtmHsDDrx1dO4ne5fc3J6EW05BP1Dl0z0iung==
 
 watchpack@^2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.0.tgz#fa33032374962c78113f93c7f2fb4c54c9862a5d"
-  integrity sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.1.tgz#29308f2cac150fa8e4c92f90e0ec954a9fed7fff"
+  integrity sha512-8wrBCMtVhqcXP2Sup1ctSkga6uc2Bx0IIvKyT7yTFier5AXHooSI+QyQQAtTb7+E0IUCCKyTFmXqdqgum2XWGg==
   dependencies:
     glob-to-regexp "^0.4.1"
     graceful-fs "^4.1.2"
@@ -10644,6 +11028,11 @@ wcwidth@^1.0.1:
   dependencies:
     defaults "^1.0.3"
 
+web-worker@^1.2.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/web-worker/-/web-worker-1.3.0.tgz#e5f2df5c7fe356755a5fb8f8410d4312627e6776"
+  integrity sha512-BSR9wyRsy/KOValMgd5kMyr3JzpdeoR9KVId8u5GVlTTAtNChlsE4yTxeY7zMdNSyOmoKBv8NH2qeRY9Tg+IaA==
+
 webdriver-js-extender@2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/webdriver-js-extender/-/webdriver-js-extender-2.1.0.tgz#57d7a93c00db4cc8d556e4d3db4b5db0a80c3bb7"
@@ -10726,7 +11115,7 @@ webpack-dev-server@4.11.1:
     webpack-dev-middleware "^5.3.1"
     ws "^8.4.2"
 
-webpack-merge@5.8.0, webpack-merge@^5.7.3:
+webpack-merge@5.8.0:
   version "5.8.0"
   resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.8.0.tgz#2b39dbf22af87776ad744c390223731d30a68f61"
   integrity sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==
@@ -10734,6 +11123,15 @@ webpack-merge@5.8.0, webpack-merge@^5.7.3:
     clone-deep "^4.0.1"
     wildcard "^2.0.0"
 
+webpack-merge@^5.7.3:
+  version "5.10.0"
+  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.10.0.tgz#a3ad5d773241e9c682803abf628d4cd62b8a4177"
+  integrity sha512-+4zXKdx7UnO+1jaN4l2lHVD+mFvnlZQP/6ljaJVb4SZiwIKeUnrT5l0gkT8z+n4hKpC+jpOv6O9R+gLtag7pSA==
+  dependencies:
+    clone-deep "^4.0.1"
+    flat "^5.0.2"
+    wildcard "^2.0.0"
+
 webpack-sources@^3.0.0, webpack-sources@^3.2.3:
   version "3.2.3"
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
@@ -10746,36 +11144,6 @@ webpack-subresource-integrity@5.1.0:
   dependencies:
     typed-assert "^1.0.8"
 
-webpack@5.75.0:
-  version "5.75.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.75.0.tgz#1e440468647b2505860e94c9ff3e44d5b582c152"
-  integrity sha512-piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ==
-  dependencies:
-    "@types/eslint-scope" "^3.7.3"
-    "@types/estree" "^0.0.51"
-    "@webassemblyjs/ast" "1.11.1"
-    "@webassemblyjs/wasm-edit" "1.11.1"
-    "@webassemblyjs/wasm-parser" "1.11.1"
-    acorn "^8.7.1"
-    acorn-import-assertions "^1.7.6"
-    browserslist "^4.14.5"
-    chrome-trace-event "^1.0.2"
-    enhanced-resolve "^5.10.0"
-    es-module-lexer "^0.9.0"
-    eslint-scope "5.1.1"
-    events "^3.2.0"
-    glob-to-regexp "^0.4.1"
-    graceful-fs "^4.2.9"
-    json-parse-even-better-errors "^2.3.1"
-    loader-runner "^4.2.0"
-    mime-types "^2.1.27"
-    neo-async "^2.6.2"
-    schema-utils "^3.1.0"
-    tapable "^2.1.1"
-    terser-webpack-plugin "^5.1.3"
-    watchpack "^2.4.0"
-    webpack-sources "^3.2.3"
-
 webpack@5.76.1:
   version "5.76.1"
   resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.76.1.tgz#7773de017e988bccb0f13c7d75ec245f377d295c"
@@ -10806,7 +11174,7 @@ webpack@5.76.1:
     watchpack "^2.4.0"
     webpack-sources "^3.2.3"
 
-webpack@^5.77.0:
+webpack@5.77.0:
   version "5.77.0"
   resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.77.0.tgz#dea3ad16d7ea6b84aa55fa42f4eac9f30e7eb9b4"
   integrity sha512-sbGNjBr5Ya5ss91yzjeJTLKyfiwo5C628AFjEa6WSXcZa4E+F57om3Cc8xLb1Jh0b243AWuSYRf3dn7HVeFQ9Q==
@@ -10862,31 +11230,30 @@ which-boxed-primitive@^1.0.2:
     is-symbol "^1.0.3"
 
 which-collection@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/which-collection/-/which-collection-1.0.1.tgz#70eab71ebbbd2aefaf32f917082fc62cdcb70906"
-  integrity sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/which-collection/-/which-collection-1.0.2.tgz#627ef76243920a107e7ce8e96191debe4b16c2a0"
+  integrity sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==
   dependencies:
-    is-map "^2.0.1"
-    is-set "^2.0.1"
-    is-weakmap "^2.0.1"
-    is-weakset "^2.0.1"
+    is-map "^2.0.3"
+    is-set "^2.0.3"
+    is-weakmap "^2.0.2"
+    is-weakset "^2.0.3"
 
 which-module@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
-  integrity sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q==
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.1.tgz#776b1fe35d90aebe99e8ac15eb24093389a4a409"
+  integrity sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==
 
-which-typed-array@^1.1.9:
-  version "1.1.9"
-  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.9.tgz#307cf898025848cf995e795e8423c7f337efbde6"
-  integrity sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==
+which-typed-array@^1.1.13, which-typed-array@^1.1.14, which-typed-array@^1.1.15:
+  version "1.1.15"
+  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.15.tgz#264859e9b11a649b388bfaaf4f767df1f779b38d"
+  integrity sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==
   dependencies:
-    available-typed-arrays "^1.0.5"
-    call-bind "^1.0.2"
+    available-typed-arrays "^1.0.7"
+    call-bind "^1.0.7"
     for-each "^0.3.3"
     gopd "^1.0.1"
-    has-tostringtag "^1.0.0"
-    is-typed-array "^1.1.10"
+    has-tostringtag "^1.0.2"
 
 which@^1.2.1, which@^1.2.9:
   version "1.3.1"
@@ -10903,9 +11270,9 @@ which@^2.0.1, which@^2.0.2:
     isexe "^2.0.0"
 
 which@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/which/-/which-3.0.0.tgz#a9efd016db59728758a390d23f1687b6e8f59f8e"
-  integrity sha512-nla//68K9NU6yRiwDY/Q8aU6siKlSs64aEC7+IV56QoAuyQT2ovsJcgGYGyqMOmI/CGN1BOR6mM5EN0FBO+zyQ==
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/which/-/which-3.0.1.tgz#89f1cd0c23f629a8105ffe69b8172791c87b4be1"
+  integrity sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==
   dependencies:
     isexe "^2.0.0"
 
@@ -10917,14 +11284,9 @@ wide-align@^1.1.5:
     string-width "^1.0.2 || 2 || 3 || 4"
 
 wildcard@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec"
-  integrity sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==
-
-word-wrap@^1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
-  integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.1.tgz#5ab10d02487198954836b6349f74fff961e10f67"
+  integrity sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==
 
 wordwrapjs@^4.0.0:
   version "4.0.1"
@@ -10958,9 +11320,9 @@ wrappy@1:
   integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
 
 ws@^8.4.2:
-  version "8.12.1"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.12.1.tgz#c51e583d79140b5e42e39be48c934131942d4a8f"
-  integrity sha512-1qo+M9Ba+xNhPB+YTWUlK6M17brTut5EXbcBaMRN5pH5dFrXz7lzz1ChFSUq3bOUl8yEvSenhHmYUNJxFzdJew==
+  version "8.16.0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.16.0.tgz#d1cd774f36fbc07165066a60e40323eab6446fd4"
+  integrity sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==
 
 ws@~8.11.0:
   version "8.11.0"
@@ -11072,9 +11434,9 @@ yargs@^16.1.1:
     yargs-parser "^20.2.2"
 
 yargs@^17.2.1:
-  version "17.7.1"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.1.tgz#34a77645201d1a8fc5213ace787c220eabbd0967"
-  integrity sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==
+  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"
@@ -11095,15 +11457,15 @@ yocto-queue@^0.1.0:
   integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
 
 zone.js@~0.13.0:
-  version "0.13.0"
-  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.13.0.tgz#4c735cb8ef49312b58c0ad13451996dc2b202a6d"
-  integrity sha512-7m3hNNyswsdoDobCkYNAy5WiUulkMd3+fWaGT9ij6iq3Zr/IwJo4RMCYPSDjT+r7tnPErmY9sZpKhWQ8S5k6XQ==
+  version "0.13.3"
+  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.13.3.tgz#344c24098fa047eda6427a4c7ed486e391fd67b5"
+  integrity sha512-MKPbmZie6fASC/ps4dkmIhaT5eonHkEt6eAy80K42tAm0G2W+AahLJjbfi6X9NPdciOE9GRFTTM8u2IiF6O3ww==
   dependencies:
     tslib "^2.3.0"
 
-zrender@5.4.4:
-  version "5.4.4"
-  resolved "https://registry.yarnpkg.com/zrender/-/zrender-5.4.4.tgz#8854f1d95ecc82cf8912f5a11f86657cb8c9e261"
-  integrity sha512-0VxCNJ7AGOMCWeHVyTrGzUgrK4asT4ml9PEkeGirAkKNYXYzoPJCLvmyfdoOXcjTHPs10OZVMfD1Rwg16AZyYw==
+zrender@5.5.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/zrender/-/zrender-5.5.0.tgz#54d0d6c4eda81a96d9f60a9cd74dc48ea026bc1e"
+  integrity sha512-O3MilSi/9mwoovx77m6ROZM7sXShR/O/JIanvzTwjN3FORfLSr81PsUGd7jlaYOeds9d8tw82oP44+3YucVo+w==
   dependencies:
     tslib "2.3.0"